diff options
author | Jan Beulich <jbeulich@suse.com> | 2011-12-13 11:49:33 +0100 |
---|---|---|
committer | Jan Beulich <jbeulich@suse.com> | 2011-12-13 11:49:33 +0100 |
commit | fee3eddfaedd990715b5b2fddf6264537dd5389c (patch) | |
tree | e98ad7a15a1e1223f2f6fadc6d969b58fa8ef45c /xen/include/xen/acpi.h | |
parent | 50e881ad1040af796dee8e0038cc296115414169 (diff) | |
download | xen-fee3eddfaedd990715b5b2fddf6264537dd5389c.tar.gz xen-fee3eddfaedd990715b5b2fddf6264537dd5389c.tar.bz2 xen-fee3eddfaedd990715b5b2fddf6264537dd5389c.zip |
ACPI: eliminate duplicate DMAR definitions
Use their proper counterparts in include/acpi/actbl*.h instead.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include/xen/acpi.h')
-rw-r--r-- | xen/include/xen/acpi.h | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index dd4182a57a..d7e2f94880 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -49,75 +49,6 @@ enum acpi_interrupt_id { ACPI_INTERRUPT_COUNT }; -/* DMA Remapping Reporting Table (DMAR) */ - -#define DMAR_FLAGS_INTR_REMAP 0x1 /* intr remap supported */ - -struct acpi_dmar_entry_header { - u16 type; - u16 length; -} __attribute__((packed)); - -enum acpi_dmar_entry_type { - ACPI_DMAR_DRHD = 0, - ACPI_DMAR_RMRR, - ACPI_DMAR_ATSR, - ACPI_DMAR_RHSA, - ACPI_DMAR_ENTRY_COUNT -}; - -#define DRHD_FLAGS_INCLUDE_ALL 0x1 /* drhd remaps remaining devices */ -struct acpi_table_drhd { - struct acpi_dmar_entry_header header; - u8 flags; - u8 reserved; - u16 segment; - u64 address; /* register base address for this drhd */ -} __attribute__ ((packed)); - -struct acpi_table_rmrr { - struct acpi_dmar_entry_header header; - u16 reserved; - u16 segment; - u64 base_address; - u64 end_address; -} __attribute__ ((packed)); - -struct acpi_table_atsr { - struct acpi_dmar_entry_header header; - u8 flags; - u8 reserved; - u16 segment; -} __attribute__ ((packed)); - -struct acpi_table_rhsa { - struct acpi_dmar_entry_header header; - u32 reserved; - u64 address; /* register base address for this drhd */ - u32 proximity_domain; -} __attribute__ ((packed)); - -enum acpi_dev_scope_type { - ACPI_DEV_ENDPOINT=0x01, /* PCI Endpoing device */ - ACPI_DEV_P2PBRIDGE, /* PCI-PCI Bridge */ - ACPI_DEV_IOAPIC, /* IOAPIC device*/ - ACPI_DEV_MSI_HPET, /* MSI capable HPET*/ - ACPI_DEV_ENTRY_COUNT -}; - -struct acpi_dev_scope { - u8 dev_type; - u8 length; - u8 reserved[2]; - u8 enum_id; - u8 start_bus; -} __attribute__((packed)); - -struct acpi_pci_path { - u8 dev; - u8 fn; -} __attribute__((packed)); - typedef int (*acpi_madt_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); typedef int (*acpi_table_handler) (struct acpi_table_header *table); |