From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.123]) by mx.groups.io with SMTP id smtpd.web09.1732.1663050173479598860 for ; Mon, 12 Sep 2022 23:22:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=dLrYLzK0; spf=pass (domain: os.amperecomputing.com, ip: 40.107.220.123, mailfrom: nhi@os.amperecomputing.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QnJRvaYZifPAlxI672MMkq8QsA8cqWFKastGfkS+0Miqjuc7qfLS7DH1p1mX+/JBaf/P9R6uoTwVS8e3Sg/NefFyCIafChj+i+MWZjCBfFf9aPR0mzlNYkg/fw1/L2RzM9QLGB/OBYKcLwqInF/wWgRWm8g9hFjOFO7N9XoPIcFrq4EjqW16hZ0cYVV1LaFzgFxOz1PuG7kv0IUNuekAz3efl4jnI5z9/RzoLBQtopiuULhmHhxeaJMG1jHT+BjB0uOh7TJ7kTdEPQ3RNgv17md7YpmoLQ2fzrB/g4+9UwTeqYBEcJzIZGetEjng1uoVC3xYP5Htyqj+0TujzaMl9Q== 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=ioK0oXra4vWMVoZegarQ1za3YhHpw2DqNnq0gzFqcAY=; b=PoscVMxN+ZvZWyFmP7k0JhmeNd7wN/cG4RfyaUGLUw3OWvD9AGj+6PrG6Qwp+YvoFirmGRXkbn/0AftDG9bVHCgfRwrPnKqAetjyLuFjPb2bUFLu9yh8HMmP20Doe6yvg/X4k7F/5slPMFcopEz6xVVsvrwKHoYbwwP/ua3IxAuoMGQbyPGlDenXRZnpHBseeQ2KEolmO34OuFrHTdA3VacrAxYVMdyfCkBS1kAWPACeUPumdJDCcCXlqTdxjwMZr5xnftChIfdUxEmfa0OthZTuuKdUlCefEZajkv+tNCsF0Tu2ue8qbVRlgX0Cn07LQSzKIKNTFFmYNKH0xyVnKQ== 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=ioK0oXra4vWMVoZegarQ1za3YhHpw2DqNnq0gzFqcAY=; b=dLrYLzK05xO0XDCcyiEstjl/F81sBj0Eu5n4kWQrkcp7W/oHs7m84m2L1ePEtah5yEH44UIrthzCHfNbsvPX84buiSVom8FHAXiB3FieOfVYYJHxs2w7+veA249JmoyjNA2VFVSdUcYoYkrC89KmgvqQfUlPGgZR6xvjxOx3gVI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from PH0PR01MB7287.prod.exchangelabs.com (2603:10b6:510:10a::21) by DM6PR01MB3644.prod.exchangelabs.com (2603:10b6:5:92::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14; Tue, 13 Sep 2022 06:22:49 +0000 Received: from PH0PR01MB7287.prod.exchangelabs.com ([fe80::fc6b:4f56:8f32:dfa5]) by PH0PR01MB7287.prod.exchangelabs.com ([fe80::fc6b:4f56:8f32:dfa5%4]) with mapi id 15.20.5612.022; Tue, 13 Sep 2022 06:22:49 +0000 From: "Nhi Pham" To: devel@edk2.groups.io, quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, sami.mujawar@arm.com, quic_rcran@quicinc.com Cc: patches@amperecomputing.com, Nhi Pham , Rebecca Cran , Ard Biesheuvel Subject: [PATCH v3 3/6] ArmPkg/SmbiosMiscDxe: Support fetching System UUID Date: Tue, 13 Sep 2022 13:19:44 +0700 Message-Id: <20220913061947.735951-4-nhi@os.amperecomputing.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220913061947.735951-1-nhi@os.amperecomputing.com> References: <20220913061947.735951-1-nhi@os.amperecomputing.com> X-ClientProxiedBy: SG2PR06CA0194.apcprd06.prod.outlook.com (2603:1096:4:1::26) To PH0PR01MB7287.prod.exchangelabs.com (2603:10b6:510:10a::21) Return-Path: nhi@os.amperecomputing.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR01MB7287:EE_|DM6PR01MB3644:EE_ X-MS-Office365-Filtering-Correlation-Id: 94a7f65c-45cf-43cb-4d81-08da95506184 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xmpIq24SjD6xEbJQdSuY8VdC3BPSDdY/gDGOihKSRrXZURBN0jTjBC98O/xdbIYkr2IQGEQCFmRRMEfuHGHaSyRcPFlonPZKWCHh2X/gIAS1iE94zB/kN/ngDiT8n2dhDmzN/cbo9oZmFUqtmDQPc5R9khVXt6thP1LLDr2hRP2vrwby+onwN07o6a2MJA7Y3b6zHiaLIzNx3eHWlB/fkpwDEWv2fxNfZWDfFYvulbG1kR2O4bQHeWXq6oaG3TYj0CzcNA2a7Lsbu1Yi9sbAkDZerydm/VVY5RSKQhPlNBVzNTwEAvwuDF/a9zCeSXsFGhKwR3ATCy16Gyyda/zR7fOlmgueq239teRj/CeQ2Ir5iAFqyPaa1oMPraEj6w3Aja6kSAad51Lpo+GyIaYCcIgcCXjwHuf6oV5MhnZsO/LNuLaE9iYl8zDn8UV6UDCFFywUOMQAbpIsWnOBNZVI7vm3C1p4n18/X8r4zSbSJ2Rl/Via9fICBtxB9TnJc/beT0ZiykZHfTAuOOEbIfEcTOMF4X+5gWPRwWIacerGG1B4gfvLw0YLweDgL8+hU7aK3OtJokdAi30sW2Ce9XJGbhAQgYtdNxIiNSlItVeRVuCtE34W8MhcpUrRomdyG7KVBfCZ9H8hEYfQYuSV1zGD70WAqBPqQSMXXP6ys/LAxHv5ixbbND9YPb44aiciKtRr8PAyoDKJolL30QVB5IoGrmO175OtYZqXNk8iZjkby2R+kKldKAZhjBOGESDygy+ZGBmlfDgfChOWvvo7wvzuUw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR01MB7287.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(39850400004)(136003)(366004)(376002)(346002)(451199015)(19627235002)(66556008)(6666004)(8676002)(316002)(66946007)(478600001)(4326008)(66476007)(83380400001)(2616005)(6512007)(86362001)(41300700001)(6486002)(26005)(54906003)(2906002)(6506007)(186003)(5660300002)(1076003)(38100700002)(8936002)(38350700002)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XCktkjUscSMdNtPxh4H7VvRxhGMRB4NKE9UOXeuA4O/aDg90vU3vFcD2t6ru?= =?us-ascii?Q?33SCpfClKhIj3whczaLtuL8Ip9k9IIwi7dHCfC6NTXs1W2oiFWXhvFoSrjy3?= =?us-ascii?Q?qlLaRHggvBGYnhKaCgSB/1fRFl8YZC5bdJUeh/yDLSJDArlWdRcvtQNez8/n?= =?us-ascii?Q?gGlpvrDWvj630ZgNN60U311sWVZawxakn9pQ3yaMiL0s/vRLhlt4qr+R1fvd?= =?us-ascii?Q?UFKShiZ8gBljAyVIBRvO2M4M6db+av/kRb2YzfVg09FRVNPhNN2zHvK7hj9a?= =?us-ascii?Q?zkk2pIYz0hHgGBnkH+aNll4slsin4kAoxoREGZy6Xush4EkHLZEp3A3pKcyr?= =?us-ascii?Q?gsID5J1dVl8rzuYm1+sD9nBoo4nPB9/YRCnnHkZtgciPiFr1lbwbTmowq5KL?= =?us-ascii?Q?DAf7+G9d+F3ydnIowc10sXz5YCO/xWUFFCnLA5d6zS1CApJBAC1lnGSSvixt?= =?us-ascii?Q?vDEE4DuVnm2/m4KBDyX681etzjFieBqQIfWMu5zZI8sDsDs4Ubm8L+ow0wsI?= =?us-ascii?Q?s0RUH3+/xdTJITgF7A3wq9GzFfAATqSfEeKvj5qWQolbmtvqXOZQilsnvtDp?= =?us-ascii?Q?q/22A9794GFmeEYtRVRW2luzjL91j/1z4JU5sSyAQlxIr3KcSlHDTb2l3kaS?= =?us-ascii?Q?aHFo/Aj3dkhW3NBYclVJnJbZZXFSDaLve5AtVffyf8o3ohrMUxAc9yjrPrdo?= =?us-ascii?Q?IcR0fKXFJBv9zHoejuySYHfOy3xOAyrGTOu8veyIL3rStbhAGT8Tdya85O97?= =?us-ascii?Q?W2CeXgTg8SXirVid8T43NgZdDSvNtTtQJAzfNT1vJoAuu+OkkQZWamXzWlHF?= =?us-ascii?Q?dBL2FG4keBOyaFZKszWursMas+vLPwFWDYf6fdsKGPuFBqh+HozkhG0tvLLs?= =?us-ascii?Q?0zzi5RuSHWd8OTcAex/pb2lIsrmXinSjLefW1pbDtQYhUICmT0lqKdlhQr9O?= =?us-ascii?Q?/kXwN173mAw2vkelVwXk0DB26J51qT5lMm/HrBxAxqX9baCR/5X89kem6tSZ?= =?us-ascii?Q?U1P8vUBTm6q1SbfVtgnc1X+oyVJtHbw6ANQ+24iRyI3JzPuyzKe3aaihzXe2?= =?us-ascii?Q?c3ZHeK/LgYKCj+CczNAbT4CiLohwO2RkPusnL2lPOru3tCTeogoRzMpUpSgJ?= =?us-ascii?Q?SJ5lX05JhggBOg1Ba2uqE48CDFczL4qAOCWdocKwP69WXTMKbmS1BYxSJ9rM?= =?us-ascii?Q?nO58mUEPjbVcFBfQ5YmivK1AmeEG0/LuvbSC7xpuqOf/6Rx9pfV2fKbaQxs0?= =?us-ascii?Q?N/J0PKBfxeApWUeHaalGA6m89xuuTk1Jhc14OStkumasGRDstq1agdlb39hj?= =?us-ascii?Q?DRUnMsHrJ7JbAGAzF9EhutLnR6wDTklM1es5kAjaBExW6/Bt9fJJrHiFVQlB?= =?us-ascii?Q?8ARpeiH9B1R/nxPj2/wflBGaeaCgg/SD5Kfw2KHLItNVMFIDgFnxb5/gt7Mj?= =?us-ascii?Q?/xL47bt43JXrba8kddOu/xxeOeuxoxTQNyoK0+0qpaW3AqKpR5v+BVaQPoIJ?= =?us-ascii?Q?AnC3Yyz6Ejb0NdGYMaXDZUyqEnVdvwFF5yiN3CF03GkUHs1wWfAkbP+oEZN9?= =?us-ascii?Q?WrTJ4Q0UCaIXXRpwh/g82cboEIRsyjzAVGeeTyaSlh4ACPrzk7Soh58LKocI?= =?us-ascii?Q?tofpztotPUGKB4QGYhD0Z1U=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94a7f65c-45cf-43cb-4d81-08da95506184 X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB7287.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 06:22:49.6234 (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: 2oDFKw/KQWvBrD6Qg+PBQwRBCbkLeaSgmt586Pmh4oOtuOCPR+cPQuJ3xEXthip6QYCS+IzQsSEgYa8Oa3yg59BRU+es4ZTlbXAjJKkN3L4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR01MB3644 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain This adds an API to OemMiscLib for fetching the system UUID according to the platform. Signed-off-by: Nhi Pham Reviewed-by: Rebecca Cran Reviewed-by: Sami Mujawar Acked-by: Ard Biesheuvel --- ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf = | 4 ++++ ArmPkg/Include/Library/OemMiscLib.h = | 12 ++++++++++++ ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c = | 18 ++++++++++++++++++ ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunctio= n.c | 3 ++- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf b/Ar= mPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf index 5c4268f68b4a..8653f57720d1 100644 --- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf +++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf @@ -1,6 +1,7 @@ #/** @file=0D # OemMiscLib.inf=0D #=0D +# Copyright (c) 2022, Ampere Computing LLC. All rights reserved.=0D # Copyright (c) 2021, NUVIA Inc. All rights reserved.=0D # Copyright (c) 2018, Hisilicon Limited. All rights reserved.=0D # Copyright (c) 2018, Linaro Limited. All rights reserved.=0D @@ -29,3 +30,6 @@ [Packages] [LibraryClasses]=0D BaseMemoryLib=0D DebugLib=0D +=0D +[Guids]=0D + gZeroGuid=0D diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/O= emMiscLib.h index 330bb4b014de..d87737db9c2b 100644 --- a/ArmPkg/Include/Library/OemMiscLib.h +++ b/ArmPkg/Include/Library/OemMiscLib.h @@ -235,4 +235,16 @@ OemGetChassisNumPowerCords ( VOID=0D );=0D =0D +/**=0D + Fetches the system UUID.=0D +=0D + @param[out] SystemUuid The pointer to the buffer to store the System= UUID.=0D +=0D +**/=0D +VOID=0D +EFIAPI=0D +OemGetSystemUuid (=0D + OUT GUID *SystemUuid=0D + );=0D +=0D #endif // OEM_MISC_LIB_H_=0D diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c b/ArmPkg/U= niversal/Smbios/OemMiscLibNull/OemMiscLib.c index 98970407a65e..32f6d55c1a9a 100644 --- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c +++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c @@ -1,6 +1,7 @@ /** @file=0D * OemMiscLib.c=0D *=0D +* Copyright (c) 2022, Ampere Computing LLC. All rights reserved.=0D * Copyright (c) 2021, NUVIA Inc. All rights reserved.=0D * Copyright (c) 2018, Hisilicon Limited. All rights reserved.=0D * Copyright (c) 2018, Linaro Limited. All rights reserved.=0D @@ -10,6 +11,7 @@ **/=0D =0D #include =0D +#include =0D #include =0D #include =0D #include =0D @@ -236,3 +238,19 @@ OemGetChassisNumPowerCords ( ASSERT (FALSE);=0D return 1;=0D }=0D +=0D +/**=0D + Fetches the system UUID.=0D +=0D + @param[out] SystemUuid The pointer to the buffer to store the System= UUID.=0D +=0D +**/=0D +VOID=0D +EFIAPI=0D +OemGetSystemUuid (=0D + OUT GUID *SystemUuid=0D + )=0D +{=0D + ASSERT (FALSE);=0D + CopyGuid (SystemUuid, &gZeroGuid);=0D +}=0D diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufac= turerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemMa= nufacturerFunction.c index 5cf72644d0b2..22fb5eccaa63 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFu= nction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFu= nction.c @@ -4,6 +4,7 @@ =0D Based on files under Nt32Pkg/MiscSubClassPlatformDxe/=0D =0D + Copyright (c) 2022, Ampere Computing LLC. All rights reserved.
=0D Copyright (c) 2021, NUVIA Inc. All rights reserved.
=0D Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
=0D Copyright (c) 2015, Hisilicon Limited. All rights reserved.
=0D @@ -160,7 +161,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscSystemManufacturer) { =0D SmbiosRecord->Hdr.Length =3D sizeof (SMBIOS_TABLE_TYPE1);=0D =0D - CopyGuid (&SmbiosRecord->Uuid, &InputData->Uuid);=0D + OemGetSystemUuid (&SmbiosRecord->Uuid);=0D =0D OptionalStrStart =3D (CHAR8 *)(SmbiosRecord + 1);=0D UnicodeStrToAsciiStrS (Manufacturer, OptionalStrStart, ManuStrLen + 1);= =0D --=20 2.25.1