Merge tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / drivers / usb / host / xhci-rcar.c

diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index c1025d3..9888ba7 100644 (file)
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/firmware.h>
+#include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
@@ -127,13 +128,19 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd)
        void __iomem *regs = hcd->regs;
        struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
        const struct firmware *fw;
-       int retval, index, j, time;
-       int timeout = 10000;
+       int retval, index, j;
        u32 data, val, temp;
        u32 quirks = 0;
        const struct soc_device_attribute *attr;
        const char *firmware_name;
 
+       /*
+        * According to the datasheet, "Upon the completion of FW Download,
+        * there is no need to write or reload FW".
+        */
+       if (readl(regs + RCAR_USB3_DL_CTRL) & RCAR_USB3_DL_CTRL_FW_SUCCESS)
+               return 0;
+
        attr = soc_device_match(rcar_quirks_match);
        if (attr)
                quirks = (uintptr_t)attr->data;
@@ -166,32 +173,19 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd)
                temp |= RCAR_USB3_DL_CTRL_FW_SET_DATA0;
                writel(temp, regs + RCAR_USB3_DL_CTRL);
 
-               for (time = 0; time < timeout; time++) {
-                       val = readl(regs + RCAR_USB3_DL_CTRL);
-                       if ((val & RCAR_USB3_DL_CTRL_FW_SET_DATA0) == 0)
-                               break;
-                       udelay(1);
-               }
-               if (time == timeout) {
-                       retval = -ETIMEDOUT;
+               retval = readl_poll_timeout_atomic(regs + RCAR_USB3_DL_CTRL,
+                               val, !(val & RCAR_USB3_DL_CTRL_FW_SET_DATA0),
+                               1, 10000);
+               if (retval < 0)
                        break;
-               }
        }
 
        temp = readl(regs + RCAR_USB3_DL_CTRL);
        temp &= ~RCAR_USB3_DL_CTRL_ENABLE;
        writel(temp, regs + RCAR_USB3_DL_CTRL);
 
-       for (time = 0; time < timeout; time++) {
-               val = readl(regs + RCAR_USB3_DL_CTRL);
-               if (val & RCAR_USB3_DL_CTRL_FW_SUCCESS) {
-                       retval = 0;
-                       break;
-               }
-               udelay(1);
-       }
-       if (time == timeout)
-               retval = -ETIMEDOUT;
+       retval = readl_poll_timeout_atomic((regs + RCAR_USB3_DL_CTRL),
+                       val, val & RCAR_USB3_DL_CTRL_FW_SUCCESS, 1, 10000);
 
        release_firmware(fw);
 
@@ -200,18 +194,12 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd)
 
 static bool xhci_rcar_wait_for_pll_active(struct usb_hcd *hcd)
 {
-       int timeout = 1000;
+       int retval;
        u32 val, mask = RCAR_USB3_AXH_STA_PLL_ACTIVE_MASK;
 
-       while (timeout > 0) {
-               val = readl(hcd->regs + RCAR_USB3_AXH_STA);
-               if ((val & mask) == mask)
-                       return true;
-               udelay(1);
-               timeout--;
-       }
-
-       return false;
+       retval = readl_poll_timeout_atomic(hcd->regs + RCAR_USB3_AXH_STA,
+                       val, (val & mask) == mask, 1, 1000);
+       return !retval;
 }
 
 /* This function needs to initialize a "phy" of usb before */