From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.124]) by mx.groups.io with SMTP id smtpd.web11.1182.1684888862967790625 for ; Tue, 23 May 2023 17:41:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@os.amperecomputing.com header.s=selector2 header.b=XhQUUDNe; spf=pass (domain: os.amperecomputing.com, ip: 40.107.244.124, mailfrom: minhnguyen1@os.amperecomputing.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ER3jpYRxASklb0r2F7GqyUHG1EnfhCx2+pHTOFjug5Qn+MlU4jCe4QbfL3KsxAJJd4J2eKpitDph8stnHh7oqxyNg7H9hCvYjRxIIVeTV865SkaKZuWkuEx43s+z2lK2ULUM9SzLL1rWOMB6Llmf0Ky0o7dwOgtnC1LsZU7FOmgYTqAtqvzDvYz6f8/YQWzCZlhsMraessoIkXP/NAJz/JcbJgf3qD7UplsXL+Vd4SrNxq1miKFRhHDFuS2HYkwEve43fI1yvUqDjJM+rG28QZQlZXkoE60p8XFHotrP/jdwSpv5vp1VofKt/7bDA9ha5JlvjYNqxL48PJwWge4NzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g3mQTLOCiiC/Z/zavaCQCw5lNaxF1S6jwV0mqhbQGOw=; b=Gm8pPRCWf9dnT1c8YxihFg7zO1gkx6Q4h+cX3+BPoMgvbDVoBSJWzBQ0nvVg1+EMiroN4QkUTR1KademYG1w/4MS+6eDNPQnjyCdYpasmzxXqqHJWFyb39fUmIhJNRnxva4VSdYQKXTw/OVGZVfDuoSVmjaBg+XkXtwK+h7vjOMh6bC9jYbRszLeK7R6kNcKGDxuqadG6q2PN+3qiJBd+oUu0oj1IPenq/Owm3o2drCVdBXgvufCSGCv/4wGkQddaWg9czdLyT+SVICvHtnQPFsJX6V+wxrDen6yRUalXTasPgIAqbfUD9mQK4Y1feVYo9fo/kZ+/tRM50PhyxfthA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g3mQTLOCiiC/Z/zavaCQCw5lNaxF1S6jwV0mqhbQGOw=; b=XhQUUDNeKF1Ph5gHSsUEVmpy+uWH6600ElQJaqahaEZBsrjsmT4cyvgNHeHtV8yeSVE1SEybgS5fTnTXzOGKYwHkxd2+D5ayOd6yTTxub4lkgkjCRN3tMij1fnGLsbTG6xmocCst65IIpuKtys8kysdMYWwBwBzf7E3fdh//W2w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from PH0PR01MB8048.prod.exchangelabs.com (2603:10b6:510:280::7) by MW6PR01MB8270.prod.exchangelabs.com (2603:10b6:303:241::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Wed, 24 May 2023 00:41:00 +0000 Received: from PH0PR01MB8048.prod.exchangelabs.com ([fe80::bbdb:b58c:140e:c4e1]) by PH0PR01MB8048.prod.exchangelabs.com ([fe80::bbdb:b58c:140e:c4e1%6]) with mapi id 15.20.6411.019; Wed, 24 May 2023 00:41:00 +0000 From: Minh Nguyen To: devel@edk2.groups.io CC: patches@amperecomputing.com, quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, nhi@os.amperecomputing.com, minhnguyen1@os.amperecomputing.com Subject: [edk2-platforms][PATCH 1/4] JadePkg: Correct PCD names for SMBIOS Type 0 Date: Wed, 24 May 2023 07:40:34 +0700 Message-ID: <20230524004037.39269-2-minhnguyen1@os.amperecomputing.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230524004037.39269-1-minhnguyen1@os.amperecomputing.com> References: <20230524004037.39269-1-minhnguyen1@os.amperecomputing.com> X-ClientProxiedBy: SI2P153CA0021.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::20) To PH0PR01MB8048.prod.exchangelabs.com (2603:10b6:510:280::7) Return-Path: minhnguyen1@os.amperecomputing.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR01MB8048:EE_|MW6PR01MB8270:EE_ X-MS-Office365-Filtering-Correlation-Id: 7728056d-fddc-4bef-a488-08db5bef8bb2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ByfP38+xcaUFHP4OmJAINfU2cmHESAM2JiZbHUlwmsLReO2fToKQyQD69IOL5e8fSh4uQvza8Luq0iDnV6solVGvicehxBVrluuF4jzcLRfvHsdzbU8VI99l6nnqb+6/ElFuqgLzy2oUOoUTeGqEyeyJQUoI29zpeieC9/Xz5X6s6Fqg/4Y6I+AyAEPWW8NguZiTMjVAp6fZ7PFtCAdO82udbNhCS44ZkHbialO4Ak7JRsutAh4KLrnIgIFzK7/T6fHVcxeck2TMVcM/nVI5pJbC3JfpynhqsIM/QfSrf00elrMgtYeOvUkeekWS0ZSbse+IWeNdjvOK4oTlDn4P4SaB+Fw51jaqcocL2QB76KhSkSDgI7T/epA7188yBHOr9lfYBMehZ3GDrvbvOebtJBm5ik8LFd4GIWajAGsPeRLm5Q8/8df1rf/RLMW1J16s8p7Juumzq0W07uiz8SgLXgwmGK0hKgungMvrb7aVIiavewZqNO40UajhzZshXeUhkfRdBjSaYE5BCJgsD1f/EJmGW+hmykdllHkljE8jv6NRh9LO2SndbMamJNw6BNIL9d0PxuZSDkeRWUPRvMIvcbO+kghttY4ALYzH4v9JLdPCcAzVl5SF7r3Id3fbrQ0F X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR01MB8048.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(39850400004)(346002)(396003)(366004)(136003)(451199021)(38350700002)(83380400001)(41300700001)(2906002)(8676002)(6666004)(6486002)(52116002)(8936002)(5660300002)(38100700002)(2616005)(86362001)(26005)(186003)(1076003)(478600001)(6506007)(6512007)(19627235002)(107886003)(66556008)(66476007)(66946007)(6916009)(4326008)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?q6218bik49Z95qI4FdBnme/nsqibQfJXhqBClZ0jpp3/QHvEFS4hC8GaAI72?= =?us-ascii?Q?djo9DcapB6lrnuAo0uDIb0QFwB7f7Lo7FszfRoXtb0Yafw3sNNCGPrHTXjgQ?= =?us-ascii?Q?iePRcOxOgC04lqBzxSC6t598Qhti+VVuc4HM0RoJWdJskTCnWDIbJxVWGPOR?= =?us-ascii?Q?Rei6LSqFUvQlR0VXRpKa/SeuezU959MboeFn0ERM6H2r5nk/KktIoUeYUOJU?= =?us-ascii?Q?nQkOuv3oAtOEX0zIKXJt+2Cc77HXoJdZjrOgwq83qhFbbmioA9UbXD1gf/g/?= =?us-ascii?Q?vZZrQeiTAeZaOPLPFQ+FWZF8LHtAT/UMDi6Ou36pD/PJp8zWZUj3yGCE3mju?= =?us-ascii?Q?qn0Tj/dBRGb0dBaKwKWEPzRi3QgCAhMHyqEse0cSE6xb8MRN59EZPSfH/iNr?= =?us-ascii?Q?WC/valeeT7fG64CuarMAvCXp2W1nVoWLSftEHO+leLtE4a/u8LobAA+ypiFy?= =?us-ascii?Q?vh8Ddg73Btm+h2Hc7ID2mlDfz9yUvDS6Zm46D5zwIG74gFiMrffRBZHOgGzS?= =?us-ascii?Q?dkANc9JRkyqoUpQifylJiFczteJxMrAbNKSAAL2BcJ5dbS8D+WysfneOgERV?= =?us-ascii?Q?9usiLEF8ERejmUGr2SYbg3RpcX1Chy8Di+uuKjraqO32H3WXjXtlQn/ggT4x?= =?us-ascii?Q?mjFxTzk0D8fR/TNphXWzXMt5FLjdjNHwWneN5NZLrwoAL0ETW/VvziChcA4L?= =?us-ascii?Q?dj+h5yCE84Hr3OoOybhg+IUluTicJE0wOByMhV0aZP0KWvRf0KTe5YT3LvZX?= =?us-ascii?Q?4lMfcbNHHC4gMAoa+DP0WcuzxLH1kGtW9uqr+lST3veGJroZDUXuMsWivwHc?= =?us-ascii?Q?Hss0lGvIeD5CVoj+sD38+0X1/1L8qqgXl0WeMmaczg8Ax7JKHYYonJGFsTKc?= =?us-ascii?Q?NrRfPKBjtXN8ugRDwzbfy7b/pUeualcWInt5+RCA1c2Bm3zZ46r7BcI+Dw+C?= =?us-ascii?Q?9rRqc6jRKAZhDvZxYi9KzgSAgsIe9FCp785d1VrrkrTRbcnbqgkBAmG7rXz5?= =?us-ascii?Q?INcIpK12D0XSKJrisKmOKO90SOWZqb1gYRxCWsrOXj2+pMScyRehyY3xwChZ?= =?us-ascii?Q?WWQ8kpXlVOxMfcyq3c9TupWEVbSqJCLbCIMiWsCJum/TOSGjCzg7KMd4Cdmn?= =?us-ascii?Q?PKgLQ++dySZTgWZnkT+MEj1Y7feNwkc6y5zzyu1DnyWmPyHsVCqutvHEPAyb?= =?us-ascii?Q?wL86xWNbMZLcXCn0JZW3oehYJH74QesmMRlApmrjBZe62P5W6aCUdK1BfxS6?= =?us-ascii?Q?M+hEIu5lvexm/8d6lGusX/bLJXCR2sJ0TK7KCqQ0XzP2FH8r2lFzW3i4brvl?= =?us-ascii?Q?9/jZrAso1RLpQ1FXlOT1HQNOkMHoLCoiySAaa8KPpOPAZNDnRZpV0hXOyDZz?= =?us-ascii?Q?fWedWNXz7CH54HXAZ31cep9EeI47cIZAoK9FIKg0iJOvRnHm0mt8+b88IhuR?= =?us-ascii?Q?MmDTdtq8a7y0DTrMkbEwu3Kysa27yl0DwxUXMPmkLheWzF1HMLj5OlaLVx0y?= =?us-ascii?Q?vXh7K+MzSotXoHgEP/Uf+Si8qRUAHA2ijtCi6cdJRBK1K2QvaZ4D1Tv5CLlM?= =?us-ascii?Q?j2tqekLZzRxhqmZoXNwcx1IC8Ye3UP6GT1G9XVggf3rZfTf19WkgpmGqGgRV?= =?us-ascii?Q?yu3cvD+Om7oGGNeK8u6icgtVNbBNoAZS/qv39DLo+X3x?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7728056d-fddc-4bef-a488-08db5bef8bb2 X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB8048.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2023 00:41:00.5266 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GFlTGEWg9M+Dr3UgCP2VNRgaNdQvICNTnbtsP3ly00HtwiAIxUD3WgksW2c/t3aWzGvJaUnqvJOsgvcPLGmIe7sU/KS8E048yCF9DD3/NfHE0eEkl8HYs4duZVXFQIfF X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR01MB8270 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain This corrects "PcdSmbiosTables1MajorVersion" and "PcdSmbiosTables1MinorVersion" of SMBIOS Type 1, these PCDs should be for Type 0. Signed-off-by: Minh Nguyen --- Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec | = 14 ++++---------- Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | = 6 +++--- Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c | = 6 +++--- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec b/Silicon= /Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec index 625a9b2b1e89..eeaf8cf87435 100644 --- a/Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec +++ b/Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec @@ -1,6 +1,6 @@ ## @file # -# Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. +# Copyright (c) 2020 - 2023, Ampere Computing LLC. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -64,19 +64,13 @@ [PcdsFixedAtBuild] gAmpereTokenSpaceGuid.PcdPmproDbBaseReg|0x100001540000|UINT64|0x00000004 =20 # - # SMBIOS Type 1 Pcd + # SMBIOS Type 0 Pcd # - gAmpereTokenSpaceGuid.PcdSmbiosTables1MajorVersion|0|UINT8|0x00000005 - gAmpereTokenSpaceGuid.PcdSmbiosTables1MinorVersion|0|UINT8|0x00000006 + gAmpereTokenSpaceGuid.PcdSmbiosTables0MajorVersion|0|UINT8|0x00000005 + gAmpereTokenSpaceGuid.PcdSmbiosTables0MinorVersion|0|UINT8|0x00000006 =20 [PcdsFixedAtBuild, PcdsDynamic, PcdsDynamicEx] # # Firmware Volume Pcds # gAmpereTokenSpaceGuid.PcdFvBlockSize|0|UINT32|0xB0000001 - - # - # SMBIOS, default or template values - # - # SMBIOS Type 0 - BIOS Information - gAmpereTokenSpaceGuid.PcdSmbiosTables0BiosReleaseDate|"MM/DD/YYYY"|VOID*= |0xB0000002 # Must follow this MM/DD/YYYY SMBIOS date format diff --git a/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatfo= rmDxe.inf b/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatfor= mDxe.inf index a70af6faa212..77148b417b0f 100644 --- a/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.i= nf +++ b/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.i= nf @@ -1,6 +1,6 @@ ## @file # -# Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. +# Copyright (c) 2020 - 2023, Ampere Computing LLC. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -40,8 +40,8 @@ [Protocols] [Pcd] # Type 0 gAmpereTokenSpaceGuid.PcdSmbiosTables0BiosReleaseDate - gAmpereTokenSpaceGuid.PcdSmbiosTables1MajorVersion - gAmpereTokenSpaceGuid.PcdSmbiosTables1MinorVersion + gAmpereTokenSpaceGuid.PcdSmbiosTables0MajorVersion + gAmpereTokenSpaceGuid.PcdSmbiosTables0MinorVersion gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString =20 gArmTokenSpaceGuid.PcdFdSize diff --git a/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatfo= rmDxe.c b/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformD= xe.c index add89f5978d6..32735496ecdc 100644 --- a/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c +++ b/Platform/Ampere/JadePkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. + Copyright (c) 2020 - 2023, Ampere Computing LLC. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -790,7 +790,7 @@ GetBiosVerMajor ( VOID ) { - return (PcdGet8 (PcdSmbiosTables1MajorVersion)); + return (PcdGet8 (PcdSmbiosTables0MajorVersion)); } =20 STATIC @@ -799,7 +799,7 @@ GetBiosVerMinor ( VOID ) { - return (PcdGet8 (PcdSmbiosTables1MinorVersion)); + return (PcdGet8 (PcdSmbiosTables0MinorVersion)); } =20 STATIC --=20 2.39.0