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:05:19 +0200
commitaf53998fcbfd2ca62a8a20fdf13dbf1ec84ee289 (patch)
treec4cd9b8ef2550b18dabc9e4f509f529162e1eaf4
parent9860868b259f599d0c02fcae60170d345df35140 (diff)
platform/x86: mlx-platform: Add support for tachometer speed
register (bsc#1112374).
-rw-r--r--patches.drivers/platform-x86-mlx-platform-Add-support-for-tachometer.patch57
-rw-r--r--series.conf1
2 files changed, 58 insertions, 0 deletions
diff --git a/patches.drivers/platform-x86-mlx-platform-Add-support-for-tachometer.patch b/patches.drivers/platform-x86-mlx-platform-Add-support-for-tachometer.patch
new file mode 100644
index 0000000000..21dfc3fb4d
--- /dev/null
+++ b/patches.drivers/platform-x86-mlx-platform-Add-support-for-tachometer.patch
@@ -0,0 +1,57 @@
+From: Vadim Pasternak <vadimp@mellanox.com>
+Date: Mon, 18 Mar 2019 10:58:22 +0000
+Subject: platform/x86: mlx-platform: Add support for tachometer speed register
+Patch-mainline: v5.2-rc1
+Git-commit: 584814af9f8ca07cd38e5c554ddd10e85c4e2053
+References: bsc#1112374
+
+Add support for tachometer speed register for the next generation
+systems MQMB7xx, MSN37xx, MSN34xx, MSN38xx.
+
+All these systems support tachometer speed capability register.
+This register is to be provided mlxreg-fan driver.
+
+Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/platform/x86/mlx-platform.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/platform/x86/mlx-platform.c
++++ b/drivers/platform/x86/mlx-platform.c
+@@ -72,6 +72,7 @@
+ #define MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET 0xf5
+ #define MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET 0xf6
+ #define MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET 0xf7
++#define MLXPLAT_CPLD_LPC_REG_TACHO_SPEED_OFFSET 0xf8
+ #define MLXPLAT_CPLD_LPC_IO_RANGE 0x100
+ #define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb
+ #define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
+@@ -1339,6 +1340,10 @@ static struct mlxreg_core_data mlxplat_m
+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET,
+ .bit = BIT(3),
+ },
++ {
++ .label = "conf",
++ .capability = MLXPLAT_CPLD_LPC_REG_TACHO_SPEED_OFFSET,
++ },
+ };
+
+ static struct mlxreg_core_platform_data mlxplat_default_fan_data = {
+@@ -1428,6 +1433,7 @@ static bool mlxplat_mlxcpld_readable_reg
+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET:
+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET:
+ case MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET:
++ case MLXPLAT_CPLD_LPC_REG_TACHO_SPEED_OFFSET:
+ return true;
+ }
+ return false;
+@@ -1484,6 +1490,7 @@ static bool mlxplat_mlxcpld_volatile_reg
+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET:
+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET:
+ case MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET:
++ case MLXPLAT_CPLD_LPC_REG_TACHO_SPEED_OFFSET:
+ return true;
+ }
+ return false;
diff --git a/series.conf b/series.conf
index ad5deaa582..8c8f1367aa 100644
--- a/series.conf
+++ b/series.conf
@@ -46922,6 +46922,7 @@
patches.drivers/platform-x86-intel_pmc_core-Mark-local-function-stat.patch
patches.drivers/platform-x86-intel_punit_ipc-Revert-Fix-resource-ior.patch
patches.drivers/platform-mellanox-Add-TmFifo-driver-for-Mellanox-Blu.patch
+ patches.drivers/platform-x86-mlx-platform-Add-support-for-tachometer.patch
patches.drivers/platform-x86-alienware-wmi-printing-the-wrong-error-.patch
patches.drivers/platform-x86-sony-laptop-Fix-unintentional-fall-thro.patch
patches.fixes/vfio-mdev-Avoid-release-parent-reference-during-erro.patch