--- arch/arm/mach-axxia/ddr_retention.c | 6 +- arch/arm/mach-axxia/ddr_shutdown.c | 271 ++++++++++++++++++----------------- 2 files changed, 139 insertions(+), 138 deletions(-)
diff --git a/arch/arm/mach-axxia/ddr_retention.c b/arch/arm/mach-axxia/ddr_retention.c index 35dbfcb..7dab78f 100644 --- a/arch/arm/mach-axxia/ddr_retention.c +++ b/arch/arm/mach-axxia/ddr_retention.c @@ -244,7 +244,7 @@ reset_elm_trace(void) } -extern void ncp_ddr_shutdown(void *, void *, unsigned long ); +extern void ncp_ddr_shutdown(void *, void *, unsigned long); void @@ -252,7 +252,7 @@ initiate_retention_reset(void) { unsigned long ctl_244 = 0; unsigned long value; - unsigned cpu_id ; + unsigned cpu_id; volatile long tmp; volatile long *ptmp; @@ -301,7 +301,7 @@ initiate_retention_reset(void) ptmp = (long *) ncp_ddr_shutdown; do { tmp += *ptmp++; - } while (ptmp < (long*) (ncp_ddr_shutdown + 0x1000)); + } while (ptmp < (long *) (ncp_ddr_shutdown + 0x1000)); asm volatile ("isb" : : : "memory"); diff --git a/arch/arm/mach-axxia/ddr_shutdown.c b/arch/arm/mach-axxia/ddr_shutdown.c index 6c6c3bb..33b889a 100644 --- a/arch/arm/mach-axxia/ddr_shutdown.c +++ b/arch/arm/mach-axxia/ddr_shutdown.c @@ -8,14 +8,14 @@ * of the normal barrier. */ #define pvt_ioread32be(p) ({ unsigned int __v = be32_to_cpu((__force __be32)__raw_readl(p)); dsb(); __v; }) -#define pvt_iowrite32be(v,p) ({ dsb(); __raw_writel((__force __u32)cpu_to_be32(v), p); }) +#define pvt_iowrite32be(v, p) ({ dsb(); __raw_writel((__force __u32)cpu_to_be32(v), p); }) #define pvt_ioread32(p) ({ unsigned int __v = (__raw_readl(p)); dsb(); __v; }) -#define pvt_iowrite32(v,p) ({ dsb(); __raw_writel((__force __u32)(v), p); }) +#define pvt_iowrite32(v, p) ({ dsb(); __raw_writel((__force __u32)(v), p); }) /* #define DDR_SHUTDOWN_DEBUG */ #ifdef DDR_SHUTDOWN_DEBUG -#define dbg_write(v, p) pvt_iowrite32be(v,p) +#define dbg_write(v, p) pvt_iowrite32be(v, p) #else #define dbg_write(v, p) #endif @@ -179,7 +179,7 @@ void ncp_ddr_shutdown(void *nca, void *apb, unsigned long ctl_244) pvt_iowrite32(0x00000001, apb + 0x300dc); dbg_write(0xaaaa0006, (unsigned *)(nca + 0x1200)); - do_reset: +do_reset: /* * Issue Chip reset */ @@ -190,72 +190,73 @@ void ncp_ddr_shutdown(void *nca, void *apb, unsigned long ctl_244) /* Chip Reset */ pvt_iowrite32(0x00080802, apb + 0x31008); - while(1); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); + while (1) + ; + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); return; } @@ -263,69 +264,69 @@ void ncp_ddr_shutdown(void *nca, void *apb, unsigned long ctl_244) void ncp_ddr_shutdown_dummy(void) { wfi(); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); - __asm__ __volatile__(" nop \n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); + __asm__ __volatile__("nop\n\t"); } -- 1.7.9.5 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto