Commit 475918e9 authored by Michael Shavit's avatar Michael Shavit Committed by Will Deacon
Browse files

iommu/arm-smmu-v3: Rename cdcfg to cd_table 



cdcfg is a confusing name, especially given other variables with the cfg
suffix in this driver. cd_table more clearly describes what is being
operated on.

Tested-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarMichael Shavit <mshavit@google.com>
Link: https://lore.kernel.org/r/20230915211705.v8.9.I5ee79793b444ddb933e8bc1eb7b77e728d7f8350@changeid


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 6032f584

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

+35 −35
Original line number Diff line number Diff line
@@ -1025,18 +1025,18 @@ static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, u32 ssid) 
	unsigned int idx;

	struct arm_smmu_l1_ctx_desc *l1_desc;

	struct arm_smmu_device *smmu = master->smmu;

	struct arm_smmu_ctx_desc_cfg *cdcfg = &master->cd_table;

	struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table;



	if (cdcfg->s1fmt == STRTAB_STE_0_S1FMT_LINEAR)

		return cdcfg->cdtab + ssid * CTXDESC_CD_DWORDS;

	if (cd_table->s1fmt == STRTAB_STE_0_S1FMT_LINEAR)

		return cd_table->cdtab + ssid * CTXDESC_CD_DWORDS;



	idx = ssid >> CTXDESC_SPLIT;

	l1_desc = &cdcfg->l1_desc[idx];

	l1_desc = &cd_table->l1_desc[idx];

	if (!l1_desc->l2ptr) {

		if (arm_smmu_alloc_cd_leaf_table(smmu, l1_desc))

			return NULL;



		l1ptr = cdcfg->cdtab + idx * CTXDESC_L1_DESC_DWORDS;

		l1ptr = cd_table->cdtab + idx * CTXDESC_L1_DESC_DWORDS;

		arm_smmu_write_cd_l1_desc(l1ptr, l1_desc);

		/* An invalid L1CD can be cached */

		arm_smmu_sync_cd(master, ssid, false);
@@ -1131,35 +1131,35 @@ static int arm_smmu_alloc_cd_tables(struct arm_smmu_master *master) 
	size_t l1size;

	size_t max_contexts;

	struct arm_smmu_device *smmu = master->smmu;

	struct arm_smmu_ctx_desc_cfg *cdcfg = &master->cd_table;

	struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table;



	cdcfg->stall_enabled = master->stall_enabled;

	cdcfg->s1cdmax = master->ssid_bits;

	max_contexts = 1 << cdcfg->s1cdmax;

	cd_table->stall_enabled = master->stall_enabled;

	cd_table->s1cdmax = master->ssid_bits;

	max_contexts = 1 << cd_table->s1cdmax;



	if (!(smmu->features & ARM_SMMU_FEAT_2_LVL_CDTAB) ||

	    max_contexts <= CTXDESC_L2_ENTRIES) {

		cdcfg->s1fmt = STRTAB_STE_0_S1FMT_LINEAR;

		cdcfg->num_l1_ents = max_contexts;

		cd_table->s1fmt = STRTAB_STE_0_S1FMT_LINEAR;

		cd_table->num_l1_ents = max_contexts;



		l1size = max_contexts * (CTXDESC_CD_DWORDS << 3);

	} else {

		cdcfg->s1fmt = STRTAB_STE_0_S1FMT_64K_L2;

		cdcfg->num_l1_ents = DIV_ROUND_UP(max_contexts,

		cd_table->s1fmt = STRTAB_STE_0_S1FMT_64K_L2;

		cd_table->num_l1_ents = DIV_ROUND_UP(max_contexts,

						  CTXDESC_L2_ENTRIES);



		cdcfg->l1_desc = devm_kcalloc(smmu->dev, cdcfg->num_l1_ents,

					      sizeof(*cdcfg->l1_desc),

		cd_table->l1_desc = devm_kcalloc(smmu->dev, cd_table->num_l1_ents,

					      sizeof(*cd_table->l1_desc),

					      GFP_KERNEL);

		if (!cdcfg->l1_desc)

		if (!cd_table->l1_desc)

			return -ENOMEM;



		l1size = cdcfg->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3);

		l1size = cd_table->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3);

	}



	cdcfg->cdtab = dmam_alloc_coherent(smmu->dev, l1size, &cdcfg->cdtab_dma,

	cd_table->cdtab = dmam_alloc_coherent(smmu->dev, l1size, &cd_table->cdtab_dma,

					   GFP_KERNEL);

	if (!cdcfg->cdtab) {

	if (!cd_table->cdtab) {

		dev_warn(smmu->dev, "failed to allocate context descriptor\n");

		ret = -ENOMEM;

		goto err_free_l1;
@@ -1168,9 +1168,9 @@ static int arm_smmu_alloc_cd_tables(struct arm_smmu_master *master) 
	return 0;



err_free_l1:

	if (cdcfg->l1_desc) {

		devm_kfree(smmu->dev, cdcfg->l1_desc);

		cdcfg->l1_desc = NULL;

	if (cd_table->l1_desc) {

		devm_kfree(smmu->dev, cd_table->l1_desc);

		cd_table->l1_desc = NULL;

	}

	return ret;

}
@@ -1180,30 +1180,30 @@ static void arm_smmu_free_cd_tables(struct arm_smmu_master *master) 
	int i;

	size_t size, l1size;

	struct arm_smmu_device *smmu = master->smmu;

	struct arm_smmu_ctx_desc_cfg *cdcfg = &master->cd_table;

	struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table;



	if (cdcfg->l1_desc) {

	if (cd_table->l1_desc) {

		size = CTXDESC_L2_ENTRIES * (CTXDESC_CD_DWORDS << 3);



		for (i = 0; i < cdcfg->num_l1_ents; i++) {

			if (!cdcfg->l1_desc[i].l2ptr)

		for (i = 0; i < cd_table->num_l1_ents; i++) {

			if (!cd_table->l1_desc[i].l2ptr)

				continue;



			dmam_free_coherent(smmu->dev, size,

					   cdcfg->l1_desc[i].l2ptr,

					   cdcfg->l1_desc[i].l2ptr_dma);

					   cd_table->l1_desc[i].l2ptr,

					   cd_table->l1_desc[i].l2ptr_dma);

		}

		devm_kfree(smmu->dev, cdcfg->l1_desc);

		cdcfg->l1_desc = NULL;

		devm_kfree(smmu->dev, cd_table->l1_desc);

		cd_table->l1_desc = NULL;



		l1size = cdcfg->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3);

		l1size = cd_table->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3);

	} else {

		l1size = cdcfg->num_l1_ents * (CTXDESC_CD_DWORDS << 3);

		l1size = cd_table->num_l1_ents * (CTXDESC_CD_DWORDS << 3);

	}



	dmam_free_coherent(smmu->dev, l1size, cdcfg->cdtab, cdcfg->cdtab_dma);

	cdcfg->cdtab_dma = 0;

	cdcfg->cdtab = NULL;

	dmam_free_coherent(smmu->dev, l1size, cd_table->cdtab, cd_table->cdtab_dma);

	cd_table->cdtab_dma = 0;

	cd_table->cdtab = NULL;

}



bool arm_smmu_free_asid(struct arm_smmu_ctx_desc *cd)