From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (EUR01-VE1-obe.outbound.protection.outlook.com [40.107.14.73]) by mx.groups.io with SMTP id smtpd.web11.39548.1628874185247082301 for ; Fri, 13 Aug 2021 10:03:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=Du2uW0Ld; spf=pass (domain: arm.com, ip: 40.107.14.73, mailfrom: christopher.jones@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9RtpJ7M1a+2Gi1EmyWtyvfrwwQGXd7bPIijjioBGW70=; b=Du2uW0Ld0su9StG8WODbilhkKf7F3cZbhmLgVr2pFl5pr4HwjGQn9vVfgUgFGu3fBaXPhTduaKY75f/8eSLZqExqO402WjQBn3dvYbvWJrGT3xtoP2bhR0B6/u5J3H3HRRf5wuQyVk0jywugKVa8PiX8RRaA2/d4BiyD4H1Luik= Received: from DB6P195CA0018.EURP195.PROD.OUTLOOK.COM (2603:10a6:4:cb::28) by AS8PR08MB6964.eurprd08.prod.outlook.com (2603:10a6:20b:349::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Fri, 13 Aug 2021 17:02:56 +0000 Received: from DB5EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:cb:cafe::41) by DB6P195CA0018.outlook.office365.com (2603:10a6:4:cb::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 17:02:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT019.mail.protection.outlook.com (10.152.20.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 17:02:56 +0000 Received: ("Tessian outbound 1a0c40aa17d8:v103"); Fri, 13 Aug 2021 17:02:56 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ddd6570c69c5c701 X-CR-MTA-TID: 64aa7808 Received: from 19f02ae0b95f.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id B3CB2D12-80CD-4C3C-B353-EE1E37C3F6A4.1; Fri, 13 Aug 2021 17:02:49 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 19f02ae0b95f.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 13 Aug 2021 17:02:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gy6UGMm/7sGkowaLsDPuGp3829Rrxr0etA/XxnIpZ7niSIcbhXuQn5Pf3q/w5Zjp20kwM/B1Cq5RyjgUxgIyiaFTP6P9rXoREko6Z1TipZN2arW+fdY2J2pDNSNJ0d6YrFYi+hsGAi2oRFsyaa+fcVai27evLI5Creog0OZXFB98me9JinEFymU7kiV915aeseZmWJBHSKaV2O7mLfn3/Ux7s1Fp5bRs670xF3IT77xnL7sR1ixoSpydduh/fWdlL6g89lBe3UtccIs0jcG+paNwvS+gjXlk7ztpxxYjr5xTZA3G+HyR2TYW4Lgtcv+u6Dn4gSyJzFulPmDLiocZmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9RtpJ7M1a+2Gi1EmyWtyvfrwwQGXd7bPIijjioBGW70=; b=QjnjQYuSQhmtdUXt7RJtk5FuVIHrhJRhWhkUkY8wVvKgNt4J8bV5wKhEhcW8gp3+tw8ddwu8DRbmhlr+ainz6K5u5m8FQuQ6WEtmDBmrjycw/S70+IBakzfoAzdYsswKZr3NVg2ckCtT1Z4ZUTD5q0gGmRzciDhPGsUm3mFA1MX4pTNgp5NGRuJABhcI6PtdtgwnePBBqFA+Pq8eTZmWgQq9iCo6D+L7vwKtCdPZuY5AG7EQi+7sARJuRqDitUBhkjrXu9+nKr6+7S44CNyrCPYZ2tlrb1SteOzI78wAP/es5v8v5Ya6LS41/K3QJpLWx4JwZIU5IL0qnsNRLk0ggA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9RtpJ7M1a+2Gi1EmyWtyvfrwwQGXd7bPIijjioBGW70=; b=Du2uW0Ld0su9StG8WODbilhkKf7F3cZbhmLgVr2pFl5pr4HwjGQn9vVfgUgFGu3fBaXPhTduaKY75f/8eSLZqExqO402WjQBn3dvYbvWJrGT3xtoP2bhR0B6/u5J3H3HRRf5wuQyVk0jywugKVa8PiX8RRaA2/d4BiyD4H1Luik= Received: from DB6PR1001CA0027.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::13) by DB6PR0801MB2087.eurprd08.prod.outlook.com (2603:10a6:4:77::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 17:02:47 +0000 Received: from DB5EUR03FT035.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:55:cafe::1) by DB6PR1001CA0027.outlook.office365.com (2603:10a6:4:55::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 17:02:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT035.mail.protection.outlook.com (10.152.20.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 17:02:47 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.14; Fri, 13 Aug 2021 17:02:46 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Fri, 13 Aug 2021 17:02:46 +0000 Received: from e125153.arm.com (10.57.68.146) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Fri, 13 Aug 2021 17:02:45 +0000 From: "Chris Jones" To: CC: , , , , , , Subject: [PATCH v1 1/2] ShellPkg: Update Acpiview PCCT parser to ACPI 6.4 Date: Fri, 13 Aug 2021 18:02:44 +0100 Message-ID: <20210813170245.4318-2-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210813170245.4318-1-christopher.jones@arm.com> References: <20210813170245.4318-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 403f163b-47b1-4b5e-315b-08d95e7c3286 X-MS-TrafficTypeDiagnostic: DB6PR0801MB2087:|AS8PR08MB6964: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7219;OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Zwjq/lg6GJ+iNlJSJX6YeLBqYUIIA1NHo0mltQEIhrHRrEI3+wate5efaQYHI+aIaz/WbtxIApf7cknSFdU9JqcEJQ5u4xR1pTkPaK2FBddaYWiexP2KD7Vf4Qoe20rTr8j+5bh/aROtvEYEjUYWvPJ7QrvXu9wwCSR6YPAz9AmgAxThLI23k5og6pzd7URG6qyrwFXoZLVK0dxLsJUt88vwkpVFAHYi/03jFQFQPoIMoJrlOXo4NrtkoFj36hvyGKCiHLR4nM6lRxRtuNdwlFzjm+DKTlA6xml4/V7xRCHZCMRAtKmjd1mY95pipuC16PpAvBGd1MWEeyoLj/U3Ecyh7XW6ouwSO6JFEwLs4KYsPussBNKAh18lmm3ruTaePA7gZWBVhrVhg/UD01nRFQgzX7bUhdTgNkHtixth2ygAw8uDLy9mHouql1cxHLhFNpVC786Dhm8o4aBgOnFnucilR7ogLuftdH5HHY0gjHfMX987zQ4ncrjB7wswW7N4A2yIgWDrvhIZYY/Htab4VxUMwwl6350ZYSManVW1oAYBuLWD3hv3naS84kPVqjG7bAMjRIIoWKIVrI+6lyhaqS7HpSKvFLFEvIVxWoOv+yAf02kh1CEzAGjKzEz8UbilMm1ry7XVyeZhzBfKHPZTLTPaHWit30NW2OMgyIQZ2nt1jisN6/WQglCqBS0CLE6ShZsoT9HMzjNkBhQUR6o4HBuIoxaGGlIY+AwJv+J0sWC2NUDIqPvSzFKeI+m7uY5mGZnS59rw9IkzeaixU9lediXMCES+PQ20N6xU8ZY8B7VmrXkpQV2yEp+B2k+AzwDEAOy91Ogc0LDtqJfNKSbdYS+D2IG2bXHJuLD91xoyVPM= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(346002)(396003)(136003)(376002)(39850400004)(46966006)(36840700001)(336012)(2616005)(426003)(19627235002)(478600001)(316002)(7696005)(6916009)(34020700004)(26005)(186003)(4326008)(54906003)(83380400001)(70586007)(1076003)(82310400003)(2906002)(86362001)(70206006)(36756003)(5660300002)(8936002)(81166007)(15650500001)(47076005)(356005)(82740400003)(36860700001)(8676002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB2087 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: de185f81-b23f-476a-df56-08d95e7c2d31 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VIFpA1UY4OKiJ+XMbVu9RrneFn08SgUuA8s50//KYt3Slx6vjCFZJVqqmnetBOC9hxy4PQw7AGRs0rs3zq9QcxAl0IRDqNfWxZSQNOAlsYoxb2lWu7Jnnebu5dbo7dhpulOD1s1B8B/1bCeYde47aSYMGUS+hPA6ZT2Be6qqHmesEIRkhEf2EDGmN02Ip+i502Tnf4SWV/j8vGOz/mEf30Tc543387RYBdpY2DPMVclZUiqvT48sGAVe/TqvKg66XRSCGFTzKIkoIAtpQkZPPF1lQ8usupCf8Gk1NMARzHZYXTGSUWhQ/ofe3e3PvVHf9ynt0Q1WDQQiRW+/S2IxH/URpn2DHzKbrt22aq4Hid7vQotP8KltfmcrAODZMewBCgv0LTksjbgDSffp8XlC67VjjNG/2NStNKW+KRm8us9Up8KxH0+hEgIWcVUBVE8IMwPHWX8vJhDWyJfiy7W0sPutJ3aJLvufp0IyVlgowLc5TGcwqbxiHwRkz5OjFQCO6y6CLc93fF+s/g6o8VRVjEtkC/mrWx8Kj018szCDIahX4p8DZ+WcPvhaKdvK5NbLDPoDv2klkwh7L+8ovAn645t6E1jFkk5bjaiA3JAMmyahvGXtz8M7B5oJrc5x5m3eOCeKStfQHmbv5VIlT0NE3XtCy2h+qyfNMinY2QEuw0mJYskJz+ysByKV3W+mAcQnycgukPGwecRIuxv2Csxdv8slYlemoh0sH3jFrHod18w2nhHZiozvXtCMNKE/2S0pZx071DgAX41tgYP/ZLh2ilBnjmeQmPB8ZGh+zwcsbAc= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(376002)(136003)(396003)(346002)(39860400002)(36840700001)(46966006)(82310400003)(86362001)(316002)(6916009)(47076005)(36860700001)(15650500001)(2616005)(8936002)(4326008)(5660300002)(82740400003)(2906002)(83380400001)(54906003)(26005)(336012)(186003)(8676002)(19627235002)(478600001)(7696005)(1076003)(81166007)(70206006)(426003)(70586007)(36756003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 17:02:56.6176 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 403f163b-47b1-4b5e-315b-08d95e7c3286 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6964 Content-Type: text/plain Bugzilla: 3563 (https://bugzilla.tianocore.org/show_bug.cgi?id=3563) Update the Acpiview PCCT parser to use Acpi64.h. Signed-off-by: Chris Jones --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c | 46 ++++++++++---------- ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c | 4 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c index ca553d5953f05651d8df4c95d1e39a73eded5129..7d3a2dd10dc928265bad3711e929d96c1ed40b1d 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c @@ -1,11 +1,11 @@ /** @file PCCT table parser - Copyright (c) 2020, Arm Limited. + Copyright (c) 2021, Arm Limited. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): - - ACPI 6.3 Specification - January 2019 + - ACPI 6.4 Specification - January 2021 **/ #include @@ -93,9 +93,9 @@ ValidatePccType0Gas ( { switch (*(UINT8*)Ptr) { #if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)) - case EFI_ACPI_6_3_SYSTEM_IO: + case EFI_ACPI_6_4_SYSTEM_IO: #endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)) - case EFI_ACPI_6_3_SYSTEM_MEMORY: + case EFI_ACPI_6_4_SYSTEM_MEMORY: return; default: IncrementErrorCount (); @@ -120,10 +120,10 @@ ValidatePccGas ( { switch (*(UINT8*)Ptr) { #if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)) - case EFI_ACPI_6_3_SYSTEM_IO: + case EFI_ACPI_6_4_SYSTEM_IO: #endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)) - case EFI_ACPI_6_3_FUNCTIONAL_FIXED_HARDWARE: - case EFI_ACPI_6_3_SYSTEM_MEMORY: + case EFI_ACPI_6_4_FUNCTIONAL_FIXED_HARDWARE: + case EFI_ACPI_6_4_SYSTEM_MEMORY: return; default: IncrementErrorCount (); @@ -148,10 +148,10 @@ ValidatePccDoorbellGas ( { // For slave subspaces this field is optional, if not present the field // should just contain zeros. - if (*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) { + if (*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) { if (IsZeroBuffer ( Ptr, - sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE) + sizeof (EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE) )) { return; } @@ -180,14 +180,14 @@ ValidatePccIntAckGas ( // edge driven the register may be omitted. A value of 0x0 on all // 12 bytes of the GAS structure indicates the register is not // present. - if (((*PccGlobalFlags & EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) != - EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) || + if (((*PccGlobalFlags & EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) != + EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) || ((*ExtendedPccSubspaceInterruptFlags & - EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE) == - EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE)) { + EFI_ACPI_6_4_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE) == + EFI_ACPI_6_4_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE)) { if (IsZeroBuffer ( Ptr, - sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE) + sizeof (EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE) )) { return; } @@ -212,7 +212,7 @@ ValidatePccErrStatusGas ( ) { // This field is ignored by the OSPM on slave channels. - if (*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) { + if (*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) { return; } @@ -236,9 +236,9 @@ ValidatePlatInterrupt ( { // If a slave subspace is present in the PCCT, then the global Platform // Interrupt flag must be set to 1. - if ((*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) && - ((*PccGlobalFlags & EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) != - EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT)) { + if ((*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) && + ((*PccGlobalFlags & EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) != + EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT)) { IncrementErrorCount (); Print ( L"\nError: Global Platform interrupt flag must be set to 1" \ @@ -563,31 +563,31 @@ ParseAcpiPcct ( } switch (*PccSubspaceType) { - case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_GENERIC: + case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_GENERIC: DumpPccSubspaceType0 ( PccSubspacePtr, *PccSubspaceLength ); break; - case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS: + case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS: DumpPccSubspaceType1 ( PccSubspacePtr, *PccSubspaceLength ); break; - case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS: + case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS: DumpPccSubspaceType2 ( PccSubspacePtr, *PccSubspaceLength ); break; - case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_3_EXTENDED_PCC: + case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_3_EXTENDED_PCC: DumpPccSubspaceType3 ( PccSubspacePtr, *PccSubspaceLength ); break; - case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC: + case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC: DumpPccSubspaceType4 ( PccSubspacePtr, *PccSubspaceLength diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c index b30ed3fc8597b229dd15b6ad4f2aab2e3d0ca583..c81e5220272ae94448203ee02ea5caacb606842c 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c @@ -1,7 +1,7 @@ /** @file Main file for 'acpiview' Shell command function. - Copyright (c) 2016 - 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -60,7 +60,7 @@ ACPI_TABLE_PARSER ParserList[] = { {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt}, {EFI_ACPI_6_2_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMcfg}, - {EFI_ACPI_6_2_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE, + {EFI_ACPI_6_4_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE, ParseAcpiPcct}, {EFI_ACPI_6_2_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, ParseAcpiPptt}, -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")