Change in coreboot[master]: fsp_broadwell_de: Move DMAR table generation to corresponding VT-d de...

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/28671 )

Change subject: fsp_broadwell_de: Move DMAR table generation to corresponding VT-d device
......................................................................

fsp_broadwell_de: Move DMAR table generation to corresponding VT-d device

The DMAR table generation depends on the VT-d feature which is
implemented in its own PCI device located in PCI:00:05.0 for
Broadwell-DE. Add a new PCI driver for this device and move
DMAR table generation to this device driver.

Change-Id: I103257c73f5e745e996a441a2535b885270bc204
Signed-off-by: Werner Zeh 
Reviewed-on: https://review.coreboot.org/28671
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
Reviewed-by: Philipp Deppenwiese 
---
M src/soc/intel/fsp_broadwell_de/Makefile.inc
M src/soc/intel/fsp_broadwell_de/acpi.c
M src/soc/intel/fsp_broadwell_de/include/soc/acpi.h
M src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h
M src/soc/intel/fsp_broadwell_de/northcluster.c
A src/soc/intel/fsp_broadwell_de/vtd.c
6 files changed, 40 insertions(+), 10 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Philipp Deppenwiese: Looks good to me, approved

diff --git a/src/soc/intel/fsp_broadwell_de/Makefile.inc b/src/soc/intel/fsp_broadwell_de/Makefile.inc
index 386adc1..9312663 100644
--- a/src/soc/intel/fsp_broadwell_de/Makefile.inc
+++ b/src/soc/intel/fsp_broadwell_de/Makefile.inc
@@ -34,6 +34,7 @@
 ramstage-y += iou_complto.c
 ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c
 ramstage-$(CONFIG_HAVE_SMI_HANDLER) += pmutil.c
+ramstage-y += vtd.c
 smm-$(CONFIG_HAVE_SMI_HANDLER) += pmutil.c
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 smm-$(CONFIG_HAVE_SMI_HANDLER) += tsc_freq.c
diff --git a/src/soc/intel/fsp_broadwell_de/acpi.c b/src/soc/intel/fsp_broadwell_de/acpi.c
index 5d65477..9c3cae0 100644
--- a/src/soc/intel/fsp_broadwell_de/acpi.c
+++ b/src/soc/intel/fsp_broadwell_de/acpi.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007-2009 coresystems GmbH
  * Copyright (C) 2013 Google Inc.
  * Copyright (C) 2015-2016 Intel Corp.
- * Copyright (C) 2016 Siemens AG
+ * Copyright (C) 2016-2018 Siemens AG
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -390,15 +390,14 @@
    return current;
 }

-unsigned long northcluster_write_acpi_tables(struct device *const dev,
+unsigned long vtd_write_acpi_tables(struct device *const dev,
    				     unsigned long current,
    				     struct acpi_rsdp *const rsdp)
 {
    acpi_dmar_t *const dmar = (acpi_dmar_t *)current;
-	struct device *vtdev = dev_find_slot(0, PCI_DEVFN(5, 0));

/* Create DMAR table only if virtualization is enabled */
-	if (!(pci_read_config32(vtdev, 0x180) & 0x01))
+	if (!(pci_read_config32(dev, VTBAR_OFFSET) & VTBAR_ENABLED))
    	return current;

printk(BIOS_DEBUG, "ACPI:    * DMAR\n");
diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h b/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h
index da552cc..da30252 100644
--- a/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h
+++ b/src/soc/intel/fsp_broadwell_de/include/soc/acpi.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2013 Google, Inc.
  * Copyright (C) 2015-2016 Intel Corp.
- * Copyright (C) 2016 Siemens AG
+ * Copyright (C) 2016-2018 Siemens AG
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 void acpi_fill_in_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);
 uint16_t get_pmbase(void);
-unsigned long northcluster_write_acpi_tables(struct device *const dev,
-					     unsigned long current,
-					     struct acpi_rsdp *const rsdp);
+unsigned long vtd_write_acpi_tables(struct device *const dev,
+				    unsigned long current,
+				    struct acpi_rsdp *const rsdp);

#endif /* _SOC_ACPI_H_ */
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
index dc1ec19..50a4022 100644
--- a/src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h
+++ b/src/soc/intel/fsp_broadwell_de/include/soc/broadwell_de.h
@@ -20,6 +20,7 @@

#define VTBAR_OFFSET		0x180
 #define VTBAR_MASK		0xffffe000
+#define VTBAR_ENABLED		0x01

#define SMM_FEATURE_CONTROL	0x58
 #define  SMM_CPU_SAVE_EN	(1 << 1)
diff --git a/src/soc/intel/fsp_broadwell_de/northcluster.c b/src/soc/intel/fsp_broadwell_de/northcluster.c
index 7090370..2e27d37 100644
--- a/src/soc/intel/fsp_broadwell_de/northcluster.c
+++ b/src/soc/intel/fsp_broadwell_de/northcluster.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2013 Google Inc.
  * Copyright (C) 2015-2016 Intel Corp.
- * Copyright (C) 2016 Siemens AG
+ * Copyright (C) 2016-2018 Siemens AG
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -137,7 +137,6 @@
 static struct device_operations nc_ops = {
    .read_resources           = nc_read_resources,
    .acpi_fill_ssdt_generator = generate_cpu_entries,
-	.write_acpi_tables        = northcluster_write_acpi_tables,
    .set_resources            = pci_dev_set_resources,
    .enable_resources         = pci_dev_enable_resources,
    .init                     = NULL,
diff --git a/src/soc/intel/fsp_broadwell_de/vtd.c b/src/soc/intel/fsp_broadwell_de/vtd.c
new file mode 100644
index 0000000..ad4a056
--- /dev/null
+++ b/src/soc/intel/fsp_broadwell_de/vtd.c
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <soc/pci_devs.h>
+#include <soc/acpi.h>
+
+
+static struct device_operations vtd_ops = {
+	.write_acpi_tables        = vtd_write_acpi_tables,
+};
+
+static const struct pci_driver vtd_driver __pci_driver = {
+	.ops    = &vtd_ops,
+	.vendor = PCI_VENDOR_ID_INTEL,
+	.device = VTD_DEVID,
+};