Repository navigation
arm64: dts: exynos: google: zuma-husky: Bluetooth on the APM UART - #199
Conversation
e9521f1 to
8664827
Compare
|
Thank you, @Somnius, this is a lovely, careful PR. I checked every value against Google's tree. The UART at A few things before it goes in:
Smaller, optional ones: upstream will want the bindings commit split by subsystem ( Thanks again. Bluetooth audio on the 8 Pro is a big step! |
…SYSREG clocks The Pixel 8 Pro's Bluetooth chip sits on the APM's USI1 UART at 0x155d0000. Its divider and gates are at the same CMU_APM offsets as Google's GPL zuma cal-if (cmucal-sfr.c: DIV_CLK_APM_USI1_UART 0x1818, IPCLK 0x20f4, PCLK 0x20f8, RSTNSYNC 0x2148, SYSREG_APM 0x2168). Signed-off-by: Lef <me@lefteros.com>
The sysreg of the Tensor G3's APM block, which holds the USI mode selectors; the Pixel 8 Pro's Bluetooth UART needs it. Signed-off-by: Lef <me@lefteros.com>
The zuma UART, for the APM USI1 UART that the Pixel 8 Pro's Bluetooth chip sits on (0x155d0000). Signed-off-by: Lef <me@lefteros.com>
Read-only, as the rest of CMU_APM. Offsets from Google's GPL zuma cal-if (cmucal-sfr.c), which match clk-zumapro.c's for the same blocks: USI1 UART divider 0x1818 (7 bits, parent the APM function gate), IPCLK 0x20f4 and RSTNSYNC 0x2148 behind it, PCLK 0x20f8 and SYSREG 0x2168 on the NOC divider. Tested on a Pixel 8 Pro with the Bluetooth board commit of this series on top: the UART comes up and the controller answers. Signed-off-by: Lef <me@lefteros.com>
usi_apm1 at 0x155d00c0 with uart18 at 0x155d0000, interrupt 71 (Google's zuma-usi.dtsi, IRQ_APM_USI1_UART_INT_ALIVE), on the pattern of zumapro's and of USI9 here. Both stay disabled; a board enables them. Signed-off-by: Lef <me@lefteros.com>
The Pixel 8 Pro's Bluetooth is a BCM4398. hci_bcm has no data of its own for it and uses the BCM4389's, so the compatible names the chip and falls back to brcm,bcm4389-bt, the same form as infineon,cyw43439-bt. No driver change is needed. Also mention the BCM4398 next to the Pixel 9a's BCM4383 in the description of brcm,ble-dbo-gpios, as it latches BT_REG_ON the same way. Signed-off-by: Lef <me@lefteros.com>
The Pixel 8 Pro's Bluetooth is the BCM4398D0 on the APM's USI1 UART (uart18, 0x155d0000), as in Google's GPL zuma-board-bluetooth.dtsi: - BT_REG_ON gpn8-0, BT_DEV_WAKE gpn9-0, BT_HOST_WAKE gpn6-0 (rising edge); - the UART pads gpa3-0 to gpa3-3 in function 2 (Google's uart18_bus); - gpp24-3 as brcm,ble-dbo-gpios: BT_REG_ON reaches the chip through a flip-flop clocked by it, as on the 9a, and hci_bcm already clocks it. Without the pads or the latch the chip never answers the first command (0xfc18 tx timeout, then Reset failed -110). The compatible names the BCM4398 with the BCM4389 as fallback, as hci_bcm has no BCM4398 entry; the fallback only adds the 30 ms wait. Tested on a Pixel 8 Pro with 7.3.0-rc6 and the stock BCM.hcd installed as brcm/BCM.google,zuma-husky.hcd: hci0 comes up as "BCM4398D0 G5SN_V17_HK3 REL BR:0169 FW:b8718197dc", discovery finds devices, and a pair of Soundcore A40 headphones paired and played YouTube over A2DP. Not tested: calls (HFP), mice and keyboards, suspend, power draw. The controller keeps a placeholder address until userspace sets the one in /chosen/config/bt_addr. Signed-off-by: Lef <me@lefteros.com>
|
@derekross thank you. Reworked on today's What changed: the bindings are split by subsystem (the clock header,
Still to add, from a boot of the combined #199 and #200 tree on |
8664827 to
69977ef
Compare
|
I booted the combined tree (origin/omamobile + #199 + #200, merge b0fb5bc, tag husky-test-20261106-pr199-200 on my fork) on my 8 Pro. uname -r 7.3.0-rc6-omamobile-push1-gb0fb5bccb3d6, it was up 223 s when I ran tools/phone-smoke and all the required checks passed. Blob ids at that commit:
Bluetooth side: hci0 shows up and phone-smoke says powered true. I only checked that it registers and powers on. dmesg also has a lot of |
|
Thanks for the quick rework, @Somnius. I went through it point by point. The compatible now names the BCM4398 with the BCM4389 as its fallback, the bindings are split by subsystem, and the comments are wrapped. I fetched One small thing before I merge: could you paste the Optional, if you touch it again: the edited This one goes in first, then #200 after its rebase. Thank you! |
|
@derekross here is the Kernel
|
|
Thank you, @Somnius. That's the report I wanted, and thanks for saying it was recovered rather than re-run. The release matches the test integration of this PR and #200 that I checked before, the boot comes after both heads, and the two "not ok" rows are the missing GPU node on that tree and your own local units, nothing from this series. I also checked that it still merges cleanly onto today's |
Bluetooth on the Pixel 8 Pro. It comes up, pairs and plays audio.
The chip is the BCM4398D0, the Bluetooth half of the Wi-Fi combo, on the APM's USI1 UART (0x155d0000, IRQ 71). Everything comes from Google's GPL zuma tree (
zuma-usi.dtsi,zuma-board-bluetooth.dtsi,zuma-pinctrl.dtsi,cmucal-sfr.c), built the way the 9a, the 7 Pro and the 6 Pro already do it.4 commits:
google,zuma-apm-sysregandgoogle,zuma-uart.clk-zumapro.c.sysreg_apm,usi_apm1,uart18, all disabled.brcm,ble-dbo-gpios, which Bluetooth: hci_bcm: Add the BCM4383 and its REG_ON latch (Pixel 9a) #94 already handles for the 9a).Two things were needed that I missed at first: without the pads and without the latch the chip never answered (
command 0xfc18 tx timeout, thenReset failed -110). The compatible isbrcm,bcm4389-bt, sincehci_bcmhas no BCM4398 entry; it only adds the 30 ms wait.Tested on my 8 Pro with 7.3.0-rc6 (the e1 kernel, so Brett's tag plus my own commits, not plain
omamobile), with the stockBCM.hcdinstalled asbrcm/BCM.google,zuma-husky.hcdfrom my own phone's vendor image (not in the repo). dmesg:BCM4398D0 G5SN_V17_HK3 REL BR:0169 FW:b8718197dc,hci0up, discovery finds devices, and my Soundcore A40 headphones paired and played YouTube in Chromium over A2DP.On the current
omamobilebranch the series applies andclk-zuma.oandzuma-husky.dtbbuild, but I did not boot that exact tree, and I did not rundt_binding_check/dtbs_check.Not tested: calls (HFP), mice and keyboards, suspend, power draw. The controller keeps a placeholder address until userspace sets the one in
/chosen/config/bt_addr(I tested that by hand with the 7 Pro'somamobile-bt-addr; the husky device package needs it, separate PR). Whether the BCM4389 entry is the right one for the BCM4398 long term is open.