[coreboot-gerrit] Change in coreboot[master]: soc/intel/cannonlake: Fix DMAR when no iGPU is present

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43994 )

Change subject: soc/intel/cannonlake: Fix DMAR when no iGPU is present
......................................................................

soc/intel/cannonlake: Fix DMAR when no iGPU is present

Don't emit RMRR for the iGPU if it's not present. This is done on
other platforms as well.

Fixes an DMAR error seen in dmesg on platforms without iGPU.

Change-Id: Iafe86e6938a120b707aaae935cb8168f790bb22f
Signed-off-by: Patrick Rudolph 
---
M src/soc/intel/cannonlake/acpi.c
1 file changed, 7 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/43994/1

diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c
index 3f3ba10..3111989 100644
--- a/src/soc/intel/cannonlake/acpi.c
+++ b/src/soc/intel/cannonlake/acpi.c
@@ -293,6 +293,13 @@
    	current += acpi_create_dmar_ds_pci(current, 0, 2, 0);

acpi_dmar_drhd_fixup(tmp, current);
+
+		/* Add RMRR entry */
+		tmp = current;
+		current += acpi_create_dmar_rmrr(current, 0,
+			sa_get_gsm_base(), sa_get_tolud_base() - 1);
+		current += acpi_create_dmar_ds_pci(current, 0, 2, 0);
+		acpi_dmar_rmrr_fixup(tmp, current);
    }

struct device *const ipu_dev = pcidev_path_on_root(SA_DEVFN_IPU);
@@ -326,13 +333,6 @@
    	acpi_dmar_drhd_fixup(tmp, current);
    }

-	/* Add RMRR entry */
-	const unsigned long tmp = current;
-	current += acpi_create_dmar_rmrr(current, 0,
-		sa_get_gsm_base(), sa_get_tolud_base() - 1);
-	current += acpi_create_dmar_ds_pci(current, 0, 2, 0);
-	acpi_dmar_rmrr_fixup(tmp, current);
-
    return current;
 }