xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: Reset to android12-5.10-keystone-qcom-release

Browse Source 
Reset watchdog back to commit 0fad51fcb6 ("Snap for 7316566 from
a5293ea1ab to
android12-5.10-keystone-qcom-release").

watchdog_en percpu variable and related modifcations are now superceded
by pause feature.

Change-Id: Ief6b47a2e54e3ac2f7ca12285537a6666c3c3bb2
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
This commit is contained in:
Elliot Berman
2021-05-04 22:07:50 -07:00
parent 35f1c19987
commit d6319bff83
1 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
kernel/watchdog.c
View File

@@ -14,7 +14,6 @@
#include <linux/mm.h>
#include <linux/cpu.h>
#include <linux/device.h>
#include <linux/nmi.h>
#include <linux/init.h>
#include <linux/module.h>
@@ -174,7 +173,6 @@ static u64 __read_mostly sample_period;
static DEFINE_PER_CPU(unsigned long, watchdog_touch_ts);
static DEFINE_PER_CPU(struct hrtimer, watchdog_hrtimer);
static DEFINE_PER_CPU(unsigned int, watchdog_en);
static DEFINE_PER_CPU(bool, softlockup_touch_sync);
static DEFINE_PER_CPU(bool, soft_watchdog_warn);
static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts);
@@ -445,20 +443,16 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
return HRTIMER_RESTART;
}
void watchdog_enable(unsigned int cpu)
static void watchdog_enable(unsigned int cpu)
{
struct hrtimer *hrtimer = this_cpu_ptr(&watchdog_hrtimer);
struct completion *done = this_cpu_ptr(&softlockup_completion);
unsigned int *enabled = this_cpu_ptr(&watchdog_en);
WARN_ON_ONCE(cpu != smp_processor_id());
init_completion(done);
complete(done);
if (*enabled)
return;
/*
* Start the timer first to prevent the NMI watchdog triggering
* before the timer has a chance to fire.
@@ -473,24 +467,13 @@ void watchdog_enable(unsigned int cpu)
/* Enable the perf event */
if (watchdog_enabled & NMI_WATCHDOG_ENABLED)
watchdog_nmi_enable(cpu);
/*
* Need to ensure above operations are observed by other CPUs before
* indicating that timer is enabled. This is to synchronize core
* isolation and hotplug. Core isolation will wait for this flag to be
* set.
*/
mb();
*enabled = 1;
}
void watchdog_disable(unsigned int cpu)
static void watchdog_disable(unsigned int cpu)
{
struct hrtimer *hrtimer = per_cpu_ptr(&watchdog_hrtimer, cpu);
unsigned int *enabled = per_cpu_ptr(&watchdog_en, cpu);
struct hrtimer *hrtimer = this_cpu_ptr(&watchdog_hrtimer);
if (!*enabled)
return;
WARN_ON_ONCE(cpu != smp_processor_id());
/*
* Disable the perf event first. That prevents that a large delay
@@ -499,18 +482,7 @@ void watchdog_disable(unsigned int cpu)
*/
watchdog_nmi_disable(cpu);
hrtimer_cancel(hrtimer);
wait_for_completion(per_cpu_ptr(&softlockup_completion, cpu));
/*
* No need for barrier here since disabling the watchdog is
* synchronized with hotplug lock
*/
*enabled = 0;
}
bool watchdog_configured(unsigned int cpu)
{
return *per_cpu_ptr(&watchdog_en, cpu);
wait_for_completion(this_cpu_ptr(&softlockup_completion));
}
static int softlockup_stop_fn(void *data)