usb: mtu3: add new helpers for host suspend/resume

Extract two helpers for host suspend and resume, will make it easy
to support dual-role mode suspend/resume later.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1626340078-29111-10-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/mtu3/mtu3_dr.h b/drivers/usb/mtu3/mtu3_dr.h
index 760fe7d..70dbf47 100644 (file)
--- a/drivers/usb/mtu3/mtu3_dr.h
+++ b/drivers/usb/mtu3/mtu3_dr.h
@@ -16,8 +16,8 @@ int ssusb_host_init(struct ssusb_mtk *ssusb, struct device_node *parent_dn);
 void ssusb_host_exit(struct ssusb_mtk *ssusb);
 int ssusb_wakeup_of_property_parse(struct ssusb_mtk *ssusb,
                                struct device_node *dn);
-int ssusb_host_enable(struct ssusb_mtk *ssusb);
-int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend);
+int ssusb_host_resume(struct ssusb_mtk *ssusb, bool p0_skipped);
+int ssusb_host_suspend(struct ssusb_mtk *ssusb);
 void ssusb_wakeup_set(struct ssusb_mtk *ssusb, bool enable);
 
 #else
@@ -38,12 +38,12 @@ static inline int ssusb_wakeup_of_property_parse(
        return 0;
 }
 
-static inline int ssusb_host_enable(struct ssusb_mtk *ssusb)
+static inline int ssusb_host_resume(struct ssusb_mtk *ssusb, bool p0_skipped)
 {
        return 0;
 }
 
-static inline int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
+static inline int ssusb_host_suspend(struct ssusb_mtk *ssusb)
 {
        return 0;
 }

diff --git a/drivers/usb/mtu3/mtu3_host.c b/drivers/usb/mtu3/mtu3_host.c
index 6185bac..a0a6a18 100644 (file)
--- a/drivers/usb/mtu3/mtu3_host.c
+++ b/drivers/usb/mtu3/mtu3_host.c
@@ -126,7 +126,7 @@ static void host_ports_num_get(struct ssusb_mtk *ssusb)
 }
 
 /* only configure ports will be used later */
-int ssusb_host_enable(struct ssusb_mtk *ssusb)
+static int ssusb_host_enable(struct ssusb_mtk *ssusb)
 {
        void __iomem *ibase = ssusb->ippc_base;
        int num_u3p = ssusb->u3_ports;
@@ -171,13 +171,12 @@ int ssusb_host_enable(struct ssusb_mtk *ssusb)
        return ssusb_check_clocks(ssusb, check_clk);
 }
 
-int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
+static int ssusb_host_disable(struct ssusb_mtk *ssusb)
 {
        void __iomem *ibase = ssusb->ippc_base;
        int num_u3p = ssusb->u3_ports;
        int num_u2p = ssusb->u2_ports;
        u32 value;
-       int ret;
        int i;
 
        /* power down and disable u3 ports except skipped ones */
@@ -186,8 +185,7 @@ int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
                        continue;
 
                value = mtu3_readl(ibase, SSUSB_U3_CTRL(i));
-               value |= SSUSB_U3_PORT_PDN;
-               value |= suspend ? 0 : SSUSB_U3_PORT_DIS;
+               value |= SSUSB_U3_PORT_PDN | SSUSB_U3_PORT_DIS;
                mtu3_writel(ibase, SSUSB_U3_CTRL(i), value);
        }
 
@@ -197,16 +195,90 @@ int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
                        continue;
 
                value = mtu3_readl(ibase, SSUSB_U2_CTRL(i));
-               value |= SSUSB_U2_PORT_PDN;
-               value |= suspend ? 0 : SSUSB_U2_PORT_DIS;
+               value |= SSUSB_U2_PORT_PDN | SSUSB_U2_PORT_DIS;
                mtu3_writel(ibase, SSUSB_U2_CTRL(i), value);
        }
 
        /* power down host ip */
        mtu3_setbits(ibase, U3D_SSUSB_IP_PW_CTRL1, SSUSB_IP_HOST_PDN);
 
-       if (!suspend)
-               return 0;
+       return 0;
+}
+
+int ssusb_host_resume(struct ssusb_mtk *ssusb, bool p0_skipped)
+{
+       void __iomem *ibase = ssusb->ippc_base;
+       int u3p_skip_msk = ssusb->u3p_dis_msk;
+       int u2p_skip_msk = ssusb->u2p_dis_msk;
+       int num_u3p = ssusb->u3_ports;
+       int num_u2p = ssusb->u2_ports;
+       u32 value;
+       int i;
+
+       if (p0_skipped) {
+               u2p_skip_msk |= 0x1;
+               if (ssusb->otg_switch.is_u3_drd)
+                       u3p_skip_msk |= 0x1;
+       }
+
+       /* power on host ip */
+       mtu3_clrbits(ibase, U3D_SSUSB_IP_PW_CTRL1, SSUSB_IP_HOST_PDN);
+
+       /* power on u3 ports except skipped ones */
+       for (i = 0; i < num_u3p; i++) {
+               if ((0x1 << i) & u3p_skip_msk)
+                       continue;
+
+               value = mtu3_readl(ibase, SSUSB_U3_CTRL(i));
+               value &= ~SSUSB_U3_PORT_PDN;
+               mtu3_writel(ibase, SSUSB_U3_CTRL(i), value);
+       }
+
+       /* power on all u2 ports except skipped ones */
+       for (i = 0; i < num_u2p; i++) {
+               if ((0x1 << i) & u2p_skip_msk)
+                       continue;
+
+               value = mtu3_readl(ibase, SSUSB_U2_CTRL(i));
+               value &= ~SSUSB_U2_PORT_PDN;
+               mtu3_writel(ibase, SSUSB_U2_CTRL(i), value);
+       }
+
+       return 0;
+}
+
+/* here not skip port0 due to PDN can be set repeatedly */
+int ssusb_host_suspend(struct ssusb_mtk *ssusb)
+{
+       void __iomem *ibase = ssusb->ippc_base;
+       int num_u3p = ssusb->u3_ports;
+       int num_u2p = ssusb->u2_ports;
+       u32 value;
+       int ret;
+       int i;
+
+       /* power down u3 ports except skipped ones */
+       for (i = 0; i < num_u3p; i++) {
+               if ((0x1 << i) & ssusb->u3p_dis_msk)
+                       continue;
+
+               value = mtu3_readl(ibase, SSUSB_U3_CTRL(i));
+               value |= SSUSB_U3_PORT_PDN;
+               mtu3_writel(ibase, SSUSB_U3_CTRL(i), value);
+       }
+
+       /* power down u2 ports except skipped ones */
+       for (i = 0; i < num_u2p; i++) {
+               if ((0x1 << i) & ssusb->u2p_dis_msk)
+                       continue;
+
+               value = mtu3_readl(ibase, SSUSB_U2_CTRL(i));
+               value |= SSUSB_U2_PORT_PDN;
+               mtu3_writel(ibase, SSUSB_U2_CTRL(i), value);
+       }
+
+       /* power down host ip */
+       mtu3_setbits(ibase, U3D_SSUSB_IP_PW_CTRL1, SSUSB_IP_HOST_PDN);
 
        /* wait for host ip to sleep */
        ret = readl_poll_timeout(ibase + U3D_SSUSB_IP_PW_STS1, value,
@@ -237,7 +309,7 @@ static void ssusb_host_cleanup(struct ssusb_mtk *ssusb)
        if (ssusb->is_host)
                ssusb_set_vbus(&ssusb->otg_switch, 0);
 
-       ssusb_host_disable(ssusb, false);
+       ssusb_host_disable(ssusb);
 }
 
 /*

diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index 5162b99..a906b24 100644 (file)
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -411,7 +411,7 @@ static int __maybe_unused mtu3_suspend(struct device *dev)
        if (!ssusb->is_host)
                return 0;
 
-       ssusb_host_disable(ssusb, true);
+       ssusb_host_suspend(ssusb);
        ssusb_phy_power_off(ssusb);
        clk_bulk_disable_unprepare(BULK_CLKS_CNT, ssusb->clks);
        ssusb_wakeup_set(ssusb, true);
@@ -438,7 +438,7 @@ static int __maybe_unused mtu3_resume(struct device *dev)
        if (ret)
                goto phy_err;
 
-       ssusb_host_enable(ssusb);
+       ssusb_host_resume(ssusb, false);
 
        return 0;