diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
| commit | e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a (patch) | |
| tree | 724e53ad8d5c0f42dc98ddc9e9ab1f39e1e3c542 /0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch | |
| parent | 7b32641801900ee7e32065b436d7318c5d7a972e (diff) | |
| parent | d176dfce22f5ead7a6018edb69757bc8840cc008 (diff) | |
| download | kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.gz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.xz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.zip | |
merge origin
Diffstat (limited to '0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch')
| -rw-r--r-- | 0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch index 78d88bf92..8ffa070b4 100644 --- a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch +++ b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch @@ -64,7 +64,7 @@ index bbf7029e224b..cf7faa970dd6 100644 @@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void) { const struct dmi_device *dev = NULL; - + +#ifdef CONFIG_ARM64 + /* RHEL-only + * If this is ARM-based HPE m400, return now, because that platform @@ -82,7 +82,7 @@ index bbf7029e224b..cf7faa970dd6 100644 + while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) dmi_decode_ipmi((const struct dmi_header *) dev->device_data); - + diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index e1b22fe0916c..894eda427214 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c @@ -92,13 +92,13 @@ index e1b22fe0916c..894eda427214 100644 #include <linux/nospec.h> #include <linux/vmalloc.h> +#include <linux/dmi.h> - + #define IPMI_DRIVER_VERSION "39.2" - + @@ -5155,8 +5156,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; - + - pr_info("version " IPMI_DRIVER_VERSION "\n"); +#ifdef CONFIG_ARM64 + /* RHEL-only @@ -107,7 +107,7 @@ index e1b22fe0916c..894eda427214 100644 + * does not exist in the ARM architecture. + */ + const char *dmistr = dmi_get_system_info(DMI_PRODUCT_NAME); - + + if (dmistr && (strcmp("ProLiant m400 Server", dmistr) == 0)) { + pr_debug("%s does not support host ipmi\n", dmistr); + return -ENOSYS; @@ -119,5 +119,5 @@ index e1b22fe0916c..894eda427214 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); -- -2.25.4 +2.26.2 |