From e298b86607dafb2168b9a5ac049ba8c34e82adf7 Mon Sep 17 00:00:00 2001 From: Boojin Kim Date: Tue, 10 Jul 2018 11:18:49 +0900 Subject: [PATCH] Revert "chub: disable silent-reset" This reverts commit cf3574b499e6edc410de2ff3fc124457a1608db2. Change-Id: I7ae071d5241783d846a9ca403d0545b83153b144 Signed-off-by: Boojin Kim --- drivers/staging/nanohub/chub.c | 8 ++------ drivers/staging/nanohub/chub.h | 1 - drivers/staging/nanohub/main.c | 13 ------------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/staging/nanohub/chub.c b/drivers/staging/nanohub/chub.c index 4540c64b56bc..811acdb37d1e 100644 --- a/drivers/staging/nanohub/chub.c +++ b/drivers/staging/nanohub/chub.c @@ -912,7 +912,6 @@ do_reset: /* dump hw & sram into file */ chub_dbg_dump_hw(ipc, err); if (need_reset) { -#ifdef CHUB_RESET_ENABLE ret = contexthub_reset(ipc); if (ret) dev_warn(ipc->dev, "%s: fails to reset %d.\n", @@ -925,9 +924,6 @@ do_reset: if (ipc->irq_wdt) enable_irq(ipc->irq_wdt); } -#else - atomic_set(&ipc->chub_status, CHUB_ST_HANG); -#endif } else { /* dump log into file: DO NOT logbuf dueto sram corruption */ log_dump_all(err); @@ -1047,7 +1043,7 @@ static irqreturn_t contexthub_irq_handler(int irq, void *data) return IRQ_HANDLED; } -#ifdef CHUB_RESET_ENABLE +#ifdef WDT_ENABLE static irqreturn_t contexthub_irq_wdt_handler(int irq, void *data) { struct contexthub_ipc_info *ipc = data; @@ -1179,7 +1175,7 @@ static __init int contexthub_ipc_hw_init(struct platform_device *pdev, return ret; } -#ifdef CHUB_RESET_ENABLE +#ifdef WDT_ENABLE /* get wdt interrupt optionally */ chub->irq_wdt = irq_of_parse_and_map(node, 1); if (chub->irq_wdt > 0) { diff --git a/drivers/staging/nanohub/chub.h b/drivers/staging/nanohub/chub.h index adf573e98504..aa080694b23d 100644 --- a/drivers/staging/nanohub/chub.h +++ b/drivers/staging/nanohub/chub.h @@ -92,7 +92,6 @@ enum chub_status { CHUB_ST_RUN, CHUB_ST_SHUTDOWN, CHUB_ST_NO_RESPONSE, - CHUB_ST_HANG, }; struct read_wait { diff --git a/drivers/staging/nanohub/main.c b/drivers/staging/nanohub/main.c index 48f4b81f7301..2435a1dd42e2 100644 --- a/drivers/staging/nanohub/main.c +++ b/drivers/staging/nanohub/main.c @@ -721,11 +721,7 @@ static int nanohub_hw_reset(struct nanohub_data *data) nanohub_wakeup_unlock(data); } #elif defined(CONFIG_NANOHUB_MAILBOX) -#ifdef CHUB_RESET_ENABLE ret = contexthub_reset(data->pdata->mailbox_client); -#else - ret = -EINVAL; -#endif #endif return ret; } @@ -1409,15 +1405,6 @@ static int nanohub_kthread(void *arg) } msleep_interruptible(WAKEUP_TIMEOUT_MS); nanohub_set_state(data, ST_RUNNING); -#ifdef CONFIG_NANOHUB_MAILBOX -#ifndef CHUB_RESET_ENABLE - if (ret) { - dev_warn(data->io[ID_NANOHUB_SENSOR].dev, - "%s fails. nanohub isn't running\n", __func__); - return 0; - } -#endif -#endif break; case ST_RUNNING: break; -- 2.20.1