1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-platform PATCH v1] Silicon/Marvell/Armada7k8k: Fix wrong SMBIOS version issue

Sunny Wang posted 1 patch 2 years, 3 months ago
Failed in applying to current master (apply log)
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[edk2-devel] [edk2-platform PATCH v1] Silicon/Marvell/Armada7k8k: Fix wrong SMBIOS version issue
Posted by Sunny Wang 2 years, 3 months ago 
The SMBIOS data is based on v3.3.0, but its version is set to v3.2.0.
Since PcdSmbiosVersion in MdeModulePkg.dec is v3.3.0, so just remove
the platform overridden value in .dsc file to fix this issue.

This also fixed the FWTS failure below:
 dmicheck: Type 17 expects length of 0x54, has incorrect length of 0x5c

Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Marcin Wojtas <mw@semihalf.com>
Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>

Signed-off-by: Sunny Wang <sunny.wang@arm.com>
---
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 3b76acd99c..5e15378207 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -1,5 +1,5 @@
 #
-#Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+#Copyright (c) 2011-2022, ARM Limited. All rights reserved.
 #Copyright (C) 2016 Marvell International Ltd.
 #
 #SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -387,7 +387,6 @@
   # SMBIOS/DMI
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0302
   gMarvellTokenSpaceGuid.PcdFirmwareVersion|"EDK2 SH 1.1"
 
   # TRNG
-- 
2.32.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85575): https://edk2.groups.io/g/devel/message/85575
Mute This Topic: https://groups.io/mt/88360051/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platform PATCH v1] Silicon/Marvell/Armada7k8k: Fix wrong SMBIOS version issue
Posted by Marcin Wojtas 2 years, 3 months ago 
wt., 11 sty 2022 o 22:46 Sunny Wang <Sunny.Wang@arm.com> napisał(a):
>
> The SMBIOS data is based on v3.3.0, but its version is set to v3.2.0.
> Since PcdSmbiosVersion in MdeModulePkg.dec is v3.3.0, so just remove
> the platform overridden value in .dsc file to fix this issue.
>
> This also fixed the FWTS failure below:
>  dmicheck: Type 17 expects length of 0x54, has incorrect length of 0x5c
>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Marcin Wojtas <mw@semihalf.com>
> Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
>
> Signed-off-by: Sunny Wang <sunny.wang@arm.com>
> ---
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 3b76acd99c..5e15378207 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -1,5 +1,5 @@
>  #
> -#Copyright (c) 2011-2012, ARM Limited. All rights reserved.
> +#Copyright (c) 2011-2022, ARM Limited. All rights reserved.
>  #Copyright (C) 2016 Marvell International Ltd.
>  #
>  #SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -387,7 +387,6 @@
>    # SMBIOS/DMI
>    gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0302
>    gMarvellTokenSpaceGuid.PcdFirmwareVersion|"EDK2 SH 1.1"
>


Reviewed-by: Marcin Wojtas <mw@semihalf.com>

Thanks!
Marcin


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85579): https://edk2.groups.io/g/devel/message/85579
Mute This Topic: https://groups.io/mt/88360051/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platform PATCH v1] Silicon/Marvell/Armada7k8k: Fix wrong SMBIOS version issue
Posted by Ard Biesheuvel 2 years, 3 months ago 
On Wed, 12 Jan 2022 at 00:00, Marcin Wojtas <mw@semihalf.com> wrote:
>
> wt., 11 sty 2022 o 22:46 Sunny Wang <Sunny.Wang@arm.com> napisał(a):
> >
> > The SMBIOS data is based on v3.3.0, but its version is set to v3.2.0.
> > Since PcdSmbiosVersion in MdeModulePkg.dec is v3.3.0, so just remove
> > the platform overridden value in .dsc file to fix this issue.
> >
> > This also fixed the FWTS failure below:
> >  dmicheck: Type 17 expects length of 0x54, has incorrect length of 0x5c
> >
> > Cc: Leif Lindholm <leif@nuviainc.com>
> > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > Cc: Marcin Wojtas <mw@semihalf.com>
> > Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
> >
> > Signed-off-by: Sunny Wang <sunny.wang@arm.com>
> > ---
> >  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > index 3b76acd99c..5e15378207 100644
> > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > @@ -1,5 +1,5 @@
> >  #
> > -#Copyright (c) 2011-2012, ARM Limited. All rights reserved.
> > +#Copyright (c) 2011-2022, ARM Limited. All rights reserved.
> >  #Copyright (C) 2016 Marvell International Ltd.
> >  #
> >  #SPDX-License-Identifier: BSD-2-Clause-Patent
> > @@ -387,7 +387,6 @@
> >    # SMBIOS/DMI
> >    gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
> >    gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2
> > -  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0302
> >    gMarvellTokenSpaceGuid.PcdFirmwareVersion|"EDK2 SH 1.1"
> >
>
>
> Reviewed-by: Marcin Wojtas <mw@semihalf.com>
>

Pushed as d5ead8b73d62..60bb320b9e47

But in the future, please omit the copyright banner updates if you are
not making changes that establish copyright on the code (and I don't
see how that could be the case when you are deleting a single line)


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85613): https://edk2.groups.io/g/devel/message/85613
Mute This Topic: https://groups.io/mt/88360051/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platform PATCH v1] Silicon/Marvell/Armada7k8k: Fix wrong SMBIOS version issue
Posted by Sunny Wang 2 years, 3 months ago 
Ah.. I forgot that. I just blindly added copyright to all modified files. Sorry about that and thanks for catching this, Ard.
I will pay more attention to this in the future.

Best Regards,
Sunny
-----Original Message-----
From: Ard Biesheuvel <ardb@kernel.org>
Sent: 12 January 2022 10:36
To: Marcin Wojtas <mw@semihalf.com>
Cc: Sunny Wang <Sunny.Wang@arm.com>; edk2-devel-groups-io <devel@edk2.groups.io>; Leif Lindholm <leif@nuviainc.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>; Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Subject: Re: [edk2-platform PATCH v1] Silicon/Marvell/Armada7k8k: Fix wrong SMBIOS version issue

On Wed, 12 Jan 2022 at 00:00, Marcin Wojtas <mw@semihalf.com> wrote:
>
> wt., 11 sty 2022 o 22:46 Sunny Wang <Sunny.Wang@arm.com> napisał(a):
> >
> > The SMBIOS data is based on v3.3.0, but its version is set to v3.2.0.
> > Since PcdSmbiosVersion in MdeModulePkg.dec is v3.3.0, so just remove
> > the platform overridden value in .dsc file to fix this issue.
> >
> > This also fixed the FWTS failure below:
> >  dmicheck: Type 17 expects length of 0x54, has incorrect length of 0x5c
> >
> > Cc: Leif Lindholm <leif@nuviainc.com>
> > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > Cc: Marcin Wojtas <mw@semihalf.com>
> > Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
> >
> > Signed-off-by: Sunny Wang <sunny.wang@arm.com>
> > ---
> >  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > index 3b76acd99c..5e15378207 100644
> > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > @@ -1,5 +1,5 @@
> >  #
> > -#Copyright (c) 2011-2012, ARM Limited. All rights reserved.
> > +#Copyright (c) 2011-2022, ARM Limited. All rights reserved.
> >  #Copyright (C) 2016 Marvell International Ltd.
> >  #
> >  #SPDX-License-Identifier: BSD-2-Clause-Patent
> > @@ -387,7 +387,6 @@
> >    # SMBIOS/DMI
> >    gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
> >    gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2
> > -  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0302
> >    gMarvellTokenSpaceGuid.PcdFirmwareVersion|"EDK2 SH 1.1"
> >
>
>
> Reviewed-by: Marcin Wojtas <mw@semihalf.com>
>

Pushed as d5ead8b73d62..60bb320b9e47

But in the future, please omit the copyright banner updates if you are
not making changes that establish copyright on the code (and I don't
see how that could be the case when you are deleting a single line)
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85616): https://edk2.groups.io/g/devel/message/85616
Mute This Topic: https://groups.io/mt/88360051/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.