diff options
| -rw-r--r-- | src/acpi/acpi.c | 6 | ||||
| -rw-r--r-- | src/include/acpi/acpi.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index b350bc389e..64af505941 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -638,17 +638,15 @@ unsigned long acpi_create_dmar_andd(unsigned long current, u8 device_number, return andd->length; } -unsigned long acpi_create_dmar_satc(unsigned long current, u8 flags, - u16 segment, const char *device_scope) +unsigned long acpi_create_dmar_satc(unsigned long current, u8 flags, u16 segment) { dmar_satc_entry_t *satc = (dmar_satc_entry_t *)current; - int satc_len = sizeof(dmar_satc_entry_t) + strlen(device_scope) + 1; + int satc_len = sizeof(dmar_satc_entry_t); memset(satc, 0, satc_len); satc->type = DMAR_SATC; satc->length = satc_len; satc->flags = flags; satc->segment_number = segment; - memcpy(&satc->device_scope, device_scope, strlen(device_scope)); return satc->length; } diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index 7f086791c0..f2d2ad93cf 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -418,6 +418,10 @@ enum { DRHD_INCLUDE_PCI_ALL = 1 }; +enum { + ATC_REQUIRED = 1 +}; + enum dmar_flags { DMAR_INTR_REMAP = 1 << 0, DMAR_X2APIC_OPT_OUT = 1 << 1, @@ -472,7 +476,6 @@ typedef struct dmar_satc_entry { u8 flags; u8 reserved; u16 segment_number; - u8 device_scope[]; } __packed dmar_satc_entry_t; /* DMAR (DMA Remapping Reporting Structure) */ @@ -1085,7 +1088,7 @@ unsigned long acpi_create_dmar_rhsa(unsigned long current, u64 base_addr, unsigned long acpi_create_dmar_andd(unsigned long current, u8 device_number, const char *device_name); unsigned long acpi_create_dmar_satc(unsigned long current, u8 flags, - u16 segment, const char *device_scope); + u16 segment); void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current); void acpi_dmar_rmrr_fixup(unsigned long base, unsigned long current); void acpi_dmar_atsr_fixup(unsigned long base, unsigned long current); |