* [PATCH] x86: remove references to unimplemented BIOS reboot option
@ 2013-08-30 0:13 Matt Wilson
2013-08-30 5:23 ` Keir Fraser
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Matt Wilson @ 2013-08-30 0:13 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Ben Guthro, Keir Fraser, Jan Beulich
The BIOS reboot option was never implemented for x86_64, and retaining
it is somewhat false advertising.
Signed-off-by: Matt Wilson <msw@amazon.com>
Cc: Keir Fraser <keir@xen.org>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Ben Guthro <benjamin.guthro@citrix.com>
---
docs/misc/xen-command-line.markdown | 5 +---
xen/arch/x86/shutdown.c | 42 ++++++++++++++--------------------
2 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown
index 13c0306..da97da8 100644
--- a/docs/misc/xen-command-line.markdown
+++ b/docs/misc/xen-command-line.markdown
@@ -747,7 +747,7 @@ This option can be specified more than once (up to 8 times at present).
> `= <integer>`
### reboot
-> `= b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]`
+> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]`
Default: `0`
@@ -757,9 +757,6 @@ Specify the host reboot method.
`cold` instructs Xen to set the cold reboot flag.
-`bios` instructs Xen to reboot the host by jumping to BIOS. This is
-only available on 32-bit x86 platforms.
-
`triple` instructs Xen to reboot the host by causing a triple fault.
`kbd` instructs Xen to reboot the host via the keyboard controller.
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 4715681..167905a 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -31,7 +31,6 @@ enum reboot_type {
BOOT_TRIPLE = 't',
BOOT_KBD = 'k',
BOOT_ACPI = 'a',
- BOOT_BIOS = 'b',
BOOT_CF9 = 'p',
};
@@ -42,7 +41,6 @@ static int reboot_mode;
* reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]
* warm Don't set the cold reboot flag
* cold Set the cold reboot flag
- * bios Reboot by jumping through the BIOS (only for X86_32)
* triple Force a triple fault (init)
* kbd Use the keyboard controller. cold reset (default)
* acpi Use the RESET_REG in the FADT
@@ -64,7 +62,6 @@ static void __init set_reboot_type(char *str)
case 'c': /* "cold" reboot (with memory testing etc) */
reboot_mode = 0x0;
break;
- case 'b':
case 'a':
case 'k':
case 't':
@@ -112,7 +109,6 @@ static int __init override_reboot(struct dmi_system_id *d)
{
static const char *__initdata msg[] =
{
- [BOOT_BIOS] = "BIOS",
[BOOT_KBD] = "keyboard controller",
[BOOT_CF9] = "PCI",
};
@@ -128,7 +124,7 @@ static int __init override_reboot(struct dmi_system_id *d)
static struct dmi_system_id __initdata reboot_dmi_table[] = {
{ /* Handle problems with rebooting on Dell E520's */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell E520",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -137,7 +133,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell 1300's */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell PowerEdge 1300",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
@@ -146,7 +142,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell 300's */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell PowerEdge 300",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
@@ -155,7 +151,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell Optiplex 745's SFF */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell OptiPlex 745",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -164,7 +160,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell Optiplex 745's DFF */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell OptiPlex 745",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -174,7 +170,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell OptiPlex 745",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -184,7 +180,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell OptiPlex 330",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -194,7 +190,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell OptiPlex 360",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -204,7 +200,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell OptiPlex 760",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -214,7 +210,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell 2400's */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell PowerEdge 2400",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
@@ -223,7 +219,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell T5400's */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell Precision T5400",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -232,7 +228,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell T7400's */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell Precision T7400",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -241,7 +237,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on HP laptops */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "HP Compaq Laptop",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
@@ -250,7 +246,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell XPS710 */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell XPS710",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -259,7 +255,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Dell DXP061 */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Dell DXP061",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -268,7 +264,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on Sony VGN-Z540N */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "Sony VGN-Z540N",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
@@ -277,7 +273,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
},
{ /* Handle problems with rebooting on ASUS P4S800 */
.callback = override_reboot,
- .driver_data = (void *)(long)BOOT_BIOS,
+ .driver_data = (void *)(long)BOOT_KBD,
.ident = "ASUS P4S800",
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
@@ -530,10 +526,6 @@ void machine_restart(unsigned int delay_millisecs)
asm volatile ( "lidt %0 ; int3" : "=m" (no_idt) );
reboot_type = BOOT_KBD;
break;
- case BOOT_BIOS:
- /* unsupported on x86_64 */
- reboot_type = BOOT_KBD;
- break;
case BOOT_ACPI:
acpi_reboot();
reboot_type = BOOT_KBD;
--
1.7.4.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: remove references to unimplemented BIOS reboot option
2013-08-30 0:13 [PATCH] x86: remove references to unimplemented BIOS reboot option Matt Wilson
@ 2013-08-30 5:23 ` Keir Fraser
2013-08-30 8:40 ` Andrew Cooper
2013-08-30 8:53 ` Jan Beulich
2 siblings, 0 replies; 5+ messages in thread
From: Keir Fraser @ 2013-08-30 5:23 UTC (permalink / raw)
To: Matt Wilson, xen-devel; +Cc: Andrew Cooper, Ben Guthro, Jan Beulich
On 30/08/2013 01:13, "Matt Wilson" <msw@amazon.com> wrote:
> The BIOS reboot option was never implemented for x86_64, and retaining
> it is somewhat false advertising.
>
> Signed-off-by: Matt Wilson <msw@amazon.com>
> Cc: Keir Fraser <keir@xen.org>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Ben Guthro <benjamin.guthro@citrix.com>
> ---
Acked-by: Keir Fraser <keir@xen.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: remove references to unimplemented BIOS reboot option
2013-08-30 0:13 [PATCH] x86: remove references to unimplemented BIOS reboot option Matt Wilson
2013-08-30 5:23 ` Keir Fraser
@ 2013-08-30 8:40 ` Andrew Cooper
2013-08-30 8:53 ` Jan Beulich
2 siblings, 0 replies; 5+ messages in thread
From: Andrew Cooper @ 2013-08-30 8:40 UTC (permalink / raw)
To: Matt Wilson; +Cc: xen-devel, Ben Guthro, Keir Fraser, Jan Beulich
On 30/08/13 01:13, Matt Wilson wrote:
> The BIOS reboot option was never implemented for x86_64, and retaining
> it is somewhat false advertising.
>
> Signed-off-by: Matt Wilson <msw@amazon.com>
> Cc: Keir Fraser <keir@xen.org>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Ben Guthro <benjamin.guthro@citrix.com>
> ---
> docs/misc/xen-command-line.markdown | 5 +---
> xen/arch/x86/shutdown.c | 42 ++++++++++++++--------------------
> 2 files changed, 18 insertions(+), 29 deletions(-)
>
> diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown
> index 13c0306..da97da8 100644
> --- a/docs/misc/xen-command-line.markdown
> +++ b/docs/misc/xen-command-line.markdown
> @@ -747,7 +747,7 @@ This option can be specified more than once (up to 8 times at present).
> > `= <integer>`
>
> ### reboot
> -> `= b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]`
> +> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]`
>
> Default: `0`
>
> @@ -757,9 +757,6 @@ Specify the host reboot method.
>
> `cold` instructs Xen to set the cold reboot flag.
>
> -`bios` instructs Xen to reboot the host by jumping to BIOS. This is
> -only available on 32-bit x86 platforms.
> -
> `triple` instructs Xen to reboot the host by causing a triple fault.
>
> `kbd` instructs Xen to reboot the host via the keyboard controller.
> diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
> index 4715681..167905a 100644
> --- a/xen/arch/x86/shutdown.c
> +++ b/xen/arch/x86/shutdown.c
> @@ -31,7 +31,6 @@ enum reboot_type {
> BOOT_TRIPLE = 't',
> BOOT_KBD = 'k',
> BOOT_ACPI = 'a',
> - BOOT_BIOS = 'b',
> BOOT_CF9 = 'p',
> };
>
> @@ -42,7 +41,6 @@ static int reboot_mode;
> * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]
> * warm Don't set the cold reboot flag
> * cold Set the cold reboot flag
> - * bios Reboot by jumping through the BIOS (only for X86_32)
> * triple Force a triple fault (init)
> * kbd Use the keyboard controller. cold reset (default)
> * acpi Use the RESET_REG in the FADT
> @@ -64,7 +62,6 @@ static void __init set_reboot_type(char *str)
> case 'c': /* "cold" reboot (with memory testing etc) */
> reboot_mode = 0x0;
> break;
> - case 'b':
> case 'a':
> case 'k':
> case 't':
> @@ -112,7 +109,6 @@ static int __init override_reboot(struct dmi_system_id *d)
> {
> static const char *__initdata msg[] =
> {
> - [BOOT_BIOS] = "BIOS",
> [BOOT_KBD] = "keyboard controller",
> [BOOT_CF9] = "PCI",
> };
> @@ -128,7 +124,7 @@ static int __init override_reboot(struct dmi_system_id *d)
> static struct dmi_system_id __initdata reboot_dmi_table[] = {
> { /* Handle problems with rebooting on Dell E520's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell E520",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -137,7 +133,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell 1300's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell PowerEdge 1300",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -146,7 +142,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell 300's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell PowerEdge 300",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -155,7 +151,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 745's SFF */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 745",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -164,7 +160,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 745's DFF */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 745",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -174,7 +170,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 745",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -184,7 +180,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 330",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -194,7 +190,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 360",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -204,7 +200,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 760",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -214,7 +210,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell 2400's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell PowerEdge 2400",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -223,7 +219,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell T5400's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell Precision T5400",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -232,7 +228,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell T7400's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell Precision T7400",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -241,7 +237,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on HP laptops */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "HP Compaq Laptop",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> @@ -250,7 +246,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell XPS710 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell XPS710",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -259,7 +255,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell DXP061 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell DXP061",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -268,7 +264,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Sony VGN-Z540N */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Sony VGN-Z540N",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
> @@ -277,7 +273,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on ASUS P4S800 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "ASUS P4S800",
> .matches = {
> DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
> @@ -530,10 +526,6 @@ void machine_restart(unsigned int delay_millisecs)
> asm volatile ( "lidt %0 ; int3" : "=m" (no_idt) );
> reboot_type = BOOT_KBD;
> break;
> - case BOOT_BIOS:
> - /* unsupported on x86_64 */
> - reboot_type = BOOT_KBD;
> - break;
> case BOOT_ACPI:
> acpi_reboot();
> reboot_type = BOOT_KBD;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: remove references to unimplemented BIOS reboot option
2013-08-30 0:13 [PATCH] x86: remove references to unimplemented BIOS reboot option Matt Wilson
2013-08-30 5:23 ` Keir Fraser
2013-08-30 8:40 ` Andrew Cooper
@ 2013-08-30 8:53 ` Jan Beulich
2013-08-30 16:25 ` Matt Wilson
2 siblings, 1 reply; 5+ messages in thread
From: Jan Beulich @ 2013-08-30 8:53 UTC (permalink / raw)
To: Matt Wilson; +Cc: Andrew Cooper, Ben Guthro, Keir Fraser, xen-devel
>>> On 30.08.13 at 02:13, Matt Wilson <msw@amazon.com> wrote:
> The BIOS reboot option was never implemented for x86_64, and retaining
> it is somewhat false advertising.
Applied, but ...
> @@ -128,7 +124,7 @@ static int __init override_reboot(struct dmi_system_id *d)
> static struct dmi_system_id __initdata reboot_dmi_table[] = {
> { /* Handle problems with rebooting on Dell E520's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell E520",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -137,7 +133,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell 1300's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell PowerEdge 1300",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -146,7 +142,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell 300's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell PowerEdge 300",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -155,7 +151,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 745's SFF */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 745",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -164,7 +160,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 745's DFF */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 745",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -174,7 +170,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 745",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -184,7 +180,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 330",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -194,7 +190,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 360",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -204,7 +200,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell OptiPlex 760",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -214,7 +210,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell 2400's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell PowerEdge 2400",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -223,7 +219,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell T5400's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell Precision T5400",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -232,7 +228,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell T7400's */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell Precision T7400",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -241,7 +237,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on HP laptops */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "HP Compaq Laptop",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> @@ -250,7 +246,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell XPS710 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell XPS710",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -259,7 +255,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Dell DXP061 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Dell DXP061",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> @@ -268,7 +264,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on Sony VGN-Z540N */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "Sony VGN-Z540N",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
> @@ -277,7 +273,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> },
> { /* Handle problems with rebooting on ASUS P4S800 */
> .callback = override_reboot,
> - .driver_data = (void *)(long)BOOT_BIOS,
> + .driver_data = (void *)(long)BOOT_KBD,
> .ident = "ASUS P4S800",
> .matches = {
> DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
... I guess quite a few of these entries are obsolete too.
Jan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: remove references to unimplemented BIOS reboot option
2013-08-30 8:53 ` Jan Beulich
@ 2013-08-30 16:25 ` Matt Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Matt Wilson @ 2013-08-30 16:25 UTC (permalink / raw)
To: Jan Beulich
Cc: Andrew Cooper, Ben Guthro, Keir Fraser, Matt Wilson, xen-devel
On Fri, Aug 30, 2013 at 09:53:21AM +0100, Jan Beulich wrote:
> >>> On 30.08.13 at 02:13, Matt Wilson <msw@amazon.com> wrote:
> > The BIOS reboot option was never implemented for x86_64, and retaining
> > it is somewhat false advertising.
>
> Applied, but ...
>
> > @@ -128,7 +124,7 @@ static int __init override_reboot(struct dmi_system_id *d)
> > static struct dmi_system_id __initdata reboot_dmi_table[] = {
> > { /* Handle problems with rebooting on Dell E520's */
> > .callback = override_reboot,
> > - .driver_data = (void *)(long)BOOT_BIOS,
> > + .driver_data = (void *)(long)BOOT_KBD,
> > .ident = "Dell E520",
> > .matches = {
> > DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
[...]
> > @@ -277,7 +273,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> > },
> > { /* Handle problems with rebooting on ASUS P4S800 */
> > .callback = override_reboot,
> > - .driver_data = (void *)(long)BOOT_BIOS,
> > + .driver_data = (void *)(long)BOOT_KBD,
> > .ident = "ASUS P4S800",
> > .matches = {
> > DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
>
> ... I guess quite a few of these entries are obsolete too.
I spot checked a few and they supported x86_64. I didn't really want
to dig into every one, so I figured we'd just leave it for now.
--msw
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-30 16:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-30 0:13 [PATCH] x86: remove references to unimplemented BIOS reboot option Matt Wilson
2013-08-30 5:23 ` Keir Fraser
2013-08-30 8:40 ` Andrew Cooper
2013-08-30 8:53 ` Jan Beulich
2013-08-30 16:25 ` Matt Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.