[coreboot-gerrit] Change in ...coreboot[master]: intel/apollolake: Add fixed resources for VTd to system resources

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30991 )

Change subject: intel/apollolake: Add fixed resources for VTd to system resources
......................................................................

intel/apollolake: Add fixed resources for VTd to system resources

If the VTd feature is enabled, there will be up to two fixed resources
which are set up by the FSP. Add these resources to the list of system
resources so that the PCI enumerator will know them.

Change-Id: If96fc1c93746e3c7f510e5b3095ea3090e1b8807
Signed-off-by: Werner Zeh 
Reviewed-on: https://review.coreboot.org/c/30991
Reviewed-by: Nico Huber 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/apollolake/systemagent.c
1 file changed, 20 insertions(+), 0 deletions(-)

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

diff --git a/src/soc/intel/apollolake/systemagent.c b/src/soc/intel/apollolake/systemagent.c
index c8f1330..fd91082 100644
--- a/src/soc/intel/apollolake/systemagent.c
+++ b/src/soc/intel/apollolake/systemagent.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015 Intel Corp.
  * (Written by Andrey Petrov  for Intel Corp.)
  * (Written by Alexandru Gagniuc  for Intel Corp.)
+ * Copyright (C) 2019 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
@@ -19,6 +20,7 @@
 #include <cpu/cpu.h>
 #include <console/console.h>
 #include <device/device.h>
+#include <device/pci_ops.h>
 #include <fsp/util.h>
 #include <intelblocks/systemagent.h>
 #include <soc/iomap.h>
@@ -40,6 +42,24 @@

sa_add_fixed_mmio_resources(dev, index, soc_fixed_resources,
    		ARRAY_SIZE(soc_fixed_resources));
+
+	/* Add VTd resources if VTd is enabled. These resources were
+	   set up by the FSP-S call. */
+	if ((pci_read_config32(dev, CAPID0_A) & VTD_DISABLE))
+		return;
+
+	if (MCHBAR32(GFXVTBAR) & VTBAR_ENABLED) {
+		mmio_resource(dev, *index,
+			      (MCHBAR64(GFXVTBAR) & VTBAR_MASK) / KiB,
+			      VTBAR_SIZE / KiB);
+		(*index)++;
+	}
+	if (MCHBAR32(DEFVTBAR) & VTBAR_ENABLED) {
+		mmio_resource(dev, *index,
+			      (MCHBAR64(DEFVTBAR) & VTBAR_MASK) / KiB,
+			      VTBAR_SIZE / KiB);
+		(*index)++;
+	}
 }

int soc_get_uncore_prmmr_base_and_mask(uint64_t *prmrr_base,