diff options
| author | Sven Schnelle <svens@stackframe.org> | 2020-08-11 18:19:19 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2020-08-12 03:55:40 +0200 |
| commit | 5b24993c21cbf2de11aff077a48c5cb0505a0450 (patch) | |
| tree | 14b04c8fdd5c6c69ac52a0b46f3e372bccd74007 /drivers/parisc | |
| parent | 3bc6e3dc5a54d5842938c6f1ed78dd1add379af7 (diff) | |
| download | linux-5b24993c21cbf2de11aff077a48c5cb0505a0450.tar.gz | |
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/parisc')
| -rw-r--r-- | drivers/parisc/sba_iommu.c | 2 |
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)) { |