--- zzzz-none-000/linux-3.10.107/arch/arm/mach-msm/proc_comm.c 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/arch/arm/mach-msm/proc_comm.c 2021-11-10 11:53:52.000000000 +0000 @@ -1,6 +1,7 @@ /* arch/arm/mach-msm/proc_comm.c * * Copyright (C) 2007-2008 Google, Inc. + * Copyright (c) 2009-2012, The Linux Foundation. All rights reserved. * Author: Brian Swetland * * This software is licensed under the terms of the GNU General Public @@ -18,24 +19,26 @@ #include #include #include +#include #include +#include +#include -#include "proc_comm.h" +#include "smd_private.h" -static inline void msm_a2m_int(uint32_t irq) +static inline void notify_other_proc_comm(void) { + /* Make sure the write completes before interrupt */ + wmb(); #if defined(CONFIG_ARCH_MSM7X30) - writel(1 << irq, MSM_GCC_BASE + 0x8); + __raw_writel(1 << 6, MSM_APCS_GCC_BASE + 0x8); +#elif defined(CONFIG_ARCH_MSM8X60) + __raw_writel(1 << 5, MSM_GCC_BASE + 0x8); #else - writel(1, MSM_CSR_BASE + 0x400 + (irq * 4)); + __raw_writel(1, MSM_CSR_BASE + 0x400 + (6) * 4); #endif } -static inline void notify_other_proc_comm(void) -{ - msm_a2m_int(6); -} - #define APP_COMMAND 0x00 #define APP_STATUS 0x04 #define APP_DATA1 0x08 @@ -47,83 +50,109 @@ #define MDM_DATA2 0x1C static DEFINE_SPINLOCK(proc_comm_lock); - -/* The higher level SMD support will install this to - * provide a way to check for and handle modem restart. - */ -int (*msm_check_for_modem_crash)(void); +static int msm_proc_comm_disable; /* Poll for a state change, checking for possible * modem crashes along the way (so we don't wait - * forever while the ARM9 is blowing up). + * forever while the ARM9 is blowing up. * * Return an error in the event of a modem crash and * restart so the msm_proc_comm() routine can restart * the operation from the beginning. */ -static int proc_comm_wait_for(void __iomem *addr, unsigned value) +static int proc_comm_wait_for(unsigned addr, unsigned value) { - for (;;) { - if (readl(addr) == value) + while (1) { + /* Barrier here prevents excessive spinning */ + mb(); + if (readl_relaxed(addr) == value) return 0; - if (msm_check_for_modem_crash) - if (msm_check_for_modem_crash()) - return -EAGAIN; + if (smsm_check_for_modem_crash()) + return -EAGAIN; + + udelay(5); } } +void msm_proc_comm_reset_modem_now(void) +{ + unsigned base = (unsigned)MSM_SHARED_RAM_BASE; + unsigned long flags; + + spin_lock_irqsave(&proc_comm_lock, flags); + +again: + if (proc_comm_wait_for(base + MDM_STATUS, PCOM_READY)) + goto again; + + writel_relaxed(PCOM_RESET_MODEM, base + APP_COMMAND); + writel_relaxed(0, base + APP_DATA1); + writel_relaxed(0, base + APP_DATA2); + + spin_unlock_irqrestore(&proc_comm_lock, flags); + + /* Make sure the writes complete before notifying the other side */ + wmb(); + notify_other_proc_comm(); + + return; +} +EXPORT_SYMBOL(msm_proc_comm_reset_modem_now); + int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2) { - void __iomem *base = MSM_SHARED_RAM_BASE; + unsigned base = (unsigned)MSM_SHARED_RAM_BASE; unsigned long flags; int ret; spin_lock_irqsave(&proc_comm_lock, flags); - for (;;) { - if (proc_comm_wait_for(base + MDM_STATUS, PCOM_READY)) - continue; - - writel(cmd, base + APP_COMMAND); - writel(data1 ? *data1 : 0, base + APP_DATA1); - writel(data2 ? *data2 : 0, base + APP_DATA2); - - notify_other_proc_comm(); - - if (proc_comm_wait_for(base + APP_COMMAND, PCOM_CMD_DONE)) - continue; - - if (readl(base + APP_STATUS) != PCOM_CMD_FAIL) { - if (data1) - *data1 = readl(base + APP_DATA1); - if (data2) - *data2 = readl(base + APP_DATA2); - ret = 0; - } else { - ret = -EIO; - } - break; + if (msm_proc_comm_disable) { + ret = -EIO; + goto end; } - writel(PCOM_CMD_IDLE, base + APP_COMMAND); - spin_unlock_irqrestore(&proc_comm_lock, flags); +again: + if (proc_comm_wait_for(base + MDM_STATUS, PCOM_READY)) + goto again; + + writel_relaxed(cmd, base + APP_COMMAND); + writel_relaxed(data1 ? *data1 : 0, base + APP_DATA1); + writel_relaxed(data2 ? *data2 : 0, base + APP_DATA2); + + /* Make sure the writes complete before notifying the other side */ + wmb(); + notify_other_proc_comm(); + + if (proc_comm_wait_for(base + APP_COMMAND, PCOM_CMD_DONE)) + goto again; + + if (readl_relaxed(base + APP_STATUS) == PCOM_CMD_SUCCESS) { + if (data1) + *data1 = readl_relaxed(base + APP_DATA1); + if (data2) + *data2 = readl_relaxed(base + APP_DATA2); + ret = 0; + } else { + ret = -EIO; + } - return ret; -} + writel_relaxed(PCOM_CMD_IDLE, base + APP_COMMAND); -/* - * We need to wait for the ARM9 to at least partially boot - * up before we can continue. Since the ARM9 does resource - * allocation, if we dont' wait we could end up crashing or in - * and unknown state. This function should be called early to - * wait on the ARM9. - */ -void proc_comm_boot_wait(void) -{ - void __iomem *base = MSM_SHARED_RAM_BASE; - - proc_comm_wait_for(base + MDM_STATUS, PCOM_READY); - + switch (cmd) { + case PCOM_RESET_CHIP: + case PCOM_RESET_CHIP_IMM: + case PCOM_RESET_APPS: + msm_proc_comm_disable = 1; + printk(KERN_ERR "msm: proc_comm: proc comm disabled\n"); + break; + } +end: + /* Make sure the writes complete before returning */ + wmb(); + spin_unlock_irqrestore(&proc_comm_lock, flags); + return ret; } +EXPORT_SYMBOL(msm_proc_comm);