From: Greg Kroah-Hartman Date: Tue, 12 Sep 2023 10:52:24 +0000 (+0200) Subject: drop spi patch from everywhere X-Git-Tag: v6.1.53~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d3deea2e31e2d00eec25f262fc0665ca5daed7f;p=thirdparty%2Fkernel%2Fstable-queue.git drop spi patch from everywhere --- diff --git a/queue-5.15/series b/queue-5.15/series index 55aa5164b8b..86bcb2c0156 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -101,7 +101,6 @@ bluetooth-nokia-fix-value-check-in-nokia_bluetooth_s.patch bluetooth-fix-potential-use-after-free-when-clear-ke.patch net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch selftests-bpf-clean-up-fmod_ret-in-bench_rename-test.patch -spi-tegra114-remove-unnecessary-null-pointer-checks.patch net-fix-slab-out-of-bounds-in-inet-6-_steal_sock.patch net-memcg-fix-scope-of-sockmem-pressure-indicators.patch ice-ice_aq_check_events-fix-off-by-one-check-when-fi.patch diff --git a/queue-5.15/spi-tegra114-remove-unnecessary-null-pointer-checks.patch b/queue-5.15/spi-tegra114-remove-unnecessary-null-pointer-checks.patch deleted file mode 100644 index 2362c920606..00000000000 --- a/queue-5.15/spi-tegra114-remove-unnecessary-null-pointer-checks.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 610a0364955625d2396971763585c37a3ef0bd76 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Aug 2023 12:20:58 +0300 -Subject: spi: tegra114: Remove unnecessary NULL-pointer checks - -From: Alexander Danilenko - -[ Upstream commit 373c36bf7914e3198ac2654dede499f340c52950 ] - -cs_setup, cs_hold and cs_inactive points to fields of spi_device struct, -so there is no sense in checking them for NULL. - -Found by Linux Verification Center (linuxtesting.org) with SVACE. - -Fixes: 04e6bb0d6bb1 ("spi: modify set_cs_timing parameter") -Signed-off-by: Alexander Danilenko -Link: https://lore.kernel.org/r/20230815092058.4083-1-al.b.danilenko@gmail.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-tegra114.c | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c -index 8f345247a8c32..b6f081227cbd4 100644 ---- a/drivers/spi/spi-tegra114.c -+++ b/drivers/spi/spi-tegra114.c -@@ -723,27 +723,23 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - struct spi_delay *setup = &spi->cs_setup; - struct spi_delay *hold = &spi->cs_hold; - struct spi_delay *inactive = &spi->cs_inactive; -- u8 setup_dly, hold_dly, inactive_dly; -+ u8 setup_dly, hold_dly; - u32 setup_hold; - u32 spi_cs_timing; - u32 inactive_cycles; - u8 cs_state; - -- if ((setup && setup->unit != SPI_DELAY_UNIT_SCK) || -- (hold && hold->unit != SPI_DELAY_UNIT_SCK) || -- (inactive && inactive->unit != SPI_DELAY_UNIT_SCK)) { -+ if (setup->unit != SPI_DELAY_UNIT_SCK || -+ hold->unit != SPI_DELAY_UNIT_SCK || -+ inactive->unit != SPI_DELAY_UNIT_SCK) { - dev_err(&spi->dev, - "Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n", - SPI_DELAY_UNIT_SCK); - return -EINVAL; - } - -- setup_dly = setup ? setup->value : 0; -- hold_dly = hold ? hold->value : 0; -- inactive_dly = inactive ? inactive->value : 0; -- -- setup_dly = min_t(u8, setup_dly, MAX_SETUP_HOLD_CYCLES); -- hold_dly = min_t(u8, hold_dly, MAX_SETUP_HOLD_CYCLES); -+ setup_dly = min_t(u8, setup->value, MAX_SETUP_HOLD_CYCLES); -+ hold_dly = min_t(u8, hold->value, MAX_SETUP_HOLD_CYCLES); - if (setup_dly && hold_dly) { - setup_hold = SPI_SETUP_HOLD(setup_dly - 1, hold_dly - 1); - spi_cs_timing = SPI_CS_SETUP_HOLD(tspi->spi_cs_timing1, -@@ -755,7 +751,7 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - } - } - -- inactive_cycles = min_t(u8, inactive_dly, MAX_INACTIVE_CYCLES); -+ inactive_cycles = min_t(u8, inactive->value, MAX_INACTIVE_CYCLES); - if (inactive_cycles) - inactive_cycles--; - cs_state = inactive_cycles ? 0 : 1; --- -2.40.1 - diff --git a/queue-6.1/series b/queue-6.1/series index 560e3f47cba..ecaec11fa31 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -173,7 +173,6 @@ bluetooth-hci_sync-avoid-use-after-free-in-dbg-for-h.patch net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch selftests-bpf-fix-repeat-option-when-kfunc_call-veri.patch selftests-bpf-clean-up-fmod_ret-in-bench_rename-test.patch -spi-tegra114-remove-unnecessary-null-pointer-checks.patch net-fix-slab-out-of-bounds-in-inet-6-_steal_sock.patch net-memcg-fix-scope-of-sockmem-pressure-indicators.patch ice-ice_aq_check_events-fix-off-by-one-check-when-fi.patch diff --git a/queue-6.1/spi-tegra114-remove-unnecessary-null-pointer-checks.patch b/queue-6.1/spi-tegra114-remove-unnecessary-null-pointer-checks.patch deleted file mode 100644 index 1715ac646ca..00000000000 --- a/queue-6.1/spi-tegra114-remove-unnecessary-null-pointer-checks.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 92a88e70cfd0d6d1148947aee97349176ef318fe Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Aug 2023 12:20:58 +0300 -Subject: spi: tegra114: Remove unnecessary NULL-pointer checks - -From: Alexander Danilenko - -[ Upstream commit 373c36bf7914e3198ac2654dede499f340c52950 ] - -cs_setup, cs_hold and cs_inactive points to fields of spi_device struct, -so there is no sense in checking them for NULL. - -Found by Linux Verification Center (linuxtesting.org) with SVACE. - -Fixes: 04e6bb0d6bb1 ("spi: modify set_cs_timing parameter") -Signed-off-by: Alexander Danilenko -Link: https://lore.kernel.org/r/20230815092058.4083-1-al.b.danilenko@gmail.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-tegra114.c | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c -index d9be80e3e1bcb..6b56108308fc5 100644 ---- a/drivers/spi/spi-tegra114.c -+++ b/drivers/spi/spi-tegra114.c -@@ -723,27 +723,23 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - struct spi_delay *setup = &spi->cs_setup; - struct spi_delay *hold = &spi->cs_hold; - struct spi_delay *inactive = &spi->cs_inactive; -- u8 setup_dly, hold_dly, inactive_dly; -+ u8 setup_dly, hold_dly; - u32 setup_hold; - u32 spi_cs_timing; - u32 inactive_cycles; - u8 cs_state; - -- if ((setup && setup->unit != SPI_DELAY_UNIT_SCK) || -- (hold && hold->unit != SPI_DELAY_UNIT_SCK) || -- (inactive && inactive->unit != SPI_DELAY_UNIT_SCK)) { -+ if (setup->unit != SPI_DELAY_UNIT_SCK || -+ hold->unit != SPI_DELAY_UNIT_SCK || -+ inactive->unit != SPI_DELAY_UNIT_SCK) { - dev_err(&spi->dev, - "Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n", - SPI_DELAY_UNIT_SCK); - return -EINVAL; - } - -- setup_dly = setup ? setup->value : 0; -- hold_dly = hold ? hold->value : 0; -- inactive_dly = inactive ? inactive->value : 0; -- -- setup_dly = min_t(u8, setup_dly, MAX_SETUP_HOLD_CYCLES); -- hold_dly = min_t(u8, hold_dly, MAX_SETUP_HOLD_CYCLES); -+ setup_dly = min_t(u8, setup->value, MAX_SETUP_HOLD_CYCLES); -+ hold_dly = min_t(u8, hold->value, MAX_SETUP_HOLD_CYCLES); - if (setup_dly && hold_dly) { - setup_hold = SPI_SETUP_HOLD(setup_dly - 1, hold_dly - 1); - spi_cs_timing = SPI_CS_SETUP_HOLD(tspi->spi_cs_timing1, -@@ -755,7 +751,7 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - } - } - -- inactive_cycles = min_t(u8, inactive_dly, MAX_INACTIVE_CYCLES); -+ inactive_cycles = min_t(u8, inactive->value, MAX_INACTIVE_CYCLES); - if (inactive_cycles) - inactive_cycles--; - cs_state = inactive_cycles ? 0 : 1; --- -2.40.1 - diff --git a/queue-6.4/series b/queue-6.4/series index 870fd10bba8..affad6d9ed7 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -207,7 +207,6 @@ bluetooth-hci_event-drop-only-unbound-cis-if-set-cig.patch net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch selftests-bpf-fix-repeat-option-when-kfunc_call-veri.patch selftests-bpf-clean-up-fmod_ret-in-bench_rename-test.patch -spi-tegra114-remove-unnecessary-null-pointer-checks.patch net-fix-slab-out-of-bounds-in-inet-6-_steal_sock.patch net-hns3-move-dump-regs-function-to-a-separate-file.patch net-hns3-support-tlv-in-regs-data-for-hns3-pf-driver.patch diff --git a/queue-6.4/spi-tegra114-remove-unnecessary-null-pointer-checks.patch b/queue-6.4/spi-tegra114-remove-unnecessary-null-pointer-checks.patch deleted file mode 100644 index ff33aedff75..00000000000 --- a/queue-6.4/spi-tegra114-remove-unnecessary-null-pointer-checks.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 4e8f4e956559f1f0ca249d76ba5cd61e1bacbeea Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Aug 2023 12:20:58 +0300 -Subject: spi: tegra114: Remove unnecessary NULL-pointer checks - -From: Alexander Danilenko - -[ Upstream commit 373c36bf7914e3198ac2654dede499f340c52950 ] - -cs_setup, cs_hold and cs_inactive points to fields of spi_device struct, -so there is no sense in checking them for NULL. - -Found by Linux Verification Center (linuxtesting.org) with SVACE. - -Fixes: 04e6bb0d6bb1 ("spi: modify set_cs_timing parameter") -Signed-off-by: Alexander Danilenko -Link: https://lore.kernel.org/r/20230815092058.4083-1-al.b.danilenko@gmail.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-tegra114.c | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c -index 488df681eaefc..2226d77a5d20a 100644 ---- a/drivers/spi/spi-tegra114.c -+++ b/drivers/spi/spi-tegra114.c -@@ -723,27 +723,23 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - struct spi_delay *setup = &spi->cs_setup; - struct spi_delay *hold = &spi->cs_hold; - struct spi_delay *inactive = &spi->cs_inactive; -- u8 setup_dly, hold_dly, inactive_dly; -+ u8 setup_dly, hold_dly; - u32 setup_hold; - u32 spi_cs_timing; - u32 inactive_cycles; - u8 cs_state; - -- if ((setup && setup->unit != SPI_DELAY_UNIT_SCK) || -- (hold && hold->unit != SPI_DELAY_UNIT_SCK) || -- (inactive && inactive->unit != SPI_DELAY_UNIT_SCK)) { -+ if (setup->unit != SPI_DELAY_UNIT_SCK || -+ hold->unit != SPI_DELAY_UNIT_SCK || -+ inactive->unit != SPI_DELAY_UNIT_SCK) { - dev_err(&spi->dev, - "Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n", - SPI_DELAY_UNIT_SCK); - return -EINVAL; - } - -- setup_dly = setup ? setup->value : 0; -- hold_dly = hold ? hold->value : 0; -- inactive_dly = inactive ? inactive->value : 0; -- -- setup_dly = min_t(u8, setup_dly, MAX_SETUP_HOLD_CYCLES); -- hold_dly = min_t(u8, hold_dly, MAX_SETUP_HOLD_CYCLES); -+ setup_dly = min_t(u8, setup->value, MAX_SETUP_HOLD_CYCLES); -+ hold_dly = min_t(u8, hold->value, MAX_SETUP_HOLD_CYCLES); - if (setup_dly && hold_dly) { - setup_hold = SPI_SETUP_HOLD(setup_dly - 1, hold_dly - 1); - spi_cs_timing = SPI_CS_SETUP_HOLD(tspi->spi_cs_timing1, -@@ -755,7 +751,7 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - } - } - -- inactive_cycles = min_t(u8, inactive_dly, MAX_INACTIVE_CYCLES); -+ inactive_cycles = min_t(u8, inactive->value, MAX_INACTIVE_CYCLES); - if (inactive_cycles) - inactive_cycles--; - cs_state = inactive_cycles ? 0 : 1; --- -2.40.1 - diff --git a/queue-6.5/series b/queue-6.5/series index 02151bde366..fe9abd2f5a6 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -131,7 +131,6 @@ net-pcs-lynx-fix-lynx_pcs_link_up_sgmii-not-doing-an.patch libbpf-set-close-on-exec-flag-on-gzopen.patch selftests-bpf-fix-repeat-option-when-kfunc_call-veri.patch selftests-bpf-clean-up-fmod_ret-in-bench_rename-test.patch -spi-tegra114-remove-unnecessary-null-pointer-checks.patch net-fix-slab-out-of-bounds-in-inet-6-_steal_sock.patch net-hns3-move-dump-regs-function-to-a-separate-file.patch net-hns3-support-tlv-in-regs-data-for-hns3-pf-driver.patch diff --git a/queue-6.5/spi-tegra114-remove-unnecessary-null-pointer-checks.patch b/queue-6.5/spi-tegra114-remove-unnecessary-null-pointer-checks.patch deleted file mode 100644 index cf27b2f6478..00000000000 --- a/queue-6.5/spi-tegra114-remove-unnecessary-null-pointer-checks.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c70fa995fc3b4241cc3a41a22e7878e5ad733ad5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Aug 2023 12:20:58 +0300 -Subject: spi: tegra114: Remove unnecessary NULL-pointer checks - -From: Alexander Danilenko - -[ Upstream commit 373c36bf7914e3198ac2654dede499f340c52950 ] - -cs_setup, cs_hold and cs_inactive points to fields of spi_device struct, -so there is no sense in checking them for NULL. - -Found by Linux Verification Center (linuxtesting.org) with SVACE. - -Fixes: 04e6bb0d6bb1 ("spi: modify set_cs_timing parameter") -Signed-off-by: Alexander Danilenko -Link: https://lore.kernel.org/r/20230815092058.4083-1-al.b.danilenko@gmail.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-tegra114.c | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c -index 488df681eaefc..2226d77a5d20a 100644 ---- a/drivers/spi/spi-tegra114.c -+++ b/drivers/spi/spi-tegra114.c -@@ -723,27 +723,23 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - struct spi_delay *setup = &spi->cs_setup; - struct spi_delay *hold = &spi->cs_hold; - struct spi_delay *inactive = &spi->cs_inactive; -- u8 setup_dly, hold_dly, inactive_dly; -+ u8 setup_dly, hold_dly; - u32 setup_hold; - u32 spi_cs_timing; - u32 inactive_cycles; - u8 cs_state; - -- if ((setup && setup->unit != SPI_DELAY_UNIT_SCK) || -- (hold && hold->unit != SPI_DELAY_UNIT_SCK) || -- (inactive && inactive->unit != SPI_DELAY_UNIT_SCK)) { -+ if (setup->unit != SPI_DELAY_UNIT_SCK || -+ hold->unit != SPI_DELAY_UNIT_SCK || -+ inactive->unit != SPI_DELAY_UNIT_SCK) { - dev_err(&spi->dev, - "Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n", - SPI_DELAY_UNIT_SCK); - return -EINVAL; - } - -- setup_dly = setup ? setup->value : 0; -- hold_dly = hold ? hold->value : 0; -- inactive_dly = inactive ? inactive->value : 0; -- -- setup_dly = min_t(u8, setup_dly, MAX_SETUP_HOLD_CYCLES); -- hold_dly = min_t(u8, hold_dly, MAX_SETUP_HOLD_CYCLES); -+ setup_dly = min_t(u8, setup->value, MAX_SETUP_HOLD_CYCLES); -+ hold_dly = min_t(u8, hold->value, MAX_SETUP_HOLD_CYCLES); - if (setup_dly && hold_dly) { - setup_hold = SPI_SETUP_HOLD(setup_dly - 1, hold_dly - 1); - spi_cs_timing = SPI_CS_SETUP_HOLD(tspi->spi_cs_timing1, -@@ -755,7 +751,7 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) - } - } - -- inactive_cycles = min_t(u8, inactive_dly, MAX_INACTIVE_CYCLES); -+ inactive_cycles = min_t(u8, inactive->value, MAX_INACTIVE_CYCLES); - if (inactive_cycles) - inactive_cycles--; - cs_state = inactive_cycles ? 0 : 1; --- -2.40.1 -