]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
authorWill Deacon <will.deacon@arm.com>
Wed, 7 Nov 2018 22:58:24 +0000 (22:58 +0000)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
commit5b589932bc9140a4971964db0afa24e3e664f038
tree23d6a271166824612913fea0c719d82d7143d421
parente6e581c4a4d8131e2eabeaf962d3ae5aa0c52872
iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer

BugLink: https://bugs.launchpad.net/bugs/1837664
[ Upstream commit a868e8530441286342f90c1fd9c5f24de3aa2880 ]

After removing an entry from a queue (e.g. reading an event in
arm_smmu_evtq_thread()) it is necessary to advance the MMIO consumer
pointer to free the queue slot back to the SMMU. A memory barrier is
required here so that all reads targetting the queue entry have
completed before the consumer pointer is updated.

The implementation of queue_inc_cons() relies on a writel() to complete
the previous reads, but this is incorrect because writel() is only
guaranteed to complete prior writes. This patch replaces the call to
writel() with an mb(); writel_relaxed() sequence, which gives us the
read->write ordering which we require.

Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/iommu/arm-smmu-v3.c