Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52101 )
Change subject: soc/intel/skylake: Drop unnecessary `ignore_vtd` option ......................................................................
soc/intel/skylake: Drop unnecessary `ignore_vtd` option
It is zero for all mainboards. If one really wanted to ignore VT-d support, a user-visible Kconfig option would be a better approach.
Change-Id: I320c10317f3fabee5443c16ebdf1ffd0e24193b8 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/protectli/vault_kbl/devicetree.cb M src/soc/intel/skylake/acpi.c M src/soc/intel/skylake/chip.c M src/soc/intel/skylake/chip.h M src/soc/intel/skylake/romstage/systemagent.c M src/soc/intel/skylake/systemagent.c 6 files changed, 3 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/52101/1
diff --git a/src/mainboard/protectli/vault_kbl/devicetree.cb b/src/mainboard/protectli/vault_kbl/devicetree.cb index abbfda4..dc73f91 100644 --- a/src/mainboard/protectli/vault_kbl/devicetree.cb +++ b/src/mainboard/protectli/vault_kbl/devicetree.cb @@ -22,9 +22,6 @@ # Disable DPTF register "dptf_enable" = "0"
- # Enable VT-d - register "ignore_vtd" = "0" - # Enable SERIRQ continuous register "serirq_mode" = "SERIRQ_CONTINUOUS"
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 0d89f29..3434aac 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -460,11 +460,10 @@ unsigned long current, struct acpi_rsdp *const rsdp) { - const struct soc_intel_skylake_config *const config = config_of(dev); acpi_dmar_t *const dmar = (acpi_dmar_t *)current;
/* Create DMAR table only if we have VT-d capability. */ - if (config->ignore_vtd || !soc_is_vtd_capable()) + if (!soc_is_vtd_capable()) return current;
printk(BIOS_DEBUG, "ACPI: * DMAR\n"); diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 0ae98a9..d4d8938 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -524,7 +524,7 @@ params->PchIoApicBdfValid = 0;
/* Enable VT-d and X2APIC */ - if (!config->ignore_vtd && soc_is_vtd_capable()) { + if (soc_is_vtd_capable()) { params->VtdBaseAddress[0] = GFXVT_BASE_ADDRESS; params->VtdBaseAddress[1] = VTVC0_BASE_ADDRESS; params->X2ApicOptOut = 0; diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 99eb8e6..1c8ca49 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -78,9 +78,6 @@ /* TCC activation offset */ uint32_t tcc_offset;
- /* Whether to ignore VT-d support of the SKU */ - int ignore_vtd; - /* * System Agent dynamic frequency configuration * When enabled memory will be trained at two different frequencies. diff --git a/src/soc/intel/skylake/romstage/systemagent.c b/src/soc/intel/skylake/romstage/systemagent.c index f22fd53..8996bce 100644 --- a/src/soc/intel/skylake/romstage/systemagent.c +++ b/src/soc/intel/skylake/romstage/systemagent.c @@ -13,11 +13,6 @@ static void systemagent_vtd_init(void) { const struct device *const igd_dev = pcidev_path_on_root(SA_DEVFN_IGD); - const struct soc_intel_skylake_config *config = NULL; - - config = config_of_soc(); - if (config->ignore_vtd) - return;
const bool vtd_capable = !(pci_read_config32(SA_DEV_ROOT, CAPID0_A) & VTD_DISABLE); diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c index 785a5e6..17dcb38 100644 --- a/src/soc/intel/skylake/systemagent.c +++ b/src/soc/intel/skylake/systemagent.c @@ -44,7 +44,7 @@ sa_add_fixed_mmio_resources(dev, index, soc_fixed_resources, ARRAY_SIZE(soc_fixed_resources));
- if (!config->ignore_vtd && soc_is_vtd_capable()) { + if (soc_is_vtd_capable()) { if (igd_dev && igd_dev->enabled) sa_add_fixed_mmio_resources(dev, index, &soc_gfxvt_mmio_descriptor, 1);