From: Greg Kroah-Hartman Date: Thu, 4 Jan 2024 08:50:40 +0000 (+0100) Subject: drop interconnect-qcom-sm8250-enable-sync_state.patch from 5.10 and 5.15 X-Git-Tag: v5.10.206~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78d6cd35edb67afd1ec2ef2e4784e5cb00029bbc;p=thirdparty%2Fkernel%2Fstable-queue.git drop interconnect-qcom-sm8250-enable-sync_state.patch from 5.10 and 5.15 --- diff --git a/queue-5.10/interconnect-qcom-sm8250-enable-sync_state.patch b/queue-5.10/interconnect-qcom-sm8250-enable-sync_state.patch deleted file mode 100644 index fd07ca84b12..00000000000 --- a/queue-5.10/interconnect-qcom-sm8250-enable-sync_state.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5bf3bc8148e6391b1dd7d651d6bba4ca821a6182 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 Nov 2023 15:04:45 +0100 -Subject: interconnect: qcom: sm8250: Enable sync_state - -From: Konrad Dybcio - -[ Upstream commit bfc7db1cb94ad664546d70212699f8cc6c539e8c ] - -Add the generic icc sync_state callback to ensure interconnect votes -are taken into account, instead of being pegged at maximum values. - -Fixes: b95b668eaaa2 ("interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate") -Signed-off-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20231130-topic-8250icc_syncstate-v1-1-7ce78ba6e04c@linaro.org -Signed-off-by: Georgi Djakov -Signed-off-by: Sasha Levin ---- - drivers/interconnect/qcom/sm8250.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c -index 40820043c8d36..cc558fec74e38 100644 ---- a/drivers/interconnect/qcom/sm8250.c -+++ b/drivers/interconnect/qcom/sm8250.c -@@ -643,6 +643,7 @@ static struct platform_driver qnoc_driver = { - .driver = { - .name = "qnoc-sm8250", - .of_match_table = qnoc_of_match, -+ .sync_state = icc_sync_state, - }, - }; - module_platform_driver(qnoc_driver); --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 33437af1383..17b74e3e617 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -26,7 +26,6 @@ smb-client-fix-null-deref-in-asn1_ber_decoder.patch btrfs-do-not-allow-non-subvolume-root-targets-for-sn.patch interconnect-treat-xlate-returning-null-node-as-an-e.patch iio-imu-inv_mpu6050-fix-an-error-code-problem-in-inv.patch -interconnect-qcom-sm8250-enable-sync_state.patch input-ipaq-micro-keys-add-error-handling-for-devm_km.patch scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch diff --git a/queue-5.15/interconnect-qcom-sm8250-enable-sync_state.patch b/queue-5.15/interconnect-qcom-sm8250-enable-sync_state.patch deleted file mode 100644 index 10384e95e93..00000000000 --- a/queue-5.15/interconnect-qcom-sm8250-enable-sync_state.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3bdee60367ff63b43157f949de6139af555cb301 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 Nov 2023 15:04:45 +0100 -Subject: interconnect: qcom: sm8250: Enable sync_state - -From: Konrad Dybcio - -[ Upstream commit bfc7db1cb94ad664546d70212699f8cc6c539e8c ] - -Add the generic icc sync_state callback to ensure interconnect votes -are taken into account, instead of being pegged at maximum values. - -Fixes: b95b668eaaa2 ("interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate") -Signed-off-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20231130-topic-8250icc_syncstate-v1-1-7ce78ba6e04c@linaro.org -Signed-off-by: Georgi Djakov -Signed-off-by: Sasha Levin ---- - drivers/interconnect/qcom/sm8250.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c -index aa707582ea016..8dfb5dea562a3 100644 ---- a/drivers/interconnect/qcom/sm8250.c -+++ b/drivers/interconnect/qcom/sm8250.c -@@ -551,6 +551,7 @@ static struct platform_driver qnoc_driver = { - .driver = { - .name = "qnoc-sm8250", - .of_match_table = qnoc_of_match, -+ .sync_state = icc_sync_state, - }, - }; - module_platform_driver(qnoc_driver); --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 72e39ed96bb..c9d7ac1515b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -34,7 +34,6 @@ smb-client-fix-null-deref-in-asn1_ber_decoder.patch smb-client-fix-oob-in-smb2_query_reparse_point.patch interconnect-treat-xlate-returning-null-node-as-an-e.patch iio-imu-inv_mpu6050-fix-an-error-code-problem-in-inv.patch -interconnect-qcom-sm8250-enable-sync_state.patch input-ipaq-micro-keys-add-error-handling-for-devm_km.patch scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch