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:04 +0200
commitb8e95aa9399e581e014bdf2e8713b80328ec6c6a (patch)
tree73fa8caa9c336532d51660a30952051a976c2b38
parentd66d85b2582891161fdaf666b05cca2c65586a40 (diff)
platform/x86: mlx-platform: Fix tachometer registers
(bsc#1112374).
-rw-r--r--patches.drivers/platform-x86-mlx-platform-Fix-tachometer-registers.patch47
-rw-r--r--series.conf1
2 files changed, 48 insertions, 0 deletions
diff --git a/patches.drivers/platform-x86-mlx-platform-Fix-tachometer-registers.patch b/patches.drivers/platform-x86-mlx-platform-Fix-tachometer-registers.patch
new file mode 100644
index 0000000000..8a35b4721c
--- /dev/null
+++ b/patches.drivers/platform-x86-mlx-platform-Fix-tachometer-registers.patch
@@ -0,0 +1,47 @@
+From: Vadim Pasternak <vadimp@mellanox.com>
+Date: Thu, 15 Nov 2018 17:26:56 +0000
+Subject: platform/x86: mlx-platform: Fix tachometer registers
+Patch-mainline: v5.0-rc1
+Git-commit: edd45cba5ed7f53974475ddc9a1453c2c87b3328
+References: bsc#1112374
+
+Shift by one the registers for tachometers (7 - 12).
+
+This fix is relevant for the same new systems MQMB7, MSN37, MSN34,
+which are about to be released to the customers.
+At the moment, none of them is at customers sites. The customers will
+not suffer from this change.
+This fix is necessary, because register used before for tachometer 7
+has been than reserved for the second PWM for newer systems, which are
+not supported yet in mlx-platform driver. So registers of tachometers
+7-12 have been shifted by one.
+
+Fixes: 0378123c5800 ("platform/x86: mlx-platform: Add mlxreg-fan 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 | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/platform/x86/mlx-platform.c
++++ b/drivers/platform/x86/mlx-platform.c
+@@ -86,12 +86,12 @@
+ #define MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET 0xe7
+ #define MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET 0xe8
+ #define MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET 0xe9
+-#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xea
+-#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xeb
+-#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xec
+-#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xed
+-#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xee
+-#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xef
++#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xeb
++#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xec
++#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xed
++#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xee
++#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xef
++#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xf0
+ #define MLXPLAT_CPLD_LPC_IO_RANGE 0x100
+ #define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb
+ #define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
diff --git a/series.conf b/series.conf
index 56abb4c6b4..6e91772008 100644
--- a/series.conf
+++ b/series.conf
@@ -43274,6 +43274,7 @@
patches.drivers/0001-ACPI-scan-Create-platform-device-for-INT3515-ACPI-no.patch
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.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