Commit ea915933 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IOMMU fixes from Joerg Roedel:

 - Fix a memory leak when dev_iommu gets freed and a sub-pointer does
   not

 - Build dependency fixes for Mediatek, spapr_tce, and Intel IOMMU
   driver

 - Export iommu_group_get_for_dev() only for GPLed modules

 - Fix AMD IOMMU interrupt remapping when x2apic is enabled

 - Fix error path in the QCOM IOMMU driver probe function

* tag 'iommu-fixes-v5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/qcom: Fix local_base status check
  iommu: Properly export iommu_group_get_for_dev()
  iommu/vt-d: Use right Kconfig option name
  iommu/amd: Fix legacy interrupt remapping for x2APIC-enabled system
  iommu: spapr_tce: Disable compile testing to fix build on book3s_32 config
  iommu/mediatek: Fix MTK_IOMMU dependencies
  iommu: Fix the memory leak in dev_iommu_free()
parents 743f0573 b52649ae

drivers/iommu/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ config IPMMU_VMSA 


config SPAPR_TCE_IOMMU

	bool "sPAPR TCE IOMMU Support"

	depends on PPC_POWERNV || PPC_PSERIES || (PPC && COMPILE_TEST)

	depends on PPC_POWERNV || PPC_PSERIES

	select IOMMU_API

	help

	  Enables bits of IOMMU API required by VFIO. The iommu_ops
@@ -457,7 +457,7 @@ config S390_AP_IOMMU 


config MTK_IOMMU

	bool "MTK IOMMU Support"

	depends on ARM || ARM64 || COMPILE_TEST

	depends on HAS_DMA

	depends on ARCH_MEDIATEK || COMPILE_TEST

	select ARM_DMA_USE_IOMMU

	select IOMMU_API

drivers/iommu/amd_iommu_init.c

+1 −1
Original line number Diff line number Diff line
@@ -2936,7 +2936,7 @@ static int __init parse_amd_iommu_intr(char *str) 
{

	for (; *str; ++str) {

		if (strncmp(str, "legacy", 6) == 0) {

			amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY;

			amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY_GA;

			break;

		}

		if (strncmp(str, "vapic", 5) == 0) {

drivers/iommu/intel-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -371,11 +371,11 @@ int dmar_disabled = 0; 
int dmar_disabled = 1;

#endif /* CONFIG_INTEL_IOMMU_DEFAULT_ON */



#ifdef INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON

#ifdef CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON

int intel_iommu_sm = 1;

#else

int intel_iommu_sm;

#endif /* INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON */

#endif /* CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON */



int intel_iommu_enabled = 0;

EXPORT_SYMBOL_GPL(intel_iommu_enabled);

drivers/iommu/iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static struct dev_iommu *dev_iommu_get(struct device *dev) 


static void dev_iommu_free(struct device *dev)

{

	iommu_fwspec_free(dev);

	kfree(dev->iommu);

	dev->iommu = NULL;

}
@@ -1428,7 +1429,7 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) 


	return group;

}

EXPORT_SYMBOL(iommu_group_get_for_dev);

EXPORT_SYMBOL_GPL(iommu_group_get_for_dev);



struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)

{

drivers/iommu/qcom_iommu.c

+4 −1
Original line number Diff line number Diff line
@@ -824,8 +824,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) 
	qcom_iommu->dev = dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res)

	if (res) {

		qcom_iommu->local_base = devm_ioremap_resource(dev, res);

		if (IS_ERR(qcom_iommu->local_base))

			return PTR_ERR(qcom_iommu->local_base);

	}



	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");

	if (IS_ERR(qcom_iommu->iface_clk)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE