Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:06 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:04:08 +0200
commit658c85feb02664bf83856356646e65f23854fc74 (patch)
tree9a802850f1b5c0eaa864000180648a53c6a2fa03
parentb8e95aa9399e581e014bdf2e8713b80328ec6c6a (diff)
platform/x86: mlx-platform: Fix LED configuration (bsc#1112374).
-rw-r--r--patches.drivers/platform-x86-mlx-platform-Fix-LED-configuration.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.drivers/platform-x86-mlx-platform-Fix-LED-configuration.patch b/patches.drivers/platform-x86-mlx-platform-Fix-LED-configuration.patch
new file mode 100644
index 0000000000..61ac2a89be
--- /dev/null
+++ b/patches.drivers/platform-x86-mlx-platform-Fix-LED-configuration.patch
@@ -0,0 +1,43 @@
+From: Vadim Pasternak <vadimp@mellanox.com>
+Date: Thu, 15 Nov 2018 17:26:57 +0000
+Subject: platform/x86: mlx-platform: Fix LED configuration
+Patch-mainline: v5.0-rc1
+Git-commit: 440f343df1996302d9a3904647ff11b689bf27bc
+References: bsc#1112374
+
+Exchange LED configuration between msn201x and next generation systems
+types.
+
+Bug was introduced when LED driver activation was added to mlx-platform.
+LED configuration for the three new system MQMB7, MSN37, MSN34 was
+assigned to MSN21 and vice versa. This bug affects MSN21 only and
+likely requires backport to v4.19.
+
+Fixes: 1189456b1cce ("platform/x86: mlx-platform: Add LED platform driver activation")
+Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
+Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/platform/x86/mlx-platform.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/platform/x86/mlx-platform.c
++++ b/drivers/platform/x86/mlx-platform.c
+@@ -1430,7 +1430,7 @@ static int __init mlxplat_dmi_msn201x_ma
+ mlxplat_hotplug = &mlxplat_mlxcpld_msn201x_data;
+ mlxplat_hotplug->deferred_nr =
+ mlxplat_default_channels[i - 1][MLXPLAT_CPLD_GRP_CHNL_NUM - 1];
+- mlxplat_led = &mlxplat_default_ng_led_data;
++ mlxplat_led = &mlxplat_msn21xx_led_data;
+ mlxplat_regs_io = &mlxplat_msn21xx_regs_io_data;
+
+ return 1;
+@@ -1448,7 +1448,7 @@ static int __init mlxplat_dmi_qmb7xx_mat
+ mlxplat_hotplug = &mlxplat_mlxcpld_default_ng_data;
+ mlxplat_hotplug->deferred_nr =
+ mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1];
+- mlxplat_led = &mlxplat_msn21xx_led_data;
++ mlxplat_led = &mlxplat_default_ng_led_data;
+ mlxplat_fan = &mlxplat_default_fan_data;
+
+ return 1;
diff --git a/series.conf b/series.conf
index 6e91772008..12e1ec71bf 100644
--- a/series.conf
+++ b/series.conf
@@ -43275,6 +43275,7 @@
patches.drivers/platform-x86-mlx-platform-Add-definitions-for-new-re.patch
patches.drivers/platform-x86-mlx-platform-Rename-new-systems-product.patch
patches.drivers/platform-x86-mlx-platform-Fix-tachometer-registers.patch
+ patches.drivers/platform-x86-mlx-platform-Fix-LED-configuration.patch
patches.drm/0049-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch
patches.drm/0050-drm-v3d-Skip-debugfs-dumping-GCA-on-platforms-withou.patch
patches.drm/0001-drm-rockchip-psr-do-not-dereference-encoder-before-i.patch