Commit 0dc589da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull iommu fixes from Joerg Roedel:

 - Fix a use-after-free of the device iommu-group. Found in the arm-smmu
   driver, but the fix is in generic code.

 - Fix for the new Allwinner IOMMU driver to use the atomic
   readl_timeout() variant in IO/TLB flushing code.

 - A couple of cleanups to fix various compile warnings.

* tag 'iommu-fixes-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/arm-smmu: Mark qcom_smmu_client_of_match as possibly unused
  iommu: Fix use-after-free in iommu_release_device
  iommu/amd: Make amd_iommu_apply_ivrs_quirks() static inline
  iommu: SUN50I_IOMMU should depend on HAS_DMA
  iommu/sun50i: Remove unused variable
  iommu/sun50i: Change the readl timeout to the atomic variant
parents f81fdd0c a082121b

drivers/iommu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ config ROCKCHIP_IOMMU 


config SUN50I_IOMMU

	bool "Allwinner H6 IOMMU Support"

	depends on HAS_DMA

	depends on ARCH_SUNXI || COMPILE_TEST

	select ARM_DMA_USE_IOMMU

	select IOMMU_API

drivers/iommu/amd/amd_iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ extern int __init add_special_device(u8 type, u8 id, u16 *devid, 
#ifdef CONFIG_DMI

void amd_iommu_apply_ivrs_quirks(void);

#else

static void amd_iommu_apply_ivrs_quirks(void) { }

static inline void amd_iommu_apply_ivrs_quirks(void) { }

#endif



#endif

drivers/iommu/arm-smmu-qcom.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ struct qcom_smmu { 
	struct arm_smmu_device smmu;

};



static const struct of_device_id qcom_smmu_client_of_match[] = {

static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {

	{ .compatible = "qcom,adreno" },

	{ .compatible = "qcom,mdp4" },

	{ .compatible = "qcom,mdss" },

drivers/iommu/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -295,10 +295,10 @@ void iommu_release_device(struct device *dev) 
		return;



	iommu_device_unlink(dev->iommu->iommu_dev, dev);

	iommu_group_remove_device(dev);



	ops->release_device(dev);



	iommu_group_remove_device(dev);

	module_put(ops->owner);

	dev_iommu_free(dev);

}

drivers/iommu/sun50i-iommu.c

+3 −5
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static int sun50i_iommu_flush_all_tlb(struct sun50i_iommu *iommu) 
		    IOMMU_TLB_FLUSH_MICRO_TLB(1) |

		    IOMMU_TLB_FLUSH_MICRO_TLB(0));



	ret = readl_poll_timeout(iommu->base + IOMMU_TLB_FLUSH_REG,

	ret = readl_poll_timeout_atomic(iommu->base + IOMMU_TLB_FLUSH_REG,

					reg, !reg,

					1, 2000);

	if (ret)
@@ -556,7 +556,6 @@ static size_t sun50i_iommu_unmap(struct iommu_domain *domain, unsigned long iova 
{

	struct sun50i_iommu_domain *sun50i_domain = to_sun50i_domain(domain);

	phys_addr_t pt_phys;

	dma_addr_t pte_dma;

	u32 *pte_addr;

	u32 dte;
@@ -566,7 +565,6 @@ static size_t sun50i_iommu_unmap(struct iommu_domain *domain, unsigned long iova 


	pt_phys = sun50i_dte_get_pt_address(dte);

	pte_addr = (u32 *)phys_to_virt(pt_phys) + sun50i_iova_get_pte_index(iova);

	pte_dma = pt_phys + sun50i_iova_get_pte_index(iova) * PT_ENTRY_SIZE;



	if (!sun50i_pte_is_page_valid(*pte_addr))

		return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE