From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.10227.1607590161109308064 for ; Thu, 10 Dec 2020 00:49:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=tscsNjPv; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: zhichao.gao@intel.com) IronPort-SDR: f9Pr00Me/SESh/3qHWlNUPBQdgrFao9vzCe3b4qUICa56GU6jaUmsLCLF12uiYcLhzPurCEEgA RLP+iDXfxSeg== X-IronPort-AV: E=McAfee;i="6000,8403,9830"; a="174335616" X-IronPort-AV: E=Sophos;i="5.78,407,1599548400"; d="scan'208";a="174335616" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 00:49:20 -0800 IronPort-SDR: os+Je6Ffy3PZe6sS1mbs1u6g/sK//surFJGpH1rZ3TJ9BTZj5u5S43u/RqCDCqfLXOHHNwGkI3 14Nyj2B9ew/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,407,1599548400"; d="scan'208";a="338347711" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga006.jf.intel.com with ESMTP; 10 Dec 2020 00:49:18 -0800 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 10 Dec 2020 00:49:16 -0800 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 10 Dec 2020 00:49:16 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 10 Dec 2020 00:49:16 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.105) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Thu, 10 Dec 2020 00:49:15 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jj6mBABD/iFAe2jn5lkc4pFI6InMqASLSUksFjsaL5UV5N4CbuUi+ZZ3NXf2OkuDZNmt3yvMD2d/fIvbd1DiziipO+tn40j1WaB3DfkoyVdq7I3WJKCgNjXTFl/aYJFsbUViCHI2qLZAiw7vb72/DgIVxosm6xAvWokcZnTFHeqRG7a5Wb1EcTrr51dhnNVJvHJHmrVAdwfhnWGeHhFDxLr0T0VoW2+4zyV92Ox56eAcsFy0os8rjY5RcF5/Sj/kQKrcOeTxEFgnKCT98n91EdhqUol57XBnLqh5dNw/v9Xy8H34O8wWzaJdYirFEVDgbctGR/Tf4yr4eR/gY7RRJQ== 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=NrAHszeDmS4+XkqUlM4p9cceUl7iMXA7aQNS/oLCtKs=; b=eel7pgnSg5547MbEWNbFfbDkqgzxB1+TNiIG92Cb82ePXp2HJQ9NHi0rsW5KInIDQmNC7DKgUiuk/2rcWFP3i4bp62A/mlSHyzKVVL/F4/dOL+RR8d/A0DTundP+CAFktHqR2xEHQ/l87HwvV1KgveHZ6+LKL7aSlKTJjN2xBo759myIwP7u2nzlcHtW+UCvtMYbHQ1AD870vly6yJSpwBmDxABeVuvcVZfAzfeReURny719PYhjjw5qGwc6s1/bneNxX8bw6kUrqNGnAFbUVo0VnrzWhNWa48Np6phhBr7jrlCuHB86oR+KByeXMvQrFisuTtkIL+3L7TRz+GkPkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NrAHszeDmS4+XkqUlM4p9cceUl7iMXA7aQNS/oLCtKs=; b=tscsNjPvlhsel2SBkLqJzCXJg8C+AAd/tk7tMpq6K8t6QOYbxqgfSM2HjOHoqG1sgTXWQmN/QtGVZ9uH83Ww+OmdpYsHeWW28i9ygiFXnVJa9GKVEVPTi3nRUGSQ3b6LTBb/ZBK9IeR4GxBNeVNOX5QJ1JkKr+JAnSbflvThwos= Received: from MWHPR11MB1647.namprd11.prod.outlook.com (2603:10b6:301:d::12) by MW3PR11MB4681.namprd11.prod.outlook.com (2603:10b6:303:57::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17; Thu, 10 Dec 2020 08:49:14 +0000 Received: from MWHPR11MB1647.namprd11.prod.outlook.com ([fe80::c861:b9c1:b082:7c77]) by MWHPR11MB1647.namprd11.prod.outlook.com ([fe80::c861:b9c1:b082:7c77%8]) with mapi id 15.20.3632.023; Thu, 10 Dec 2020 08:49:14 +0000 From: "Gao, Zhichao" To: Sami Mujawar , "devel@edk2.groups.io" CC: "Ni, Ray" , "Matteo.Carlini@arm.com" , "Ben.Adderson@arm.com" , "nd@arm.com" Subject: Re: [PATCH v2-resend 1/2] ShellPkg/AcpiView: PCCT Parser Thread-Topic: [PATCH v2-resend 1/2] ShellPkg/AcpiView: PCCT Parser Thread-Index: AQHWsqTOEv5wNMVfCES+pvfFC7CraKnwPT6w Date: Thu, 10 Dec 2020 08:49:14 +0000 Message-ID: References: <20201104121821.18728-1-sami.mujawar@arm.com> <20201104121821.18728-3-sami.mujawar@arm.com> In-Reply-To: <20201104121821.18728-3-sami.mujawar@arm.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.39] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cdc05daf-4803-41a9-0972-08d89ce878ea x-ms-traffictypediagnostic: MW3PR11MB4681: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: fZWIRpxQu8L29otkAkpSPcrN46fPxBp7xbVGk8KGPBWxa6cQYfxdU7zDosS6bgsZl2779fiFcXF1QQ/0aCUpjJmz9E1KunFbr9Yyc/Up+wNTFa6oTJmdmfGfhYDOEPpAfOVowU3PNX14mSlbdoyXnCltQ3qBWugHaNYXxscs2eUVeggAR/D2c0ADT4NjH56o65B3nYA/cHbKRIvUNZ2WPmfgHwp7MwVCMrnHcoDfZliQ3m2JhkAM1WxywV8Apyh+yfkuqfh9T9BF4CjAeu0RAqez1wAtfVhF2XPTgxeowRLyAnItSOd/Iw6F2PMkQDom9QQ5V0N5AixeC5U6A8axhtA7YJ85+K5aHJUINnZtv3og8arZU59RFiLNJyuQBlGzeeQX0jUEhXETzQx6eYvcRA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1647.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(136003)(376002)(346002)(4326008)(6506007)(86362001)(8676002)(83380400001)(66556008)(53546011)(19627235002)(186003)(508600001)(76116006)(64756008)(26005)(33656002)(66476007)(71200400001)(7696005)(110136005)(8936002)(66946007)(66446008)(52536014)(30864003)(54906003)(9686003)(5660300002)(55016002)(2906002)(579004)(559001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?T7py3j7gGTKRq5RPMQZbXdFZBqfezmqTaYiGo076JptVgLsHV+QfvO5k+Q6d?= =?us-ascii?Q?nMvwEQSWPSg3OmSUhfa1+DbwCFKNZWWX/fpVxxGX+M3rwCAGtiMywVxU2+0m?= =?us-ascii?Q?QH0fJ6aItrW8v5fRm5OeGNsNdjN2/Yx+lbAbyBRwupbPeIj1Hqqbn71fcfAA?= =?us-ascii?Q?KRVqU96+cHx2Y5K1M5vmCtrD79iKW+V3x5yzgxX5rbxplIg3qeu3aSgz4lkz?= =?us-ascii?Q?CpMq4wYTCIab38YOji6V6s5umhT2UmL0QdBcuBGiZx9ThVSXXV5RGnToQKci?= =?us-ascii?Q?r6X7L0CPiVsZG9Y72RO443HQ8lKAHoSdSoersE8v1/Ln1CqHRH2L+gaN5wnl?= =?us-ascii?Q?wuNObT5rcxwVScH8KY5UPu9G3QD8Ef9lo/O9aRPz/zUhx9gXm3TiEfQphb2p?= =?us-ascii?Q?w+J3ygLtA+DaqO3FYsNUoDxGIQlwrm409oEMtRv+Y70df42GKtCIDslAqXrN?= =?us-ascii?Q?jv0RQFXGUjhh/XBqAfCczOKIDkz3brZh8VHGPACbblxsD9gEnwdOHqqZTcL4?= =?us-ascii?Q?Z71hNplh4u13HEXD7/HjHoVGoTFEl8XOcZ/3pA8NO42ZFHoirsRq9y9V50MG?= =?us-ascii?Q?zH+IaQWth8wX+hvKD5ZJ5cuSQ6WBu8knFk53d4qgn6jXpVgXhSF5fKZgtc12?= =?us-ascii?Q?EOnZUkU/XcxGueHh1j9rNTBz5JUqxsOKS0z8F6n1ShCrZ/IKW6xNONeosvjw?= =?us-ascii?Q?rJw1ZsOiO/nPHYMcxJNeARxWeKrgjlLF9+HohMFdmLmywaXJ40pNie5GuHtj?= =?us-ascii?Q?MFUS8+kCWteWHiXam+6SfHqTnQiZRcZkvCZXSP/PMPRCGs7u0CxewTbeMlqH?= =?us-ascii?Q?ut2gKTdPzYsy8ixunT6vOw+RpRy/CeTqrAq5oXMLDEy2dYw+KntqpLRXlYYZ?= =?us-ascii?Q?WgP4doad7l12Lh5pxYf/vABybNkNnx2E1/WrJOHzg3H1IDAM5F236cnOMzvP?= =?us-ascii?Q?5oYePy7Yf7CrkAio2ueGedqW40LVT98zeQIArKbgnBw=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1647.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdc05daf-4803-41a9-0972-08d89ce878ea X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Dec 2020 08:49:14.6375 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Esf+AYY3my5emgg8Ex5cQpwMFP+DxaI1dJhvd/Ct/L62C9siLbdv3hWLK+8PhrbydcLJVc6RaqhsjphT5RC+GA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4681 Return-Path: zhichao.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Zhichao Gao Thanks, Zhichao > -----Original Message----- > From: Sami Mujawar > Sent: Wednesday, November 4, 2020 8:18 PM > To: devel@edk2.groups.io > Cc: Sami Mujawar ; Ni, Ray ; Gao, > Zhichao ; Matteo.Carlini@arm.com; > Ben.Adderson@arm.com; nd@arm.com > Subject: [PATCH v2-resend 1/2] ShellPkg/AcpiView: PCCT Parser >=20 > From: Marc Moisson-Franckhauser >=20 > Bugzilla: 3047 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3047) >=20 > Create a new parser for the PCCT Table. >=20 > The PCCT Table is used to describe how the OSPM can communicate with enti= ties > outside the platform. It describes which memory spaces correspond to whic= h > entity as well as a few of the needed information to handle the communica= tions. >=20 > This new PCCT parser dumps the values and names of the table fields. It a= lso > performs some validation on the table's fields. >=20 > Signed-off-by: Marc Moisson-Franckhauser franckhauser@arm.com> > Signed-off-by: Sami Mujawar > --- >=20 > Notes: > v2: > - Addressed review comments by adding validation functions [SAMI= ] > for Doorbell, Interrupt Ack and Error Status GAS fields. > Also added validation to check if the global platform > interrupt flag is set for type 4 structure. >=20 > ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h = | 24 +- > ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h = | 4 > +- > ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c = | > 615 ++++++++++++++++++++ > ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.h = | > 33 ++ >=20 > ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.= c > | 4 +- >=20 > ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.= i > nf | 4 +- > 6 files changed, 679 insertions(+), 5 deletions(-) >=20 > diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h > index > f81ccac7e118378aa185db4b625e5bcd75f78347..051fdf807abb1067a264c136364 > bb6d145b38dab 100644 > --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h > +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h > @@ -1,7 +1,7 @@ > /** @file > Header file for ACPI parser >=20 > - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. > + Copyright (c) 2016 - 2020, Arm Limited. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent **/ >=20 > @@ -671,6 +671,28 @@ ParseAcpiMcfg ( > ); >=20 > /** > + This function parses the ACPI PCCT table including its sub-structures > + of type 0 through 4. > + When trace is enabled this function parses the PCCT table and traces > + the ACPI table fields. > + > + This function also performs validation of the ACPI table fields. > + > + @param [in] Trace If TRUE, trace the ACPI fields. > + @param [in] Ptr Pointer to the start of the buffer. > + @param [in] AcpiTableLength Length of the ACPI table. > + @param [in] AcpiTableRevision Revision of the ACPI table. > +**/ > +VOID > +EFIAPI > +ParseAcpiPcct ( > + IN BOOLEAN Trace, > + IN UINT8* Ptr, > + IN UINT32 AcpiTableLength, > + IN UINT8 AcpiTableRevision > + ); > + > +/** > This function parses the ACPI PPTT table. > When trace is enabled this function parses the PPTT table and > traces the ACPI table fields. > diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser= .h > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h > index > 4f92596b90a6ee422d8d0959881015ffd3de4da0..0ebf79fb653ae3a8190273aee4 > 52723c6213eb58 100644 > --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h > +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h > @@ -1,7 +1,7 @@ > /** @file > Header file for ACPI table parser >=20 > - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. > + Copyright (c) 2016 - 2020, Arm Limited. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent **/ >=20 > @@ -11,7 +11,7 @@ > /** > The maximum number of ACPI table parsers. > */ > -#define MAX_ACPI_TABLE_PARSERS 16 > +#define MAX_ACPI_TABLE_PARSERS 32 >=20 > /** An invalid/NULL signature value. > */ > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c > new file mode 100644 > index > 0000000000000000000000000000000000000000..ca553d5953f05651d8df4c95d > 1e39a73eded5129 > --- /dev/null > +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctPars > +++ er.c > @@ -0,0 +1,615 @@ > +/** @file > + PCCT table parser > + > + Copyright (c) 2020, Arm Limited. > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > + @par Reference(s): > + - ACPI 6.3 Specification - January 2019 **/ > + > +#include > +#include > +#include > +#include "AcpiParser.h" > +#include "AcpiView.h" > +#include "AcpiViewConfig.h" > +#include "PcctParser.h" > + > +// Local variables > +STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; > + > +STATIC UINT32* PccGlobalFlags; > +STATIC UINT8* PccSubspaceLength; > +STATIC UINT8* PccSubspaceType; > +STATIC UINT8* ExtendedPccSubspaceInterruptFlags; > + > +/** > + This function validates the length coded on 4 bytes of a shared > +memory range > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidateRangeLength4 ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + if (*(UINT32*)Ptr < MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN) { > + IncrementErrorCount (); > + Print ( > + L"\nError: Shared memory range length is too short.\n" > + L"Length is %u when it should be greater than or equal to %u", > + *(UINT32*)Ptr, > + MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN > + ); > + } > +} > + > +/** > + This function validates the length coded on 8 bytes of a shared > +memory range > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidateRangeLength8 ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + if (*(UINT64*)Ptr <=3D MIN_MEMORY_RANGE_LENGTH) { > + IncrementErrorCount (); > + Print ( > + L"\nError: Shared memory range length is too short.\n" > + L"Length is %u when it should be greater than %u", > + *(UINT64*)Ptr, > + MIN_MEMORY_RANGE_LENGTH > + ); > + } > +} > + > +/** > + This function validates address space for type 0 structure. > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidatePccType0Gas ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + switch (*(UINT8*)Ptr) { > +#if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)) > + case EFI_ACPI_6_3_SYSTEM_IO: > +#endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)) > + case EFI_ACPI_6_3_SYSTEM_MEMORY: > + return; > + default: > + IncrementErrorCount (); > + Print (L"\nError: Invalid address space"); > + } > +} > + > +/** > + This function validates address space for structures of types other th= an 0. > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidatePccGas ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + switch (*(UINT8*)Ptr) { > +#if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)) > + case EFI_ACPI_6_3_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: > + return; > + default: > + IncrementErrorCount (); > + Print (L"\nError: Invalid address space"); > + } > +} > + > +/** > + This function validates doorbell address space for type 4 structure. > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidatePccDoorbellGas ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + // For slave subspaces this field is optional, if not present the > +field > + // should just contain zeros. > + if (*PccSubspaceType =3D=3D > EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) { > + if (IsZeroBuffer ( > + Ptr, > + sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE) > + )) { > + return; > + } > + } > + > + ValidatePccGas (Ptr, Context); > +} > + > +/** > + This function validates interrupt acknowledge address space for > + type 4 structure. > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidatePccIntAckGas ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + // If the subspace does not support interrupts or the interrupt is > + // 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) !=3D > + EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) || > + ((*ExtendedPccSubspaceInterruptFlags & > + EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE) =3D=3D > + EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE)) { > + if (IsZeroBuffer ( > + Ptr, > + sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE) > + )) { > + return; > + } > + } > + > + ValidatePccGas (Ptr, Context); > +} > + > +/** > + This function validates error status address space for type 4 structur= e. > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidatePccErrStatusGas ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + // This field is ignored by the OSPM on slave channels. > + if (*PccSubspaceType =3D=3D > EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) { > + return; > + } > + > + ValidatePccGas (Ptr, Context); > +} > + > +/** > + This function validates platform interrupt flags for type 4 structure. > + > + @param [in] Ptr Pointer to the start of the field data. > + @param [in] Context Pointer to context specific information e.g. this > + could be a pointer to the ACPI table header. > +**/ > +STATIC > +VOID > +EFIAPI > +ValidatePlatInterrupt ( > + IN UINT8* Ptr, > + IN VOID* Context > + ) > +{ > + // If a slave subspace is present in the PCCT, then the global > +Platform > + // Interrupt flag must be set to 1. > + if ((*PccSubspaceType =3D=3D > EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) && > + ((*PccGlobalFlags & EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) != =3D > + EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT)) { > + IncrementErrorCount (); > + Print ( > + L"\nError: Global Platform interrupt flag must be set to 1" \ > + L" if a PCC type 4 structure is present in PCCT." > + ); > + } > +} > + > +/** > + An ACPI_PARSER array describing the ACPI PCCT Table. > +*/ > +STATIC CONST ACPI_PARSER PcctParser[] =3D { > + PARSE_ACPI_HEADER (&AcpiHdrInfo), > + {L"Flags", 4, 36, NULL, NULL, (VOID**)&PccGlobalFlags, NULL, NULL}, > + {L"Reserved", 8, 40, NULL, NULL, NULL, NULL, NULL} }; > + > +/** > + An ACPI_PARSER array describing the platform communications channel > +subspace > + structure header. > +*/ > +STATIC CONST ACPI_PARSER PccSubspaceHeaderParser[] =3D { > + PCC_SUBSPACE_HEADER () > + // ... Type Specific Fields ... > +}; > + > +/** > + An ACPI_PARSER array describing the Generic Communications Subspace - > +Type 0 */ STATIC CONST ACPI_PARSER PccSubspaceType0Parser[] =3D { > + PCC_SUBSPACE_HEADER (), > + {L"Reserved", 6, 2, L"%x %x %x %x %x %x", Dump6Chars, NULL, NULL, > +NULL}, > + {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Memory Range Length", 8, 16, L"0x%lx", NULL, NULL, > ValidateRangeLength8, > + NULL}, > + {L"Doorbell Register", 12, 24, NULL, DumpGas, NULL, ValidatePccType0Ga= s, > + NULL}, > + {L"Doorbell Preserve", 8, 36, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Doorbell Write", 8, 44, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Nominal Latency", 4, 52, L"%u", NULL, NULL, NULL, NULL}, > + {L"Maximum Periodic Access Rate", 4, 56, L"%u", NULL, NULL, NULL, > +NULL}, > + {L"Minimum Request Turnaround Time", 2, 60, L"%u", NULL, NULL, NULL, > +NULL} }; > + > +/** > + An ACPI_PARSER array describing the HW-Reduced Communications > +Subspace > + - Type 1 > +*/ > +STATIC CONST ACPI_PARSER PccSubspaceType1Parser[] =3D { > + PCC_SUBSPACE_HEADER (), > + {L"Platform Interrupt", 4, 2, L"0x%x", NULL, NULL, NULL, NULL}, > + {L"Platform Interrupt Flags", 1, 6, L"0x%x", NULL, NULL, NULL, NULL}, > + {L"Reserved", 1, 7, L"0x%x", NULL, NULL, NULL, NULL}, > + {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Memory Range Length", 8, 16, L"0x%lx", NULL, NULL, > ValidateRangeLength8, > + NULL}, > + {L"Doorbell Register", 12, 24, NULL, DumpGas, NULL, > + ValidatePccGas, NULL}, > + {L"Doorbell Preserve", 8, 36, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Doorbell Write", 8, 44, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Nominal Latency", 4, 52, L"%u", NULL, NULL, NULL, NULL}, > + {L"Maximum Periodic Access Rate", 4, 56, L"%u", NULL, NULL, NULL, > +NULL}, > + {L"Minimum Request Turnaround Time", 2, 60, L"%u", NULL, NULL, NULL, > +NULL} }; > + > +/** > + An ACPI_PARSER array describing the HW-Reduced Communications > +Subspace > + - Type 2 > +*/ > +STATIC CONST ACPI_PARSER PccSubspaceType2Parser[] =3D { > + PCC_SUBSPACE_HEADER (), > + {L"Platform Interrupt", 4, 2, L"0x%x", NULL, NULL, NULL, NULL}, > + {L"Platform Interrupt Flags", 1, 6, L"0x%x", NULL, NULL, NULL, NULL}, > + {L"Reserved", 1, 7, L"0x%x", NULL, NULL, NULL, NULL}, > + {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Memory Range Length", 8, 16, L"0x%lx", NULL, NULL, > ValidateRangeLength8, > + NULL}, > + {L"Doorbell Register", 12, 24, NULL, DumpGas, NULL, > + ValidatePccGas, NULL}, > + {L"Doorbell Preserve", 8, 36, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Doorbell Write", 8, 44, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Nominal Latency", 4, 52, L"%u", NULL, NULL, NULL, NULL}, > + {L"Maximum Periodic Access Rate", 4, 56, L"%u", NULL, NULL, NULL, > +NULL}, > + {L"Minimum Request Turnaround Time", 2, 60, L"%u", NULL, NULL, NULL, > +NULL}, > + {L"Platform Interrupt Ack Register", 12, 62, NULL, DumpGas, NULL, > + ValidatePccGas, NULL}, > + {L"Platform Interrupt Ack Preserve", 8, 74, L"0x%lx", NULL, NULL, > +NULL, NULL}, > + {L"Platform Interrupt Ack Write", 8, 82, L"0x%lx", NULL, NULL, > + NULL, NULL}, > +}; > + > +/** > + An ACPI_PARSER array describing the Extended PCC Subspaces - Type 3/4 > +*/ STATIC CONST ACPI_PARSER PccSubspaceType3Parser[] =3D { > + PCC_SUBSPACE_HEADER (), > + {L"Platform Interrupt", 4, 2, L"0x%x", NULL, NULL, > + ValidatePlatInterrupt, NULL}, > + {L"Platform Interrupt Flags", 1, 6, L"0x%x", NULL, > + (VOID**)&ExtendedPccSubspaceInterruptFlags, NULL, NULL}, > + {L"Reserved", 1, 7, L"0x%x", NULL, NULL, NULL, NULL}, > + {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Memory Range Length", 4, 16, L"0x%x", NULL, NULL, > ValidateRangeLength4, > + NULL}, > + {L"Doorbell Register", 12, 20, NULL, DumpGas, NULL, > + ValidatePccDoorbellGas, NULL}, > + {L"Doorbell Preserve", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Doorbell Write", 8, 40, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Nominal Latency", 4, 48, L"%u", NULL, NULL, NULL, NULL}, > + {L"Maximum Periodic Access Rate", 4, 52, L"%u", NULL, NULL, NULL, > +NULL}, > + {L"Minimum Request Turnaround Time", 4, 56, L"%u", NULL, NULL, NULL, > +NULL}, > + {L"Platform Interrupt Ack Register", 12, 60, NULL, DumpGas, NULL, > + ValidatePccIntAckGas, NULL}, > + {L"Platform Interrupt Ack Preserve", 8, 72, L"0x%lx", NULL, NULL, > +NULL, NULL}, > + {L"Platform Interrupt Ack Set", 8, 80, L"0x%lx", NULL, NULL, NULL, > +NULL}, > + {L"Reserved", 8, 88, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Cmd Complete Check Reg Addr", 12, 96, NULL, DumpGas, NULL, > + ValidatePccGas, NULL}, > + {L"Cmd Complete Check Mask", 8, 108, L"0x%lx", NULL, NULL, NULL, > +NULL}, > + {L"Cmd Update Reg Addr", 12, 116, NULL, DumpGas, NULL, > + ValidatePccGas, NULL}, > + {L"Cmd Update Preserve mask", 8, 128, L"0x%lx", NULL, NULL, NULL, > +NULL}, > + {L"Cmd Update Set mask", 8, 136, L"0x%lx", NULL, NULL, NULL, NULL}, > + {L"Error Status Register", 12, 144, NULL, DumpGas, NULL, > + ValidatePccErrStatusGas, NULL}, > + {L"Error Status Mask", 8, 156, L"0x%lx", NULL, NULL, NULL, NULL}, }; > + > +/** > + This function parses the PCC Subspace type 0. > + > + @param [in] Ptr Pointer to the start of Subspace Structure. > + @param [in] Length Length of the Subspace Structure. > +**/ > +STATIC > +VOID > +DumpPccSubspaceType0 ( > + IN UINT8* Ptr, > + IN UINT8 Length > + ) > +{ > + ParseAcpi ( > + TRUE, > + 2, > + "Subspace Type 0", > + Ptr, > + Length, > + PARSER_PARAMS (PccSubspaceType0Parser) > + ); > +} > + > +/** > + This function parses the PCC Subspace type 1. > + > + @param [in] Ptr Pointer to the start of the Subspace Structure. > + @param [in] Length Length of the Subspace Structure. > +**/ > +STATIC > +VOID > +DumpPccSubspaceType1 ( > + IN UINT8* Ptr, > + IN UINT8 Length > + ) > +{ > + ParseAcpi ( > + TRUE, > + 2, > + "Subspace Type 1", > + Ptr, > + Length, > + PARSER_PARAMS (PccSubspaceType1Parser) > + ); > +} > + > +/** > + This function parses the PCC Subspace type 2. > + > + @param [in] Ptr Pointer to the start of the Subspace Structure. > + @param [in] Length Length of the Subspace Structure. > +**/ > +STATIC > +VOID > +DumpPccSubspaceType2 ( > + IN UINT8* Ptr, > + IN UINT8 Length > + ) > +{ > + ParseAcpi ( > + TRUE, > + 2, > + "Subspace Type 2", > + Ptr, > + Length, > + PARSER_PARAMS (PccSubspaceType2Parser) > + ); > +} > + > +/** > + This function parses the PCC Subspace type 3. > + > + @param [in] Ptr Pointer to the start of the Subspace Structure. > + @param [in] Length Length of the Subspace Structure. > +**/ > +STATIC > +VOID > +DumpPccSubspaceType3 ( > + IN UINT8* Ptr, > + IN UINT8 Length > + ) > +{ > + ParseAcpi ( > + TRUE, > + 2, > + "Subspace Type 3", > + Ptr, > + Length, > + PARSER_PARAMS (PccSubspaceType3Parser) > + ); > +} > + > +/** > + This function parses the PCC Subspace type 4. > + > + @param [in] Ptr Pointer to the start of the Subspace Structure. > + @param [in] Length Length of the Subspace Structure. > +**/ > +STATIC > +VOID > +DumpPccSubspaceType4 ( > + IN UINT8* Ptr, > + IN UINT8 Length > + ) > +{ > + ParseAcpi ( > + TRUE, > + 2, > + "Subspace Type 4", > + Ptr, > + Length, > + PARSER_PARAMS (PccSubspaceType3Parser) > + ); > +} > + > +/** > + This function parses the ACPI PCCT table including its sub-structures > + of type 0 through 4. > + When trace is enabled this function parses the PCCT table and > + traces the ACPI table fields. > + > + This function also performs validation of the ACPI table fields. > + > + @param [in] Trace If TRUE, trace the ACPI fields. > + @param [in] Ptr Pointer to the start of the buffer. > + @param [in] AcpiTableLength Length of the ACPI table. > + @param [in] AcpiTableRevision Revision of the ACPI table. > +**/ > +VOID > +EFIAPI > +ParseAcpiPcct ( > + IN BOOLEAN Trace, > + IN UINT8* Ptr, > + IN UINT32 AcpiTableLength, > + IN UINT8 AcpiTableRevision > + ) > +{ > + UINT32 Offset; > + UINT8* PccSubspacePtr; > + UINTN SubspaceCount; > + > + if (!Trace) { > + return; > + } > + > + Offset =3D ParseAcpi ( > + TRUE, > + 0, > + "PCCT", > + Ptr, > + AcpiTableLength, > + PARSER_PARAMS (PcctParser) > + ); > + > + PccSubspacePtr =3D Ptr + Offset; > + > + SubspaceCount =3D 0; > + while (Offset < AcpiTableLength) { > + // Parse common structure header to obtain Type and Length. > + ParseAcpi ( > + FALSE, > + 0, > + NULL, > + PccSubspacePtr, > + AcpiTableLength - Offset, > + PARSER_PARAMS (PccSubspaceHeaderParser) > + ); > + > + // Check if the values used to control the parsing logic have been > + // successfully read. > + if ((PccSubspaceType =3D=3D NULL) || > + (PccSubspaceLength =3D=3D NULL)) { > + IncrementErrorCount (); > + Print ( > + L"ERROR: Insufficient remaining table buffer length to read the = " \ > + L"structure header. Length =3D %u.\n", > + AcpiTableLength - Offset > + ); > + return; > + } > + > + // Validate Structure length > + if ((*PccSubspaceLength =3D=3D 0) || > + ((Offset + (*PccSubspaceLength)) > AcpiTableLength)) { > + IncrementErrorCount (); > + Print ( > + L"ERROR: Invalid Structure length. " \ > + L"Length =3D %u. Offset =3D %u. AcpiTableLength =3D %u.\n", > + *PccSubspaceLength, > + Offset, > + AcpiTableLength > + ); > + return; > + } > + > + switch (*PccSubspaceType) { > + case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_GENERIC: > + DumpPccSubspaceType0 ( > + PccSubspacePtr, > + *PccSubspaceLength > + ); > + break; > + case > EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS: > + DumpPccSubspaceType1 ( > + PccSubspacePtr, > + *PccSubspaceLength > + ); > + break; > + case > EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS: > + DumpPccSubspaceType2 ( > + PccSubspacePtr, > + *PccSubspaceLength > + ); > + break; > + case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_3_EXTENDED_PCC: > + DumpPccSubspaceType3 ( > + PccSubspacePtr, > + *PccSubspaceLength > + ); > + break; > + case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC: > + DumpPccSubspaceType4 ( > + PccSubspacePtr, > + *PccSubspaceLength > + ); > + break; > + default: > + IncrementErrorCount (); > + Print ( > + L"ERROR: Unknown PCC subspace structure:" > + L" Type =3D %u, Length =3D %u\n", > + PccSubspaceType, > + *PccSubspaceLength > + ); > + } > + > + PccSubspacePtr +=3D *PccSubspaceLength; > + Offset +=3D *PccSubspaceLength; > + SubspaceCount++; > + } // while > + > + if (SubspaceCount > MAX_PCC_SUBSPACES) { > + IncrementErrorCount (); > + Print (L"ERROR: Too many PCC subspaces."); > + } > +} > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.h > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.h > new file mode 100644 > index > 0000000000000000000000000000000000000000..278dc83c5de8860cbb2b1e2b2 > e277aa7c6c58698 > --- /dev/null > +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctPars > +++ er.h > @@ -0,0 +1,33 @@ > +/** @file > + Header file for PCCT parser > + > + Copyright (c) 2020, Arm Limited. > + SPDX-License-Identifier: BSD-2-Clause-Patent **/ > + > +#ifndef PCCT_PARSER_H_ > +#define PCCT_PARSER_H_ > + > +/** > + Minimum value for the 'length' field in subspaces of types 0, 1 and 2. > +*/ > +#define MIN_MEMORY_RANGE_LENGTH 8 > + > +/** > + Minimum value for the 'length' field in subspaces of types 3 and 4. > +*/ > +#define MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN 16 > + > +/** > + Maximum number of PCC subspaces. > +*/ > +#define MAX_PCC_SUBSPACES 256 > + > +/** > + Parser for the header of any type of PCC subspace. > +*/ > +#define PCC_SUBSPACE_HEADER() = \ > + {L"Type", 1, 0, L"0x%x", NULL, (VOID**)&PccSubspaceType, NULL, NULL}, = \ > + {L"Length", 1, 1, L"%u", NULL, (VOID**)&PccSubspaceLength, NULL, > +NULL} > + > +#endif // PCCT_PARSER_H_ > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLi > b.c > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLi > b.c > index > d2f26ff89f12e596702281c38ab0de3729aa68e4..feb80661cddc420670edb2d8c7a > 570b0a89272d8 100644 > --- > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLi > b.c > +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewComm > +++ andLib.c > @@ -1,7 +1,7 @@ > /** @file > Main file for 'acpiview' Shell command function. >=20 > - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
> + Copyright (c) 2016 - 2020, Arm Limited. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent **/ >=20 > @@ -57,6 +57,8 @@ ACPI_TABLE_PARSER ParserList[] =3D { > {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, > ParseAcpiMadt}, >=20 > {EFI_ACPI_6_2_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BA > SE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, > ParseAcpiMcfg}, > + > {EFI_ACPI_6_2_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE, > + ParseAcpiPcct}, >=20 > {EFI_ACPI_6_2_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGN > ATURE, > ParseAcpiPptt}, > {RSDP_TABLE_INFO, ParseAcpiRsdp}, > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLi > b.inf > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLi > b.inf > index > 91459f9ec632635ee453c5ef46f67445cd9eee0c..efa9c8784a6670e5a4f500e0ae5 > 59a4938852f95 100644 > --- > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLi > b.inf > +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewComm > +++ andLib.inf > @@ -1,7 +1,7 @@ > ## @file > # Provides Shell 'acpiview' command functions # -# Copyright (c) 2016 -= 2020, > ARM Limited. All rights reserved.
> +# Copyright (c) 2016 - 2020, Arm Limited. All rights reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -37,6 +37,8 @@ > [Sources.common] > Parsers/Madt/MadtParser.c > Parsers/Madt/MadtParser.h > Parsers/Mcfg/McfgParser.c > + Parsers/Pcct/PcctParser.c > + Parsers/Pcct/PcctParser.h > Parsers/Pptt/PpttParser.c > Parsers/Pptt/PpttParser.h > Parsers/Rsdp/RsdpParser.c > -- > 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'