Commit 6948d4a7 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/arm-smmu: Remove ACPICA workarounds 



Now that the kernel headers have synced with the relevant upstream
ACPICA updates, it's time to clean up the temporary local definitions.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 2bd6bf03

drivers/iommu/arm-smmu-v3.c

+1 −10
Original line number Diff line number Diff line
@@ -413,15 +413,6 @@ 
#define MSI_IOVA_BASE			0x8000000

#define MSI_IOVA_LENGTH			0x100000



/* Until ACPICA headers cover IORT rev. C */

#ifndef ACPI_IORT_SMMU_HISILICON_HI161X

#define ACPI_IORT_SMMU_HISILICON_HI161X		0x1

#endif



#ifndef ACPI_IORT_SMMU_V3_CAVIUM_CN99XX

#define ACPI_IORT_SMMU_V3_CAVIUM_CN99XX		0x2

#endif



static bool disable_bypass;

module_param_named(disable_bypass, disable_bypass, bool, S_IRUGO);

MODULE_PARM_DESC(disable_bypass,
@@ -2665,7 +2656,7 @@ static void acpi_smmu_get_options(u32 model, struct arm_smmu_device *smmu) 
	case ACPI_IORT_SMMU_V3_CAVIUM_CN99XX:

		smmu->options |= ARM_SMMU_OPT_PAGE0_REGS_ONLY;

		break;

	case ACPI_IORT_SMMU_HISILICON_HI161X:

	case ACPI_IORT_SMMU_V3_HISILICON_HI161X:

		smmu->options |= ARM_SMMU_OPT_SKIP_PREFETCH;

		break;

	}

drivers/iommu/arm-smmu.c

+0 −8
Original line number Diff line number Diff line
@@ -119,14 +119,6 @@ enum arm_smmu_implementation { 
	CAVIUM_SMMUV2,

};



/* Until ACPICA headers cover IORT rev. C */

#ifndef ACPI_IORT_SMMU_CORELINK_MMU401

#define ACPI_IORT_SMMU_CORELINK_MMU401	0x4

#endif

#ifndef ACPI_IORT_SMMU_CAVIUM_THUNDERX

#define ACPI_IORT_SMMU_CAVIUM_THUNDERX	0x5

#endif



struct arm_smmu_s2cr {

	struct iommu_group		*group;

	int				count;