From: Greg Kroah-Hartman Date: Tue, 18 Apr 2023 10:51:38 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.313~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1b317ad763dad1d6a3f1cea485e676d08086df3;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: counter-add-the-necessary-colons-and-indents-to-the-comments-of-counter_compi.patch counter-fix-docum.-build-problems-after-filename-change.patch nvme-pci-avoid-the-deepest-sleep-state-on-zhitai-tipro5000-ssds.patch --- diff --git a/queue-5.15/counter-add-the-necessary-colons-and-indents-to-the-comments-of-counter_compi.patch b/queue-5.15/counter-add-the-necessary-colons-and-indents-to-the-comments-of-counter_compi.patch new file mode 100644 index 00000000000..d31c0655289 --- /dev/null +++ b/queue-5.15/counter-add-the-necessary-colons-and-indents-to-the-comments-of-counter_compi.patch @@ -0,0 +1,114 @@ +From 0032ca576a79946492194ae4860b462d32815c66 Mon Sep 17 00:00:00 2001 +From: Yanteng Si +Date: Tue, 21 Dec 2021 17:16:46 +0900 +Subject: counter: Add the necessary colons and indents to the comments of counter_compi + +From: Yanteng Si + +commit 0032ca576a79946492194ae4860b462d32815c66 upstream. + +Since commit aaec1a0f76ec ("counter: Internalize sysfs interface code") +introduce a warning as: + +linux-next/Documentation/driver-api/generic-counter:234: ./include/linux/counter.h:43: WARNING: Unexpected indentation. +linux-next/Documentation/driver-api/generic-counter:234: ./include/linux/counter.h:45: WARNING: Block quote ends without a blank line; unexpected unindent. + +Add the necessary colons and indents. + +Fixes: aaec1a0f76ec ("counter: Internalize sysfs interface code") +Signed-off-by: Yanteng Si +Signed-off-by: William Breathitt Gray +Link: https://lore.kernel.org/r/26011e814d6eca02c7ebdbb92f171a49928a7e89.1640072891.git.vilhelm.gray@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/counter.h | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +--- a/include/linux/counter.h ++++ b/include/linux/counter.h +@@ -73,64 +73,64 @@ enum counter_synapse_action { + * @type: Counter component data type + * @name: device-specific component name + * @priv: component-relevant data +- * @action_read Synapse action mode read callback. The read value of the ++ * @action_read: Synapse action mode read callback. The read value of the + * respective Synapse action mode should be passed back via + * the action parameter. +- * @device_u8_read Device u8 component read callback. The read value of the ++ * @device_u8_read: Device u8 component read callback. The read value of the + * respective Device u8 component should be passed back via + * the val parameter. +- * @count_u8_read Count u8 component read callback. The read value of the ++ * @count_u8_read: Count u8 component read callback. The read value of the + * respective Count u8 component should be passed back via + * the val parameter. +- * @signal_u8_read Signal u8 component read callback. The read value of the ++ * @signal_u8_read: Signal u8 component read callback. The read value of the + * respective Signal u8 component should be passed back via + * the val parameter. +- * @device_u32_read Device u32 component read callback. The read value of ++ * @device_u32_read: Device u32 component read callback. The read value of + * the respective Device u32 component should be passed + * back via the val parameter. +- * @count_u32_read Count u32 component read callback. The read value of the ++ * @count_u32_read: Count u32 component read callback. The read value of the + * respective Count u32 component should be passed back via + * the val parameter. +- * @signal_u32_read Signal u32 component read callback. The read value of ++ * @signal_u32_read: Signal u32 component read callback. The read value of + * the respective Signal u32 component should be passed + * back via the val parameter. +- * @device_u64_read Device u64 component read callback. The read value of ++ * @device_u64_read: Device u64 component read callback. The read value of + * the respective Device u64 component should be passed + * back via the val parameter. +- * @count_u64_read Count u64 component read callback. The read value of the ++ * @count_u64_read: Count u64 component read callback. The read value of the + * respective Count u64 component should be passed back via + * the val parameter. +- * @signal_u64_read Signal u64 component read callback. The read value of ++ * @signal_u64_read: Signal u64 component read callback. The read value of + * the respective Signal u64 component should be passed + * back via the val parameter. +- * @action_write Synapse action mode write callback. The write value of ++ * @action_write: Synapse action mode write callback. The write value of + * the respective Synapse action mode is passed via the + * action parameter. +- * @device_u8_write Device u8 component write callback. The write value of ++ * @device_u8_write: Device u8 component write callback. The write value of + * the respective Device u8 component is passed via the val + * parameter. +- * @count_u8_write Count u8 component write callback. The write value of ++ * @count_u8_write: Count u8 component write callback. The write value of + * the respective Count u8 component is passed via the val + * parameter. +- * @signal_u8_write Signal u8 component write callback. The write value of ++ * @signal_u8_write: Signal u8 component write callback. The write value of + * the respective Signal u8 component is passed via the val + * parameter. +- * @device_u32_write Device u32 component write callback. The write value of ++ * @device_u32_write: Device u32 component write callback. The write value of + * the respective Device u32 component is passed via the + * val parameter. +- * @count_u32_write Count u32 component write callback. The write value of ++ * @count_u32_write: Count u32 component write callback. The write value of + * the respective Count u32 component is passed via the val + * parameter. +- * @signal_u32_write Signal u32 component write callback. The write value of ++ * @signal_u32_write: Signal u32 component write callback. The write value of + * the respective Signal u32 component is passed via the + * val parameter. +- * @device_u64_write Device u64 component write callback. The write value of ++ * @device_u64_write: Device u64 component write callback. The write value of + * the respective Device u64 component is passed via the + * val parameter. +- * @count_u64_write Count u64 component write callback. The write value of ++ * @count_u64_write: Count u64 component write callback. The write value of + * the respective Count u64 component is passed via the val + * parameter. +- * @signal_u64_write Signal u64 component write callback. The write value of ++ * @signal_u64_write: Signal u64 component write callback. The write value of + * the respective Signal u64 component is passed via the + * val parameter. + */ diff --git a/queue-5.15/counter-fix-docum.-build-problems-after-filename-change.patch b/queue-5.15/counter-fix-docum.-build-problems-after-filename-change.patch new file mode 100644 index 00000000000..b186990db49 --- /dev/null +++ b/queue-5.15/counter-fix-docum.-build-problems-after-filename-change.patch @@ -0,0 +1,42 @@ +From 7110acbdab462b8f2bc30e216c331cbd68c00af9 Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Mon, 4 Oct 2021 22:51:57 -0700 +Subject: counter: fix docum. build problems after filename change + +From: Randy Dunlap + +commit 7110acbdab462b8f2bc30e216c331cbd68c00af9 upstream. + +Fix documentation build warnings due to a source file being +renamed. + +WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -sphinx-version 1.8.5 -export ../drivers/counter/counter.c' failed with return code 2 + +Error: Cannot open file ../drivers/counter/counter.c + +Fixes: aaec1a0f76ec ("counter: Internalize sysfs interface code") +Signed-off-by: Randy Dunlap +Cc: William Breathitt Gray +Cc: linux-iio@vger.kernel.org +Cc: Jonathan Cameron +Cc: Jonathan Corbet +Cc: linux-doc@vger.kernel.org +Acked-by: William Breathitt Gray +Link: https://lore.kernel.org/r/20211005055157.22937-1-rdunlap@infradead.org +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/driver-api/generic-counter.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/driver-api/generic-counter.rst ++++ b/Documentation/driver-api/generic-counter.rst +@@ -247,7 +247,7 @@ for defining a counter device. + .. kernel-doc:: include/linux/counter.h + :internal: + +-.. kernel-doc:: drivers/counter/counter.c ++.. kernel-doc:: drivers/counter/counter-core.c + :export: + + Implementation diff --git a/queue-5.15/nvme-pci-avoid-the-deepest-sleep-state-on-zhitai-tipro5000-ssds.patch b/queue-5.15/nvme-pci-avoid-the-deepest-sleep-state-on-zhitai-tipro5000-ssds.patch new file mode 100644 index 00000000000..154f0d915c9 --- /dev/null +++ b/queue-5.15/nvme-pci-avoid-the-deepest-sleep-state-on-zhitai-tipro5000-ssds.patch @@ -0,0 +1,53 @@ +From d5d3c100ac40dcb03959a6f1d2f0f13204c4f145 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Wed, 28 Sep 2022 17:39:13 +0800 +Subject: nvme-pci: avoid the deepest sleep state on ZHITAI TiPro5000 SSDs + +From: Xi Ruoyao + +commit d5d3c100ac40dcb03959a6f1d2f0f13204c4f145 upstream. + +ZHITAI TiPro5000 SSDs has the same APST sleep problem as its cousin, +TiPro7000. The quirk for TiPro7000 has been added in +commit 6b961bce50e4 ("nvme-pci: avoid the deepest sleep state on +ZHITAI TiPro7000 SSDs"), use the same quirk for TiPro5000. + +The ASPT data from "nvme id-ctrl /dev/nvme1": + +vid : 0x1e49 +ssvid : 0x1e49 +sn : ZTA21T0KA2227304LM +mn : ZHITAI TiPlus5000 1TB +fr : ZTA09139 +[...] +ps 0 : mp:6.50W operational enlat:0 exlat:0 rrt:0 rrl:0 + rwt:0 rwl:0 idle_power:- active_power:- +ps 1 : mp:5.80W operational enlat:0 exlat:0 rrt:1 rrl:1 + rwt:1 rwl:1 idle_power:- active_power:- +ps 2 : mp:3.60W operational enlat:0 exlat:0 rrt:2 rrl:2 + rwt:2 rwl:2 idle_power:- active_power:- +ps 3 : mp:0.0500W non-operational enlat:5000 exlat:10000 rrt:3 rrl:3 + rwt:3 rwl:3 idle_power:- active_power:- +ps 4 : mp:0.0025W non-operational enlat:8000 exlat:45000 rrt:4 rrl:4 + rwt:4 rwl:4 idle_power:- active_power:- + +Reported-and-tested-by: Chang Feng +Signed-off-by: Xi Ruoyao +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nvme/host/pci.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -3390,6 +3390,8 @@ static const struct pci_device_id nvme_i + .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1cc1, 0x5350), /* ADATA XPG GAMMIX S50 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, ++ { PCI_DEVICE(0x1e49, 0x0021), /* ZHITAI TiPro5000 NVMe SSD */ ++ .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, + { PCI_DEVICE(0x1e49, 0x0041), /* ZHITAI TiPro7000 NVMe SSD */ + .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, + { PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */ diff --git a/queue-5.15/series b/queue-5.15/series index 5c0d261ba91..0de83d85107 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -86,3 +86,6 @@ cgroup-cpuset-make-cpuset_fork-handle-clone_into_cgr.patch cgroup-cpuset-add-cpuset_can_fork-and-cpuset_cancel_fork-methods.patch kexec-turn-all-kexec_mutex-acquisitions-into-trylocks.patch panic-kexec-make-__crash_kexec-nmi-safe.patch +counter-fix-docum.-build-problems-after-filename-change.patch +counter-add-the-necessary-colons-and-indents-to-the-comments-of-counter_compi.patch +nvme-pci-avoid-the-deepest-sleep-state-on-zhitai-tipro5000-ssds.patch