Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / powerpc / cpu / mpc8xxx / fsl_pamu.c

diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index ede8e662104e890ec03bfa14724ed3dca38a096d..2c378b761588aaa284c5be84577051401b6cdf60 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -1,12 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * FSL PAMU driver
  *
  * Copyright 2012-2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <log.h>
+#include <linux/bitops.h>
 #include <linux/log2.h>
 #include <malloc.h>
 #include <asm/fsl_pamu.h>
@@ -132,10 +133,10 @@ static int pamu_config_ppaace(uint32_t liodn, uint64_t win_addr,
                set_bf(ppaace->addr_bitfields, PAACE_AF_AP, PAACE_AP_PERMS_ALL);
        }
 
-       asm volatile("sync" : : : "memory");
+       sync();
        /* Mark the ppace entry valid */
        ppaace->addr_bitfields |= PAACE_V_VALID;
-       asm volatile("sync" : : : "memory");
+       sync();
 
        return 0;
 }
@@ -280,7 +281,7 @@ int pamu_init(void)
                        out_be32(&regs->splah, spaact_lim >> 32);
                        out_be32(&regs->splal, (uint32_t)spaact_lim);
                }
-               asm volatile("sync" : : : "memory");
+               sync();
 
                base_addr += PAMU_OFFSET;
        }
@@ -295,7 +296,7 @@ void pamu_enable(void)
        for (i = 0; i < CONFIG_NUM_PAMU; i++) {
                setbits_be32((void *)base_addr + PAMU_PCR_OFFSET,
                             PAMU_PCR_PE);
-               asm volatile("sync" : : : "memory");
+               sync();
                base_addr += PAMU_OFFSET;
        }
 }
@@ -319,7 +320,7 @@ void pamu_reset(void)
                out_be32(&regs->splal, 0);
 
                clrbits_be32((void *)regs + PAMU_PCR_OFFSET, PAMU_PCR_PE);
-               asm volatile("sync" : : : "memory");
+               sync();
                base_addr += PAMU_OFFSET;
        }
 }
@@ -332,7 +333,7 @@ void pamu_disable(void)
 
        for (i = 0; i < CONFIG_NUM_PAMU; i++) {
                clrbits_be32((void *)base_addr + PAMU_PCR_OFFSET, PAMU_PCR_PE);
-               asm volatile("sync" : : : "memory");
+               sync();
                base_addr += PAMU_OFFSET;
        }
 }