[PATCH] x86/shutdown: use ACPI reboot method for Dell PowerEdge R540

[PATCH] x86/shutdown: use ACPI reboot method for Dell PowerEdge R540

[Ross Lagerwall]

When EFI booting the Dell PowerEdge R540 it consistently wanders into
the weeds and gets an invalid opcode in the EFI ResetSystem call. This
is the same bug which affects the PowerEdge R740 so fix it in the same
way: quirk this hardware to use the ACPI reboot method instead.

BIOS Information
    Vendor: Dell Inc.
    Version: 1.3.7
    Release Date: 02/09/2018
System Information
    Manufacturer: Dell Inc.
    Product Name: PowerEdge R540

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
---
 xen/arch/x86/shutdown.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index c709e13..0a55552 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -520,6 +520,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
             DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R740"),
         },
     },
+    {    /* Handle problems with rebooting on Dell PowerEdge R540. */
+        .callback = override_reboot,
+        .driver_data = (void *)(long)BOOT_ACPI,
+        .ident = "Dell PowerEdge R540",
+        .matches = {
+            DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+            DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R540"),
+        },
+    },
     { }
 };
 
-- 
2.9.5


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/shutdown: use ACPI reboot method for Dell PowerEdge R540

[Jan Beulich]

>>> On 14.05.18 at 13:02, <ross.lagerwall@citrix.com> wrote:
> When EFI booting the Dell PowerEdge R540 it consistently wanders into
> the weeds and gets an invalid opcode in the EFI ResetSystem call. This
> is the same bug which affects the PowerEdge R740 so fix it in the same
> way: quirk this hardware to use the ACPI reboot method instead.
> 
> BIOS Information
>     Vendor: Dell Inc.
>     Version: 1.3.7
>     Release Date: 02/09/2018
> System Information
>     Manufacturer: Dell Inc.
>     Product Name: PowerEdge R540
> 
> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>

Acked-by: Jan Beulich <jbeulich@suse.com>
with a remark:

> --- a/xen/arch/x86/shutdown.c
> +++ b/xen/arch/x86/shutdown.c
> @@ -520,6 +520,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
>              DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R740"),
>          },
>      },
> +    {    /* Handle problems with rebooting on Dell PowerEdge R540. */
> +        .callback = override_reboot,
> +        .driver_data = (void *)(long)BOOT_ACPI,
> +        .ident = "Dell PowerEdge R540",
> +        .matches = {
> +            DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +            DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R540"),
> +        },
> +    },
>      { }

Assuming ordinary numbering of machine models (R540 being older than
R740), I think it would be better to place the new entry ahead of the
R740 one. Should I end up being the one to commit this, I would take the
liberty of doing the re-arrangement at that point.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/shutdown: use ACPI reboot method for Dell PowerEdge R540

[Ross Lagerwall]

On 05/14/2018 04:17 PM, Jan Beulich wrote:
>>>> On 14.05.18 at 13:02, <ross.lagerwall@citrix.com> wrote:
>> When EFI booting the Dell PowerEdge R540 it consistently wanders into
>> the weeds and gets an invalid opcode in the EFI ResetSystem call. This
>> is the same bug which affects the PowerEdge R740 so fix it in the same
>> way: quirk this hardware to use the ACPI reboot method instead.
>>
>> BIOS Information
>>      Vendor: Dell Inc.
>>      Version: 1.3.7
>>      Release Date: 02/09/2018
>> System Information
>>      Manufacturer: Dell Inc.
>>      Product Name: PowerEdge R540
>>
>> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
> 
> Acked-by: Jan Beulich <jbeulich@suse.com>
> with a remark:
> 
>> --- a/xen/arch/x86/shutdown.c
>> +++ b/xen/arch/x86/shutdown.c
>> @@ -520,6 +520,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
>>               DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R740"),
>>           },
>>       },
>> +    {    /* Handle problems with rebooting on Dell PowerEdge R540. */
>> +        .callback = override_reboot,
>> +        .driver_data = (void *)(long)BOOT_ACPI,
>> +        .ident = "Dell PowerEdge R540",
>> +        .matches = {
>> +            DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
>> +            DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R540"),
>> +        },
>> +    },
>>       { }
> 
> Assuming ordinary numbering of machine models (R540 being older than
> R740), I think it would be better to place the new entry ahead of the
> R740 one. Should I end up being the one to commit this, I would take the
> liberty of doing the re-arrangement at that point.
> 

My googling suggests they're both the same generation of server, with 
the R740 being more powerful than the R540. I don't mind either way in 
which order they are placed although having R540 before R740 is indeed a 
bit more logical.

-- 
Ross Lagerwall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/shutdown: use ACPI reboot method for Dell PowerEdge R540

[Andrew Cooper]

On 14/05/18 17:22, Ross Lagerwall wrote:
> On 05/14/2018 04:17 PM, Jan Beulich wrote:
>>>>> On 14.05.18 at 13:02, <ross.lagerwall@citrix.com> wrote:
>>> When EFI booting the Dell PowerEdge R540 it consistently wanders into
>>> the weeds and gets an invalid opcode in the EFI ResetSystem call. This
>>> is the same bug which affects the PowerEdge R740 so fix it in the same
>>> way: quirk this hardware to use the ACPI reboot method instead.
>>>
>>> BIOS Information
>>>      Vendor: Dell Inc.
>>>      Version: 1.3.7
>>>      Release Date: 02/09/2018
>>> System Information
>>>      Manufacturer: Dell Inc.
>>>      Product Name: PowerEdge R540
>>>
>>> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
>>
>> Acked-by: Jan Beulich <jbeulich@suse.com>
>> with a remark:
>>
>>> --- a/xen/arch/x86/shutdown.c
>>> +++ b/xen/arch/x86/shutdown.c
>>> @@ -520,6 +520,15 @@ static struct dmi_system_id __initdata
>>> reboot_dmi_table[] = {
>>>               DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R740"),
>>>           },
>>>       },
>>> +    {    /* Handle problems with rebooting on Dell PowerEdge R540. */
>>> +        .callback = override_reboot,
>>> +        .driver_data = (void *)(long)BOOT_ACPI,
>>> +        .ident = "Dell PowerEdge R540",
>>> +        .matches = {
>>> +            DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
>>> +            DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R540"),
>>> +        },
>>> +    },
>>>       { }
>>
>> Assuming ordinary numbering of machine models (R540 being older than
>> R740), I think it would be better to place the new entry ahead of the
>> R740 one. Should I end up being the one to commit this, I would take the
>> liberty of doing the re-arrangement at that point.
>>
>
> My googling suggests they're both the same generation of server, with
> the R740 being more powerful than the R540. I don't mind either way in
> which order they are placed although having R540 before R740 is indeed
> a bit more logical.

Dell's numbering isn't chronological, and needs logically decoding from
the low order end.

R => Rackmount
x => Type, between 1 and 9.  5 is "2-cpu system"
y => Generation ($Y + 10)
z => 0 for Intel, 5 for AMD

Working backwards, this is an Intel, Gen 14 (which is Skylake) 2-socket
rackmount system.

The main difference between a R540 and R740 seems to be the basic vs
enterprise iDRAC controller, and the associated "value add".

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel