Commit 91d69885 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge tag 'arm-smmu-updates' of... 

Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu

Arm SMMU updates for 5.17

- Revert evtq and priq back to their former sizes

- Return early on short-descriptor page-table allocation failure

- Fix page fault reporting for Adreno GPU on SMMUv2

- Make SMMUv3 MMU notifier ops 'const'

- Numerous new compatible strings for Qualcomm SMMUv2 implementations
parents 0fcfb00b 47743669

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+2 −0
Original line number Diff line number Diff line
@@ -38,10 +38,12 @@ properties: 
              - qcom,sc7280-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sdm845-smmu-500

              - qcom,sdx55-smmu-500

              - qcom,sm6350-smmu-500

              - qcom,sm8150-smmu-500

              - qcom,sm8250-smmu-500

              - qcom,sm8350-smmu-500

              - qcom,sm8450-smmu-500

          - const: arm,mmu-500

      - description: Qcom Adreno GPUs implementing "arm,smmu-v2"

        items:

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

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void arm_smmu_mmu_notifier_free(struct mmu_notifier *mn) 
	kfree(mn_to_smmu(mn));

}



static struct mmu_notifier_ops arm_smmu_mmu_notifier_ops = {

static const struct mmu_notifier_ops arm_smmu_mmu_notifier_ops = {

	.invalidate_range	= arm_smmu_mm_invalidate_range,

	.release		= arm_smmu_mm_release,

	.free_notifier		= arm_smmu_mmu_notifier_free,

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

+2 −3
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ 
#else

#define Q_MAX_SZ_SHIFT			(PAGE_SHIFT + MAX_ORDER - 1)

#endif

#define Q_MIN_SZ_SHIFT			(PAGE_SHIFT)



/*

 * Stream table.
@@ -374,7 +373,7 @@ 
/* Event queue */

#define EVTQ_ENT_SZ_SHIFT		5

#define EVTQ_ENT_DWORDS			((1 << EVTQ_ENT_SZ_SHIFT) >> 3)

#define EVTQ_MAX_SZ_SHIFT		(Q_MIN_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT)

#define EVTQ_MAX_SZ_SHIFT		(Q_MAX_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT)



#define EVTQ_0_ID			GENMASK_ULL(7, 0)
@@ -400,7 +399,7 @@ 
/* PRI queue */

#define PRIQ_ENT_SZ_SHIFT		4

#define PRIQ_ENT_DWORDS			((1 << PRIQ_ENT_SZ_SHIFT) >> 3)

#define PRIQ_MAX_SZ_SHIFT		(Q_MIN_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT)

#define PRIQ_MAX_SZ_SHIFT		(Q_MAX_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT)



#define PRIQ_0_SID			GENMASK_ULL(31, 0)

#define PRIQ_0_SSID			GENMASK_ULL(51, 32)

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

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void qcom_adreno_smmu_get_fault_info(const void *cookie, 
	info->fsynr1 = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_FSYNR1);

	info->far = arm_smmu_cb_readq(smmu, cfg->cbndx, ARM_SMMU_CB_FAR);

	info->cbfrsynra = arm_smmu_gr1_read(smmu, ARM_SMMU_GR1_CBFRSYNRA(cfg->cbndx));

	info->ttbr0 = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_TTBR0);

	info->ttbr0 = arm_smmu_cb_readq(smmu, cfg->cbndx, ARM_SMMU_CB_TTBR0);

	info->contextidr = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_CONTEXTIDR);

}
@@ -415,6 +415,7 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = { 
	{ .compatible = "qcom,sm8150-smmu-500" },

	{ .compatible = "qcom,sm8250-smmu-500" },

	{ .compatible = "qcom,sm8350-smmu-500" },

	{ .compatible = "qcom,sm8450-smmu-500" },

	{ }

};

drivers/iommu/io-pgtable-arm-v7s.c

+5 −1
Original line number Diff line number Diff line
@@ -246,13 +246,17 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, 
			__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));

	else if (lvl == 2)

		table = kmem_cache_zalloc(data->l2_tables, gfp);



	if (!table)

		return NULL;



	phys = virt_to_phys(table);

	if (phys != (arm_v7s_iopte)phys) {

		/* Doesn't fit in PTE */

		dev_err(dev, "Page table does not fit in PTE: %pa", &phys);

		goto out_free;

	}

	if (table && !cfg->coherent_walk) {

	if (!cfg->coherent_walk) {

		dma = dma_map_single(dev, table, size, DMA_TO_DEVICE);

		if (dma_mapping_error(dev, dma))

			goto out_free;