From: Greg Kroah-Hartman Date: Wed, 21 Dec 2022 16:11:24 +0000 (+0100) Subject: drop usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch from everywhere X-Git-Tag: v5.10.161~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0953c5dd2425003dc7865fc2b2c7484798d6ce89;p=thirdparty%2Fkernel%2Fstable-queue.git drop usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch from everywhere --- diff --git a/queue-4.14/series b/queue-4.14/series index 680c18cb7c0..78dc3aceed0 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -18,6 +18,5 @@ usb-gadget-uvc-prevent-buffer-overflow-in-setup-handler.patch usb-serial-option-add-quectel-em05-g-modem.patch usb-serial-cp210x-add-kamstrup-rf-sniffer-pids.patch igb-initialize-mailbox-message-for-vf-reset.patch -usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch bluetooth-l2cap-fix-u8-overflow.patch net-loopback-use-net_name_predictable-for-name_assig.patch diff --git a/queue-4.14/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-4.14/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch deleted file mode 100644 index 80790a0302b..00000000000 --- a/queue-4.14/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac Mon Sep 17 00:00:00 2001 -From: Ferry Toth -Date: Mon, 5 Dec 2022 21:15:26 +0100 -Subject: usb: ulpi: defer ulpi_register on ulpi_read_id timeout - -From: Ferry Toth - -commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac upstream. - -Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral -if extcon is present") Dual Role support on Intel Merrifield platform -broke due to rearranging the call to dwc3_get_extcon(). - -It appears to be caused by ulpi_read_id() on the first test write failing -with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via -DT when the test write fails and returns 0 in that case, even if DT does not -provide the phy. As a result usb probe completes without phy. - -Make ulpi_read_id() return -ETIMEDOUT to its user if the first test write -fails. The user should then handle it appropriately. A follow up patch -will make dwc3_core_init() set -EPROBE_DEFER in this case and bail out. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Cc: stable@vger.kernel.org -Acked-by: Heikki Krogerus -Signed-off-by: Ferry Toth -Link: https://lore.kernel.org/r/20221205201527.13525-2-ftoth@exalondelft.nl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/common/ulpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -210,7 +210,7 @@ static int ulpi_read_id(struct ulpi *ulp - /* Test the interface */ - ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) -- goto err; -+ return ret; - - ret = ulpi_read(ulpi, ULPI_SCRATCH); - if (ret < 0) diff --git a/queue-4.19/series b/queue-4.19/series index a4b0cb9f9a0..e4c2334327b 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -17,6 +17,5 @@ usb-serial-option-add-quectel-em05-g-modem.patch usb-serial-cp210x-add-kamstrup-rf-sniffer-pids.patch usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch igb-initialize-mailbox-message-for-vf-reset.patch -usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch bluetooth-l2cap-fix-u8-overflow.patch net-loopback-use-net_name_predictable-for-name_assig.patch diff --git a/queue-4.19/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-4.19/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch deleted file mode 100644 index 8e85b8e3f06..00000000000 --- a/queue-4.19/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac Mon Sep 17 00:00:00 2001 -From: Ferry Toth -Date: Mon, 5 Dec 2022 21:15:26 +0100 -Subject: usb: ulpi: defer ulpi_register on ulpi_read_id timeout - -From: Ferry Toth - -commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac upstream. - -Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral -if extcon is present") Dual Role support on Intel Merrifield platform -broke due to rearranging the call to dwc3_get_extcon(). - -It appears to be caused by ulpi_read_id() on the first test write failing -with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via -DT when the test write fails and returns 0 in that case, even if DT does not -provide the phy. As a result usb probe completes without phy. - -Make ulpi_read_id() return -ETIMEDOUT to its user if the first test write -fails. The user should then handle it appropriately. A follow up patch -will make dwc3_core_init() set -EPROBE_DEFER in this case and bail out. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Cc: stable@vger.kernel.org -Acked-by: Heikki Krogerus -Signed-off-by: Ferry Toth -Link: https://lore.kernel.org/r/20221205201527.13525-2-ftoth@exalondelft.nl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/common/ulpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulp - /* Test the interface */ - ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) -- goto err; -+ return ret; - - ret = ulpi_read(ulpi, ULPI_SCRATCH); - if (ret < 0) diff --git a/queue-5.10/series b/queue-5.10/series index 4235029dd0f..d2a97ef3ac4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -9,7 +9,6 @@ usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch xhci-apply-xhci_reset_to_default-quirk-to-adl-n.patch igb-initialize-mailbox-message-for-vf-reset.patch -usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch hid-ite-add-support-for-acer-s1002-keyboard-dock.patch hid-ite-enable-quirk_touchpad_on_off_report-on-acer-.patch hid-ite-enable-quirk_touchpad_on_off_report-on-acer-.patch-1053 diff --git a/queue-5.10/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-5.10/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch deleted file mode 100644 index 72401eba74e..00000000000 --- a/queue-5.10/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac Mon Sep 17 00:00:00 2001 -From: Ferry Toth -Date: Mon, 5 Dec 2022 21:15:26 +0100 -Subject: usb: ulpi: defer ulpi_register on ulpi_read_id timeout - -From: Ferry Toth - -commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac upstream. - -Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral -if extcon is present") Dual Role support on Intel Merrifield platform -broke due to rearranging the call to dwc3_get_extcon(). - -It appears to be caused by ulpi_read_id() on the first test write failing -with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via -DT when the test write fails and returns 0 in that case, even if DT does not -provide the phy. As a result usb probe completes without phy. - -Make ulpi_read_id() return -ETIMEDOUT to its user if the first test write -fails. The user should then handle it appropriately. A follow up patch -will make dwc3_core_init() set -EPROBE_DEFER in this case and bail out. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Cc: stable@vger.kernel.org -Acked-by: Heikki Krogerus -Signed-off-by: Ferry Toth -Link: https://lore.kernel.org/r/20221205201527.13525-2-ftoth@exalondelft.nl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/common/ulpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -208,7 +208,7 @@ static int ulpi_read_id(struct ulpi *ulp - /* Test the interface */ - ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) -- goto err; -+ return ret; - - ret = ulpi_read(ulpi, ULPI_SCRATCH); - if (ret < 0) diff --git a/queue-5.15/series b/queue-5.15/series index e3d7536ba97..a14f7e4d479 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -10,7 +10,6 @@ usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch xhci-apply-xhci_reset_to_default-quirk-to-adl-n.patch igb-initialize-mailbox-message-for-vf-reset.patch usb-dwc3-pci-update-pcie-device-id-for-usb3-controller-on-cpu-sub-system-for-raptor-lake.patch -usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch hid-uclogic-add-hid_quirk_hidinput_force-quirk.patch bluetooth-l2cap-fix-u8-overflow.patch selftests-net-use-grep-e-instead-of-egrep.patch diff --git a/queue-5.15/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-5.15/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch deleted file mode 100644 index d090f36714c..00000000000 --- a/queue-5.15/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac Mon Sep 17 00:00:00 2001 -From: Ferry Toth -Date: Mon, 5 Dec 2022 21:15:26 +0100 -Subject: usb: ulpi: defer ulpi_register on ulpi_read_id timeout - -From: Ferry Toth - -commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac upstream. - -Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral -if extcon is present") Dual Role support on Intel Merrifield platform -broke due to rearranging the call to dwc3_get_extcon(). - -It appears to be caused by ulpi_read_id() on the first test write failing -with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via -DT when the test write fails and returns 0 in that case, even if DT does not -provide the phy. As a result usb probe completes without phy. - -Make ulpi_read_id() return -ETIMEDOUT to its user if the first test write -fails. The user should then handle it appropriately. A follow up patch -will make dwc3_core_init() set -EPROBE_DEFER in this case and bail out. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Cc: stable@vger.kernel.org -Acked-by: Heikki Krogerus -Signed-off-by: Ferry Toth -Link: https://lore.kernel.org/r/20221205201527.13525-2-ftoth@exalondelft.nl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/common/ulpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -206,7 +206,7 @@ static int ulpi_read_id(struct ulpi *ulp - /* Test the interface */ - ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) -- goto err; -+ return ret; - - ret = ulpi_read(ulpi, ULPI_SCRATCH); - if (ret < 0) diff --git a/queue-5.4/series b/queue-5.4/series index 0e1221b5773..649b5440057 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -9,7 +9,6 @@ usb-serial-cp210x-add-kamstrup-rf-sniffer-pids.patch usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch igb-initialize-mailbox-message-for-vf-reset.patch -usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch xen-netback-move-removal-of-hotplug-status-to-the-right-place.patch hid-ite-add-support-for-acer-s1002-keyboard-dock.patch hid-ite-enable-quirk_touchpad_on_off_report-on-acer-.patch diff --git a/queue-5.4/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-5.4/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch deleted file mode 100644 index 8e85b8e3f06..00000000000 --- a/queue-5.4/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac Mon Sep 17 00:00:00 2001 -From: Ferry Toth -Date: Mon, 5 Dec 2022 21:15:26 +0100 -Subject: usb: ulpi: defer ulpi_register on ulpi_read_id timeout - -From: Ferry Toth - -commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac upstream. - -Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral -if extcon is present") Dual Role support on Intel Merrifield platform -broke due to rearranging the call to dwc3_get_extcon(). - -It appears to be caused by ulpi_read_id() on the first test write failing -with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via -DT when the test write fails and returns 0 in that case, even if DT does not -provide the phy. As a result usb probe completes without phy. - -Make ulpi_read_id() return -ETIMEDOUT to its user if the first test write -fails. The user should then handle it appropriately. A follow up patch -will make dwc3_core_init() set -EPROBE_DEFER in this case and bail out. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Cc: stable@vger.kernel.org -Acked-by: Heikki Krogerus -Signed-off-by: Ferry Toth -Link: https://lore.kernel.org/r/20221205201527.13525-2-ftoth@exalondelft.nl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/common/ulpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulp - /* Test the interface */ - ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) -- goto err; -+ return ret; - - ret = ulpi_read(ulpi, ULPI_SCRATCH); - if (ret < 0) diff --git a/queue-6.0/series b/queue-6.0/series index eb6f41522fd..782e6c9bfa8 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -22,7 +22,6 @@ igb-initialize-mailbox-message-for-vf-reset.patch usb-typec-ucsi-resume-in-separate-work.patch usb-dwc3-pci-update-pcie-device-id-for-usb3-controller-on-cpu-sub-system-for-raptor-lake.patch keys-encrypted-fix-key-instantiation-with-user-provided-data.patch -usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch bluetooth-l2cap-fix-u8-overflow.patch selftests-net-use-grep-e-instead-of-egrep.patch net-loopback-use-net_name_predictable-for-name_assig.patch diff --git a/queue-6.0/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-6.0/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch deleted file mode 100644 index 8e85b8e3f06..00000000000 --- a/queue-6.0/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac Mon Sep 17 00:00:00 2001 -From: Ferry Toth -Date: Mon, 5 Dec 2022 21:15:26 +0100 -Subject: usb: ulpi: defer ulpi_register on ulpi_read_id timeout - -From: Ferry Toth - -commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac upstream. - -Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral -if extcon is present") Dual Role support on Intel Merrifield platform -broke due to rearranging the call to dwc3_get_extcon(). - -It appears to be caused by ulpi_read_id() on the first test write failing -with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via -DT when the test write fails and returns 0 in that case, even if DT does not -provide the phy. As a result usb probe completes without phy. - -Make ulpi_read_id() return -ETIMEDOUT to its user if the first test write -fails. The user should then handle it appropriately. A follow up patch -will make dwc3_core_init() set -EPROBE_DEFER in this case and bail out. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Cc: stable@vger.kernel.org -Acked-by: Heikki Krogerus -Signed-off-by: Ferry Toth -Link: https://lore.kernel.org/r/20221205201527.13525-2-ftoth@exalondelft.nl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/common/ulpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulp - /* Test the interface */ - ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) -- goto err; -+ return ret; - - ret = ulpi_read(ulpi, ULPI_SCRATCH); - if (ret < 0) diff --git a/queue-6.1/series b/queue-6.1/series index 7e50e23ebea..236531d9f29 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -22,4 +22,3 @@ usb-typec-ucsi-resume-in-separate-work.patch usb-dwc3-pci-update-pcie-device-id-for-usb3-controller-on-cpu-sub-system-for-raptor-lake.patch cifs-fix-oops-during-encryption.patch keys-encrypted-fix-key-instantiation-with-user-provided-data.patch -usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch diff --git a/queue-6.1/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-6.1/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch deleted file mode 100644 index 8e85b8e3f06..00000000000 --- a/queue-6.1/usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac Mon Sep 17 00:00:00 2001 -From: Ferry Toth -Date: Mon, 5 Dec 2022 21:15:26 +0100 -Subject: usb: ulpi: defer ulpi_register on ulpi_read_id timeout - -From: Ferry Toth - -commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac upstream. - -Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral -if extcon is present") Dual Role support on Intel Merrifield platform -broke due to rearranging the call to dwc3_get_extcon(). - -It appears to be caused by ulpi_read_id() on the first test write failing -with -ETIMEDOUT. Currently ulpi_read_id() expects to discover the phy via -DT when the test write fails and returns 0 in that case, even if DT does not -provide the phy. As a result usb probe completes without phy. - -Make ulpi_read_id() return -ETIMEDOUT to its user if the first test write -fails. The user should then handle it appropriately. A follow up patch -will make dwc3_core_init() set -EPROBE_DEFER in this case and bail out. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Cc: stable@vger.kernel.org -Acked-by: Heikki Krogerus -Signed-off-by: Ferry Toth -Link: https://lore.kernel.org/r/20221205201527.13525-2-ftoth@exalondelft.nl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/common/ulpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulp - /* Test the interface */ - ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); - if (ret < 0) -- goto err; -+ return ret; - - ret = ulpi_read(ulpi, ULPI_SCRATCH); - if (ret < 0)