From e50ee906307d1e69680437df587079d29472f816 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 25 Jun 2024 08:34:04 +0200 Subject: [PATCH] drop mips patch --- ...i-lantiq-restore-reset-gpio-polarity.patch | 73 ------------------- queue-6.1/series | 1 - ...i-lantiq-restore-reset-gpio-polarity.patch | 68 ----------------- queue-6.6/series | 1 - ...i-lantiq-restore-reset-gpio-polarity.patch | 68 ----------------- queue-6.9/series | 1 - 6 files changed, 212 deletions(-) delete mode 100644 queue-6.1/mips-pci-lantiq-restore-reset-gpio-polarity.patch delete mode 100644 queue-6.6/mips-pci-lantiq-restore-reset-gpio-polarity.patch delete mode 100644 queue-6.9/mips-pci-lantiq-restore-reset-gpio-polarity.patch diff --git a/queue-6.1/mips-pci-lantiq-restore-reset-gpio-polarity.patch b/queue-6.1/mips-pci-lantiq-restore-reset-gpio-polarity.patch deleted file mode 100644 index d21de2bd82d..00000000000 --- a/queue-6.1/mips-pci-lantiq-restore-reset-gpio-polarity.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 277a0363120276645ae598d8d5fea7265e076ae9 Mon Sep 17 00:00:00 2001 -From: Martin Schiller -Date: Fri, 7 Jun 2024 11:04:00 +0200 -Subject: MIPS: pci: lantiq: restore reset gpio polarity - -From: Martin Schiller - -commit 277a0363120276645ae598d8d5fea7265e076ae9 upstream. - -Commit 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") not -only switched to the gpiod API, but also inverted / changed the polarity -of the GPIO. - -According to the PCI specification, the RST# pin is an active-low -signal. However, most of the device trees that have been widely used for -a long time (mainly in the openWrt project) define this GPIO as -active-high and the old driver code inverted the signal internally. - -Apparently there are actually boards where the reset gpio must be -operated inverted. For this reason, we cannot use the GPIOD_OUT_LOW/HIGH -flag for initialization. Instead, we must explicitly set the gpio to -value 1 in order to take into account any "GPIO_ACTIVE_LOW" flag that -may have been set. - -In order to remain compatible with all these existing device trees, we -should therefore keep the logic as it was before the commit. - -Fixes: 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") -Cc: stable@vger.kernel.org -Signed-off-by: Martin Schiller -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman ---- - arch/mips/pci/pci-lantiq.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c -index 68a8cefed420..0844db34022e 100644 ---- a/arch/mips/pci/pci-lantiq.c -+++ b/arch/mips/pci/pci-lantiq.c -@@ -124,14 +124,14 @@ static int ltq_pci_startup(struct platform_device *pdev) - clk_disable(clk_external); - - /* setup reset gpio used by pci */ -- reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", -- GPIOD_OUT_LOW); -+ reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_ASIS); - error = PTR_ERR_OR_ZERO(reset_gpio); - if (error) { - dev_err(&pdev->dev, "failed to request gpio: %d\n", error); - return error; - } - gpiod_set_consumer_name(reset_gpio, "pci_reset"); -+ gpiod_direction_output(reset_gpio, 1); - - /* enable auto-switching between PCI and EBU */ - ltq_pci_w32(0xa, PCI_CR_CLK_CTRL); -@@ -194,10 +194,10 @@ static int ltq_pci_startup(struct platform_device *pdev) - - /* toggle reset pin */ - if (reset_gpio) { -- gpiod_set_value_cansleep(reset_gpio, 1); -+ gpiod_set_value_cansleep(reset_gpio, 0); - wmb(); - mdelay(1); -- gpiod_set_value_cansleep(reset_gpio, 0); -+ gpiod_set_value_cansleep(reset_gpio, 1); - } - return 0; - } --- -2.45.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 441303b2d92..2d3130fb03a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -106,7 +106,6 @@ drm-radeon-fix-ubsan-warning-in-kv_dpm.c.patch drm-amdgpu-fix-ubsan-warning-in-kv_dpm.c.patch gcov-add-support-for-gcc-14.patch kcov-don-t-lose-track-of-remote-references-during-softirqs.patch -mips-pci-lantiq-restore-reset-gpio-polarity.patch mm-mmap-allow-for-the-maximum-number-of-bits-for-randomizing-mmap_base-by-default.patch tcp-clear-tp-retrans_stamp-in-tcp_rcv_fastopen_synack.patch mm-page_table_check-fix-crash-on-zone_device.patch diff --git a/queue-6.6/mips-pci-lantiq-restore-reset-gpio-polarity.patch b/queue-6.6/mips-pci-lantiq-restore-reset-gpio-polarity.patch deleted file mode 100644 index bdfd84dd366..00000000000 --- a/queue-6.6/mips-pci-lantiq-restore-reset-gpio-polarity.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 277a0363120276645ae598d8d5fea7265e076ae9 Mon Sep 17 00:00:00 2001 -From: Martin Schiller -Date: Fri, 7 Jun 2024 11:04:00 +0200 -Subject: MIPS: pci: lantiq: restore reset gpio polarity - -From: Martin Schiller - -commit 277a0363120276645ae598d8d5fea7265e076ae9 upstream. - -Commit 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") not -only switched to the gpiod API, but also inverted / changed the polarity -of the GPIO. - -According to the PCI specification, the RST# pin is an active-low -signal. However, most of the device trees that have been widely used for -a long time (mainly in the openWrt project) define this GPIO as -active-high and the old driver code inverted the signal internally. - -Apparently there are actually boards where the reset gpio must be -operated inverted. For this reason, we cannot use the GPIOD_OUT_LOW/HIGH -flag for initialization. Instead, we must explicitly set the gpio to -value 1 in order to take into account any "GPIO_ACTIVE_LOW" flag that -may have been set. - -In order to remain compatible with all these existing device trees, we -should therefore keep the logic as it was before the commit. - -Fixes: 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") -Cc: stable@vger.kernel.org -Signed-off-by: Martin Schiller -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman ---- - arch/mips/pci/pci-lantiq.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/arch/mips/pci/pci-lantiq.c -+++ b/arch/mips/pci/pci-lantiq.c -@@ -124,14 +124,14 @@ static int ltq_pci_startup(struct platfo - clk_disable(clk_external); - - /* setup reset gpio used by pci */ -- reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", -- GPIOD_OUT_LOW); -+ reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_ASIS); - error = PTR_ERR_OR_ZERO(reset_gpio); - if (error) { - dev_err(&pdev->dev, "failed to request gpio: %d\n", error); - return error; - } - gpiod_set_consumer_name(reset_gpio, "pci_reset"); -+ gpiod_direction_output(reset_gpio, 1); - - /* enable auto-switching between PCI and EBU */ - ltq_pci_w32(0xa, PCI_CR_CLK_CTRL); -@@ -194,10 +194,10 @@ static int ltq_pci_startup(struct platfo - - /* toggle reset pin */ - if (reset_gpio) { -- gpiod_set_value_cansleep(reset_gpio, 1); -+ gpiod_set_value_cansleep(reset_gpio, 0); - wmb(); - mdelay(1); -- gpiod_set_value_cansleep(reset_gpio, 0); -+ gpiod_set_value_cansleep(reset_gpio, 1); - } - return 0; - } diff --git a/queue-6.6/series b/queue-6.6/series index fe981c6d4cc..e36ad0b1b84 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -159,7 +159,6 @@ gcov-add-support-for-gcc-14.patch kcov-don-t-lose-track-of-remote-references-during-softirqs.patch efi-x86-free-efi-memory-map-only-when-installing-a-new-one.patch serial-8250_dw-revert-move-definitions-to-the-shared-header.patch -mips-pci-lantiq-restore-reset-gpio-polarity.patch mm-mmap-allow-for-the-maximum-number-of-bits-for-randomizing-mmap_base-by-default.patch tcp-clear-tp-retrans_stamp-in-tcp_rcv_fastopen_synack.patch mm-page_table_check-fix-crash-on-zone_device.patch diff --git a/queue-6.9/mips-pci-lantiq-restore-reset-gpio-polarity.patch b/queue-6.9/mips-pci-lantiq-restore-reset-gpio-polarity.patch deleted file mode 100644 index bdfd84dd366..00000000000 --- a/queue-6.9/mips-pci-lantiq-restore-reset-gpio-polarity.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 277a0363120276645ae598d8d5fea7265e076ae9 Mon Sep 17 00:00:00 2001 -From: Martin Schiller -Date: Fri, 7 Jun 2024 11:04:00 +0200 -Subject: MIPS: pci: lantiq: restore reset gpio polarity - -From: Martin Schiller - -commit 277a0363120276645ae598d8d5fea7265e076ae9 upstream. - -Commit 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") not -only switched to the gpiod API, but also inverted / changed the polarity -of the GPIO. - -According to the PCI specification, the RST# pin is an active-low -signal. However, most of the device trees that have been widely used for -a long time (mainly in the openWrt project) define this GPIO as -active-high and the old driver code inverted the signal internally. - -Apparently there are actually boards where the reset gpio must be -operated inverted. For this reason, we cannot use the GPIOD_OUT_LOW/HIGH -flag for initialization. Instead, we must explicitly set the gpio to -value 1 in order to take into account any "GPIO_ACTIVE_LOW" flag that -may have been set. - -In order to remain compatible with all these existing device trees, we -should therefore keep the logic as it was before the commit. - -Fixes: 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") -Cc: stable@vger.kernel.org -Signed-off-by: Martin Schiller -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman ---- - arch/mips/pci/pci-lantiq.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/arch/mips/pci/pci-lantiq.c -+++ b/arch/mips/pci/pci-lantiq.c -@@ -124,14 +124,14 @@ static int ltq_pci_startup(struct platfo - clk_disable(clk_external); - - /* setup reset gpio used by pci */ -- reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", -- GPIOD_OUT_LOW); -+ reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_ASIS); - error = PTR_ERR_OR_ZERO(reset_gpio); - if (error) { - dev_err(&pdev->dev, "failed to request gpio: %d\n", error); - return error; - } - gpiod_set_consumer_name(reset_gpio, "pci_reset"); -+ gpiod_direction_output(reset_gpio, 1); - - /* enable auto-switching between PCI and EBU */ - ltq_pci_w32(0xa, PCI_CR_CLK_CTRL); -@@ -194,10 +194,10 @@ static int ltq_pci_startup(struct platfo - - /* toggle reset pin */ - if (reset_gpio) { -- gpiod_set_value_cansleep(reset_gpio, 1); -+ gpiod_set_value_cansleep(reset_gpio, 0); - wmb(); - mdelay(1); -- gpiod_set_value_cansleep(reset_gpio, 0); -+ gpiod_set_value_cansleep(reset_gpio, 1); - } - return 0; - } diff --git a/queue-6.9/series b/queue-6.9/series index 83e331be0ff..da6917557df 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -218,7 +218,6 @@ gcov-add-support-for-gcc-14.patch kcov-don-t-lose-track-of-remote-references-during-softirqs.patch efi-x86-free-efi-memory-map-only-when-installing-a-new-one.patch serial-8250_dw-revert-move-definitions-to-the-shared-header.patch -mips-pci-lantiq-restore-reset-gpio-polarity.patch mips-mipsmtregs-fix-target-register-for-mftc0.patch mm-mmap-allow-for-the-maximum-number-of-bits-for-randomizing-mmap_base-by-default.patch mm-huge_memory-fix-misused-mapping_large_folio_support-for-anon-folios.patch -- 2.47.3