From 7bcc06775a546173561b974b544f4c08d82d4435 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 May 2017 14:52:33 +0200 Subject: [PATCH] had to delete 2 USB ehci patches that broke the build Dropped from 4.11, 4.9, and 4.4 queues. --- queue-4.11/series | 2 - ...i-platform-fix-companion-device-leak.patch | 36 ----------- ...ce-is-not-connected-in-system-resume.patch | 61 ------------------- queue-4.4/series | 2 - ...i-platform-fix-companion-device-leak.patch | 36 ----------- ...ce-is-not-connected-in-system-resume.patch | 61 ------------------- queue-4.9/series | 2 - ...i-platform-fix-companion-device-leak.patch | 36 ----------- ...ce-is-not-connected-in-system-resume.patch | 61 ------------------- 9 files changed, 297 deletions(-) delete mode 100644 queue-4.11/usb-ehci-platform-fix-companion-device-leak.patch delete mode 100644 queue-4.11/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch delete mode 100644 queue-4.4/usb-ehci-platform-fix-companion-device-leak.patch delete mode 100644 queue-4.4/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch delete mode 100644 queue-4.9/usb-ehci-platform-fix-companion-device-leak.patch delete mode 100644 queue-4.9/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch diff --git a/queue-4.11/series b/queue-4.11/series index ac9fd697545..995fe9ce545 100644 --- a/queue-4.11/series +++ b/queue-4.11/series @@ -98,8 +98,6 @@ dvb-usb-dibusb-mc-common-add-module_license.patch usb-dwc3-gadget-prevent-losing-events-in-event-cache.patch usb-musb-tusb6010_omap-do-not-reset-the-other-direction-s-packet-size.patch usb-musb-fix-trying-to-suspend-while-active-for-otg-configurations.patch -usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch -usb-ehci-platform-fix-companion-device-leak.patch usb-iowarrior-fix-info-ioctl-on-big-endian-hosts.patch usb-serial-option-add-telit-me910-support.patch usb-serial-qcserial-add-more-lenovo-em74xx-device-ids.patch diff --git a/queue-4.11/usb-ehci-platform-fix-companion-device-leak.patch b/queue-4.11/usb-ehci-platform-fix-companion-device-leak.patch deleted file mode 100644 index 336f025eb5e..00000000000 --- a/queue-4.11/usb-ehci-platform-fix-companion-device-leak.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a7415477a20448bbb7d13765784c0b29249a176f Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 16 May 2017 16:26:13 +0200 -Subject: USB: ehci-platform: fix companion-device leak - -From: Johan Hovold - -commit a7415477a20448bbb7d13765784c0b29249a176f upstream. - -Make sure do drop the reference taken to the companion device during -resume. - -Fixes: d4d75128b8fd ("usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume") -Signed-off-by: Johan Hovold -Acked-by: Yoshihiro Shimoda -Acked-by: Alan Stern -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/ehci-platform.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -381,8 +381,10 @@ static int ehci_platform_resume(struct d - } - - companion_dev = usb_of_get_companion_dev(hcd->self.controller); -- if (companion_dev) -+ if (companion_dev) { - device_pm_wait_for_dev(hcd->self.controller, companion_dev); -+ put_device(companion_dev); -+ } - - ehci_resume(hcd, priv->reset_on_resume); - return 0; diff --git a/queue-4.11/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch b/queue-4.11/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch deleted file mode 100644 index 73ec80ad086..00000000000 --- a/queue-4.11/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d4d75128b8fd727d42c775a16b41634d09409dba Mon Sep 17 00:00:00 2001 -From: Yoshihiro Shimoda -Date: Tue, 21 Feb 2017 19:59:48 +0900 -Subject: usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume - -From: Yoshihiro Shimoda - -commit d4d75128b8fd727d42c775a16b41634d09409dba upstream. - -This patch fixes an issue that a usb 1.1 device is not connected in -system resume and then the following message appeared if debug messages -are enabled: - usb 2-1: Waited 2000ms for CONNECT - -To resolve this issue, the EHCI controller must be resumed after its -companion controllers. So, this patch adds such code on the driver. - -Signed-off-by: Yoshihiro Shimoda -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/ehci-platform.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "ehci.h" - -@@ -297,6 +298,7 @@ static int ehci_platform_probe(struct pl - goto err_power; - - device_wakeup_enable(hcd->self.controller); -+ device_enable_async_suspend(hcd->self.controller); - platform_set_drvdata(dev, hcd); - - return err; -@@ -370,6 +372,7 @@ static int ehci_platform_resume(struct d - struct usb_ehci_pdata *pdata = dev_get_platdata(dev); - struct platform_device *pdev = to_platform_device(dev); - struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); -+ struct device *companion_dev; - - if (pdata->power_on) { - int err = pdata->power_on(pdev); -@@ -377,6 +380,10 @@ static int ehci_platform_resume(struct d - return err; - } - -+ companion_dev = usb_of_get_companion_dev(hcd->self.controller); -+ if (companion_dev) -+ device_pm_wait_for_dev(hcd->self.controller, companion_dev); -+ - ehci_resume(hcd, priv->reset_on_resume); - return 0; - } diff --git a/queue-4.4/series b/queue-4.4/series index 9f6038807c7..cde9b7f405a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -58,8 +58,6 @@ usbvision-fix-null-deref-at-probe.patch mceusb-fix-null-deref-at-probe.patch ttusb2-limit-messages-to-buffer-size.patch usb-musb-tusb6010_omap-do-not-reset-the-other-direction-s-packet-size.patch -usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch -usb-ehci-platform-fix-companion-device-leak.patch usb-iowarrior-fix-info-ioctl-on-big-endian-hosts.patch usb-serial-option-add-telit-me910-support.patch usb-serial-qcserial-add-more-lenovo-em74xx-device-ids.patch diff --git a/queue-4.4/usb-ehci-platform-fix-companion-device-leak.patch b/queue-4.4/usb-ehci-platform-fix-companion-device-leak.patch deleted file mode 100644 index faee09b113c..00000000000 --- a/queue-4.4/usb-ehci-platform-fix-companion-device-leak.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a7415477a20448bbb7d13765784c0b29249a176f Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 16 May 2017 16:26:13 +0200 -Subject: USB: ehci-platform: fix companion-device leak - -From: Johan Hovold - -commit a7415477a20448bbb7d13765784c0b29249a176f upstream. - -Make sure do drop the reference taken to the companion device during -resume. - -Fixes: d4d75128b8fd ("usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume") -Signed-off-by: Johan Hovold -Acked-by: Yoshihiro Shimoda -Acked-by: Alan Stern -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/ehci-platform.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -378,8 +378,10 @@ static int ehci_platform_resume(struct d - } - - companion_dev = usb_of_get_companion_dev(hcd->self.controller); -- if (companion_dev) -+ if (companion_dev) { - device_pm_wait_for_dev(hcd->self.controller, companion_dev); -+ put_device(companion_dev); -+ } - - ehci_resume(hcd, priv->reset_on_resume); - return 0; diff --git a/queue-4.4/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch b/queue-4.4/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch deleted file mode 100644 index 02e42efd4e5..00000000000 --- a/queue-4.4/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d4d75128b8fd727d42c775a16b41634d09409dba Mon Sep 17 00:00:00 2001 -From: Yoshihiro Shimoda -Date: Tue, 21 Feb 2017 19:59:48 +0900 -Subject: usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume - -From: Yoshihiro Shimoda - -commit d4d75128b8fd727d42c775a16b41634d09409dba upstream. - -This patch fixes an issue that a usb 1.1 device is not connected in -system resume and then the following message appeared if debug messages -are enabled: - usb 2-1: Waited 2000ms for CONNECT - -To resolve this issue, the EHCI controller must be resumed after its -companion controllers. So, this patch adds such code on the driver. - -Signed-off-by: Yoshihiro Shimoda -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/ehci-platform.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "ehci.h" - -@@ -292,6 +293,7 @@ static int ehci_platform_probe(struct pl - goto err_power; - - device_wakeup_enable(hcd->self.controller); -+ device_enable_async_suspend(hcd->self.controller); - platform_set_drvdata(dev, hcd); - - return err; -@@ -367,6 +369,7 @@ static int ehci_platform_resume(struct d - struct platform_device *pdev = - container_of(dev, struct platform_device, dev); - struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); -+ struct device *companion_dev; - - if (pdata->power_on) { - int err = pdata->power_on(pdev); -@@ -374,6 +377,10 @@ static int ehci_platform_resume(struct d - return err; - } - -+ companion_dev = usb_of_get_companion_dev(hcd->self.controller); -+ if (companion_dev) -+ device_pm_wait_for_dev(hcd->self.controller, companion_dev); -+ - ehci_resume(hcd, priv->reset_on_resume); - return 0; - } diff --git a/queue-4.9/series b/queue-4.9/series index c94beba73e8..e411dc204e0 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -87,8 +87,6 @@ dvb-usb-dibusb-mc-common-add-module_license.patch usb-dwc3-gadget-prevent-losing-events-in-event-cache.patch usb-musb-tusb6010_omap-do-not-reset-the-other-direction-s-packet-size.patch usb-musb-fix-trying-to-suspend-while-active-for-otg-configurations.patch -usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch -usb-ehci-platform-fix-companion-device-leak.patch usb-iowarrior-fix-info-ioctl-on-big-endian-hosts.patch usb-serial-option-add-telit-me910-support.patch usb-serial-qcserial-add-more-lenovo-em74xx-device-ids.patch diff --git a/queue-4.9/usb-ehci-platform-fix-companion-device-leak.patch b/queue-4.9/usb-ehci-platform-fix-companion-device-leak.patch deleted file mode 100644 index 336f025eb5e..00000000000 --- a/queue-4.9/usb-ehci-platform-fix-companion-device-leak.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a7415477a20448bbb7d13765784c0b29249a176f Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 16 May 2017 16:26:13 +0200 -Subject: USB: ehci-platform: fix companion-device leak - -From: Johan Hovold - -commit a7415477a20448bbb7d13765784c0b29249a176f upstream. - -Make sure do drop the reference taken to the companion device during -resume. - -Fixes: d4d75128b8fd ("usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume") -Signed-off-by: Johan Hovold -Acked-by: Yoshihiro Shimoda -Acked-by: Alan Stern -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/ehci-platform.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -381,8 +381,10 @@ static int ehci_platform_resume(struct d - } - - companion_dev = usb_of_get_companion_dev(hcd->self.controller); -- if (companion_dev) -+ if (companion_dev) { - device_pm_wait_for_dev(hcd->self.controller, companion_dev); -+ put_device(companion_dev); -+ } - - ehci_resume(hcd, priv->reset_on_resume); - return 0; diff --git a/queue-4.9/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch b/queue-4.9/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch deleted file mode 100644 index 73ec80ad086..00000000000 --- a/queue-4.9/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d4d75128b8fd727d42c775a16b41634d09409dba Mon Sep 17 00:00:00 2001 -From: Yoshihiro Shimoda -Date: Tue, 21 Feb 2017 19:59:48 +0900 -Subject: usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume - -From: Yoshihiro Shimoda - -commit d4d75128b8fd727d42c775a16b41634d09409dba upstream. - -This patch fixes an issue that a usb 1.1 device is not connected in -system resume and then the following message appeared if debug messages -are enabled: - usb 2-1: Waited 2000ms for CONNECT - -To resolve this issue, the EHCI controller must be resumed after its -companion controllers. So, this patch adds such code on the driver. - -Signed-off-by: Yoshihiro Shimoda -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/ehci-platform.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "ehci.h" - -@@ -297,6 +298,7 @@ static int ehci_platform_probe(struct pl - goto err_power; - - device_wakeup_enable(hcd->self.controller); -+ device_enable_async_suspend(hcd->self.controller); - platform_set_drvdata(dev, hcd); - - return err; -@@ -370,6 +372,7 @@ static int ehci_platform_resume(struct d - struct usb_ehci_pdata *pdata = dev_get_platdata(dev); - struct platform_device *pdev = to_platform_device(dev); - struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); -+ struct device *companion_dev; - - if (pdata->power_on) { - int err = pdata->power_on(pdev); -@@ -377,6 +380,10 @@ static int ehci_platform_resume(struct d - return err; - } - -+ companion_dev = usb_of_get_companion_dev(hcd->self.controller); -+ if (companion_dev) -+ device_pm_wait_for_dev(hcd->self.controller, companion_dev); -+ - ehci_resume(hcd, priv->reset_on_resume); - return 0; - } -- 2.47.3