diff options
| author | Avaneesh Kumar Dwivedi <akdwived@codeaurora.org> | 2017-12-28 12:05:23 +0530 |
|---|---|---|
| committer | celtare21 <celtare21@gmail.com> | 2019-08-24 19:41:25 +0000 |
| commit | 8657bfc9aa60dffd548758421f37904d4ece5590 (patch) | |
| tree | 60107fe76562549d6351d8a5a90017eb1b7089e2 | |
| parent | 4bfc1ec083c20d04c71e613704b9ed46eb5c8802 (diff) | |
Revert "soc: qcom: pil: Log the TZ NMI caused subsystem err fatal"
This reverts commit 94619d9e07581607affb22733daf1e772eeeb5d3.
Reverting because on secure devices there is permission issues causing
external abort while trying to read the register.
Change-Id: I382bdd37f042e8634c682de5e2c064aef9473ec6
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
Signed-off-by: celtare21 <celtare21@gmail.com>
| -rw-r--r-- | drivers/soc/qcom/subsys-pil-tz.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/soc/qcom/subsys-pil-tz.c b/drivers/soc/qcom/subsys-pil-tz.c index dfd0e8a1f02c..4eb4e669a0b6 100644 --- a/drivers/soc/qcom/subsys-pil-tz.c +++ b/drivers/soc/qcom/subsys-pil-tz.c @@ -43,7 +43,6 @@ #define ERR_READY 0 #define PBL_DONE 1 -#define NMI_STATUS_REGISTER 0x44 #define desc_to_data(d) container_of(d, struct pil_tz_data, desc) #define subsys_to_data(d) container_of(d, struct pil_tz_data, subsys_desc) @@ -111,7 +110,6 @@ struct pil_tz_data { void __iomem *irq_mask; void __iomem *err_status; void __iomem *err_status_spare; - void __iomem *reg_base; u32 bits_arr[2]; }; @@ -874,19 +872,8 @@ static void subsys_crash_shutdown(const struct subsys_desc *subsys) static irqreturn_t subsys_err_fatal_intr_handler (int irq, void *dev_id) { struct pil_tz_data *d = subsys_to_data(dev_id); - u32 nmi_status = 0; - - if (d->reg_base) - nmi_status = readl_relaxed(d->reg_base + - NMI_STATUS_REGISTER); - - if (nmi_status & 0x04) - pr_err("%s: Fatal error on the %s due to TZ NMI\n", - __func__, d->subsys_desc.name); - else - pr_err("%s Fatal error on the %s\n", - __func__, d->subsys_desc.name); + pr_err("Fatal error on %s!\n", d->subsys_desc.name); if (subsys_get_crash_status(d->subsys)) { pr_err("%s: Ignoring error fatal, restart in progress\n", d->subsys_desc.name); @@ -1022,13 +1009,6 @@ static int pil_tz_driver_probe(struct platform_device *pdev) d->keep_proxy_regs_on = of_property_read_bool(pdev->dev.of_node, "qcom,keep-proxy-regs-on"); - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "base_reg"); - d->reg_base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(d->reg_base)) { - dev_err(&pdev->dev, "Failed to iomap base register\n"); - d->reg_base = NULL; - } - rc = of_property_read_string(pdev->dev.of_node, "qcom,firmware-name", &d->desc.name); if (rc) |