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

Commit 4d581259 authored by Alex Hung's avatar Alex Hung Committed by Ingo Molnar
Browse files

x86/reboot: Add Dell Optiplex 7450 AIO reboot quirk 



Dell Optiplex 7450 AIO works with BOOT_ACPI; however, the quirk for
"OptiPlex 745" changes its boot method to BOOT_BIOS and causes 7450 AIO
hangs when rebooting; as a result, 7450 AIO is appended to overwrite
BOOT_BIOS by BOOT_ACPI in order not to break the original 745 series

Signed-off-by: default avatarAlex Hung <alex.hung@canonical.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f97d1045

arch/x86/kernel/reboot.c

+21 −0
Original line number Diff line number Diff line
@@ -54,6 +54,19 @@ bool port_cf9_safe = false; 
 * Dell Inc. so their systems "just work". :-)

 */



/*

 * Some machines require the "reboot=a" commandline options

 */

static int __init set_acpi_reboot(const struct dmi_system_id *d)

{

	if (reboot_type != BOOT_ACPI) {

		reboot_type = BOOT_ACPI;

		pr_info("%s series board detected. Selecting %s-method for reboots.\n",

			d->ident, "ACPI");

	}

	return 0;

}



/*

 * Some machines require the "reboot=b" or "reboot=k"  commandline options,

 * this quirk makes that automatic.
@@ -395,6 +408,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Dell XPS710"),

		},

	},

	{	/* Handle problems with rebooting on Dell Optiplex 7450 AIO */

		.callback = set_acpi_reboot,

		.ident = "Dell OptiPlex 7450 AIO",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 7450 AIO"),

		},

	},



	/* Hewlett-Packard */

	{	/* Handle problems with rebooting on HP laptops */