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 76FB6AC0FC3 for ; Thu, 21 Mar 2024 17:18:40 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=YIFUrcKl2yXtnoO10ybNTV+lQtvikYeIIwARKqSRjZQ=; 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=1711041519; v=1; b=LmelMFtcVVyXFh1nYCdfyoyBw/eSrgws7vZor8/ScQL2PizPCrP6OJ1a43QrqXaGNMauhZgm xU7SsAFOZ75jPdSbeN3sxo5qZ5Pys54nEb3AoO6N0hHpOqZrF/q0ntuIAb4ZDdvmVQSV73el6zS 9dRZEXMoM5p7hi2CPONFJaml6jBC1abAm/w7SE8knst9pOEtmiYsrulkWdwukmzVM6ycy6vINGy l/4IlzjR6nad+ifemYlulayyK5Y1kNl2swn07Ke+mwXnpc/TJZLkbZ0ryUfbBywMTJjAbDSp+60 /TlytsG/cX/jOdt0UkZhmnMCAG7jmdRDKl2dm8mlopPyg== X-Received: by 127.0.0.2 with SMTP id 5HccYY7687511xrZUtCJwmVa; Thu, 21 Mar 2024 10:18:39 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.2931.1711041518476074447 for ; Thu, 21 Mar 2024 10:18:38 -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 6649F1063; Thu, 21 Mar 2024 10:19:12 -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 479EA3F67D; Thu, 21 Mar 2024 10:18:35 -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 03/14] Platform/ARM: FVP,Juno:: Move Serial Port info to Arch Common Date: Thu, 21 Mar 2024 18:18:04 +0100 Message-Id: <20240321171815.781762-4-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:38 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: fnVyCnFgA780sOQhcGfQEsY2x7686176AA= 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=LmelMFtc; 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 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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: - EArchCommonObjConsolePortInfo - EArchCommonObjSerialDebugPortInfo 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 | 38 +++++++++--------- .../ConfigurationManager.h | 4 +- .../ConfigurationManager.c | 40 +++++++++---------- .../ConfigurationManager.h | 4 +- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.c index c1af3bac2458..813e420a4740 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c @@ -1658,6 +1658,26 @@ GetArchCommonNameSpaceObject ( );=0D break;=0D =0D + case EArchCommonObjConsolePortInfo:=0D + Status =3D HandleCmObject (=0D + CmObjectId,=0D + &PlatformRepo->SpcrSerialPort,=0D + sizeof (PlatformRepo->SpcrSerialPort),=0D + 1,=0D + CmObject=0D + );=0D + break;=0D +=0D + case EArchCommonObjSerialDebugPortInfo:=0D + Status =3D HandleCmObject (=0D + CmObjectId,=0D + &PlatformRepo->DbgSerialPort,=0D + sizeof (PlatformRepo->DbgSerialPort),=0D + 1,=0D + CmObject=0D + );=0D + break;=0D +=0D default: {=0D Status =3D EFI_NOT_FOUND;=0D DEBUG ((=0D @@ -1795,25 +1815,7 @@ GetArmNameSpaceObject ( CmObject=0D );=0D break;=0D - case EArmObjSerialConsolePortInfo:=0D - Status =3D HandleCmObject (=0D - CmObjectId,=0D - &PlatformRepo->SpcrSerialPort,=0D - sizeof (PlatformRepo->SpcrSerialPort),=0D - 1,=0D - CmObject=0D - );=0D - break;=0D =0D - case EArmObjSerialDebugPortInfo:=0D - Status =3D HandleCmObject (=0D - CmObjectId,=0D - &PlatformRepo->DbgSerialPort,=0D - sizeof (PlatformRepo->DbgSerialPort),=0D - 1,=0D - CmObject=0D - );=0D - break;=0D case EArmObjGicMsiFrameInfo:=0D Status =3D HandleCmObject (=0D CmObjectId,=0D diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.h index 034d945f18c5..72b035e1421f 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h @@ -250,10 +250,10 @@ typedef struct PlatformRepositoryInfo { /** Serial port information for the=0D serial port console redirection port=0D */=0D - CM_ARM_SERIAL_PORT_INFO SpcrSerialPort;=0D + CM_ARCH_COMMON_SERIAL_PORT_INFO SpcrSerialPort;=0D =0D /// Serial port information for the DBG2 UART port=0D - CM_ARM_SERIAL_PORT_INFO DbgSerialPort;=0D + CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort;=0D =0D /// PCI configuration space information=0D CM_ARM_PCI_CONFIG_SPACE_INFO PciConfigInfo;=0D diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.c index dd7b068a335b..397de8a365dc 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c @@ -775,6 +775,26 @@ GetArchCommonNameSpaceObject ( );=0D break;=0D =0D + case EArchCommonObjConsolePortInfo:=0D + Status =3D HandleCmObject (=0D + CmObjectId,=0D + &PlatformRepo->SpcrSerialPort,=0D + sizeof (PlatformRepo->SpcrSerialPort),=0D + 1,=0D + CmObject=0D + );=0D + break;=0D +=0D + case EArchCommonObjSerialDebugPortInfo:=0D + Status =3D HandleCmObject (=0D + CmObjectId,=0D + &PlatformRepo->DbgSerialPort,=0D + sizeof (PlatformRepo->DbgSerialPort),=0D + 1,=0D + CmObject=0D + );=0D + break;=0D +=0D default: {=0D Status =3D EFI_NOT_FOUND;=0D DEBUG ((=0D @@ -943,26 +963,6 @@ GetArmNameSpaceObject ( );=0D break;=0D =0D - case EArmObjSerialConsolePortInfo:=0D - Status =3D HandleCmObject (=0D - CmObjectId,=0D - &PlatformRepo->SpcrSerialPort,=0D - sizeof (PlatformRepo->SpcrSerialPort),=0D - 1,=0D - CmObject=0D - );=0D - break;=0D -=0D - case EArmObjSerialDebugPortInfo:=0D - Status =3D HandleCmObject (=0D - CmObjectId,=0D - &PlatformRepo->DbgSerialPort,=0D - sizeof (PlatformRepo->DbgSerialPort),=0D - 1,=0D - CmObject=0D - );=0D - break;=0D -=0D case EArmObjGicItsInfo:=0D Status =3D HandleCmObject (=0D CmObjectId,=0D diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.h index f4d26242c27c..ae7df98824d9 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h @@ -144,10 +144,10 @@ typedef struct PlatformRepositoryInfo { /** Serial port information for the=0D serial port console redirection port=0D */=0D - CM_ARM_SERIAL_PORT_INFO SpcrSerialPort;=0D + CM_ARCH_COMMON_SERIAL_PORT_INFO SpcrSerialPort;=0D =0D /// Serial port information for the DBG2 UART port=0D - CM_ARM_SERIAL_PORT_INFO DbgSerialPort;=0D + CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort;=0D =0D /// GIC ITS information=0D CM_ARM_GIC_ITS_INFO GicItsInfo;=0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117004): https://edk2.groups.io/g/devel/message/117004 Mute This Topic: https://groups.io/mt/105069938/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-