summaryrefslogtreecommitdiffstats
path: root/DynamicTablesPkg
diff options
context:
space:
mode:
authorSami Mujawar <sami.mujawar@arm.com>2019-02-25 20:36:48 +0000
committerSami Mujawar <sami.mujawar@arm.com>2019-02-26 08:53:35 +0000
commitdb8382ef5e44bd07654fb4726b77f3c329210561 (patch)
tree5b2dd91652c47d1feedacea71ceea94b750292c6 /DynamicTablesPkg
parent82c4426a176c271d24915b403b267a431bdc52f5 (diff)
downloadedk2-db8382ef5e44bd07654fb4726b77f3c329210561.tar.gz
edk2-db8382ef5e44bd07654fb4726b77f3c329210561.tar.bz2
edk2-db8382ef5e44bd07654fb4726b77f3c329210561.zip
Revert "DynamicTablesPkg: DGB2: Update DBG2_DEBUG_PORT_DDI"
This reverts commit 6814256083a90ef218e7ae240e51922045175df1. Reverting this patch as Soft Feature Freeze for edk2-stable201903 started on 22 Feb 2019. Cc: Laszlo Ersek <lersek@redhat.com> Cc: Alexei Fedorov <alexei.fedorov@arm.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar <sami.mujawar@arm.com> Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>
Diffstat (limited to 'DynamicTablesPkg')
-rw-r--r--DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
index 90380f48da..697cfc46ab 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
@@ -97,12 +97,14 @@ typedef struct {
/** A helper macro used for initializing the debug port device
information structure.
+ @param [in] NumReg The number of generic address registers.
@param [in] SubType The DBG Port SubType.
@param [in] UartBase The UART port base address.
@param [in] UartAddrLen The UART port address range length.
@param [in] UartNameStr The UART port name string.
**/
#define DBG2_DEBUG_PORT_DDI( \
+ NumReg, \
SubType, \
UartBase, \
UartAddrLen, \
@@ -114,7 +116,7 @@ typedef struct {
/* UINT16 Length */ \
sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \
/* UINT8 NumberofGenericAddressRegisters */ \
- DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, \
+ NumReg, \
/* UINT16 NameSpaceStringLength */ \
DBG2_NAMESPACESTRING_FIELD_SIZE, \
/* UINT16 NameSpaceStringOffset */ \
@@ -162,6 +164,7 @@ DBG2_TABLE AcpiDbg2 = {
* Debug port 1
*/
DBG2_DEBUG_PORT_DDI (
+ DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS,
0, // {Template}: Serial Port Subtype
0, // {Template}: Serial Port Base Address
PL011_UART_LENGTH,