Skip to contentSkip to conversation

usb: typec: Add typec_enter_usb() helper function

PATCH In review Heikki Krogerus 2 participants 3 messages Nov 9, 2020

Subsystems (2)
lore
Share & tools
lore

Heikki Krogerus

author maintainer
#0 lore raw

PATCH 1/1 usb: typec: Add typec_enter_usb() helper function

This function configures the muxes according to the requested USB mode in the Enter_USB Message that was communicated with the partner.

In practice the function just fills struct typec_mux_state for the caller by extracting the connector mode (so USB mode) from the EUDO (Enter_USB Data Object), and then passes that structure to typec_mux_set().

---
 drivers/usb/typec/class.c | 32 ++++++++++++++++++++++++++++++++
 include/linux/usb/typec.h |  1 +
 2 files changed, 33 insertions(+)
drivers/usb/typec/class.c +32 -0
index 35eec707cb512..22f82e924d585 100644
@@ -11,6 +11,7 @@
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/slab.h>
+#include <linux/usb/pd.h>
 
 #include "bus.h"
 
@@ -1579,6 +1580,37 @@ int typec_set_mode(struct typec_port *port, int mode)
 }
 EXPORT_SYMBOL_GPL(typec_set_mode);
 
+/**
+ * typec_enter_usb - Set USB Mode for USB Type-C connector
+ * @port: USB Type-C connector
+ * @data: Enter_USB Message details.
+ *
+ * This function is called when Enter_USB Message is used. It configures @port
+ * muxes for the USB mode (USB 2.0, USB 3.2 or USB4).
+ */
+int typec_enter_usb(struct typec_port *port, struct enter_usb_data *data)
+{
+	struct typec_mux_state mux_state;
+
+	switch ((data->eudo & EUDO_USB_MODE_MASK) >> EUDO_USB_MODE_SHIFT) {
+	case EUDO_USB_MODE_USB4:
+		mux_state.mode = TYPEC_MODE_USB4;
+		break;
+	case EUDO_USB_MODE_USB3:
+		mux_state.mode = TYPEC_MODE_USB3;
+		break;
+	default:
+		mux_state.mode = TYPEC_MODE_USB2;
+		break;
+	}
+
+	mux_state.alt = NULL; /* Not an alt mode */
+	mux_state.data = data;
+
+	return typec_mux_set(port->mux, &mux_state);
+}
+EXPORT_SYMBOL_GPL(typec_enter_usb);
+
 /* --------------------------------------- */
 
 /**
include/linux/usb/typec.h +1 -0
index 6be5580459428..ee8db91737330 100644
@@ -265,6 +265,7 @@ int typec_set_orientation(struct typec_port *port,
 			  enum typec_orientation orientation);
 enum typec_orientation typec_get_orientation(struct typec_port *port);
 int typec_set_mode(struct typec_port *port, int mode);
+int typec_enter_usb(struct typec_port *port, struct enter_usb_data *data);
 
 void *typec_get_drvdata(struct typec_port *port);
 
Signature · 1 line
2.28.0
#1 lore raw
Quoted 51 lines · Heikki Krogerus

This function configures the muxes according to the requested USB mode in the Enter_USB Message that was communicated with the partner.

In practice the function just fills struct typec_mux_state for the caller by extracting the connector mode (so USB mode) from the EUDO (Enter_USB Data Object), and then passes that structure to typec_mux_set().

---
 drivers/usb/typec/class.c | 32 ++++++++++++++++++++++++++++++++
 include/linux/usb/typec.h |  1 +
 2 files changed, 33 insertions(+)
drivers/usb/typec/class.c +21 -0
index 35eec707cb512..22f82e924d585 100644
@@ -11,6 +11,7 @@
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/slab.h>
+#include <linux/usb/pd.h>
 
 #include "bus.h"
 
@@ -1579,6 +1580,37 @@ int typec_set_mode(struct typec_port *port, int mode)
 }
 EXPORT_SYMBOL_GPL(typec_set_mode);
 
+/**
+ * typec_enter_usb - Set USB Mode for USB Type-C connector
+ * @port: USB Type-C connector
+ * @data: Enter_USB Message details.
+ *
+ * This function is called when Enter_USB Message is used. It configures @port
+ * muxes for the USB mode (USB 2.0, USB 3.2 or USB4).
+ */
+int typec_enter_usb(struct typec_port *port, struct enter_usb_data *data)
+{
+	struct typec_mux_state mux_state;
+
+	switch ((data->eudo & EUDO_USB_MODE_MASK) >> EUDO_USB_MODE_SHIFT) {
+	case EUDO_USB_MODE_USB4:
+		mux_state.mode = TYPEC_MODE_USB4;
+		break;
+	case EUDO_USB_MODE_USB3:
+		mux_state.mode = TYPEC_MODE_USB3;
+		break;
+	default:

drivers/usb/typec/class.c int typec_set_mode(struct typec_port *port, int mode) · line 1612

Quoted 10 lines
drivers/usb/typec/class.c +10 -0
+		mux_state.mode = TYPEC_MODE_USB2;
+		break;
+	}
+
+	mux_state.alt = NULL; /* Not an alt mode */
+	mux_state.data = data;
+
+	return typec_mux_set(port->mux, &mux_state);
+}
+EXPORT_SYMBOL_GPL(typec_enter_usb);

We can't add symbols/functions for no in-kernel users, so perhaps submit this as part of a series that actually uses it?

thanks,

greg k-h

author maintainer
#2 lore raw
Quoted 2 lines · Greg Kroah-Hartman

We can't add symbols/functions for no in-kernel users, so perhaps submit this as part of a series that actually uses it?

Sorry Greg. I didn't mean to send the patch out yet.

thanks,

Signature · 1 line
heikki