From nobody Wed May 15 18:29:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+113601+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+113601+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1704963668; cv=none; d=zohomail.com; s=zohoarc; b=JbTaXFQcruKRq2B89IxaiGBUw5VDEt+c0eE7zgy4TlQK2C4ujecVDGs6H9xYQeUqQQye+qzWDBjmWWkqjCuYU5dL6RGhK6rZ9vker2EFHj8H6jID/jXAZ14BnZePMpYJf//A1uNvOBTgYCiho1aJ6cfrDkm/shwJVU18H5MWJDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704963668; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Sender:Subject:Subject:To:To:Message-Id; bh=5rqfUFkAeA7WGMgz7LQ+rBvgna+18ZRumiEo2ITscWw=; b=G2syK4aqMu+4FKOAH6ggqBinbMbeiyILWZYcCkWXHlrdsbgOSyyY0JPPy2e0B7aWcBOfYJzmcS3308v7U6qrxJp/tagDc3ksmYsINotEFQuqYYwwyqUpIi4B3mbeCIFqbl2f2PMt97rDvwmnFfSQ+sc551fX7y/cfV+xknlKpi0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+113601+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 170496366859446.64606158502636; Thu, 11 Jan 2024 01:01:08 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Uw/BdsIQrBKKA5nqXD23QHsmtuPF/SOGHqrnIWL4QQc=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1704963668; v=1; b=c213V0OfHG7UWsls5/T6s5YjsIBQK0Azs6HlKKKiOP8hy+1mLS1hX9PePKQvfmGQ63HWjil2 Ih4jax1A5S+M2XkiIqm0iiGtK+CuExM39odPtiYagSxKCu5mDw+XnCgcFFlW2KgcJp8iHywkKP0 TXfNqZ+rm63IqYDVlF/gLsmg= X-Received: by 127.0.0.2 with SMTP id BAryYY1788612x81cRA9sxes; Thu, 11 Jan 2024 01:01:08 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.7637.1704963667729511654 for ; Thu, 11 Jan 2024 01:01:07 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10949"; a="389223784" X-IronPort-AV: E=Sophos;i="6.04,185,1695711600"; d="scan'208";a="389223784" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2024 01:01:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10949"; a="1113768682" X-IronPort-AV: E=Sophos;i="6.04,185,1695711600"; d="scan'208";a="1113768682" X-Received: from shwdeopenlab702.ccr.corp.intel.com ([10.239.55.43]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2024 01:01:05 -0800 From: "duntan" To: devel@edk2.groups.io Cc: Ray Ni , Laszlo Ersek , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [PATCH] UefiCpuPkg: change name of gMpInformationHobGuid2 Date: Thu, 11 Jan 2024 17:00:55 +0800 Message-Id: <20240111090055.1721-1-dun.tan@intel.com> MIME-Version: 1.0 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 Reply-To: devel@edk2.groups.io,dun.tan@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: V9QopE9ShlEezNTrbaljotmzx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704963670246100001 Content-Type: text/plain; charset="utf-8" Change name of gMpInformationHobGuid2 to gMpInformation2HobGuid. It's to align with the file name MpInformation2.h and the structure name MP_INFORMATION2_HOB_DATA. Signed-off-by: Dun Tan Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Cc: Gerd Hoffmann Reviewed-by: Laszlo Ersek Reviewed-by: Ray Ni --- UefiCpuPkg/CpuMpPei/CpuMpPei.c | 8 ++++---- UefiCpuPkg/CpuMpPei/CpuMpPei.inf | 2 +- UefiCpuPkg/Include/Guid/MpInformation2.h | 2 +- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 6 +++--- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 2 +- UefiCpuPkg/UefiCpuPkg.dec | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c index 93919be94f..2ce4d6ab50 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c @@ -566,7 +566,7 @@ GetProcessorCoreType ( } =20 /** - Create gMpInformationHobGuid2. + Create gMpInformation2HobGuid. **/ VOID BuildMpInformationHob ( @@ -618,13 +618,13 @@ BuildMpInformationHob ( // // Create MP_INFORMATION2_HOB. when the max HobLength 0xFFF8 is not enou= gh, there // will be a MP_INFORMATION2_HOB series in the HOB list. - // In the HOB list, there is a gMpInformationHobGuid2 with 0 value Numbe= rOfProcessors + // In the HOB list, there is a gMpInformation2HobGuid with 0 value Numbe= rOfProcessors // fields to indicate it's the last MP_INFORMATION2_HOB. // while (NumberOfProcessorsInHob !=3D 0) { NumberOfProcessorsInHob =3D MIN (NumberOfProcessors - ProcessorIndex, = MaxProcessorsPerHob); MpInformation2HobData =3D BuildGuidHob ( - &gMpInformationHobGuid2, + &gMpInformation2HobGuid, sizeof (MP_INFORMATION2_HOB_DATA) + sizeof= (MP_INFORMATION2_ENTRY) * NumberOfProcessorsInHob ); ASSERT (MpInformation2HobData !=3D NULL); @@ -744,7 +744,7 @@ InitializeCpuMpWorker ( ASSERT_EFI_ERROR (Status); =20 // - // Create gMpInformationHobGuid2 + // Create gMpInformation2HobGuid // BuildMpInformationHob (); =20 diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf b/UefiCpuPkg/CpuMpPei/CpuMpPe= i.inf index 812fa179bd..9ab2623bd0 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf @@ -50,7 +50,7 @@ =20 [Guids] gEdkiiMigratedFvInfoGuid ## = SOMETIMES_CONSUMES ## HOB - gMpInformationHobGuid2 ## PRODUCES + gMpInformation2HobGuid ## PRODUCES =20 [Ppis] gEfiPeiMpServicesPpiGuid ## PRODUCES diff --git a/UefiCpuPkg/Include/Guid/MpInformation2.h b/UefiCpuPkg/Include/= Guid/MpInformation2.h index 43185a4b01..2d9266f061 100644 --- a/UefiCpuPkg/Include/Guid/MpInformation2.h +++ b/UefiCpuPkg/Include/Guid/MpInformation2.h @@ -53,6 +53,6 @@ typedef struct { #define GET_MP_INFORMATION_ENTRY(MpInfoHobData, Index) \ (MP_INFORMATION2_ENTRY *)((UINTN)&((MP_INFORMATION2_HOB_DATA *)(MpInfo= HobData))->Entry + (MpInfoHobData)->EntrySize * Index) =20 -extern EFI_GUID gMpInformationHobGuid2; +extern EFI_GUID gMpInformation2HobGuid; =20 #endif diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.c index 9b230772cb..cd394826ff 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c @@ -776,7 +776,7 @@ GetMpInformation ( HobIndex =3D 0; HobCount =3D 0; =20 - FirstMpInfo2Hob =3D GetFirstGuidHob (&gMpInformationHobGuid2); + FirstMpInfo2Hob =3D GetFirstGuidHob (&gMpInformation2HobGuid); ASSERT (FirstMpInfo2Hob !=3D NULL); GuidHob =3D FirstMpInfo2Hob; while (GuidHob !=3D NULL) { @@ -792,7 +792,7 @@ GetMpInformation ( =20 HobCount++; *NumberOfCpus +=3D MpInformation2HobData->NumberOfProcessors; - GuidHob =3D GetNextGuidHob (&gMpInformationHobGuid2, GET_NEXT_H= OB (GuidHob)); + GuidHob =3D GetNextGuidHob (&gMpInformation2HobGuid, GET_NEXT_H= OB (GuidHob)); } =20 ASSERT (*NumberOfCpus <=3D PcdGet32 (PcdCpuMaxLogicalProcessorNumber)); @@ -820,7 +820,7 @@ GetMpInformation ( GuidHob =3D FirstMpInfo2Hob; while (HobIndex < HobCount) { MpInfo2Hobs[HobIndex++] =3D GET_GUID_HOB_DATA (GuidHob); - GuidHob =3D GetNextGuidHob (&gMpInformationHobGuid2, G= ET_NEXT_HOB (GuidHob)); + GuidHob =3D GetNextGuidHob (&gMpInformation2HobGuid, G= ET_NEXT_HOB (GuidHob)); } =20 ProcessorInfo =3D (EFI_PROCESSOR_INFORMATION *)AllocatePool (sizeof (EFI= _PROCESSOR_INFORMATION) * (*MaxNumberOfCpus)); diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/UefiCpuPkg/PiSm= mCpuDxeSmm/PiSmmCpuDxeSmm.inf index 793220aba3..a018954ed7 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf @@ -120,7 +120,7 @@ gEdkiiPiSmmMemoryAttributesTableGuid ## CONSUMES ## SystemTable gEfiMemoryAttributesTableGuid ## CONSUMES ## SystemTable gSmmBaseHobGuid ## CONSUMES - gMpInformationHobGuid2 ## CONSUMES # Assume the HOB mu= st has been created + gMpInformation2HobGuid ## CONSUMES # Assume the HOB mu= st has been created =20 [FeaturePcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug ## CONS= UMES diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec index cc785a3222..571b59b36f 100644 --- a/UefiCpuPkg/UefiCpuPkg.dec +++ b/UefiCpuPkg/UefiCpuPkg.dec @@ -89,7 +89,7 @@ gSmmBaseHobGuid =3D { 0xc2217ba7, 0x03bb, 0x4f63, {0xa6, 0x47, 0x7c= , 0x25, 0xc5, 0xfc, 0x9d, 0x73 }} =20 ## Include/Guid/MpInformation2.h - gMpInformationHobGuid2 =3D { 0x417a7f64, 0xf4e9, 0x4b32, {0x84, = 0x6a, 0x5c, 0xc4, 0xd8, 0x62, 0x18, 0x79 }} + gMpInformation2HobGuid =3D { 0x417a7f64, 0xf4e9, 0x4b32, {0x84, = 0x6a, 0x5c, 0xc4, 0xd8, 0x62, 0x18, 0x79 }} =20 [Protocols] ## Include/Protocol/SmmCpuService.h --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113601): https://edk2.groups.io/g/devel/message/113601 Mute This Topic: https://groups.io/mt/103658826/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-