From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id CA77BAC14DF for ; Tue, 30 Jul 2024 15:08:35 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=3c1HzLclRcsv9ejEhvQC68OC27E8QsjLyBM7XXLA4O0=; c=relaxed/simple; d=groups.io; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20240206; t=1722352115; v=1; b=wYOxMw08cmI7NftHh+1VdVMAPX8DYxROwJ9YnlMv1LBpviPYIWq1RqwA57sqrPCi9HuxG6c4 cxZ9wur0t6DQ7WmE/vBkYzUwZgxCoyxbihVIQq97+hgplQG0GWMOf2o3AzyWw4Bn87fI2/pIA5C egawM715VFAwPlegsZDmWmqVWRSBh3XSEu2643cJw4u4etXJTwq+pSYBXwTW+uz227JHvyjbr3G c98jSp8pTGi8W6ji6jbrk2u1HWpO8wTezBeSiIDdWB++rEk0o7DkM8n+T+tz4cTjWDFV/Mal7G/ n1Kdi+5/xhN1aH+vp0DWPDqZ5svGWFs1I8CSufANdz1uw== X-Received: by 127.0.0.2 with SMTP id q9SeYY7687511xQQtqzcydsJ; Tue, 30 Jul 2024 08:08:34 -0700 X-Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by mx.groups.io with SMTP id smtpd.web11.56034.1722258972247659451 for ; Mon, 29 Jul 2024 06:16:12 -0700 X-Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-66a8ce9eecfso32616197b3.1 for ; Mon, 29 Jul 2024 06:16:12 -0700 (PDT) X-Gm-Message-State: V86IxsEDSN42hk8yevOsajJ9x7686176AA= X-Google-Smtp-Source: AGHT+IEHsptIY6NST+NS7qiRnwgnH2jrEAo3WAIYYUxFT272LKjd63d0c3TQ5Kl+rsM20q+kyM9IJH5D X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:ab6c:0:b0:e03:5e58:489b with SMTP id 3f1490d57ef6-e0b55b99256mr74213276.3.1722258971284; Mon, 29 Jul 2024 06:16:11 -0700 (PDT) Date: Mon, 29 Jul 2024 15:16:00 +0200 Mime-Version: 1.0 Message-ID: <20240729131600.435025-1-ardb+git@google.com> Subject: [edk2-devel] [PATCH edk2-platforms 1/1] Platform AARCH64: Drop bogus local copy of gArmMpCoreInfoPpiGuid GUID From: "Ard Biesheuvel via groups.io" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Tue, 30 Jul 2024 08:08:26 -0700 Resent-From: ardb+git@google.com Reply-To: devel@edk2.groups.io,ardb+git@google.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=wYOxMw08; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: Ard Biesheuvel There is a pattern that has been copy-pasted a number of times where a missing references in the INFs [Ppis] section is 'fixed' by creating a local GUID variable. Fix all of those. This is just a janitorial patch with no functional changes so fixing all of these in one go. Cc: Leif Lindholm Signed-off-by: Ard Biesheuvel --- Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf | 3 +++ Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf | 3 +++ Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf | 3 +++ Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 3 +++ Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf | 3 +++ Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 4 +--- Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c | 4 +--- Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 4 +--- Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c | 4 +--- Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c | 7 +------ 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf index 18b74bc42ef4..2a6ae8a4bb9f 100644 --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf @@ -35,6 +35,9 @@ [Sources.common] [Sources.AARCH64] HiKeyHelper.S +[Ppis] + gArmMpCoreInfoPpiGuid + [FixedPcd] gArmTokenSpaceGuid.PcdArmPrimaryCore gArmTokenSpaceGuid.PcdArmPrimaryCoreMask diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf index 81167c76f95c..5ccf4a11d5e2 100644 --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf @@ -31,6 +31,9 @@ [Sources.common] HiKey960Helper.S HiKey960Mem.c +[Ppis] + gArmMpCoreInfoPpiGuid + [FixedPcd] gArmTokenSpaceGuid.PcdArmPrimaryCore gArmTokenSpaceGuid.PcdArmPrimaryCoreMask diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf index a61da278c705..ffeb28d8a901 100644 --- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf +++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf @@ -37,6 +37,9 @@ [Packages] Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec +[Ppis] + gArmMpCoreInfoPpiGuid + [Pcd] gArmTokenSpaceGuid.PcdMmBufferBase gArmTokenSpaceGuid.PcdMmBufferSize diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf index 83c3f4bf193f..2ab649019aa0 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf @@ -39,6 +39,9 @@ [Sources.common] [Sources.AARCH64] AArch64/Helper.S +[Ppis] + gArmMpCoreInfoPpiGuid + [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf index 11134b8fc497..c7b3368ac9e1 100644 --- a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf +++ b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf @@ -35,6 +35,9 @@ [Sources.AARCH64] [Guids] +[Ppis] + gArmMpCoreInfoPpiGuid + [FixedPcd] gPhytiumPlatformTokenSpaceGuid.PcdSystemIoBase gPhytiumPlatformTokenSpaceGuid.PcdSystemIoSize diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c index 801d63398524..057d566bde67 100644 --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c @@ -117,14 +117,12 @@ PrePeiCoreGetMpCoreInfo ( return EFI_SUCCESS; } -// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is undefined in the contect of PrePeiCore -EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID; ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo }; EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI, - &mArmMpCoreInfoPpiGuid, + &gArmMpCoreInfoPpiGuid, &mMpCoreInfoPpi } }; diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c index 89cca920ad8d..d7f65420a593 100644 --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c @@ -115,14 +115,12 @@ PrePeiCoreGetMpCoreInfo ( return EFI_SUCCESS; } -// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is undefined in the contect of PrePeiCore -EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID; ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo }; EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI, - &mArmMpCoreInfoPpiGuid, + &gArmMpCoreInfoPpiGuid, &mMpCoreInfoPpi } }; diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c index f2ec923d6f8d..84104213d68b 100644 --- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c +++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c @@ -125,14 +125,12 @@ PrePeiCoreGetMpCoreInfo ( return EFI_SUCCESS; } -// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is undefined in the contect of PrePeiCore -EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID; ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo }; EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI, - &mArmMpCoreInfoPpiGuid, + &gArmMpCoreInfoPpiGuid, &mMpCoreInfoPpi }, }; diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c index 0a00cd9d3e3b..070bd0a7f5dc 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c @@ -59,14 +59,12 @@ PrePeiCoreGetMpCoreInfo ( return EFI_UNSUPPORTED; } -// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is undefined in the contect of PrePeiCore -EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID; ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo }; EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI, - &mArmMpCoreInfoPpiGuid, + &gArmMpCoreInfoPpiGuid, &mMpCoreInfoPpi } }; diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c index a192797d1cfa..7338fe53d6c0 100644 --- a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c +++ b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c @@ -100,18 +100,13 @@ PrePeiCoreGetMpCoreInfo ( return EFI_SUCCESS; } -// -// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is -// undefined in the contect of PrePeiCore -// -EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID; ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo }; EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI, - &mArmMpCoreInfoPpiGuid, + &gArmMpCoreInfoPpiGuid, &mMpCoreInfoPpi } }; -- 2.46.0.rc1.232.g9752f9e123-goog -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#120116): https://edk2.groups.io/g/devel/message/120116 Mute This Topic: https://groups.io/mt/107626562/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-