Skip to contentSkip to conversation

usb: chipidea: add query_available_role interface

PATCH New Peter Chen 1 participant 2 messages Jul 22, 2020

Subsystems (3)
lore
Share & tools
lore

Peter Chen

author
#0 lore raw

PATCH 1/2 usb: chipidea: add query_available_role interface

The glue layer may need to know current available role to do some setting, eg, the wakeup setting. So we add ci_hdrc_query_available_role for that.

---
 drivers/usb/chipidea/core.c  | 27 +++++++++++++++++++++++++++
 include/linux/usb/chipidea.h |  2 ++
 2 files changed, 29 insertions(+)
drivers/usb/chipidea/core.c +27 -0
index 9a7c53d09ab4..87ae3c8686a7 100644
@@ -877,6 +877,33 @@ void ci_hdrc_remove_device(struct platform_device *pdev)
 }
 EXPORT_SYMBOL_GPL(ci_hdrc_remove_device);
 
+/**
+ * ci_hdrc_query_available_role: get runtime available operation mode
+ *
+ * The glue layer can get current operation mode (host/peripheral/otg)
+ * This function should be called after ci core device has created.
+ *
+ * @pdev: the platform device of ci core.
+ *
+ * Return runtime usb_dr_mode.
+ */
+enum usb_dr_mode ci_hdrc_query_available_role(struct platform_device *pdev)
+{
+	struct ci_hdrc *ci = platform_get_drvdata(pdev);
+
+	if (!ci)
+		return USB_DR_MODE_UNKNOWN;
+	if (ci->roles[CI_ROLE_HOST] && ci->roles[CI_ROLE_GADGET])
+		return USB_DR_MODE_OTG;
+	else if (ci->roles[CI_ROLE_HOST])
+		return USB_DR_MODE_HOST;
+	else if (ci->roles[CI_ROLE_GADGET])
+		return USB_DR_MODE_PERIPHERAL;
+	else
+		return USB_DR_MODE_UNKNOWN;
+}
+EXPORT_SYMBOL_GPL(ci_hdrc_query_available_role);
+
 static inline void ci_role_destroy(struct ci_hdrc *ci)
 {
 	ci_hdrc_gadget_destroy(ci);
include/linux/usb/chipidea.h +2 -0
index 54167a2d28ea..025b41687ce9 100644
@@ -99,5 +99,7 @@ struct platform_device *ci_hdrc_add_device(struct device *dev,
 			struct ci_hdrc_platform_data *platdata);
 /* Remove ci hdrc device */
 void ci_hdrc_remove_device(struct platform_device *pdev);
+/* Get current available role */
+enum usb_dr_mode ci_hdrc_query_available_role(struct platform_device *pdev);
 
 #endif
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 usb: chipidea: imx: get available runtime dr mode for wakeup setting

If runtime dr_mode is not dual-role, it doesn't need to enable ID wakeup interrupt.
If runtime dr_mode is host, it doesn't need to enable VBUS wakeup interrupt.
With these changes, the user will not get the unexpected wakeup for single role use case. For example, the host-only use case at Micro-AB port, the controller should not be waken up by only plug in Micro-AB cable or the Micro-B cable with host.

---
 drivers/usb/chipidea/ci_hdrc_imx.c | 4 ++++
 drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
 drivers/usb/chipidea/usbmisc_imx.c | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +4 -0
index 58de0f3ac0e9..800ed9663172 100644
@@ -467,6 +467,10 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 		if (!IS_ERR(pdata.vbus_extcon.edev) ||
 		    of_property_read_bool(np, "usb-role-switch"))
 			data->usbmisc_data->ext_vbus = 1;
+
+		/* usbmisc needs to know dr mode to choose wakeup setting */
+		data->usbmisc_data->available_role =
+			ci_hdrc_query_available_role(data->ci_pdev);
 	}
 
 	ret = imx_usbmisc_init_post(data->usbmisc_data);
drivers/usb/chipidea/ci_hdrc_imx.h +1 -0
index 367bb0d0cb6b..234d2dcd8a24 100644
@@ -27,6 +27,7 @@ struct imx_usbmisc_data {
 	struct usb_phy *usb_phy;
 	int emp_curr_control;
 	int dc_vol_level_adjust;
+	enum usb_dr_mode available_role; /* runtime usb dr mode */
 };
 
 int imx_usbmisc_init(struct imx_usbmisc_data *data);
drivers/usb/chipidea/usbmisc_imx.c +2 -2
index f9881aed468f..ce2e19d87387 100644
@@ -373,10 +373,10 @@ static u32 usbmisc_wakeup_setting(struct imx_usbmisc_data *data)
 {
 	u32 wakeup_setting = MX6_USB_OTG_WAKEUP_BITS;
 
-	if (data->ext_id)
+	if (data->ext_id || data->available_role != USB_DR_MODE_OTG)
 		wakeup_setting &= ~MX6_BM_ID_WAKEUP;
 
-	if (data->ext_vbus)
+	if (data->ext_vbus || data->available_role == USB_DR_MODE_HOST)
 		wakeup_setting &= ~MX6_BM_VBUS_WAKEUP;
 
 	return wakeup_setting;
Signature · 1 line
2.17.1