4.4-stable patches

added patches:
	hwmon-pmbus-ltc2978-fix-pmbus-polling-of-mfr_common-definitions.patch
	s390-time-fix-clk-type-in-get_tod_clock.patch

diff --git a/queue-4.4/hwmon-pmbus-ltc2978-fix-pmbus-polling-of-mfr_common-definitions.patch b/queue-4.4/hwmon-pmbus-ltc2978-fix-pmbus-polling-of-mfr_common-definitions.patch
new file mode 100644 (file)
index 0000000..6aa9bf3
--- /dev/null
+++ b/queue-4.4/hwmon-pmbus-ltc2978-fix-pmbus-polling-of-mfr_common-definitions.patch
@@ -0,0 +1,40 @@
+From cf2b012c90e74e85d8aea7d67e48868069cfee0c Mon Sep 17 00:00:00 2001
+From: Mike Jones <michael-a1.jones@analog.com>
+Date: Tue, 28 Jan 2020 10:59:59 -0700
+Subject: hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions.
+
+From: Mike Jones <michael-a1.jones@analog.com>
+
+commit cf2b012c90e74e85d8aea7d67e48868069cfee0c upstream.
+
+Change 21537dc driver PMBus polling of MFR_COMMON from bits 5/4 to
+bits 6/5. This fixs a LTC297X family bug where polling always returns
+not busy even when the part is busy. This fixes a LTC388X and
+LTM467X bug where polling used PEND and NOT_IN_TRANS, and BUSY was
+not polled, which can lead to NACKing of commands. LTC388X and
+LTM467X modules now poll BUSY and PEND, increasing reliability by
+eliminating NACKing of commands.
+
+Signed-off-by: Mike Jones <michael-a1.jones@analog.com>
+Link: https://lore.kernel.org/r/1580234400-2829-2-git-send-email-michael-a1.jones@analog.com
+Fixes: e04d1ce9bbb49 ("hwmon: (ltc2978) Add polling for chips requiring it")
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwmon/pmbus/ltc2978.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/hwmon/pmbus/ltc2978.c
++++ b/drivers/hwmon/pmbus/ltc2978.c
+@@ -89,8 +89,8 @@ enum chips { ltc2974, ltc2975, ltc2977,
+ 
+ #define LTC_POLL_TIMEOUT              100     /* in milli-seconds */
+ 
+-#define LTC_NOT_BUSY                  BIT(5)
+-#define LTC_NOT_PENDING                       BIT(4)
++#define LTC_NOT_BUSY                  BIT(6)
++#define LTC_NOT_PENDING                       BIT(5)
+ 
+ /*
+  * LTC2978 clears peak data whenever the CLEAR_FAULTS command is executed, which

diff --git a/queue-4.4/s390-time-fix-clk-type-in-get_tod_clock.patch b/queue-4.4/s390-time-fix-clk-type-in-get_tod_clock.patch
new file mode 100644 (file)
index 0000000..785b285
--- /dev/null
+++ b/queue-4.4/s390-time-fix-clk-type-in-get_tod_clock.patch
@@ -0,0 +1,54 @@
+From 0f8a206df7c920150d2aa45574fba0ab7ff6be4f Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <natechancellor@gmail.com>
+Date: Sat, 8 Feb 2020 07:08:59 -0700
+Subject: s390/time: Fix clk type in get_tod_clock
+
+From: Nathan Chancellor <natechancellor@gmail.com>
+
+commit 0f8a206df7c920150d2aa45574fba0ab7ff6be4f upstream.
+
+Clang warns:
+
+In file included from ../arch/s390/boot/startup.c:3:
+In file included from ../include/linux/elf.h:5:
+In file included from ../arch/s390/include/asm/elf.h:132:
+In file included from ../include/linux/compat.h:10:
+In file included from ../include/linux/time.h:74:
+In file included from ../include/linux/time32.h:13:
+In file included from ../include/linux/timex.h:65:
+../arch/s390/include/asm/timex.h:160:20: warning: passing 'unsigned char
+[16]' to parameter of type 'char *' converts between pointers to integer
+types with different sign [-Wpointer-sign]
+        get_tod_clock_ext(clk);
+                          ^~~
+../arch/s390/include/asm/timex.h:149:44: note: passing argument to
+parameter 'clk' here
+static inline void get_tod_clock_ext(char *clk)
+                                           ^
+
+Change clk's type to just be char so that it matches what happens in
+get_tod_clock_ext.
+
+Fixes: 57b28f66316d ("[S390] s390_hypfs: Add new attributes")
+Link: https://github.com/ClangBuiltLinux/linux/issues/861
+Link: http://lkml.kernel.org/r/20200208140858.47970-1-natechancellor@gmail.com
+Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/s390/include/asm/timex.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/s390/include/asm/timex.h
++++ b/arch/s390/include/asm/timex.h
+@@ -82,7 +82,7 @@ static inline void get_tod_clock_ext(cha
+ 
+ static inline unsigned long long get_tod_clock(void)
+ {
+-      unsigned char clk[STORE_CLOCK_EXT_SIZE];
++      char clk[STORE_CLOCK_EXT_SIZE];
+ 
+       get_tod_clock_ext(clk);
+       return *((unsigned long long *)&clk[1]);

diff --git a/queue-4.4/series b/queue-4.4/series
index 7df96b6b6006f4fa32b5c9aff794b5878e0ff8cb..f2697eb3ae6c3d1924a9110d09c675b94024213e 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -4,3 +4,5 @@ ext4-fix-checksum-errors-with-indexed-dirs.patch
 btrfs-fix-race-between-using-extent-maps-and-merging-them.patch
 btrfs-log-message-when-rw-remount-is-attempted-with-unclean-tree-log.patch
 padata-remove-broken-queue-flushing.patch
+s390-time-fix-clk-type-in-get_tod_clock.patch
+hwmon-pmbus-ltc2978-fix-pmbus-polling-of-mfr_common-definitions.patch