From: Greg Kroah-Hartman Date: Thu, 16 Jan 2020 13:03:17 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.14.166~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6e1e4c125edae6c3faa67a6412335c4285ec2f5;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: clk-samsung-exynos5420-preserve-cpu-clocks-configuration-during-suspend-resume.patch iio-imu-adis16480-assign-bias-value-only-if-operation-succeeded.patch mei-fix-modalias-documentation.patch --- diff --git a/queue-4.9/clk-samsung-exynos5420-preserve-cpu-clocks-configuration-during-suspend-resume.patch b/queue-4.9/clk-samsung-exynos5420-preserve-cpu-clocks-configuration-during-suspend-resume.patch new file mode 100644 index 00000000000..f42b545c0f8 --- /dev/null +++ b/queue-4.9/clk-samsung-exynos5420-preserve-cpu-clocks-configuration-during-suspend-resume.patch @@ -0,0 +1,34 @@ +From e21be0d1d7bd7f78a77613f6bcb6965e72b22fc1 Mon Sep 17 00:00:00 2001 +From: Marian Mihailescu +Date: Tue, 29 Oct 2019 11:20:25 +1030 +Subject: clk: samsung: exynos5420: Preserve CPU clocks configuration during suspend/resume + +From: Marian Mihailescu + +commit e21be0d1d7bd7f78a77613f6bcb6965e72b22fc1 upstream. + +Save and restore top PLL related configuration registers for big (APLL) +and LITTLE (KPLL) cores during suspend/resume cycle. So far, CPU clocks +were reset to default values after suspend/resume cycle and performance +after system resume was affected when performance governor has been selected. + +Fixes: 773424326b51 ("clk: samsung: exynos5420: add more registers to restore list") +Signed-off-by: Marian Mihailescu +Signed-off-by: Sylwester Nawrocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/clk/samsung/clk-exynos5420.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/clk/samsung/clk-exynos5420.c ++++ b/drivers/clk/samsung/clk-exynos5420.c +@@ -170,6 +170,8 @@ static const unsigned long exynos5x_clk_ + GATE_BUS_CPU, + GATE_SCLK_CPU, + CLKOUT_CMU_CPU, ++ APLL_CON0, ++ KPLL_CON0, + CPLL_CON0, + DPLL_CON0, + EPLL_CON0, diff --git a/queue-4.9/iio-imu-adis16480-assign-bias-value-only-if-operation-succeeded.patch b/queue-4.9/iio-imu-adis16480-assign-bias-value-only-if-operation-succeeded.patch new file mode 100644 index 00000000000..fa9dd10428c --- /dev/null +++ b/queue-4.9/iio-imu-adis16480-assign-bias-value-only-if-operation-succeeded.patch @@ -0,0 +1,45 @@ +From 9b742763d9d4195e823ae6ece760c9ed0500c1dc Mon Sep 17 00:00:00 2001 +From: Alexandru Ardelean +Date: Fri, 1 Nov 2019 11:35:03 +0200 +Subject: iio: imu: adis16480: assign bias value only if operation succeeded + +From: Alexandru Ardelean + +commit 9b742763d9d4195e823ae6ece760c9ed0500c1dc upstream. + +This was found only after the whole thing with the inline functions, but +the compiler actually found something. The value of the `bias` (in +adis16480_get_calibbias()) should only be set if the read operation was +successful. + +No actual known problem occurs as users of this function all +ultimately check the return value. Hence probably not stable material. + +Fixes: 2f3abe6cbb6c9 ("iio:imu: Add support for the ADIS16480 and similar IMUs") +Signed-off-by: Alexandru Ardelean +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/iio/imu/adis16480.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/iio/imu/adis16480.c ++++ b/drivers/iio/imu/adis16480.c +@@ -372,12 +372,14 @@ static int adis16480_get_calibbias(struc + case IIO_MAGN: + case IIO_PRESSURE: + ret = adis_read_reg_16(&st->adis, reg, &val16); +- *bias = sign_extend32(val16, 15); ++ if (ret == 0) ++ *bias = sign_extend32(val16, 15); + break; + case IIO_ANGL_VEL: + case IIO_ACCEL: + ret = adis_read_reg_32(&st->adis, reg, &val32); +- *bias = sign_extend32(val32, 31); ++ if (ret == 0) ++ *bias = sign_extend32(val32, 31); + break; + default: + ret = -EINVAL; diff --git a/queue-4.9/mei-fix-modalias-documentation.patch b/queue-4.9/mei-fix-modalias-documentation.patch new file mode 100644 index 00000000000..2ff6b8598e4 --- /dev/null +++ b/queue-4.9/mei-fix-modalias-documentation.patch @@ -0,0 +1,33 @@ +From 73668309215285366c433489de70d31362987be9 Mon Sep 17 00:00:00 2001 +From: Alexander Usyskin +Date: Tue, 8 Oct 2019 03:57:34 +0300 +Subject: mei: fix modalias documentation + +From: Alexander Usyskin + +commit 73668309215285366c433489de70d31362987be9 upstream. + +mei client bus added the client protocol version to the device alias, +but ABI documentation was not updated. + +Fixes: b26864cad1c9 (mei: bus: add client protocol version to the device alias) +Signed-off-by: Alexander Usyskin +Signed-off-by: Tomas Winkler +Link: https://lore.kernel.org/r/20191008005735.12707-1-tomas.winkler@intel.com +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/ABI/testing/sysfs-bus-mei | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/ABI/testing/sysfs-bus-mei ++++ b/Documentation/ABI/testing/sysfs-bus-mei +@@ -4,7 +4,7 @@ KernelVersion: 3.10 + Contact: Samuel Ortiz + linux-mei@linux.intel.com + Description: Stores the same MODALIAS value emitted by uevent +- Format: mei::: ++ Format: mei::: + + What: /sys/bus/mei/devices/.../name + Date: May 2015 diff --git a/queue-4.9/series b/queue-4.9/series index 1ebc4441e13..a43463f2a76 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -26,3 +26,6 @@ rdma-srpt-report-the-scsi-residual-to-the-initiator.patch scsi-enclosure-fix-stale-device-oops-with-hot-replug.patch scsi-sd-clear-sdkp-protection_type-if-disk-is-reformatted-without-pi.patch platform-x86-asus-wmi-fix-keyboard-brightness-cannot-be-set-to-0.patch +iio-imu-adis16480-assign-bias-value-only-if-operation-succeeded.patch +mei-fix-modalias-documentation.patch +clk-samsung-exynos5420-preserve-cpu-clocks-configuration-during-suspend-resume.patch