From: Greg Kroah-Hartman Date: Wed, 8 Mar 2023 07:46:42 +0000 (+0100) Subject: drop spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch X-Git-Tag: v6.2.3~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=defeefa44dc656a7db91d57a7ec9913257513dc8;p=thirdparty%2Fkernel%2Fstable-queue.git drop spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch Is not complete and not quite correct. --- diff --git a/queue-4.14/series b/queue-4.14/series index 4bb585e478e..66393f71026 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -61,7 +61,6 @@ asoc-soc-compress.c-fixup-private_data-on-snd_soc_ne.patch gpio-vf610-connect-gpio-label-to-dev-name.patch hwmon-ltc2945-handle-error-case-in-ltc2945_value_sto.patch scsi-aic94xx-add-missing-check-for-dma_map_single.patch -spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch dm-remove-flush_scheduled_work-during-local_exit.patch mfd-pcf50633-adc-fix-potential-memleak-in-pcf50633_a.patch mtd-rawnand-sunxi-fix-the-size-of-the-last-oob-regio.patch diff --git a/queue-4.14/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch b/queue-4.14/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch deleted file mode 100644 index b490640f293..00000000000 --- a/queue-4.14/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7ae079fbda5ccd60b72d76e6f5d44e8355d3f4dd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 Feb 2023 22:58:17 -0800 -Subject: spi: bcm63xx-hsspi: Endianness fix for ARM based SoC - -From: William Zhang - -[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ] - -HSSPI controller uses big endian for the opcode in the message to the -controller ping pong buffer. Use cpu_to_be16 to properly handle the -endianness for both big and little endian host. - -Fixes: 142168eba9dc ("spi: bcm63xx-hsspi: add bcm63xx HSSPI driver") -Signed-off-by: Kursad Oney -Signed-off-by: William Zhang -Acked-by: Florian Fainelli - -Link: https://lore.kernel.org/r/20230207065826.285013-7-william.zhang@broadcom.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx-hsspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c -index cbcba614b2533..bc539010f2b98 100644 ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -191,7 +191,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) - tx += curr_step; - } - -- __raw_writew(opcode | curr_step, bs->fifo); -+ __raw_writew((u16)cpu_to_be16(opcode | curr_step), bs->fifo); - - /* enable interrupt */ - __raw_writel(HSSPI_PINGx_CMD_DONE(0), --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index b8895602242..194536b0836 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -83,7 +83,6 @@ asoc-soc-compress.c-fixup-private_data-on-snd_soc_ne.patch gpio-vf610-connect-gpio-label-to-dev-name.patch hwmon-ltc2945-handle-error-case-in-ltc2945_value_sto.patch scsi-aic94xx-add-missing-check-for-dma_map_single.patch -spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch spi-bcm63xx-hsspi-fix-pm_runtime.patch spi-bcm63xx-hsspi-fix-multi-bit-mode-setting.patch hwmon-mlxreg-fan-return-zero-speed-for-broken-fan.patch diff --git a/queue-4.19/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch b/queue-4.19/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch deleted file mode 100644 index aaff839db2e..00000000000 --- a/queue-4.19/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e19b7cbc048e87c72124953619a3b2ea546472ce Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 Feb 2023 22:58:17 -0800 -Subject: spi: bcm63xx-hsspi: Endianness fix for ARM based SoC - -From: William Zhang - -[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ] - -HSSPI controller uses big endian for the opcode in the message to the -controller ping pong buffer. Use cpu_to_be16 to properly handle the -endianness for both big and little endian host. - -Fixes: 142168eba9dc ("spi: bcm63xx-hsspi: add bcm63xx HSSPI driver") -Signed-off-by: Kursad Oney -Signed-off-by: William Zhang -Acked-by: Florian Fainelli - -Link: https://lore.kernel.org/r/20230207065826.285013-7-william.zhang@broadcom.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx-hsspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c -index 2ad7b3f3666be..443a480767e09 100644 ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -192,7 +192,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) - tx += curr_step; - } - -- __raw_writew(opcode | curr_step, bs->fifo); -+ __raw_writew((u16)cpu_to_be16(opcode | curr_step), bs->fifo); - - /* enable interrupt */ - __raw_writel(HSSPI_PINGx_CMD_DONE(0), --- -2.39.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 32b01d25dd2..f1903cef520 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -201,7 +201,6 @@ hwmon-ltc2945-handle-error-case-in-ltc2945_value_sto.patch drm-amdgpu-fix-enum-odm_combine_mode-mismatch.patch scsi-mpt3sas-fix-a-memory-leak.patch scsi-aic94xx-add-missing-check-for-dma_map_single.patch -spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch spi-bcm63xx-hsspi-fix-pm_runtime.patch spi-bcm63xx-hsspi-fix-multi-bit-mode-setting.patch hwmon-mlxreg-fan-return-zero-speed-for-broken-fan.patch diff --git a/queue-5.10/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch b/queue-5.10/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch deleted file mode 100644 index b5150b0ea99..00000000000 --- a/queue-5.10/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fc3dd7aee110274dc3d76f77714fea9dadf77d5e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 Feb 2023 22:58:17 -0800 -Subject: spi: bcm63xx-hsspi: Endianness fix for ARM based SoC - -From: William Zhang - -[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ] - -HSSPI controller uses big endian for the opcode in the message to the -controller ping pong buffer. Use cpu_to_be16 to properly handle the -endianness for both big and little endian host. - -Fixes: 142168eba9dc ("spi: bcm63xx-hsspi: add bcm63xx HSSPI driver") -Signed-off-by: Kursad Oney -Signed-off-by: William Zhang -Acked-by: Florian Fainelli - -Link: https://lore.kernel.org/r/20230207065826.285013-7-william.zhang@broadcom.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx-hsspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c -index 1f08d7553f079..f591a543b1d07 100644 ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -193,7 +193,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) - tx += curr_step; - } - -- __raw_writew(opcode | curr_step, bs->fifo); -+ __raw_writew((u16)cpu_to_be16(opcode | curr_step), bs->fifo); - - /* enable interrupt */ - __raw_writel(HSSPI_PINGx_CMD_DONE(0), --- -2.39.2 - diff --git a/queue-5.15/series b/queue-5.15/series index 9794c7cfc6d..1c87c788f42 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -237,7 +237,6 @@ asoc-codecs-tx-macro-move-clk-provider-to-managed-va.patch asoc-codecs-rx-macro-move-to-individual-clks-from-bu.patch asoc-codecs-tx-macro-move-to-individual-clks-from-bu.patch asoc-codecs-lpass-fix-incorrect-mclk-rate.patch -spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch spi-bcm63xx-hsspi-fix-multi-bit-mode-setting.patch hwmon-mlxreg-fan-return-zero-speed-for-broken-fan.patch asoc-tlv320adcx140-fix-ti-gpio-config-dt-property-in.patch diff --git a/queue-5.15/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch b/queue-5.15/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch deleted file mode 100644 index d1da06af94c..00000000000 --- a/queue-5.15/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c561c7820378f83268550c350b27a2a953fa7acb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 Feb 2023 22:58:17 -0800 -Subject: spi: bcm63xx-hsspi: Endianness fix for ARM based SoC - -From: William Zhang - -[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ] - -HSSPI controller uses big endian for the opcode in the message to the -controller ping pong buffer. Use cpu_to_be16 to properly handle the -endianness for both big and little endian host. - -Fixes: 142168eba9dc ("spi: bcm63xx-hsspi: add bcm63xx HSSPI driver") -Signed-off-by: Kursad Oney -Signed-off-by: William Zhang -Acked-by: Florian Fainelli - -Link: https://lore.kernel.org/r/20230207065826.285013-7-william.zhang@broadcom.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx-hsspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c -index b871fd810d801..a74345ed0e2ff 100644 ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -194,7 +194,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) - tx += curr_step; - } - -- __raw_writew(opcode | curr_step, bs->fifo); -+ __raw_writew((u16)cpu_to_be16(opcode | curr_step), bs->fifo); - - /* enable interrupt */ - __raw_writel(HSSPI_PINGx_CMD_DONE(0), --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 67ed46d74d5..c5dd6a77468 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -121,7 +121,6 @@ asoc-soc-compress.c-fixup-private_data-on-snd_soc_ne.patch gpio-vf610-connect-gpio-label-to-dev-name.patch hwmon-ltc2945-handle-error-case-in-ltc2945_value_sto.patch scsi-aic94xx-add-missing-check-for-dma_map_single.patch -spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch spi-bcm63xx-hsspi-fix-pm_runtime.patch spi-bcm63xx-hsspi-fix-multi-bit-mode-setting.patch hwmon-mlxreg-fan-return-zero-speed-for-broken-fan.patch diff --git a/queue-5.4/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch b/queue-5.4/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch deleted file mode 100644 index 8d736a06a1d..00000000000 --- a/queue-5.4/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 69d60fd26d677a9e0974c1f27f6a274ae6e6ae31 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 Feb 2023 22:58:17 -0800 -Subject: spi: bcm63xx-hsspi: Endianness fix for ARM based SoC - -From: William Zhang - -[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ] - -HSSPI controller uses big endian for the opcode in the message to the -controller ping pong buffer. Use cpu_to_be16 to properly handle the -endianness for both big and little endian host. - -Fixes: 142168eba9dc ("spi: bcm63xx-hsspi: add bcm63xx HSSPI driver") -Signed-off-by: Kursad Oney -Signed-off-by: William Zhang -Acked-by: Florian Fainelli - -Link: https://lore.kernel.org/r/20230207065826.285013-7-william.zhang@broadcom.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx-hsspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c -index 509476a2d79bb..657855c56c1cb 100644 ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -192,7 +192,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) - tx += curr_step; - } - -- __raw_writew(opcode | curr_step, bs->fifo); -+ __raw_writew((u16)cpu_to_be16(opcode | curr_step), bs->fifo); - - /* enable interrupt */ - __raw_writel(HSSPI_PINGx_CMD_DONE(0), --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index d15610f4f4a..da0e5b73f66 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -353,7 +353,6 @@ asoc-qcom-q6apm-dai-fix-race-condition-while-updatin.patch asoc-qcom-q6apm-dai-add-sndrv_pcm_info_batch-flag.patch asoc-codecs-lpass-register-mclk-after-runtime-pm.patch asoc-codecs-lpass-fix-incorrect-mclk-rate.patch -spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch drm-amd-display-don-t-call-dc_interrupt_set-for-disa.patch hid-logitech-hidpp-hard-code-hid-1.0-fast-scroll-sup.patch spi-bcm63xx-hsspi-fix-multi-bit-mode-setting.patch diff --git a/queue-6.1/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch b/queue-6.1/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch deleted file mode 100644 index 1f5b050c6de..00000000000 --- a/queue-6.1/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From aca778056048ad947ce89d030e6e9f3ba0b503f7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 Feb 2023 22:58:17 -0800 -Subject: spi: bcm63xx-hsspi: Endianness fix for ARM based SoC - -From: William Zhang - -[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ] - -HSSPI controller uses big endian for the opcode in the message to the -controller ping pong buffer. Use cpu_to_be16 to properly handle the -endianness for both big and little endian host. - -Fixes: 142168eba9dc ("spi: bcm63xx-hsspi: add bcm63xx HSSPI driver") -Signed-off-by: Kursad Oney -Signed-off-by: William Zhang -Acked-by: Florian Fainelli - -Link: https://lore.kernel.org/r/20230207065826.285013-7-william.zhang@broadcom.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx-hsspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c -index b871fd810d801..a74345ed0e2ff 100644 ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -194,7 +194,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) - tx += curr_step; - } - -- __raw_writew(opcode | curr_step, bs->fifo); -+ __raw_writew((u16)cpu_to_be16(opcode | curr_step), bs->fifo); - - /* enable interrupt */ - __raw_writel(HSSPI_PINGx_CMD_DONE(0), --- -2.39.2 - diff --git a/queue-6.2/series b/queue-6.2/series index 11ebc8a5daf..7901589eccd 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -426,7 +426,6 @@ asoc-qcom-q6apm-dai-fix-race-condition-while-updatin.patch asoc-qcom-q6apm-dai-add-sndrv_pcm_info_batch-flag.patch asoc-codecs-lpass-register-mclk-after-runtime-pm.patch asoc-codecs-lpass-fix-incorrect-mclk-rate.patch -spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch drm-amd-display-don-t-call-dc_interrupt_set-for-disa.patch hid-logitech-hidpp-hard-code-hid-1.0-fast-scroll-sup.patch spi-bcm63xx-hsspi-fix-multi-bit-mode-setting.patch diff --git a/queue-6.2/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch b/queue-6.2/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch deleted file mode 100644 index a4bc7bb9e73..00000000000 --- a/queue-6.2/spi-bcm63xx-hsspi-endianness-fix-for-arm-based-soc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a8a67407f1e1f787a2a27ae140a965d7975e2648 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 Feb 2023 22:58:17 -0800 -Subject: spi: bcm63xx-hsspi: Endianness fix for ARM based SoC - -From: William Zhang - -[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ] - -HSSPI controller uses big endian for the opcode in the message to the -controller ping pong buffer. Use cpu_to_be16 to properly handle the -endianness for both big and little endian host. - -Fixes: 142168eba9dc ("spi: bcm63xx-hsspi: add bcm63xx HSSPI driver") -Signed-off-by: Kursad Oney -Signed-off-by: William Zhang -Acked-by: Florian Fainelli - -Link: https://lore.kernel.org/r/20230207065826.285013-7-william.zhang@broadcom.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx-hsspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c -index b871fd810d801..a74345ed0e2ff 100644 ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -194,7 +194,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) - tx += curr_step; - } - -- __raw_writew(opcode | curr_step, bs->fifo); -+ __raw_writew((u16)cpu_to_be16(opcode | curr_step), bs->fifo); - - /* enable interrupt */ - __raw_writel(HSSPI_PINGx_CMD_DONE(0), --- -2.39.2 -