* patch "xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()" added to usb-linus
@ 2019-05-22 12:27 gregkh
2019-06-03 19:05 ` Raul Rangel
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2019-05-22 12:27 UTC (permalink / raw)
To: andrew.smirnov, gregkh, mathias.nyman, rrangel, stable
This is a note to let you know that I've just added the patch titled
xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the
next -rc kernel release.
If you have any questions about this process, please let me know.
From f7fac17ca925faa03fc5eb854c081a24075f8bad Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Wed, 22 May 2019 14:34:01 +0300
Subject: xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()
Xhci_handshake() implements the algorithm already captured by
readl_poll_timeout_atomic(). Convert the former to use the latter to
avoid repetition.
Turned out this patch also fixes a bug on the AMD Stoneyridge platform
where usleep(1) sometimes takes over 10ms.
This means a 5 second timeout can easily take over 15 seconds which will
trigger the watchdog and reboot the system.
[Add info about patch fixing a bug to commit message -Mathias]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Tested-by: Raul E Rangel <rrangel@chromium.org>
Reviewed-by: Raul E Rangel <rrangel@chromium.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/usb/host/xhci.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 048a675bbc52..20db378a6012 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -9,6 +9,7 @@
*/
#include <linux/pci.h>
+#include <linux/iopoll.h>
#include <linux/irq.h>
#include <linux/log2.h>
#include <linux/module.h>
@@ -52,7 +53,6 @@ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
return false;
}
-/* TODO: copied from ehci-hcd.c - can this be refactored? */
/*
* xhci_handshake - spin reading hc until handshake completes or fails
* @ptr: address of hc register to be read
@@ -69,18 +69,16 @@ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
int xhci_handshake(void __iomem *ptr, u32 mask, u32 done, int usec)
{
u32 result;
+ int ret;
- do {
- result = readl(ptr);
- if (result == ~(u32)0) /* card removed */
- return -ENODEV;
- result &= mask;
- if (result == done)
- return 0;
- udelay(1);
- usec--;
- } while (usec > 0);
- return -ETIMEDOUT;
+ ret = readl_poll_timeout_atomic(ptr, result,
+ (result & mask) == done ||
+ result == U32_MAX,
+ 1, usec);
+ if (result == U32_MAX) /* card removed */
+ return -ENODEV;
+
+ return ret;
}
/*
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: patch "xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()" added to usb-linus
2019-05-22 12:27 patch "xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()" added to usb-linus gregkh
@ 2019-06-03 19:05 ` Raul Rangel
2019-06-03 19:40 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Raul Rangel @ 2019-06-03 19:05 UTC (permalink / raw)
To: mathias.nyman; +Cc: andrew.smirnov, mathias.nyman, stable, gregkh
Mathias,
Are there any plans to backport this to the other kernels?
Looks like it landed upstream as f7fac17ca925faa03fc5eb854c081a24075f8bad
Thanks,
Raul
On Wed, May 22, 2019 at 02:27:29PM +0200, gregkh@linuxfoundation.org wrote:
>
> This is a note to let you know that I've just added the patch titled
>
> xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()
>
> to my usb git tree which can be found at
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
> in the usb-linus branch.
>
> The patch will show up in the next release of the linux-next tree
> (usually sometime within the next 24 hours during the week.)
>
> The patch will hopefully also be merged in Linus's tree for the
> next -rc kernel release.
>
> If you have any questions about this process, please let me know.
>
>
> From f7fac17ca925faa03fc5eb854c081a24075f8bad Mon Sep 17 00:00:00 2001
> From: Andrey Smirnov <andrew.smirnov@gmail.com>
> Date: Wed, 22 May 2019 14:34:01 +0300
> Subject: xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()
>
> Xhci_handshake() implements the algorithm already captured by
> readl_poll_timeout_atomic(). Convert the former to use the latter to
> avoid repetition.
>
> Turned out this patch also fixes a bug on the AMD Stoneyridge platform
> where usleep(1) sometimes takes over 10ms.
> This means a 5 second timeout can easily take over 15 seconds which will
> trigger the watchdog and reboot the system.
>
> [Add info about patch fixing a bug to commit message -Mathias]
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> Tested-by: Raul E Rangel <rrangel@chromium.org>
> Reviewed-by: Raul E Rangel <rrangel@chromium.org>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/usb/host/xhci.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 048a675bbc52..20db378a6012 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -9,6 +9,7 @@
> */
>
> #include <linux/pci.h>
> +#include <linux/iopoll.h>
> #include <linux/irq.h>
> #include <linux/log2.h>
> #include <linux/module.h>
> @@ -52,7 +53,6 @@ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
> return false;
> }
>
> -/* TODO: copied from ehci-hcd.c - can this be refactored? */
> /*
> * xhci_handshake - spin reading hc until handshake completes or fails
> * @ptr: address of hc register to be read
> @@ -69,18 +69,16 @@ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
> int xhci_handshake(void __iomem *ptr, u32 mask, u32 done, int usec)
> {
> u32 result;
> + int ret;
>
> - do {
> - result = readl(ptr);
> - if (result == ~(u32)0) /* card removed */
> - return -ENODEV;
> - result &= mask;
> - if (result == done)
> - return 0;
> - udelay(1);
> - usec--;
> - } while (usec > 0);
> - return -ETIMEDOUT;
> + ret = readl_poll_timeout_atomic(ptr, result,
> + (result & mask) == done ||
> + result == U32_MAX,
> + 1, usec);
> + if (result == U32_MAX) /* card removed */
> + return -ENODEV;
> +
> + return ret;
> }
>
> /*
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: patch "xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()" added to usb-linus
2019-06-03 19:05 ` Raul Rangel
@ 2019-06-03 19:40 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2019-06-03 19:40 UTC (permalink / raw)
To: Raul Rangel; +Cc: mathias.nyman, andrew.smirnov, stable
On Mon, Jun 03, 2019 at 01:05:38PM -0600, Raul Rangel wrote:
> Mathias,
> Are there any plans to backport this to the other kernels?
>
> Looks like it landed upstream as f7fac17ca925faa03fc5eb854c081a24075f8bad
That is what the stable@ tag will cause to have happen. Give it some
time...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-03 19:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-22 12:27 patch "xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()" added to usb-linus gregkh
2019-06-03 19:05 ` Raul Rangel
2019-06-03 19:40 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).