From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.75]) by mx.groups.io with SMTP id smtpd.web10.15191.1638979610073084453 for ; Wed, 08 Dec 2021 08:06:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=TTtdb/Rz; spf=pass (domain: arm.com, ip: 40.107.20.75, 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=jvd1WEP3K4G9ttsjDt2bJLCc0S1VbUOT8+oftiWFAz8=; b=TTtdb/RzwDAFjBTc6TILpuwSpiWDFwhSeCNM1snLaWmHTPg1+7IzleCd5LRJ2ZnLrQv3jdvNNOVHHnKhvD1HCcXLQsBm6J829wWHYNprKzzOvpvoDZfEAQORr/nmVREgFBggNkWIVHOht0zpdpdvwoQ8BdPFAs2/WG0gxMJjgfc= Received: from AM6P192CA0051.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:82::28) by DB9PR08MB6427.eurprd08.prod.outlook.com (2603:10a6:10:25a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.19; Wed, 8 Dec 2021 16:06:47 +0000 Received: from AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:82:cafe::ec) by AM6P192CA0051.outlook.office365.com (2603:10a6:209:82::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Wed, 8 Dec 2021 16:06:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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 AM5EUR03FT019.mail.protection.outlook.com (10.152.16.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:47 +0000 Received: ("Tessian outbound c61f076cbd30:v110"); Wed, 08 Dec 2021 16:06:47 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a68815b48a507215 X-CR-MTA-TID: 64aa7808 Received: from f524d828564f.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F13A6DD5-15DD-45EC-AE82-079D58F6E3B5.1; Wed, 08 Dec 2021 16:06:40 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id f524d828564f.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=boCUR3erojB4SbuduWpTUD0lVCIP1AS1L6tMF1XHtKR8xR+CBlPv7S6VJVeDUpYEhqZOffukBRDDUBiDT49DURpRfQ/szxjsqvyymugOrGLS2dg2mpa5Krqrmc36KYfCVHh8AWeW0Hj58M/XbH3mTTscf2RxOH0TlOwl2ECNrUea9pMRi5KVXcpxK2rAh7tXmLqs/exPjxhpBdIh35kl1HfzCDSaNCb3SsYF1s6oJ8tp2wK/EvPGKRdHBjfbzR/QRW/O9qt0Cb3+dzvjv8eha7e5YIB1dNcuElDmArkM7bUlbeBhZLFQ8VdbGmuq4TcKHnmL0+lUPX8iAU8HqIwX3Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jvd1WEP3K4G9ttsjDt2bJLCc0S1VbUOT8+oftiWFAz8=; b=XmCHCP3OHa2X9GiOcbn9tdtCzyJFJPjaPVBU57alAyKb4CTIBy998yxsC2jb4tU8Xb75KZLWxwrVHkzeAE16Y1Hw7+nfIlJwkOSDQPNqp4fU+NJw2EVSok+1EA+z/N+YbS1l9vC7qIIqeZvS3qiJk8HBUxJdwXnB3MDnEJ6wBxeI0Xp1cX7htzrddWOYnZhgHXkNtLW4cWq5kOEWXyq1bmhEnr1oLaeW18FKcyl1eXxgkvSW+Tt3XwBjWDFv+zLMZ3hwpQ0f+fGuRsOSDUvJMhmUic/ShTqQpY5+whKUXlhk899pROl7SuWxzx8Gt3nTogmJsrNF5XJ+y+cixVfk+g== 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=jvd1WEP3K4G9ttsjDt2bJLCc0S1VbUOT8+oftiWFAz8=; b=TTtdb/RzwDAFjBTc6TILpuwSpiWDFwhSeCNM1snLaWmHTPg1+7IzleCd5LRJ2ZnLrQv3jdvNNOVHHnKhvD1HCcXLQsBm6J829wWHYNprKzzOvpvoDZfEAQORr/nmVREgFBggNkWIVHOht0zpdpdvwoQ8BdPFAs2/WG0gxMJjgfc= Received: from AM7PR02CA0004.eurprd02.prod.outlook.com (2603:10a6:20b:100::14) by DBBPR08MB4282.eurprd08.prod.outlook.com (2603:10a6:10:ce::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Wed, 8 Dec 2021 16:06:38 +0000 Received: from AM5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::84) by AM7PR02CA0004.outlook.office365.com (2603:10a6:20b:100::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.19 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;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 AM5EUR03FT003.mail.protection.outlook.com (10.152.16.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +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.20; Wed, 8 Dec 2021 16:06:36 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) 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.20; Wed, 8 Dec 2021 16:06:35 +0000 Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:35 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH v3 4/7] ShellPkg: Add Cache ID to PPTT parser Date: Wed, 8 Dec 2021 16:06:27 +0000 Message-ID: <20211208160630.10923-5-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 5c942629-d368-48ef-e384-08d9ba64bca3 X-MS-TrafficTypeDiagnostic: DBBPR08MB4282:EE_|AM5EUR03FT019:EE_|DB9PR08MB6427:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: gRXzHBCRrt0yq73qpqbTw8EYa9hRBNR4RgQWG5IA4uigHYeUzAxR2YhvazlA79P10PSk+Yrof5upxCmbKdqXDPmoLnFPYNDyOzXWYICREc6SI06dZF64ATYVWZ4CDIU49LyvU4/GQCWwWKIxdzW1Ty/KyboQfIdcGfzFd1c9OitSFfNPmBuE2ii2uAQDDB0DkMphT1YzrFOBAYlAQCTI7tV5Rc63M3tivRqTFCv92AkW9P2tpNv0xEJ5gep8aGE820G0I1550kJnJUllH4vWCYGRuh6YLu4rMRDdC08iTTcglxs6MstqhDt/NDdyrBLMW6ZHHbqaaMwWIlYKaQBcpUpQL7XmoL6JOKt5pCSc5C4RWxt4nSj3NT1PnLFBQOtUNlJVNI72Hy/7pW5Az2h05YGrRXw8L3ZPjevTrL4YsF2QqMRuZ607eJnpQmqntUhDkfUoDAcnqjCB1iWl3FA/jjve1+0+gmsy0+AbQz95Jp+1cqJamLBtfnRggFLEhuC/1D7YRrBn2G3SztfKJEIrww35PdGTpY9cKMPz8PFqaV3DihxkPEb5CLIxm40qvyfY0cIgH9J1RedtXzXh1U7+J/nkMqSGCufE71fUxPE3Fw6mTrO+kiWhpB9Vc4pF/1carQBSoSu2WDXnmdPFebus8SEF+CRQFMsXJHXVQsqktfe3bhSUlZoVHWPmlpgrh75jxEB7n7Lsqg+YY70Rlic/zc1MPdmaTHTd98x4GmLURTVYaMFkR3ytAAlHmByccIcQmA9gmnaJpU2VzkmsoRWaGDHuFHyS1g7jgf+rNCsjypb3gmt5rGKg072BZc99Ijz5t4WoUAwKmhrKIWoAFaAA/a00jBMFZ4vzcqkREQlveg7hW27H21VHO1cxUc5vmw2Y 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)(46966006)(36840700001)(40470700001)(83380400001)(40460700001)(6666004)(54906003)(82310400004)(2616005)(7696005)(2906002)(426003)(1076003)(4326008)(70206006)(356005)(36756003)(47076005)(336012)(8676002)(6916009)(81166007)(5660300002)(508600001)(316002)(26005)(186003)(70586007)(86362001)(36860700001)(8936002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4282 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 4c06f705-258c-4f37-fd9d-08d9ba64b701 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hsMdTN8TvI+2/hZCYB9xC/MFw4og9V23iAwuxzzQJKq3E/SIK+6ZVINsKnyP6G7J3IH8blilWNQteKi/XiVe2gkp6KizcUuXBoD1IIz32ShrtHYfTHdgwM5TpZzlpl7bcHVUW8AaQZFKFNa9kUtamJfFDr8Ca6MM+Uy4A3sRMLojFQgLd5AP10LSKQyI8kpGhbnLp+op0UuvJOKp3/nGRPIAoKPPiHFyb5FoRiTMstZRmNu8GeHgENAQ12IUNvNG7gOUhWY173XnVlM5RyPZTRowDNvuf1vlhCBfO6RZ0bTHBnXq0pY+C+K0qSlCuuvzHYNPvzTUaw02lxfDlz1gGGL56jMZKtbHOMNC9PyjLX5SUZOUIrcOZkgT92VXsrPOkxHnJDJPcdy5fGCnhfopx6Uz5hhMd9csueTkwrSMgwOq7wo/1xNGGs2FeDqAf4wO0kiLr1ynL1T8MAw7ZS3ObKJjdAeA7/GcjvuxSgBRlvzXs65VxfhhA/twCnvc8bEfj6rqYbDy+lliSFaOdeFUnpA2MoH9sK7JickADCjfpLLWNUVzhVHKwtBfrK5JgC9gauQS0DjC0drhSFkzc8RTdV4xTQX3WbtZXTwyHvoJ6NVgTYaWcFCA8gfvnpk4TDBsbUbHbfqmagoDHF6k3Q5g4DuwsdmsPm7SdfeMOMEOUBkDyLZkedH8QitQlt8Ai3HG8oeCirgHfqjoWpdIq/Dk3tX7udHwfpbB3tCpAqWudwQlgBSHG7o3/eGpAW9MPGAOU72k0vSIJ50j9gIZ/z6RfvmTqRDnyyCH+8UcWH+K5T9u6lm2ogm/xLQCa/m7xLFnIr029Egfb608wGa6KUpAxTL4T4mgdjPvIXaLlazuyGc= 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)(36840700001)(46966006)(40470700001)(40460700001)(186003)(70586007)(82310400004)(36860700001)(2616005)(508600001)(426003)(26005)(70206006)(81166007)(336012)(86362001)(2906002)(83380400001)(6666004)(54906003)(1076003)(47076005)(5660300002)(4326008)(8676002)(8936002)(316002)(36756003)(6916009)(7696005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:47.3207 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c942629-d368-48ef-e384-08d9ba64bca3 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: AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6427 Content-Type: text/plain Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3697) Update the Acpiview PPTT parser with the Cache ID field and relevant validations as defined in tables 5.140 and 5.141 of the ACPI 6.4 specification. Signed-off-by: Chris Jones Reviewed-by: Zhichao Gao --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c | 153 ++++++++++++++++++-- 1 file changed, 139 insertions(+), 14 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c index 7be249819e70dee9547c3fecc0763f473aa9ce92..8b12809f8a155b0ee0a4ad5c63d620b48d97f4b0 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -17,10 +17,94 @@ #include "PpttParser.h" // Local variables -STATIC CONST UINT8 *ProcessorTopologyStructureType; -STATIC CONST UINT8 *ProcessorTopologyStructureLength; -STATIC CONST UINT32 *NumberOfPrivateResources; -STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; +STATIC CONST UINT8 *ProcessorTopologyStructureType; +STATIC CONST UINT8 *ProcessorTopologyStructureLength; +STATIC CONST UINT32 *NumberOfPrivateResources; +STATIC CONST EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS *CacheFlags; +STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; + +/** + Increment the error count and print an error that a required flag is missing. + + @param [in] FlagName Name of the missing flag. +**/ +STATIC +VOID +EFIAPI +LogCacheFlagError ( + IN CONST CHAR16 *FlagName + ) +{ + IncrementErrorCount (); + Print ( + L"\nERROR: On Arm based systems, all cache properties must be" + L"provided in the cache type structure." + L"Missing '%s' flag.", + *FlagName + ); +} + +/** + This function validates the Cache Type Structure (Type 1) Cache Flags field. + + @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 +ValidateCacheFlags ( + IN UINT8 *Ptr, + IN VOID *Context + ) +{ + #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64) + CacheFlags = (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS *)Ptr; + + if (CacheFlags == NULL) { + IncrementErrorCount (); + Print (L"\nERROR: Cache Structure Flags were not successfully read."); + return; + } + + if (CacheFlags->SizePropertyValid == EFI_ACPI_6_4_PPTT_CACHE_SIZE_INVALID) { + LogCacheFlagError (L"Size Property Valid"); + } + + if (CacheFlags->NumberOfSetsValid == EFI_ACPI_6_4_PPTT_NUMBER_OF_SETS_INVALID) { + LogCacheFlagError (L"Number Of Sets Valid"); + } + + if (CacheFlags->AssociativityValid == EFI_ACPI_6_4_PPTT_ASSOCIATIVITY_INVALID) { + LogCacheFlagError (L"Associativity Valid"); + } + + if (CacheFlags->AllocationTypeValid == EFI_ACPI_6_4_PPTT_ALLOCATION_TYPE_INVALID) { + LogCacheFlagError (L"Allocation Type Valid"); + } + + if (CacheFlags->CacheTypeValid == EFI_ACPI_6_4_PPTT_CACHE_TYPE_INVALID) { + LogCacheFlagError (L"Cache Type Valid"); + } + + if (CacheFlags->WritePolicyValid == EFI_ACPI_6_4_PPTT_WRITE_POLICY_INVALID) { + LogCacheFlagError (L"Write Policy Valid"); + } + + if (CacheFlags->LineSizeValid == EFI_ACPI_6_4_PPTT_LINE_SIZE_INVALID) { + LogCacheFlagError (L"Line Size Valid"); + } + + // Cache ID was only introduced in revision 3 + if (*(AcpiHdrInfo.Revision) >= 3) { + if (CacheFlags->CacheIdValid == EFI_ACPI_6_4_PPTT_CACHE_ID_INVALID) { + LogCacheFlagError (L"Cache Id Valid"); + } + } + + #endif +} /** This function validates the Cache Type Structure (Type 1) 'Number of sets' @@ -145,6 +229,45 @@ ValidateCacheLineSize ( #endif } +/** + This function validates the Cache Type Structure (Type 1) Cache ID field. + + @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 +ValidateCacheId ( + IN UINT8 *Ptr, + IN VOID *Context + ) +{ + UINT32 CacheId; + + CacheId = *(UINT32 *)Ptr; + + // Cache ID was only introduced in revision 3 + if (*(AcpiHdrInfo.Revision) < 3) { + return; + } + + if (CacheFlags == NULL) { + IncrementErrorCount (); + Print (L"\nERROR: Cache Structure Flags were not successfully read."); + return; + } + + if (CacheFlags->CacheIdValid == EFI_ACPI_6_4_PPTT_CACHE_ID_VALID) { + if (CacheId == 0) { + IncrementErrorCount (); + Print (L"\nERROR: 0 is not a valid Cache ID."); + return; + } + } +} + /** This function validates the Cache Type Structure (Type 1) Attributes field. @@ -214,17 +337,19 @@ STATIC CONST ACPI_PARSER ProcessorHierarchyNodeStructureParser[] = { An ACPI_PARSER array describing the Cache Type Structure - Type 1. **/ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = { - { L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL }, - { L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL }, - { L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL }, + { L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL }, + { L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL }, + { L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL }, - { L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL }, - { L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL }, - { L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL }, - { L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets, NULL }, - { L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity, NULL }, - { L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NULL }, - { L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL } + { L"Flags", 4, 4, L"0x%x", NULL, (VOID **)&CacheFlags, ValidateCacheFlags, + NULL }, + { L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL }, + { L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL }, + { L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets, NULL }, + { L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity, NULL }, + { L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NULL }, + { L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL }, + { L"Cache ID", 4, 24, L"%d", NULL, NULL, ValidateCacheId, NULL } }; /** -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")