Pull request for efi-2021-07-rc5-2

[Heinrich Schuchardt]

On 7/3/21 5:25 PM, Da Xue wrote:
>
> On Sat, Jul 3, 2021 at 9:36 AM Heinrich Schuchardt <xypron.glpk at gmx.de
> <mailto:xypron.glpk at gmx.de>> wrote:
>
>     Am 3. Juli 2021 14:46:39 MESZ schrieb Da Xue <da at libre.computer>:
>      >On Wed, Jun 30, 2021 at 8:06 AM Tom Rini <trini at konsulko.com
>     <mailto:trini at konsulko.com>> wrote:
>      >
>      >> On Mon, Jun 28, 2021 at 09:47:53PM +0200, Heinrich Schuchardt wrote:
>      >>
>      >> > Dear Tom,
>      >> >
>      >> > I have removed the one patch for better EFI/DM integration that
>      >caused
>      >> > sandbox test problems on my last pull request. This topic needs
>      >more
>      >> > coordination with Simon.
>      >> >
>      >> > Gitlab CI showed no problems:
>      >> >
>      >https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/7968 <https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/7968>
>      >> >
>      >> > The following changes since commit
>      >> 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff:
>      >> >
>      >> >   Merge tag 'u-boot-imx-20210625' of
>      >> > https://gitlab.denx.de/u-boot/custodians/u-boot-imx
>     <https://gitlab.denx.de/u-boot/custodians/u-boot-imx> (2021-06-25
>      >13:33:47
>      >> > -0400)
>      >> >
>      >> > are available in the Git repository at:
>      >> >
>      >> > https://source.denx.de/u-boot/custodians/u-boot-efi.git
>     <https://source.denx.de/u-boot/custodians/u-boot-efi.git>
>      >> > tags/efi-2021-07-rc5-2
>      >> >
>      >> > for you to fetch changes up to
>      >70e80666f26a516096f3787e884d42818d8b4087:
>      >> >
>      >> >   smbios: Fix SMBIOS tables (2021-06-28 19:57:13 +0200)
>      >> >
>      >>
>      >> Applied to u-boot/master, thanks!
>      >>
>      >> --
>      >> Tom
>      >>
>      >
>      >Hi Heinrich and Ilias,
>      >
>      >We use SMBIOS/DMI entries to identify our boards. For some reason the
>      >device tree entries are not being passed to /sys/class/virtual/dmi/id.
>      >I'm
>      >using master as of this morning.
>      >
>      >EFI stub: Booting Linux Kernel...
>      >EFI stub: Using DTB from configuration table
>      >...
>      >[    0.000000] Linux version 5.10.45 (dxue at build-server)
>      >(aarch64-buildroot-linux-musl-gcc.br_real (Buildroot
>      >2019.08-10705-g7cb51d4843-dirty) 10.3.0, GNU ld (GNU Binutils) 2.36.1)
>      >#21
>      >[    0.000000] Machine model: Libre Computer AML-S805X-AC
>      >...
>      >[    0.000000] efi: ESRT=0x3aeea040 RTPROP=0x3aee8040
>     SMBIOS=0x3aee4000
>      >RNG=0x394ee040 MEMRESERVE=0x394ed040
>      >
>      >/sys/firmware/devicetree/base/smbios/smbios # grep -r . *
>      >baseboard/manufacturer:libre-computer
>      >baseboard/product:aml-s805x-ac
>      >baseboard/name:baseboard
>      >chassis/manufacturer:libre-computer
>      >chassis/product:aml-s805x-ac
>      >chassis/name:chassis
>
>     This matces the device tree segment below.
>
>      >name:smbios
>      >system/manufacturer:libre-computer
>      >system/product:aml-s805x-ac
>      >system/name:system
>      >/sys/firmware/devicetree/base/smbios/smbios # cd
>      >/sys/devices/virtual/dmi/id
>      >/sys/devices/virtual/dmi/id # grep -r . *
>      >bios_date:07/03/2021
>      >bios_release:21.7
>      >bios_vendor:U-Boot
>      >bios_version:2021.07-rc5+
>      >board_name:Unknown Product
>      >board_vendor:Unknown
>      >chassis_type:3
>      >chassis_vendor:Unknown
>
>     All that is marked unknown is not in your device-tree below.
>
>     What are you expecting here?
>     Was it here before the pull request?
>
>     Best regards
>
>     Heinrich
>
>      >modalias:dmi:bvnU-Boot:bvr2021.07-rc5+:bd07/03/2021:br21.7:svnUnknown:pnUnknownProduct:pvr:rvnUnknown:rnUnknownProduct:rvr:cvnUnknown:ct3:cvr:
>      >power/runtime_active_time:0
>      >power/runtime_status:unsupported
>      >power/runtime_suspended_time:0
>      >power/control:auto
>      >product_name:Unknown Product
>      >sys_vendor:Unknown
>      >uevent:MODALIAS=dmi:bvnU-Boot:bvr2021.07-rc5+:bd07/03/2021:br21.7:svnUnknown:pnUnknownProduct:pvr:rvnUnknown:rnUnknownProduct:rvr:cvnUnknown:ct3:cvr:
>      >
>      >diff --git a/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
>      >b/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
>      >index 39270ea71c..02177c64a6 100644
>      >--- a/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
>      >+++ b/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
>      >@@ -5,3 +5,26 @@
>      >  */
>      >
>      > #include "meson-gxl-u-boot.dtsi"
>      >+
>      >+/ {
>      >+       smbios {
>      >+               compatible = "u-boot,sysinfo-smbios";
>      >+
>      >+               smbios {
>      >+                       system {
>      >+                               manufacturer = "libre-computer";
>      >+                               product = "aml-s805x-ac";
>      >+                       };
>      >+
>      >+                       baseboard {
>      >+                               manufacturer = "libre-computer";
>      >+                               product = "aml-s805x-ac";
>      >+                       };
>      >+
>      >+                       chassis {
>      >+                               manufacturer = "libre-computer";
>      >+                       };
>      >+               };
>      >+       };
>      >+};
>      >
>      >Any ideas?
>      >
>      >Best,
>      >Da
>
> There's two issues:
>
> 1) I just saw this patch: "x86: Provide default SMBIOS
> manufacturer/product". Should we add the same thing for ARM or maybe
> generically across the board?
>
> 2) The DMI entries previously took CONFIG_SYS_VENDOR and
> CONFIG_SYS_BOARD entries as manufacturer and product respectively. Now
> those entries become Unknown and Unknown Product.

Having file smbios.dtsi in an x86 specific path (arch/x86/dts/) does not
make much sense. There is nothing architecture specific in it.

Maybe where Ilias now has filled the missing properties with 'Unknown'
he should have opted for CONFIG_SYS* instead if available. This would
make smbios.dtsi superfluous.

Best regards

Heinrich