UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / DebugPort2Table.h

diff --git a/MdePkg/Include/IndustryStandard/DebugPort2Table.h b/MdePkg/Include/IndustryStandard/DebugPort2Table.h
index 08d6fc093d4c87682497237a1aaad5215e77e624..d6d468b7e592043f8af61ac4875948b33ea90902 100644 (file)
--- a/MdePkg/Include/IndustryStandard/DebugPort2Table.h
+++ b/MdePkg/Include/IndustryStandard/DebugPort2Table.h
@@ -1,20 +1,13 @@
-/** @file   \r
-  ACPI debug port 2 table definition, defined at \r
+/** @file\r
+  ACPI debug port 2 table definition, defined at\r
   Microsoft DebugPort2Specification.\r
 \r
-  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.<BR>\r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-\r
 #ifndef _DEBUG_PORT_2_TABLE_H_\r
 #define _DEBUG_PORT_2_TABLE_H_\r
 \r
@@ -29,30 +22,32 @@
 // Debug Device Information structure.\r
 //\r
 typedef struct {\r
-  UINT8                                     Revision;\r
-  UINT16                                    Length;\r
-  UINT8                                     NumberofGenericAddressRegisters;\r
-  UINT16                                    NameSpaceStringLength;\r
-  UINT16                                    NameSpaceStringOffset;\r
-  UINT16                                    OemDataLength;\r
-  UINT16                                    OemDataOffset;\r
-  UINT16                                    PortType;\r
-  UINT16                                    PortSubtype;\r
-  UINT8                                     Reserved[2];\r
-  UINT16                                    BaseAddressRegisterOffset;\r
-  UINT16                                    AddressSizeOffset;\r
+  UINT8     Revision;\r
+  UINT16    Length;\r
+  UINT8     NumberofGenericAddressRegisters;\r
+  UINT16    NameSpaceStringLength;\r
+  UINT16    NameSpaceStringOffset;\r
+  UINT16    OemDataLength;\r
+  UINT16    OemDataOffset;\r
+  UINT16    PortType;\r
+  UINT16    PortSubtype;\r
+  UINT8     Reserved[2];\r
+  UINT16    BaseAddressRegisterOffset;\r
+  UINT16    AddressSizeOffset;\r
 } EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT;\r
 \r
-#define EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION      0x00\r
+#define EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION  0x00\r
 \r
 #define EFI_ACPI_DBG2_PORT_TYPE_SERIAL                                                 0x8000\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_FULL_16550                                 0x0000\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_16550_SUBSET_COMPATIBLE_WITH_MS_DBGP_SPEC  0x0001\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_ARM_PL011_UART                             0x0003\r
+#define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_NVIDIA_16550_UART                          0x0005\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_ARM_SBSA_GENERIC_UART_2X                   0x000d\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_ARM_SBSA_GENERIC_UART                      0x000e\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_DCC                                        0x000f\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_BCM2835_UART                               0x0010\r
+#define   EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_16550_WITH_GAS                             0x0012\r
 #define EFI_ACPI_DBG2_PORT_TYPE_1394                                                   0x8001\r
 #define   EFI_ACPI_DBG2_PORT_SUBTYPE_1394_STANDARD                                     0x0000\r
 #define EFI_ACPI_DBG2_PORT_TYPE_USB                                                    0x8002\r
@@ -64,9 +59,9 @@ typedef struct {
 // Debug Port 2 Table definition.\r
 //\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER               Header;\r
-  UINT32                                    OffsetDbgDeviceInfo;\r
-  UINT32                                    NumberDbgDeviceInfo;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         OffsetDbgDeviceInfo;\r
+  UINT32                         NumberDbgDeviceInfo;\r
 } EFI_ACPI_DEBUG_PORT_2_DESCRIPTION_TABLE;\r
 \r
 #pragma pack()\r
@@ -74,6 +69,6 @@ typedef struct {
 //\r
 // DBG2 Revision (defined in spec)\r
 //\r
-#define EFI_ACPI_DEBUG_PORT_2_TABLE_REVISION      0x00\r
+#define EFI_ACPI_DEBUG_PORT_2_TABLE_REVISION  0x00\r
 \r
 #endif\r