| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20170721140544.j4obgspw7mcyikw5@zumbi.com.ar>
Date: Fri, 21 Jul 2017 22:05:44 +0800
From: gustavo panizzo <gfa@...bi.com.ar>
To: Baolin Wang <baolin.wang@...aro.org>
Cc: Felipe Balbi <balbi@...nel.org>,
Greg KH <gregkh@...uxfoundation.org>,
USB <linux-usb@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>, stable@...r.kernel.org,
Brian Kim <brian.kim@...dkernel.com>
Subject: Re: [PATCH] usb: dwc3: Fix the USB 3.0 hub detection bug after warm
boot
Hello,
On Thu, Jul 13, 2017 at 01:58:26PM +0800, Baolin Wang wrote:
>Hi,
>
>On 13 July 2017 at 07:20, gustavo panizzo <gfa@...bi.com.ar> wrote:
>> Hello Wang
>>
>> thanks for your response
>>
>>
>> On Wed, Jul 12, 2017 at 02:08:04PM +0800, Baolin Wang wrote:
>>>
>>> Hi,
>>>
>>> On 12 July 2017 at 11:52, gustavo panizzo <gfa@...bi.com.ar> wrote:
>>>>
>>>> The dwc3 could not release resources when the module is built-in
>>>> because this module does not have shutdown method. This causes the USB
>>>> 3.0 hub is not able to detect after warm boot.
>>>>
>>>> Original patch by Brian Kim, updated and submitted upstream by gustavo
>>>> panizzo.
>>>>
>>>> Also see https://bugs.debian.org/843448
>>>>
>>>> Signed-off-by: Brian Kim <brian.kim@...dkernel.com>
>>>> Signed-off-by: gustavo panizzo <gfa@...bi.com.ar>
>>>> ---
>>>> drivers/usb/dwc3/core.c | 33 +++++++++++++++++++++++++++++++++
>>>> 1 file changed, 33 insertions(+)
>>>>
>>>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
>>>> index 326b302fc440..f92dfe213d89 100644
>>>> --- a/drivers/usb/dwc3/core.c
>>>> +++ b/drivers/usb/dwc3/core.c
>>>> @@ -1259,6 +1259,38 @@ static int dwc3_probe(struct platform_device
>>>> *pdev)
>>>> return ret;
>>>> }
>>>>
>>>> +static void dwc3_shutdown(struct platform_device *pdev)
>>>> +{
>>>> + struct dwc3 *dwc = platform_get_drvdata(pdev);
>>>> + struct resource *res = platform_get_resource(pdev,
>>>> IORESOURCE_MEM, 0);
>>>> +
>>>> + pm_runtime_get_sync(&pdev->dev);
>>>> + /*
>>>> + * restore res->start back to its original value so that, in case
>>>> the
>>>> + * probe is deferred, we don't end up getting error in request
>>>> the
>>>> + * memory region the next time probe is called.
>>>> + */
>>>> + res->start -= DWC3_GLOBALS_REGS_START;
>>>> +
>>>> + dwc3_debugfs_exit(dwc);
>>>> + dwc3_core_exit_mode(dwc);
>>>> + dwc3_event_buffers_cleanup(dwc);
>>
>>
>> What about dwc3_event_buffers_cleanup? should I remove it from
>> dwc3_shutdown()?
>> It is already in dwc3_core_exit()
>
>I think so. We should avoid duplicate code.
>
>>>> + dwc3_free_event_buffers(dwc);
>>>> +
>>>> + usb_phy_set_suspend(dwc->usb2_phy, 1);
>>>> + usb_phy_set_suspend(dwc->usb3_phy, 1);
>>>> +
>>>> + phy_power_off(dwc->usb2_generic_phy);
>>>> + phy_power_off(dwc->usb3_generic_phy);
>>>
>>>
>>> We've done these in dwc3_core_exit().
This is the patch after testing on a Odroid XU4, on top of linux-next
964bcc1b4f57028d56dace7d9bc5924f2eb43f36 which translates to 4.13.0-rc1-next-20170717+
I tested this patch for a week without problems with heavy USB and NIC usage.
Please consider merging it
Author: gustavo panizzo <gfa@...bi.com.ar>
Date: Wed Jul 12 11:26:55 2017 +0800
usb: dwc3: Fix the USB 3.0 hub detection bug after warm boot
The dwc3 could not release resources when the module is built-in
because this module does not have shutdown method. This causes the USB
3.0 hub is not able to detect after warm boot.
Original patch by Brian Kim, updated and submitted upstream by gustavo
panizzo.
Also see https://bugs.debian.org/843448
Signed-off-by: Brian Kim <brian.kim@...dkernel.com>
Signed-off-by: gustavo panizzo <gfa@...bi.com.ar>
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 326b302fc440..09de37d47ee7 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1259,6 +1259,32 @@ static int dwc3_probe(struct platform_device *pdev)
return ret;
}
+static void dwc3_shutdown(struct platform_device *pdev)
+{
+ struct dwc3 *dwc = platform_get_drvdata(pdev);
+ struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+ pm_runtime_get_sync(&pdev->dev);
+ /*
+ * restore res->start back to its original value so that, in case the
+ * probe is deferred, we don't end up getting error in request the
+ * memory region the next time probe is called.
+ */
+ res->start -= DWC3_GLOBALS_REGS_START;
+
+ dwc3_debugfs_exit(dwc);
+ dwc3_core_exit_mode(dwc);
+ dwc3_event_buffers_cleanup(dwc);
+ dwc3_free_event_buffers(dwc);
+
+ dwc3_core_exit(dwc);
+ dwc3_ulpi_exit(dwc);
+
+ pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_allow(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+}
+
static int dwc3_remove(struct platform_device *pdev)
{
struct dwc3 *dwc = platform_get_drvdata(pdev);
@@ -1488,6 +1514,7 @@ MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);
static struct platform_driver dwc3_driver = {
.probe = dwc3_probe,
.remove = dwc3_remove,
+ .shutdown = dwc3_shutdown,
.driver = {
.name = "dwc3",
.of_match_table = of_match_ptr(of_dwc3_match),
>>>
>>>> +
>>>> + dwc3_core_exit(dwc);
>>>> + dwc3_ulpi_exit(dwc);
>>>> +
>>>> + pm_runtime_put_sync(&pdev->dev);
>>>> + pm_runtime_allow(&pdev->dev);
>>>> + pm_runtime_disable(&pdev->dev);
>>>> +}
>>>> +
>>>> static int dwc3_remove(struct platform_device *pdev)
>>>> {
>>>> struct dwc3 *dwc = platform_get_drvdata(pdev);
>>>> @@ -1488,6 +1520,7 @@ MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);
>>>> static struct platform_driver dwc3_driver = {
>>>> .probe = dwc3_probe,
>>>> .remove = dwc3_remove,
>>>> + .shutdown = dwc3_shutdown,
>>>> .driver = {
>>>> .name = "dwc3",
>>>> .of_match_table = of_match_ptr(of_dwc3_match),
>>>> --
>>>> 2.11.0
>>>>
>>>> --
>>>> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
>>>> the body of a message to majordomo@...r.kernel.org
>>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
>>>
>>>
>>>
>>> --
>>> Baolin.wang
>>> Best Regards
>>
>>
>> --
>> IRC: gfa
>> GPG: 0X44BB1BA79F6C6333
>>
>
>
>
>--
>Baolin.wang
>Best Regards
--
IRC: gfa
GPG: 0X44BB1BA79F6C6333
Powered by blists - more mailing lists