* [v3 PATCH] usb: gadget: bdc: use readl_poll_timeout() to simplify code
@ 2020-07-13 6:48 Chunfeng Yun
2020-07-16 1:06 ` Stephen Boyd
2020-07-21 9:42 ` Felipe Balbi
0 siblings, 2 replies; 4+ messages in thread
From: Chunfeng Yun @ 2020-07-13 6:48 UTC (permalink / raw)
To: Felipe Balbi, Florian Fainelli
Cc: Greg Kroah-Hartman, Matthias Brugger, YueHaibing, Stephen Boyd,
Chunfeng Yun, linux-usb, linux-kernel, linux-arm-kernel,
linux-mediatek
Use readl_poll_timeout() to poll register status
Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
v3 changes:
1. indent code to match open parenthesis suggested by Florian
2. add Reviewed-by Florian
v2 changes, suggested by Stephen:
1. use unsigned int instead of int for @usec parameter
2. add dev_log() back
3. drop "Err" in error log
---
drivers/usb/gadget/udc/bdc/bdc_core.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c
index 02a3a77..d567e20 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_core.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_core.c
@@ -12,6 +12,7 @@
#include <linux/spinlock.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
+#include <linux/iopoll.h>
#include <linux/ioport.h>
#include <linux/io.h>
#include <linux/list.h>
@@ -29,24 +30,19 @@
#include "bdc_dbg.h"
/* Poll till controller status is not OIP */
-static int poll_oip(struct bdc *bdc, int usec)
+static int poll_oip(struct bdc *bdc, u32 usec)
{
u32 status;
- /* Poll till STS!= OIP */
- while (usec) {
- status = bdc_readl(bdc->regs, BDC_BDCSC);
- if (BDC_CSTS(status) != BDC_OIP) {
- dev_dbg(bdc->dev,
- "poll_oip complete status=%d",
- BDC_CSTS(status));
- return 0;
- }
- udelay(10);
- usec -= 10;
- }
- dev_err(bdc->dev, "Err: operation timedout BDCSC: 0x%08x\n", status);
+ int ret;
- return -ETIMEDOUT;
+ ret = readl_poll_timeout(bdc->regs + BDC_BDCSC, status,
+ (BDC_CSTS(status) != BDC_OIP), 10, usec);
+ if (ret)
+ dev_err(bdc->dev, "operation timedout BDCSC: 0x%08x\n", status);
+ else
+ dev_dbg(bdc->dev, "%s complete status=%d", __func__, BDC_CSTS(status));
+
+ return ret;
}
/* Stop the BDC controller */
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [v3 PATCH] usb: gadget: bdc: use readl_poll_timeout() to simplify code
2020-07-13 6:48 [v3 PATCH] usb: gadget: bdc: use readl_poll_timeout() to simplify code Chunfeng Yun
@ 2020-07-16 1:06 ` Stephen Boyd
2020-07-21 9:42 ` Felipe Balbi
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Boyd @ 2020-07-16 1:06 UTC (permalink / raw)
To: Chunfeng Yun, Felipe Balbi, Florian Fainelli
Cc: Greg Kroah-Hartman, linux-usb, YueHaibing, linux-kernel,
Chunfeng Yun, linux-mediatek, Matthias Brugger, linux-arm-kernel
Quoting Chunfeng Yun (2020-07-12 23:48:01)
> diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c
> index 02a3a77..d567e20 100644
> --- a/drivers/usb/gadget/udc/bdc/bdc_core.c
> +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c
> @@ -29,24 +30,19 @@
> #include "bdc_dbg.h"
>
> /* Poll till controller status is not OIP */
> -static int poll_oip(struct bdc *bdc, int usec)
> +static int poll_oip(struct bdc *bdc, u32 usec)
> {
> u32 status;
> - /* Poll till STS!= OIP */
> - while (usec) {
> - status = bdc_readl(bdc->regs, BDC_BDCSC);
> - if (BDC_CSTS(status) != BDC_OIP) {
> - dev_dbg(bdc->dev,
> - "poll_oip complete status=%d",
> - BDC_CSTS(status));
> - return 0;
> - }
> - udelay(10);
> - usec -= 10;
> - }
> - dev_err(bdc->dev, "Err: operation timedout BDCSC: 0x%08x\n", status);
> + int ret;
>
> - return -ETIMEDOUT;
> + ret = readl_poll_timeout(bdc->regs + BDC_BDCSC, status,
> + (BDC_CSTS(status) != BDC_OIP), 10, usec);
> + if (ret)
> + dev_err(bdc->dev, "operation timedout BDCSC: 0x%08x\n", status);
> + else
> + dev_dbg(bdc->dev, "%s complete status=%d", __func__, BDC_CSTS(status));
Different than before but OK.
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [v3 PATCH] usb: gadget: bdc: use readl_poll_timeout() to simplify code
2020-07-13 6:48 [v3 PATCH] usb: gadget: bdc: use readl_poll_timeout() to simplify code Chunfeng Yun
2020-07-16 1:06 ` Stephen Boyd
@ 2020-07-21 9:42 ` Felipe Balbi
2020-07-22 6:51 ` Chunfeng Yun
1 sibling, 1 reply; 4+ messages in thread
From: Felipe Balbi @ 2020-07-21 9:42 UTC (permalink / raw)
To: Chunfeng Yun, Florian Fainelli
Cc: Greg Kroah-Hartman, Matthias Brugger, YueHaibing, Stephen Boyd,
Chunfeng Yun, linux-usb, linux-kernel, linux-arm-kernel,
linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
Hi,
Chunfeng Yun <chunfeng.yun@mediatek.com> writes:
> Use readl_poll_timeout() to poll register status
>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
I had a lot of trouble to apply this patch, could you avoid base64
encoding on the patch body next time?
Thanks
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [v3 PATCH] usb: gadget: bdc: use readl_poll_timeout() to simplify code
2020-07-21 9:42 ` Felipe Balbi
@ 2020-07-22 6:51 ` Chunfeng Yun
0 siblings, 0 replies; 4+ messages in thread
From: Chunfeng Yun @ 2020-07-22 6:51 UTC (permalink / raw)
To: Felipe Balbi
Cc: Florian Fainelli, Greg Kroah-Hartman, Matthias Brugger,
YueHaibing, Stephen Boyd, linux-usb, linux-kernel,
linux-arm-kernel, linux-mediatek
On Tue, 2020-07-21 at 12:42 +0300, Felipe Balbi wrote:
> Hi,
>
> Chunfeng Yun <chunfeng.yun@mediatek.com> writes:
> > Use readl_poll_timeout() to poll register status
> >
> > Cc: Florian Fainelli <f.fainelli@gmail.com>
> > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
> > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
>
> I had a lot of trouble to apply this patch, could you avoid base64
> encoding on the patch body next time?
Sorry for inconvenience.
I usually use Source Insight 3.5 or Vim to edit the code, sometimes use
Beyond Compare to compare patches, their default encoding is UTF-8 or
ANSI. Not sure which tool would use base64 encoding, maybe introduced
when I copy email address from Win7 with Chinese (used to receive email)
into Win10 with English (used to sent email/patch).
Can you tell me which lines are base64 encoding in this patch?
The patch's encoding is ANSI, I'll convert it into UTF-8 and resend it,
please try it again.
>
> Thanks
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-22 6:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-13 6:48 [v3 PATCH] usb: gadget: bdc: use readl_poll_timeout() to simplify code Chunfeng Yun
2020-07-16 1:06 ` Stephen Boyd
2020-07-21 9:42 ` Felipe Balbi
2020-07-22 6:51 ` Chunfeng Yun
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).