diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-10 11:08:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-10 11:08:36 -0700 |
| commit | 0712c44637e859d20474ca45bdecfdbdd27bb694 (patch) | |
| tree | c517850acbcbfbb481aa4e6ecd59592ae9025b33 | |
| parent | c691d29c1af5632f8dedc0b25097e5074d317b6b (diff) | |
| parent | cdd6ec91e1c2521fb04c09f2b556e5a5d95996bd (diff) | |
Merge "soc: qcom: pil: Remove a register read as it causes an unclocked access"
| -rw-r--r-- | drivers/soc/qcom/pil-q6v5-mss.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/soc/qcom/pil-q6v5-mss.c b/drivers/soc/qcom/pil-q6v5-mss.c index 1177cac25ffa..c4c64409cfda 100644 --- a/drivers/soc/qcom/pil-q6v5-mss.c +++ b/drivers/soc/qcom/pil-q6v5-mss.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -41,7 +41,6 @@ #define PROXY_TIMEOUT_MS 10000 #define MAX_SSR_REASON_LEN 130U #define STOP_ACK_TIMEOUT_MS 1000 -#define QDSP6SS_NMI_STATUS 0x44 #define subsys_to_drv(d) container_of(d, struct modem_data, subsys_desc) @@ -78,17 +77,11 @@ static void restart_modem(struct modem_data *drv) static irqreturn_t modem_err_fatal_intr_handler(int irq, void *dev_id) { struct modem_data *drv = subsys_to_drv(dev_id); - u32 nmi_status = readl_relaxed(drv->q6->reg_base + QDSP6SS_NMI_STATUS); /* Ignore if we're the one that set the force stop GPIO */ if (drv->crash_shutdown) return IRQ_HANDLED; - if (nmi_status & 0x04) - pr_err("%s: Fatal error on the modem due to TZ NMI\n", - __func__); - else - pr_err("%s: Fatal error on the modem\n", __func__); subsys_set_crash_status(drv->subsys, CRASH_STATUS_ERR_FATAL); restart_modem(drv); return IRQ_HANDLED; |