<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23821">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/broadwell: Generate ACPI DMAR table<br><br>If the SoC is VT-d capable, write an ACPI DMAR table. The entry for the<br>GFXVTBAR is only generated if the IGD is enabled.<br><br>Change-Id: Id7c899954f1bae9d2b48532ca5ee271944f0c5f6<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/soc/intel/broadwell/acpi.c<br>M src/soc/intel/broadwell/chip.c<br>M src/soc/intel/broadwell/include/soc/acpi.h<br>3 files changed, 57 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/23821/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c</span><br><span>index a23c8e2..6f89e43 100644</span><br><span>--- a/src/soc/intel/broadwell/acpi.c</span><br><span>+++ b/src/soc/intel/broadwell/acpi.c</span><br><span>@@ -37,6 +37,7 @@</span><br><span> #include <soc/msr.h></span><br><span> #include <soc/pci_devs.h></span><br><span> #include <soc/pm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/systemagent.h></span><br><span> #include <soc/intel/broadwell/chip.h></span><br><span> </span><br><span> /*</span><br><span>@@ -571,6 +572,56 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long acpi_fill_dmar(unsigned long current)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *const igfx_dev = dev_find_slot(0, SA_DEVFN_IGD);</span><br><span style="color: hsl(120, 100%, 40%);">+ const u32 gfx_vtbar = MCHBAR32(GFXVTBAR) & ~0xfff;</span><br><span style="color: hsl(120, 100%, 40%);">+ const u32 vtvc0bar = MCHBAR32(VTVC0BAR) & ~0xfff;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* iGFX has to be enabled, GFXVTBAR set and in 32-bit space. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (igfx_dev && igfx_dev->enabled &&</span><br><span style="color: hsl(120, 100%, 40%);">+ gfx_vtbar && !MCHBAR32(GFXVTBAR + 4)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned long tmp = current;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_drhd(current, 0, 0, gfx_vtbar);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_drhd_ds_pci(current, 0, 2, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_dmar_drhd_fixup(tmp, current);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned long tmp = current;</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_drhd(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ DRHD_INCLUDE_PCI_ALL, 0, vtvc0bar);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_drhd_ds_ioapic(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ 2, PCH_IOAPIC_PCI_BUS, PCH_IOAPIC_PCI_SLOT, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t i;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 8; ++i)</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_drhd_ds_msi_hpet(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, PCH_HPET_PCI_BUS, PCH_HPET_PCI_SLOT, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_dmar_drhd_fixup(tmp, current);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return current;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *const dev,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct acpi_rsdp *const rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Create DMAR table only if we have VT-d capability. */</span><br><span style="color: hsl(120, 100%, 40%);">+ const u32 capid0_a = pci_read_config32(dev, CAPID0_A);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (capid0_a & VTD_DISABLE)</span><br><span style="color: hsl(120, 100%, 40%);">+ return current;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_dmar_t *const dmar = (acpi_dmar_t *)current;</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "ACPI: * DMAR\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_create_dmar(dmar, DMAR_INTR_REMAP, acpi_fill_dmar);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += dmar->header.length;</span><br><span style="color: hsl(120, 100%, 40%);">+ current = acpi_align_current(current);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_add_table(rsdp, dmar);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return current;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> unsigned long acpi_madt_irq_overrides(unsigned long current)</span><br><span> {</span><br><span> int sci = acpi_sci_irq();</span><br><span>diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c</span><br><span>index 8176c8e..a0ffd5a 100644</span><br><span>--- a/src/soc/intel/broadwell/chip.c</span><br><span>+++ b/src/soc/intel/broadwell/chip.c</span><br><span>@@ -16,6 +16,7 @@</span><br><span> #include <console/console.h></span><br><span> #include <device/device.h></span><br><span> #include <device/pci.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/acpi.h></span><br><span> #include <soc/pci_devs.h></span><br><span> #include <soc/ramstage.h></span><br><span> #include <soc/intel/broadwell/chip.h></span><br><span>@@ -30,6 +31,9 @@</span><br><span> .set_resources = &pci_domain_set_resources,</span><br><span> .scan_bus = &pci_domain_scan_bus,</span><br><span> .ops_pci_bus = &pci_bus_default_ops,</span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span style="color: hsl(120, 100%, 40%);">+ .write_acpi_tables = &northbridge_write_acpi_tables,</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> };</span><br><span> </span><br><span> static struct device_operations cpu_bus_ops = {</span><br><span>diff --git a/src/soc/intel/broadwell/include/soc/acpi.h b/src/soc/intel/broadwell/include/soc/acpi.h</span><br><span>index f766dc9..24fe3ae 100644</span><br><span>--- a/src/soc/intel/broadwell/include/soc/acpi.h</span><br><span>+++ b/src/soc/intel/broadwell/include/soc/acpi.h</span><br><span>@@ -29,5 +29,6 @@</span><br><span> void acpi_fill_in_fadt(acpi_fadt_t *fadt);</span><br><span> unsigned long acpi_madt_irq_overrides(unsigned long current);</span><br><span> void acpi_init_gnvs(global_nvs_t *gnvs);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *dev,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned long current, struct acpi_rsdp *rsdp);</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23821">change 23821</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23821"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id7c899954f1bae9d2b48532ca5ee271944f0c5f6 </div>
<div style="display:none"> Gerrit-Change-Number: 23821 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>