diff mbox series

[1/1] board/raspberrypi: fix autoprobing of bluetooth driver

Message ID 20231120214150.671145-1-gael.portay@rtone.fr
State Accepted
Headers show
Series [1/1] board/raspberrypi: fix autoprobing of bluetooth driver | expand

Commit Message

Gael PORTAY Nov. 20, 2023, 9:41 p.m. UTC
The commit 689b9ac439 (package/rpi-firmware: rework boot/config file
handling) has split in two the property:

	dtoverlay=miniuart-bt,krnbt=on

Into:

	dtoverlay=miniuart-bt
	dtoverlay=krnbt=on

The initial property contained the dtbo file miniuart-bt[1] and its
parameter krnbt=on[2][3].

The first syntax is correct while the second is not. The krnbt=on is not
a dtoverlay[4] but a dtparam[5]. Therefore the property dtparam must be
used instead.

This fixes:

	# cat /sys/firmware/devicetree/base/chosen/user-warnings
	Failed to load overlay 'krnbt=on'

[1]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
[2]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L91
[3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215
[4]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay
[5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtparam

Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>
---
 board/raspberrypi/config_0w.txt      | 2 +-
 board/raspberrypi/config_3.txt       | 2 +-
 board/raspberrypi/config_3_64bit.txt | 2 +-
 board/raspberrypi/config_4.txt       | 2 +-
 board/raspberrypi/config_4_64bit.txt | 2 +-
 board/raspberrypi/config_zero2w.txt  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

--
2.42.1

Comments

Peter Seiderer Nov. 20, 2023, 10:11 p.m. UTC | #1
Hello *,

On Mon, 20 Nov 2023 22:41:50 +0100, Gaël PORTAY <gael.portay@rtone.fr> wrote:

> The commit 689b9ac439 (package/rpi-firmware: rework boot/config file
> handling) has split in two the property:
> 
> 	dtoverlay=miniuart-bt,krnbt=on
> 
> Into:
> 
> 	dtoverlay=miniuart-bt
> 	dtoverlay=krnbt=on
> 
> The initial property contained the dtbo file miniuart-bt[1] and its
> parameter krnbt=on[2][3].
> 
> The first syntax is correct while the second is not. The krnbt=on is not
> a dtoverlay[4] but a dtparam[5]. Therefore the property dtparam must be
> used instead.
> 
> This fixes:
> 
> 	# cat /sys/firmware/devicetree/base/chosen/user-warnings
> 	Failed to load overlay 'krnbt=on'
> 
> [1]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
> [2]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L91
> [3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215
> [4]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay
> [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtparam
> 
> Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>
> ---
>  board/raspberrypi/config_0w.txt      | 2 +-
>  board/raspberrypi/config_3.txt       | 2 +-
>  board/raspberrypi/config_3_64bit.txt | 2 +-
>  board/raspberrypi/config_4.txt       | 2 +-
>  board/raspberrypi/config_4_64bit.txt | 2 +-
>  board/raspberrypi/config_zero2w.txt  | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt
> index 195bad449e..bc59d5fad2 100644
> --- a/board/raspberrypi/config_0w.txt
> +++ b/board/raspberrypi/config_0w.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt
> index 195bad449e..bc59d5fad2 100644
> --- a/board/raspberrypi/config_3.txt
> +++ b/board/raspberrypi/config_3.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt
> index 34412fa9e8..6672871125 100644
> --- a/board/raspberrypi/config_3_64bit.txt
> +++ b/board/raspberrypi/config_3_64bit.txt
> @@ -26,7 +26,7 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> 
>  # enable 64bits support
>  arm_64bit=1
> diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt
> index ea02d3f071..74a7b270cd 100644
> --- a/board/raspberrypi/config_4.txt
> +++ b/board/raspberrypi/config_4.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt
> index 41c7e97e99..2a9814274f 100644
> --- a/board/raspberrypi/config_4_64bit.txt
> +++ b/board/raspberrypi/config_4_64bit.txt
> @@ -26,7 +26,7 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> 
>  dtoverlay=vc4-kms-v3d-pi4
>  dtoverlay=imx219
> diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt
> index 9e6b7f5ccf..55095f64a7 100644
> --- a/board/raspberrypi/config_zero2w.txt
> +++ b/board/raspberrypi/config_zero2w.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> --
> 2.42.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

...alternative patch (removing the failing line) already suggested, see [6] for
details and reasoning...

Regards,
Peter

[6] https://patchwork.ozlabs.org/project/buildroot/patch/20230808180959.28091-2-ps.report@gmx.net/
Yann E. MORIN Nov. 27, 2023, 6:40 p.m. UTC | #2
Gaël, All,

On 2023-11-20 22:41 +0100, Gaël PORTAY spake thusly:
> The commit 689b9ac439 (package/rpi-firmware: rework boot/config file
> handling) has split in two the property:
> 
> 	dtoverlay=miniuart-bt,krnbt=on
> 
> Into:
> 
> 	dtoverlay=miniuart-bt
> 	dtoverlay=krnbt=on
> 
> The initial property contained the dtbo file miniuart-bt[1] and its
> parameter krnbt=on[2][3].
> 
> The first syntax is correct while the second is not. The krnbt=on is not
> a dtoverlay[4] but a dtparam[5]. Therefore the property dtparam must be
> used instead.
> 
> This fixes:
> 
> 	# cat /sys/firmware/devicetree/base/chosen/user-warnings
> 	Failed to load overlay 'krnbt=on'
> 
> [1]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
> [2]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L91
> [3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215
> [4]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay
> [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtparam
> 
> Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  board/raspberrypi/config_0w.txt      | 2 +-
>  board/raspberrypi/config_3.txt       | 2 +-
>  board/raspberrypi/config_3_64bit.txt | 2 +-
>  board/raspberrypi/config_4.txt       | 2 +-
>  board/raspberrypi/config_4_64bit.txt | 2 +-
>  board/raspberrypi/config_zero2w.txt  | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt
> index 195bad449e..bc59d5fad2 100644
> --- a/board/raspberrypi/config_0w.txt
> +++ b/board/raspberrypi/config_0w.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt
> index 195bad449e..bc59d5fad2 100644
> --- a/board/raspberrypi/config_3.txt
> +++ b/board/raspberrypi/config_3.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt
> index 34412fa9e8..6672871125 100644
> --- a/board/raspberrypi/config_3_64bit.txt
> +++ b/board/raspberrypi/config_3_64bit.txt
> @@ -26,7 +26,7 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> 
>  # enable 64bits support
>  arm_64bit=1
> diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt
> index ea02d3f071..74a7b270cd 100644
> --- a/board/raspberrypi/config_4.txt
> +++ b/board/raspberrypi/config_4.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt
> index 41c7e97e99..2a9814274f 100644
> --- a/board/raspberrypi/config_4_64bit.txt
> +++ b/board/raspberrypi/config_4_64bit.txt
> @@ -26,7 +26,7 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> 
>  dtoverlay=vc4-kms-v3d-pi4
>  dtoverlay=imx219
> diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt
> index 9e6b7f5ccf..55095f64a7 100644
> --- a/board/raspberrypi/config_zero2w.txt
> +++ b/board/raspberrypi/config_zero2w.txt
> @@ -26,4 +26,4 @@ gpu_mem_1024=100
>  dtoverlay=miniuart-bt
> 
>  # enable autoprobing of Bluetooth driver without need of hciattach/btattach
> -dtoverlay=krnbt=on
> +dtparam=krnbt=on
> --
> 2.42.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN Nov. 27, 2023, 6:45 p.m. UTC | #3
Peter, All,

On 2023-11-20 23:11 +0100, Peter Seiderer spake thusly:
> On Mon, 20 Nov 2023 22:41:50 +0100, Gaël PORTAY <gael.portay@rtone.fr> wrote:
> > The commit 689b9ac439 (package/rpi-firmware: rework boot/config file
> > handling) has split in two the property:
> > 	dtoverlay=miniuart-bt,krnbt=on
> > Into:
> > 	dtoverlay=miniuart-bt
> > 	dtoverlay=krnbt=on
[--SNIP--]
> ...alternative patch (removing the failing line) already suggested, see [6] for
> details and reasoning...
> [6] https://patchwork.ozlabs.org/project/buildroot/patch/20230808180959.28091-2-ps.report@gmx.net/

Thanks for the heads-up on that patch, I'll look into it now: It states
"as no one complained since 2021 just drop it" but Gaël noticed now, so
it makes sense to apply his patch now.

Regards,
Yann E. MORIN.
Gael PORTAY Nov. 27, 2023, 7:44 p.m. UTC | #4
Hello Yann, All,

On Mon Nov 27, 2023 at 7:45 PM CET, Yann E. MORIN wrote:
> Peter, All,
>
> On 2023-11-20 23:11 +0100, Peter Seiderer spake thusly:
> > On Mon, 20 Nov 2023 22:41:50 +0100, Gaël PORTAY <gael.portay@rtone.fr> wrote:
> > > The commit 689b9ac439 (package/rpi-firmware: rework boot/config file
> > > handling) has split in two the property:
> > > 	dtoverlay=miniuart-bt,krnbt=on
> > > Into:
> > > 	dtoverlay=miniuart-bt
> > > 	dtoverlay=krnbt=on
> [--SNIP--]
> > ...alternative patch (removing the failing line) already suggested, see [6] for
> > details and reasoning...
> > [6] https://patchwork.ozlabs.org/project/buildroot/patch/20230808180959.28091-2-ps.report@gmx.net/
>
> Thanks for the heads-up on that patch, I'll look into it now: It states
> "as no one complained since 2021 just drop it" but Gaël noticed now, so
> it makes sense to apply his patch now.
>
> Regards,
> Yann E. MORIN.

Yann, sorry for that late post, but you may also consider that one[1]
for the consistency.

And right, these lines should get removed after the bump of the pi
kernel[2] since the krnbt=on is now the default behaviour.

Regards,
Gaël

[1]: https://patchwork.ozlabs.org/project/buildroot/patch/20231127192455.2822374-1-gael.portay@rtone.fr/
[2]: https://patchwork.ozlabs.org/project/buildroot/list/?series=380671
Peter Korsgaard Nov. 30, 2023, 8:30 a.m. UTC | #5
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Gaël, All,
 > On 2023-11-20 22:41 +0100, Gaël PORTAY spake thusly:
 >> The commit 689b9ac439 (package/rpi-firmware: rework boot/config file
 >> handling) has split in two the property:
 >> 
 >> dtoverlay=miniuart-bt,krnbt=on
 >> 
 >> Into:
 >> 
 >> dtoverlay=miniuart-bt
 >> dtoverlay=krnbt=on
 >> 
 >> The initial property contained the dtbo file miniuart-bt[1] and its
 >> parameter krnbt=on[2][3].
 >> 
 >> The first syntax is correct while the second is not. The krnbt=on is not
 >> a dtoverlay[4] but a dtparam[5]. Therefore the property dtparam must be
 >> used instead.
 >> 
 >> This fixes:
 >> 
 >> # cat /sys/firmware/devicetree/base/chosen/user-warnings
 >> Failed to load overlay 'krnbt=on'
 >> 
 >> [1]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 >> [2]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L91
 >> [3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215
 >> [4]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay
 >> [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtparam
 >> 
 >> Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>

 > Applied to master, thanks.

Committed to 2023.02.x and 2023.08.x, thanks.
diff mbox series

Patch

diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt
index 195bad449e..bc59d5fad2 100644
--- a/board/raspberrypi/config_0w.txt
+++ b/board/raspberrypi/config_0w.txt
@@ -26,4 +26,4 @@  gpu_mem_1024=100
 dtoverlay=miniuart-bt

 # enable autoprobing of Bluetooth driver without need of hciattach/btattach
-dtoverlay=krnbt=on
+dtparam=krnbt=on
diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt
index 195bad449e..bc59d5fad2 100644
--- a/board/raspberrypi/config_3.txt
+++ b/board/raspberrypi/config_3.txt
@@ -26,4 +26,4 @@  gpu_mem_1024=100
 dtoverlay=miniuart-bt

 # enable autoprobing of Bluetooth driver without need of hciattach/btattach
-dtoverlay=krnbt=on
+dtparam=krnbt=on
diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt
index 34412fa9e8..6672871125 100644
--- a/board/raspberrypi/config_3_64bit.txt
+++ b/board/raspberrypi/config_3_64bit.txt
@@ -26,7 +26,7 @@  gpu_mem_1024=100
 dtoverlay=miniuart-bt

 # enable autoprobing of Bluetooth driver without need of hciattach/btattach
-dtoverlay=krnbt=on
+dtparam=krnbt=on

 # enable 64bits support
 arm_64bit=1
diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt
index ea02d3f071..74a7b270cd 100644
--- a/board/raspberrypi/config_4.txt
+++ b/board/raspberrypi/config_4.txt
@@ -26,4 +26,4 @@  gpu_mem_1024=100
 dtoverlay=miniuart-bt

 # enable autoprobing of Bluetooth driver without need of hciattach/btattach
-dtoverlay=krnbt=on
+dtparam=krnbt=on
diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt
index 41c7e97e99..2a9814274f 100644
--- a/board/raspberrypi/config_4_64bit.txt
+++ b/board/raspberrypi/config_4_64bit.txt
@@ -26,7 +26,7 @@  gpu_mem_1024=100
 dtoverlay=miniuart-bt

 # enable autoprobing of Bluetooth driver without need of hciattach/btattach
-dtoverlay=krnbt=on
+dtparam=krnbt=on

 dtoverlay=vc4-kms-v3d-pi4
 dtoverlay=imx219
diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt
index 9e6b7f5ccf..55095f64a7 100644
--- a/board/raspberrypi/config_zero2w.txt
+++ b/board/raspberrypi/config_zero2w.txt
@@ -26,4 +26,4 @@  gpu_mem_1024=100
 dtoverlay=miniuart-bt

 # enable autoprobing of Bluetooth driver without need of hciattach/btattach
-dtoverlay=krnbt=on
+dtparam=krnbt=on