Skip to content

arm64: dts: exynos: google: zumapro-tegu: Add the SPI21 pins - #151

Closed
W4HO-ham wants to merge 17 commits into
derekross:omamobilefrom
W4HO-ham:tegu-spi21-pins
Closed

W4HO-ham wants to merge 17 commits into
derekross:omamobilefrom
W4HO-ham:tegu-spi21-pins

Conversation

@W4HO-ham

Copy link
Copy Markdown
Contributor

SPI21 carries the 9a's GNSS link (CHPP to the modem's GNSS core). The node has had no pinctrl, so the bus ran on the bootloader's pin state: gpp22-0..3 in function 2 at drive 0, gpp22-2 (data in) pulled down, read from the PERIC1 pin registers on the palmtop. This describes the pins, keeps the pulls as found and uses drive 3, as gpp21 (the other SPI bus on PERIC1) is set.

At drive 0 the link was marginal; at drive 3 received frames pass their CRC, and together with #150 (the spi-s3c64xx flush order) the receiver gets a position fix: a 10-minute session on the palmtop with 38 of 43 GGA sentences fixed, 10-13 satellites, HDOP about 1, no link errors (details on #137). The SPI21 node stays disabled until the GNSS driver is in, so this changes nothing at runtime yet; it records the pin state the bus needs.

Stacked on #136 (the last of the 9a DT stack, per your note on #105); one commit on top. The board file builds with the change (cpp + dtc), and the pin groups land on /soc/pinctrl@10c40000 with pinctrl-0 on spi@111e0000. checkpatch --strict: 0 errors, 0 warnings. Drive 3 is my choice from the other bus, not read from stock's DT (the stock base DT isn't in my captures); if you have stock's spi21 group, I'll match it.

Turn on CMU_G3D and the Mali-G715 for the Pixel 9a, with its core clock
on ACPM's paired "gpu" clock (index 17), which sets the shader (G3D) and
L2 (G3DL2) domains together, and coregroup and stacks on CMU_G3D's gates.

The operating points are the shader rates of the 9a's GPU DVFS table up
to 649 MHz. The levels above it, to 940 MHz, wait for a GPU thermal
zone, since nothing throttles the GPU yet.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Give the three CPU clusters their ACPM DVFS clocks (cpucl0-2, by the
zumapro ACPM clock ids) and operating points for cpufreq-dt, with
capacities and power coefficients for the energy model from Google's
zumapro-cpu.dtsi, and add the ACPM TMU sensor and the big, mid, little
and GPU thermal zones.

The CPU levels are the APM firmware's own (its DVFS table, read on the
Pixel 9a), up to the 9a's thermal headroom: 1950 MHz little (Google's
max-freq for that cluster), 2367 MHz mid and 2687 MHz big. The little
cluster's 324 and 610 MHz lie below stock's 820 MHz floor. Each CPU zone
throttles its cluster from 80 C, forces the cluster's lowest levels
from 95 C and shuts down at 105 C, all below stock's 112 C (CPU) and
115 C (GPU) hot trips. gpu-thermal throttles panthor's devfreq from
85 C.

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

With gpu-thermal throttling the GPU, add the 9a's GPU levels above 649
MHz: 723, 807, 850 and 890 MHz. The table's top, 940 MHz, stays out
until it has run on the 9a.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Tensor G4 (zumapro) display pipeline has the gs201 DSIM, at the same
register layout and with the same three register windows. Add
google,zumapro-dsim with google,gs201-dsim as its fallback.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Add DSIM0, the DSI master between DECON0 and the panel: its link and
D-PHY register windows and its interrupt (GIC SPI 252), as in Google's
GPL zumapro device tree, disabled until a board names its panel.

Link: https://android.googlesource.com/kernel/devices/google/zumapro/+/8831630eee2ad095b85ed452944e6353940966a5/dts/zumapro.dtsi
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Turn on the Pixel 9a's display pipeline: DECON0 with a 64 MiB reusable
scanout pool below 4 GiB and the bootloader's splash as its boot
framebuffer, scanning out to DSIM0, and the TG4C panel on DSIM0's
virtual channel 0. With DECON's output on DSIM0, gs-decon switches the
link and the panel between 60 and 120 Hz.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Add the Pixel 9a's haptics, a Cirrus Logic CS40L26 on USI9's I2C bus
(0x43, interrupt on gpa6-3, reset on gph2-3), with Google's limits for
its LRA (2.5 A boost peak, 10 V boost, 162 Hz, ReDC 14.1 ohm) and VP
brownout prevention at 3.008 V, and its torch, a TI LM3644 on USI4's
I2C bus (0x63, enable on gpp24-1) driving one white LED from both
outputs, limited to 75 mA.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Tensor G3/G4 PMU (google,zuma-pmu) gates the NFC controller's
reference clock pad. Say what #clock-cells numbers there: clock 0 is
that pad.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Pixel 9a's NFC controller (an ST54L) asks the SoC for its reference
clock on a CLK_REQ line, which reaches the controller only once the PMU
follows that line: PMU 0x3e84 bit 16 (EXTPAD_EN), which Google's st21nfc
driver sets from its DT (pmu_clk_pad = <0x3e84>, st,extpad_control_en).
Without it the controller doesn't ACK its I2C address.

When the zuma PMU's node has #clock-cells, register that bit as clock 0,
a gate written through the SMC-backed regmap, and add the register to
zuma's access table.

Tested on the Pixel 9a (7.3.0-rc6-omamobile-tegu-s2mpg15-m1, with this
clock and the NFC node's clocks = <&pmu_system_controller 0>): the clock
is enabled by nxp-nci's probe (clk_summary: zuma_pmu_nfc_clk_pad, 25-0008),
the controller answers CORE_RESET and polls, with no other code touching
the pad.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Some boards gate the controller's reference clock, or the SoC pad it
comes from, in a clock provider: the Pixel 9a's ST54L takes its clock
from a pad the PMU enables. Allow one clock.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Take an optional clock and keep it enabled while the device is bound, for
boards whose controller clock (or the pad it comes from) is gated: the
Pixel 9a's ST54L needs the PMU's NFC clock pad.

Tested on the Pixel 9a: the clock is enabled at probe and the
controller answers and polls.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The zuma PMU provides the NFC controller's clock pad as clock 0; give its
node #clock-cells.

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The Pixel 9a's ST54L sits at 0x08 on hsi2c9, its interrupt on gpa7-5
(level high), its RST_N on gph1-6, and its reference clock from the PMU's
clock pad. Its chip enable (gpa0-1) powers the whole chip and is held
high by a hog: stock's eSE driver raises it, and nothing here drives the
eSE.

Tested on the Pixel 9a: the controller probes on nxp-nci, polls and reads
a contactless card (ISO-DEP over NFC-A) through neard.

Link: https://android.googlesource.com/kernel/devices/google/tegu/+/6276884d9940694b25a6934671918ec8ac412ee8/dts/zuma-tegu-nfc.dtsi
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
The region stock uses for ramoops was only reserved, because zuma's
user-build bootloader doesn't keep it across a warm reset. zumapro's
does: on the Pixel 9a, after a hang that ended in a watchdog reset,
the console zone held the previous kernel's log up to the hang (after
the bootloader's own log, which it writes at the start of the zone).

Describe it as ramoops with stock zumapro's layout, which every other
Google board in this tree also uses: console-size 0x200000 and pmsg-size
0x200000, with no record-size, so the console zone starts where the
bootloader writes its log.

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

The Pixel 9a's MAX77779 sits on hsi2c6 (USI6, pins gpp12-0/1, 950 kHz as
stock): its fuel gauge at 0x36 with the board's 2 mOhm shunt, and its
USB-C port controller at 0x25, interrupting on gpa8-3 (active low, as
stock's max77759tcpc@25). The port is described as a sink with a dual
data role and is not linked to the USB controller's role switch yet:
the USB controller stays a peripheral, as today.

gpa8 becomes an interrupt controller with its four EINT SPIs (44-47).

Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
USI10 on PERIC1 carries the Pixel 9a's RT9470 (the USB OTG boost) at
0x5b. Add the USI and its HSI2C controller, disabled, with the clocks
from CMU_PERIC1 (merged as "clk: samsung: zumapro: Add the PERIC1 USI10
clocks"), PERIC1 sysreg offset 0x8 and GIC SPI 658. The board enables
it with its pins.

Google's zumapro-usi.dtsi describes hsi2c_10 at 0x10CA0000 with
IRQ_USI10_USI_PERIC1, SCL and SDA on gpp20-0 and gpp20-1, and the USI
at sysreg_peric1 offset 0x8; the header defines IRQ_USI10_USI_PERIC1 as
SPI 658. On the Pixel 9a the node, enabled by the board, bound hsi2c10
and talked to the RT9470.

Link: https://android.googlesource.com/kernel/devices/google/zumapro/+/8831630eee2ad095b85ed452944e6353940966a5/dts/zumapro-usi.dtsi
Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/include/dt-bindings/interrupt-controller/zumapro.h
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
SPI21 carries the GNSS link to the modem's GNSS core. The node has no
pinctrl, so the bus has run on the bootloader's pin state: gpp22-0..3 in
function 2 at drive strength 0, gpp22-2 (the data in) pulled down.

At that drive the link was marginal: frames arrived intact only some of
the time and the receiver never got far. With the pins at drive 3, as
the other SPI bus on this pin controller (gpp21) is set, received frames
pass their CRC, and with the flush-order fix in spi-s3c64xx the receiver
gets a position fix.

Describe the pins, keep the pulls as the bootloader leaves them, and use
drive 3. The node stays disabled until the GNSS driver is in.

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

Copy link
Copy Markdown
Contributor Author

Rebased onto #136's new head (one commit, unchanged). Compiles; checkpatch clean.

@derekross

Copy link
Copy Markdown
Owner

Thanks for tracking the link down; the fix is great news. Before this goes in, I think gpp22 belongs to another controller: in Google's tegu tree (android-gs-tegu-6.1-android16), zuma-tegu-ese.dtsi uses gpp22-0..3 as SPI15 for the eSE (chip select on gpp22-3), and stock's SPI21 (HSI0 USI3) has no pin group in either iGNSS file. Could you check whether the CRC improvement still holds with #150 alone, at drive 0? If it does, I'd drop this commit rather than claim the eSE's pins for SPI21.

@W4HO-ham

Copy link
Copy Markdown
Contributor Author

You were right, and the test says so cleanly. One boot without this commit's overlay, so gpp22-0..3 back at the bootloader's drive 0 (read from the pin controller: DRV(0x0) on all four), with #150 alone:

  • every received read that holds a frame sits at bit offset 0 with a valid CRC32: 41 of 41;
  • 50 of 53 GGA sentences fixed in a 3-minute session, 0 bad checksums, 0 ACK timeouts, 0 permanent failures.

That is the same quality as with the pins at drive 3, so the improvement I attributed to the drive was #150's doing all along. Given your reading of Google's tegu tree (gpp22 is the eSE's SPI15, with its chip select on gpp22-3, and stock's SPI21 has no pin group), I'm closing this rather than claim those pins for SPI21. The plan and the AGENTS gotcha that leaned on this are being corrected now: the data was marginal because of the flush order, not the drive.

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.

2 participants