From f204c082cfe0647f445cbf311fc629de0c08a48a Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 18 Nov 2019 13:04:45 -0800 Subject: [PATCH] iommu/arm-smmu: Remove DOMAIN_ATTR_BITMAP_IOVA_ALLOCATOR DOMAIN_ATTR_BITMAP_IOVA_ALLOCATOR is no longer supported, so remove it. Change-Id: I91473cb1a03d78cf2cbb82a7f13a4a531f3c7d5b Signed-off-by: Isaac J. Manjarres --- drivers/iommu/arm-smmu.c | 6 ------ include/linux/iommu.h | 7 +++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index aafac8dd63e3..ba22263290b0 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -3419,11 +3419,6 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, & (1ULL << DOMAIN_ATTR_EARLY_MAP)); ret = 0; break; - case DOMAIN_ATTR_BITMAP_IOVA_ALLOCATOR: - *((int *)data) = !!(smmu_domain->attributes - & (1ULL << DOMAIN_ATTR_BITMAP_IOVA_ALLOCATOR)); - ret = 0; - break; case DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT: if (!smmu_domain->smmu) { ret = -ENODEV; @@ -3651,7 +3646,6 @@ static int __arm_smmu_domain_set_attr2(struct iommu_domain *domain, } break; } - case DOMAIN_ATTR_BITMAP_IOVA_ALLOCATOR: case DOMAIN_ATTR_CB_STALL_DISABLE: case DOMAIN_ATTR_NO_CFRE: if (*((int *)data)) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 0d0f7db1ebe5..1e244b1a1395 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -176,10 +176,9 @@ enum iommu_attr { #define DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT (EXTENDED_ATTR_BASE + 14) #define DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT (EXTENDED_ATTR_BASE + 15) #define DOMAIN_ATTR_CB_STALL_DISABLE (EXTENDED_ATTR_BASE + 16) -#define DOMAIN_ATTR_BITMAP_IOVA_ALLOCATOR (EXTENDED_ATTR_BASE + 17) -#define DOMAIN_ATTR_USE_LLC_NWA (EXTENDED_ATTR_BASE + 18) -#define DOMAIN_ATTR_NO_CFRE (EXTENDED_ATTR_BASE + 19) -#define DOMAIN_ATTR_DEBUG (EXTENDED_ATTR_BASE + 20) +#define DOMAIN_ATTR_USE_LLC_NWA (EXTENDED_ATTR_BASE + 17) +#define DOMAIN_ATTR_NO_CFRE (EXTENDED_ATTR_BASE + 18) +#define DOMAIN_ATTR_DEBUG (EXTENDED_ATTR_BASE + 19) /* These are the possible reserved region types */ enum iommu_resv_type {