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:09 +0200
commit35a08c1354ef0615b4ad7c934de04db4fd77bae2 (patch)
treee4732db3fd19479d8ad4909cbed53d44b765e512
parente3c07ac7da464635a05edac42d3e3bdfe3030e6e (diff)
platform_data/mlxreg: additions for Mellanox watchdog driver
(bsc#1112374).
-rw-r--r--patches.drivers/platform_data-mlxreg-additions-for-Mellanox-watchdog.patch63
-rw-r--r--series.conf1
2 files changed, 64 insertions, 0 deletions
diff --git a/patches.drivers/platform_data-mlxreg-additions-for-Mellanox-watchdog.patch b/patches.drivers/platform_data-mlxreg-additions-for-Mellanox-watchdog.patch
new file mode 100644
index 0000000000..820917743e
--- /dev/null
+++ b/patches.drivers/platform_data-mlxreg-additions-for-Mellanox-watchdog.patch
@@ -0,0 +1,63 @@
+From: Michael Shych <michaelsh@mellanox.com>
+Date: Wed, 20 Feb 2019 09:34:22 +0000
+Subject: platform_data/mlxreg: additions for Mellanox watchdog driver.
+Patch-mainline: v5.1-rc1
+Git-commit: 9f03161a1bd8cd9ccf11533e52326718c656036e
+References: bsc#1112374
+
+There are two new fields added to mlxreg core structure:
+features - supported features of device and
+identity - device identity name.
+Add new defines for watchdog features.
+
+Signed-off-by: Michael Shych <michaelsh@mellanox.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@linux-watchdog.org>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ include/linux/platform_data/mlxreg.h | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+--- a/include/linux/platform_data/mlxreg.h
++++ b/include/linux/platform_data/mlxreg.h
+@@ -35,6 +35,19 @@
+ #define __LINUX_PLATFORM_DATA_MLXREG_H
+
+ #define MLXREG_CORE_LABEL_MAX_SIZE 32
++#define MLXREG_CORE_WD_FEATURE_NOWAYOUT BIT(0)
++#define MLXREG_CORE_WD_FEATURE_START_AT_BOOT BIT(1)
++
++/**
++ * enum mlxreg_wdt_type - type of HW watchdog
++ *
++ * TYPE1 HW watchdog implementation exist in old systems.
++ * All new systems have TYPE2 HW watchdog.
++ */
++enum mlxreg_wdt_type {
++ MLX_WDT_TYPE1,
++ MLX_WDT_TYPE2,
++};
+
+ /**
+ * struct mlxreg_hotplug_device - I2C device data:
+@@ -111,12 +124,18 @@ struct mlxreg_core_item {
+ *
+ * @data: instance private data;
+ * @regmap: register map of parent device;
+- * @counter: number of instances;
++ * @counter: number of led instances;
++ * @features: supported features of device;
++ * @version: implementation version;
++ * @identity: device identity name;
+ */
+ struct mlxreg_core_platform_data {
+ struct mlxreg_core_data *data;
+ void *regmap;
+ int counter;
++ u32 features;
++ u32 version;
++ char identity[MLXREG_CORE_LABEL_MAX_SIZE];
+ };
+
+ /**
diff --git a/series.conf b/series.conf
index 22206ff545..ead573aeb8 100644
--- a/series.conf
+++ b/series.conf
@@ -45768,6 +45768,7 @@
patches.drivers/pinctrl-sh-pfc-r8a7791-Fix-scifb2_data_c-pin-group.patch
patches.drivers/pinctrl-sh-pfc-r8a7792-Fix-vin1_data18_b-pin-group.patch
patches.drivers/pinctrl-sh-pfc-sh73a0-Fix-fsic_spdif-pin-groups.patch
+ patches.drivers/platform_data-mlxreg-additions-for-Mellanox-watchdog.patch
patches.suse/tracing-do-not-free-iter-trace-in-fail-path-of-tracing_open_pipe.patch
patches.suse/tracing-use-strncpy-instead-of-memcpy-for-string-keys-in-hist-triggers.patch
patches.fixes/0001-xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch