From nobody Mon Apr 29 09:36:12 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+103923+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+103923+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683150633; cv=none; d=zohomail.com; s=zohoarc; b=b9+3GJfUYezJqj0P1H8Rh8MUa4Us4g7KYEaKCqJnJTqE0GxDRULcP927w29uqE9TxRYJWrCUhSQD27RTkn5cVbtVYSF0tBjWRann2o9Df73GhedcuHZ1Hnu0ilR/a+JVrMQjGxTqCj0YaPmQTbU8f1UsOslkb5SLRBziBMn2ohw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683150633; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=BzbRc392OqhoFsTRSS66ZuKqtNBRrF7LFyvm5u7eHkg=; b=gbsW8jEetZD/N2voajy7wVPy5psD1jzEvpmeXdm1oGRx1UMpwkNYWLARC+Kyd7PqV6lSmTKFKBkUC6yBLdDomAEkPlx0sKJPKfVrOf4ZY6UG/ugK5KuBiXAL1sdJfMerB09aW65IjbW0CWxy5ZK4KwDwT785hKfmwMApLjjbm9k= 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+103923+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683150633086601.7138854303454; Wed, 3 May 2023 14:50:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 53s7YY1788612xKHojRN7wjU; Wed, 03 May 2023 14:50:32 -0700 X-Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by mx.groups.io with SMTP id smtpd.web10.35336.1683150632171118522 for ; Wed, 03 May 2023 14:50:32 -0700 X-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6EBCF32009AC; Wed, 3 May 2023 17:50:31 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 03 May 2023 17:50:31 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedvledgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 3 May 2023 17:50:30 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Ray Ni , Zhichao Gao Cc: Rebecca Cran Subject: [edk2-devel] [PATCH 1/2] ShellPkg: acpiview: add support for parsing the Local APIC NMI structure Date: Wed, 3 May 2023 15:50:22 -0600 Message-Id: <20230503215023.1176725-2-rebecca@bsdio.com> In-Reply-To: <20230503215023.1176725-1-rebecca@bsdio.com> References: <20230503215023.1176725-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,rebecca@bsdio.com X-Gm-Message-State: X4iAAd34J5VmVTGF4iz9QcsHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683150632; bh=BakeWE2KBLExfTstSQ01wEfdy2+knI91dI06B/PuxCM=; h=Cc:Date:From:Reply-To:Subject:To; b=tPdv0C6cgosCZ6BF/ruUBBl5D/+D+YpInD3wiHQjt4FGwJDEi4yZy+j0GzFQnL2guEy AdKt2jwCl6hqzoD7z11raFfv6bSifTgNp9pCOmFKhipO80N2uoPbVtIVt64ODN0kPjNFD +c3w4rb3F/4RZyeH0wmu9uCNRPGHHJj7snk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683150634896100007 Content-Type: text/plain; charset="utf-8" Add support to acpiview for parsing the Local APIC NMI structure. Signed-off-by: Rebecca Cran --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c | 6= 0 ++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/Madt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtPa= rser.c index 41edcb9ffd1d..9d33ad2606e8 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c @@ -213,6 +213,12 @@ STATIC CONST ACPI_PARSER LocalApicFlags[] =3D { { L"Reserved", 30, 2, L"%d", NULL, NULL, NULL, NULL } }; =20 +STATIC CONST ACPI_PARSER MpsIntiFlags[] =3D { + { L"Polarity", 2, 0, L"%d", NULL, NULL, NULL, NULL }, + { L"Trigger Mode", 2, 2, L"%d", NULL, NULL, NULL, NULL }, + { L"Reserved", 12, 4, L"%d", NULL, NULL, NULL, NULL } +}; + /** This function traces Bit Flags fields. If no format string is specified the Format must be NULL. @@ -243,6 +249,36 @@ DumpLocalApicBitFlags ( ); } =20 +/** + This function traces Bit Flags fields. + If no format string is specified the Format must be NULL. + + @param [in] Format Optional format string for tracing the data. + @param [in] Ptr Pointer to the start of the buffer. +**/ +VOID +EFIAPI +DumpMpsIntiBitFlags ( + IN CONST CHAR16 *Format OPTIONAL, + IN UINT8 *Ptr + ) +{ + if (Format !=3D NULL) { + Print (Format, *(UINT32 *)Ptr); + return; + } + + Print (L"0x%X\n", *(UINT32 *)Ptr); + ParseAcpiBitFields ( + TRUE, + 2, + NULL, + Ptr, + 4, + PARSER_PARAMS (MpsIntiFlags) + ); +} + /** An ACPI_PARSER array describing the Processor Local APIC Structure. **/ @@ -255,6 +291,18 @@ STATIC CONST ACPI_PARSER ProcessorLocalApic[] =3D { { L"Flags", 4, 4, NULL, DumpLocalApicBitFlags, NULL, NUL= L, NULL } }; =20 +/** + An ACPI_PARSER array describing the Local APIC NMI Structure. + **/ +STATIC CONST ACPI_PARSER LocalApicNmi[] =3D { + { L"Type", 1, 0, L"0x%x", NULL, NULL, NUL= L, NULL }, + { L"Length", 1, 1, L"%d", NULL, NULL, NUL= L, NULL }, + + { L"ACPI Processor UID", 1, 2, L"0x%x", NULL, NULL, NUL= L, NULL }, + { L"Flags", 2, 3, NULL, DumpMpsIntiBitFlags, NULL, NUL= L, NULL }, + { L"Local APIC LINT#", 1, 5, L"%d", NULL, NULL, NUL= L, NULL } +}; + /** An ACPI_PARSER array describing the Processor Local x2APIC Structure. **/ @@ -502,6 +550,18 @@ ParseAcpiMadt ( ); break; } + case EFI_ACPI_6_3_LOCAL_APIC_NMI: + { + ParseAcpi ( + TRUE, + 2, + "LOCAL APIC NMI", + InterruptContollerPtr, + *MadtInterruptControllerLength, + PARSER_PARAMS (LocalApicNmi) + ); + break; + } case EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC: { ParseAcpi ( --=20 2.39.2 -=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 (#103923): https://edk2.groups.io/g/devel/message/103923 Mute This Topic: https://groups.io/mt/98672297/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- From nobody Mon Apr 29 09:36:12 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+103924+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+103924+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683150635; cv=none; d=zohomail.com; s=zohoarc; b=YeWuLw7LM7I62SMPmLl1ojXL0vPZmR8HQ9BREOk9QnzFM6RGAX7l1NbAfBqodulxte5iIOKKHc7jRuv/QT6o+aaFIpMukC9HnBrosEdfFD0noEkASURpnfkWdigzeVSM0tPfphvxV73k8DShQ7yYpxqoQrXsu5j9fD/O5CYapOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683150635; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=2ZIjJt+cNytIiWhgdmHHtUjnzlXNnk63OWJQCzFjkqA=; b=f0/uOAnPaxAvF4Z55l/UgXsx/j8D2rsxB2bYhNb/jA7KcVBCdjHLg+UdmzBkepNOIqcnk8qFJFXjf6YbE45RhCyjv3lk9jYNKcIrnKGdMDKXlI77dKj8WDq9r7HnKhWw/TF6zFIK2xEK+u4pbMmK/jovGB915NjtSq7g0MMyoAM= 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+103924+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683150635199275.9941530021317; Wed, 3 May 2023 14:50:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id e0tTYY1788612xLH2qsCmqG8; Wed, 03 May 2023 14:50:34 -0700 X-Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by mx.groups.io with SMTP id smtpd.web11.34940.1683150634459349822 for ; Wed, 03 May 2023 14:50:34 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id B93943200B92; Wed, 3 May 2023 17:50:33 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 03 May 2023 17:50:34 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedvledgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 3 May 2023 17:50:32 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Ray Ni , Zhichao Gao Cc: Rebecca Cran Subject: [edk2-devel] [PATCH 2/2] ShellPkg: Fix typo of 'Controller' in acpiview MadtParser.c Date: Wed, 3 May 2023 15:50:23 -0600 Message-Id: <20230503215023.1176725-3-rebecca@bsdio.com> In-Reply-To: <20230503215023.1176725-1-rebecca@bsdio.com> References: <20230503215023.1176725-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,rebecca@bsdio.com X-Gm-Message-State: mLWiRllE4M7DN5aUBF4vNGydx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683150634; bh=KWfuebXXAaJqY9rDI3ozP0jcAZJxllWAXQDIwYzWl0s=; h=Cc:Date:From:Reply-To:Subject:To; b=T/vJ+mkGk2UVQEJ6NrbV3+0wk+8HbOl5VngKzIXElfmrODZDUm7y4LkIVdLi128w7E6 1iJtiW07ymigBAf+jRts1IVZZ3pijZb9+De/RPRrAjg9X+CK8T8l1rLwUuxtFIfax/mPA g0xlx+/yapxnCO/urgxdd8Hi91Jt0kPMAtk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683150636989100011 Content-Type: text/plain; charset="utf-8" Fix typos of 'Controller' in acpiview MadtParser.c. Signed-off-by: Rebecca Cran --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c | 5= 0 ++++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/Madt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtPa= rser.c index 9d33ad2606e8..0197b4bd9a66 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c @@ -214,9 +214,9 @@ STATIC CONST ACPI_PARSER LocalApicFlags[] =3D { }; =20 STATIC CONST ACPI_PARSER MpsIntiFlags[] =3D { - { L"Polarity", 2, 0, L"%d", NULL, NULL, NULL, NULL }, - { L"Trigger Mode", 2, 2, L"%d", NULL, NULL, NULL, NULL }, - { L"Reserved", 12, 4, L"%d", NULL, NULL, NULL, NULL } + { L"Polarity", 2, 0, L"%d", NULL, NULL, NULL, NULL }, + { L"Trigger Mode", 2, 2, L"%d", NULL, NULL, NULL, NULL }, + { L"Reserved", 12, 4, L"%d", NULL, NULL, NULL, NULL } }; =20 /** @@ -295,12 +295,12 @@ STATIC CONST ACPI_PARSER ProcessorLocalApic[] =3D { An ACPI_PARSER array describing the Local APIC NMI Structure. **/ STATIC CONST ACPI_PARSER LocalApicNmi[] =3D { - { L"Type", 1, 0, L"0x%x", NULL, NULL, NUL= L, NULL }, - { L"Length", 1, 1, L"%d", NULL, NULL, NUL= L, NULL }, + { L"Type", 1, 0, L"0x%x", NULL, NULL, NULL,= NULL }, + { L"Length", 1, 1, L"%d", NULL, NULL, NULL,= NULL }, =20 - { L"ACPI Processor UID", 1, 2, L"0x%x", NULL, NULL, NUL= L, NULL }, - { L"Flags", 2, 3, NULL, DumpMpsIntiBitFlags, NULL, NUL= L, NULL }, - { L"Local APIC LINT#", 1, 5, L"%d", NULL, NULL, NUL= L, NULL } + { L"ACPI Processor UID", 1, 2, L"0x%x", NULL, NULL, NULL,= NULL }, + { L"Flags", 2, 3, NULL, DumpMpsIntiBitFlags, NULL, NULL,= NULL }, + { L"Local APIC LINT#", 1, 5, L"%d", NULL, NULL, NULL,= NULL } }; =20 /** @@ -379,7 +379,7 @@ ParseAcpiMadt ( ) { UINT32 Offset; - UINT8 *InterruptContollerPtr; + UINT8 *InterruptControllerPtr; UINT32 GICDCount; =20 GICDCount =3D 0; @@ -396,7 +396,7 @@ ParseAcpiMadt ( AcpiTableLength, PARSER_PARAMS (MadtParser) ); - InterruptContollerPtr =3D Ptr + Offset; + InterruptControllerPtr =3D Ptr + Offset; =20 while (Offset < AcpiTableLength) { // Parse Interrupt Controller Structure to obtain Length. @@ -404,7 +404,7 @@ ParseAcpiMadt ( FALSE, 0, NULL, - InterruptContollerPtr, + InterruptControllerPtr, AcpiTableLength - Offset, PARSER_PARAMS (MadtInterruptControllerHeaderParser) ); @@ -445,7 +445,7 @@ ParseAcpiMadt ( TRUE, 2, "GICC", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (GicCParser) ); @@ -467,7 +467,7 @@ ParseAcpiMadt ( TRUE, 2, "GICD", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (GicDParser) ); @@ -480,7 +480,7 @@ ParseAcpiMadt ( TRUE, 2, "GIC MSI Frame", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (GicMSIFrameParser) ); @@ -493,7 +493,7 @@ ParseAcpiMadt ( TRUE, 2, "GICR", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (GicRParser) ); @@ -506,7 +506,7 @@ ParseAcpiMadt ( TRUE, 2, "GIC ITS", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (GicITSParser) ); @@ -519,7 +519,7 @@ ParseAcpiMadt ( TRUE, 2, "IO APIC", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (IoApic) ); @@ -532,7 +532,7 @@ ParseAcpiMadt ( TRUE, 2, "INTERRUPT SOURCE OVERRIDE", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (InterruptSourceOverride) ); @@ -544,7 +544,7 @@ ParseAcpiMadt ( TRUE, 2, "PROCESSOR LOCAL APIC", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (ProcessorLocalApic) ); @@ -556,11 +556,11 @@ ParseAcpiMadt ( TRUE, 2, "LOCAL APIC NMI", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (LocalApicNmi) ); - break; + break; } case EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC: { @@ -568,7 +568,7 @@ ParseAcpiMadt ( TRUE, 2, "PROCESSOR LOCAL X2APIC", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (ProcessorLocalX2Apic) ); @@ -581,7 +581,7 @@ ParseAcpiMadt ( TRUE, 2, "LOCAL x2APIC NMI", - InterruptContollerPtr, + InterruptControllerPtr, *MadtInterruptControllerLength, PARSER_PARAMS (LocalX2ApicNmi) ); @@ -600,7 +600,7 @@ ParseAcpiMadt ( } } // switch =20 - InterruptContollerPtr +=3D *MadtInterruptControllerLength; - Offset +=3D *MadtInterruptControllerLength; + InterruptControllerPtr +=3D *MadtInterruptControllerLength; + Offset +=3D *MadtInterruptControllerLength; } // while } --=20 2.39.2 -=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 (#103924): https://edk2.groups.io/g/devel/message/103924 Mute This Topic: https://groups.io/mt/98672298/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-