[Buildroot] [PATCH 0/4] rock5b minor improvements

[Buildroot] [PATCH 0/4] rock5b minor improvements

[Niklas Cassel via buildroot]

From: Niklas Cassel <cassel@kernel.org>

Hello all,

Here are some minor improvements for the rock5b board that:
-Removes superfluous arguments on the kernel command line.
-Adds firmware for the onboard NIC to avoid errors in dmesg.

Kind regards,
Niklas

Niklas Cassel (4):
  board/radxa/rock5b: use PARTLABEL to specify rootfs
  board/radxa/rock5b: there is no need to specify rootfstype
  board/radxa/rock5b: do not let the kernel mount the rootfs as rw
  configs/rock5b: add firmware for the RTL8125 NIC

 board/radxa/rock5b/extlinux.conf | 2 +-
 configs/rock5b_defconfig         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.46.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/4] board/radxa/rock5b: use PARTLABEL to specify rootfs

[Niklas Cassel via buildroot]

From: Niklas Cassel <cassel@kernel.org>

This board has an optional eMMC module.

Use PARTLABEL to specify the rootfs, as this works regardless of the mmc
device probe order.

Signed-off-by: Niklas Cassel <cassel@kernel.org>
---
 board/radxa/rock5b/extlinux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf
index a1a531f038..8759d7491c 100644
--- a/board/radxa/rock5b/extlinux.conf
+++ b/board/radxa/rock5b/extlinux.conf
@@ -1,4 +1,4 @@
 label Radxa Rock 5b Linux
   kernel /boot/Image
   devicetree /boot/rk3588-rock-5b.dtb
-  append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait
+  append root=PARTLABEL=rootfs rw rootfstype=ext4 earlycon rootwait
-- 
2.46.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/4] board/radxa/rock5b: use PARTLABEL to specify rootfs

[Thomas Petazzoni via buildroot]

On Fri, 30 Aug 2024 12:13:24 +0200
Niklas Cassel via buildroot <buildroot@buildroot.org> wrote:

> diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf
> index a1a531f038..8759d7491c 100644
> --- a/board/radxa/rock5b/extlinux.conf
> +++ b/board/radxa/rock5b/extlinux.conf
> @@ -1,4 +1,4 @@
>  label Radxa Rock 5b Linux
>    kernel /boot/Image
>    devicetree /boot/rk3588-rock-5b.dtb
> -  append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait
> +  append root=PARTLABEL=rootfs rw rootfstype=ext4 earlycon rootwait

I'm wondering how this can work. Indeed the genimage.cfg file for this
board creates a MBR partition table, which doesn't have any
concept/space to store partition labels (unlike GPT partition tables).
And my understanding is that PARTLABEL is based on GPT partition
labels. So how can this work?

From the Linux kernel code:

 *      9) PARTLABEL=<name> with name being the GPT partition label.
 *         MSDOS partitions do not support labels!

Note that I would be fine with switching to a GPT partition table to
make this work.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/4] board/radxa/rock5b: use PARTLABEL to specify rootfs

[Niklas Cassel via buildroot]

Hello Thomas,

On Fri, Aug 30, 2024 at 06:56:13PM +0200, Thomas Petazzoni wrote:
> On Fri, 30 Aug 2024 12:13:24 +0200
> Niklas Cassel via buildroot <buildroot@buildroot.org> wrote:
> 
> > diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf
> > index a1a531f038..8759d7491c 100644
> > --- a/board/radxa/rock5b/extlinux.conf
> > +++ b/board/radxa/rock5b/extlinux.conf
> > @@ -1,4 +1,4 @@
> >  label Radxa Rock 5b Linux
> >    kernel /boot/Image
> >    devicetree /boot/rk3588-rock-5b.dtb
> > -  append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait
> > +  append root=PARTLABEL=rootfs rw rootfstype=ext4 earlycon rootwait
> 
> I'm wondering how this can work. Indeed the genimage.cfg file for this
> board creates a MBR partition table, which doesn't have any
> concept/space to store partition labels (unlike GPT partition tables).
> And my understanding is that PARTLABEL is based on GPT partition
> labels. So how can this work?

Because the genimage partition-table-type is set to 'hybrid', not 'mbr':
$ git grep partition-table-type board/radxa/rock5b/genimage.cfg
board/radxa/rock5b/genimage.cfg:                partition-table-type = "hybrid"


From:
https://github.com/pengutronix/genimage

"hybrid: A hybrid MBR/GPT partition table.
Partitions with an explicit partition-type will be placed in in the MBR table.
At most 3 such partitions are allowed. This limit does not effect the maximum
number of GPT partition entries in the same image."

The prints from genimage at build time:
INFO: hdimage(sdcard.img): adding primary partition 'uboot' from 'u-boot-rockchip.bin' ...
INFO: hdimage(sdcard.img): adding primary partition 'rootfs' (in MBR) from 'rootfs.ext2' ...
INFO: hdimage(sdcard.img): adding primary partition '[MBR]' ...
INFO: hdimage(sdcard.img): adding primary partition '[GPT header]' ...
INFO: hdimage(sdcard.img): adding primary partition '[GPT array]' ...
INFO: hdimage(sdcard.img): adding primary partition '[GPT backup]' ...
INFO: hdimage(sdcard.img): writing GPT
INFO: hdimage(sdcard.img): writing hybrid MBR


Doing a:
$ echo print | parted output/images/sdcard.img
Model:  (file)
Disk /home/nks/src/buildroot-rock5b/output/images/sdcard.img: 272MB
Sector size (logical/physical): 512B/512B
Partition Table: gpt
Disk Flags: 

Number  Start   End    Size   File system  Name    Flags
 1      9633kB  272MB  262MB  ext4         rootfs


Shows a gpt partition with label 'rootfs'.


During boot:
[    3.134613] Waiting for root device PARTLABEL=rootfs...
[    3.422771] dwmmc_rockchip fe2c0000.mmc: Successfully tuned phase to 247
[    3.423813] mmc1: new ultra high speed SDR104 SDXC card at address aaaa
[    3.424819] mmcblk1: mmc1:aaaa SH64G 59.5 GiB
[    3.429940]  mmcblk1: p1
[    3.461922] EXT4-fs (mmcblk1p1): orphan cleanup on readonly fs
[    3.462582] EXT4-fs (mmcblk1p1): mounted filesystem 5d48042f-ad69-4b24-ad35-61abae2598b2 ro with ordered data mode. Quota mode: none.
[    3.463676] VFS: Mounted root (ext4 filesystem) readonly on device 179:1.
[    3.464599] devtmpfs: mounted
[    3.466399] Freeing unused kernel memory: 10304K
[    3.466843] Run /sbin/init as init process
[    3.554357] EXT4-fs (mmcblk1p1): re-mounted 5d48042f-ad69-4b24-ad35-61abae2598b2 r/w. Quota mode: none.


> 
> From the Linux kernel code:
> 
>  *      9) PARTLABEL=<name> with name being the GPT partition label.
>  *         MSDOS partitions do not support labels!
> 
> Note that I would be fine with switching to a GPT partition table to
> make this work.

That is not strictly necessary, since hybrid means:
GPT (all partitions) + MBR (includes only partitions with a partition-type set)


However, looking at the buildroot tree:
$ git grep partition-table-type | grep gpt | wc -l
29
$ git grep partition-table-type | grep hybrid | wc -l
2
$ git grep partition-table-type | grep mbr | wc -l
0

It seems that only two boards using hybrid are:
board/avnet/rzboard_v2l/genimage.cfg:           partition-table-type = "hybrid"
board/radxa/rock5b/genimage.cfg:                partition-table-type = "hybrid"

I don't know of any reason to keep the mbr for rock5b, so I'm quite sure that
we could change rock5b from hybrid to gpt.

I'm not familiar with rzboard_v2l. Most likely there also isn't any good reason
to keep the mbr. I don't have that board, so I wouldn't be able to test.


Kind regards,
Niklas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/4] board/radxa/rock5b: use PARTLABEL to specify rootfs

[Niklas Cassel via buildroot]

On Sat, Aug 31, 2024 at 12:37:45PM +0200, Niklas Cassel wrote:

(snip)

> I don't know of any reason to keep the mbr for rock5b, so I'm quite sure that
> we could change rock5b from hybrid to gpt.

I've now sent a new series based on "next" that migrates from hybrid to
GPT only:
https://lore.kernel.org/buildroot/20240902104433.2561797-1-niklas.cassel@wdc.com/T/#t

I also included patch 1/4 from this series in the new series, to make life
easier for you (so that you do not get conflicts when applying to "next").


Kind regards,
Niklas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/4] board/radxa/rock5b: there is no need to specify rootfstype

[Niklas Cassel via buildroot]

From: Niklas Cassel <cassel@kernel.org>

The ext4 rootfs is mounted as ext4 perfectly fine without rootfstype
specified on the kernel command line.

In order to keep the kernel command line clean, remove the superfluous
kernel parameter.

Signed-off-by: Niklas Cassel <cassel@kernel.org>
---
 board/radxa/rock5b/extlinux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf
index 8759d7491c..bca99a3aa8 100644
--- a/board/radxa/rock5b/extlinux.conf
+++ b/board/radxa/rock5b/extlinux.conf
@@ -1,4 +1,4 @@
 label Radxa Rock 5b Linux
   kernel /boot/Image
   devicetree /boot/rk3588-rock-5b.dtb
-  append root=PARTLABEL=rootfs rw rootfstype=ext4 earlycon rootwait
+  append root=PARTLABEL=rootfs rw earlycon rootwait
-- 
2.46.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/4] board/radxa/rock5b: there is no need to specify rootfstype

[Thomas Petazzoni via buildroot]

On Fri, 30 Aug 2024 12:13:25 +0200
Niklas Cassel via buildroot <buildroot@buildroot.org> wrote:

> From: Niklas Cassel <cassel@kernel.org>
> 
> The ext4 rootfs is mounted as ext4 perfectly fine without rootfstype
> specified on the kernel command line.
> 
> In order to keep the kernel command line clean, remove the superfluous
> kernel parameter.
> 
> Signed-off-by: Niklas Cassel <cassel@kernel.org>
> ---
>  board/radxa/rock5b/extlinux.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/4] board/radxa/rock5b: do not let the kernel mount the rootfs as rw

[Niklas Cassel via buildroot]

From: Niklas Cassel <cassel@kernel.org>

Do not let the kernel mount the rootfs as rw.
There is no need for this, and init will remount the rootfs as rw anyway.

Signed-off-by: Niklas Cassel <cassel@kernel.org>
---
 board/radxa/rock5b/extlinux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf
index bca99a3aa8..c4198deaa0 100644
--- a/board/radxa/rock5b/extlinux.conf
+++ b/board/radxa/rock5b/extlinux.conf
@@ -1,4 +1,4 @@
 label Radxa Rock 5b Linux
   kernel /boot/Image
   devicetree /boot/rk3588-rock-5b.dtb
-  append root=PARTLABEL=rootfs rw earlycon rootwait
+  append root=PARTLABEL=rootfs earlycon rootwait
-- 
2.46.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/4] board/radxa/rock5b: do not let the kernel mount the rootfs as rw

[Thomas Petazzoni via buildroot]

On Fri, 30 Aug 2024 12:13:26 +0200
Niklas Cassel via buildroot <buildroot@buildroot.org> wrote:

> From: Niklas Cassel <cassel@kernel.org>
> 
> Do not let the kernel mount the rootfs as rw.
> There is no need for this, and init will remount the rootfs as rw anyway.
> 
> Signed-off-by: Niklas Cassel <cassel@kernel.org>
> ---
>  board/radxa/rock5b/extlinux.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/4] configs/rock5b: add firmware for the RTL8125 NIC

[Niklas Cassel via buildroot]

From: Niklas Cassel <cassel@kernel.org>

Add the proper firmware to avoid the following warning + error during
boot:
r8169 0004:41:00.0: Direct firmware load for rtl_nic/rtl8125b-2.fw failed with error -2
r8169 0004:41:00.0: Unable to load firmware rtl_nic/rtl8125b-2.fw (-2)

Note that the NIC appears functional even without the proper firmware.
However, add the firmware anyway, since the error messages are distracting
and clutters dmesg.

Signed-off-by: Niklas Cassel <cassel@kernel.org>
---
 configs/rock5b_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig
index 0778e8afdf..899537c001 100644
--- a/configs/rock5b_defconfig
+++ b/configs/rock5b_defconfig
@@ -22,6 +22,8 @@ BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y
 BR2_PACKAGE_ROCKCHIP_RKBIN=y
 BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin"
 BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf"
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-- 
2.46.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/4] configs/rock5b: add firmware for the RTL8125 NIC

[Thomas Petazzoni via buildroot]

On Fri, 30 Aug 2024 12:13:27 +0200
Niklas Cassel via buildroot <buildroot@buildroot.org> wrote:

> From: Niklas Cassel <cassel@kernel.org>
> 
> Add the proper firmware to avoid the following warning + error during
> boot:
> r8169 0004:41:00.0: Direct firmware load for rtl_nic/rtl8125b-2.fw failed with error -2
> r8169 0004:41:00.0: Unable to load firmware rtl_nic/rtl8125b-2.fw (-2)
> 
> Note that the NIC appears functional even without the proper firmware.
> However, add the firmware anyway, since the error messages are distracting
> and clutters dmesg.
> 
> Signed-off-by: Niklas Cassel <cassel@kernel.org>
> ---
>  configs/rock5b_defconfig | 2 ++
>  1 file changed, 2 insertions(+)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot