[RFC PATCHv3] usb: USB Type-C Connector Class

From: Heikki Krogerus
Date: Fri Jun 10 2016 - 10:34:48 EST

The purpose of this class is to provide unified interface for user
space to get the status and basic information about USB Type-C
Connectors in the system, control data role swapping, and when USB PD
is available, also power role swapping and Alternate Modes.

Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
---
drivers/usb/Kconfig | 2 +
drivers/usb/Makefile | 2 +
drivers/usb/typec/Kconfig | 7 +
drivers/usb/typec/Makefile | 1 +
drivers/usb/typec/typec.c | 1077 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/usb/typec.h | 252 +++++++++++
6 files changed, 1341 insertions(+)
create mode 100644 drivers/usb/typec/Kconfig
create mode 100644 drivers/usb/typec/Makefile
create mode 100644 drivers/usb/typec/typec.c
create mode 100644 include/linux/usb/typec.h

Hi,

I'm sorry to send this on Friday evening, but next week I want to get
the alternate modes sorted out. Most of the remaining open questions
are related to those. But first I want confirmation from you guys that
the other attributes are OK.

The attributes for each type-c port under /sys/class/typec/usbc<x> are:

current_data_role
current_power_role
current_vconn_role
power_operation_mode
preferred_role
supported_accessory_modes
supported_data_roles
supported_power_roles
supports_usb_power_delivery

I choose to not have separate attribute for every accessory mode, as
it seems we are getting more of them in the future type-c
specifications. Instead I added a single attribute,
supported_accessory_modes, to list all of them.

For the alternate modes I added an attribute, supported_roles, for the
modes. It is not available for the partners and plugs. It will list
the roles that particular mode supports on the port.

I have the following opens in my list:

- How do we restore the role and altmodes on resume?
- We are missing notification on alt_mode changes, resets from
initiated by partner, etc.
- The supported_accessory_modes is not implemented yet.

What else?


Thanks,

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 8689dcb..f42a3d3 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -150,6 +150,8 @@ source "drivers/usb/phy/Kconfig"

source "drivers/usb/gadget/Kconfig"

+source "drivers/usb/typec/Kconfig"
+
config USB_LED_TRIG
bool "USB LED Triggers"
depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index dca7856..51e381e 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -61,3 +61,5 @@ obj-$(CONFIG_USB_GADGET) += gadget/
obj-$(CONFIG_USB_COMMON) += common/

obj-$(CONFIG_USBIP_CORE) += usbip/
+
+obj-$(CONFIG_TYPEC) += typec/
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
new file mode 100644
index 0000000..b229fb9
--- /dev/null
+++ b/drivers/usb/typec/Kconfig
@@ -0,0 +1,7 @@
+
+menu "USB PD and Type-C drivers"
+
+config TYPEC
+ tristate
+
+endmenu
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
new file mode 100644
index 0000000..1012a8b
--- /dev/null
+++ b/drivers/usb/typec/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_TYPEC) += typec.o
diff --git a/drivers/usb/typec/typec.c b/drivers/usb/typec/typec.c
new file mode 100644
index 0000000..f551de9
--- /dev/null
+++ b/drivers/usb/typec/typec.c
@@ -0,0 +1,1077 @@
+/*
+ * USB Type-C Connector Class
+ *
+ * Copyright (C) 2016, Intel Corporation
+ * Author: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/usb/typec.h>
+
+struct typec_port {
+ unsigned int id;
+ struct device dev;
+ struct mutex lock; /* device lock */
+
+ int prefer_role;
+
+ enum typec_data_role data_role;
+ enum typec_role pwr_role;
+ enum typec_role vconn_role;
+ enum typec_pwr_opmode pwr_opmode;
+
+ struct typec_partner *partner;
+ struct typec_cable *cable;
+
+ unsigned int connected:1;
+
+ const struct typec_capability *cap;
+};
+
+#define to_typec_port(p) container_of(p, struct typec_port, dev)
+
+static DEFINE_IDA(typec_index_ida);
+
+static struct class typec_class = {
+ .name = "typec",
+};
+
+static const char * const typec_accessory_modes[] = {
+ [TYPEC_ACCESSORY_NONE] = "none",
+ [TYPEC_ACCESSORY_AUDIO] = "Audio",
+ [TYPEC_ACCESSORY_DEBUG] = "Debug",
+ [TYPEC_ACCESSORY_DAUDIO] = "Digital Audio",
+};
+
+/* -------------------------------- */
+/* Type-C Partners */
+
+static void typec_dev_release(struct device *dev)
+{
+}
+
+static const char * const typec_partner_types[] = {
+ [TYPEC_PARTNER_USB] = "USB",
+ [TYPEC_PARTNER_CHARGER] = "Charger",
+ [TYPEC_PARTNER_ALTMODE] = "Alternate Mode",
+ [TYPEC_PARTNER_ACCESSORY] = "Accessory",
+};
+
+static ssize_t partner_type_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct typec_partner *partner = container_of(dev, struct typec_partner,
+ dev);
+
+ return sprintf(buf, "%s\n", typec_partner_types[partner->type]);
+}
+
+static struct device_attribute dev_attr_partner_type = {
+ .attr = {
+ .name = "type",
+ .mode = S_IRUGO,
+ },
+ .show = partner_type_show,
+};
+
+static ssize_t
+partner_accessory_mode_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_partner *partner = container_of(dev, struct typec_partner,
+ dev);
+
+ return sprintf(buf, "%s\n", typec_accessory_modes[partner->accessory]);
+}
+
+static struct device_attribute dev_attr_partner_accessory = {
+ .attr = {
+ .name = "accessory",
+ .mode = S_IRUGO,
+ },
+ .show = partner_accessory_mode_show,
+};
+
+static struct attribute *typec_partner_attrs[] = {
+ &dev_attr_partner_type.attr,
+ &dev_attr_partner_accessory.attr,
+ NULL
+};
+
+static struct attribute_group typec_partner_group = {
+ .attrs = typec_partner_attrs,
+};
+
+static const struct attribute_group *typec_partner_groups[] = {
+ &typec_partner_group,
+ NULL
+};
+
+static struct device_type typec_partner_dev_type = {
+ .name = "typec_partner_device",
+ .groups = typec_partner_groups,
+ .release = typec_dev_release,
+};
+
+static int
+typec_add_partner(struct typec_port *port, struct typec_partner *partner)
+{
+ struct device *dev = &partner->dev;
+ int ret;
+
+ dev->class = &typec_class;
+ dev->parent = &port->dev;
+ dev->type = &typec_partner_dev_type;
+ dev_set_name(dev, "%s-partner", dev_name(&port->dev));
+
+ ret = device_register(dev);
+ if (ret) {
+ put_device(dev);
+ return ret;
+ }
+
+ port->partner = partner;
+ return 0;
+}
+
+static void typec_remove_partner(struct typec_port *port)
+{
+ typec_unregister_altmodes(port->partner->alt_modes);
+ device_unregister(&port->partner->dev);
+}
+
+/* -------------------------------- */
+/* Type-C Cable Plugs */
+
+static struct device_type typec_plug_dev_type = {
+ .name = "type_plug_device",
+ .release = typec_dev_release,
+};
+
+static int
+typec_add_plug(struct typec_port *port, struct typec_plug *plug)
+{
+ struct device *dev = &plug->dev;
+ char name[8];
+ int ret;
+
+ sprintf(name, "plug%d", plug->index);
+
+ dev->class = &typec_class;
+ dev->parent = &port->cable->dev;
+ dev->type = &typec_plug_dev_type;
+ dev_set_name(dev, "%s-%s", dev_name(&port->dev), name);
+
+ ret = device_register(dev);
+ if (ret) {
+ put_device(dev);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void typec_remove_plug(struct typec_plug *plug)
+{
+ typec_unregister_altmodes(plug->alt_modes);
+ device_unregister(&plug->dev);
+}
+
+static ssize_t
+active_cable_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct typec_cable *cable = container_of(dev, struct typec_cable, dev);
+
+ return sprintf(buf, "%d\n", cable->active);
+}
+
+static struct device_attribute dev_attr_active_cable = {
+ .attr = {
+ .name = "active",
+ .mode = S_IRUGO,
+ },
+ .show = active_cable_show,
+};
+
+static const char * const typec_plug_types[] = {
+ [USB_PLUG_NONE] = "unknown",
+ [USB_PLUG_TYPE_A] = "Type-A",
+ [USB_PLUG_TYPE_B] = "Type-B",
+ [USB_PLUG_TYPE_C] = "Type-C",
+ [USB_PLUG_CAPTIVE] = "Captive",
+};
+
+static ssize_t
+cable_plug_type_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_cable *cable = container_of(dev, struct typec_cable, dev);
+
+ return sprintf(buf, "%s\n", typec_plug_types[cable->type]);
+}
+
+static struct device_attribute dev_attr_plug_type = {
+ .attr = {
+ .name = "plug_type",
+ .mode = S_IRUGO,
+ },
+ .show = cable_plug_type_show,
+};
+
+static struct attribute *typec_cable_attrs[] = {
+ &dev_attr_active_cable.attr,
+ &dev_attr_plug_type.attr,
+ NULL
+};
+
+static struct attribute_group typec_cable_group = {
+ .attrs = typec_cable_attrs,
+};
+
+static const struct attribute_group *typec_cable_groups[] = {
+ &typec_cable_group,
+ NULL
+};
+
+static struct device_type typec_cable_dev_type = {
+ .name = "typec_cable_device",
+ .groups = typec_cable_groups,
+ .release = typec_dev_release,
+};
+
+static int typec_add_cable(struct typec_port *port, struct typec_cable *cable)
+{
+ struct device *dev = &cable->dev;
+ int ret;
+
+ dev->class = &typec_class;
+ dev->parent = &port->dev;
+ dev->type = &typec_cable_dev_type;
+ dev_set_name(dev, "%s-cable", dev_name(&port->dev));
+
+ ret = device_register(dev);
+ if (ret) {
+ put_device(dev);
+ return ret;
+ }
+
+ /* Plug1 */
+ if (!cable->active)
+ return 0;
+
+ cable->plug[0].index = 1;
+ ret = typec_add_plug(port, &cable->plug[0]);
+ if (ret) {
+ device_unregister(dev);
+ return ret;
+ }
+
+ /* Plug2 */
+ if (!cable->sop_pp_controller)
+ return 0;
+
+ cable->plug[1].index = 2;
+ ret = typec_add_plug(port, &cable->plug[1]);
+ if (ret) {
+ typec_remove_plug(&cable->plug[0]);
+ device_unregister(dev);
+ return ret;
+ }
+
+ port->cable = cable;
+ return 0;
+}
+
+static void typec_remove_cable(struct typec_port *port)
+{
+ if (port->cable->active) {
+ typec_remove_plug(&port->cable->plug[0]);
+ if (port->cable->sop_pp_controller)
+ typec_remove_plug(&port->cable->plug[1]);
+ }
+ device_unregister(&port->cable->dev);
+}
+
+static void typec_init_roles(struct typec_port *port)
+{
+ if (port->prefer_role < 0)
+ return;
+
+ if (port->prefer_role == TYPEC_SOURCE) {
+ port->data_role = TYPEC_HOST;
+ port->pwr_role = TYPEC_SOURCE;
+ port->vconn_role = TYPEC_SOURCE;
+ } else {
+ /* Device mode as default also by default with DRP ports */
+ port->data_role = TYPEC_DEVICE;
+ port->pwr_role = TYPEC_SINK;
+ port->vconn_role = TYPEC_SINK;
+ }
+}
+
+/* -------------------------------- */
+
+int typec_connect(struct typec_port *port, struct typec_connection *con)
+{
+ int ret;
+
+ dev_info(&port->dev, "%s\n", __func__);
+
+ if (!con->partner && !con->cable)
+ return -EINVAL;
+
+ port->connected = 1;
+ port->data_role = con->data_role;
+ port->pwr_role = con->pwr_role;
+ port->vconn_role = con->vconn_role;
+ port->pwr_opmode = con->pwr_opmode;
+
+ kobject_uevent(&port->dev.kobj, KOBJ_CHANGE);
+
+ if (con->cable) {
+ ret = typec_add_cable(port, con->cable);
+ if (ret)
+ return ret;
+ }
+
+ if (con->partner) {
+ ret = typec_add_partner(port, con->partner);
+ if (ret) {
+ if (con->cable)
+ typec_remove_cable(port);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(typec_connect);
+
+void typec_disconnect(struct typec_port *port)
+{
+ dev_info(&port->dev, "%s\n", __func__);
+
+ if (port->partner)
+ typec_remove_partner(port);
+
+ if (port->cable)
+ typec_remove_cable(port);
+
+ port->connected = 0;
+ port->partner = NULL;
+ port->cable = NULL;
+
+ port->pwr_opmode = TYPEC_PWR_MODE_USB;
+
+ typec_init_roles(port);
+
+ kobject_uevent(&port->dev.kobj, KOBJ_CHANGE);
+}
+EXPORT_SYMBOL_GPL(typec_disconnect);
+
+struct device *typec_port2dev(struct typec_port *port)
+{
+ return &port->dev;
+}
+EXPORT_SYMBOL_GPL(typec_port2dev);
+
+struct typec_port *typec_dev2port(struct device *dev)
+{
+ return to_typec_port(dev);
+}
+EXPORT_SYMBOL_GPL(typec_dev2port);
+
+/* --------------------------------------- */
+/* Driver callbacks to report role updates */
+
+void typec_set_data_role(struct typec_port *port, enum typec_data_role role)
+{
+ port->data_role = role;
+}
+EXPORT_SYMBOL(typec_set_data_role);
+
+void typec_set_pwr_role(struct typec_port *port, enum typec_role role)
+{
+ port->pwr_role = role;
+}
+EXPORT_SYMBOL(typec_set_pwr_role);
+
+void typec_set_vconn_role(struct typec_port *port, enum typec_role role)
+{
+ port->vconn_role = role;
+}
+EXPORT_SYMBOL(typec_set_vconn_role);
+
+void typec_set_pwr_opmode(struct typec_port *port,
+ enum typec_pwr_opmode opmode)
+{
+ port->pwr_opmode = opmode;
+}
+EXPORT_SYMBOL(typec_set_pwr_opmode);
+
+/* -------------------------------- */
+/* Alternate Modes */
+
+static struct device_type typec_port_dev_type;
+
+/*
+ * typec_altmode2port - Alternate Mode to USB Type-C port
+ * @alt: The Alternate Mode
+ *
+ * Returns the port that the cable plug or partner with @alt is connected to.
+ */
+struct typec_port *typec_altmode2port(struct typec_altmode *alt)
+{
+ if (alt->dev.parent->type == &typec_plug_dev_type)
+ return to_typec_port(alt->dev.parent->parent->parent);
+ if (alt->dev.parent->type == &typec_partner_dev_type)
+ return to_typec_port(alt->dev.parent->parent);
+ if (alt->dev.parent->type == &typec_port_dev_type)
+ return to_typec_port(alt->dev.parent);
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(typec_altmode2port);
+
+static void typec_altmode_release(struct device *dev)
+{
+ struct typec_altmode *alt = to_altmode(dev);
+
+ kfree(alt->mode_groups);
+}
+
+static ssize_t
+typec_altmode_vdo_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_mode *mode = container_of(attr, struct typec_mode,
+ vdo_attr);
+
+ return sprintf(buf, "0x%08x\n", mode->vdo);
+}
+
+static ssize_t
+typec_altmode_desc_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_mode *mode = container_of(attr, struct typec_mode,
+ desc_attr);
+
+ return sprintf(buf, "%s\n", mode->desc ? mode->desc : "");
+}
+
+static ssize_t
+typec_altmode_active_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_mode *mode = container_of(attr, struct typec_mode,
+ active_attr);
+
+ return sprintf(buf, "%d\n", mode->active);
+}
+
+static ssize_t
+typec_altmode_active_store(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ struct typec_mode *mode = container_of(attr, struct typec_mode,
+ active_attr);
+ struct typec_port *port = typec_altmode2port(mode->alt_mode);
+ bool activate;
+ int ret;
+
+ ret = kstrtobool(buf, &activate);
+ if (ret)
+ return ret;
+
+ if (activate > 1)
+ return -EINVAL;
+
+ ret = port->cap->activate_mode(mode->alt_mode, mode->index, activate);
+ if (ret)
+ return ret;
+
+ return size;
+}
+
+static ssize_t
+typec_altmode_roles_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_mode *mode = container_of(attr, struct typec_mode,
+ roles_attr);
+
+ switch (mode->roles) {
+ case TYPEC_PORT_DFP:
+ return sprintf(buf, "source\n");
+ case TYPEC_PORT_UFP:
+ return sprintf(buf, "sink\n");
+ case TYPEC_PORT_DRP:
+ default:
+ return sprintf(buf, "source, sink\n");
+ }
+}
+
+static void typec_init_modes(struct typec_altmode *alt, int is_port)
+{
+ struct typec_mode *mode = alt->modes;
+ int i;
+
+ for (i = 0; i < alt->n_modes; i++, mode++) {
+ mode->alt_mode = alt;
+ mode->index = i;
+ sprintf(mode->group_name, "mode%d", i);
+
+ sysfs_attr_init(&mode->vdo_attr.attr);
+ mode->vdo_attr.attr.name = "vdo";
+ mode->vdo_attr.attr.mode = S_IRUGO;
+ mode->vdo_attr.show = typec_altmode_vdo_show;
+
+ sysfs_attr_init(&mode->desc_attr.attr);
+ mode->desc_attr.attr.name = "description";
+ mode->desc_attr.attr.mode = S_IRUGO;
+ mode->desc_attr.show = typec_altmode_desc_show;
+
+ sysfs_attr_init(&mode->active_attr.attr);
+ mode->active_attr.attr.name = "active";
+ mode->active_attr.attr.mode = S_IWUSR | S_IRUGO;
+ mode->active_attr.show = typec_altmode_active_show;
+ mode->active_attr.store = typec_altmode_active_store;
+
+ mode->attrs[0] = &mode->vdo_attr.attr;
+ mode->attrs[1] = &mode->desc_attr.attr;
+ mode->attrs[2] = &mode->active_attr.attr;
+
+ /* With ports, list the roles that the mode is supported with */
+ if (is_port) {
+ sysfs_attr_init(&mode->roles_attr.attr);
+ mode->roles_attr.attr.name = "supported_roles";
+ mode->roles_attr.attr.mode = S_IRUGO;
+ mode->roles_attr.show = typec_altmode_roles_show;
+
+ mode->attrs[3] = &mode->roles_attr.attr;
+ }
+
+ mode->group.attrs = mode->attrs;
+ mode->group.name = mode->group_name;
+
+ alt->mode_groups[i] = &mode->group;
+ }
+}
+
+static int
+typec_add_altmode(struct device *parent, struct typec_altmode *alt, int is_port)
+{
+ struct device *dev = &alt->dev;
+ int ret;
+
+ alt->mode_groups = kcalloc(alt->n_modes + 1,
+ sizeof(struct attibute_group *), GFP_KERNEL);
+ if (!alt->mode_groups)
+ return -ENOMEM;
+
+ typec_init_modes(alt, is_port);
+
+ dev->groups = alt->mode_groups;
+ dev->release = typec_altmode_release;
+ dev->parent = parent;
+ /* TODO: if (!is_port) dev->bus = &typec_altmode_bus; */
+
+ dev_set_name(dev, "%s.svid:%04x", dev_name(parent), alt->svid);
+
+ dev_info(parent, "%s\n", __func__);
+
+ ret = device_register(dev);
+ if (ret) {
+ put_device(dev);
+ kfree(alt->mode_groups);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int __typec_register_altmodes(struct device *parent,
+ struct typec_altmode *alt_modes,
+ int is_port)
+{
+ struct typec_altmode *alt;
+ int index;
+ int ret;
+
+ if (!alt_modes)
+ return 0;
+
+ for (alt = alt_modes, index = 0; alt->svid; alt++, index++) {
+ dev_info(parent, "%s\n", __func__);
+
+ ret = typec_add_altmode(parent, alt, is_port);
+ if (ret)
+ goto err;
+ }
+
+ return 0;
+err:
+ for (alt = alt_modes + index; index; alt--, index--)
+ device_unregister(&alt->dev);
+
+ return ret;
+}
+
+int typec_register_altmodes(struct device *parent,
+ struct typec_altmode *alt_modes)
+{
+ return __typec_register_altmodes(parent, alt_modes, false);
+}
+EXPORT_SYMBOL_GPL(typec_register_altmodes);
+
+void typec_unregister_altmodes(struct typec_altmode *alt_modes)
+{
+ struct typec_altmode *alt;
+
+ if (!alt_modes)
+ return;
+
+ for (alt = alt_modes; alt->svid; alt++)
+ device_unregister(&alt->dev);
+}
+EXPORT_SYMBOL_GPL(typec_unregister_altmodes);
+
+/* -------------------------------- */
+
+static const char * const typec_roles[] = {
+ [TYPEC_SINK] = "sink",
+ [TYPEC_SOURCE] = "source",
+};
+
+static const char * const typec_data_roles[] = {
+ [TYPEC_DEVICE] = "device",
+ [TYPEC_HOST] = "host",
+};
+
+static ssize_t
+preferred_role_store(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ struct typec_port *port = to_typec_port(dev);
+ enum typec_role role;
+ int ret;
+
+ mutex_lock(&port->lock);
+
+ if (port->cap->type != TYPEC_PORT_DRP) {
+ dev_dbg(dev, "Try.SRC/SNK only supported with DRP ports\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (!port->cap->try_role) {
+ dev_warn(dev, "Try.SRC/SNK not supported\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (!strlen(buf)) {
+ port->prefer_role = -1;
+ ret = size;
+ goto out;
+ }
+
+ role = match_string(typec_roles, ARRAY_SIZE(typec_roles), buf);
+ if (role < 0) {
+ ret = role;
+ goto out;
+ }
+
+ ret = port->cap->try_role(port->cap, role);
+ if (ret)
+ goto out;
+
+ port->prefer_role = role;
+ ret = size;
+out:
+ mutex_unlock(&port->lock);
+ return ret;
+}
+
+static ssize_t
+preferred_role_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+ int ret = 0;
+
+ mutex_lock(&port->lock);
+
+ if (port->prefer_role < 0)
+ goto out;
+
+ ret = sprintf(buf, "%s\n", typec_roles[port->prefer_role]);
+out:
+ mutex_unlock(&port->lock);
+ return ret;
+}
+static DEVICE_ATTR_RW(preferred_role);
+
+static ssize_t
+current_data_role_store(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ struct typec_port *port = to_typec_port(dev);
+ int role;
+ int ret;
+
+ mutex_lock(&port->lock);
+
+ if (port->cap->type != TYPEC_PORT_DRP) {
+ dev_dbg(dev, "data role swap only supported with DRP ports\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (!port->cap->dr_set) {
+ dev_warn(dev, "data role swapping not supported\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ role = match_string(typec_data_roles, ARRAY_SIZE(typec_data_roles),
+ buf);
+ if (role < 0) {
+ ret = role;
+ goto out;
+ }
+
+ ret = port->cap->dr_set(port->cap, role);
+ if (ret)
+ goto out;
+
+ ret = size;
+out:
+ mutex_unlock(&port->lock);
+ return ret;
+}
+
+static ssize_t
+current_data_role_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+
+ return sprintf(buf, "%s\n", typec_data_roles[port->data_role]);
+}
+static DEVICE_ATTR_RW(current_data_role);
+
+static ssize_t supported_data_roles_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+ size_t ret;
+
+ mutex_lock(&port->lock);
+
+ if (port->cap->type == TYPEC_PORT_DRP) {
+ ret = sprintf(buf, "host, device\n");
+ goto out;
+ }
+
+ ret = sprintf(buf, "%s\n", typec_data_roles[port->data_role]);
+out:
+ mutex_unlock(&port->lock);
+ return ret;
+}
+static DEVICE_ATTR_RO(supported_data_roles);
+
+static ssize_t current_power_role_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ struct typec_port *port = to_typec_port(dev);
+ int role;
+ int ret;
+
+ mutex_lock(&port->lock);
+
+ if (!port->cap->usb_pd) {
+ dev_dbg(dev, "power role swap only supported with USB PD\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (!port->cap->pr_set) {
+ dev_warn(dev, "power role swapping not supported\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (port->pwr_opmode != TYPEC_PWR_MODE_PD) {
+ dev_dbg(dev, "partner unable to swap power role\n");
+ ret = -EIO;
+ goto out;
+ }
+
+ role = match_string(typec_roles, ARRAY_SIZE(typec_roles), buf);
+ if (role < 0) {
+ ret = role;
+ goto out;
+ }
+
+ ret = port->cap->pr_set(port->cap, role);
+ if (ret)
+ goto out;
+
+ ret = size;
+out:
+ mutex_unlock(&port->lock);
+ return ret;
+}
+
+static ssize_t current_power_role_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+
+ return sprintf(buf, "%s\n", typec_roles[port->pwr_role]);
+}
+static DEVICE_ATTR_RW(current_power_role);
+
+static ssize_t supported_power_roles_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+ size_t ret;
+
+ mutex_lock(&port->lock);
+
+ if (port->cap->usb_pd || port->cap->type == TYPEC_PORT_DRP) {
+ ret = sprintf(buf, "source, sink\n");
+ goto out;
+ }
+
+ ret = sprintf(buf, "%s\n", typec_roles[port->pwr_role]);
+out:
+ mutex_unlock(&port->lock);
+ return ret;
+}
+static DEVICE_ATTR_RO(supported_power_roles);
+
+static const char * const typec_pwr_opmodes[] = {
+ [TYPEC_PWR_MODE_USB] = "USB",
+ [TYPEC_PWR_MODE_BC1_2] = "BC1.2",
+ [TYPEC_PWR_MODE_1_5A] = "USB Type-C 1.5A",
+ [TYPEC_PWR_MODE_3_0A] = "USB Type-C 3.0A",
+ [TYPEC_PWR_MODE_PD] = "USB Power Delivery",
+};
+
+static ssize_t power_operation_mode_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+
+ return sprintf(buf, "%s\n", typec_pwr_opmodes[port->pwr_opmode]);
+}
+static DEVICE_ATTR_RO(power_operation_mode);
+
+static ssize_t current_vconn_role_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ struct typec_port *port = to_typec_port(dev);
+ int role;
+ int ret;
+
+ mutex_lock(&port->lock);
+
+ if (!port->cap->usb_pd) {
+ dev_dbg(dev, "vconn swap only supported with USB PD\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (!port->cap->vconn_set) {
+ dev_warn(dev, "vconn swapping not supported\n");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
+ role = match_string(typec_roles, ARRAY_SIZE(typec_roles), buf);
+ if (role < 0) {
+ ret = role;
+ goto out;
+ }
+
+ ret = port->cap->vconn_set(port->cap, role);
+ if (ret)
+ goto out;
+
+ ret = size;
+out:
+ mutex_unlock(&port->lock);
+ return ret;
+}
+
+static ssize_t current_vconn_role_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+
+ return sprintf(buf, "%s\n", typec_roles[port->vconn_role]);
+}
+static DEVICE_ATTR_RW(current_vconn_role);
+
+static ssize_t supported_accessory_modes_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ /* FIXME!!! How do list the supported accessory modes? */
+ return 0;
+}
+static DEVICE_ATTR_RO(supported_accessory_modes);
+
+static ssize_t supports_usb_power_delivery_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct typec_port *port = to_typec_port(dev);
+
+ return sprintf(buf, "%d\n", port->cap->usb_pd);
+}
+static DEVICE_ATTR_RO(supports_usb_power_delivery);
+
+static struct attribute *typec_attrs[] = {
+ &dev_attr_current_power_role.attr,
+ &dev_attr_current_vconn_role.attr,
+ &dev_attr_current_data_role.attr,
+ &dev_attr_power_operation_mode.attr,
+ &dev_attr_preferred_role.attr,
+ &dev_attr_supported_accessory_modes.attr,
+ &dev_attr_supported_data_roles.attr,
+ &dev_attr_supported_power_roles.attr,
+ &dev_attr_supports_usb_power_delivery.attr,
+ NULL,
+};
+
+static const struct attribute_group typec_group = {
+ .attrs = typec_attrs,
+};
+
+static const struct attribute_group *typec_groups[] = {
+ &typec_group,
+ NULL,
+};
+
+static int typec_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+ int ret;
+
+ ret = add_uevent_var(env, "TYPEC_PORT=%s", dev_name(dev));
+ if (ret)
+ dev_err(dev, "failed to add uevent TYPEC_PORT\n");
+
+ return ret;
+}
+
+static void typec_release(struct device *dev)
+{
+ struct typec_port *port = to_typec_port(dev);
+
+ ida_simple_remove(&typec_index_ida, port->id);
+ kfree(port);
+}
+
+static struct device_type typec_port_dev_type = {
+ .name = "typec_port",
+ .groups = typec_groups,
+ .uevent = typec_uevent,
+ .release = typec_release,
+};
+
+struct typec_port *typec_register_port(struct device *dev,
+ const struct typec_capability *cap)
+{
+ struct typec_port *port;
+ int ret;
+ int id;
+
+ dev_info(dev, "%s\n", __func__);
+
+ port = kzalloc(sizeof(*port), GFP_KERNEL);
+ if (!port)
+ return ERR_PTR(-ENOMEM);
+
+ id = ida_simple_get(&typec_index_ida, 0, 0, GFP_KERNEL);
+ if (id < 0) {
+ kfree(port);
+ return ERR_PTR(id);
+ }
+
+ /* FIXME: a better approach for this */
+ port->prefer_role = -1;
+
+ port->id = id;
+ port->cap = cap;
+ port->dev.type = &typec_port_dev_type;
+ port->dev.class = &typec_class;
+ port->dev.parent = dev;
+ dev_set_name(&port->dev, "usbc%d", id);
+ mutex_init(&port->lock);
+
+ typec_init_roles(port);
+
+ ret = device_register(&port->dev);
+ if (ret)
+ goto reg_err;
+
+ dev_info(&port->dev, "%s\n", __func__);
+
+ ret = __typec_register_altmodes(&port->dev, cap->alt_modes, true);
+ if (ret)
+ goto alt_err;
+
+ return port;
+alt_err:
+ device_unregister(&port->dev);
+reg_err:
+ ida_simple_remove(&typec_index_ida, id);
+ put_device(&port->dev);
+ kfree(port);
+ return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(typec_register_port);
+
+void typec_unregister_port(struct typec_port *port)
+{
+ if (port->connected)
+ typec_disconnect(port);
+
+ dev_info(&port->dev, "%s\n", __func__);
+
+ typec_unregister_altmodes(port->cap->alt_modes);
+ device_unregister(&port->dev);
+}
+EXPORT_SYMBOL_GPL(typec_unregister_port);
+
+static int __init typec_init(void)
+{
+ return class_register(&typec_class);
+}
+subsys_initcall(typec_init);
+
+static void __exit typec_exit(void)
+{
+ class_unregister(&typec_class);
+}
+module_exit(typec_exit);
+
+MODULE_AUTHOR("Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("USB Type-C Connector Class");
diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h
new file mode 100644
index 0000000..1b91046
--- /dev/null
+++ b/include/linux/usb/typec.h
@@ -0,0 +1,252 @@
+
+#ifndef __LINUX_USB_TYPEC_H
+#define __LINUX_USB_TYPEC_H
+
+#include <linux/types.h>
+
+struct typec_port;
+
+enum typec_port_type {
+ TYPEC_PORT_DFP,
+ TYPEC_PORT_UFP,
+ TYPEC_PORT_DRP,
+};
+
+enum typec_partner_type {
+ TYPEC_PARTNER_USB,
+ TYPEC_PARTNER_CHARGER,
+ TYPEC_PARTNER_ALTMODE,
+ TYPEC_PARTNER_ACCESSORY,
+};
+
+enum typec_plug_type {
+ USB_PLUG_NONE,
+ USB_PLUG_TYPE_A,
+ USB_PLUG_TYPE_B,
+ USB_PLUG_TYPE_C,
+ USB_PLUG_CAPTIVE,
+};
+
+enum typec_data_role {
+ TYPEC_DEVICE,
+ TYPEC_HOST,
+};
+
+enum typec_role {
+ TYPEC_SINK,
+ TYPEC_SOURCE,
+};
+
+enum typec_pwr_opmode {
+ TYPEC_PWR_MODE_USB,
+ TYPEC_PWR_MODE_BC1_2,
+ TYPEC_PWR_MODE_1_5A,
+ TYPEC_PWR_MODE_3_0A,
+ TYPEC_PWR_MODE_PD,
+};
+
+enum typec_accessory {
+ TYPEC_ACCESSORY_NONE,
+ TYPEC_ACCESSORY_AUDIO,
+ TYPEC_ACCESSORY_DEBUG,
+ TYPEC_ACCESSORY_DAUDIO,
+};
+
+/*
+ * struct typec_mode - Individual Mode of an Alternate Mode
+ * @vdo: VDO returned by Discover Modes USB PD command
+ * @desc: Mode description
+ * @active: Tells if the mode is currently entered or not
+ * @index: Index of the mode
+ * @group_name: Name for the sysfs folder in form "mode<index>"
+ * @group: The sysfs group (folder) for the mode
+ * @attrs: The attributes for the sysfs group
+ * @vdo_attr: Device attribute to expose the VDO of the mode
+ * @desc_attr: Device attribute to expose the description of the mode
+ * @active_attr: Device attribute to expose active of the mode
+ * @roles: Only for ports. DRP if the mode is awailable in both roles
+ * @roles_attr: Device attribute, only for ports, to expose the supported roles
+ *
+ * Details about a mode of an Alternate Mode which a connector, cable plug or
+ * partner supports. Every mode will have it's own sysfs group. The details are
+ * the VDO returned by discover modes command, description for the mode and
+ * active flag telling is the mode currently active or not.
+ */
+struct typec_mode {
+ u32 vdo;
+ char *desc;
+ unsigned int active:1;
+ /* Only for ports */
+ enum typec_port_type roles;
+
+ struct typec_altmode *alt_mode;
+
+ int index;
+ char group_name[8];
+ struct attribute_group group;
+ struct attribute *attrs[5];
+ struct device_attribute vdo_attr;
+ struct device_attribute desc_attr;
+ struct device_attribute active_attr;
+ /* Only for ports */
+ struct device_attribute roles_attr;
+};
+
+/*
+ * struct typec_altmode - USB Type-C Alternate Mode
+ * @dev: struct device instance
+ * @name: Name for the Alternate Mode (optional)
+ * @svid: Standard or Vendor ID
+ * @n_modes: Number of modes
+ * @modes: Array of modes supported by the Alternat Mode
+ * @mode_groups: The modes as attribute groups to be exposed in sysfs
+ *
+ * Representation of an Alternate Mode that has SVID assigned by USB-IF. The
+ * array of modes will list the modes of a particular SVID that are supported by
+ * a connector, partner of a cable plug.
+ */
+struct typec_altmode {
+ struct device dev;
+ char *name;
+
+ u16 svid;
+ int n_modes;
+ struct typec_mode *modes;
+
+ const struct attribute_group **mode_groups;
+};
+
+#define to_altmode(d) container_of(d, struct typec_altmode, dev)
+
+struct typec_port *typec_altmode2port(struct typec_altmode *);
+
+int typec_register_altmodes(struct device *, struct typec_altmode *);
+void typec_unregister_altmodes(struct typec_altmode *);
+
+/*
+ * struct typec_plug - USB Type-C Cable Plug
+ * @dev: struct device instance
+ * @index: 1 for the plug connected to DFP and 2 for the plug connected to UFP
+ * @alt_modes: Alternate Modes the cable plug supports (null terminated)
+ *
+ * Represents USB Type-C Cable Plug.
+ */
+struct typec_plug {
+ struct device dev;
+ int index;
+ struct typec_altmode *alt_modes;
+};
+
+/*
+ * struct typec_cable - USB Type-C Cable
+ * @dev: struct device instance
+ * @type: The plug type from USB PD Cable VDO
+ * @active: Is the cable active or passive
+ *Â@sop_pp_controller: Tells whether both cable plugs are configurable or not
+ * @plug: The two plugs in the cable.
+ *
+ * Represents USB Type-C Cable attached to USB Type-C port. Two plugs are
+ * created if the cable has SOP Double Prime controller as defined in USB PD
+ * specification. Otherwise only one will be created if the cable is active. For
+ * passive cables no plugs are created.
+ */
+struct typec_cable {
+ struct device dev;
+ enum typec_plug_type type;
+ unsigned int active:1;
+ unsigned int sop_pp_controller:1;
+ /* REVISIT: What else needed? */
+
+ struct typec_plug plug[2];
+};
+
+/*
+ * struct typec_partner - USB Type-C Partner
+ * @dev: struct device instance
+ * @type: Normal USB device, charger, Alternate Mode or Accessory
+ * @alt_modes: Alternate Modes the partner supports (null terminated)
+ *
+ * Details about a partner that is attached to USB Type-C port.
+ */
+struct typec_partner {
+ struct device dev;
+ enum typec_partner_type type;
+ enum typec_accessory accessory;
+ struct typec_altmode *alt_modes;
+};
+
+/*
+ * struct typec_capability - USB Type-C Port Capabilities
+ * @role: DFP (Host-only), UFP (Device-only) or DRP (Dual Role)
+ * @usb_pd: USB Power Delivery support
+ * @alt_modes: Alternate Modes the connector supports (null terminated)
+ * @accessors: Supported Accessory Modes (null terminated)
+ * @try_role: Set a fixed data role for DRP port
+ * @dr_set: Set Data Role
+ * @pr_set: Set Power Role
+ * @vconn_set: Set VCONN Role
+ * @activate_mode: Enter/exit given Alternate Mode
+ *
+ * Static capabilities of a single USB Type-C port.
+ */
+struct typec_capability {
+ enum typec_port_type type;
+ unsigned int usb_pd:1;
+ struct typec_altmode *alt_modes;
+
+ int (*try_role)(const struct typec_capability *,
+ enum typec_role);
+
+ int (*dr_set)(const struct typec_capability *,
+ enum typec_data_role);
+ int (*pr_set)(const struct typec_capability *,
+ enum typec_role);
+ int (*vconn_set)(const struct typec_capability *,
+ enum typec_role);
+
+ int (*activate_mode)(struct typec_altmode *,
+ int mode, int activate);
+};
+
+/*
+ * struct typec_connection - Details about USB Type-C port connection event
+ * @partner: The attached partner
+ * @cable: The attached cable
+ * @data_role: Initial USB data role (host or device)
+ * @pwr_role: Initial Power role (source or sink)
+ * @vconn_role: Initial VCONN role (source or sink)
+ * @pwr_opmode: The power mode of the connection
+ *
+ * All the relevant details about a connection event. Wrapper that is passed to
+ * typec_connect(). The context is copied when typec_connect() is called and the
+ * structure is not used for anything else.
+ */
+struct typec_connection {
+ struct typec_partner *partner;
+ struct typec_cable *cable;
+
+ enum typec_data_role data_role;
+ enum typec_role pwr_role;
+ enum typec_role vconn_role;
+ enum typec_pwr_opmode pwr_opmode;
+};
+
+struct typec_port *typec_register_port(struct device *dev,
+ const struct typec_capability *cap);
+void typec_unregister_port(struct typec_port *port);
+
+int typec_connect(struct typec_port *port, struct typec_connection *con);
+void typec_disconnect(struct typec_port *port);
+
+/* REVISIT: are these needed? */
+struct device *typec_port2dev(struct typec_port *port);
+struct typec_port *typec_dev2port(struct device *dev);
+
+/* Callbacks from driver */
+
+void typec_set_data_role(struct typec_port *, enum typec_data_role);
+void typec_set_pwr_role(struct typec_port *, enum typec_role);
+void typec_set_vconn_role(struct typec_port *, enum typec_role);
+void typec_set_pwr_opmode(struct typec_port *, enum typec_pwr_opmode);
+
+#endif /* __LINUX_USB_TYPEC_H */
--
2.8.1