Re: [PATCH v2] x86/EFI: allow reboot= overrides when running under EFI

[Andrew Cooper <andrew.cooper3@citrix.com>]

On 13/03/15 10:37, Jan Beulich wrote:
>>>> On 12.03.15 at 17:43, <andrew.cooper3@citrix.com> wrote:
>> On 12/03/15 16:32, Jan Beulich wrote:
>>> By default we will always use EFI reboot mechanism when
>>> running under EFI platforms. However some EFI platforms
>>> are buggy and need to use the ACPI mechanism to
>>> reboot (such as Lenovo ThinkCentre M57). As such
>>> respect the 'reboot=' override and DMI overrides
>>> for EFI platforms.
>>>
>>> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>>>
>>> - BOOT_INVALID is just zero
>>> - also consider acpi_disabled in BOOT_INVALID resolution
>>> - duplicate BOOT_INVALID resolution in machine_restart()
>>> - don't fall back from BOOT_ACPI to BOOT_EFI (if it was overridden, it
>>>   surely was for a reason)
>>> - adjust doc change formatting
>>>
>>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>>> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>
>> Are you happy merging this with Ross's v2 patch (my review still
>> withstanding), with which this conflicts?
> And which allows this to become even less of a change:
>
> x86: don't apply reboot quirks if reboot set by user
>
> If reboot= is specified on the command-line, don't apply reboot quirks
> to allow the command-line option to take precedence.
>
> This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI
> checks if reboot set by user").
>
> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
>
> Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow
> reboot= overrides when running under EFI").
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

>
> --- a/xen/arch/x86/shutdown.c
> +++ b/xen/arch/x86/shutdown.c
> @@ -464,6 +464,13 @@ static struct dmi_system_id __initdata r
>  
>  static int __init reboot_init(void)
>  {
> +    /*
> +     * Only do the DMI check if reboot_type hasn't been overridden
> +     * on the command line
> +     */
> +    if ( reboot_type != BOOT_INVALID )
> +        return 0;
> +
>      default_reboot_type();
>      dmi_check_system(reboot_dmi_table);
>      return 0;
>
>
>