[PATCH v1 1/1] iommu/amd: set iommu for early mapped ioapic/hpet

[Su, Friendy]

From: Su Friendy <friendy.su@xxxxxxxxxxx>

The early mapped ioapic/hpet specified by kernel boot parameter
ivrs_ioapic[ID]/ivrs_hpet[ID] always override the ioapic/hpet with
same ID reported by ACPI IVRS table. Therefore, the early mapped
should be always controlled by iommu.

Current driver did not set iommu for the early mapped. This causes
ivrs_ioapic[ID]/ivrs_hpet[ID] actually are not controlled by iommu.
This patch fixes this problem by setting iommu for early mapped.

Signed-off-by: Su Friendy <friendy.su@xxxxxxxxxxx>
Signed-off-by: Saeki Shusuke <shusuke.saeki@xxxxxxxxxxx>
Signed-off-by: Tamori Masahiro <Masahiro.Tamori@xxxxxxxxxxx>
---
 drivers/iommu/amd_iommu_init.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 3783e0b..148ab61 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -747,7 +747,7 @@ static int __init add_special_device(u8 type, u8 id, u16 devid, bool cmd_line)
 	return 0;
 }
 
-static int __init add_early_maps(void)
+static int __init add_early_maps(struct amd_iommu *iommu)
 {
 	int i, ret;
 
@@ -758,6 +758,11 @@ static int __init add_early_maps(void)
 					 early_ioapic_map[i].cmd_line);
 		if (ret)
 			return ret;
+		/*
+		 * early mapped ioapci overrides ACPI IVRS,
+		 * they should be always controlled by iommu.
+		 */
+		set_iommu_for_device(iommu, early_ioapic_map[i].devid);
 	}
 
 	for (i = 0; i < early_hpet_map_size; ++i) {
@@ -767,6 +772,11 @@ static int __init add_early_maps(void)
 					 early_hpet_map[i].cmd_line);
 		if (ret)
 			return ret;
+		/*
+		 * early mapped hpet overrides ACPI IVRS,
+		 * they should be always controlled by iommu.
+		 */
+		set_iommu_for_device(iommu, early_hpet_map[i].devid);
 	}
 
 	return 0;
@@ -811,7 +821,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 	int ret;
 
 
-	ret = add_early_maps();
+	ret = add_early_maps(iommu);
 	if (ret)
 		return ret;
 
-- 
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/