From 1a8837fe1d1d79adce2f34dc7ad732734d12c25b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 1 May 2022 18:43:34 +0200 Subject: [PATCH] drop some broken usb patches --- queue-4.14/series | 2 - ...-core-only-handle-soft-reset-in-dctl.patch | 35 ----------------- .../usb-phy-generic-get-the-vbus-supply.patch | 38 ------------------- queue-4.19/series | 2 - ...-core-only-handle-soft-reset-in-dctl.patch | 35 ----------------- .../usb-phy-generic-get-the-vbus-supply.patch | 38 ------------------- queue-4.9/series | 2 - ...-core-only-handle-soft-reset-in-dctl.patch | 35 ----------------- .../usb-phy-generic-get-the-vbus-supply.patch | 38 ------------------- 9 files changed, 225 deletions(-) delete mode 100644 queue-4.14/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch delete mode 100644 queue-4.14/usb-phy-generic-get-the-vbus-supply.patch delete mode 100644 queue-4.19/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch delete mode 100644 queue-4.19/usb-phy-generic-get-the-vbus-supply.patch delete mode 100644 queue-4.9/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch delete mode 100644 queue-4.9/usb-phy-generic-get-the-vbus-supply.patch diff --git a/queue-4.14/series b/queue-4.14/series index 2c7411f45b6..ed5f47fee84 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -18,7 +18,5 @@ iio-magnetometer-ak8975-fix-the-error-handling-in-ak8975_power_on.patch usb-misc-fix-improper-handling-of-refcount-in-uss720_probe.patch usb-gadget-uvc-fix-crash-when-encoding-data-for-usb-request.patch usb-gadget-configfs-clear-deactivation-flag-in-configfs_composite_unbind.patch -usb-dwc3-core-only-handle-soft-reset-in-dctl.patch -usb-phy-generic-get-the-vbus-supply.patch serial-8250-also-set-sticky-mcr-bits-in-console-restoration.patch serial-8250-correct-the-clock-for-endrun-ptp-1588-pcie-device.patch diff --git a/queue-4.14/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch b/queue-4.14/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch deleted file mode 100644 index ed9007eec17..00000000000 --- a/queue-4.14/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f4fd84ae0765a80494b28c43b756a95100351a94 Mon Sep 17 00:00:00 2001 -From: Thinh Nguyen -Date: Thu, 21 Apr 2022 19:33:56 -0700 -Subject: usb: dwc3: core: Only handle soft-reset in DCTL - -From: Thinh Nguyen - -commit f4fd84ae0765a80494b28c43b756a95100351a94 upstream. - -Make sure not to set run_stop bit or link state change request while -initiating soft-reset. Register read-modify-write operation may -unintentionally start the controller before the initialization completes -with its previous DCTL value, which can cause initialization failure. - -Fixes: f59dcab17629 ("usb: dwc3: core: improve reset sequence") -Cc: -Signed-off-by: Thinh Nguyen -Link: https://lore.kernel.org/r/6aecbd78328f102003d40ccf18ceeebd411d3703.1650594792.git.Thinh.Nguyen@synopsys.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/dwc3/core.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/dwc3/core.c -+++ b/drivers/usb/dwc3/core.c -@@ -238,7 +238,8 @@ static int dwc3_core_soft_reset(struct d - - reg = dwc3_readl(dwc->regs, DWC3_DCTL); - reg |= DWC3_DCTL_CSFTRST; -- dwc3_writel(dwc->regs, DWC3_DCTL, reg); -+ reg &= ~DWC3_DCTL_RUN_STOP; -+ dwc3_gadget_dctl_write_safe(dwc, reg); - - do { - reg = dwc3_readl(dwc->regs, DWC3_DCTL); diff --git a/queue-4.14/usb-phy-generic-get-the-vbus-supply.patch b/queue-4.14/usb-phy-generic-get-the-vbus-supply.patch deleted file mode 100644 index e14777e82e8..00000000000 --- a/queue-4.14/usb-phy-generic-get-the-vbus-supply.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 03e607cbb2931374db1825f371e9c7f28526d3f4 Mon Sep 17 00:00:00 2001 -From: Sean Anderson -Date: Mon, 25 Apr 2022 13:14:09 -0400 -Subject: usb: phy: generic: Get the vbus supply - -From: Sean Anderson - -commit 03e607cbb2931374db1825f371e9c7f28526d3f4 upstream. - -While support for working with a vbus was added, the regulator was never -actually gotten (despite what was documented). Fix this by actually -getting the supply from the device tree. - -Fixes: 7acc9973e3c4 ("usb: phy: generic: add vbus support") -Cc: stable -Signed-off-by: Sean Anderson -Link: https://lore.kernel.org/r/20220425171412.1188485-3-sean.anderson@seco.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/phy/phy-generic.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/phy/phy-generic.c -+++ b/drivers/usb/phy/phy-generic.c -@@ -293,6 +293,13 @@ int usb_phy_gen_create_phy(struct device - return -EPROBE_DEFER; - } - -+ nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus"); -+ if (PTR_ERR(nop->vbus_draw) == -ENODEV) -+ nop->vbus_draw = NULL; -+ if (IS_ERR(nop->vbus_draw)) -+ return dev_err_probe(dev, PTR_ERR(nop->vbus_draw), -+ "could not get vbus regulator\n"); -+ - nop->dev = dev; - nop->phy.dev = nop->dev; - nop->phy.label = "nop-xceiv"; diff --git a/queue-4.19/series b/queue-4.19/series index c807e3b4ce3..50cfadbdcc6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -13,9 +13,7 @@ usb-misc-fix-improper-handling-of-refcount-in-uss720_probe.patch usb-gadget-uvc-fix-crash-when-encoding-data-for-usb-request.patch usb-gadget-configfs-clear-deactivation-flag-in-configfs_composite_unbind.patch usb-dwc3-core-fix-tx-rx-threshold-settings.patch -usb-dwc3-core-only-handle-soft-reset-in-dctl.patch usb-dwc3-gadget-return-proper-request-status.patch -usb-phy-generic-get-the-vbus-supply.patch serial-imx-fix-overrun-interrupts-in-dma-mode.patch serial-8250-also-set-sticky-mcr-bits-in-console-restoration.patch serial-8250-correct-the-clock-for-endrun-ptp-1588-pcie-device.patch diff --git a/queue-4.19/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch b/queue-4.19/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch deleted file mode 100644 index c87526ff870..00000000000 --- a/queue-4.19/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f4fd84ae0765a80494b28c43b756a95100351a94 Mon Sep 17 00:00:00 2001 -From: Thinh Nguyen -Date: Thu, 21 Apr 2022 19:33:56 -0700 -Subject: usb: dwc3: core: Only handle soft-reset in DCTL - -From: Thinh Nguyen - -commit f4fd84ae0765a80494b28c43b756a95100351a94 upstream. - -Make sure not to set run_stop bit or link state change request while -initiating soft-reset. Register read-modify-write operation may -unintentionally start the controller before the initialization completes -with its previous DCTL value, which can cause initialization failure. - -Fixes: f59dcab17629 ("usb: dwc3: core: improve reset sequence") -Cc: -Signed-off-by: Thinh Nguyen -Link: https://lore.kernel.org/r/6aecbd78328f102003d40ccf18ceeebd411d3703.1650594792.git.Thinh.Nguyen@synopsys.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/dwc3/core.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/dwc3/core.c -+++ b/drivers/usb/dwc3/core.c -@@ -249,7 +249,8 @@ static int dwc3_core_soft_reset(struct d - - reg = dwc3_readl(dwc->regs, DWC3_DCTL); - reg |= DWC3_DCTL_CSFTRST; -- dwc3_writel(dwc->regs, DWC3_DCTL, reg); -+ reg &= ~DWC3_DCTL_RUN_STOP; -+ dwc3_gadget_dctl_write_safe(dwc, reg); - - do { - reg = dwc3_readl(dwc->regs, DWC3_DCTL); diff --git a/queue-4.19/usb-phy-generic-get-the-vbus-supply.patch b/queue-4.19/usb-phy-generic-get-the-vbus-supply.patch deleted file mode 100644 index e9cbc0576ba..00000000000 --- a/queue-4.19/usb-phy-generic-get-the-vbus-supply.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 03e607cbb2931374db1825f371e9c7f28526d3f4 Mon Sep 17 00:00:00 2001 -From: Sean Anderson -Date: Mon, 25 Apr 2022 13:14:09 -0400 -Subject: usb: phy: generic: Get the vbus supply - -From: Sean Anderson - -commit 03e607cbb2931374db1825f371e9c7f28526d3f4 upstream. - -While support for working with a vbus was added, the regulator was never -actually gotten (despite what was documented). Fix this by actually -getting the supply from the device tree. - -Fixes: 7acc9973e3c4 ("usb: phy: generic: add vbus support") -Cc: stable -Signed-off-by: Sean Anderson -Link: https://lore.kernel.org/r/20220425171412.1188485-3-sean.anderson@seco.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/phy/phy-generic.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/phy/phy-generic.c -+++ b/drivers/usb/phy/phy-generic.c -@@ -283,6 +283,13 @@ int usb_phy_gen_create_phy(struct device - return -EPROBE_DEFER; - } - -+ nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus"); -+ if (PTR_ERR(nop->vbus_draw) == -ENODEV) -+ nop->vbus_draw = NULL; -+ if (IS_ERR(nop->vbus_draw)) -+ return dev_err_probe(dev, PTR_ERR(nop->vbus_draw), -+ "could not get vbus regulator\n"); -+ - nop->dev = dev; - nop->phy.dev = nop->dev; - nop->phy.label = "nop-xceiv"; diff --git a/queue-4.9/series b/queue-4.9/series index 158626a91c2..fbdded27b92 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -14,7 +14,5 @@ iio-magnetometer-ak8975-fix-the-error-handling-in-ak8975_power_on.patch usb-misc-fix-improper-handling-of-refcount-in-uss720_probe.patch usb-gadget-uvc-fix-crash-when-encoding-data-for-usb-request.patch usb-gadget-configfs-clear-deactivation-flag-in-configfs_composite_unbind.patch -usb-dwc3-core-only-handle-soft-reset-in-dctl.patch -usb-phy-generic-get-the-vbus-supply.patch serial-8250-also-set-sticky-mcr-bits-in-console-restoration.patch serial-8250-correct-the-clock-for-endrun-ptp-1588-pcie-device.patch diff --git a/queue-4.9/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch b/queue-4.9/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch deleted file mode 100644 index d13c8727b28..00000000000 --- a/queue-4.9/usb-dwc3-core-only-handle-soft-reset-in-dctl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f4fd84ae0765a80494b28c43b756a95100351a94 Mon Sep 17 00:00:00 2001 -From: Thinh Nguyen -Date: Thu, 21 Apr 2022 19:33:56 -0700 -Subject: usb: dwc3: core: Only handle soft-reset in DCTL - -From: Thinh Nguyen - -commit f4fd84ae0765a80494b28c43b756a95100351a94 upstream. - -Make sure not to set run_stop bit or link state change request while -initiating soft-reset. Register read-modify-write operation may -unintentionally start the controller before the initialization completes -with its previous DCTL value, which can cause initialization failure. - -Fixes: f59dcab17629 ("usb: dwc3: core: improve reset sequence") -Cc: -Signed-off-by: Thinh Nguyen -Link: https://lore.kernel.org/r/6aecbd78328f102003d40ccf18ceeebd411d3703.1650594792.git.Thinh.Nguyen@synopsys.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/dwc3/core.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/dwc3/core.c -+++ b/drivers/usb/dwc3/core.c -@@ -156,7 +156,8 @@ static int dwc3_core_soft_reset(struct d - - reg = dwc3_readl(dwc->regs, DWC3_DCTL); - reg |= DWC3_DCTL_CSFTRST; -- dwc3_writel(dwc->regs, DWC3_DCTL, reg); -+ reg &= ~DWC3_DCTL_RUN_STOP; -+ dwc3_gadget_dctl_write_safe(dwc, reg); - - do { - reg = dwc3_readl(dwc->regs, DWC3_DCTL); diff --git a/queue-4.9/usb-phy-generic-get-the-vbus-supply.patch b/queue-4.9/usb-phy-generic-get-the-vbus-supply.patch deleted file mode 100644 index d0526c94bf5..00000000000 --- a/queue-4.9/usb-phy-generic-get-the-vbus-supply.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 03e607cbb2931374db1825f371e9c7f28526d3f4 Mon Sep 17 00:00:00 2001 -From: Sean Anderson -Date: Mon, 25 Apr 2022 13:14:09 -0400 -Subject: usb: phy: generic: Get the vbus supply - -From: Sean Anderson - -commit 03e607cbb2931374db1825f371e9c7f28526d3f4 upstream. - -While support for working with a vbus was added, the regulator was never -actually gotten (despite what was documented). Fix this by actually -getting the supply from the device tree. - -Fixes: 7acc9973e3c4 ("usb: phy: generic: add vbus support") -Cc: stable -Signed-off-by: Sean Anderson -Link: https://lore.kernel.org/r/20220425171412.1188485-3-sean.anderson@seco.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/phy/phy-generic.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/phy/phy-generic.c -+++ b/drivers/usb/phy/phy-generic.c -@@ -284,6 +284,13 @@ int usb_phy_gen_create_phy(struct device - return -EPROBE_DEFER; - } - -+ nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus"); -+ if (PTR_ERR(nop->vbus_draw) == -ENODEV) -+ nop->vbus_draw = NULL; -+ if (IS_ERR(nop->vbus_draw)) -+ return dev_err_probe(dev, PTR_ERR(nop->vbus_draw), -+ "could not get vbus regulator\n"); -+ - nop->dev = dev; - nop->phy.dev = nop->dev; - nop->phy.label = "nop-xceiv"; -- 2.47.3