All of lore.kernel.org
 help / color / mirror / Atom feed
* Pull request for efi-2021-07-rc5-2
@ 2021-06-28 19:47 Heinrich Schuchardt
  2021-06-30 12:06 ` Tom Rini
  0 siblings, 1 reply; 11+ messages in thread
From: Heinrich Schuchardt @ 2021-06-28 19:47 UTC (permalink / raw)
  To: Tom Rini
  Cc: U-Boot Mailing List, Ilias Apalodimas, Alexander Graf,
	Adarsh Babu Kalepalli

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

The following changes since commit 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff:

   Merge tag 'u-boot-imx-20210625' of
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
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)

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

Documentation:

* man-page for askenv

bug fixes

* correct display of BootOrder in efidebug command
* do not allow TPL_HIGH_LEVEL for CreateEvent(Ex)
* correct handling of unknown properties in SMBIOS tables

----------------------------------------------------------------
Adarsh Babu Kalepalli (1):
       doc/usage: cmd-usage help file for askenv

Heinrich Schuchardt (3):
       efi_loader: TPL_HIGH_LEVEL not allowed for CreateEvent
       efidebug: correct display of BootOrder
       smbios: convert function descriptions to Sphinx style

Ilias Apalodimas (2):
       smbios: Fix BIOS Characteristics Extension Byte 2
       smbios: Fix SMBIOS tables

  cmd/efidebug.c                      |  2 +-
  doc/usage/askenv.rst                | 87
+++++++++++++++++++++++++++++++++++++
  doc/usage/index.rst                 |  1 +
  include/smbios.h                    |  2 +-
  lib/efi_loader/efi_boottime.c       |  1 -
  lib/efi_selftest/efi_selftest_tpl.c |  2 +-
  lib/smbios.c                        | 24 +++++++---
  7 files changed, 108 insertions(+), 11 deletions(-)
  create mode 100644 doc/usage/askenv.rst

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-06-28 19:47 Pull request for efi-2021-07-rc5-2 Heinrich Schuchardt
@ 2021-06-30 12:06 ` Tom Rini
  2021-07-03 12:46   ` Da Xue
  0 siblings, 1 reply; 11+ messages in thread
From: Tom Rini @ 2021-06-30 12:06 UTC (permalink / raw)
  To: Heinrich Schuchardt
  Cc: U-Boot Mailing List, Ilias Apalodimas, Alexander Graf,
	Adarsh Babu Kalepalli

[-- Attachment #1: Type: text/plain, Size: 920 bytes --]

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
> 
> The following changes since commit 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff:
> 
>   Merge tag 'u-boot-imx-20210625' of
> 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
> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-06-30 12:06 ` Tom Rini
@ 2021-07-03 12:46   ` Da Xue
  2021-07-03 13:36     ` Heinrich Schuchardt
  0 siblings, 1 reply; 11+ messages in thread
From: Da Xue @ 2021-07-03 12:46 UTC (permalink / raw)
  To: Tom Rini
  Cc: Heinrich Schuchardt, U-Boot Mailing List, Ilias Apalodimas,
	Alexander Graf, Adarsh Babu Kalepalli

On Wed, Jun 30, 2021 at 8:06 AM Tom Rini <trini@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
> >
> > The following changes since commit
> 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff:
> >
> >   Merge tag 'u-boot-imx-20210625' of
> > 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
> > 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@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
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
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

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-07-03 12:46   ` Da Xue
@ 2021-07-03 13:36     ` Heinrich Schuchardt
  2021-07-03 15:25       ` Da Xue
  0 siblings, 1 reply; 11+ messages in thread
From: Heinrich Schuchardt @ 2021-07-03 13:36 UTC (permalink / raw)
  To: Da Xue, Tom Rini
  Cc: U-Boot Mailing List, Ilias Apalodimas, Alexander Graf,
	Adarsh Babu Kalepalli

Am 3. Juli 2021 14:46:39 MESZ schrieb Da Xue <da@libre.computer>:
>On Wed, Jun 30, 2021 at 8:06 AM Tom Rini <trini@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
>> >
>> > The following changes since commit
>> 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff:
>> >
>> >   Merge tag 'u-boot-imx-20210625' of
>> > 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
>> > 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@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


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-07-03 13:36     ` Heinrich Schuchardt
@ 2021-07-03 15:25       ` Da Xue
  2021-07-03 16:06         ` Heinrich Schuchardt
  0 siblings, 1 reply; 11+ messages in thread
From: Da Xue @ 2021-07-03 15:25 UTC (permalink / raw)
  To: Heinrich Schuchardt
  Cc: Tom Rini, U-Boot Mailing List, Ilias Apalodimas, Alexander Graf,
	Adarsh Babu Kalepalli

On Sat, Jul 3, 2021 at 9:36 AM Heinrich Schuchardt <xypron.glpk@gmx.de>
wrote:

> Am 3. Juli 2021 14:46:39 MESZ schrieb Da Xue <da@libre.computer>:
> >On Wed, Jun 30, 2021 at 8:06 AM Tom Rini <trini@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
> >> >
> >> > The following changes since commit
> >> 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff:
> >> >
> >> >   Merge tag 'u-boot-imx-20210625' of
> >> > 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
> >> > 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@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.

Best,

Da

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-07-03 15:25       ` Da Xue
@ 2021-07-03 16:06         ` Heinrich Schuchardt
  2021-07-03 19:24           ` Ilias Apalodimas
  0 siblings, 1 reply; 11+ messages in thread
From: Heinrich Schuchardt @ 2021-07-03 16:06 UTC (permalink / raw)
  To: Da Xue
  Cc: Tom Rini, U-Boot Mailing List, Ilias Apalodimas, Alexander Graf,
	Adarsh Babu Kalepalli

On 7/3/21 5:25 PM, Da Xue wrote:
>
> On Sat, Jul 3, 2021 at 9:36 AM Heinrich Schuchardt <xypron.glpk@gmx.de
> <mailto:xypron.glpk@gmx.de>> wrote:
>
>     Am 3. Juli 2021 14:46:39 MESZ schrieb Da Xue <da@libre.computer>:
>      >On Wed, Jun 30, 2021 at 8:06 AM Tom Rini <trini@konsulko.com
>     <mailto:trini@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@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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-07-03 16:06         ` Heinrich Schuchardt
@ 2021-07-03 19:24           ` Ilias Apalodimas
  2021-07-03 19:43             ` Heinrich Schuchardt
  0 siblings, 1 reply; 11+ messages in thread
From: Ilias Apalodimas @ 2021-07-03 19:24 UTC (permalink / raw)
  To: Heinrich Schuchardt
  Cc: Da Xue, Tom Rini, U-Boot Mailing List, Alexander Graf,
	Adarsh Babu Kalepalli

> >      >EFI stub: Booting Linux Kernel...

[...]

> >      >EFI stub: Using DTB from configuration table
> >      >...
> >      >[?? ?? 0.000000] Linux version 5.10.45 (dxue@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.

Which version was that? My patch changed nothing in that regard.
The only thing my patch did was fix e4f8e543f1a9 which removed some Kconfig
options. Removing those made the strings "" which is against the spec. 
Heinrich fixed a similar issue with 00a871d34e2f back when we had 
CONFIG_SMBIOS_MANUFACTURER and CONFIG_SMBIOS_PRODUCT_NAME. Any chance that 
was your working version and those values were used?

> 
> 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.

We discussed this with Simon and I'll send a follow up patch. The idea is to
try and use CONFIG_SYS* and if those are not available, pop a warning and use
Unknown

Cheers
/Ilias
> 
> Best regards
> 
> Heinrich

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-07-03 19:24           ` Ilias Apalodimas
@ 2021-07-03 19:43             ` Heinrich Schuchardt
  2021-07-05  5:56               ` Ilias Apalodimas
  0 siblings, 1 reply; 11+ messages in thread
From: Heinrich Schuchardt @ 2021-07-03 19:43 UTC (permalink / raw)
  To: Ilias Apalodimas
  Cc: Da Xue, Tom Rini, U-Boot Mailing List, Alexander Graf,
	Adarsh Babu Kalepalli, Simon Glass

On 7/3/21 9:24 PM, Ilias Apalodimas wrote:
>>>       >EFI stub: Booting Linux Kernel...
>
> [...]
>
>>>       >EFI stub: Using DTB from configuration table
>>>       >...
>>>       >[?? ?? 0.000000] Linux version 5.10.45 (dxue@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.
>
> Which version was that? My patch changed nothing in that regard.

commit 44ffb6f0ecaf ("smbios: Allow properties to come from the device
tree") still used CONFIG symbols.

commit e4f8e543f1a9 ("smbios: Drop the unused Kconfig options") dropped
the CONFIG symbols

Best regards

Heinrich

> The only thing my patch did was fix e4f8e543f1a9 which removed some Kconfig
> options. Removing those made the strings "" which is against the spec.
> Heinrich fixed a similar issue with 00a871d34e2f back when we had
> CONFIG_SMBIOS_MANUFACTURER and CONFIG_SMBIOS_PRODUCT_NAME. Any chance that
> was your working version and those values were used?
>
>>
>> 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.
>
> We discussed this with Simon and I'll send a follow up patch. The idea is to
> try and use CONFIG_SYS* and if those are not available, pop a warning and use
> Unknown
>
> Cheers
> /Ilias
>>
>> Best regards
>>
>> Heinrich


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-07-03 19:43             ` Heinrich Schuchardt
@ 2021-07-05  5:56               ` Ilias Apalodimas
  0 siblings, 0 replies; 11+ messages in thread
From: Ilias Apalodimas @ 2021-07-05  5:56 UTC (permalink / raw)
  To: Heinrich Schuchardt
  Cc: Da Xue, Tom Rini, U-Boot Mailing List, Alexander Graf,
	Adarsh Babu Kalepalli, Simon Glass

> 
[...]
> commit 44ffb6f0ecaf ("smbios: Allow properties to come from the device
> tree") still used CONFIG symbols.
> 
> commit e4f8e543f1a9 ("smbios: Drop the unused Kconfig options") dropped
> the CONFIG symbols

Exactly, that was the point I tried to make.  I think whatever Da was seing
on his entires as 'correct' was prior to e4f8e543f1a9.

Cheers
/Ilias

> 
> Best regards
> 
> Heinrich
> 
> > The only thing my patch did was fix e4f8e543f1a9 which removed some Kconfig
> > options. Removing those made the strings "" which is against the spec.
> > Heinrich fixed a similar issue with 00a871d34e2f back when we had
> > CONFIG_SMBIOS_MANUFACTURER and CONFIG_SMBIOS_PRODUCT_NAME. Any chance that
> > was your working version and those values were used?
> > 
> > > 
> > > 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.
> > 
> > We discussed this with Simon and I'll send a follow up patch. The idea is to
> > try and use CONFIG_SYS* and if those are not available, pop a warning and use
> > Unknown
> > 
> > Cheers
> > /Ilias
> > > 
> > > Best regards
> > > 
> > > Heinrich
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Pull request for efi-2021-07-rc5-2
  2021-06-21  7:10 Heinrich Schuchardt
@ 2021-06-21 21:22 ` Tom Rini
  0 siblings, 0 replies; 11+ messages in thread
From: Tom Rini @ 2021-06-21 21:22 UTC (permalink / raw)
  To: Heinrich Schuchardt
  Cc: U-Boot Mailing List, Adarsh Babu Kalepalli, Ilias Apalodimas,
	Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 8835 bytes --]

On Mon, Jun 21, 2021 at 09:10:38AM +0200, Heinrich Schuchardt wrote:

> Dear Tom,
> 
> The following changes since commit 97c8cb524c19f054036efd2b4429273bd503e39c:
> 
>   Merge branch 'network_master' of
> https://source.denx.de/u-boot/custodians/u-boot-net (2021-06-18 11:18:56
> -0400)
> 
> are available in the Git repository at:
> 
>   https://source.denx.de/u-boot/custodians/u-boot-efi.git
> tags/efi-2021-07-rc5-2
> 
> for you to fetch changes up to fe06d3f4e540c9985bf9898fabf859e81c428db7:
> 
>   smbios: Fix SMBIOS tables (2021-06-21 07:58:38 +0200)
> 
> Gitlab CI showed no problems:
> https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/7899
> 

This causes failures:
test/py/tests/test_fs/test_unlink.py F..F...F..F...                                     [ 99%]
test/py/tests/test_fs/test_squashfs/test_sqfs_load.py .                                 [ 99%]
test/py/tests/test_fs/test_squashfs/test_sqfs_ls.py .                                   [100%]

========================================== FAILURES ===========================================
_______________________________ TestUnlink.test_unlink1[fat16] ________________________________

self = <test_unlink.TestUnlink object at 0x7fde2c537940>
u_boot_console = <u_boot_console_sandbox.ConsoleSandbox object at 0x7fde31514240>
fs_obj_unlink = ['fat', '/tmp/.bm-work/sandbox/persistent-data/128MB.fat16.img']

    def test_unlink1(self, u_boot_console, fs_obj_unlink):
        """
        Test Case 1 - delete a file
        """
        fs_type,fs_img = fs_obj_unlink
        with u_boot_console.log.section('Test Case 1 - unlink (file)'):
            output = u_boot_console.run_command_list([
                'host bind 0 %s' % fs_img,
                '%srm host 0:0 dir1/file1' % fs_type,
                '%sls host 0:0 dir1/file1' % fs_type])
>           assert('' == ''.join(output))
E           AssertionError: assert '' == 'Scanning dis...egister host0'
E             + Scanning disk host0...
E             +
E             + ERROR: failure to add disk device host0, r = 20
E             +
E             + Failed to register host0

test/py/tests/test_fs/test_unlink.py:28: AssertionError
------------------------------------ Captured stdout setup ------------------------------------
mkfs.fat 4.1 (2017-01-24)
------------------------------------ Captured stderr setup ------------------------------------
128+0 records in
128+0 records out
134217728 bytes (134 MB, 128 MiB) copied, 0.109379 s, 1.2 GB/s
1+0 records in
1+0 records out
1024 bytes (1.0 kB, 1.0 KiB) copied, 0.000251915 s, 4.1 MB/s
1+0 records in
1+0 records out
1024 bytes (1.0 kB, 1.0 KiB) copied, 0.000212585 s, 4.8 MB/s
1+0 records in
1+0 records out
1024 bytes (1.0 kB, 1.0 KiB) copied, 0.000238622 s, 4.3 MB/s
------------------------------------ Captured stdout call -------------------------------------
=> host bind 0 /tmp/.bm-work/sandbox/persistent-data/128MB.fat16.img
Scanning disk host0...
ERROR: failure to add disk device host0, r = 20
Failed to register host0
=> => fatrm host 0:0 dir1/file1
=> => fatls host 0:0 dir1/file1
=>
_______________________________ TestUnlink.test_unlink4[fat16] ________________________________

self = <test_unlink.TestUnlink object at 0x7fde2c54c8d0>
u_boot_console = <u_boot_console_sandbox.ConsoleSandbox object at 0x7fde31514240>
fs_obj_unlink = ['fat', '/tmp/.bm-work/sandbox/persistent-data/128MB.fat16.img']

    def test_unlink4(self, u_boot_console, fs_obj_unlink):
        """
        Test Case 4 - delete an empty directory
        """
        fs_type,fs_img = fs_obj_unlink
        with u_boot_console.log.section('Test Case 4 - unlink (directory)'):
            output = u_boot_console.run_command_list([
                'host bind 0 %s' % fs_img,
                '%srm host 0:0 dir4' % fs_type])
>           assert('' == ''.join(output))
E           AssertionError: assert '' == 'Scanning dis...egister host0'
E             + Scanning disk host0...
E             +
E             + ERROR: failure to add disk device host0, r = 20
E             +
E             + Failed to register host0

test/py/tests/test_fs/test_unlink.py:76: AssertionError
------------------------------------ Captured stdout call -------------------------------------
=> host bind 0 /tmp/.bm-work/sandbox/persistent-data/128MB.fat16.img
Scanning disk host0...
ERROR: failure to add disk device host0, r = 20
Failed to register host0
=> => fatrm host 0:0 dir4
=>
_______________________________ TestUnlink.test_unlink1[fat32] ________________________________

self = <test_unlink.TestUnlink object at 0x7fde2c4d10b8>
u_boot_console = <u_boot_console_sandbox.ConsoleSandbox object at 0x7fde31514240>
fs_obj_unlink = ['fat', '/tmp/.bm-work/sandbox/persistent-data/128MB.fat32.img']

    def test_unlink1(self, u_boot_console, fs_obj_unlink):
        """
        Test Case 1 - delete a file
        """
        fs_type,fs_img = fs_obj_unlink
        with u_boot_console.log.section('Test Case 1 - unlink (file)'):
            output = u_boot_console.run_command_list([
                'host bind 0 %s' % fs_img,
                '%srm host 0:0 dir1/file1' % fs_type,
                '%sls host 0:0 dir1/file1' % fs_type])
>           assert('' == ''.join(output))
E           AssertionError: assert '' == 'Scanning dis...egister host0'
E             + Scanning disk host0...
E             +
E             + ERROR: failure to add disk device host0, r = 20
E             +
E             + Failed to register host0

test/py/tests/test_fs/test_unlink.py:28: AssertionError
------------------------------------ Captured stdout setup ------------------------------------
mkfs.fat 4.1 (2017-01-24)
------------------------------------ Captured stderr setup ------------------------------------
128+0 records in
128+0 records out
134217728 bytes (134 MB, 128 MiB) copied, 0.107716 s, 1.2 GB/s
1+0 records in
1+0 records out
1024 bytes (1.0 kB, 1.0 KiB) copied, 0.000244757 s, 4.2 MB/s
1+0 records in
1+0 records out
1024 bytes (1.0 kB, 1.0 KiB) copied, 0.00018367 s, 5.6 MB/s
1+0 records in
1+0 records out
1024 bytes (1.0 kB, 1.0 KiB) copied, 0.000279979 s, 3.7 MB/s
------------------------------------ Captured stdout call -------------------------------------
=> host bind 0 /tmp/.bm-work/sandbox/persistent-data/128MB.fat32.img
Scanning disk host0...
ERROR: failure to add disk device host0, r = 20
Failed to register host0
=> => fatrm host 0:0 dir1/file1
=> => fatls host 0:0 dir1/file1
=>
_______________________________ TestUnlink.test_unlink4[fat32] ________________________________

self = <test_unlink.TestUnlink object at 0x7fde2c54ccf8>
u_boot_console = <u_boot_console_sandbox.ConsoleSandbox object at 0x7fde31514240>
fs_obj_unlink = ['fat', '/tmp/.bm-work/sandbox/persistent-data/128MB.fat32.img']

    def test_unlink4(self, u_boot_console, fs_obj_unlink):
        """
        Test Case 4 - delete an empty directory
        """
        fs_type,fs_img = fs_obj_unlink
        with u_boot_console.log.section('Test Case 4 - unlink (directory)'):
            output = u_boot_console.run_command_list([
                'host bind 0 %s' % fs_img,
                '%srm host 0:0 dir4' % fs_type])
>           assert('' == ''.join(output))
E           AssertionError: assert '' == 'Scanning dis...egister host0'
E             + Scanning disk host0...
E             +
E             + ERROR: failure to add disk device host0, r = 20
E             +
E             + Failed to register host0

test/py/tests/test_fs/test_unlink.py:76: AssertionError
------------------------------------ Captured stdout call -------------------------------------
=> host bind 0 /tmp/.bm-work/sandbox/persistent-data/128MB.fat32.img
Scanning disk host0...
ERROR: failure to add disk device host0, r = 20
Failed to register host0
=> => fatrm host 0:0 dir4
=>

I bisected this down to:
commit 7f51279244811b6eae5d647b21d35b496562e285
Author: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date:   Thu Jun 17 11:57:32 2021 +0200

    efi_loader: improve block device integration with DM
    
    Up to now when devices became available after executing the UEFI
    sub-system initialization where not available for EFI applications.
    
    With the patch block devices are added to the UEFI object list whenever
    they are probed.
    
    Fixes: f3866909e350 ("distro_bootcmd: call EFI bootmgr even without having /EFI/boot")
    Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
    Tested-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>

I suspect that with
https://patchwork.ozlabs.org/project/uboot/list/?series=250001 applied
Azure will also fail.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Pull request for efi-2021-07-rc5-2
@ 2021-06-21  7:10 Heinrich Schuchardt
  2021-06-21 21:22 ` Tom Rini
  0 siblings, 1 reply; 11+ messages in thread
From: Heinrich Schuchardt @ 2021-06-21  7:10 UTC (permalink / raw)
  To: Tom Rini
  Cc: U-Boot Mailing List, Adarsh Babu Kalepalli, Ilias Apalodimas,
	Alexander Graf

Dear Tom,

The following changes since commit 97c8cb524c19f054036efd2b4429273bd503e39c:

   Merge branch 'network_master' of
https://source.denx.de/u-boot/custodians/u-boot-net (2021-06-18 11:18:56
-0400)

are available in the Git repository at:

   https://source.denx.de/u-boot/custodians/u-boot-efi.git
tags/efi-2021-07-rc5-2

for you to fetch changes up to fe06d3f4e540c9985bf9898fabf859e81c428db7:

   smbios: Fix SMBIOS tables (2021-06-21 07:58:38 +0200)

Gitlab CI showed no problems:
https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/7899

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

Documentation:

* man-page for askenv

bug fixes

* improve block device integration with driver model
* correct display of BootOrder in efidebug command
* do not allow TPL_HIGH_LEVEL for CreateEvent(Ex)
* correct handling of unknown properties in SMBIOS tables

----------------------------------------------------------------
Adarsh Babu Kalepalli (1):
       doc/usage: cmd-usage help file for askenv

Heinrich Schuchardt (4):
       efi_loader: TPL_HIGH_LEVEL not allowed for CreateEvent
       efidebug: correct display of BootOrder
       efi_loader: improve block device integration with DM
       smbios: convert function descriptions to Sphinx style

Ilias Apalodimas (2):
       smbios: Fix BIOS Characteristics Extension Byte 2
       smbios: Fix SMBIOS tables

  cmd/efidebug.c                      |  2 +-
  doc/usage/askenv.rst                | 87
+++++++++++++++++++++++++++++++++++++
  doc/usage/index.rst                 |  1 +
  drivers/core/device.c               |  7 +++
  include/efi_loader.h                |  6 +++
  include/smbios.h                    |  2 +-
  lib/efi_driver/Makefile             |  1 +
  lib/efi_driver/efi_dm_integration.c | 36 +++++++++++++++
  lib/efi_loader/efi_boottime.c       |  1 -
  lib/efi_loader/efi_disk.c           | 72 +++++++++++++++++-------------
  lib/efi_selftest/efi_selftest_tpl.c |  2 +-
  lib/smbios.c                        | 24 +++++++---
  12 files changed, 201 insertions(+), 40 deletions(-)
  create mode 100644 doc/usage/askenv.rst
  create mode 100644 lib/efi_driver/efi_dm_integration.c

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2021-07-05  5:56 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-28 19:47 Pull request for efi-2021-07-rc5-2 Heinrich Schuchardt
2021-06-30 12:06 ` Tom Rini
2021-07-03 12:46   ` Da Xue
2021-07-03 13:36     ` Heinrich Schuchardt
2021-07-03 15:25       ` Da Xue
2021-07-03 16:06         ` Heinrich Schuchardt
2021-07-03 19:24           ` Ilias Apalodimas
2021-07-03 19:43             ` Heinrich Schuchardt
2021-07-05  5:56               ` Ilias Apalodimas
  -- strict thread matches above, loose matches on Subject: below --
2021-06-21  7:10 Heinrich Schuchardt
2021-06-21 21:22 ` Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.