From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id C090FD801B2 for ; Thu, 21 Mar 2024 17:18:49 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=174RyJMdgobvj6IwFa5vGxTjpvPY8NRm84BMyT32WNE=; 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:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1711041528; v=1; b=dBZuKheTNYYkyxSEhYQQgpP7eKaTFkb1hmZ7DZJNWJQGs+/+WGeRuMzCFJ3/EeXEWeFnI9/a 6ppT891ysRS3N7FLaZnSBQvWCahKZzhfE9QMg0PdxjWFGhfO4/QJVpW1QapLazCJp9vcODmhQKb 21oGmg+qhIgvZTrjOwEe6GHw2QLo/XJKteUxJWlQm27fxTB7Z3hEhTYM8fwvMTwEc1A1SkGHcuY SnJi9jsF8dq10YYVvp+RKvpzKT2ON0cKTItfxYyTylhvBIWOKg2bJifcFaXGko63y3K/OfFGXNH DFgtF8Dtb1/KwY+dKRpSdBznsG3PBhnjqrU/ubdYTU+gw== X-Received: by 127.0.0.2 with SMTP id YuYDYY7687511xzUTlO6WUZG; Thu, 21 Mar 2024 10:18:48 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.2736.1711041527786327725 for ; Thu, 21 Mar 2024 10:18:47 -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 B40C21063; Thu, 21 Mar 2024 10:19:21 -0700 (PDT) X-Received: from e126645.nice.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C6F433F67D; Thu, 21 Mar 2024 10:18:44 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , Sami Mujawar , Pierre Gondois , Yeo Reum Yun , Sunil V L , AbdulLateef Attar , Jeshua Smith , Jeff Brasen , Girish Mahadevan , Leif Lindholm , Meenakshi Aggarwal Subject: [edk2-devel] [PATCH 06/14] Platform/ARM: FVP,Juno: Move Pci Config Space info to Arch Common Date: Thu, 21 Mar 2024 18:18:07 +0100 Message-Id: <20240321171815.781762-7-pierre.gondois@arm.com> In-Reply-To: <20240321171815.781762-1-pierre.gondois@arm.com> References: <20240321171815.781762-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: Thu, 21 Mar 2024 10:18:47 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Kq5UI0z1yWMMEn4SSarjK9g0x7686176AA= 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=dBZuKheT; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none) 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: - Juno - FVP for the following Arch Common object Id: - EArchCommonObjPciConfigSpaceInfo Cc: Sami Mujawar Cc: Pierre Gondois Cc: Yeo Reum Yun Cc: AbdulLateef Attar Cc: Jeshua Smith Cc: Jeff Brasen Cc: Girish Mahadevan Cc: Leif Lindholm Cc: Meenakshi Aggarwal Signed-off-by: Pierre Gondois --- .../ConfigurationManager.c | 30 +++++++++--------- .../ConfigurationManager.h | 2 +- .../ConfigurationManager.c | 31 +++++++++++-------- .../ConfigurationManager.h | 2 +- 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.c index 65506f0514a8..e33aa6578fd1 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c @@ -1688,6 +1688,21 @@ GetArchCommonNameSpaceObject ( );=0D break;=0D =0D + case EArchCommonObjPciConfigSpaceInfo:=0D + if (PlatformRepo->JunoRevision !=3D JUNO_REVISION_R0) {=0D + Status =3D HandleCmObject (=0D + CmObjectId,=0D + &PlatformRepo->PciConfigInfo,=0D + sizeof (PlatformRepo->PciConfigInfo),=0D + 1,=0D + CmObject=0D + );=0D + } else {=0D + // No PCIe on Juno R0.=0D + Status =3D EFI_NOT_FOUND;=0D + }=0D + break;=0D +=0D default: {=0D Status =3D EFI_NOT_FOUND;=0D DEBUG ((=0D @@ -1856,21 +1871,6 @@ GetArmNameSpaceObject ( );=0D break;=0D =0D - case EArmObjPciConfigSpaceInfo:=0D - if (PlatformRepo->JunoRevision !=3D JUNO_REVISION_R0) {=0D - Status =3D HandleCmObject (=0D - CmObjectId,=0D - &PlatformRepo->PciConfigInfo,=0D - sizeof (PlatformRepo->PciConfigInfo),=0D - 1,=0D - CmObject=0D - );=0D - } else {=0D - // No PCIe on Juno R0.=0D - Status =3D EFI_NOT_FOUND;=0D - }=0D - break;=0D -=0D case EArmObjLpiInfo:=0D Status =3D HandleCmObjectRefByToken (=0D This,=0D diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.h index e3a50edcc0b3..8bd79ca387d4 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h @@ -256,7 +256,7 @@ typedef struct PlatformRepositoryInfo { CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort;=0D =0D /// PCI configuration space information=0D - CM_ARM_PCI_CONFIG_SPACE_INFO PciConfigInfo;=0D + CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO PciConfigInfo;=0D =0D // PCI address-range mapping references=0D CM_ARCH_COMMON_OBJ_REF PciAddressMapRef[PCI_ADDRESS_MAP_C= OUNT];=0D diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.c index 0fb3e99d2ab1..fed1fdbd5a52 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c @@ -754,6 +754,7 @@ GetArchCommonNameSpaceObject ( {=0D EFI_STATUS Status;=0D EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo;=0D + UINTN PciConfigSpaceCount;=0D =0D if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) {=0D ASSERT (This !=3D NULL);=0D @@ -764,6 +765,13 @@ GetArchCommonNameSpaceObject ( Status =3D EFI_NOT_FOUND;=0D PlatformRepo =3D This->PlatRepoInfo;=0D =0D + if ((PlatformRepo->SysId & ARM_FVP_SYS_ID_REV_MASK) =3D=3D=0D + ARM_FVP_BASE_REVC_REV) {=0D + PciConfigSpaceCount =3D 1;=0D + } else {=0D + PciConfigSpaceCount =3D 0;=0D + }=0D +=0D switch (GET_CM_OBJECT_ID (CmObjectId)) {=0D case EArchCommonObjPowerManagementProfileInfo:=0D Status =3D HandleCmObject (=0D @@ -807,6 +815,16 @@ GetArchCommonNameSpaceObject ( break;=0D #endif=0D =0D + case EArchCommonObjPciConfigSpaceInfo:=0D + Status =3D HandleCmObject (=0D + CmObjectId,=0D + &PlatformRepo->PciConfigInfo,=0D + sizeof (PlatformRepo->PciConfigInfo),=0D + PciConfigSpaceCount,=0D + CmObject=0D + );=0D + break;=0D +=0D default: {=0D Status =3D EFI_NOT_FOUND;=0D DEBUG ((=0D @@ -851,7 +869,6 @@ GetArmNameSpaceObject ( UINTN ItsIdentifierArrayCount;=0D UINTN RootComplexCount;=0D UINTN DeviceIdMappingArrayCount;=0D - UINTN PciConfigSpaceCount;=0D =0D if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) {=0D ASSERT (This !=3D NULL);=0D @@ -869,14 +886,12 @@ GetArmNameSpaceObject ( ItsIdentifierArrayCount =3D ARRAY_SIZE (PlatformRepo->ItsIdentifierArr= ay);=0D RootComplexCount =3D 1;=0D DeviceIdMappingArrayCount =3D ARRAY_SIZE (PlatformRepo->DeviceIdMappin= g);=0D - PciConfigSpaceCount =3D 1;=0D } else {=0D Smmuv3Count =3D 0;=0D ItsGroupCount =3D 0;=0D ItsIdentifierArrayCount =3D 0;=0D RootComplexCount =3D 0;=0D DeviceIdMappingArrayCount =3D 0;=0D - PciConfigSpaceCount =3D 0;=0D }=0D =0D switch (GET_CM_OBJECT_ID (CmObjectId)) {=0D @@ -1029,16 +1044,6 @@ GetArmNameSpaceObject ( );=0D break;=0D =0D - case EArmObjPciConfigSpaceInfo:=0D - Status =3D HandleCmObject (=0D - CmObjectId,=0D - &PlatformRepo->PciConfigInfo,=0D - sizeof (PlatformRepo->PciConfigInfo),=0D - PciConfigSpaceCount,=0D - CmObject=0D - );=0D - break;=0D -=0D case EArmObjEtInfo:=0D if (Token =3D=3D (CM_OBJECT_TOKEN)&PlatformRepo->EtInfo) {=0D Status =3D HandleCmObject (=0D diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.h index ad71e8ef5376..e251eed16425 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h @@ -169,7 +169,7 @@ typedef struct PlatformRepositoryInfo { CM_ARM_ID_MAPPING DeviceIdMapping[2];=0D =0D /// PCI configuration space information=0D - CM_ARM_PCI_CONFIG_SPACE_INFO PciConfigInfo;=0D + CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO PciConfigInfo;=0D =0D CM_ARM_ET_INFO EtInfo;=0D =0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117007): https://edk2.groups.io/g/devel/message/117007 Mute This Topic: https://groups.io/mt/105069941/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-