From 50f2e4ccec9df213e012c7ecddb0a9c644526c8d Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 29 Oct 2018 11:16:53 -0600 Subject: soc/amd/stoneyridge: Set IOMMU support to follow device setting Instead of forcing the IOMMU to be enabled, change it to only be enabled if the device is enabled in devicetree. BUG=b:118612241 TEST=Verify that IOMMU is disabled. Change-Id: I6cfd6c81f47de23c54a49ec7cf87b219215ced5e Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/29343 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel Reviewed-by: Daniel Kurtz --- src/soc/amd/stoneyridge/northbridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/soc/amd/stoneyridge') diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 5fb28c028c..3a0c77d6b6 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -506,7 +506,8 @@ __weak void set_board_env_params(GNB_ENV_CONFIGURATION *params) { } void SetNbEnvParams(GNB_ENV_CONFIGURATION *params) { - params->IommuSupport = TRUE; + const struct device *dev = SOC_IOMMU_DEV; + params->IommuSupport = dev && dev->enabled; set_board_env_params(params); } -- cgit v1.2.3