From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id B4DE0941568 for ; Mon, 10 Jun 2024 09:34:48 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=n+1F6SPnoe1dgWk4Nycqx6P9AJeE3Wl++oOFWUJ8lDQ=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1718012088; v=1; b=E7GboLI9HEmBvTYl664LnvlWeJ5/bBFKOvVTO8GUNpz+OU8BWa9HruWKnu75EkY4odeH2DY0 QiXQBzOxZSFPPIF1K1nl1NK8o1fT77DhQDt2nQSCjAL3mjMRPqUDG+9iHzEo+ljPCFXMM0rcR7a vLOpkyt7eIe7zxg9uTLqGwer/D8w1Q8gn4iOnJfQg6aDj64LLn6BrrY06z+xAYh1qrKG52Yk/lr m+koU6yFIrJUDfPPLTXOY+IuaVmsibgmV1TiYC09dOB1VBqXnRAFJqGqJtwXLOV32GLg/5lgzIs feYoeQcHzBDCejepVPZdQ+flBJ6V3PtQHZy5JKTHC0jAg== X-Received: by 127.0.0.2 with SMTP id hWllYY7687511xAvoGUuLZtw; Mon, 10 Jun 2024 02:34:47 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.15505.1718012084448733429 for ; Mon, 10 Jun 2024 02:34:44 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A0E4312FC; Mon, 10 Jun 2024 02:35:08 -0700 (PDT) X-Received: from e126645.arm.com (unknown [10.57.69.240]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id F3E403F73B; Mon, 10 Jun 2024 02:34:42 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , Pierre Gondois Subject: [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 08/14] Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy info to Arch Common Date: Mon, 10 Jun 2024 11:33:59 +0200 Message-Id: <20240610093405.1980592-9-Pierre.Gondois@arm.com> In-Reply-To: <20240610093405.1980592-1-Pierre.Gondois@arm.com> References: <20240610093405.1980592-1-Pierre.Gondois@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Mon, 10 Jun 2024 02:34:44 -0700 Resent-From: pierre.gondois@arm.com Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: qL970TDUxcMeq9Hezb1vmNK4x7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=E7GboLI9; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: Pierre Gondois Some DynamicTables objects have been moved from the Arm namespace to a new Arch Common namespace. Reflect this change by renaming/moving the relevant object. This patch modifies the ConfigurationManager of the following platforms: - Morello - N1Sdp for the following Arch Common object Id: - EArchCommonObjProcHierarchyInfo Signed-off-by: Pierre Gondois --- .../ConfigurationManager.c | 20 +++++++------- .../ConfigurationManager.h | 2 +- .../ConfigurationManager.c | 26 +++++++++---------- .../ConfigurationManager.h | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManag= erDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/= ConfigurationManagerDxe/ConfigurationManager.c index 640fdde96e2a..21e5a742345a 100644 --- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/C= onfigurationManager.c +++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/C= onfigurationManager.c @@ -853,6 +853,16 @@ GetArchCommonNameSpaceObject ( ); break; =20 + case EArchCommonObjProcHierarchyInfo: + Status =3D HandleCmObject ( + CmObjectId, + CommonPlatRepo->ProcHierarchyInfo, + sizeof (CommonPlatRepo->ProcHierarchyInfo), + PLAT_PROC_HIERARCHY_NODE_COUNT, + CmObject + ); + break; + default: { Status =3D EFI_NOT_FOUND; DEBUG (( @@ -992,16 +1002,6 @@ GetArmNameSpaceObject ( ); break; =20 - case EArmObjProcHierarchyInfo: - Status =3D HandleCmObject ( - CmObjectId, - CommonPlatRepo->ProcHierarchyInfo, - sizeof (CommonPlatRepo->ProcHierarchyInfo), - PLAT_PROC_HIERARCHY_NODE_COUNT, - CmObject - ); - break; - case EArmObjCacheInfo: Status =3D HandleCmObject ( CmObjectId, diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManag= erDxe/ConfigurationManager.h b/Platform/ARM/Morello/ConfigurationManager/= ConfigurationManagerDxe/ConfigurationManager.h index 96767e3fe888..df50b860c9a2 100644 --- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/C= onfigurationManager.h +++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/C= onfigurationManager.h @@ -261,7 +261,7 @@ typedef struct CommonPlatformRepositoryInfo { CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort; =20 // Processor topology information - CM_ARM_PROC_HIERARCHY_INFO ProcHierarchyInfo[PLAT_PROC_HIER= ARCHY_NODE_COUNT]; + CM_ARCH_COMMON_PROC_HIERARCHY_INFO ProcHierarchyInfo[PLAT_PROC_HIER= ARCHY_NODE_COUNT]; =20 // Cache information CM_ARM_CACHE_INFO CacheInfo[PLAT_CACHE_COUNT]; diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.c index c23fa78038fa..5c7a65afb43c 100644 --- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c +++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c @@ -1703,6 +1703,7 @@ GetArchCommonNameSpaceObject ( EFI_STATUS Status; EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo; UINT32 PciConfigInfoCount; + UINT32 ProcHierarchyInfoCount; =20 if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { ASSERT (This !=3D NULL); @@ -1715,8 +1716,10 @@ GetArchCommonNameSpaceObject ( =20 if (PlatformRepo->PlatInfo->MultichipMode =3D=3D 1) { PciConfigInfoCount =3D Root_pcie_max; + ProcHierarchyInfoCount =3D PLAT_PROC_HIERARCHY_NODE_COUNT * 2; } else { PciConfigInfoCount =3D Root_pcie_master_chip_max; + ProcHierarchyInfoCount =3D PLAT_PROC_HIERARCHY_NODE_COUNT; } =20 switch (GET_CM_OBJECT_ID (CmObjectId)) { @@ -1780,6 +1783,16 @@ GetArchCommonNameSpaceObject ( ); break; =20 + case EArchCommonObjProcHierarchyInfo: + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->ProcHierarchyInfo, + sizeof (PlatformRepo->ProcHierarchyInfo), + ProcHierarchyInfoCount, + CmObject + ); + break; + default: { Status =3D EFI_NOT_FOUND; DEBUG (( @@ -1821,7 +1834,6 @@ GetArmNameSpaceObject ( EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo; UINT32 GicRedistCount; UINT32 GicCpuCount; - UINT32 ProcHierarchyInfoCount; UINT32 GicItsInfoCount; UINT32 ItsGroupInfoCount; UINT32 ItsIdentifierArrayCount; @@ -1842,7 +1854,6 @@ GetArmNameSpaceObject ( if (PlatformRepo->PlatInfo->MultichipMode =3D=3D 1) { GicRedistCount =3D 2; GicCpuCount =3D PLAT_CPU_COUNT * 2; - ProcHierarchyInfoCount =3D PLAT_PROC_HIERARCHY_NODE_COUNT * 2; GicItsInfoCount =3D Its_max; ItsGroupInfoCount =3D Its_max; ItsIdentifierArrayCount =3D Its_max; @@ -1852,7 +1863,6 @@ GetArmNameSpaceObject ( } else { GicRedistCount =3D 1; GicCpuCount =3D PLAT_CPU_COUNT; - ProcHierarchyInfoCount =3D PLAT_PROC_HIERARCHY_NODE_COUNT; GicItsInfoCount =3D Its_master_chip_max; ItsGroupInfoCount =3D Its_master_chip_max; ItsIdentifierArrayCount =3D Its_master_chip_max; @@ -2017,16 +2027,6 @@ GetArmNameSpaceObject ( ); break; =20 - case EArmObjProcHierarchyInfo: - Status =3D HandleCmObject ( - CmObjectId, - PlatformRepo->ProcHierarchyInfo, - sizeof (PlatformRepo->ProcHierarchyInfo), - ProcHierarchyInfoCount, - CmObject - ); - break; - case EArmObjCacheInfo: Status =3D HandleCmObject ( CmObjectId, diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.h index 93ec3c42565b..54b0483d43ec 100644 --- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h +++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h @@ -267,7 +267,7 @@ typedef struct PlatformRepositoryInfo { CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort; =20 // Processor topology information - CM_ARM_PROC_HIERARCHY_INFO ProcHierarchyInfo[PLAT_PROC_HIER= ARCHY_NODE_COUNT * 2]; + CM_ARCH_COMMON_PROC_HIERARCHY_INFO ProcHierarchyInfo[PLAT_PROC_HIER= ARCHY_NODE_COUNT * 2]; =20 // Cache information CM_ARM_CACHE_INFO CacheInfo[PLAT_CACHE_COUNT]; --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119528): https://edk2.groups.io/g/devel/message/119528 Mute This Topic: https://groups.io/mt/106589346/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-