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

iommu/arm-smmu-v3: Fix typos introduced by arm_smmu_invs 



These are introduced by separate commits, so not submitting with a "Fixes"
line, since they aren't critical.

Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 6a01b9f0

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

+3 −3
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static inline int arm_smmu_invs_iter_next_cmp(struct arm_smmu_invs *invs_l, 
 * Both @invs and @to_merge must be sorted, to ensure the returned array will be

 * sorted as well.

 *

 * Caller is resposible for freeing the @invs and the returned new one.

 * Caller is responsible for freeing the @invs and the returned new one.

 *

 * Entries marked as trash will be purged in the returned array.

 */
@@ -1258,7 +1258,7 @@ EXPORT_SYMBOL_IF_KUNIT(arm_smmu_invs_unref); 
 * This function must be locked and serialized with arm_smmu_invs_merge() and

 * arm_smmu_invs_unref(), but do not lockdep on any lock for KUNIT test.

 *

 * Caller is resposible for freeing the @invs and the returned new one.

 * Caller is responsible for freeing the @invs and the returned new one.

 */

VISIBLE_IF_KUNIT

struct arm_smmu_invs *arm_smmu_invs_purge(struct arm_smmu_invs *invs)
@@ -2739,7 +2739,7 @@ void arm_smmu_domain_inv_range(struct arm_smmu_domain *smmu_domain, 
	 * But in a race, these two can be interdependent, making it a special

	 * case requiring an additional smp_mb() for the write->read ordering.

	 * Pairing with the dma_wmb() in arm_smmu_install_ste_for_dev(), this

	 * makes sure that IOPTE update prior to this point is visable to SMMU

	 * makes sure that IOPTE update prior to this point is visible to SMMU

	 * hardware before we load the updated invalidation array.

	 *

	 *  [CPU0]                        | [CPU1]

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

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static inline bool arm_smmu_inv_is_ats(const struct arm_smmu_inv *inv) 
 *            greater than @max_invs

 * @num_trashes: number of trash entries in the array for arm_smmu_invs_purge().

 *               Must not be greater than @num_invs

 * @rwlock: optional rwlock to fench ATS operations

 * @rwlock: optional rwlock to fence ATS operations

 * @has_ats: flag if the array contains an INV_TYPE_ATS or INV_TYPE_ATS_FULL

 * @rcu: rcu head for kfree_rcu()

 * @inv: flexible invalidation array