summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2020-08-11 19:19:19 +0300
committerHelge Deller <deller@gmx.de>2020-08-12 04:55:40 +0300
commit5b24993c21cbf2de11aff077a48c5cb0505a0450 (patch)
tree14b04c8fdd5c6c69ac52a0b46f3e372bccd74007 /drivers
parent3bc6e3dc5a54d5842938c6f1ed78dd1add379af7 (diff)
downloadlinux-5b24993c21cbf2de11aff077a48c5cb0505a0450.tar.xz
parisc: mask out enable and reserved bits from sba imask
When using kexec the SBA IOMMU IBASE might still have the RE bit set. This triggers a WARN_ON when trying to write back the IBASE register later, and it also makes some mask calculations fail. Cc: <stable@vger.kernel.org> Signed-off-by: Sven Schnelle <svens@stackframe.org> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/parisc/sba_iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 7e112829d250..00785fa81ff7 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1270,7 +1270,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
** (one that doesn't overlap memory or LMMIO space) in the
** IBASE and IMASK registers.
*/
- ioc->ibase = READ_REG(ioc->ioc_hpa + IOC_IBASE);
+ ioc->ibase = READ_REG(ioc->ioc_hpa + IOC_IBASE) & ~0x1fffffULL;
iova_space_size = ~(READ_REG(ioc->ioc_hpa + IOC_IMASK) & 0xFFFFFFFFUL) + 1;
if ((ioc->ibase < 0xfed00000UL) && ((ioc->ibase + iova_space_size) > 0xfee00000UL)) {