From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Felipe Balbi <balbi@kernel.org>
Cc: Mathias Nyman <mathias.nyman@intel.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Sumit Garg <sumit.garg@linaro.org>,
Lee Jones <lee.jones@linaro.org>, Jann Horn <jannh@google.com>,
Jason Yan <yanaijie@huawei.com>, Arnd Bergmann <arnd@arndb.de>,
Chuhong Yuan <hslester96@gmail.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
"Ben Dooks (Codethink)" <ben.dooks@codethink.co.uk>,
Saurav Girepunje <saurav.girepunje@gmail.com>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Daniel Thompson <daniel.thompson@linaro.org>
Subject: [PATCH v4 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic()
Date: Mon, 21 Sep 2020 14:13:33 +0800 [thread overview]
Message-ID: <1600668815-12135-9-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com>
Use readl_poll_timeout_atomic() to simplify code
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v4: no changes
v3: re-align argument of log suggested by Sergei
v2: udelay 10us instead of 20us according to kerneldoc
---
drivers/usb/phy/phy-mv-usb.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c
index ce767ec..576d925 100644
--- a/drivers/usb/phy/phy-mv-usb.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -8,6 +8,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/uaccess.h>
#include <linux/device.h>
#include <linux/proc_fs.h>
@@ -135,8 +136,8 @@ static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id,
static int mv_otg_reset(struct mv_otg *mvotg)
{
- unsigned int loops;
u32 tmp;
+ int ret;
/* Stop the controller */
tmp = readl(&mvotg->op_regs->usbcmd);
@@ -146,15 +147,12 @@ static int mv_otg_reset(struct mv_otg *mvotg)
/* Reset the controller to get default values */
writel(USBCMD_CTRL_RESET, &mvotg->op_regs->usbcmd);
- loops = 500;
- while (readl(&mvotg->op_regs->usbcmd) & USBCMD_CTRL_RESET) {
- if (loops == 0) {
- dev_err(&mvotg->pdev->dev,
- "Wait for RESET completed TIMEOUT\n");
- return -ETIMEDOUT;
- }
- loops--;
- udelay(20);
+ ret = readl_poll_timeout_atomic(&mvotg->op_regs->usbcmd, tmp,
+ (tmp & USBCMD_CTRL_RESET), 10, 10000);
+ if (ret < 0) {
+ dev_err(&mvotg->pdev->dev,
+ "Wait for RESET completed TIMEOUT\n");
+ return ret;
}
writel(0x0, &mvotg->op_regs->usbintr);
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Felipe Balbi <balbi@kernel.org>
Cc: Sumit Garg <sumit.garg@linaro.org>,
Daniel Thompson <daniel.thompson@linaro.org>,
linux-usb@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Mathias Nyman <mathias.nyman@intel.com>,
Jann Horn <jannh@google.com>, Jason Yan <yanaijie@huawei.com>,
Chuhong Yuan <hslester96@gmail.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-kernel@vger.kernel.org,
Saurav Girepunje <saurav.girepunje@gmail.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
"Ben Dooks \(Codethink\)" <ben.dooks@codethink.co.uk>,
linux-mediatek@lists.infradead.org,
"Eric W. Biederman" <ebiederm@xmission.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic()
Date: Mon, 21 Sep 2020 14:13:33 +0800 [thread overview]
Message-ID: <1600668815-12135-9-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com>
Use readl_poll_timeout_atomic() to simplify code
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v4: no changes
v3: re-align argument of log suggested by Sergei
v2: udelay 10us instead of 20us according to kerneldoc
---
drivers/usb/phy/phy-mv-usb.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c
index ce767ec..576d925 100644
--- a/drivers/usb/phy/phy-mv-usb.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -8,6 +8,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/uaccess.h>
#include <linux/device.h>
#include <linux/proc_fs.h>
@@ -135,8 +136,8 @@ static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id,
static int mv_otg_reset(struct mv_otg *mvotg)
{
- unsigned int loops;
u32 tmp;
+ int ret;
/* Stop the controller */
tmp = readl(&mvotg->op_regs->usbcmd);
@@ -146,15 +147,12 @@ static int mv_otg_reset(struct mv_otg *mvotg)
/* Reset the controller to get default values */
writel(USBCMD_CTRL_RESET, &mvotg->op_regs->usbcmd);
- loops = 500;
- while (readl(&mvotg->op_regs->usbcmd) & USBCMD_CTRL_RESET) {
- if (loops == 0) {
- dev_err(&mvotg->pdev->dev,
- "Wait for RESET completed TIMEOUT\n");
- return -ETIMEDOUT;
- }
- loops--;
- udelay(20);
+ ret = readl_poll_timeout_atomic(&mvotg->op_regs->usbcmd, tmp,
+ (tmp & USBCMD_CTRL_RESET), 10, 10000);
+ if (ret < 0) {
+ dev_err(&mvotg->pdev->dev,
+ "Wait for RESET completed TIMEOUT\n");
+ return ret;
}
writel(0x0, &mvotg->op_regs->usbintr);
--
1.9.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
WARNING: multiple messages have this Message-ID (diff)
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Felipe Balbi <balbi@kernel.org>
Cc: Sumit Garg <sumit.garg@linaro.org>,
Daniel Thompson <daniel.thompson@linaro.org>,
linux-usb@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Mathias Nyman <mathias.nyman@intel.com>,
Jann Horn <jannh@google.com>, Jason Yan <yanaijie@huawei.com>,
Chuhong Yuan <hslester96@gmail.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-kernel@vger.kernel.org,
Saurav Girepunje <saurav.girepunje@gmail.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
"Ben Dooks \(Codethink\)" <ben.dooks@codethink.co.uk>,
linux-mediatek@lists.infradead.org,
"Eric W. Biederman" <ebiederm@xmission.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic()
Date: Mon, 21 Sep 2020 14:13:33 +0800 [thread overview]
Message-ID: <1600668815-12135-9-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com>
Use readl_poll_timeout_atomic() to simplify code
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v4: no changes
v3: re-align argument of log suggested by Sergei
v2: udelay 10us instead of 20us according to kerneldoc
---
drivers/usb/phy/phy-mv-usb.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c
index ce767ec..576d925 100644
--- a/drivers/usb/phy/phy-mv-usb.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -8,6 +8,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/uaccess.h>
#include <linux/device.h>
#include <linux/proc_fs.h>
@@ -135,8 +136,8 @@ static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id,
static int mv_otg_reset(struct mv_otg *mvotg)
{
- unsigned int loops;
u32 tmp;
+ int ret;
/* Stop the controller */
tmp = readl(&mvotg->op_regs->usbcmd);
@@ -146,15 +147,12 @@ static int mv_otg_reset(struct mv_otg *mvotg)
/* Reset the controller to get default values */
writel(USBCMD_CTRL_RESET, &mvotg->op_regs->usbcmd);
- loops = 500;
- while (readl(&mvotg->op_regs->usbcmd) & USBCMD_CTRL_RESET) {
- if (loops == 0) {
- dev_err(&mvotg->pdev->dev,
- "Wait for RESET completed TIMEOUT\n");
- return -ETIMEDOUT;
- }
- loops--;
- udelay(20);
+ ret = readl_poll_timeout_atomic(&mvotg->op_regs->usbcmd, tmp,
+ (tmp & USBCMD_CTRL_RESET), 10, 10000);
+ if (ret < 0) {
+ dev_err(&mvotg->pdev->dev,
+ "Wait for RESET completed TIMEOUT\n");
+ return ret;
}
writel(0x0, &mvotg->op_regs->usbintr);
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-21 6:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 6:13 [PATCH v4 01/11] usb: early: convert to readl_poll_timeout_atomic() Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 02/11] usb: early: ehci-dbgp: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 03/11] usb: pci-quirks: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 04/11] usb: xhci-rcar: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-23 8:47 ` Yoshihiro Shimoda
2020-09-23 8:47 ` Yoshihiro Shimoda
2020-09-23 8:47 ` Yoshihiro Shimoda
2020-09-23 8:53 ` Chunfeng Yun
2020-09-23 8:53 ` Chunfeng Yun
2020-09-23 8:53 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 05/11] usb: oxu210hp-hcd: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 06/11] usb: fotg210-hcd: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 07/11] usb: isp1760-hcd: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 08/11] usb: phy-ulpi-viewport: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun [this message]
2020-09-21 6:13 ` [PATCH v4 09/11] usb: phy: phy-mv-usb: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 10/11] usb: udc: net2280: " Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` [PATCH v4 11/11] iopoll: update kerneldoc of read_poll_timeout_atomic() Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
2020-09-21 6:13 ` Chunfeng Yun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1600668815-12135-9-git-send-email-chunfeng.yun@mediatek.com \
--to=chunfeng.yun@mediatek.com \
--cc=arnd@arndb.de \
--cc=balbi@kernel.org \
--cc=ben.dooks@codethink.co.uk \
--cc=daniel.thompson@linaro.org \
--cc=ebiederm@xmission.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavoars@kernel.org \
--cc=hslester96@gmail.com \
--cc=jannh@google.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=matthias.bgg@gmail.com \
--cc=saurav.girepunje@gmail.com \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=sumit.garg@linaro.org \
--cc=yanaijie@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.