From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io
Cc: Pierre Gondois <pierre.gondois@arm.com>,
Sami Mujawar <sami.mujawar@arm.com>,
Pierre Gondois <Pierre.Gondois@arm.com>,
Yeo Reum Yun <YeoReum.Yun@arm.com>,
Sunil V L <sunilvl@ventanamicro.com>,
AbdulLateef Attar <AbdulLateef.Attar@amd.com>,
Jeshua Smith <jeshuas@nvidia.com>,
Jeff Brasen <jbrasen@nvidia.com>,
Girish Mahadevan <gmahadevan@nvidia.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
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 [thread overview]
Message-ID: <20240321171815.781762-4-pierre.gondois@arm.com> (raw)
In-Reply-To: <20240321171815.781762-1-pierre.gondois@arm.com>
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 <sami.mujawar@arm.com>
Cc: Pierre Gondois <Pierre.Gondois@arm.com>
Cc: Yeo Reum Yun <YeoReum.Yun@arm.com>
Cc: AbdulLateef Attar <AbdulLateef.Attar@amd.com>
Cc: Jeshua Smith <jeshuas@nvidia.com>
Cc: Jeff Brasen <jbrasen@nvidia.com>
Cc: Girish Mahadevan <gmahadevan@nvidia.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
.../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/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index c1af3bac2458..813e420a4740 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1658,6 +1658,26 @@ GetArchCommonNameSpaceObject (
);
break;
+ case EArchCommonObjConsolePortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &PlatformRepo->SpcrSerialPort,
+ sizeof (PlatformRepo->SpcrSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
+ case EArchCommonObjSerialDebugPortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &PlatformRepo->DbgSerialPort,
+ sizeof (PlatformRepo->DbgSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
default: {
Status = EFI_NOT_FOUND;
DEBUG ((
@@ -1795,25 +1815,7 @@ GetArmNameSpaceObject (
CmObject
);
break;
- case EArmObjSerialConsolePortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &PlatformRepo->SpcrSerialPort,
- sizeof (PlatformRepo->SpcrSerialPort),
- 1,
- CmObject
- );
- break;
- case EArmObjSerialDebugPortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &PlatformRepo->DbgSerialPort,
- sizeof (PlatformRepo->DbgSerialPort),
- 1,
- CmObject
- );
- break;
case EArmObjGicMsiFrameInfo:
Status = HandleCmObject (
CmObjectId,
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 034d945f18c5..72b035e1421f 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -250,10 +250,10 @@ typedef struct PlatformRepositoryInfo {
/** Serial port information for the
serial port console redirection port
*/
- CM_ARM_SERIAL_PORT_INFO SpcrSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO SpcrSerialPort;
/// Serial port information for the DBG2 UART port
- CM_ARM_SERIAL_PORT_INFO DbgSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort;
/// PCI configuration space information
CM_ARM_PCI_CONFIG_SPACE_INFO PciConfigInfo;
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/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 (
);
break;
+ case EArchCommonObjConsolePortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &PlatformRepo->SpcrSerialPort,
+ sizeof (PlatformRepo->SpcrSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
+ case EArchCommonObjSerialDebugPortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &PlatformRepo->DbgSerialPort,
+ sizeof (PlatformRepo->DbgSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
default: {
Status = EFI_NOT_FOUND;
DEBUG ((
@@ -943,26 +963,6 @@ GetArmNameSpaceObject (
);
break;
- case EArmObjSerialConsolePortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &PlatformRepo->SpcrSerialPort,
- sizeof (PlatformRepo->SpcrSerialPort),
- 1,
- CmObject
- );
- break;
-
- case EArmObjSerialDebugPortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &PlatformRepo->DbgSerialPort,
- sizeof (PlatformRepo->DbgSerialPort),
- 1,
- CmObject
- );
- break;
-
case EArmObjGicItsInfo:
Status = HandleCmObject (
CmObjectId,
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationManager/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
serial port console redirection port
*/
- CM_ARM_SERIAL_PORT_INFO SpcrSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO SpcrSerialPort;
/// Serial port information for the DBG2 UART port
- CM_ARM_SERIAL_PORT_INFO DbgSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort;
/// GIC ITS information
CM_ARM_GIC_ITS_INFO GicItsInfo;
--
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]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-03-21 17:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 17:18 [edk2-devel] [RESEND PATCH 00/14] Platform/ARM: FVP, Juno: Move DynamicTablesPkg obj to Arch Common PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 01/14] Platform/ARM: FVP,Juno: Add Arch Common objects handler PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 02/14] Platform/ARM: FVP,Juno: Move Power Mgmt Profile info to Arch Common PierreGondois
2024-03-21 17:18 ` PierreGondois [this message]
2024-03-21 17:18 ` [edk2-devel] [PATCH 04/14] Platform/ARM: FVP: Move Fixed Feat Flags " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 05/14] Platform/ARM: Juno: Move CmRef " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 06/14] Platform/ARM: FVP,Juno: Move Pci Config Space " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 07/14] Platform/ARM: Juno: Move Pci Address Map " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 08/14] Platform/ARM: Juno: Move Pci Interrupt " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 09/14] Platform/ARM: Juno: Move Lpi " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 10/14] Platform/ARM: Juno: Rename GicCToken PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 11/14] Platform/ARM: Juno: Move Proc Hierarchy info to Arch Common PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 12/14] Platform/ARM: Juno: Move Cache " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 13/14] Platform/ARM: Juno: Move Cpc " PierreGondois
2024-03-21 17:18 ` [edk2-devel] [PATCH 14/14] Platform/ARM: Juno: Move Psd " PierreGondois
2024-06-07 14:06 ` [edk2-devel] [RESEND PATCH 00/14] Platform/ARM: FVP, Juno: Move DynamicTablesPkg obj " Sami Mujawar
2024-06-07 14:21 ` Sami Mujawar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240321171815.781762-4-pierre.gondois@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox