Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DynamicTablesPkg: DGB2: Update DBG2_DEBUG_PORT_DDI 

This patch was originally merged in edk2 master at
6814256083. However, this was
later reverted at db8382ef5e
as it was merged during the Soft Feature Freeze for
edk2-stable201903.

Resubmitting this patch as the edk2 merge window is now open.

The DBG2_DEBUG_PORT_DDI() macro supports adding only one
Generic Base Address Register. Therefore, removed the
superfluous parameter NumReg and updated the macro to
use DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS which has
a value 1.

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>
This commit is contained in:
Sami Mujawar 2019-02-16 12:10:02 +00:00
parent e12bdeb1c2
commit 1018bd4c79
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
View File

@ -97,14 +97,12 @@ typedef struct {
/** A helper macro used for initializing the debug port device /** A helper macro used for initializing the debug port device
information structure. information structure.
@param [in] NumReg The number of generic address registers.
@param [in] SubType The DBG Port SubType. @param [in] SubType The DBG Port SubType.
@param [in] UartBase The UART port base address. @param [in] UartBase The UART port base address.
@param [in] UartAddrLen The UART port address range length. @param [in] UartAddrLen The UART port address range length.
@param [in] UartNameStr The UART port name string. @param [in] UartNameStr The UART port name string.
**/ **/
#define DBG2_DEBUG_PORT_DDI( \ #define DBG2_DEBUG_PORT_DDI( \
NumReg, \
SubType, \ SubType, \
UartBase, \ UartBase, \
UartAddrLen, \ UartAddrLen, \
@ -116,7 +114,7 @@ typedef struct {
/* UINT16 Length */ \ /* UINT16 Length */ \
sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \ sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \
/* UINT8 NumberofGenericAddressRegisters */ \ /* UINT8 NumberofGenericAddressRegisters */ \
NumReg, \ DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, \
/* UINT16 NameSpaceStringLength */ \ /* UINT16 NameSpaceStringLength */ \
DBG2_NAMESPACESTRING_FIELD_SIZE, \ DBG2_NAMESPACESTRING_FIELD_SIZE, \
/* UINT16 NameSpaceStringOffset */ \ /* UINT16 NameSpaceStringOffset */ \
@ -164,7 +162,6 @@ DBG2_TABLE AcpiDbg2 = {
* Debug port 1 * Debug port 1
*/ */
DBG2_DEBUG_PORT_DDI ( DBG2_DEBUG_PORT_DDI (
DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS,
0, // {Template}: Serial Port Subtype 0, // {Template}: Serial Port Subtype
0, // {Template}: Serial Port Base Address 0, // {Template}: Serial Port Base Address
PL011_UART_LENGTH, PL011_UART_LENGTH,