malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "soc: qcom: Dump more watchdog data when watchdog bark"

Browse Source 
This reverts commit 919eece679cd1097f13cbb9208e3f1f7668fac6a.

Change-Id: Id71d1a079d09a1aeff9c292f49d2486b28713ea9
Signed-off-by: Richard Raya <rdxzv.dev@gmail.com>
This commit is contained in:
Richard Raya 2024-09-08 20:45:32 -03:00
parent bfdaa3af2f
commit 889bdb0b06
1 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/soc/qcom/watchdog_v2.c
View File

@ -55,8 +55,6 @@
#define SCM_SVC_SEC_WDOG_DIS 0x7
#define MAX_CPU_CTX_SIZE 2048
#define WDOG_BITE_OFFSET_IN_SECONDS 3
static struct msm_watchdog_data *wdog_data;
static int cpu_idle_pc_state[NR_CPUS];
@ -536,9 +534,6 @@ static irqreturn_t wdog_bark_handler(int irq, void *dev_id)
struct msm_watchdog_data *wdog_dd = (struct msm_watchdog_data *)dev_id;
unsigned long nanosec_rem;
unsigned long long t = sched_clock();
struct task_struct *wdog_task;
int cpu;
struct cpumask *bark_affinity;
nanosec_rem = do_div(t, 1000000000);
dev_info(wdog_dd->dev, "Watchdog bark! Now = %lu.%06lu\n",
@ -549,50 +544,6 @@ static irqreturn_t wdog_bark_handler(int irq, void *dev_id)
(unsigned long) wdog_dd->last_pet, nanosec_rem / 1000);
if (wdog_dd->do_ipi_ping)
dump_cpu_alive_mask(wdog_dd);
/* Print pet, bark and bite expire times */
dev_info(wdog_dd->dev, "Pet: %dms, Bark: %dms, Bite: %dms\n",
wdog_dd->pet_time, wdog_dd->bark_time,
wdog_dd->bark_time + WDOG_BITE_OFFSET_IN_SECONDS*1000);
/* Check if pet task is running */
wdog_task = wdog_dd->watchdog_task;
if (wdog_task) {
if (wdog_task->on_cpu) {
dev_info(wdog_dd->dev, "Pet task is running on CPU%d\n",
task_cpu(wdog_task));
for_each_cpu(cpu, cpu_present_mask) {
if (wdog_dd->ping_start[cpu] != 0 &&
wdog_dd->ping_end[cpu] == 0) {
dev_info(wdog_dd->dev, "CPU%d did not "
"respond to IPI ping\n",
cpu);
break;
}
}
} else if (wdog_task->state == TASK_RUNNING) {
dev_info(wdog_dd->dev, "Pet task is waiting on CPU%d\n",
task_cpu(wdog_task));
} else if (wdog_dd->timer_expired) {
dev_info(wdog_dd->dev,
"Pet timer expired but pet task not queued\n");
} else {
dev_info(wdog_dd->dev,
"Pet timer not expired, queued on CPU%d\n",
wdog_dd->pet_timer.flags & TIMER_CPUMASK);
}
}
/* Print current jiffies and pet timer expiring jiffies */
dev_info(wdog_dd->dev, "Current jiffies: %lu\n", jiffies);
dev_info(wdog_dd->dev, "Pet timer expire: %lu\n",
wdog_dd->pet_timer.expires);
/* Print watchdog bark IRQ affinity mask */
bark_affinity = irq_get_affinity_mask(wdog_dd->bark_irq);
dev_info(wdog_dd->dev, "Watchdog bark IRQ %d CPU affinity: %*pbl\n",
irq, cpumask_pr_args(bark_affinity));
msm_trigger_wdog_bite();
panic("Failed to cause a watchdog bite! - Falling back to kernel panic!");
return IRQ_HANDLED;
@ -798,8 +749,7 @@ static void init_watchdog_data(struct msm_watchdog_data *wdog_dd)
configure_bark_dump(wdog_dd);
timeout = (wdog_dd->bark_time * WDT_HZ)/1000;
__raw_writel(timeout, wdog_dd->base + WDT0_BARK_TIME);
__raw_writel(timeout + WDOG_BITE_OFFSET_IN_SECONDS*WDT_HZ,
wdog_dd->base + WDT0_BITE_TIME);
__raw_writel(timeout + 3*WDT_HZ, wdog_dd->base + WDT0_BITE_TIME);
wdog_dd->panic_blk.notifier_call = panic_wdog_handler;
atomic_notifier_chain_register(&panic_notifier_list,