Commit 1a9d079f authored Dec 15, 2020 by Matteo Croce Committed by Linus Torvalds Dec 15, 2020

reboot: allow to override reboot type if quirks are found

Patch series "reboot: sysfs improvements".

Some improvements to the sysfs reboot interface: hide not working settings
and support machines with known reboot quirks.

This patch (of 2):

On some machines a quirk can force a specific reboot type.  Quirks are
found during a DMI scan, the list of machines which need special reboot
handling is defined in reboot_dmi_table.

The kernel command line reboot= option overrides this via a global
variable `reboot_default`, so that the reboot type requested in the
command line is really performed.

This was not true when setting the reboot type via the new sysfs
interface.  Fix this by setting reboot_default upon the first change, like
reboot_setup() does for the command line.

Link: https://lkml.kernel.org/r/20201130173717.198952-1-mcroce@linux.microsoft.com
Link: https://lkml.kernel.org/r/20201130173717.198952-2-mcroce@linux.microsoft.com


Signed-off-by: Matteo Croce <mcroce@microsoft.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0c5c0179

kernel/reboot.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -662,6 +662,8 @@ static ssize_t mode_store(struct kobject kobj, struct kobj_attribute attr,
		else
		return -EINVAL;

		reboot_default = 0;

		return count;
		}
		static struct kobj_attribute reboot_mode_attr = __ATTR_RW(mode);
		@@ -716,6 +718,8 @@ static ssize_t type_store(struct kobject kobj, struct kobj_attribute attr,
		else
		return -EINVAL;

		reboot_default = 0;

		return count;
		}
		static struct kobj_attribute reboot_type_attr = __ATTR_RW(type);
		@@ -741,6 +745,7 @@ static ssize_t cpu_store(struct kobject kobj, struct kobj_attribute attr,
		if (cpunum >= num_possible_cpus())
		return -ERANGE;

		reboot_default = 0;
		reboot_cpu = cpunum;

		return count;
		@@ -762,6 +767,7 @@ static ssize_t force_store(struct kobject kobj, struct kobj_attribute attr,
		if (kstrtobool(buf, &res))
		return -EINVAL;

		reboot_default = 0;
		reboot_force = res;

		return count;

Admin message