Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

iommu/arm-smmu-v3: Rename arm_smmu_master_data to arm_smmu_master 



The arm_smmu_master_data structure already represents more than just the
firmware data associated to a master, and will be used extensively to
represent a device's state when implementing more SMMU features. Rename
the structure to arm_smmu_master.

Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe.brucker@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 5702ee24

drivers/iommu/arm-smmu-v3.c

+6 −6
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ struct arm_smmu_device { 
};



/* SMMU private data for each master */

struct arm_smmu_master_data {

struct arm_smmu_master {

	struct arm_smmu_device		*smmu;

	struct arm_smmu_strtab_ent	ste;

};
@@ -1691,7 +1691,7 @@ static __le64 *arm_smmu_get_step_for_sid(struct arm_smmu_device *smmu, u32 sid) 
static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)

{

	int i, j;

	struct arm_smmu_master_data *master = fwspec->iommu_priv;

	struct arm_smmu_master *master = fwspec->iommu_priv;

	struct arm_smmu_device *smmu = master->smmu;



	for (i = 0; i < fwspec->num_ids; ++i) {
@@ -1712,7 +1712,7 @@ static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec) 
static void arm_smmu_detach_dev(struct device *dev)

{

	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

	struct arm_smmu_master_data *master = fwspec->iommu_priv;

	struct arm_smmu_master *master = fwspec->iommu_priv;



	master->ste.assigned = false;

	arm_smmu_install_ste_for_dev(fwspec);
@@ -1724,7 +1724,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) 
	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

	struct arm_smmu_device *smmu;

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_master_data *master;

	struct arm_smmu_master *master;

	struct arm_smmu_strtab_ent *ste;



	if (!fwspec)
@@ -1860,7 +1860,7 @@ static int arm_smmu_add_device(struct device *dev) 
{

	int i, ret;

	struct arm_smmu_device *smmu;

	struct arm_smmu_master_data *master;

	struct arm_smmu_master *master;

	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

	struct iommu_group *group;
@@ -1913,7 +1913,7 @@ static int arm_smmu_add_device(struct device *dev) 
static void arm_smmu_remove_device(struct device *dev)

{

	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

	struct arm_smmu_master_data *master;

	struct arm_smmu_master *master;

	struct arm_smmu_device *smmu;



	if (!fwspec || fwspec->ops != &arm_smmu_ops)