Commit 51d113c3 authored by Jean-Philippe Brucker's avatar Jean-Philippe Brucker Committed by Will Deacon
Browse files

iommu/arm-smmu-v3: Make BTM optional for SVA 



When BTM isn't supported by the SMMU, send invalidations on the
command queue.

Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
Link: https://lore.kernel.org/r/20210122151054.2833521-3-jean-philippe@linaro.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent eba8d2f8

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c

+7 −3
Original line number Diff line number Diff line
@@ -182,9 +182,13 @@ static void arm_smmu_mm_invalidate_range(struct mmu_notifier *mn, 
					 unsigned long start, unsigned long end)

{

	struct arm_smmu_mmu_notifier *smmu_mn = mn_to_smmu(mn);

	struct arm_smmu_domain *smmu_domain = smmu_mn->domain;

	size_t size = end - start + 1;



	arm_smmu_atc_inv_domain(smmu_mn->domain, mm->pasid, start,

				end - start + 1);

	if (!(smmu_domain->smmu->features & ARM_SMMU_FEAT_BTM))

		arm_smmu_tlb_inv_range_asid(start, size, smmu_mn->cd->asid,

					    PAGE_SIZE, false, smmu_domain);

	arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, start, size);

}



static void arm_smmu_mm_release(struct mmu_notifier *mn, struct mm_struct *mm)
@@ -391,7 +395,7 @@ bool arm_smmu_sva_supported(struct arm_smmu_device *smmu) 
	unsigned long reg, fld;

	unsigned long oas;

	unsigned long asid_bits;

	u32 feat_mask = ARM_SMMU_FEAT_BTM | ARM_SMMU_FEAT_COHERENCY;

	u32 feat_mask = ARM_SMMU_FEAT_COHERENCY;



	if (vabits_actual == 52)

		feat_mask |= ARM_SMMU_FEAT_VAX;

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+15 −0
Original line number Diff line number Diff line
@@ -1743,6 +1743,21 @@ static void arm_smmu_tlb_inv_range_domain(unsigned long iova, size_t size, 
	arm_smmu_atc_inv_domain(smmu_domain, 0, iova, size);

}



void arm_smmu_tlb_inv_range_asid(unsigned long iova, size_t size, int asid,

				 size_t granule, bool leaf,

				 struct arm_smmu_domain *smmu_domain)

{

	struct arm_smmu_cmdq_ent cmd = {

		.opcode	= CMDQ_OP_TLBI_NH_VA,

		.tlbi = {

			.asid	= asid,

			.leaf	= leaf,

		},

	};



	__arm_smmu_tlb_inv_range(&cmd, iova, size, granule, smmu_domain);

}



static void arm_smmu_tlb_inv_page_nosync(struct iommu_iotlb_gather *gather,

					 unsigned long iova, size_t granule,

					 void *cookie)

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h

+3 −0
Original line number Diff line number Diff line
@@ -694,6 +694,9 @@ extern struct arm_smmu_ctx_desc quiet_cd; 
int arm_smmu_write_ctx_desc(struct arm_smmu_domain *smmu_domain, int ssid,

			    struct arm_smmu_ctx_desc *cd);

void arm_smmu_tlb_inv_asid(struct arm_smmu_device *smmu, u16 asid);

void arm_smmu_tlb_inv_range_asid(unsigned long iova, size_t size, int asid,

				 size_t granule, bool leaf,

				 struct arm_smmu_domain *smmu_domain);

bool arm_smmu_free_asid(struct arm_smmu_ctx_desc *cd);

int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, int ssid,

			    unsigned long iova, size_t size);