From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web08.5996.1636420387528528877 for ; Mon, 08 Nov 2021 17:13:10 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Tue, 09 Nov 2021 09:13:00 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Christopher Jones'" , "'Samer El-Haj-Mahmoud'" , Cc: , , "'Sami Mujawar'" , "'Ben Adderson'" , "'Akanksha Jain'" , "'Matteo Carlini'" , "'nd'" References: <20211006101154.20589-1-christopher.jones@arm.com> <005e01d7bbe3$70b63a80$5222af80$@byosoft.com.cn> <006301d7bbe9$8fbad840$af3088c0$@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHYxIDEvMV0gTWRlUGtnOiBGaXggQUNQSSBtZW1vcnkgYWdncmVnYXRvci9kZXZpY2UgdHlwZSBtaXNtYXRjaA==?= Date: Tue, 9 Nov 2021 09:13:00 +0800 Message-ID: <007801d7d506$f0bf06d0$d23d1470$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQHtEPFXU7b29eDIWS+m4pOB9DaWvgJ/XTrrAbVJlkoCBfIOQAGDLxxlq5H3CMA= Content-Type: multipart/alternative; boundary="----=_NextPart_000_0079_01D7D549.FEE442A0" Content-Language: zh-cn ------=_NextPart_000_0079_01D7D549.FEE442A0 Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Yes. I will create PR for this patch.=20 =20 Thanks Liming =B7=A2=BC=FE=C8=CB: Christopher Jones =20 =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA11=D4=C28=C8=D5 19:12 =CA=D5=BC=FE=C8=CB: gaoliming ; Samer El-Haj-Mahm= oud ; devel@edk2.groups.io =B3=AD=CB=CD: michael.d.kinney@intel.com; zhiguang.liu@intel.com; Sami Muja= war ; Ben Adderson ; Akanksha Jain ; Matteo Carlini ; nd =D6=F7=CC=E2: Re: [edk2-devel] [PATCH v1 1/1] MdePkg: Fix ACPI memory aggregator/device type mismatch =20 Hi,=20 It looks like this patch has received the relevant approvals and is ready for merge. Could this patch please be merged in time for the edk2-stable202111 release. =20 =20 Thanks, Chris _____ =20 From: gaoliming > Sent: Friday, October 8, 2021 3:09 AM To: Samer El-Haj-Mahmoud >; devel@edk2.groups.io >; Christopher Jones > Cc: michael.d.kinney@intel.com >; zhiguang= . liu@intel.com >; Sami Mujawar >; Ben Adderson >; Akanksha Jain >; Matteo Carlini >; nd > Subject: =BB=D8=B8=B4: [edk2-devel] [PATCH v1 1/1] MdePkg: Fix ACPI memory aggregator/device type mismatch=20 =20 Samer: Thanks for your information. I agree this change. Reviewed-by: Liming Gao > Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Samer El-Haj-Mahmoud > > =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA10=D4=C28=C8=D5 9:45 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io ; gaoliming@byosoft.com.cn ; Christopher > Jones > > =B3=AD=CB=CD: michael.d.kinney@intel.com ; zhiguang.liu@intel.com ; Sami Mujawar > >; Ben Adderson >; > Akanksha Jain >; Matteo Carlini > >; nd >; Samer El-Haj-Mahmoud > > > =D6=F7=CC=E2: RE: [edk2-devel] [PATCH v1 1/1] MdePkg: Fix ACPI memory > aggregator/device type mismatch >=20 > We did investigate this in the BZ, and the conclusion was it is safer to update > the code to match the spec. The only OS implementation we have seen so fa= r > is in Linux, and it uses the spec defined values (although for limited usage). > See https://bugzilla.tianocore.org/show_bug.cgi?id=3D3579 >=20 >=20 >=20 >=20 > > -----Original Message----- > > From: devel@edk2.groups.io > On Behalf Of > > gaoliming via groups.io > > Sent: Thursday, October 7, 2021 9:26 PM > > To: devel@edk2.groups.io ; Christopher Jones > > > > > Cc: michael.d.kinney@intel.com ; zhiguang.liu@intel.com ; Sami Mujawar > > >; Ben Adderson >; > > Akanksha Jain >= ; Matteo Carlini > > >; nd > > > Subject: =BB=D8=B8=B4: [edk2-devel] [PATCH v1 1/1] MdePkg: Fix ACPI mem= ory > > aggregator/device type mismatch > > > > Jones: > > Do you know what impact will be introduced by this change? > > > > Thanks > > Liming > > > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > > > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io > =B4=FA=B1=ED Chris > Jones > > > =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA10=D4=C26=C8=D5 18:12 > > > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io =20 > > > =B3=AD=CB=CD: michael.d.kinney@intel.com ; gaoliming@byosoft.com.cn ; > > > zhiguang.liu@intel.com ; Sami.Mujawar@arm.com ; > > Ben.Adderson@arm.com ; > > > Akanksha.Jain2@arm.com ; Matteo.Carlini@arm.com ; nd@arm.com =20 > > > =D6=F7=CC=E2: [edk2-devel] [PATCH v1 1/1] MdePkg: Fix ACPI memory > > > aggregator/device type mismatch > > > > > > Bugzilla: 3578 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3579= ) > > > > > > Since the Common Memory Device (formerly Memory Aggregator Device) > > > was > > > introduced in ACPI 5.0, the edk2 type values have not matched the > > > values defined in the ACPI specification. > > > > > > Fix this discrepancy by aligning the code to match the specification. > > > > > > Signed-off-by: Chris Jones > > > --- > > > MdePkg/Include/IndustryStandard/Acpi50.h | 6 +++--- > > > MdePkg/Include/IndustryStandard/Acpi51.h | 6 +++--- > > > MdePkg/Include/IndustryStandard/Acpi60.h | 6 +++--- > > > MdePkg/Include/IndustryStandard/Acpi61.h | 6 +++--- > > > MdePkg/Include/IndustryStandard/Acpi62.h | 6 +++--- > > > MdePkg/Include/IndustryStandard/Acpi63.h | 6 +++--- > > > MdePkg/Include/IndustryStandard/Acpi64.h | 6 +++--- > > > 7 files changed, 21 insertions(+), 21 deletions(-) > > > > > > diff --git a/MdePkg/Include/IndustryStandard/Acpi50.h > > > b/MdePkg/Include/IndustryStandard/Acpi50.h > > > index > > > > 31a47e6a2c4276d5b1ad7b834af84844090b64c5..83d787c7650cf649fe3d2e1 > > > 2e7983bae86a2a114 100644 > > > --- a/MdePkg/Include/IndustryStandard/Acpi50.h > > > +++ b/MdePkg/Include/IndustryStandard/Acpi50.h > > > @@ -996,9 +996,9 @@ typedef struct { > > > /// > > > /// Memory Aggregator Device Type > > > /// > > > -#define > > > EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x1 > > > -#define > > > > > > EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x2 > > > -#define > > > EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x3 > > > +#define > > > EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x0 > > > +#define > > > > > > EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x1 > > > +#define > > > EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x2 > > > > > > /// > > > /// Socket Memory Aggregator Device Structure. > > > diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h > > > b/MdePkg/Include/IndustryStandard/Acpi51.h > > > index > > > > fc28ffa18fc6a22e52fda88fade6ad80b2817cc3..5fbf7c99f1f7d6ca9109f198bd > > > 3f25f12bd47961 100644 > > > --- a/MdePkg/Include/IndustryStandard/Acpi51.h > > > +++ b/MdePkg/Include/IndustryStandard/Acpi51.h > > > @@ -951,9 +951,9 @@ typedef struct { > > > /// > > > /// Memory Aggregator Device Type > > > /// > > > -#define > > > EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x1 > > > -#define > > > > > > EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x2 > > > -#define > > > EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x3 > > > +#define > > > EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x0 > > > +#define > > > > > > EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x1 > > > +#define > > > EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x2 > > > > > > /// > > > /// Socket Memory Aggregator Device Structure. > > > diff --git a/MdePkg/Include/IndustryStandard/Acpi60.h > > > b/MdePkg/Include/IndustryStandard/Acpi60.h > > > index > > > > 5dcd73b6f1ec4bccc7fdae7d56c2963ab58764f9..eba4248e1d5733d21973f0d > > > ac2286e02238a0aae 100644 > > > --- a/MdePkg/Include/IndustryStandard/Acpi60.h > > > +++ b/MdePkg/Include/IndustryStandard/Acpi60.h > > > @@ -966,9 +966,9 @@ typedef struct { > > > /// > > > /// Memory Aggregator Device Type > > > /// > > > -#define > > > EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x1 > > > -#define > > > > > > EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x2 > > > -#define > > > EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x3 > > > +#define > > > EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x0 > > > +#define > > > > > > EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x1 > > > +#define > > > EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x2 > > > > > > /// > > > /// Socket Memory Aggregator Device Structure. > > > diff --git a/MdePkg/Include/IndustryStandard/Acpi61.h > > > b/MdePkg/Include/IndustryStandard/Acpi61.h > > > index > > > > 8626833a794dfb4a6f19d459d5214c6caefdbbee..7a776020baa8f3ee7b6f05fe > > > e336225ab6589ce0 100644 > > > --- a/MdePkg/Include/IndustryStandard/Acpi61.h > > > +++ b/MdePkg/Include/IndustryStandard/Acpi61.h > > > @@ -966,9 +966,9 @@ typedef struct { > > > /// > > > /// Memory Aggregator Device Type > > > /// > > > -#define > > > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x1 > > > -#define > > > > > > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x2 > > > -#define > > > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x3 > > > +#define > > > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x0 > > > +#define > > > > > > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x1 > > > +#define > > > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x2 > > > > > > /// > > > /// Socket Memory Aggregator Device Structure. > > > diff --git a/MdePkg/Include/IndustryStandard/Acpi62.h > > > b/MdePkg/Include/IndustryStandard/Acpi62.h > > > index > > > > 1b2704e98e3703a4405075247432ec842e45021b..33a0a0f21959df8b64803e > > > 972ab19f0c0ab1619e 100644 > > > --- a/MdePkg/Include/IndustryStandard/Acpi62.h > > > +++ b/MdePkg/Include/IndustryStandard/Acpi62.h > > > @@ -1078,9 +1078,9 @@ typedef struct { > > > /// > > > /// Memory Aggregator Device Type > > > /// > > > -#define > > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x1 > > > -#define > > > > > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x2 > > > -#define > > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x3 > > > +#define > > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x0 > > > +#define > > > > > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x1 > > > +#define > > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x2 > > > > > > /// > > > /// Socket Memory Aggregator Device Structure. > > > diff --git a/MdePkg/Include/IndustryStandard/Acpi63.h > > > b/MdePkg/Include/IndustryStandard/Acpi63.h > > > index > > > > b281b30155e90eba5169dc39bde9a3379e3b7005..3b1426af27ea4ebada1a1 > > > 2e99ce958bb288ad931 100644 > > > --- a/MdePkg/Include/IndustryStandard/Acpi63.h > > > +++ b/MdePkg/Include/IndustryStandard/Acpi63.h > > > @@ -1040,9 +1040,9 @@ typedef struct { > > > /// > > > /// Memory Aggregator Device Type > > > /// > > > -#define > > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x1 > > > -#define > > > > > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x2 > > > -#define > > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x3 > > > +#define > > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET > > > 0x0 > > > +#define > > > > > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C > > > ONTROLLER 0x1 > > > +#define > > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM > > > 0x2 > > > > > > /// > > > /// Socket Memory Aggregator Device Structure. > > > diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h > > > b/MdePkg/Include/IndustryStandard/Acpi64.h > > > index > > > > 3a91302f8c0e71d4951d27aac35322073219c836..8346d83f1249045497b602 > > > 907b94fbb2b495cd56 100644 > > > --- a/MdePkg/Include/IndustryStandard/Acpi64.h > > > +++ b/MdePkg/Include/IndustryStandard/Acpi64.h > > > @@ -1075,9 +1075,9 @@ typedef struct { > > > /// > > > /// Memory Device Type. > > > /// > > > -#define EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_SOCKET > > > 0x1 > > > -#define > > > EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_MEMORY_CONTROLLER > > > 0x2 > > > -#define EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_DIMM > > > 0x3 > > > +#define EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_SOCKET > > > 0x0 > > > +#define > > > EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_MEMORY_CONTROLLER > > > 0x1 > > > +#define EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_DIMM > > > 0x2 > > > #define > > > EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_VENDOR_SPECIFIC_TYPE > > > 0xFF > > > > > > /// > > > -- > > > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") > > > > > > > > > > > > > > > > > > > > > > > > > > >=20 > > ------=_NextPart_000_0079_01D7D549.FEE442A0 Content-Type: text/html; charset="gb2312" Content-Transfer-Encoding: quoted-printable

Yes. I will create PR for this patch.

 

Thanks

Liming

=B7=A2=BC=FE=C8=CB: Christop= her Jones <Christopher.Jones@arm.com>
=B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA11=D4=C28=C8=D5 19:12
=CA=D5=BC=FE=C8=CB<= span lang=3DEN-US>: gaoliming <gaoliming@b= yosoft.com.cn>; Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>= ;; devel@edk2.groups.io
=B3=AD=CB=CD: michael.d.kinney@intel.com; zhiguang.liu@intel.com= ; Sami Mujawar <Sami.Mujawar@arm.com>; Ben Adderson <Ben.Adderson@= arm.com>; Akanksha Jain <Akanksha.Jain2@arm.com>; Matteo Carlini &= lt;Matteo.Carlini@arm.com>; nd <nd@arm.com>
=D6=F7=CC= =E2: Re: [edk2-devel] [PAT= CH v1 1/1] MdePkg: Fix ACPI memory aggregator/device type mismatch

 

Hi,

It looks like this patch has received the relev= ant approvals and is ready for merge. Could this patch please be merged in = time for the edk2-stable202111 release.

 

 

Thanks,

<= span lang=3DEN-US style=3D'font-family:"Calibri",sans-serif;color:black;bac= kground:white'>Chris

From: gaolimi= ng <gaoliming@byosoft.com.cn= >
Sent: Friday, October 8, 2021 3:09 AM
To: Same= r El-Haj-Mahmoud <Samer.= El-Haj-Mahmoud@arm.com>; dev= el@edk2.groups.io <devel@edk= 2.groups.io>; Christopher Jones <Christopher.Jones@arm.com>
Cc: michael.d.kinney@intel.com <michael.d.kinney@intel.com>; = zhiguang.liu@intel.com <zhiguang.liu@intel.com>; Sam= i Mujawar <Sami.Mujawar@arm.com<= /a>>; Ben Adderson <Ben.Adder= son@arm.com>; Akanksha Jain <Akanksha.Jain2@arm.com>; Matteo Carlini <Matteo.Carlini@arm.com>; nd <nd@arm.com>
Subject: =BB=D8=B8=B4: [edk= 2-devel] [PATCH v1 1/1] MdePkg: Fix ACPI memory aggregator/device type mism= atch

 

Samer:
  Thanks for your information. I agree= this change. Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

Thanks
Liming
>= -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: S= amer El-Haj-Mahmoud <Sam= er.El-Haj-Mahmoud@arm.com>
> =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA10=D4=C28=C8=D5 9:45
> =CA=D5= =BC=FE=C8=CB: de= vel@edk2.groups.io; gaolimi= ng@byosoft.com.cn; Christopher
> Jones <Christopher.Jones@arm.com>
> =B3= =AD=CB=CD: michael.d.kinney@intel.com; = zhiguang.liu@intel.com; Sami Mujawar
> <Sami.Mujawar@arm.com>; Ben Adderson <Ben.Adderson@arm.com>;
> Akanksh= a Jain <Akanksha.Jain2@arm.com= >; Matteo Carlini
> <Matteo.Carlini@arm.com>; nd <nd= @arm.com>; Samer El-Haj-Mahmoud
> <Samer.El-Haj-Mahmoud@arm.com>
> =D6=F7=CC=E2: RE: [edk2-devel] [PATCH v1 1/1] MdePkg: F= ix ACPI memory
> aggregator/device type mismatch
>
> We = did investigate this in the BZ, and the conclusion was it is safer to updat= e
> the code to match the spec. The only OS implementation we have se= en so far
> is in Linux, and it uses the spec defined values (althoug= h for limited usage).
> See https://bugzilla.tianocore.org/show_bug.cgi?id=3D3= 579
>
>
>
>
> > -----Original Mess= age-----
> > From: devel@e= dk2.groups.io <devel@edk2.gr= oups.io> On Behalf Of
> > gaoliming via groups.io
> &= gt; Sent: Thursday, October 7, 2021 9:26 PM
> > To: devel@edk2.groups.io; Christopher Jones
&g= t; > <Christopher.Jones@= arm.com>
> > Cc: michael.d.kinney@intel.com; zhiguang.liu@intel.com; Sami Mujawar
> > <Sami.Mujawar@arm.com>; Ben Adderson <Ben.Adderson@arm.com>;
>= > Akanksha Jain <Akanksha.= Jain2@arm.com>; Matteo Carlini
> > <Matteo.Carlini@arm.com>; nd <nd@arm.com>
> > Subject: =BB=D8=B8= =B4: [edk2-devel] [PATCH v1 1/1] MdePkg: Fix ACPI memory=
> > aggregator/device type mismatch
> >
> > Jon= es:
> >   Do you know what impact will be introduced by = this change?
> >
> > Thanks
> > Liming
> &= gt; > -----=D3=CA=BC=FE=D4=AD=BC=FE-----
&g= t; > > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io <devel@edk2.groups.io> =B4=FA=B1=ED Chris
> Jones
> > > =B7=A2=CB=CD=CA=B1= =BC=E4: 2021=C4=EA10=D4= =C26=C8=D5 18:12
> > = > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> > > =B3=AD=CB= =CD: micha= el.d.kinney@intel.com; gaol= iming@byosoft.com.cn;
> > > zhiguang.liu@intel.com; Sami.Mujawar@arm.com;
> > Ben.Adderson@arm.com;
> > > Akanksha.Jain2@arm.com; Matteo.Carlini@arm.com; nd@= arm.com
> > > =D6=F7=CC=E2: [edk2= -devel] [PATCH v1 1/1] MdePkg: Fix ACPI memory
> > > aggregator= /device type mismatch
> > >
> > > Bugzilla: 3578 (<= a href=3D"https://bugzilla.tianocore.org/show_bug.cgi?id=3D3579">https://bu= gzilla.tianocore.org/show_bug.cgi?id=3D3579)
> > >
> = > > Since the Common Memory Device (formerly Memory Aggregator Device= )
> > > was
> > > introduced in ACPI 5.0, the edk2 = type values have not matched the
> > > values defined in the AC= PI specification.
> > >
> > > Fix this discrepancy = by aligning the code to match the specification.
> > >
> = > > Signed-off-by: Chris Jones <christopher.jones@arm.com>
> > > ---
> = > >  MdePkg/Include/IndustryStandard/Acpi50.h | 6 +++---
>= > >  MdePkg/Include/IndustryStandard/Acpi51.h | 6 +++---
>= ; > >  MdePkg/Include/IndustryStandard/Acpi60.h | 6 +++---
&g= t; > >  MdePkg/Include/IndustryStandard/Acpi61.h | 6 +++---
&= gt; > >  MdePkg/Include/IndustryStandard/Acpi62.h | 6 +++---
= > > >  MdePkg/Include/IndustryStandard/Acpi63.h | 6 +++---> > >  MdePkg/Include/IndustryStandard/Acpi64.h | 6 +++---> > >  7 files changed, 21 insertions(+), 21 deletions(-)> > >
> > > diff --git a/MdePkg/Include/IndustryStan= dard/Acpi50.h
> > > b/MdePkg/Include/IndustryStandard/Acpi50.h<= br>> > > index
> > >
> 31a47e6a2c4276d5b1ad7b834= af84844090b64c5..83d787c7650cf649fe3d2e1
> > > 2e7983bae86a2a11= 4 100644
> > > --- a/MdePkg/Include/IndustryStandard/Acpi50.h> > > +++ b/MdePkg/Include/IndustryStandard/Acpi50.h
> >= ; > @@ -996,9 +996,9 @@ typedef struct {
> > >  ///
= > > >  /// Memory Aggregator Device Type
> > >&nb= sp; ///
> > > -#define
> > > EFI_ACPI_5_0_PMMT_MEMO= RY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > 0x1
> > > -#= define
> > >
> >
> EFI_ACPI_5_0_PMMT_MEMORY_AGGR= EGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTROLLER 0x2
> > &g= t; -#define
> > > EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TY= PE_DIMM
> > > 0x3
> > > +#define
> > > = EFI_ACPI_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > 0x= 0
> > > +#define
> > >
> >
> EFI_ACP= I_5_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTROLL= ER 0x1
> > > +#define
> > > EFI_ACPI_5_0_PMMT_MEMOR= Y_AGGREGATOR_DEVICE_TYPE_DIMM
> > > 0x2
> > >
&g= t; > >  ///
> > >  /// Socket Memory Aggregator= Device Structure.
> > > diff --git a/MdePkg/Include/IndustrySt= andard/Acpi51.h
> > > b/MdePkg/Include/IndustryStandard/Acpi51.= h
> > > index
> > >
> fc28ffa18fc6a22e52fda88= fade6ad80b2817cc3..5fbf7c99f1f7d6ca9109f198bd
> > > 3f25f12bd47= 961 100644
> > > --- a/MdePkg/Include/IndustryStandard/Acpi51.h=
> > > +++ b/MdePkg/Include/IndustryStandard/Acpi51.h
> &= gt; > @@ -951,9 +951,9 @@ typedef struct {
> > >  ///> > >  /// Memory Aggregator Device Type
> > >&= nbsp; ///
> > > -#define
> > > EFI_ACPI_5_1_PMMT_ME= MORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > 0x1
> > > = -#define
> > >
> >
> EFI_ACPI_5_1_PMMT_MEMORY_AG= GREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTROLLER 0x2
> > = > -#define
> > > EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_= TYPE_DIMM
> > > 0x3
> > > +#define
> > >= ; EFI_ACPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > = 0x0
> > > +#define
> > >
> >
> EFI_A= CPI_5_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTRO= LLER 0x1
> > > +#define
> > > EFI_ACPI_5_1_PMMT_MEM= ORY_AGGREGATOR_DEVICE_TYPE_DIMM
> > > 0x2
> > >
= > > >  ///
> > >  /// Socket Memory Aggregat= or Device Structure.
> > > diff --git a/MdePkg/Include/Industry= Standard/Acpi60.h
> > > b/MdePkg/Include/IndustryStandard/Acpi6= 0.h
> > > index
> > >
> 5dcd73b6f1ec4bccc7fda= e7d56c2963ab58764f9..eba4248e1d5733d21973f0d
> > > ac2286e02238= a0aae 100644
> > > --- a/MdePkg/Include/IndustryStandard/Acpi60= .h
> > > +++ b/MdePkg/Include/IndustryStandard/Acpi60.h
>= > > @@ -966,9 +966,9 @@ typedef struct {
> > >  ///=
> > >  /// Memory Aggregator Device Type
> > >= ;  ///
> > > -#define
> > > EFI_ACPI_6_0_PMMT_= MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > 0x1
> > >= ; -#define
> > >
> >
> EFI_ACPI_6_0_PMMT_MEMORY_= AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTROLLER 0x2
> >= ; > -#define
> > > EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVIC= E_TYPE_DIMM
> > > 0x3
> > > +#define
> > &= gt; EFI_ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > >= ; 0x0
> > > +#define
> > >
> >
> EFI= _ACPI_6_0_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONT= ROLLER 0x1
> > > +#define
> > > EFI_ACPI_6_0_PMMT_M= EMORY_AGGREGATOR_DEVICE_TYPE_DIMM
> > > 0x2
> > >> > >  ///
> > >  /// Socket Memory Aggreg= ator Device Structure.
> > > diff --git a/MdePkg/Include/Indust= ryStandard/Acpi61.h
> > > b/MdePkg/Include/IndustryStandard/Acp= i61.h
> > > index
> > >
> 8626833a794dfb4a6f1= 9d459d5214c6caefdbbee..7a776020baa8f3ee7b6f05fe
> > > e336225ab= 6589ce0 100644
> > > --- a/MdePkg/Include/IndustryStandard/Acpi= 61.h
> > > +++ b/MdePkg/Include/IndustryStandard/Acpi61.h
&g= t; > > @@ -966,9 +966,9 @@ typedef struct {
> > >  /= //
> > >  /// Memory Aggregator Device Type
> > &= gt;  ///
> > > -#define
> > > EFI_ACPI_6_1_PMM= T_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > 0x1
> > &= gt; -#define
> > >
> >
> EFI_ACPI_6_1_PMMT_MEMOR= Y_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTROLLER 0x2
> &= gt; > -#define
> > > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEV= ICE_TYPE_DIMM
> > > 0x3
> > > +#define
> >= > EFI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > &= gt; 0x0
> > > +#define
> > >
> >
> E= FI_ACPI_6_1_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > O= NTROLLER 0x1
> > > +#define
> > > EFI_ACPI_6_1_PMMT= _MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM
> > > 0x2
> > >=
> > >  ///
> > >  /// Socket Memory Aggr= egator Device Structure.
> > > diff --git a/MdePkg/Include/Indu= stryStandard/Acpi62.h
> > > b/MdePkg/Include/IndustryStandard/A= cpi62.h
> > > index
> > >
> 1b2704e98e3703a44= 05075247432ec842e45021b..33a0a0f21959df8b64803e
> > > 972ab19f0= c0ab1619e 100644
> > > --- a/MdePkg/Include/IndustryStandard/Ac= pi62.h
> > > +++ b/MdePkg/Include/IndustryStandard/Acpi62.h
= > > > @@ -1078,9 +1078,9 @@ typedef struct {
> > >&nbs= p; ///
> > >  /// Memory Aggregator Device Type
> &g= t; >  ///
> > > -#define
> > > EFI_ACPI_6_2= _PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > 0x1
> &g= t; > -#define
> > >
> >
> EFI_ACPI_6_2_PMMT_M= EMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTROLLER 0x2
&g= t; > > -#define
> > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR= _DEVICE_TYPE_DIMM
> > > 0x3
> > > +#define
> = > > EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> &g= t; > 0x0
> > > +#define
> > >
> >
&g= t; EFI_ACPI_6_2_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > &g= t; ONTROLLER 0x1
> > > +#define
> > > EFI_ACPI_6_2_= PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM
> > > 0x2
> > = >
> > >  ///
> > >  /// Socket Memory = Aggregator Device Structure.
> > > diff --git a/MdePkg/Include/= IndustryStandard/Acpi63.h
> > > b/MdePkg/Include/IndustryStanda= rd/Acpi63.h
> > > index
> > >
> b281b30155e90= eba5169dc39bde9a3379e3b7005..3b1426af27ea4ebada1a1
> > > 2e99ce= 958bb288ad931 100644
> > > --- a/MdePkg/Include/IndustryStandar= d/Acpi63.h
> > > +++ b/MdePkg/Include/IndustryStandard/Acpi63.h=
> > > @@ -1040,9 +1040,9 @@ typedef struct {
> > >=   ///
> > >  /// Memory Aggregator Device Type
>= ; > >  ///
> > > -#define
> > > EFI_ACPI= _6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
> > > 0x1
>= ; > > -#define
> > >
> >
> EFI_ACPI_6_3_PM= MT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> > > ONTROLLER 0x2> > > -#define
> > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREG= ATOR_DEVICE_TYPE_DIMM
> > > 0x3
> > > +#define
&= gt; > > EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_SOCKET
>= ; > > 0x0
> > > +#define
> > >
> >> EFI_ACPI_6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_MEMORY_C
> >= ; > ONTROLLER 0x1
> > > +#define
> > > EFI_ACPI_= 6_3_PMMT_MEMORY_AGGREGATOR_DEVICE_TYPE_DIMM
> > > 0x2
> &= gt; >
> > >  ///
> > >  /// Socket Mem= ory Aggregator Device Structure.
> > > diff --git a/MdePkg/Incl= ude/IndustryStandard/Acpi64.h
> > > b/MdePkg/Include/IndustrySt= andard/Acpi64.h
> > > index
> > >
> 3a91302f8= c0e71d4951d27aac35322073219c836..8346d83f1249045497b602
> > > 9= 07b94fbb2b495cd56 100644
> > > --- a/MdePkg/Include/IndustrySta= ndard/Acpi64.h
> > > +++ b/MdePkg/Include/IndustryStandard/Acpi= 64.h
> > > @@ -1075,9 +1075,9 @@ typedef struct {
> > = >  ///
> > >  /// Memory Device Type.
> >= >  ///
> > > -#define EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_= TYPE_SOCKET
> > > 0x1
> > > -#define
> > &= gt; EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_MEMORY_CONTROLLER
> > >= ; 0x2
> > > -#define EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_DIMM<= br>> > > 0x3
> > > +#define EFI_ACPI_6_4_PMTT_MEMORY_D= EVICE_TYPE_SOCKET
> > > 0x0
> > > +#define
> = > > EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_MEMORY_CONTROLLER
> &g= t; > 0x1
> > > +#define EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE= _DIMM
> > > 0x2
> > >  #define
> > &g= t; EFI_ACPI_6_4_PMTT_MEMORY_DEVICE_TYPE_VENDOR_SPECIFIC_TYPE
> > &= gt; 0xFF
> > >
> > >  ///
> > > --=
> > > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")> > >
> > >
> > >
> > >
&= gt; > >
> >
> >
> >
> >
> &= gt;
> >
> >


------=_NextPart_000_0079_01D7D549.FEE442A0--