From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.84]) by mx.groups.io with SMTP id smtpd.web10.242.1663879030404731482 for ; Thu, 22 Sep 2022 13:37:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nvidia.com header.s=selector2 header.b=n3IhKJbF; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.93.84, mailfrom: jbrasen@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y+zTcim09XsW2xuTXjT90h2zdQjY/1bbElp5lNWMZY6vqYrRBHddCmTMOvN27z9gT8EZlKSbTjXEKRR2BSBTIYPpZu3GXOyqnU9+ay8hBkaZB9dOVUzUICMJzC3IRYGiX6TbQnhdDFQ/7uR3FY2GrXvF9QvbHt6gnh/3mxQ0NxVO7QQHqbT3Ri7slqj44UA1IYGT/wT8jGxebfdLlO5Gyu8yeVfVkr+qHGV4gdlT3OVTK5VeJAC2ishLQnYBClYlJQsENe0rqCBCCNqHDLsOW3DzWYcpQ+I4MYDezVqGTr/v484polNPYJCGMyexXtaQ74sb9Grl83tX+f3e3fQT4w== 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=o29N+fsz4FJVamCJ5J0XJneZ5mWurTTSj6LNAFuc2AY=; b=H9o4jD2KUgRtgxUHnRblmZ6OcqxKBgTNYTWnVmSBTQ2LlfgliSxlzj9iTjEPcX4TaK0fSu6drT4RWAPTWAPddXecYgSSZt+K9G2kJBYL691PALC0IE3j1Ka2wgttFU/PZ+UQlenb1K+eDxL4+bbPcmeqG406PB1JGkvsVprsnld/ZmHyIQtaCxZMY3AuSl4GJt8VVIHRQEm+/8zdOYwXV8Uzb7f4UOYMDn6FhrYXyODhvKekrPdvIJHHlUX7Aqa3gfp/9/n6Tn4anTe5F2lWxMH4/2Y0nVp2152KV508HNjW6L0GBM2YOIdZy7DTv3CqXEl66/Hvyo3edMwKZuzE4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o29N+fsz4FJVamCJ5J0XJneZ5mWurTTSj6LNAFuc2AY=; b=n3IhKJbFq1M4pIfqSz5d/eSLeyRqQS5KMcqJQDxozPBTTGW2kUUCMcHo0XvQNhdeROIOHDS5taf8JvTQ8EhrzEYVD3kHnL5RK6Jv0BfyZgtFFwAmzSWpLasXcicUYkkigrDaJ3lDhZzIpQJwVHNmpJjQjZKgx8zZrWnZeIRqoo8tVrz0u0ZS5gxaY7OxgOzJ7USbETpBRCEiI0XvH1iMX8nuzQ7vjfPoDrm7BHM/NjjL4idtS5hcCyhchMfT770BQ3kWb7zDaj7BofLnGS3HwsV1Cm7gdDwHtj9zOdS7Lo+aSgjt8ffez0AIwH/eQSwgx9Ev2F+aN/Pk9fquujb9Vw== Received: from DM6PR06CA0026.namprd06.prod.outlook.com (2603:10b6:5:120::39) by DM4PR12MB5086.namprd12.prod.outlook.com (2603:10b6:5:389::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.18; Thu, 22 Sep 2022 20:37:08 +0000 Received: from DM6NAM11FT094.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::5b) by DM6PR06CA0026.outlook.office365.com (2603:10b6:5:120::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.18 via Frontend Transport; Thu, 22 Sep 2022 20:37:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT094.mail.protection.outlook.com (10.13.172.195) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14 via Frontend Transport; Thu, 22 Sep 2022 20:37:08 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Thu, 22 Sep 2022 13:36:55 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Thu, 22 Sep 2022 13:36:55 -0700 Received: from f153882e4be8.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 22 Sep 2022 13:36:54 -0700 From: "Jeff Brasen" To: CC: , , , , , Jeff Brasen Subject: [PATCH v5 3/3] DynamicTablesPkg: SSDT CPU _CPC generator Date: Thu, 22 Sep 2022 14:36:46 -0600 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-NVConfidentiality: public Return-Path: jbrasen@nvidia.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT094:EE_|DM4PR12MB5086:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a449508-59a5-4c26-43a6-08da9cda3840 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +thpZcmr/uc5/Vs1cKis4m4tbyGklmXQ3+mNucggROjms5HmSU9ALJNY2UUQgPp1KbWEGSBmkLIg9OWB199jKFvn5Rzb98QaYO/UEHisaplfvAA/Mez/Jmz4FQrMA3MIprxZix9wtPxsRIIkLAMRBzqMPkgD5MF1lLYj2vsWGPNE/2REHyw6xKR6qG1PSeNBNze0UDBnjUAgMvqeQzHtzXc4uM5uEx1ekb2o1oEtWPQs8ELo9SHGp2AlV2pTq/7b8acRI5c3HYT0YbB12ok4mRxB+wIYdDNU85k3HW5QVBEI9DI6e7+OapHAt4zTkhnv2cY9V1x/DVWDPWKE+jLSgk6s6f96HjhmY0SIhTrQV4bRRUvzV0WO8n3NaN4MMxUvWXJ8iQZ1/wYx59CNKhbDO9QCLC2XSbBo1NwbvZUzn2LNVz3xQ8vvHzwnTUuoHV0HMeNVbg2hLU0uBrA/uD5IrKE6uBCoDr1nNYSVMojPLtmRcSuB402bonVhglgpWkzMI6ZaJpLhGC/Xd8Ig5HiFY1p4MOOU/pZQ3PkiVZOJbvx0jsQ/qE2HT4cV/zaWEvB0tOu+kU6JToZjMB95kV1AFURJ833BbZGMiSqsEprT86uYLL6Ex/XjwTzmasOVnZtrT6E+TUMj/Io3Q054c1TAFQiGJ6SwEuVdNXDVYLdmvgpDHN2t27FqdexSFrItE3GXxFu+dWfHflsaF85aRR0BOiAy8N1lPZWpqwiwppNhdPSm6YM5IeVm8cHchjIKZGIsViuONYBdo3EsDVQbZPETkg== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(376002)(39860400002)(136003)(396003)(346002)(451199015)(40470700004)(46966006)(36840700001)(356005)(82310400005)(7636003)(54906003)(6916009)(82740400003)(316002)(70206006)(70586007)(4326008)(8676002)(2906002)(41300700001)(186003)(2616005)(107886003)(6666004)(47076005)(478600001)(36860700001)(8936002)(86362001)(5660300002)(26005)(426003)(336012)(83380400001)(36756003)(40480700001)(7696005)(40460700003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2022 20:37:08.5479 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a449508-59a5-4c26-43a6-08da9cda3840 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT094.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5086 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Add code to use a token attached to GICC to generate _CPC object on cpus.=0D =0D Signed-off-by: Jeff Brasen =0D ---=0D .../SsdtCpuTopologyGenerator.c | 133 +++++++++++++++++-=0D 1 file changed, 127 insertions(+), 6 deletions(-)=0D =0D diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/Ss= dtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTop= ologyLibArm/SsdtCpuTopologyGenerator.c=0D index 8561f48e1f..22422aef75 100644=0D --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c=0D +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c=0D @@ -76,6 +76,16 @@ GET_OBJECT_LIST (=0D CM_ARM_LPI_INFO=0D );=0D =0D +/**=0D + This macro expands to a function that retrieves the CPC=0D + information from the Configuration Manager.=0D +*/=0D +GET_OBJECT_LIST (=0D + EObjNameSpaceArm,=0D + EArmObjCpcInfo,=0D + CM_ARM_CPC_INFO=0D + );=0D +=0D /** Initialize the TokenTable.=0D =0D One entry should be allocated for each CM_ARM_PROC_HIERARCHY_INFO=0D @@ -229,6 +239,93 @@ WriteAslName (=0D return EFI_SUCCESS;=0D }=0D =0D +/** Create and add an _CPC Node to Cpu Node.=0D +=0D + For instance, transform an AML node from:=0D + Device (C002)=0D + {=0D + Name (_UID, 2)=0D + Name (_HID, "ACPI0007")=0D + }=0D +=0D + To:=0D + Device (C002)=0D + {=0D + Name (_UID, 2)=0D + Name (_HID, "ACPI0007")=0D + Name(_CPC, Package()=0D + {=0D + NumEntries, // Integer=0D + Revision, // Integer=0D + HighestPerformance, // Integer or Buffer (Res= ource Descriptor)=0D + NominalPerformance, // Integer or Buffer (Res= ource Descriptor)=0D + LowestNonlinearPerformance, // Integer or Buffer (Res= ource Descriptor)=0D + LowestPerformance, // Integer or Buffer (Res= ource Descriptor)=0D + GuaranteedPerformanceRegister, // Buffer (Resource Descr= iptor)=0D + DesiredPerformanceRegister , // Buffer (Resource Descr= iptor)=0D + MinimumPerformanceRegister , // Buffer (Resource Descr= iptor)=0D + MaximumPerformanceRegister , // Buffer (Resource Descr= iptor)=0D + PerformanceReductionToleranceRegister, // Buffer (Resource Descr= iptor)=0D + TimeWindowRegister, // Buffer (Resource Descr= iptor)=0D + CounterWraparoundTime, // Integer or Buffer (Res= ource Descriptor)=0D + ReferencePerformanceCounterRegister, // Buffer (Resource Descr= iptor)=0D + DeliveredPerformanceCounterRegister, // Buffer (Resource Descr= iptor)=0D + PerformanceLimitedRegister, // Buffer (Resource Descr= iptor)=0D + CPPCEnableRegister // Buffer (Resource Descr= iptor)=0D + AutonomousSelectionEnable, // Integer or Buffer (Res= ource Descriptor)=0D + AutonomousActivityWindowRegister, // Buffer (Resource Descr= iptor)=0D + EnergyPerformancePreferenceRegister, // Buffer (Resource Descr= iptor)=0D + ReferencePerformance // Integer or Buffer (Res= ource Descriptor)=0D + LowestFrequency, // Integer or Buffer (Res= ource Descriptor)=0D + NominalFrequency // Integer or Buffer (Res= ource Descriptor)=0D + })=0D + }=0D +=0D + @param [in] Generator The SSDT Cpu Topology generator.=0D + @param [in] CfgMgrProtocol Pointer to the Configuration Manager= =0D + Protocol Interface.=0D + @param [in] ProcHierarchyNodeInfo CM_ARM_PROC_HIERARCHY_INFO describin= g=0D + the Cpu.=0D + @param [in] Node CPU Node to which the _CPC node is=0D + attached.=0D +=0D + @retval EFI_SUCCESS The function completed successfully.=0D + @retval EFI_INVALID_PARAMETER Invalid parameter.=0D + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.=0D +**/=0D +STATIC=0D +EFI_STATUS=0D +EFIAPI=0D +CreateAmlCpcNode (=0D + IN ACPI_CPU_TOPOLOGY_GENERATOR *Generator,=0D + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,= =0D + IN CM_ARM_GICC_INFO *GicCInfo,=0D + IN AML_OBJECT_NODE_HANDLE *Node=0D + )=0D +{=0D + EFI_STATUS Status;=0D + CM_ARM_CPC_INFO *CpcInfo;=0D +=0D + Status =3D GetEArmObjCpcInfo (=0D + CfgMgrProtocol,=0D + GicCInfo->CpcToken,=0D + &CpcInfo,=0D + NULL=0D + );=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D + Status =3D AmlCreateCpcNode (=0D + CpcInfo,=0D + Node,=0D + NULL=0D + );=0D + ASSERT_EFI_ERROR (Status);=0D + return Status;=0D +}=0D +=0D /** Create and add an _LPI method to Cpu/Cluster Node.=0D =0D For instance, transform an AML node from:=0D @@ -581,7 +678,20 @@ CreateAmlCpuFromProcHierarchy (=0D // CM_ARM_PROC_HIERARCHY_INFO, create an _LPI method returning them.=0D if (ProcHierarchyNodeInfo->LpiToken !=3D CM_NULL_TOKEN) {=0D Status =3D CreateAmlLpiMethod (Generator, ProcHierarchyNodeInfo, CpuNo= de);=0D - ASSERT_EFI_ERROR (Status);=0D + if (EFI_ERROR (Status)) {=0D + ASSERT_EFI_ERROR (Status);=0D + return Status;=0D + }=0D + }=0D +=0D + // If a CPC info is associated with the=0D + // GicCinfo, create an _CPC method returning them.=0D + if (GicCInfo->CpcToken !=3D CM_NULL_TOKEN) {=0D + Status =3D CreateAmlCpcNode (Generator, CfgMgrProtocol, GicCInfo, CpuN= ode);=0D + if (EFI_ERROR (Status)) {=0D + ASSERT_EFI_ERROR (Status);=0D + return Status;=0D + }=0D }=0D =0D return Status;=0D @@ -934,10 +1044,11 @@ CreateTopologyFromGicC (=0D IN AML_OBJECT_NODE_HANDLE ScopeNode=0D )=0D {=0D - EFI_STATUS Status;=0D - CM_ARM_GICC_INFO *GicCInfo;=0D - UINT32 GicCInfoCount;=0D - UINT32 Index;=0D + EFI_STATUS Status;=0D + CM_ARM_GICC_INFO *GicCInfo;=0D + UINT32 GicCInfoCount;=0D + UINT32 Index;=0D + AML_OBJECT_NODE_HANDLE CpuNode;=0D =0D ASSERT (Generator !=3D NULL);=0D ASSERT (CfgMgrProtocol !=3D NULL);=0D @@ -961,12 +1072,22 @@ CreateTopologyFromGicC (=0D ScopeNode,=0D &GicCInfo[Index],=0D Index,=0D - NULL=0D + &CpuNode=0D );=0D if (EFI_ERROR (Status)) {=0D ASSERT (0);=0D break;=0D }=0D +=0D + // If a CPC info is associated with the=0D + // GicCinfo, create an _CPC method returning them.=0D + if (GicCInfo->CpcToken !=3D CM_NULL_TOKEN) {=0D + Status =3D CreateAmlCpcNode (Generator, CfgMgrProtocol, &GicCInfo[In= dex], CpuNode);=0D + if (EFI_ERROR (Status)) {=0D + ASSERT_EFI_ERROR (Status);=0D + break;=0D + }=0D + }=0D } // for=0D =0D return Status;=0D -- =0D 2.25.1=0D =0D