Commit a7a08b85 authored by Nicolin Chen's avatar Nicolin Chen Committed by Will Deacon
Browse files

iommu/arm-smmu-v3: Make symbols public for CONFIG_TEGRA241_CMDQV 



The symbols __arm_smmu_cmdq_skip_err(), arm_smmu_init_one_queue(), and
arm_smmu_cmdq_init() need to be used by the tegra241-cmdqv compilation
unit in a following patch.

Remove the static and put prototypes in the header.

Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Link: https://lore.kernel.org/r/c4f2aa5f5f40a2e7c68b132c6d3171d6403de57a.1724970714.git.nicolinc@nvidia.com


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

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

+8 −10
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static void arm_smmu_cmdq_build_sync_cmd(u64 *cmd, struct arm_smmu_device *smmu, 
	arm_smmu_cmdq_build_cmd(cmd, &ent);

}



static void __arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu,

void __arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu,

			      struct arm_smmu_cmdq *cmdq)

{

	static const char * const cerror_str[] = {
@@ -3521,11 +3521,9 @@ static struct iommu_dirty_ops arm_smmu_dirty_ops = { 
};



/* Probing and initialisation functions */

static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,

				   struct arm_smmu_queue *q,

				   void __iomem *page,

				   unsigned long prod_off,

				   unsigned long cons_off,

int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,

			    struct arm_smmu_queue *q, void __iomem *page,

			    unsigned long prod_off, unsigned long cons_off,

			    size_t dwords, const char *name)

{

	size_t qsz;
@@ -3564,7 +3562,7 @@ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu, 
	return 0;

}



static int arm_smmu_cmdq_init(struct arm_smmu_device *smmu,

int arm_smmu_cmdq_init(struct arm_smmu_device *smmu,

		       struct arm_smmu_cmdq *cmdq)

{

	unsigned int nents = 1 << cmdq->q.llq.max_n_shift;

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

+9 −0
Original line number Diff line number Diff line
@@ -816,6 +816,15 @@ void arm_smmu_tlb_inv_range_asid(unsigned long iova, size_t size, int asid, 
int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain,

			    unsigned long iova, size_t size);



void __arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu,

			      struct arm_smmu_cmdq *cmdq);

int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,

			    struct arm_smmu_queue *q, void __iomem *page,

			    unsigned long prod_off, unsigned long cons_off,

			    size_t dwords, const char *name);

int arm_smmu_cmdq_init(struct arm_smmu_device *smmu,

		       struct arm_smmu_cmdq *cmdq);



#ifdef CONFIG_ARM_SMMU_V3_SVA

bool arm_smmu_sva_supported(struct arm_smmu_device *smmu);

bool arm_smmu_master_sva_supported(struct arm_smmu_master *master);