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
| ||
|
Date: Thu, 10 Sep 2020 16:21:46 +0800 From: Chunfeng Yun <chunfeng.yun@...iatek.com> To: Greg Kroah-Hartman <gregkh@...uxfoundation.org> CC: Mathias Nyman <mathias.nyman@...el.com>, Felipe Balbi <balbi@...nel.org>, Matthias Brugger <matthias.bgg@...il.com>, Douglas Anderson <dianders@...omium.org>, Chunfeng Yun <chunfeng.yun@...iatek.com>, Daniel Thompson <daniel.thompson@...aro.org>, "Eric W. Biederman" <ebiederm@...ssion.com>, Lee Jones <lee.jones@...aro.org>, Sumit Garg <sumit.garg@...aro.org>, Jann Horn <jannh@...gle.com>, Arnd Bergmann <arnd@...db.de>, Jason Yan <yanaijie@...wei.com>, Chuhong Yuan <hslester96@...il.com>, "Gustavo A. R. Silva" <gustavoars@...nel.org>, Ben Dooks <ben.dooks@...ethink.co.uk>, Saurav Girepunje <saurav.girepunje@...il.com>, <linux-usb@...r.kernel.org>, <linux-kernel@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>, <linux-mediatek@...ts.infradead.org> Subject: [PATCH RESEND v3 05/11] usb: oxu210hp-hcd: convert to readl_poll_timeout_atomic() Use readl_poll_timeout_atomic() to simplify code Signed-off-by: Chunfeng Yun <chunfeng.yun@...iatek.com> --- v2~v3: no changes --- drivers/usb/host/oxu210hp-hcd.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index cfa7dd2..27dbbe1 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c @@ -24,6 +24,7 @@ #include <linux/moduleparam.h> #include <linux/dma-mapping.h> #include <linux/io.h> +#include <linux/iopoll.h> #include <asm/irq.h> #include <asm/unaligned.h> @@ -748,18 +749,16 @@ static int handshake(struct oxu_hcd *oxu, 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; } /* Force HC to halt state from unknown (EHCI spec section 2.3) */ -- 1.9.1
Powered by blists - more mailing lists