OSDN Git Service

soc/fsl/qbman: use ioremap_cache() instead of ioremap_prot(0)
authorChristophe Leroy <christophe.leroy@c-s.fr>
Tue, 9 Oct 2018 13:51:39 +0000 (13:51 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 14 Oct 2018 07:04:09 +0000 (18:04 +1100)
ioremap_prot() with flag set to 0 relies on a hack in
__ioremap_caller() which adds PAGE_KERNEL flags when the
handed flags don't look like a valid set of flags
(ie don't include _PAGE_PRESENT)

The intention being to map cached memory, use ioremap_cache() instead.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
drivers/soc/fsl/qbman/qman_ccsr.c

index 79cba58..0fbb201 100644 (file)
@@ -418,7 +418,7 @@ static size_t fqd_sz, pfdr_sz;
 static int zero_priv_mem(phys_addr_t addr, size_t sz)
 {
        /* map as cacheable, non-guarded */
-       void __iomem *tmpp = ioremap_prot(addr, sz, 0);
+       void __iomem *tmpp = ioremap_cache(addr, sz);
 
        if (!tmpp)
                return -ENOMEM;