<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27269">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">arch/x86/acpi: Add DMAR RMRR helper functions<br><br>Add DMAR RMRR table entry and helper functions, using the existing<br>DRHD functions as a model. As the DRHD device scope (DS) functions<br>aren't DRHD-specific, genericize them to be used with RMRR tables as<br>well. Correct DRHD bar size to match table entry in creator function,<br>as noted in comments from patchset below.<br><br>Adapted from https://review.coreboot.org/25445<br><br>Change-Id: I912b1d7244ca4dd911bb6629533d453b1b4a06be<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/arch/x86/acpi.c<br>M src/arch/x86/include/arch/acpi.h<br>M src/northbridge/intel/haswell/acpi.c<br>M src/northbridge/intel/sandybridge/acpi.c<br>M src/soc/intel/broadwell/acpi.c<br>M src/soc/intel/skylake/acpi.c<br>6 files changed, 60 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/27269/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c</span><br><span>index 8b6b2c1..60d2879 100644</span><br><span>--- a/src/arch/x86/acpi.c</span><br><span>+++ b/src/arch/x86/acpi.c</span><br><span>@@ -449,7 +449,7 @@</span><br><span> }</span><br><span> </span><br><span> unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags,</span><br><span style="color: hsl(0, 100%, 40%);">- u16 segment, u32 bar)</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 segment, u64 bar)</span><br><span> {</span><br><span> dmar_entry_t *drhd = (dmar_entry_t *)current;</span><br><span> memset(drhd, 0, sizeof(*drhd));</span><br><span>@@ -462,6 +462,20 @@</span><br><span> return drhd->length;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_rmrr(unsigned long current, u16 segment,</span><br><span style="color: hsl(120, 100%, 40%);">+ u64 bar, u64 limit)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ dmar_rmrr_entry_t *rmrr = (dmar_rmrr_entry_t *)current;</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(rmrr, 0, sizeof(*rmrr));</span><br><span style="color: hsl(120, 100%, 40%);">+ rmrr->type = DMAR_RMRR;</span><br><span style="color: hsl(120, 100%, 40%);">+ rmrr->length = sizeof(*rmrr); /* will be fixed up later */</span><br><span style="color: hsl(120, 100%, 40%);">+ rmrr->segment = segment;</span><br><span style="color: hsl(120, 100%, 40%);">+ rmrr->bar = bar;</span><br><span style="color: hsl(120, 100%, 40%);">+ rmrr->limit = limit;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rmrr->length;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> unsigned long acpi_create_dmar_atsr(unsigned long current, u8 flags,</span><br><span> u16 segment)</span><br><span> {</span><br><span>@@ -481,13 +495,19 @@</span><br><span> drhd->length = current - base;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void acpi_dmar_rmrr_fixup(unsigned long base, unsigned long current)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ dmar_rmrr_entry_t *rmrr = (dmar_rmrr_entry_t *)base;</span><br><span style="color: hsl(120, 100%, 40%);">+ rmrr->length = current - base;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void acpi_dmar_atsr_fixup(unsigned long base, unsigned long current)</span><br><span> {</span><br><span> dmar_atsr_entry_t *atsr = (dmar_atsr_entry_t *)base;</span><br><span> atsr->length = current - base;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned long acpi_create_dmar_drhd_ds(unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long acpi_create_dmar_ds(unsigned long current,</span><br><span> enum dev_scope_type type, u8 enumeration_id, u8 bus, u8 dev, u8 fn)</span><br><span> {</span><br><span> /* we don't support longer paths yet */</span><br><span>@@ -505,31 +525,31 @@</span><br><span> return ds->length;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_pci_br(unsigned long current, u8 bus,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_pci_br(unsigned long current, u8 bus,</span><br><span> u8 dev, u8 fn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return acpi_create_dmar_drhd_ds(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ return acpi_create_dmar_ds(current,</span><br><span> SCOPE_PCI_SUB, 0, bus, dev, fn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current, u8 bus,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_pci(unsigned long current, u8 bus,</span><br><span> u8 dev, u8 fn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return acpi_create_dmar_drhd_ds(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ return acpi_create_dmar_ds(current,</span><br><span> SCOPE_PCI_ENDPOINT, 0, bus, dev, fn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_ioapic(unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_ioapic(unsigned long current,</span><br><span> u8 enumeration_id, u8 bus, u8 dev, u8 fn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return acpi_create_dmar_drhd_ds(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ return acpi_create_dmar_ds(current,</span><br><span> SCOPE_IOAPIC, enumeration_id, bus, dev, fn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_msi_hpet(unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_msi_hpet(unsigned long current,</span><br><span> u8 enumeration_id, u8 bus, u8 dev, u8 fn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return acpi_create_dmar_drhd_ds(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ return acpi_create_dmar_ds(current,</span><br><span> SCOPE_MSI_HPET, enumeration_id, bus, dev, fn);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h</span><br><span>index f5e2e81..1811965 100644</span><br><span>--- a/src/arch/x86/include/arch/acpi.h</span><br><span>+++ b/src/arch/x86/include/arch/acpi.h</span><br><span>@@ -331,6 +331,15 @@</span><br><span> u64 bar;</span><br><span> } __packed dmar_entry_t;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+typedef struct dmar_rmrr_entry {</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 type;</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 length;</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 reserved;</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 segment;</span><br><span style="color: hsl(120, 100%, 40%);">+ u64 bar;</span><br><span style="color: hsl(120, 100%, 40%);">+ u64 limit;</span><br><span style="color: hsl(120, 100%, 40%);">+} __packed dmar_rmrr_entry_t;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> typedef struct dmar_atsr_entry {</span><br><span> u16 type;</span><br><span> u16 length;</span><br><span>@@ -738,19 +747,22 @@</span><br><span> void acpi_create_dmar(acpi_dmar_t *dmar, enum dmar_flags flags,</span><br><span> unsigned long (*acpi_fill_dmar)(unsigned long));</span><br><span> unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags,</span><br><span style="color: hsl(0, 100%, 40%);">- u16 segment, u32 bar);</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 segment, u64 bar);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_rmrr(unsigned long current, u16 segment,</span><br><span style="color: hsl(120, 100%, 40%);">+ u64 bar, u64 limit);</span><br><span> unsigned long acpi_create_dmar_atsr(unsigned long current, u8 flags,</span><br><span> u16 segment);</span><br><span> void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current);</span><br><span style="color: hsl(120, 100%, 40%);">+void acpi_dmar_rmrr_fixup(unsigned long base, unsigned long current);</span><br><span> void acpi_dmar_atsr_fixup(unsigned long base, unsigned long current);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_pci_br(unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_pci_br(unsigned long current,</span><br><span> u8 bus, u8 dev, u8 fn);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_pci(unsigned long current,</span><br><span> u8 bus, u8 dev, u8 fn);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_ioapic(unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_ioapic(unsigned long current,</span><br><span> u8 enumeration_id,</span><br><span> u8 bus, u8 dev, u8 fn);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_create_dmar_drhd_ds_msi_hpet(unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_create_dmar_ds_msi_hpet(unsigned long current,</span><br><span> u8 enumeration_id,</span><br><span> u8 bus, u8 dev, u8 fn);</span><br><span> void acpi_write_hest(acpi_hest_t *hest,</span><br><span>diff --git a/src/northbridge/intel/haswell/acpi.c b/src/northbridge/intel/haswell/acpi.c</span><br><span>index 292219f..b3ceed9 100644</span><br><span>--- a/src/northbridge/intel/haswell/acpi.c</span><br><span>+++ b/src/northbridge/intel/haswell/acpi.c</span><br><span>@@ -85,7 +85,7 @@</span><br><span> const unsigned long tmp = current;</span><br><span> </span><br><span> current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_pci(current, 0, 2, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_pci(current, 0, 2, 0);</span><br><span> </span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span> }</span><br><span>@@ -95,11 +95,11 @@</span><br><span> const unsigned long tmp = current;</span><br><span> current += acpi_create_dmar_drhd(current,</span><br><span> DRHD_INCLUDE_PCI_ALL, 0, vtvc0bar);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_ioapic(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_ioapic(current,</span><br><span> 2, PCH_IOAPIC_PCI_BUS, PCH_IOAPIC_PCI_SLOT, 0);</span><br><span> size_t i;</span><br><span> for (i = 0; i < 8; ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_msi_hpet(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_msi_hpet(current,</span><br><span> 0, PCH_HPET_PCI_BUS,</span><br><span> PCH_HPET_PCI_SLOT, i);</span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span>diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c</span><br><span>index 91ecac5..88ac2b1 100644</span><br><span>--- a/src/northbridge/intel/sandybridge/acpi.c</span><br><span>+++ b/src/northbridge/intel/sandybridge/acpi.c</span><br><span>@@ -74,19 +74,19 @@</span><br><span> if (igfx && igfx->enabled) {</span><br><span> const unsigned long tmp = current;</span><br><span> current += acpi_create_dmar_drhd(current, 0, 0, IOMMU_BASE1);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_pci(current, 0, 2, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_pci(current, 0, 2, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_pci(current, 0, 2, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_pci(current, 0, 2, 1);</span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span> }</span><br><span> </span><br><span> const unsigned long tmp = current;</span><br><span> current += acpi_create_dmar_drhd(current,</span><br><span> DRHD_INCLUDE_PCI_ALL, 0, IOMMU_BASE2);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_ioapic(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_ioapic(current,</span><br><span> 2, PCH_IOAPIC_PCI_BUS, PCH_IOAPIC_PCI_SLOT, 0);</span><br><span> size_t i;</span><br><span> for (i = 0; i < 8; ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_msi_hpet(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_msi_hpet(current,</span><br><span> 0, PCH_HPET_PCI_BUS, PCH_HPET_PCI_SLOT, i);</span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span> </span><br><span>diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c</span><br><span>index 36d3e58..af8e012 100644</span><br><span>--- a/src/soc/intel/broadwell/acpi.c</span><br><span>+++ b/src/soc/intel/broadwell/acpi.c</span><br><span>@@ -586,7 +586,7 @@</span><br><span> const unsigned long tmp = current;</span><br><span> </span><br><span> current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_pci(current, 0, 2, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_pci(current, 0, 2, 0);</span><br><span> </span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span> }</span><br><span>@@ -596,11 +596,11 @@</span><br><span> const unsigned long tmp = current;</span><br><span> current += acpi_create_dmar_drhd(current,</span><br><span> DRHD_INCLUDE_PCI_ALL, 0, vtvc0bar);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_ioapic(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_ioapic(current,</span><br><span> 2, PCH_IOAPIC_PCI_BUS, PCH_IOAPIC_PCI_SLOT, 0);</span><br><span> size_t i;</span><br><span> for (i = 0; i < 8; ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_msi_hpet(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_msi_hpet(current,</span><br><span> 0, PCH_HPET_PCI_BUS,</span><br><span> PCH_HPET_PCI_SLOT, i);</span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span>diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c</span><br><span>index 2c3df09..4ad4831 100644</span><br><span>--- a/src/soc/intel/skylake/acpi.c</span><br><span>+++ b/src/soc/intel/skylake/acpi.c</span><br><span>@@ -557,7 +557,7 @@</span><br><span> const unsigned long tmp = current;</span><br><span> </span><br><span> current += acpi_create_dmar_drhd(current, 0, 0, gfx_vtbar);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_pci(current, 0, 2, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_pci(current, 0, 2, 0);</span><br><span> </span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span> }</span><br><span>@@ -582,9 +582,9 @@</span><br><span> </span><br><span> current += acpi_create_dmar_drhd(current,</span><br><span> DRHD_INCLUDE_PCI_ALL, 0, vtvc0bar);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_ioapic(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_ioapic(current,</span><br><span> 2, ibdf >> 8, PCI_SLOT(ibdf), PCI_FUNC(ibdf));</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_dmar_drhd_ds_msi_hpet(current,</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_dmar_ds_msi_hpet(current,</span><br><span> 0, hbdf >> 8, PCI_SLOT(hbdf), PCI_FUNC(hbdf));</span><br><span> </span><br><span> acpi_dmar_drhd_fixup(tmp, current);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27269">change 27269</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/27269"/><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: I912b1d7244ca4dd911bb6629533d453b1b4a06be </div>
<div style="display:none"> Gerrit-Change-Number: 27269 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>