John Zhao has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32189
Change subject: ACPI: Add RHSA and ANDD structures for DMAR table ......................................................................
ACPI: Add RHSA and ANDD structures for DMAR table
Remapping Hardware Status Affinity (RHSA) structure is applicable for platforms supporting non-uniform memory. An ACPI Name-space Device Declaration (ANDD) structure uniquely represents an ACPI name-space enumerated device capable of issuing DMA requests in the platform. Add RHSA and ANDD structures support for DMAR table generation.
Change-Id: I042925a7c03831061870d9bca03f11bf25aeb3e7 Signed-off-by: zhaojohn john.zhao@intel.com --- M src/arch/x86/acpi.c M src/arch/x86/include/arch/acpi.h 2 files changed, 60 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/32189/1
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index f08a401..781efac 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -568,6 +568,32 @@ return atsr->length; }
+unsigned long acpi_create_dmar_rhsa(unsigned long current, u64 base_addr, + u32 proximity_domain) +{ + dmar_rhsa_entry_t *rhsa = (dmar_rhsa_entry_t *)current; + memset(rhsa, 0, sizeof(*rhsa)); + rhsa->type = DMAR_RHSA; + rhsa->length = sizeof(*rhsa); /* will be fixed up later */ + rhsa->base_address = base_addr; + rhsa->proximity_domain = proximity_domain; + + return rhsa->length; +} + +unsigned long acpi_create_dmar_andd(unsigned long current, u8 device_number, + const char *device_name) +{ + dmar_andd_entry_t *andd = (dmar_andd_entry_t *)current; + memset(andd, 0, sizeof(*andd)); + andd->type = DMAR_ANDD; + andd->length = sizeof(*andd); /* will be fixed up later */ + andd->device_number = device_number; + memcpy(&andd->device_name, device_name, 4); + + return andd->length; +} + void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current) { dmar_entry_t *drhd = (dmar_entry_t *)base; @@ -586,6 +612,18 @@ atsr->length = current - base; }
+void acpi_dmar_rhsa_fixup(unsigned long base, unsigned long current) +{ + dmar_rhsa_entry_t *rhsa = (dmar_rhsa_entry_t *)base; + rhsa->length = current - base; +} + +void acpi_dmar_andd_fixup(unsigned long base, unsigned long current) +{ + dmar_andd_entry_t *andd = (dmar_andd_entry_t *)base; + andd->length = current - base; +} + static unsigned long acpi_create_dmar_ds(unsigned long current, enum dev_scope_type type, u8 enumeration_id, u8 bus, u8 dev, u8 fn) { diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index f4ed744..3df0c64 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -366,6 +366,22 @@ u16 segment; } __packed dmar_atsr_entry_t;
+typedef struct dmar_rhsa_entry { + u16 type; + u16 length; + u32 reserved; + u64 base_address; + u32 proximity_domain; +} __packed dmar_rhsa_entry_t; + +typedef struct dmar_andd_entry { + u16 type; + u16 length; + u8 reserved[3]; + u8 device_number; + char device_name[4]; +} __packed dmar_andd_entry_t; + /* DMAR (DMA Remapping Reporting Structure) */ typedef struct acpi_dmar { struct acpi_table_header header; @@ -850,9 +866,15 @@ u64 bar, u64 limit); unsigned long acpi_create_dmar_atsr(unsigned long current, u8 flags, u16 segment); +unsigned long acpi_create_dmar_rhsa(unsigned long current, u64 base_addr, + u32 proximity_domain); +unsigned long acpi_create_dmar_andd(unsigned long current, u8 device_number, + const char *device_name); 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); +void acpi_dmar_rhsa_fixup(unsigned long base, unsigned long current); +void acpi_dmar_andd_fixup(unsigned long base, unsigned long current); unsigned long acpi_create_dmar_ds_pci_br(unsigned long current, u8 bus, u8 dev, u8 fn); unsigned long acpi_create_dmar_ds_pci(unsigned long current,