<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/28671">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Nico Huber: Looks good to me, approved
Philipp Deppenwiese: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fsp_broadwell_de: Move DMAR table generation to corresponding VT-d device<br><br>The DMAR table generation depends on the VT-d feature which is<br>implemented in its own PCI device located in PCI:00:05.0 for<br>Broadwell-DE. Add a new PCI driver for this device and move<br>DMAR table generation to this device driver.<br><br>Change-Id: I103257c73f5e745e996a441a2535b885270bc204<br>Signed-off-by: Werner Zeh <werner.zeh@siemens.com><br>Reviewed-on: https://review.coreboot.org/28671<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Nico Huber <nico.h@gmx.de><br>Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com><br>---<br>M src/soc/intel/fsp_broadwell_de/Makefile.inc<br>M src/soc/intel/fsp_broadwell_de/acpi.c<br>M src/soc/intel/fsp_broadwell_de/include/soc/acpi.h<br>M src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h<br>M src/soc/intel/fsp_broadwell_de/northcluster.c<br>A src/soc/intel/fsp_broadwell_de/vtd.c<br>6 files changed, 40 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/fsp_broadwell_de/Makefile.inc b/src/soc/intel/fsp_broadwell_de/Makefile.inc</span><br><span>index 386adc1..9312663 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/Makefile.inc</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/Makefile.inc</span><br><span>@@ -34,6 +34,7 @@</span><br><span> ramstage-y += iou_complto.c</span><br><span> ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c</span><br><span> ramstage-$(CONFIG_HAVE_SMI_HANDLER) += pmutil.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += vtd.c</span><br><span> smm-$(CONFIG_HAVE_SMI_HANDLER) += pmutil.c</span><br><span> smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c</span><br><span> smm-$(CONFIG_HAVE_SMI_HANDLER) += tsc_freq.c</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/acpi.c b/src/soc/intel/fsp_broadwell_de/acpi.c</span><br><span>index 5d65477..9c3cae0 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/acpi.c</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/acpi.c</span><br><span>@@ -4,7 +4,7 @@</span><br><span> * Copyright (C) 2007-2009 coresystems GmbH</span><br><span> * Copyright (C) 2013 Google Inc.</span><br><span> * Copyright (C) 2015-2016 Intel Corp.</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (C) 2016 Siemens AG</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2016-2018 Siemens AG</span><br><span> *</span><br><span> * This program is free software; you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU General Public License as published by</span><br><span>@@ -390,15 +390,14 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northcluster_write_acpi_tables(struct device *const dev,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long vtd_write_acpi_tables(struct device *const dev,</span><br><span> unsigned long current,</span><br><span> struct acpi_rsdp *const rsdp)</span><br><span> {</span><br><span> acpi_dmar_t *const dmar = (acpi_dmar_t *)current;</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *vtdev = dev_find_slot(0, PCI_DEVFN(5, 0));</span><br><span> </span><br><span> /* Create DMAR table only if virtualization is enabled */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(pci_read_config32(vtdev, 0x180) & 0x01))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(pci_read_config32(dev, VTBAR_OFFSET) & VTBAR_ENABLED))</span><br><span> return current;</span><br><span> </span><br><span> printk(BIOS_DEBUG, "ACPI: * DMAR\n");</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h b/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h</span><br><span>index da552cc..da30252 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h</span><br><span>@@ -3,7 +3,7 @@</span><br><span> *</span><br><span> * Copyright (C) 2013 Google, Inc.</span><br><span> * Copyright (C) 2015-2016 Intel Corp.</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (C) 2016 Siemens AG</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2016-2018 Siemens AG</span><br><span> *</span><br><span> * This program is free software; you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU General Public License as published by</span><br><span>@@ -24,8 +24,8 @@</span><br><span> void acpi_fill_in_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt);</span><br><span> unsigned long acpi_madt_irq_overrides(unsigned long current);</span><br><span> uint16_t get_pmbase(void);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northcluster_write_acpi_tables(struct device *const dev,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long current,</span><br><span style="color: hsl(0, 100%, 40%);">- struct acpi_rsdp *const rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long vtd_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> </span><br><span> #endif /* _SOC_ACPI_H_ */</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h b/src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h</span><br><span>index dc1ec19..50a4022 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h</span><br><span>@@ -20,6 +20,7 @@</span><br><span> </span><br><span> #define VTBAR_OFFSET 0x180</span><br><span> #define VTBAR_MASK 0xffffe000</span><br><span style="color: hsl(120, 100%, 40%);">+#define VTBAR_ENABLED 0x01</span><br><span> </span><br><span> #define SMM_FEATURE_CONTROL 0x58</span><br><span> #define SMM_CPU_SAVE_EN (1 << 1)</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/northcluster.c b/src/soc/intel/fsp_broadwell_de/northcluster.c</span><br><span>index 7090370..2e27d37 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/northcluster.c</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/northcluster.c</span><br><span>@@ -3,7 +3,7 @@</span><br><span> *</span><br><span> * Copyright (C) 2013 Google Inc.</span><br><span> * Copyright (C) 2015-2016 Intel Corp.</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (C) 2016 Siemens AG</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2016-2018 Siemens AG</span><br><span> *</span><br><span> * This program is free software; you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU General Public License as published by</span><br><span>@@ -137,7 +137,6 @@</span><br><span> static struct device_operations nc_ops = {</span><br><span> .read_resources = nc_read_resources,</span><br><span> .acpi_fill_ssdt_generator = generate_cpu_entries,</span><br><span style="color: hsl(0, 100%, 40%);">- .write_acpi_tables = northcluster_write_acpi_tables,</span><br><span> .set_resources = pci_dev_set_resources,</span><br><span> .enable_resources = pci_dev_enable_resources,</span><br><span> .init = NULL,</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/vtd.c b/src/soc/intel/fsp_broadwell_de/vtd.c</span><br><span>new file mode 100644</span><br><span>index 0000000..ad4a056</span><br><span>--- /dev/null</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/vtd.c</span><br><span>@@ -0,0 +1,30 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2018 Siemens AG</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</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%);">+#include <device/pci.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <device/pci_ids.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/pci_devs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/acpi.h></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%);">+static struct device_operations vtd_ops = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .write_acpi_tables = vtd_write_acpi_tables,</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%);">+static const struct pci_driver vtd_driver __pci_driver = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .ops = &vtd_ops,</span><br><span style="color: hsl(120, 100%, 40%);">+ .vendor = PCI_VENDOR_ID_INTEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .device = VTD_DEVID,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28671">change 28671</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/28671"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I103257c73f5e745e996a441a2535b885270bc204 </div>
<div style="display:none"> Gerrit-Change-Number: 28671 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Werner Zeh <werner.zeh@siemens.com> </div>
<div style="display:none"> Gerrit-Reviewer: Aaron Durbin <adurbin@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Mario Scheithauer <mario.scheithauer@siemens.com> </div>
<div style="display:none"> Gerrit-Reviewer: Nico Huber <nico.h@gmx.de> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph@9elements.com> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Werner Zeh <werner.zeh@siemens.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>