Skip to content

Commit a7a08b8

Browse files
nicolincwilldeacon
authored andcommitted
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: Jason Gunthorpe <[email protected]> Signed-off-by: Nicolin Chen <[email protected]> Link: https://lore.kernel.org/r/c4f2aa5f5f40a2e7c68b132c6d3171d6403de57a.1724970714.git.nicolinc@nvidia.com Signed-off-by: Will Deacon <[email protected]>
1 parent e736c89 commit a7a08b8

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ static void arm_smmu_cmdq_build_sync_cmd(u64 *cmd, struct arm_smmu_device *smmu,
371371
arm_smmu_cmdq_build_cmd(cmd, &ent);
372372
}
373373

374-
static void __arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu,
375-
struct arm_smmu_cmdq *cmdq)
374+
void __arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu,
375+
struct arm_smmu_cmdq *cmdq)
376376
{
377377
static const char * const cerror_str[] = {
378378
[CMDQ_ERR_CERROR_NONE_IDX] = "No error",
@@ -3521,12 +3521,10 @@ static struct iommu_dirty_ops arm_smmu_dirty_ops = {
35213521
};
35223522

35233523
/* Probing and initialisation functions */
3524-
static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,
3525-
struct arm_smmu_queue *q,
3526-
void __iomem *page,
3527-
unsigned long prod_off,
3528-
unsigned long cons_off,
3529-
size_t dwords, const char *name)
3524+
int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,
3525+
struct arm_smmu_queue *q, void __iomem *page,
3526+
unsigned long prod_off, unsigned long cons_off,
3527+
size_t dwords, const char *name)
35303528
{
35313529
size_t qsz;
35323530

@@ -3564,8 +3562,8 @@ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,
35643562
return 0;
35653563
}
35663564

3567-
static int arm_smmu_cmdq_init(struct arm_smmu_device *smmu,
3568-
struct arm_smmu_cmdq *cmdq)
3565+
int arm_smmu_cmdq_init(struct arm_smmu_device *smmu,
3566+
struct arm_smmu_cmdq *cmdq)
35693567
{
35703568
unsigned int nents = 1 << cmdq->q.llq.max_n_shift;
35713569

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,15 @@ void arm_smmu_tlb_inv_range_asid(unsigned long iova, size_t size, int asid,
816816
int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain,
817817
unsigned long iova, size_t size);
818818

819+
void __arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu,
820+
struct arm_smmu_cmdq *cmdq);
821+
int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,
822+
struct arm_smmu_queue *q, void __iomem *page,
823+
unsigned long prod_off, unsigned long cons_off,
824+
size_t dwords, const char *name);
825+
int arm_smmu_cmdq_init(struct arm_smmu_device *smmu,
826+
struct arm_smmu_cmdq *cmdq);
827+
819828
#ifdef CONFIG_ARM_SMMU_V3_SVA
820829
bool arm_smmu_sva_supported(struct arm_smmu_device *smmu);
821830
bool arm_smmu_master_sva_supported(struct arm_smmu_master *master);

0 commit comments

Comments
 (0)