Skip to content

media: gs201-csis: Leave ERR_WRONG_CONFIG out of the link's error interrupt - #120

Open
W4HO-ham wants to merge 19 commits into
derekross:omamobilefrom
W4HO-ham:tegu-csis-wrongcfg
Open

W4HO-ham wants to merge 19 commits into
derekross:omamobilefrom
W4HO-ham:tegu-csis-wrongcfg

Conversation

@W4HO-ham

Copy link
Copy Markdown
Contributor

Draft, stacked on #103 (and #63 under it); only the last commit is new. It waits for one camera run on the palmtop: the nine-switch capture test, plus the link interrupt count per main-camera frame, which should drop from about 530 to about 2.

Every camera stream on the 9a shows link errors, and all of them are INT0 bit 3, ERR_WRONG_CONFIG (the name in Google's isp_fe.h): a packet on VC 0 with a data type no channel takes. The front and ultrawide cameras send one a frame, an embedded-data line. The main camera sends about 527 a frame, its PDAF data; the link's per-VC counters show frames only on VC 0. At 30 fps that's some 16,000 interrupts a second, each a read and two writes of the link's interrupt registers, for an error that never touches the image.

The default INT0 mask now leaves ERR_WRONG_CONFIG out, and the other link errors still interrupt. int0_mask can still take them all for bring-up.

Checks: checkpatch --strict clean. The module with this change (together with #103's fix) is built for the palmtop's kernel.

The Tensor G4 (zumapro) camera front end has the same Samsung DC-PHY
receiver with nine slaves for its twelve CSIS links, the clock lane
first on each and one reset bit per slave. Add its compatible; the PHY
cell is the CSIS link.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
zumapro's DC-PHY slaves sit at 0x1c100000 with the bias block at +0x1000
as on gs201, but every slave has its clock lane first and up to four data
lanes (three C-PHY trios) after it, and three slaves are a clock lane
only, which links 4 and 6 enable next to their own in four-lane D-PHY
mode. The layout comes from the Pixel 9a camera HAL's register table and
Google's GPL zuma DT; the reset bits are one per slave in the ISP-FE
system registers at +0x500.

Make the link layout per SoC with the reset bits and the partner clock
lane in it, and add zumapro's four-lane links (0, 1, 2, 4 and 6). The
data file format is unchanged.

On the Pixel 9a, link 1 (the ultrawide IMX712, four lanes at
1105.92 Mbps) powers on with settle 55, and the CSIS link receives about
30 frames a second with no SOT, CRC or ECC errors.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
zumapro has the same CSIS link (version 0x08010000 against gs201's
0x05040000, the same register layout) with twelve link contexts, but a
different DMA path. Add its compatible with the link registers and the
link interrupt only.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
zumapro's CSIS link has gs201's layout, but its frames reach memory
through the ISP front end's CSIS core, which this driver doesn't drive
yet. Add a zumapro match that maps the link only and always runs as
link_only does: PHY, link and sensor, counting frames, with no WDMA, no
routing and none of gs201's CSIS sysreg accesses (an unknown sysreg word
aborted gs201).

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
On zumapro a link's frames reach memory through the ISP front end's CSIS
core, one page shared by all links, with one interrupt for all of them.
Describe it as an optional second register range and interrupt of a
zumapro link, with the image logical channel the link writes through.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
zumapro's CSIS core takes a link's data type on one virtual channel into
an image logical channel (LoCH) and writes it to memory through its Bayer
WDMA. The register layout and fields come from the Pixel 9a camera HAL's
register table and value packers and, for the interrupt bits, Google's
GPL zuma ISP event description.

Route the link's channel 0 into a LoCH, write packed RAW10 (or RAW8) at
the stride the video node set, and program the batch slot at each start
of frame only: a configuration written during a frame is a late config
and stops the LoCH, so frames with no queued buffer go to a scratch
buffer. A status queue page takes the LoCH's per-frame record.

The link differs from gs201 in three bits the zumapro HAL sets or clears:
pixel mode 3, CMN_CTRL bit 12, and DBG_OPTION_SUITE cleared. gs201 sets
DBG_OPTION_SUITE bit 23, and with it the link hands out unpacked 16-bit
words, which gs201's WDMA expects; zumapro's core reads them as packed
RAW10 and scrambles every pixel.

On the Pixel 9a the ultrawide's solid colour test pattern (R 1023, Gr 0,
B 341, Gb 682) reads back exactly in RAW10 and RAW16, and libcamera's
simple pipeline streams it at 30 fps.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Pixel 9a main camera is a Samsung part with model ID 0x08e8 that
takes the GN1's register layout and data file, with a second auxiliary
supply and its digital supply switched by the board.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Pixel 9a main camera (model 0x08e8) powers up as stock's module power
sequence has it: the interface supply, two 2.9 V auxiliary supplies, the
analog and the digital supply, reset released, then the clock and 10 ms.
Its soft reset goes through the direct page, its standard registers too,
and its horizontal addresses count pixels. Its initialisation and modes
come from the data file, as for the other parts.

On the Pixel 9a it identifies at 0x56 and streams 2000x1128 over three
C-PHY trios.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
All zumapro links write through image LoCH 0, so a stream that stopped
with the LoCH in error (the main camera's first C-PHY attempts) left it
taking a few frames and then nothing for the next link. Disable, abort
and clear the LoCH before routing it. Count the core interrupts each link
handles in debugfs, with the last aggregate and processing sources.

Bring-up parameters for the link and the core (pixel and parallel mode,
CMN_CTRL bits, LoCH data type and memory format) stay for the C-PHY work.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
zumapro's camera software never writes the link's PHY_CMN_CTRL: its PHY
lanes are enabled in the DC-PHY transaction. Write it on gs201 only. The
ultrawide and front cameras stream as before without it.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
…ocks

A zumapro link takes the INT DVFS domain, the rail of the ISP front end's
NOC clock, and that clock, as "int" and "fe". gs201 keeps its "cam" and
"int" DVFS domains.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
ABL leaves the ISP front end's NOC clock at a sixth of SHARED3 (111 MHz).
The Pixel 9a main camera's three C-PHY trios at 2740 Msps (18.8 Gbps)
overrun the front end at that rate: the link reports ERR_DESKEW_OVER and
the LoCH a size mismatch and stream error, with a few hundred bytes of
each frame in memory. At 332 MHz every frame lands whole.

Take the INT DVFS domain (the clock's rail, through ACPM) and the front
end clock as "int" and "fe", and raise both while a link streams, the
rail first, restoring them in reverse afterwards.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Pixel 9a's ultrawide and front cameras are Sony IMX712s (model
0x0712), with the IMX386's register map and their own initialisation and
modes in the data file.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Pixel 9a's ultrawide and front cameras answer with model 0x0712 at the
IMX386's chip ID register and take the same CCS-style register map. Take
the expected model ID from the compatible, for the probe's check and the
data file's header. Both cameras stream 4208x3072 RAW10 on four D-PHY
lanes on the palmtop with their data file from the 9a's camera HAL.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
…used define

The LoCH interrupt registers' offsets are also in Google's GPL
zuma-isp-event-info.dtsi, not only their bits: say so. ZP_STRIDE_ALIGN
was never used (CSIS_STRIDE_ALIGN, 64, already covers it).

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
…roles

The GN8's power-up order is rear_main_camera_power_seq in Google's GPL
zuma-tegu-camera.dtsi, which also names ldo5 and ldo4 as the actuator's
and OIS's AVDD and AF_VM (the sensor's own being ldo1 and vdig). Replace
the open question with that; both stay required, as the module's
sequence powers them before the sensor.

Link: https://android.googlesource.com/kernel/devices/google/tegu/+/6276884d9940694b25a6934671918ec8ac412ee8/dts/zuma-tegu-camera.dtsi
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
None of gs201-csis, the MIPI DC-PHY receiver or the S5KGN1 and IMX386
sensor drivers had an entry. Add one block for the four and their
bindings.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
On the Pixel 9a the first capture after switching cameras came back
empty whenever the previous stream ran on a D-PHY link (the ultrawide
or the front camera) and worked: the new link received its frames,
but the LoCH raised no interrupt and wrote nothing. The next capture
on the same link worked.

The LoCH's EN_STATUS register (0x0a8, named in the camera HAL's
register table) shows why. After a stream that stopped cleanly it
still reads active with the old link in its low bits (0x106 after link
6, 0x101 after link 1), and every failing start began that way, every
good start with it clear. The abort at route time didn't clear it,
because the LoCH ignores an abort while it is disabled.

So when the LoCH is still active, enable it (its DMA is already off)
for the abort, and disable it afterwards. Nine captures in a row,
switching between all three cameras in every order, now all write
frames; before, about half of the switches failed.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
…errupt

ERR_WRONG_CONFIG flags a packet that no channel is configured to take.
The Pixel 9a's sensors send such packets by design on VC 0: one
embedded-data line a frame on the front and ultrawide cameras, and about
527 PDAF packets a frame on the main camera. At 30 fps that is some
16,000 link interrupts a second on the main camera, each a read and two
writes of the link's interrupt registers, for an error that never
affects the image.

Leave it out of the default INT0 mask; the other link errors still
interrupt, and the int0_mask parameter can still take them all for
bring-up.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
@derekross

Copy link
Copy Markdown
Owner

Thank you. The numbers explain the change well (about 527 interrupts a frame on the main camera, for packets the image never uses). One thing for when it leaves draft: int0_mask's default applies to every SoC, so this also changes the Pixel 7 Pro, where the old comment records the same ERR_WRONG_CONFIG flood from the main camera's second stream. I think the reason holds there too, so I'm happy to treat it as a deliberate change on both phones, but then it needs a capture on my Pixel 7 Pro before it merges. I can do that alongside #63 and #103. Alternatively, keep gs201's default in its SoC data. Tell me which you prefer.

@W4HO-ham

Copy link
Copy Markdown
Contributor Author

Run on the palmtop (7.3.0-rc6-omamobile-tegu-s2mpg15-m1-g991042e2eff3-dirty, this commit with #103's in the module; int0_mask reads 16773239, bit 3 clear). Nine captures, switching between all three cameras in every order (3 2 1 2 3 1 1 3 2), all wrote frames (WDMA done 5-9 each). Link interrupts per stream now track the frame count: the main camera took 10 for 5 frames, where it took 2,611 and 3,078 for the same five frames before. The front and ultrawide take one a frame as before, which is the frame interrupt. The error counter still sees bit 3 on the frame interrupts it reads; it just no longer interrupts for it.

@W4HO-ham
W4HO-ham marked this pull request as ready for review October 28, 2026 14:42
@derekross

Copy link
Copy Markdown
Owner

Thank you for the run. Nine captures across all three cameras in every order, with the main camera down from 2,611 and 3,078 link interrupts to 10 for five frames, is a clear result. The int0_mask you read (16773239, 0xfff077) is exactly the default this commit builds: I compared the object with #103's, and the only difference is that one word in .data, bit 3 cleared. No function changes.

You've taken it out of draft with the default still shared, so I'll treat it as a deliberate change on both phones. The reason holds on the Pixel 7 Pro too: my camera notes record ERR_WRONG_CONFIG as the only link error there, about 180-200 interrupts a frame from the main camera's VC 1 lines and once a frame on the others. Two things before it merges:

  1. Please add a sentence to the commit message saying that the default applies to gs201 (the Pixel 7 Pro) too, and why it's right there (the same error, from the main camera's VC 1 lines). As it reads now, the message describes only the 9a, and the old comment's Pixel 7 Pro figure is gone from the new one. "Both phones' sensors" in the comment would cover it.
  2. I'll run a capture on my Pixel 7 Pro with media, phy: the Pixel 9a (zumapro) camera receiver on gs201-csis and the DC-PHY driver #63, media: gs201-csis, s5kgn1, MAINTAINERS: follow-ups to #63 #103 and this commit, and post the result here before I merge. Merge order is media, phy: the Pixel 9a (zumapro) camera receiver on gs201-csis and the DC-PHY driver #63, then media: gs201-csis, s5kgn1, MAINTAINERS: follow-ups to #63 #103, then this.

The checks pass on today's omamobile (clean merge, sign-offs, checkpatch with #63's two known notes, W=1 on the four files).

@kdegeek

kdegeek commented Nov 18, 2026

Copy link
Copy Markdown

A second zumapro data point, from the Pixel 9 Pro Fold (comet, 7.3.0-rc6 int-k9 builds, 11-01).

  • The main IMX787 (link 1, C-PHY x3, 4000x3000) raised ERR_WRONG_CONFIG (INT0 bit 3) about 2,248 times a frame. With this PR's last commit applied as int0_mask=16773239 (0x00fff077), that dropped to 3-6 link errors a capture, and frames were written with WDMA done 3 errors 0.

  • The other three sensors with the mask:

    • outer S5K3K1 (link 4, D-PHY x4): 0 link errors;
    • inner S5K3K1 (link 0, D-PHY x4): 0 link errors;
    • tele S5K3J1 (link 6, D-PHY x4): 9 link errors, all bit 3.

    Test-pattern frames were correct on all three.

  • The S5K3LU ultrawide (link 2, C-PHY x3) needs google,lrte-packet-delimiters, as tegu's GN8 does. Without it, it gives FS 8 FE 0, INT1 bits 3 and 6 about 60,600 times each, and every pixel 0. With the delimiters (lrte_config=0xffff7fff) it gives FS 4 FE 4, WDMA done 4 errors 0 and correct colour bars. The IMX787 doesn't need it.

So the default mask holds on comet's five sensors too. Comet's board DTS will set the LRTE property on the ultrawide's link when it goes up.

@derekross

Copy link
Copy Markdown
Owner

@kdegeek, thank you for the comet numbers. The main IMX787 going from about 2,248 of these a frame to a handful per capture, with the other sensors quiet and no WDMA errors, is the same picture as on the 9a, now on five more sensors. I'll note the ultrawide's google,lrte-packet-delimiters for when comet's board file comes up; it's separate from this commit. When that board PR arrives, please bring the tree and kernel release these runs were made on with it, so the notes can cite them.

@W4HO-ham, where this stands. The head hasn't changed since 28 October, and I re-ran our gate on today's omamobile with it: a clean merge, the 19 sign-offs, checkpatch with #63's two known notes, and the W=1 builds of the four files. Nothing under the CSIS driver or the DC-PHY has moved on omamobile since your base, so the object comparison from then still holds: one word of data differs from #103, bit 3 of the default mask.

Two things are still open from my comment of the 28th:

  1. The message and the comment still describe only the Pixel 9a. The default is shared, so this changes the Pixel 7 Pro too, where the same error comes from the main camera's VC 1 lines (about 180 to 200 a frame). Please add a sentence saying so to the commit message, and name both phones' sensors in the comment above int0_mask; the old comment's Pixel 7 Pro figure disappeared with the rewrite. That's a message amend and one comment line.
  2. My Pixel 7 Pro capture with media, phy: the Pixel 9a (zumapro) camera receiver on gs201-csis and the DC-PHY driver #63, media: gs201-csis, s5kgn1, MAINTAINERS: follow-ups to #63 #103 and this commit. That one is on me, and I'm sorry it is still open; I'll post the per-frame interrupt counts here before I merge.

The order stays #63, then #103, then this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants