soc/intel/denverton_ns: Generate ACPI DMAR Table

- Write ACPI DMAR Table if VT-d is enabled.
- The entries are defined to follow FSP settings.

Change-Id: I263b03b96280599266d4c5e193583ecdfe9697b7
Signed-off-by: Julien Viard de Galbert <jviarddegalbert@online.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/25446
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Julien Viard de Galbert
2018-04-05 11:59:07 +02:00
committed by Patrick Georgi
parent 81b88a1963
commit a0e5046a08
6 changed files with 78 additions and 0 deletions

View File

@@ -16,6 +16,7 @@
#include <soc/soc_util.h> #include <soc/soc_util.h>
#include <soc/pmc.h> #include <soc/pmc.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <soc/pci_devs.h>
#define MWAIT_RES(state, sub_state) \ #define MWAIT_RES(state, sub_state) \
{ \ { \
@@ -268,3 +269,54 @@ void southcluster_inject_dsdt(const struct device *device)
} }
__weak void acpi_create_serialio_ssdt(acpi_header_t *ssdt) {} __weak void acpi_create_serialio_ssdt(acpi_header_t *ssdt) {}
static unsigned long acpi_fill_dmar(unsigned long current)
{
uint64_t vtbar;
unsigned long tmp = current;
vtbar = read64((void *)(DEFAULT_MCHBAR + MCH_VTBAR_OFFSET)) & MCH_VTBAR_MASK;
printk(BIOS_DEBUG, "DEFVTBAR:0x%llx\n", vtbar);
if (!vtbar)
return current;
current += acpi_create_dmar_drhd(current,
DRHD_INCLUDE_PCI_ALL, 0, vtbar);
current += acpi_create_dmar_ds_ioapic(current,
2, PCH_IOAPIC_PCI_BUS, PCH_IOAPIC_PCI_SLOT, 0);
current += acpi_create_dmar_ds_msi_hpet(current,
0, PCH_HPET_PCI_BUS, PCH_HPET_PCI_SLOT, 0);
acpi_dmar_drhd_fixup(tmp, current);
/* Create RMRR; see "VTD PLATFORM CONFIGURATION" in FSP log */
tmp = current;
current += acpi_create_dmar_rmrr(current, 0,
RMRR_USB_BASE_ADDRESS,
RMRR_USB_LIMIT_ADDRESS);
current += acpi_create_dmar_ds_pci(current,
0, XHCI_DEV, XHCI_FUNC);
acpi_dmar_rmrr_fixup(tmp, current);
return current;
}
unsigned long systemagent_write_acpi_tables(const struct device *dev,
unsigned long current,
struct acpi_rsdp *const rsdp)
{
/* Create DMAR table only if we have VT-d capability. */
const u32 capid0_a = pci_read_config32(dev, CAPID0_A);
if (capid0_a & VTD_DISABLE)
return current;
acpi_dmar_t *const dmar = (acpi_dmar_t *)current;
printk(BIOS_DEBUG, "ACPI: * DMAR\n");
acpi_create_dmar(dmar, DMAR_INTR_REMAP, acpi_fill_dmar);
current += dmar->header.length;
current = acpi_align_current(current);
acpi_add_table(rsdp, dmar);
return current;
}

View File

@@ -12,5 +12,8 @@ unsigned long southcluster_write_acpi_tables(const struct device *device,
unsigned long current, unsigned long current,
struct acpi_rsdp *rsdp); struct acpi_rsdp *rsdp);
void southcluster_inject_dsdt(const struct device *device); void southcluster_inject_dsdt(const struct device *device);
unsigned long systemagent_write_acpi_tables(const struct device *dev,
unsigned long start,
struct acpi_rsdp *const rsdp);
#endif /* _DENVERTON_NS_ACPI_H_ */ #endif /* _DENVERTON_NS_ACPI_H_ */

View File

@@ -24,4 +24,8 @@
#define DEFAULT_HPET_ADDR CONFIG_HPET_ADDRESS #define DEFAULT_HPET_ADDR CONFIG_HPET_ADDRESS
#define DEFAULT_SPI_BASE 0xfed01000 #define DEFAULT_SPI_BASE 0xfed01000
/* "VTD PLATFORM CONFIGURATION" (Set to match FSP settings) */
#define RMRR_USB_BASE_ADDRESS 0x3e2e0000
#define RMRR_USB_LIMIT_ADDRESS 0x3e2fffff
#endif /* _DENVERTON_NS_IOMAP_H_ */ #endif /* _DENVERTON_NS_IOMAP_H_ */

View File

@@ -143,4 +143,12 @@
#define PCH_DEV_LPC _PCH_DEV(LPC, 0) #define PCH_DEV_LPC _PCH_DEV(LPC, 0)
#define PCH_DEV_SPI _PCH_DEV(LPC, 5) #define PCH_DEV_SPI _PCH_DEV(LPC, 5)
/* VT-d support value to match FSP settings */
/* "PCH IOAPIC Config" */
#define PCH_IOAPIC_PCI_BUS 0xf0
#define PCH_IOAPIC_PCI_SLOT 0x1f
/* "PCH HPET Config" */
#define PCH_HPET_PCI_BUS 0
#define PCH_HPET_PCI_SLOT 0
#endif /* _DENVERTON_NS_PCI_DEVS_H_ */ #endif /* _DENVERTON_NS_PCI_DEVS_H_ */

View File

@@ -31,6 +31,9 @@
#define TOLUD 0xbc /* Top of Low Used Memory */ #define TOLUD 0xbc /* Top of Low Used Memory */
#define MASK_TOLUD 0xFFF00000 #define MASK_TOLUD 0xFFF00000
#define CAPID0_A 0xe4
#define VTD_DISABLE (1 << 23)
/* SideBand B-UNIT */ /* SideBand B-UNIT */
#define B_UNIT 3 #define B_UNIT 3
@@ -57,6 +60,10 @@
#define MCH_BMISC_RESDRAM \ #define MCH_BMISC_RESDRAM \
0x01 /* Bit 0: 1 - reads targeting E-segment are routed to DRAM. */ 0x01 /* Bit 0: 1 - reads targeting E-segment are routed to DRAM. */
#define MCH_VTBAR_OFFSET 0x6c80
#define MCH_VTBAR_ENABLE_MASK 0x1
#define MCH_VTBAR_MASK 0x7ffffff000
#define MCH_BAR_BIOS_RESET_CPL 0x7078 #define MCH_BAR_BIOS_RESET_CPL 0x7078
#define RST_CPL_BIT (1 << 0) #define RST_CPL_BIT (1 << 0)
#define PCODE_INIT_DONE (1 << 8) #define PCODE_INIT_DONE (1 << 8)

View File

@@ -15,6 +15,7 @@
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/ramstage.h> #include <soc/ramstage.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <soc/acpi.h>
#define _1ms 1 #define _1ms 1
#define WAITING_STEP 100 #define WAITING_STEP 100
@@ -325,6 +326,9 @@ static struct device_operations systemagent_ops = {
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = systemagent_init, .init = systemagent_init,
.ops_pci = &soc_pci_ops, .ops_pci = &soc_pci_ops,
#if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = systemagent_write_acpi_tables,
#endif
}; };
/* IDs for System Agent device of Intel Denverton SoC */ /* IDs for System Agent device of Intel Denverton SoC */