5.10-stable patches

added patches:
	hwmon-occ-fix-p10-vrm-temp-sensors.patch
	rtc-test-fix-invalid-format-specifier.patch

diff --git a/queue-5.10/hwmon-occ-fix-p10-vrm-temp-sensors.patch b/queue-5.10/hwmon-occ-fix-p10-vrm-temp-sensors.patch
new file mode 100644 (file)
index 0000000..9d0f56b
--- /dev/null
+++ b/queue-5.10/hwmon-occ-fix-p10-vrm-temp-sensors.patch
@@ -0,0 +1,57 @@
+From ffa2600044979aff4bd6238edb9af815a47d7c32 Mon Sep 17 00:00:00 2001
+From: Eddie James <eajames@linux.ibm.com>
+Date: Wed, 29 Sep 2021 10:36:04 -0500
+Subject: hwmon: (occ) Fix P10 VRM temp sensors
+
+From: Eddie James <eajames@linux.ibm.com>
+
+commit ffa2600044979aff4bd6238edb9af815a47d7c32 upstream.
+
+The P10 (temp sensor version 0x10) doesn't do the same VRM status
+reporting that was used on P9. It just reports the temperature, so
+drop the check for VRM fru type in the sysfs show function, and don't
+set the name to "alarm".
+
+Fixes: db4919ec86 ("hwmon: (occ) Add new temperature sensor type")
+Signed-off-by: Eddie James <eajames@linux.ibm.com>
+Link: https://lore.kernel.org/r/20210929153604.14968-1-eajames@linux.ibm.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hwmon/occ/common.c |   17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+--- a/drivers/hwmon/occ/common.c
++++ b/drivers/hwmon/occ/common.c
+@@ -340,18 +340,11 @@ static ssize_t occ_show_temp_10(struct d
+               if (val == OCC_TEMP_SENSOR_FAULT)
+                       return -EREMOTEIO;
+ 
+-              /*
+-               * VRM doesn't return temperature, only alarm bit. This
+-               * attribute maps to tempX_alarm instead of tempX_input for
+-               * VRM
+-               */
+-              if (temp->fru_type != OCC_FRU_TYPE_VRM) {
+-                      /* sensor not ready */
+-                      if (val == 0)
+-                              return -EAGAIN;
++              /* sensor not ready */
++              if (val == 0)
++                      return -EAGAIN;
+ 
+-                      val *= 1000;
+-              }
++              val *= 1000;
+               break;
+       case 2:
+               val = temp->fru_type;
+@@ -888,7 +881,7 @@ static int occ_setup_sensor_attrs(struct
+                                  0, i, "temp%d_label", s);
+               attr++;
+ 
+-              if (sensors->temp.version > 1 &&
++              if (sensors->temp.version == 2 &&
+                   temp->fru_type == OCC_FRU_TYPE_VRM) {
+                       occ_init_attribute(attr, 0444, show_temp, NULL,
+                                          1, i, "temp%d_alarm", s);

diff --git a/queue-5.10/rtc-test-fix-invalid-format-specifier.patch b/queue-5.10/rtc-test-fix-invalid-format-specifier.patch
new file mode 100644 (file)
index 0000000..873060a
--- /dev/null
+++ b/queue-5.10/rtc-test-fix-invalid-format-specifier.patch
@@ -0,0 +1,36 @@
+From 8a904a3caa88118744062e872ae90f37748a8fd8 Mon Sep 17 00:00:00 2001
+From: David Gow <davidgow@google.com>
+Date: Wed, 21 Feb 2024 17:27:18 +0800
+Subject: rtc: test: Fix invalid format specifier.
+
+From: David Gow <davidgow@google.com>
+
+commit 8a904a3caa88118744062e872ae90f37748a8fd8 upstream.
+
+'days' is a s64 (from div_s64), and so should use a %lld specifier.
+
+This was found by extending KUnit's assertion macros to use gcc's
+__printf attribute.
+
+Fixes: 1d1bb12a8b18 ("rtc: Improve performance of rtc_time64_to_tm(). Add tests.")
+Signed-off-by: David Gow <davidgow@google.com>
+Tested-by: Guenter Roeck <linux@roeck-us.net>
+Reviewed-by: Justin Stitt <justinstitt@google.com>
+Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/rtc/lib_test.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/rtc/lib_test.c
++++ b/drivers/rtc/lib_test.c
+@@ -54,7 +54,7 @@ static void rtc_time64_to_tm_test_date_r
+ 
+               days = div_s64(secs, 86400);
+ 
+-              #define FAIL_MSG "%d/%02d/%02d (%2d) : %ld", \
++              #define FAIL_MSG "%d/%02d/%02d (%2d) : %lld", \
+                       year, month, mday, yday, days
+ 
+               KUNIT_ASSERT_EQ_MSG(test, year - 1900, result.tm_year, FAIL_MSG);

diff --git a/queue-5.10/series b/queue-5.10/series
index e69d789894500bb074f7976c857f6e2ef6b920f5..0e5174c680b7da45dc3dacb1a11a44f2917babc8 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -345,3 +345,5 @@ net_sched-sch_sfq-don-t-allow-1-packet-limit.patch
 net_sched-sch_sfq-use-a-temporary-work-area-for-validating-configuration.patch
 net_sched-sch_sfq-move-the-limit-validation.patch
 mm-huge_memory-fix-dereferencing-invalid-pmd-migration-entry.patch
+hwmon-occ-fix-p10-vrm-temp-sensors.patch
+rtc-test-fix-invalid-format-specifier.patch