parisc: mask out enable and reserved bits from sba imask

PATCH New Sven Schnelle 1 participant 1 message Aug 11, 2020 PA-RISC architecture

Share & tools

Sven Schnelle

author

2020-08-11 16:19 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Sven Schnelle <[email protected]>

---
 drivers/parisc/sba_iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/parisc/sba_iommu.c +1 -1

index 5368452eb5a6..d4314fba0269 100644
@@ -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)) {

Signature · 1 line

2.27.0