commit 66c8062a0072e9b162bf132fc5f279db158ab708
author Sean Rhodes <sean@starlabs.systems> Tue Jul 13 07:23:22 2021 +0100
committer Felix Held <felix-coreboot@felixheld.de> Mon Oct 18 12:32:43 2021 +0000
tree 31461bf5d1e53442f192118d6ace3fac6034f1e1
parent bc89bc6680c186c3a7969e93f48b90bc6d6e9eb6

soc/skylake: Make VT-d controllable from CMOS option

Make VT-d enable or disable based on CMOS value "vtd"
1 = Enable
0 = Disable

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I1aea14968e08ee6af822bd259ca1d462f8926994
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56252
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>

src/soc/intel/skylake/acpi.c

diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index cac7253..9bbfec3 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -245,7 +245,7 @@
 	acpi_dmar_t *const dmar = (acpi_dmar_t *)current;
 
 	/* Create DMAR table only if we have VT-d capability. */
-	if (!soc_is_vtd_capable())
+	if (!soc_vtd_enabled())
 		return current;
 
 	printk(BIOS_DEBUG, "ACPI:    * DMAR\n");

src/soc/intel/skylake/chip.c

diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index dd42f31..a048699 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -509,7 +509,7 @@
 	params->PchIoApicBdfValid = 0;
 
 	/* Enable VT-d and X2APIC */
-	if (soc_is_vtd_capable()) {
+	if (soc_vtd_enabled()) {
 		params->VtdBaseAddress[0] = GFXVT_BASE_ADDRESS;
 		params->VtdBaseAddress[1] = VTVC0_BASE_ADDRESS;
 		params->X2ApicOptOut = 0;

src/soc/intel/skylake/include/soc/systemagent.h

diff --git a/src/soc/intel/skylake/include/soc/systemagent.h b/src/soc/intel/skylake/include/soc/systemagent.h
index da9ba55..9d91776 100644
--- a/src/soc/intel/skylake/include/soc/systemagent.h
+++ b/src/soc/intel/skylake/include/soc/systemagent.h
@@ -31,7 +31,7 @@
 #define MCH_DDR_POWER_LIMIT_LO	0x58e0
 #define MCH_DDR_POWER_LIMIT_HI	0x58e4
 
-bool soc_is_vtd_capable(void);
+bool soc_vtd_enabled(void);
 
 static const struct sa_mmio_descriptor soc_gfxvt_mmio_descriptor = {
 	GFXVTBAR,

src/soc/intel/skylake/systemagent.c

diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c
index 2b29767..f112087 100644
--- a/src/soc/intel/skylake/systemagent.c
+++ b/src/soc/intel/skylake/systemagent.c
@@ -6,15 +6,20 @@
 #include <device/pci_ops.h>
 #include <intelblocks/power_limit.h>
 #include <intelblocks/systemagent.h>
+#include <option.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/msr.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
+#include <types.h>
 #include "chip.h"
 
-bool soc_is_vtd_capable(void)
+bool soc_vtd_enabled(void)
 {
+	const unsigned int vtd = get_uint_option("vtd", 1);
+	if (!vtd)
+		return false;
 	struct device *const root_dev = pcidev_path_on_root(SA_DEVFN_ROOT);
 	return root_dev &&
 		!(pci_read_config32(root_dev, CAPID0_A) & VTD_DISABLE);
@@ -41,7 +46,7 @@
 	sa_add_fixed_mmio_resources(dev, index, soc_fixed_resources,
 			ARRAY_SIZE(soc_fixed_resources));
 
-	if (soc_is_vtd_capable()) {
+	if (soc_vtd_enabled()) {
 		if (is_devfn_enabled(SA_DEVFN_IGD))
 			sa_add_fixed_mmio_resources(dev, index,
 					&soc_gfxvt_mmio_descriptor, 1);