Commit ddd25670 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-thierry/arm-smmu' into for-joerg/arm-smmu/updates 

Merge in support for the Arm SMMU '->probe_finalize()' implementation
callback, which is required to prevent early faults in conjunction with
Nvidia's memory controller.

* for-thierry/arm-smmu:
  iommu/arm-smmu: Check smmu->impl pointer before dereferencing
  iommu/arm-smmu: Implement ->probe_finalize()
parents affa9095 b472191f

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

+13 −0
Original line number Diff line number Diff line
@@ -1454,6 +1454,18 @@ static void arm_smmu_release_device(struct device *dev) 
	iommu_fwspec_free(dev);

}



static void arm_smmu_probe_finalize(struct device *dev)

{

	struct arm_smmu_master_cfg *cfg;

	struct arm_smmu_device *smmu;



	cfg = dev_iommu_priv_get(dev);

	smmu = cfg->smmu;



	if (smmu->impl && smmu->impl->probe_finalize)

		smmu->impl->probe_finalize(smmu, dev);

}



static struct iommu_group *arm_smmu_device_group(struct device *dev)

{

	struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev);
@@ -1573,6 +1585,7 @@ static struct iommu_ops arm_smmu_ops = { 
	.iova_to_phys		= arm_smmu_iova_to_phys,

	.probe_device		= arm_smmu_probe_device,

	.release_device		= arm_smmu_release_device,

	.probe_finalize		= arm_smmu_probe_finalize,

	.device_group		= arm_smmu_device_group,

	.enable_nesting		= arm_smmu_enable_nesting,

	.set_pgtable_quirks	= arm_smmu_set_pgtable_quirks,

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

+1 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ struct arm_smmu_impl { 
				  struct device *dev, int start);

	void (*write_s2cr)(struct arm_smmu_device *smmu, int idx);

	void (*write_sctlr)(struct arm_smmu_device *smmu, int idx, u32 reg);

	void (*probe_finalize)(struct arm_smmu_device *smmu, struct device *dev);

};



#define INVALID_SMENDX			-1