Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8faa2c4 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

ACPI: watchdog: Allow disabling WDAT at boot 



[ Upstream commit 3f9e12e0df012c4a9a7fd7eb0d3ae69b459d6b2c ]

In case the WDAT interface is broken, give the user an option to
ignore it to let a native driver bind to the watchdog device instead.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 625d0b13

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ 
			dynamic table installation which will install SSDT

			tables to /sys/firmware/acpi/tables/dynamic.



	acpi_no_watchdog	[HW,ACPI,WDT]

			Ignore the ACPI-based watchdog interface (WDAT) and let

			a native driver control the watchdog device instead.



	acpi_rsdp=	[ACPI,EFI,KEXEC]

			Pass the RSDP address to the kernel, mostly used

			on machines running EFI runtime service to boot the

drivers/acpi/acpi_watchdog.c

+11 −1
Original line number Diff line number Diff line
@@ -58,12 +58,14 @@ static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat) 
}

#endif



static bool acpi_no_watchdog;



static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void)

{

	const struct acpi_table_wdat *wdat = NULL;

	acpi_status status;



	if (acpi_disabled)

	if (acpi_disabled || acpi_no_watchdog)

		return NULL;



	status = acpi_get_table(ACPI_SIG_WDAT, 0,
@@ -91,6 +93,14 @@ bool acpi_has_watchdog(void) 
}

EXPORT_SYMBOL_GPL(acpi_has_watchdog);



/* ACPI watchdog can be disabled on boot command line */

static int __init disable_acpi_watchdog(char *str)

{

	acpi_no_watchdog = true;

	return 1;

}

__setup("acpi_no_watchdog", disable_acpi_watchdog);



void __init acpi_watchdog_init(void)

{

	const struct acpi_wdat_entry *entries;