The patch titled
Subject: reboot: remove cf9_safe from allowed types and rename cf9_force
has been added to the -mm tree. Its filename is
reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Matteo Croce <mcroce@xxxxxxxxxxxxx>
Subject: reboot: remove cf9_safe from allowed types and rename cf9_force
BOOT_CF9_SAFE_STR is an internal value used only by the x86 code and it's
not possible to set it from userspace.
Remove it, and rename 'cf9_force' to 'pci', so to make it coherent with
the kernel command line reboot= option.
Tested with this script:
cd /sys/kernel/reboot/
for i in cold warm hard soft gpio; do
echo $i >mode
read j <mode
[ $i = $j ] || echo "mode $i != $j"
done
for i in bios acpi kbd triple efi pci; do
echo $i >type
read j <type
[ $i = $j ] || echo "type $i != $j"
done
for i in $(seq 0 $(nproc --ignore=1)); do
echo $i >cpu
read j <cpu
[ $i = $j ] || echo "cpu $i != $j"
done
for i in 0 1; do
echo $i >force
read j <force
[ $i = $j ] || echo "force $i != $j"
done
Link: https://lkml.kernel.org/r/20201113015900.543923-1-mcroce@xxxxxxxxxxxxxxxxxxx
Fixes: eab8da48579d ("reboot: allow to specify reboot mode via sysfs")
Signed-off-by: Matteo Croce <mcroce@xxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxx>
Cc: Nathan Chancellor <natechancellor@xxxxxxxxx>
Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxxx>
Cc: Tyler Hicks <tyhicks@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/reboot.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
--- a/kernel/reboot.c~reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force
+++ a/kernel/reboot.c
@@ -613,8 +613,7 @@ __setup("reboot=", reboot_setup);
#define BOOT_BIOS_STR "bios"
#define BOOT_ACPI_STR "acpi"
#define BOOT_EFI_STR "efi"
-#define BOOT_CF9_FORCE_STR "cf9_force"
-#define BOOT_CF9_SAFE_STR "cf9_safe"
+#define BOOT_PCI_STR "pci"
static ssize_t mode_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
@@ -686,10 +685,7 @@ static ssize_t type_show(struct kobject
val = BOOT_EFI_STR;
break;
case BOOT_CF9_FORCE:
- val = BOOT_CF9_FORCE_STR;
- break;
- case BOOT_CF9_SAFE:
- val = BOOT_CF9_SAFE_STR;
+ val = BOOT_PCI_STR;
break;
default:
val = REBOOT_UNDEFINED_STR;
@@ -713,10 +709,8 @@ static ssize_t type_store(struct kobject
reboot_type = BOOT_ACPI;
else if (!strncmp(buf, BOOT_EFI_STR, strlen(BOOT_EFI_STR)))
reboot_type = BOOT_EFI;
- else if (!strncmp(buf, BOOT_CF9_FORCE_STR, strlen(BOOT_CF9_FORCE_STR)))
+ else if (!strncmp(buf, BOOT_PCI_STR, strlen(BOOT_PCI_STR)))
reboot_type = BOOT_CF9_FORCE;
- else if (!strncmp(buf, BOOT_CF9_SAFE_STR, strlen(BOOT_CF9_SAFE_STR)))
- reboot_type = BOOT_CF9_SAFE;
else
return -EINVAL;
_
Patches currently in -mm which might be from mcroce@xxxxxxxxxxxxx are
revert-kernel-rebootc-convert-simple_strtoul-to-kstrtoint.patch
reboot-fix-overflow-parsing-reboot-cpu-number.patch
reboot-refactor-and-comment-the-cpu-selection-code.patch
reboot-allow-to-specify-reboot-mode-via-sysfs.patch
reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force.patch
