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 1064EAC17B0 for ; Tue, 30 Jul 2024 12:45:37 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=tELXU+2sWhwNZqV7kcU83KpzDC+4yBpEf3Eq2gpTZMM=; c=relaxed/simple; d=groups.io; h=Date:From:To:CC:Subject:Message-ID:References:MIME-Version:In-Reply-To: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:Content-Disposition; s=20240206; t=1722343537; v=1; b=anhmUOL2ZOnBJbLBaUvuffce7mxuXBIM46iPRWAJDuzJFD77STtdM2hht54g5eJwxxZbLZ8R cBCWsj+Up0OronE2IFOG6sK847MpIJCrZhoNU+4kT0nbfCiPmPI/i0PQYXgWIfw88Fgq+bHZnTF LhKknXPkUUH5Q87SD2FcT6LYlhVZIsyYDt6JJpjL7kVh4X+nD3dlxFy0NImaZnRPR42ePDqmAnW oW9MtaX2+2WpQmuMl41Swr2XKfVeCOYkvPKxifpWtPdQnEJ+5fha9hDnMyPKzHJwO+oa+VCCgpF LSGIfYlzfgIhiwZ43ZUJz8qsljrHSrlZ6L3G1rHpEKXuQ== X-Received: by 127.0.0.2 with SMTP id FRnQYY7687511xuhF7Zr2QJI; Tue, 30 Jul 2024 05:45:36 -0700 X-Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.16645.1722343536011514975 for ; Tue, 30 Jul 2024 05:45:36 -0700 X-Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46U9Rf7l009002; Tue, 30 Jul 2024 12:45:35 GMT X-Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 40mrytyddx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jul 2024 12:45:35 +0000 (GMT) X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA05.qualcomm.com (8.17.1.19/8.17.1.19) with ESMTPS id 46UCjYEI009365 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jul 2024 12:45:34 GMT X-Received: from qc-i7.hemma.eciton.net (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 30 Jul 2024 05:45:32 -0700 Date: Tue, 30 Jul 2024 13:45:29 +0100 From: "Leif Lindholm" To: Ard Biesheuvel CC: , Ard Biesheuvel Subject: Re: [edk2-devel] [PATCH edk2-platforms 1/1] Platform AARCH64: Drop bogus local copy of gArmMpCoreInfoPpiGuid GUID Message-ID: References: <20240729131600.435025-1-ardb+git@google.com> MIME-Version: 1.0 In-Reply-To: <20240729131600.435025-1-ardb+git@google.com> X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-ORIG-GUID: PMI2rNdC3vW4uIylI8EPmO-XCafA8hML X-Proofpoint-GUID: PMI2rNdC3vW4uIylI8EPmO-XCafA8hML 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 05:45:36 -0700 Resent-From: quic_llindhol@quicinc.com Reply-To: devel@edk2.groups.io,quic_llindhol@quicinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: bCglQitW8bRN7qR7FT7GGypyx7686176AA= Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=anhmUOL2; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=quicinc.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io On Mon, Jul 29, 2024 at 15:16:00 +0200, Ard Biesheuvel wrote: > 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. Eew. > 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 Reviewed-by: Leif Lindholm Thanks! / Leif > --- > 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 (#120077): https://edk2.groups.io/g/devel/message/120077 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] -=-=-=-=-=-=-=-=-=-=-=-