ACPICA: Split large ACPI table header

Split out the non-acpi-defined ACPI tables into the existing
(but empty) actbl2.h file. Preparation for new ACPI 4.0 tables.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 550 deletions

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index ec36693f868c..582af1fcb8f5 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -46,41 +46,29 @@
 
 /*******************************************************************************
  *
- * Additional ACPI Tables
+ * Additional ACPI Tables (1)
  *
  * These tables are not consumed directly by the ACPICA subsystem, but are
  * included here to support device drivers and the AML disassembler.
  *
+ * The tables in this file are fully defined within the ACPI specification.
+ *
  ******************************************************************************/
 
 /*
  * Values for description table header signatures. Useful because they make
  * it more difficult to inadvertently type in the wrong signature.
  */
-#define ACPI_SIG_ASF            "ASF!"  /* Alert Standard Format table */
 #define ACPI_SIG_BERT           "BERT"  /* Boot Error Record Table */
-#define ACPI_SIG_BOOT           "BOOT"  /* Simple Boot Flag Table */
 #define ACPI_SIG_CPEP           "CPEP"  /* Corrected Platform Error Polling table */
-#define ACPI_SIG_DBGP           "DBGP"  /* Debug Port table */
-#define ACPI_SIG_DMAR           "DMAR"  /* DMA Remapping table */
 #define ACPI_SIG_ECDT           "ECDT"  /* Embedded Controller Boot Resources Table */
 #define ACPI_SIG_EINJ           "EINJ"  /* Error Injection table */
 #define ACPI_SIG_ERST           "ERST"  /* Error Record Serialization Table */
 #define ACPI_SIG_HEST           "HEST"  /* Hardware Error Source Table */
-#define ACPI_SIG_HPET           "HPET"  /* High Precision Event Timer table */
-#define ACPI_SIG_IBFT           "IBFT"  /* i_sCSI Boot Firmware Table */
 #define ACPI_SIG_MADT           "APIC"  /* Multiple APIC Description Table */
-#define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_SBST           "SBST"  /* Smart Battery Specification Table */
-#define ACPI_SIG_SLIC           "SLIC"  /* Software Licensing Description Table */
 #define ACPI_SIG_SLIT           "SLIT"  /* System Locality Distance Information Table */
-#define ACPI_SIG_SPCR           "SPCR"  /* Serial Port Console Redirection table */
-#define ACPI_SIG_SPMI           "SPMI"  /* Server Platform Management Interface table */
 #define ACPI_SIG_SRAT           "SRAT"  /* System Resource Affinity Table */
-#define ACPI_SIG_TCPA           "TCPA"  /* Trusted Computing Platform Alliance table */
-#define ACPI_SIG_UEFI           "UEFI"  /* Uefi Boot Optimization Table */
-#define ACPI_SIG_WDAT           "WDAT"  /* Watchdog Action Table */
-#define ACPI_SIG_WDRT           "WDRT"  /* Watchdog Resource Table */
 
 /*
  * All tables must be byte-packed to match the ACPI specification, since
@@ -115,115 +103,6 @@ struct acpi_whea_header {
 
 /*******************************************************************************
  *
- * ASF - Alert Standard Format table (Signature "ASF!")
- *
- * Conforms to the Alert Standard Format Specification V2.0, 23 April 2003
- *
- ******************************************************************************/
-
-struct acpi_table_asf {
-        struct acpi_table_header header;        /* Common ACPI table header */
-};
-
-/* ASF subtable header */
-
-struct acpi_asf_header {
-        u8 type;
-        u8 reserved;
-        u16 length;
-};
-
-/* Values for Type field above */
-
-enum acpi_asf_type {
-        ACPI_ASF_TYPE_INFO = 0,
-        ACPI_ASF_TYPE_ALERT = 1,
-        ACPI_ASF_TYPE_CONTROL = 2,
-        ACPI_ASF_TYPE_BOOT = 3,
-        ACPI_ASF_TYPE_ADDRESS = 4,
-        ACPI_ASF_TYPE_RESERVED = 5
-};
-
-/*
- * ASF subtables
- */
-
-/* 0: ASF Information */
-
-struct acpi_asf_info {
-        struct acpi_asf_header header;
-        u8 min_reset_value;
-        u8 min_poll_interval;
-        u16 system_id;
-        u32 mfg_id;
-        u8 flags;
-        u8 reserved2[3];
-};
-
-/* 1: ASF Alerts */
-
-struct acpi_asf_alert {
-        struct acpi_asf_header header;
-        u8 assert_mask;
-        u8 deassert_mask;
-        u8 alerts;
-        u8 data_length;
-};
-
-struct acpi_asf_alert_data {
-        u8 address;
-        u8 command;
-        u8 mask;
-        u8 value;
-        u8 sensor_type;
-        u8 type;
-        u8 offset;
-        u8 source_type;
-        u8 severity;
-        u8 sensor_number;
-        u8 entity;
-        u8 instance;
-};
-
-/* 2: ASF Remote Control */
-
-struct acpi_asf_remote {
-        struct acpi_asf_header header;
-        u8 controls;
-        u8 data_length;
-        u16 reserved2;
-};
-
-struct acpi_asf_control_data {
-        u8 function;
-        u8 address;
-        u8 command;
-        u8 value;
-};
-
-/* 3: ASF RMCP Boot Options */
-
-struct acpi_asf_rmcp {
-        struct acpi_asf_header header;
-        u8 capabilities[7];
-        u8 completion_code;
-        u32 enterprise_id;
-        u8 command;
-        u16 parameter;
-        u16 boot_options;
-        u16 oem_parameters;
-};
-
-/* 4: ASF Address */
-
-struct acpi_asf_address {
-        struct acpi_asf_header header;
-        u8 eprom_address;
-        u8 devices;
-};
-
-/*******************************************************************************
- *
  * BERT - Boot Error Record Table
  *
  ******************************************************************************/
@@ -253,18 +132,6 @@ struct acpi_bert_region {
 
 /*******************************************************************************
  *
- * BOOT - Simple Boot Flag Table
- *
- ******************************************************************************/
-
-struct acpi_table_boot {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 cmos_index;          /* Index in CMOS RAM for the boot register */
-        u8 reserved[3];
-};
-
-/*******************************************************************************
- *
  * CPEP - Corrected Platform Error Polling table
  *
  ******************************************************************************/
@@ -286,123 +153,6 @@ struct acpi_cpep_polling {
 
 /*******************************************************************************
  *
- * DBGP - Debug Port table
- *
- ******************************************************************************/
-
-struct acpi_table_dbgp {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 type;                /* 0=full 16550, 1=subset of 16550 */
-        u8 reserved[3];
-        struct acpi_generic_address debug_port;
-};
-
-/*******************************************************************************
- *
- * DMAR - DMA Remapping table
- *        From "Intel Virtualization Technology for Directed I/O", Sept. 2007
- *
- ******************************************************************************/
-
-struct acpi_table_dmar {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 width;               /* Host Address Width */
-        u8 flags;
-        u8 reserved[10];
-};
-
-/* Flags */
-
-#define ACPI_DMAR_INTR_REMAP        (1)
-
-/* DMAR subtable header */
-
-struct acpi_dmar_header {
-        u16 type;
-        u16 length;
-};
-
-/* Values for subtable type in struct acpi_dmar_header */
-
-enum acpi_dmar_type {
-        ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
-        ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
-        ACPI_DMAR_TYPE_ATSR = 2,
-        ACPI_DMAR_TYPE_RESERVED = 3     /* 3 and greater are reserved */
-};
-
-struct acpi_dmar_device_scope {
-        u8 entry_type;
-        u8 length;
-        u16 reserved;
-        u8 enumeration_id;
-        u8 bus;
-};
-
-/* Values for entry_type in struct acpi_dmar_device_scope */
-
-enum acpi_dmar_scope_type {
-        ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
-        ACPI_DMAR_SCOPE_TYPE_ENDPOINT = 1,
-        ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
-        ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
-        ACPI_DMAR_SCOPE_TYPE_HPET = 4,
-        ACPI_DMAR_SCOPE_TYPE_RESERVED = 5       /* 5 and greater are reserved */
-};
-
-struct acpi_dmar_pci_path {
-        u8 dev;
-        u8 fn;
-};
-
-/*
- * DMAR Sub-tables, correspond to Type in struct acpi_dmar_header
- */
-
-/* 0: Hardware Unit Definition */
-
-struct acpi_dmar_hardware_unit {
-        struct acpi_dmar_header header;
-        u8 flags;
-        u8 reserved;
-        u16 segment;
-        u64 address;            /* Register Base Address */
-};
-
-/* Flags */
-
-#define ACPI_DMAR_INCLUDE_ALL       (1)
-
-/* 1: Reserved Memory Defininition */
-
-struct acpi_dmar_reserved_memory {
-        struct acpi_dmar_header header;
-        u16 reserved;
-        u16 segment;
-        u64 base_address;               /* 4_k aligned base address */
-        u64 end_address;        /* 4_k aligned limit address */
-};
-
-/* Flags */
-
-#define ACPI_DMAR_ALLOW_ALL         (1)
-
-
-/* 2: Root Port ATS Capability Reporting Structure */
-
-struct acpi_dmar_atsr {
-       struct acpi_dmar_header header;
-       u8 flags;
-       u8 reserved;
-       u16 segment;
-};
-
-/* Flags */
-
-#define ACPI_DMAR_ALL_PORTS         (1)
-
-/*******************************************************************************
- *
  * ECDT - Embedded Controller Boot Resources Table
  *
  ******************************************************************************/
@@ -764,119 +514,6 @@ struct acpi_hest_generic {
 
 /*******************************************************************************
  *
- * HPET - High Precision Event Timer table
- *
- ******************************************************************************/
-
-struct acpi_table_hpet {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u32 id;                 /* Hardware ID of event timer block */
-        struct acpi_generic_address address;    /* Address of event timer block */
-        u8 sequence;            /* HPET sequence number */
-        u16 minimum_tick;       /* Main counter min tick, periodic mode */
-        u8 flags;
-};
-
-/*! Flags */
-
-#define ACPI_HPET_PAGE_PROTECT      (1) /* 00: No page protection */
-#define ACPI_HPET_PAGE_PROTECT_4    (1<<1)      /* 01: 4KB page protected */
-#define ACPI_HPET_PAGE_PROTECT_64   (1<<2)      /* 02: 64KB page protected */
-
-/*! [End] no source code translation !*/
-
-/*******************************************************************************
- *
- * IBFT - Boot Firmware Table
- *
- ******************************************************************************/
-
-struct acpi_table_ibft {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 reserved[12];
-};
-
-/* IBFT common subtable header */
-
-struct acpi_ibft_header {
-        u8 type;
-        u8 version;
-        u16 length;
-        u8 index;
-        u8 flags;
-};
-
-/* Values for Type field above */
-
-enum acpi_ibft_type {
-        ACPI_IBFT_TYPE_NOT_USED = 0,
-        ACPI_IBFT_TYPE_CONTROL = 1,
-        ACPI_IBFT_TYPE_INITIATOR = 2,
-        ACPI_IBFT_TYPE_NIC = 3,
-        ACPI_IBFT_TYPE_TARGET = 4,
-        ACPI_IBFT_TYPE_EXTENSIONS = 5,
-        ACPI_IBFT_TYPE_RESERVED = 6     /* 6 and greater are reserved */
-};
-
-/* IBFT subtables */
-
-struct acpi_ibft_control {
-        struct acpi_ibft_header header;
-        u16 extensions;
-        u16 initiator_offset;
-        u16 nic0_offset;
-        u16 target0_offset;
-        u16 nic1_offset;
-        u16 target1_offset;
-};
-
-struct acpi_ibft_initiator {
-        struct acpi_ibft_header header;
-        u8 sns_server[16];
-        u8 slp_server[16];
-        u8 primary_server[16];
-        u8 secondary_server[16];
-        u16 name_length;
-        u16 name_offset;
-};
-
-struct acpi_ibft_nic {
-        struct acpi_ibft_header header;
-        u8 ip_address[16];
-        u8 subnet_mask_prefix;
-        u8 origin;
-        u8 gateway[16];
-        u8 primary_dns[16];
-        u8 secondary_dns[16];
-        u8 dhcp[16];
-        u16 vlan;
-        u8 mac_address[6];
-        u16 pci_address;
-        u16 name_length;
-        u16 name_offset;
-};
-
-struct acpi_ibft_target {
-        struct acpi_ibft_header header;
-        u8 target_ip_address[16];
-        u16 target_ip_socket;
-        u8 target_boot_lun[8];
-        u8 chap_type;
-        u8 nic_association;
-        u16 target_name_length;
-        u16 target_name_offset;
-        u16 chap_name_length;
-        u16 chap_name_offset;
-        u16 chap_secret_length;
-        u16 chap_secret_offset;
-        u16 reverse_chap_name_length;
-        u16 reverse_chap_name_offset;
-        u16 reverse_chap_secret_length;
-        u16 reverse_chap_secret_offset;
-};
-
-/*******************************************************************************
- *
  * MADT - Multiple APIC Description Table
  *
  ******************************************************************************/
@@ -1058,27 +695,6 @@ struct acpi_madt_local_x2apic_nmi {
 
 /*******************************************************************************
  *
- * MCFG - PCI Memory Mapped Configuration table and sub-table
- *
- ******************************************************************************/
-
-struct acpi_table_mcfg {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 reserved[8];
-};
-
-/* Subtable */
-
-struct acpi_mcfg_allocation {
-        u64 address;            /* Base address, processor-relative */
-        u16 pci_segment;        /* PCI segment group number */
-        u8 start_bus_number;    /* Starting PCI Bus number */
-        u8 end_bus_number;      /* Final PCI Bus number */
-        u32 reserved;
-};
-
-/*******************************************************************************
- *
  * SBST - Smart Battery Specification Table
  *
  ******************************************************************************/
@@ -1104,59 +720,6 @@ struct acpi_table_slit {
 
 /*******************************************************************************
  *
- * SPCR - Serial Port Console Redirection table
- *
- ******************************************************************************/
-
-struct acpi_table_spcr {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 interface_type;      /* 0=full 16550, 1=subset of 16550 */
-        u8 reserved[3];
-        struct acpi_generic_address serial_port;
-        u8 interrupt_type;
-        u8 pc_interrupt;
-        u32 interrupt;
-        u8 baud_rate;
-        u8 parity;
-        u8 stop_bits;
-        u8 flow_control;
-        u8 terminal_type;
-        u8 reserved1;
-        u16 pci_device_id;
-        u16 pci_vendor_id;
-        u8 pci_bus;
-        u8 pci_device;
-        u8 pci_function;
-        u32 pci_flags;
-        u8 pci_segment;
-        u32 reserved2;
-};
-
-/*******************************************************************************
- *
- * SPMI - Server Platform Management Interface table
- *
- ******************************************************************************/
-
-struct acpi_table_spmi {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 reserved;
-        u8 interface_type;
-        u16 spec_revision;      /* Version of IPMI */
-        u8 interrupt_type;
-        u8 gpe_number;          /* GPE assigned */
-        u8 reserved1;
-        u8 pci_device_flag;
-        u32 interrupt;
-        struct acpi_generic_address ipmi_register;
-        u8 pci_segment;
-        u8 pci_bus;
-        u8 pci_device;
-        u8 pci_function;
-};
-
-/*******************************************************************************
- *
  * SRAT - System Resource Affinity Table
  *
  ******************************************************************************/
@@ -1227,116 +790,6 @@ struct acpi_srat_x2apic_cpu_affinity {
 
 #define ACPI_SRAT_CPU_ENABLED       (1) /* 00: Use affinity structure */
 
-/*******************************************************************************
- *
- * TCPA - Trusted Computing Platform Alliance table
- *
- ******************************************************************************/
-
-struct acpi_table_tcpa {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u16 reserved;
-        u32 max_log_length;     /* Maximum length for the event log area */
-        u64 log_address;        /* Address of the event log area */
-};
-
-/*******************************************************************************
- *
- * UEFI - UEFI Boot optimization Table
- *
- ******************************************************************************/
-
-struct acpi_table_uefi {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u8 identifier[16];      /* UUID identifier */
-        u16 data_offset;        /* Offset of remaining data in table */
-        u8 data;
-};
-
-/*******************************************************************************
- *
- * WDAT - Watchdog Action Table
- *
- ******************************************************************************/
-
-struct acpi_table_wdat {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u32 header_length;      /* Watchdog Header Length */
-        u16 pci_segment;        /* PCI Segment number */
-        u8 pci_bus;             /* PCI Bus number */
-        u8 pci_device;          /* PCI Device number */
-        u8 pci_function;        /* PCI Function number */
-        u8 reserved[3];
-        u32 timer_period;       /* Period of one timer count (msec) */
-        u32 max_count;          /* Maximum counter value supported */
-        u32 min_count;          /* Minimum counter value */
-        u8 flags;
-        u8 reserved2[3];
-        u32 entries;            /* Number of watchdog entries that follow */
-};
-
-/* WDAT Instruction Entries (actions) */
-
-struct acpi_wdat_entry {
-        struct acpi_whea_header whea_header;    /* Common header for WHEA tables */
-};
-
-/* Values for Action field above */
-
-enum acpi_wdat_actions {
-        ACPI_WDAT_RESET = 1,
-        ACPI_WDAT_GET_CURRENT_COUNTDOWN = 4,
-        ACPI_WDAT_GET_COUNTDOWN = 5,
-        ACPI_WDAT_SET_COUNTDOWN = 6,
-        ACPI_WDAT_GET_RUNNING_STATE = 8,
-        ACPI_WDAT_SET_RUNNING_STATE = 9,
-        ACPI_WDAT_GET_STOPPED_STATE = 10,
-        ACPI_WDAT_SET_STOPPED_STATE = 11,
-        ACPI_WDAT_GET_REBOOT = 16,
-        ACPI_WDAT_SET_REBOOT = 17,
-        ACPI_WDAT_GET_SHUTDOWN = 18,
-        ACPI_WDAT_SET_SHUTDOWN = 19,
-        ACPI_WDAT_GET_STATUS = 32,
-        ACPI_WDAT_SET_STATUS = 33,
-        ACPI_WDAT_ACTION_RESERVED = 34  /* 34 and greater are reserved */
-};
-
-/* Values for Instruction field above */
-
-enum acpi_wdat_instructions {
-        ACPI_WDAT_READ_VALUE = 0,
-        ACPI_WDAT_READ_COUNTDOWN = 1,
-        ACPI_WDAT_WRITE_VALUE = 2,
-        ACPI_WDAT_WRITE_COUNTDOWN = 3,
-        ACPI_WDAT_INSTRUCTION_RESERVED = 4,     /* 4 and greater are reserved */
-        ACPI_WDAT_PRESERVE_REGISTER = 0x80      /* Except for this value */
-};
-
-/*******************************************************************************
- *
- * WDRT - Watchdog Resource Table
- *
- ******************************************************************************/
-
-struct acpi_table_wdrt {
-        struct acpi_table_header header;        /* Common ACPI table header */
-        u32 header_length;      /* Watchdog Header Length */
-        u8 pci_segment;         /* PCI Segment number */
-        u8 pci_bus;             /* PCI Bus number */
-        u8 pci_device;          /* PCI Device number */
-        u8 pci_function;        /* PCI Function number */
-        u32 timer_period;       /* Period of one timer count (msec) */
-        u32 max_count;          /* Maximum counter value supported */
-        u32 min_count;          /* Minimum counter value */
-        u8 flags;
-        u8 reserved[3];
-        u32 entries;            /* Number of watchdog entries that follow */
-};
-
-/* Flags */
-
-#define ACPI_WDRT_TIMER_ENABLED     (1) /* 00: Timer enabled */
-
 /* Reset to default packing */
 
 #pragma pack()