| From c42cbe41727a138905a28f8e0b00c147be77ee93 Mon Sep 17 00:00:00 2001 |
| From: Jerry Hoemann <jerry.hoemann@hpe.com> |
| Date: Mon, 23 Oct 2017 16:46:16 -0600 |
| Subject: watchdog: hpwdt: SMBIOS check |
| |
| From: Jerry Hoemann <jerry.hoemann@hpe.com> |
| |
| commit c42cbe41727a138905a28f8e0b00c147be77ee93 upstream. |
| |
| This corrects: |
| commit cce78da76601 ("watchdog: hpwdt: Add check for UEFI bits") |
| |
| The test on HPE SMBIOS extension type 219 record "Misc Features" |
| bits for UEFI support is incorrect. The definition of the Misc Features |
| bits in the HPE SMBIOS OEM Extensions specification (and related |
| firmware) was changed to use a different pair of bits to |
| represent UEFI supported. Howerver, a corresponding change |
| to Linux was missed. |
| |
| Current code/platform work because the iCRU test is working. |
| But purpose of cce78da766 is to ensure correct functionality |
| on future systems where iCRU isn't supported. |
| |
| Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> |
| Reviewed-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Wim Van Sebroeck <wim@iguana.be> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/watchdog/hpwdt.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/watchdog/hpwdt.c |
| +++ b/drivers/watchdog/hpwdt.c |
| @@ -700,7 +700,7 @@ static void dmi_find_icru(const struct d |
| smbios_proliant_ptr = (struct smbios_proliant_info *) dm; |
| if (smbios_proliant_ptr->misc_features & 0x01) |
| is_icru = 1; |
| - if (smbios_proliant_ptr->misc_features & 0x408) |
| + if (smbios_proliant_ptr->misc_features & 0x1400) |
| is_uefi = 1; |
| } |
| } |