diff mbox series

arm64: dts: rockchip: nanopi4: decrease Bluetooth UART baud rate

Message ID 20210920175647.13008-1-wens@kernel.org (mailing list archive)
State New
Headers show
Series arm64: dts: rockchip: nanopi4: decrease Bluetooth UART baud rate | expand

Commit Message

Chen-Yu Tsai Sept. 20, 2021, 5:56 p.m. UTC
From: Chen-Yu Tsai <wens@csie.org>

The RK3399 does not seem to be able to properly generate the required
64 MHz clock for the UART to operate at 4MBd.

Drop the baud rate down to 3MBd, which can be used as the clock
controller is able to produce a 48 MHz clock.

Fixes: 3e2f0bb72be3 ("arm64: dts: rockchip: Add nanopi4 bluetooth")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Robin Murphy Oct. 6, 2021, 10:49 a.m. UTC | #1
On 2021-09-20 18:56, Chen-Yu Tsai wrote:
> From: Chen-Yu Tsai <wens@csie.org>
> 
> The RK3399 does not seem to be able to properly generate the required
> 64 MHz clock for the UART to operate at 4MBd.
> 
> Drop the baud rate down to 3MBd, which can be used as the clock
> controller is able to produce a 48 MHz clock.

Hmm, I've been running mine this way (with DMA) for ages now :/

Looking at clk_summary, clk_uart0_src ends up at 800MHz off CPLL (same 
as several other significant clocks), with clk_uart0 at an exact 64MHz 
as a division of that. I stuck a scope on the UART pins of the module 
and all the edges look nicely lined up to 250ns intervals.

This is with a 5.11.4 kernel, though - I wonder if the recent fractional 
divider changes in the clock driver have changed anything?

Robin.

> Fixes: 3e2f0bb72be3 ("arm64: dts: rockchip: Add nanopi4 bluetooth")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>   arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> index 8c0ff6c96e03..45ff053b119d 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> @@ -699,7 +699,7 @@ bluetooth {
>   		device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
>   		host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
>   		shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
> -		max-speed = <4000000>;
> +		max-speed = <3000000>;
>   		pinctrl-names = "default";
>   		pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>;
>   		vbat-supply = <&vcc3v3_sys>;
>
Chen-Yu Tsai Oct. 7, 2021, 5:13 p.m. UTC | #2
On Wed, Oct 6, 2021 at 6:49 PM Robin Murphy <robin.murphy@arm.com> wrote:
>
> On 2021-09-20 18:56, Chen-Yu Tsai wrote:
> > From: Chen-Yu Tsai <wens@csie.org>
> >
> > The RK3399 does not seem to be able to properly generate the required
> > 64 MHz clock for the UART to operate at 4MBd.
> >
> > Drop the baud rate down to 3MBd, which can be used as the clock
> > controller is able to produce a 48 MHz clock.
>
> Hmm, I've been running mine this way (with DMA) for ages now :/

I guess you have extra patches on top for DMA? I sent another patch
to hook up DMA.

> Looking at clk_summary, clk_uart0_src ends up at 800MHz off CPLL (same
> as several other significant clocks), with clk_uart0 at an exact 64MHz
> as a division of that. I stuck a scope on the UART pins of the module
> and all the edges look nicely lined up to 250ns intervals.

Could you provide a partial dump of /sys/kernel/debug/clk/clk_summary ?
Just the bits related to uart0 should be enough.

Mine is also running from CPLL, but ends up at 1843200 Hz, which seems
like the clock rate used for 115200 baud:

 xin24m                              24       24        0    24000000
        0     0  50000         Y
    pll_cpll                          1        1        0   800000000
        0     0  50000         Y
       cpll                           7       15        0   800000000
        0     0  50000         Y
          clk_uart0_src               1        1        0   800000000
        0     0  50000         Y
             clk_uart0_div            1        1        0   800000000
        0     0  50000         Y
                clk_uart0_frac        1        1        0     1843200
        0     0  50000         Y
                   clk_uart0          1        1        0     1843200
        0     0  50000         Y

I also observe a couple error messages:

Bluetooth: hci0: BCM: failed to write clock (-56)
Bluetooth: hci0: Failed to set baudrate
Bluetooth: hci0: BCM: chip id 130
Bluetooth: hci0: BCM: features 0x0f
Bluetooth: hci0: BCM4345C5
Bluetooth: hci0: BCM4345C5 (003.006.006) build 0000
Bluetooth: hci0: BCM4345C5 'brcm/BCM4345C5.hcd' Patch
Bluetooth: hci0: BCM: failed to write clock (-56)
Bluetooth: hci0: BCM4345C5 Ampak_CL1.5 UART 37.4 MHz BT 5.0 [Version:
Version: 0033.0080]
Bluetooth: hci0: BCM4345C5 (003.006.006) build 0080

So I think my UART is actually still running at its initial speed.

Another thing is that the Rockchip datasheet says something about the
denominator has to be 20 times larger than the nominator for a stable clock.

> This is with a 5.11.4 kernel, though - I wonder if the recent fractional
> divider changes in the clock driver have changed anything?

I tried reverting the three patches but that didn't make a difference.

Regards
ChenYu


>
> > Fixes: 3e2f0bb72be3 ("arm64: dts: rockchip: Add nanopi4 bluetooth")
> > Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> > ---
> >   arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> > index 8c0ff6c96e03..45ff053b119d 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
> > @@ -699,7 +699,7 @@ bluetooth {
> >               device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
> >               host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
> >               shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
> > -             max-speed = <4000000>;
> > +             max-speed = <3000000>;
> >               pinctrl-names = "default";
> >               pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>;
> >               vbat-supply = <&vcc3v3_sys>;
> >
Robin Murphy Oct. 20, 2021, 12:57 p.m. UTC | #3
On 2021-10-07 18:13, Chen-Yu Tsai wrote:
> On Wed, Oct 6, 2021 at 6:49 PM Robin Murphy <robin.murphy@arm.com> wrote:
>>
>> On 2021-09-20 18:56, Chen-Yu Tsai wrote:
>>> From: Chen-Yu Tsai <wens@csie.org>
>>>
>>> The RK3399 does not seem to be able to properly generate the required
>>> 64 MHz clock for the UART to operate at 4MBd.
>>>
>>> Drop the baud rate down to 3MBd, which can be used as the clock
>>> controller is able to produce a 48 MHz clock.
>>
>> Hmm, I've been running mine this way (with DMA) for ages now :/
> 
> I guess you have extra patches on top for DMA? I sent another patch
> to hook up DMA.

Indeed I've been using Katsuhiro's patch from ages ago:

https://lore.kernel.org/linux-rockchip/20190321162244.10080-1-katsuhiro@katsuster.net/

Heiko - as far as I'm aware pl330 still isn't hooked up to virt-dma; I 
think the core change to avoid using DMA for the console UART has merely 
mitigated the issue by leaving just enough channels available for "most" 
use-cases.

>> Looking at clk_summary, clk_uart0_src ends up at 800MHz off CPLL (same
>> as several other significant clocks), with clk_uart0 at an exact 64MHz
>> as a division of that. I stuck a scope on the UART pins of the module
>> and all the edges look nicely lined up to 250ns intervals.
> 
> Could you provide a partial dump of /sys/kernel/debug/clk/clk_summary ?
> Just the bits related to uart0 should be enough.
> 
> Mine is also running from CPLL, but ends up at 1843200 Hz, which seems
> like the clock rate used for 115200 baud:
> 
>   xin24m                              24       24        0    24000000
>          0     0  50000         Y
>      pll_cpll                          1        1        0   800000000
>          0     0  50000         Y
>         cpll                           7       15        0   800000000
>          0     0  50000         Y
>            clk_uart0_src               1        1        0   800000000
>          0     0  50000         Y
>               clk_uart0_div            1        1        0   800000000
>          0     0  50000         Y
>                  clk_uart0_frac        1        1        0     1843200
>          0     0  50000         Y
>                     clk_uart0          1        1        0     1843200
>          0     0  50000         Y
> 
> I also observe a couple error messages:
> 
> Bluetooth: hci0: BCM: failed to write clock (-56)
> Bluetooth: hci0: Failed to set baudrate
> Bluetooth: hci0: BCM: chip id 130
> Bluetooth: hci0: BCM: features 0x0f
> Bluetooth: hci0: BCM4345C5
> Bluetooth: hci0: BCM4345C5 (003.006.006) build 0000
> Bluetooth: hci0: BCM4345C5 'brcm/BCM4345C5.hcd' Patch
> Bluetooth: hci0: BCM: failed to write clock (-56)
> Bluetooth: hci0: BCM4345C5 Ampak_CL1.5 UART 37.4 MHz BT 5.0 [Version:
> Version: 0033.0080]
> Bluetooth: hci0: BCM4345C5 (003.006.006) build 0080
> 
> So I think my UART is actually still running at its initial speed.

FWIW, with a functioning 5.14 kernel back on my board (5.15-rc4 couldn't 
even boot due to eMMC issues), nothing stands out except the lack of 
errors. However, looking again at said errors and digging in to 
bcm_set_baudrate(), it looks like it's actually the module itself being 
unhappy about the special command to update *its* clock, which then 
prevents the host baud rate from being changed from its initial 115200. 
The internet leads me to believe that BCM4345C5 is BCM43455 which is now 
CYW43555 whose datasheet says "UART baud rates up to 4 Mbps", so 
whatever the issue is it looks to be beyond the limit of my knowledge.

Poking around hci_bcm to see if there's any notable difference between 
the modules, I spotted commit e601daed271e mentioning issues with 
AP6256, so I wonder if using the "brcm,bcm4345c5" compatible as an 
override in the M4B DTS makes any difference?

If not, now that things seem to make a bit more sense it might be 
reasonable to tweak the speed for M4B as a workaround to avoid sending 
the offending command (since AP6356S as used on the other variants seems 
unaffected), unless Bluetooth people can shed any more light on why the 
module is unhappy about it.

Cheers,
Robin.

> Another thing is that the Rockchip datasheet says something about the
> denominator has to be 20 times larger than the nominator for a stable clock.
> 
>> This is with a 5.11.4 kernel, though - I wonder if the recent fractional
>> divider changes in the clock driver have changed anything?
> 
> I tried reverting the three patches but that didn't make a difference.
> 
> Regards
> ChenYu
> 
> 
>>
>>> Fixes: 3e2f0bb72be3 ("arm64: dts: rockchip: Add nanopi4 bluetooth")
>>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>>> ---
>>>    arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
>>> index 8c0ff6c96e03..45ff053b119d 100644
>>> --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
>>> @@ -699,7 +699,7 @@ bluetooth {
>>>                device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
>>>                host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
>>>                shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
>>> -             max-speed = <4000000>;
>>> +             max-speed = <3000000>;
>>>                pinctrl-names = "default";
>>>                pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>;
>>>                vbat-supply = <&vcc3v3_sys>;
>>>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 8c0ff6c96e03..45ff053b119d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -699,7 +699,7 @@  bluetooth {
 		device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
 		host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
 		shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
-		max-speed = <4000000>;
+		max-speed = <3000000>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>;
 		vbat-supply = <&vcc3v3_sys>;