USB Type-C Connector class
Subsystems (5)
Heikki Krogerus
maintainerv14 cover USB Type-C Connector class
The USB Type-C class is meant to provide unified interface to the userspace to present the USB Type-C ports in a system.
Changes since v13:
- New API. Everything is registered separately.
Changes since v12:
- Added prefer_role member to typec_capability structure as requested by Guenter
Changes since v11:
- The port drivers are responsible of removing the alternate modes (just like the documentation already said).
Changes since v10:
- Using ATTRIBUTE_GROUPS and DEVICE_ATTR marcos everywhere
- Moved sysfs_match_string to lib/string.c
- Rationalized uevents
- Calling ida_destroy
Changes since v9:
- Minor typec_wcove.c cleanup as proposed by Guenter Roeck. No function affect.
Changes since v8:
- checking sysfs_streq() result correctly in sysfs_strmatch
- fixed accessory check in supported_accessory_mode
- using "none" as the only string that can clear the preferred role
Changes since v7:
- Removed "type" attribute from partners
- Added supports_usb_power_delivery attribute for partner and cable
Changes since v6:
- current_vconn_role attr renamed to vconn_source (no API changes)
- Small documentation improvements proposed by Vincent Palatin
Changes since v5:
- Only updating the roles based on driver notifications
- Added MODULE_ALIAS for the WhiskeyCove module
- Including the patch that creates the actual platform device for the WhiskeyCove Type-C PHY in this series.
Changes since v4:
- Remove the port lock completely
Changes since v3:
- Documentation cleanup as proposed by Roger Quadros
- Setting partner altmodes member to NULL on removal and fixing a warning, as proposed by Guenter Roeck
- Added the following attributes for partners and cables:
* supports_usb_power_delivery
* id_header_vdo
- "id_header_vdo" is visible only when the partner or cable supports USB Power Delivery communication.
- Partner attribute "accessory" is hidden when the partner type is not "Accessory".
Changes since v2:
- Notification on role and alternate mode changes
- cleanups
Changes since v1:
- Completely rewrote alternate mode support
- Patners, cables and cable plugs presented as devices.
Heikki Krogerus (3):
lib/string: add sysfs_match_string helper
usb: USB Type-C connector class
usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY
Documentation/ABI/testing/sysfs-class-typec | 219 +++++ Documentation/usb/typec.txt | 181 ++++ MAINTAINERS | 9 + drivers/usb/Kconfig | 2 + drivers/usb/Makefile | 2 + drivers/usb/typec/Kconfig | 21 + drivers/usb/typec/Makefile | 2 + drivers/usb/typec/typec.c | 1190 +++++++++++++++++++++++++++ drivers/usb/typec/typec_wcove.c | 377 +++++++++ include/linux/string.h | 10 + include/linux/usb/typec.h | 212 +++++ lib/string.c | 26 + 12 files changed, 2251 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-class-typec create mode 100644 Documentation/usb/typec.txt 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 drivers/usb/typec/typec_wcove.c create mode 100644 include/linux/usb/typec.h
Signature · 1 line
2.11.0
Heikki Krogerus
maintainerPATCH v14 1/3 lib/string: add sysfs_match_string helper
Make a simple helper for matching strings with sysfs attribute files. In most parts the same as match_string(), except sysfs_match_string() uses sysfs_streq() instead of strcmp() for matching. This is more convenient when used with sysfs attributes.
--- include/linux/string.h | 10 ++++++++++ lib/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+)
include/linux/string.h +10 -0
@@ -135,6 +135,16 @@ static inline int strtobool(const char *s, bool *res) }int match_string (const char *const *array,size_t n,const char *string); +int __sysfs_match_string (const char *const *array,size_t n,const char *s); + +/** +* sysfs_match_string - matches given string in an array +* @_a: array of strings +* @_s: string to match with +* +* Helper for __sysfs_match_string(). Calculates the size of @a automatically. +*/ +#define sysfs_match_string (_a, _s) __sysfs_match_string(_a, ARRAY_SIZE(_a), _s)#ifdef CONFIG_BINARY_PRINTF int vbin_printf (u32 *bin_buf,size_t size,const char *fmt,va_list args);
lib/string.c +26 -0
@@ -656,6 +656,32 @@ int match_string(const char * const *array, size_t n, const char *string) }EXPORT_SYMBOL (match_string); +/** +* __sysfs_match_string - matches given string in an array +* @array: array of strings +* @n: number of strings in the array or -1 for NULL terminated arrays +* @str: string to match with +* +* Returns index of @str in the @array or -EINVAL, just like match_string(). +* Uses sysfs_streq instead of strcmp for matching. +*/ +int __sysfs_match_string (const char *const *array,size_t n,const char *str) +{ +const char *item; +int index; + +for (index =0 ; index < n; index++) { + item = array[index]; +if (!item) +break ; +if (sysfs_streq (item, str)) +return index; + } + +return -EINVAL ; +} +EXPORT_SYMBOL (__sysfs_match_string); +#ifndef __HAVE_ARCH_MEMSET/** * memset - Fill a region of memory with the given value
Signature · 1 line
2.11.0
Heikki Krogerus
maintainerPATCH v14 2/3 usb: USB Type-C connector class
In reply to Heikki KrogerusThe purpose of USB Type-C connector class is to provide unified interface for the user space to get the status and basic information about USB Type-C connectors on a system, control over data role swapping, and when the port supports USB Power Delivery, also control over power role swapping and Alternate Modes.
--- Documentation/ABI/testing/sysfs-class-typec | 219 +++++ Documentation/usb/typec.txt | 181 ++++ MAINTAINERS | 9 + drivers/usb/Kconfig | 2 + drivers/usb/Makefile | 2 + drivers/usb/typec/Kconfig | 7 + drivers/usb/typec/Makefile | 1 + drivers/usb/typec/typec.c | 1190 +++++++++++++++++++++++++++ include/linux/usb/typec.h | 212 +++++ 9 files changed, 1823 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-class-typec create mode 100644 Documentation/usb/typec.txt 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
Documentation/ABI/testing/sysfs-class-typec new file +219 -0
@@ -0,0 +1,219 @@ +USB Type-C port devices (eg. /sys/class/typec/port0/) + +What: /sys/class/typec/<port>/current_data_role +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + The current USB data role the port is operating in. This + attribute can be used for requesting data role swapping on the + port. Swapping is supported as synchronous operation, so + write(2) to the attribute will not return until the operation + has finished. The attribute is notified about role changes so + that poll(2) on the attribute wakes up. Change on the role will + also generate uevent KOBJ_CHANGE on the port. + + Valid values: + - host + - device + +What: /sys/class/typec/<port>/current_power_role +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + The current power role of the port. This attribute can be used + to request power role swap on the port when the port supports + USB Power Delivery. Swapping is supported as synchronous + operation, so write(2) to the attribute will not return until + the operation has finished. The attribute is notified about role + changes so that poll(2) on the attribute wakes up. Change on the + role will also generate uevent KOBJ_CHANGE. + + Valid values: + - source + - sink + +What: /sys/class/typec/<port>/vconn_source +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows is the port VCONN Source. This attribute can be used to + request VCONN swap to change the VCONN Source during connection + when both the port and the partner support USB Power Delivery. + Swapping is supported as synchronous operation, so write(2) to + the attribute will not return until the operation has finished. + The attribute is notified about VCONN source changes so that + poll(2) on the attribute wakes up. Change on VCONN source also + generates uevent KOBJ_CHANGE. + + Valid values are: + - 0 when the port is not the VCONN Source + - 1 when the port is the VCONN Source + +What: /sys/class/typec/<port>/power_operation_mode +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows the current power operational mode the port is in. + + Valid values: + - USB - Normal power levels defined in USB specifications + - USB Type-C 1.5A - Higher 1.5A current defined in USB Type-C + specification. + - USB Type-C 3.0A - Higher 3A current defined in USB Type-C + specification. + - USB Power Delivery - The voltages and currents defined in USB + Power Delivery specification + +What: /sys/class/typec/<port>/preferred_role +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + The user space can notify the driver about the preferred role. + It should be handled as enabling of Try.SRC or Try.SNK, as + defined in USB Type-C specification, in the port drivers. By + default there is no preferred role. + + Valid values: + - source + - sink + - none - to remove preference + +What: /sys/class/typec/<port>/supported_accessory_modes +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Lists the Accessory Modes, defined in the USB Type-C + specification, the port supports. + +What: /sys/class/typec/<port>/supported_data_roles +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Lists the USB data roles the port is capable of supporting. + + Valid values: + - device + - host + - device, host (DRD as defined in USB Type-C specification v1.2) + +What: /sys/class/typec/<port>/supported_power_roles +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Lists the power roles the port is capable of supporting. + + Valid values: + - source + - sink + - source, sink (DRP as defined in USB Type-C specification v1.2) + +What: /sys/class/typec/<port>/supports_usb_power_delivery +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows if the port supports USB Power Delivery. + - 1 if USB Power Delivery is supported + - 0 when it's not + + +USB Type-C partner devices (eg. /sys/class/typec/port0-partner/) + +What: /sys/class/typec/<port>-partner/accessory_mode +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows the Accessory Mode name when the partner an Accesory Mode. + The Accessory Modes are defined in USB Type-C Specification. + +What: /sys/class/typec/<port>-partner/supports_usb_power_delivery +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows if the partner supports USB Power Delivery: + - 0 when USB Power Delivery is not supported + - 1 when USB Power Delivery is supported + + +USB Type-C cable devices (eg. /sys/class/typec/port0-cable/) + +Note: Electronically Marked Cables will have a device also for one cable plug +(eg. /sys/class/typec/port0-plug0). If the cable is active and has also SOP +Double Prime controller (USB Power Deliver specification ch. 2.4) it will have +second device also for the other plug. Both plugs may have their alternate modes +as described in USB Type-C and USB Power Delivery specifications. + +What: /sys/class/typec/<port>-cable/active +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows if the cable is active or passive. + + Valid values: + - 0 when the cable is passive + - 1 when the cable is active + +What: /sys/class/typec/<port>-cable/plug_type +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows type of the plug on the cable: + - Type-A - Standard A + - Type-B - Standard B + - Type-C - USB Type-C + - Captive - Non-standard + +What: /sys/class/typec/<port>-cable/supports_usb_power_delivery +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows if the cable supports USB Power Delivery: + - 0 when USB Power Delivery is not supported + - 1 when USB Power Delivery is supported + + +Alternate Mode devices (For example, +/sys/class/typec/port0-partner/port0-partner.svid:xxxx/). The ports, partners +and cable plugs can have alternate modes. + +What: /sys/class/typec/<dev>/<dev>.svid:<svid>/<mode>/active +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows if the mode is active or not. The attribute can be used + for entering/exiting the mode with partners and cable plugs, and + with the port alternate modes it can be used for disabling + support for specific alternate modes. Entering/exiting modes is + supported as synchronous operation so write(2) to the attribute + does not return until the enter/exit mode operation has + finished. The attribute is notified when the mode is + entered/exited so poll(2) on the attribute wakes up. + Entering/exiting a mode will also generate uevent KOBJ_CHANGE. + + Valid values: + - 0 when the mode is inactive + - 1 when the mode is active + +What: /sys/class/typec/<dev>/<dev>.svid:<svid>/<mode>/description +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows description of the mode. The description is optional for + the drivers, just like with the Billboard Devices. + +What: /sys/class/typec/<dev>/<dev>.svid:<svid>/<mode>/vdo +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows the VDO in hexadecimal returned from the Discover Modes + command. + +What: /sys/class/typec/<port>/<port>.svid:<svid>/<mode>/supported_roles +Date: February 2017 +Contact: Heikki Krogerus <[email protected]> +Description: + Shows the roles, source or sink, the mode is supported with. + + This attribute is available for the devices describing the + alternate modes a port supports, and it will not be exposed with + the devices presenting the alternate modes the partners or cable + plugs support.
Documentation/usb/typec.txt new file +181 -0
181 lines not on this page · raw message
MAINTAINERS +9 -0
@@ -12895,6 +12895,15 @@ F: drivers/usb/ F: include/linux/usb.h F: include/linux/usb/ +USB TYPEC SUBSYSTEM +M: Heikki Krogerus <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/ABI/testing/sysfs-class-typec +F: Documentation/usb/typec.txt +F: drivers/usb/typec/ +F: include/linux/usb/typec.h + USB UHCI DRIVER M: Alan Stern <[email protected]> L: [email protected]
drivers/usb/Kconfig +2 -0
@@ -152,6 +152,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 && LEDS_TRIGGERS
drivers/usb/Makefile +2 -0
@@ -62,3 +62,5 @@ obj-$(CONFIG_USB_GADGET) += gadget/ obj-$(CONFIG_USB_COMMON) += common/ obj-$(CONFIG_USBIP_CORE) += usbip/ + +obj-$(CONFIG_TYPEC) += typec/
drivers/usb/typec/Kconfig new file +7 -0
@@ -0,0 +1,7 @@ + +menu "USB Power Delivery and Type-C drivers" + +config TYPEC + tristate + +endmenu
drivers/usb/typec/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_TYPEC) += typec.o
drivers/usb/typec/typec.c new file +1190 -0
1,190 lines not on this page · raw message
include/linux/usb/typec.h new file +212 -0
212 lines not on this page · raw message
Signature · 1 line
2.11.0
Re: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 6 lines · Heikki Krogerus
The purpose of USB Type-C connector class is to provide unified interface for the user space to get the status and basic information about USB Type-C connectors on a system, control over data role swapping, and when the port supports USB Power Delivery, also control over power role swapping and Alternate Modes.
Disclaimer: I'm not familiar with USB Type-C, so my comments are pretty much limited to generic/stylistic issues.
Overall this looks good. Please find a couple of nitpicks below.
[snip]
Documentation/usb/typec.txt line 2
Quoted 4 lines
+++
b/Documentation/usb/typec.txtDocumentation/usb/typec.txt new file +2
-0@@ -0,0 +1,181 @@ +USB Type-C connector class +==========================
You might want to convert this to the new .rst format at some point.
[snip]
drivers/usb/typec/Kconfig line 2
Quoted 4 lines
drivers/usb/typec/Kconfig new file +3
-0+++ b/drivers/usb/typec/Kconfig@@ -0,0 +1,7 @@ + +menu "USB Power Delivery and Type-C drivers"
This could use a help text telling why the user wants to select this.
Quoted 26 lines
drivers/usb/typec/Kconfig new file +5
-0+ +config TYPEC + tristate + +endmenudrivers/usb/typec/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_TYPEC) += typec.odrivers/usb/typec/typec.c new file +8
-0@@ -0,0 +1,1190 @@ +/* +* USB Type-C Connector Class +* +* Copyright (C) 2017, Intel Corporation +* Author: Heikki Krogerus <[email protected]> +* +* 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
drivers/usb/typec/typec.c line 18
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+* published by the Free Software Foundation. +*/ + +#include <linux/device.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/usb/typec.h> + +/* XXX: Once we have a header for USB Power Delivery, this belongs there */ +#define ALTMODE_MAX_N_MODES 7
ALTMODE_MAX_MODES looks better.
Quoted 97 lines
drivers/usb/typec/typec.c new file +97
-0+ +struct typec_mode { +int index; +u32 vdo; +char *desc; +enum typec_port_type roles; + +struct typec_altmode *alt_mode; + +unsigned int active:1 ; + +char group_name[6 ]; +struct attribute_group group; +struct attribute *attrs[5 ]; +struct device_attribute vdo_attr; +struct device_attribute desc_attr; +struct device_attribute active_attr; +struct device_attribute roles_attr; +}; + +struct typec_altmode { +struct device dev; +u16 svid; +int n_modes; +struct typec_mode modes[ALTMODE_MAX_N_MODES ]; +const struct attribute_group *mode_groups[ALTMODE_MAX_N_MODES ]; +}; + +struct typec_plug { +struct device dev; +enum typec_plug_index index; +}; + +struct typec_cable { +struct device dev; +u16 pd_revision; +enum typec_plug_type type; +u32 vdo; +unsigned int active:1 ; +}; + +struct typec_partner { +struct device dev; +u16 pd_revision; +u32 vdo; +enum typec_accessory accessory; +}; + +struct typec_port { +unsigned int id; +struct device dev; + +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; + +const struct typec_capability *cap; +}; + +#define to_typec_port (_dev_) container_of(_dev_, struct typec_port, dev) +#define to_typec_plug (_dev_) container_of(_dev_, struct typec_plug, dev) +#define to_typec_cable (_dev_) container_of(_dev_, struct typec_cable, dev) +#define to_typec_partner (_dev_) container_of(_dev_, struct typec_partner, dev) +#define to_altmode (_dev_) container_of(_dev_, struct typec_altmode, dev) + +static const struct device_type typec_partner_dev_type; +static const struct device_type typec_cable_dev_type; +static const struct device_type typec_plug_dev_type; +static const struct device_type typec_port_dev_type; + +#define is_typec_partner (_dev_) (_dev_->type == &typec_partner_dev_type) +#define is_typec_cable (_dev_) (_dev_->type == &typec_cable_dev_type) +#define is_typec_plug (_dev_) (_dev_->type == &typec_plug_dev_type) +#define is_typec_port (_dev_) (_dev_->type == &typec_port_dev_type) + +static DEFINE_IDA (typec_index_ida); +static struct class *typec_class; + +/* Common attributes */ + +static const char *const typec_accessory_modes[] = { + [TYPEC_ACCESSORY_NONE ] ="None" , + [TYPEC_ACCESSORY_AUDIO ] ="Audio Adapter Accessory Mode" , + [TYPEC_ACCESSORY_DEBUG ] ="Debug Accessory Mode" , +}; + +static ssize_t usb_power_delivery_revision_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +u16 rev =0 ; + +if (is_typec_partner (dev)) { +struct typec_partner *p =to_typec_partner (dev); +
drivers/usb/typec/typec.c line 125
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+ rev = p->pd_revision; + }else if (is_typec_cable (dev)) { +struct typec_cable *p =to_typec_cable (dev); + + rev = p->pd_revision; + }else if (is_typec_port (dev)) { +struct typec_port *p =to_typec_port (dev); + + rev = p->cap->pd_revision; + }
Is it better to return -EINVAL or -ENODEV in case we do not find supported type?
Quoted 9 lines
drivers/usb/typec/typec.c new file +9
-0+ +return sprintf (buf,"%d\n" , (rev >>8 ) &0xff ); +} +static DEVICE_ATTR_RO (usb_power_delivery_revision); + +static ssize_t +vdo_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +u32 vdo =0 ;
drivers/usb/typec/typec.c line 144
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+ +if (is_typec_partner (dev)) { +struct typec_partner *p =to_typec_partner (dev); + + vdo = p->vdo; + }else if (is_typec_cable (dev)) { +struct typec_cable *p =to_typec_cable (dev); + + vdo = p->vdo; + }
Ditto.
Quoted 18 lines
drivers/usb/typec/typec.c new file +18
-0+ +return sprintf (buf,"0x%08x\n" , vdo); +} +static DEVICE_ATTR_RO (vdo); + +/* ------------------------------------------------------------------------- */ +/* Alternate Modes */ + +/** +* typec_altmode_update_active - Report Enter/Exit mode +* @alt: Handle to the alternate mode +* @mode: Mode index +* @active: True when the mode has been entered +* +* If a partner or cable plug executes Enter/Exit Mode command successfully, the +* drivers use this routine to report the updated state of the mode. +*/ +void typec_altmode_update_active(struct typec_altmode *alt, int mode,
drivers/usb/typec/typec.c line 172
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+ bool active) +{ +struct typec_mode *m = &alt->modes[mode]; +char dir[6 ]; + +if (m->active == active) +return ; + + m->active = active; +snprintf (dir,6 ,"mode%d" , mode);
Or instead of 6 use sizeof(dir). We are sure mode is never larger than 9, right?
Quoted 90 lines
drivers/usb/typec/typec.c new file +90
-0+sysfs_notify (&alt->dev.kobj, dir,"active" ); +kobject_uevent (&alt->dev.kobj,KOBJ_CHANGE ); +} +EXPORT_SYMBOL_GPL (typec_altmode_update_active); + +/** +* typec_altmode2port - Alternate Mode to USB Type-C port +* @alt: The Alternate Mode +* +* Returns handle to the port that a cable plug or partner with @alt is +* connected to. +*/ +struct typec_port *typec_altmode2port (struct typec_altmode *alt) +{ +if (is_typec_plug (alt->dev.parent)) +return to_typec_port (alt->dev.parent->parent->parent); +if (is_typec_partner (alt->dev.parent)) +return to_typec_port (alt->dev.parent->parent); +if (is_typec_port (alt->dev.parent)) +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); +int i; + +for (i =0 ; i < alt->n_modes; i++) +kfree (alt->modes[i].desc); +kfree (alt); +} + +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; + +if (!port->cap->activate_mode) +return -EOPNOTSUPP ; + + ret =kstrtobool (buf, &activate); +if (ret) +return ret; + + ret = port->cap->activate_mode (port->cap, mode->index, activate); +if (ret) +return ret; + +return size; +} + +static ssize_t
drivers/usb/typec/typec.c line 272
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+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); +ssize_t ret; + +switch (mode->roles) { +case TYPEC_PORT_DFP : + ret =sprintf (buf,"source\n" );
Extra space after '='.
drivers/usb/typec/typec.c line 279
Quoted 7 lines
drivers/usb/typec/typec.c new file +7
-0+break ; +case TYPEC_PORT_UFP : + ret =sprintf (buf,"sink\n" ); +break ; +case TYPEC_PORT_DRP : +default : + ret =sprintf (buf,"source\nsink\n" );
I wonder if "source sink" instead is better? Along the lines of /sys/power/state.
Then you can print "[source] sink" when source is selected and so on.
drivers/usb/typec/typec.c line 285
Quoted 6 lines
drivers/usb/typec/typec.c new file +6
-0+break ; + } +return ret; +} + +static inline void typec_init_modes(struct typec_altmode *alt,
inline, really?
Quoted 47 lines
drivers/usb/typec/typec.c new file +47
-0+ struct typec_mode_desc *desc, bool is_port) +{ + int i; + +for (i =0 ; i < alt->n_modes; i++, desc++) { +struct typec_mode *mode = &alt->modes[i]; + +/* Not considering the human readable description critical */ + mode->desc =kstrdup (desc->desc,GFP_KERNEL ); +if (desc->desc && !mode->desc) +dev_err (&alt->dev,"failed to copy mode%d desc\n" , i); + + mode->alt_mode = alt; + mode->vdo = desc->vdo; + mode->roles = desc->roles; + mode->index = desc->index; +sprintf (mode->group_name,"mode%d" , desc->index); + +sysfs_attr_init (&mode->vdo_attr.attr); + mode->vdo_attr.attr.name ="vdo" ; + mode->vdo_attr.attr.mode =0444 ; + 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 =0444 ; + 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 =0644 ; + 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 =0444 ; + mode->roles_attr.show = typec_altmode_roles_show; + + mode->attrs[3 ] = &mode->roles_attr.attr; + }
drivers/usb/typec/typec.c line 342
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+ + mode->group.attrs = mode->attrs; + mode->group.name = mode->group_name; + + alt->mode_groups[i] = &mode->group; + } +} + +static struct typec_altmode +*typec_register_altmode (struct device *parent,struct typec_altmode_desc *desc)
Star belongs to the above line.
Quoted 19 lines
drivers/usb/typec/typec.c new file +19
-0+{ +struct typec_altmode *alt; +int ret; + + alt =kzalloc (sizeof (*alt),GFP_KERNEL ); +if (!alt) +return NULL ; + + alt->svid = desc->svid; + alt->n_modes = desc->n_modes; +typec_init_modes (alt, desc->modes,is_typec_port (parent)); + + alt->dev.parent = parent; + alt->dev.groups = alt->mode_groups; + alt->dev.release = typec_altmode_release; +dev_set_name (&alt->dev,"%s.svid:%04x" ,dev_name (parent), alt->svid); + + ret =device_register (&alt->dev); +if (ret) {
drivers/usb/typec/typec.c line 371
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+int i; + +dev_err (parent,"failed to register alternate mode (%d)\n" , + ret); + +put_device (&alt->dev); + +for (i =0 ; i < alt->n_modes; i++) +kfree (alt->modes[i].desc); +kfree (alt);
Just checking: ->release() is not called when device_register() fails and that's why you release memory here?
Quoted 61 lines
drivers/usb/typec/typec.c new file +61
-0+return NULL ; + } + +return alt; +} + +/** +* typec_unregister_altmode - Unregister Alternate Mode +* @alt: The alternate mode to be unregistered +* +* Unregister device created with typec_partner_register_altmode(), +* typec_plug_register_altmode() or typec_port_register_altmode(). +*/ +void typec_unregister_altmode (struct typec_altmode *alt) +{ +if (alt) +device_unregister (&alt->dev); +} +EXPORT_SYMBOL_GPL (typec_unregister_altmode); + +/* ------------------------------------------------------------------------- */ +/* Type-C Partners */ + +static ssize_t accessory_mode_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct typec_partner *p =to_typec_partner (dev); + +if (p->accessory ==TYPEC_ACCESSORY_NONE ) +return 0 ; + +return sprintf (buf,"%s\n" , typec_accessory_modes[p->accessory]); +} +static DEVICE_ATTR_RO (accessory_mode); + +static struct attribute *typec_partner_attrs[] = { + &dev_attr_vdo.attr, + &dev_attr_accessory_mode.attr, + &dev_attr_usb_power_delivery_revision.attr, +NULL +}; +ATTRIBUTE_GROUPS (typec_partner); + +static void typec_partner_release (struct device *dev) +{ +struct typec_partner *partner =to_typec_partner (dev); + +kfree (partner); +} + +static const struct device_type typec_partner_dev_type = { + .name ="typec_partner_device" , + .groups = typec_partner_groups, + .release = typec_partner_release, +}; + +/** +* typec_partner_register_altmode - Register USB Type-C Partner Alternate Mode +* @partner: USB Type-C Partner that supports the alternate mode +* @desc: Description of the alternate mode
drivers/usb/typec/typec.c line 442
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+* +* This routine is used to register each alternate mode individually that +* @partner has listed in response to Discover SVIDs command. The modes for a +* SVID listed in response to Discover Modes command need to be listed in an +* array in @desc. +* +* Returns handle to the alternate mode on success or NULL on failure. +*/ +struct typec_altmode +*typec_partner_register_altmode(struct typec_partner *partner,
Here also star belongs to the line above.
Quoted 78 lines
drivers/usb/typec/typec.c new file +78
-0+ struct typec_altmode_desc *desc) +{ +return typec_register_altmode (&partner->dev, desc); +} +EXPORT_SYMBOL_GPL (typec_partner_register_altmode); + +/** +* typec_register_partner - Register a USB Type-C Partner +* @port: The USB Type-C Port the partner is connected to +* @desc: Description of the partner +* +* Registers a device for USB Type-C Partner described in @desc. +* +* Returns handle to the partner on success or NULL on failure. +*/ +struct typec_partner *typec_register_partner (struct typec_port *port, +struct typec_partner_desc *desc) +{ +struct typec_partner *partner =NULL ; +int ret; + + partner =kzalloc (sizeof (*partner),GFP_KERNEL ); +if (!partner) +return NULL ; + + partner->vdo = desc->vdo; + partner->accessory = desc->accessory; + partner->pd_revision = desc->pd_revision; + + partner->dev.class = typec_class; + partner->dev.parent = &port->dev; + partner->dev.type = &typec_partner_dev_type; +dev_set_name (&partner->dev,"%s-partner" ,dev_name (&port->dev)); + + ret =device_register (&partner->dev); +if (ret) { +dev_err (&port->dev,"failed to register partner (%d)\n" , ret); +put_device (&partner->dev); +kfree (partner); +return NULL ; + } + +return partner; +} +EXPORT_SYMBOL_GPL (typec_register_partner); + +/** +* typec_unregister_partner - Unregister a USB Type-C Partner +* @partner: The partner to be unregistered +* +* Unregister device created with typec_register_partner(). +*/ +void typec_unregister_partner (struct typec_partner *partner) +{ +if (partner) +device_unregister (&partner->dev); +} +EXPORT_SYMBOL_GPL (typec_unregister_partner); + +/* ------------------------------------------------------------------------- */ +/* Type-C Cable Plugs */ + +static void typec_plug_release (struct device *dev) +{ +struct typec_plug *plug =to_typec_plug (dev); + +kfree (plug); +} + +static const struct device_type typec_plug_dev_type = { + .name ="typec_plug_device" , + .release = typec_plug_release, +}; + +/** +* typec_plug_register_altmode - Register USB Type-C Cable Plug Alternate Mode +* @plug: USB Type-C Cable Plug that supports the alternate mode +* @desc: Description of the alternate mode
drivers/usb/typec/typec.c line 530
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+* +* This routine is used to register each alternate mode individually that @plug +* has listed in response to Discover SVIDs command. The modes for a SVID that +* the plug lists in response to Discover Modes command need to be listed in an +* array in @desc. +* +* Returns handle to the alternate mode on success or NULL on failure. +*/ +struct typec_altmode +*typec_plug_register_altmode(struct typec_plug *plug,
Here also star belongs to the above line.
Quoted 11 lines
drivers/usb/typec/typec.c new file +11
-0+ struct typec_altmode_desc *desc) +{ +return typec_register_altmode (&plug->dev, desc); +} +EXPORT_SYMBOL_GPL (typec_plug_register_altmode); + +/** +* typec_register_plug - Register a USB Type-C Cable Plug +* @cable: USB Type-C Cable with the plug +* @desc: Description of the cable plug +*
drivers/usb/typec/typec.c line 551
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+* Registers a device for USB Type-C Cable Plug described in @desc. A USB Type-C +* Cable Plug represents a plug with electronics in it that can response to USB +* Power Delivery SOP Prime or SOP Double Prime packages. +* +* Returns handle to the cable plug on success or NULL on failure. +*/ +struct typec_plug *typec_register_plug (struct typec_cable *cable, +struct typec_plug_desc *desc) +{ +struct typec_plug *plug =NULL ;
No need to initialize plug.
Quoted 93 lines
drivers/usb/typec/typec.c new file +93
-0+char name[8 ]; +int ret; + + plug =kzalloc (sizeof (*plug),GFP_KERNEL ); +if (!plug) +return NULL ; + +sprintf (name,"plug%d" , desc->index); + + plug->index = desc->index; + plug->dev.class = typec_class; + plug->dev.parent = &cable->dev; + plug->dev.type = &typec_plug_dev_type; +dev_set_name (&plug->dev,"%s-%s" ,dev_name (cable->dev.parent), name); + + ret =device_register (&plug->dev); +if (ret) { +dev_err (&cable->dev,"failed to register plug (%d)\n" , ret); +put_device (&plug->dev); +kfree (plug); +return NULL ; + } + +return plug; +} +EXPORT_SYMBOL_GPL (typec_register_plug); + +/** +* typec_unregister_plug - Unregister a USB Type-C Cable Plug +* @plug: The cable plug to be unregistered +* +* Unregister device created with typec_register_plug(). +*/ +void typec_unregister_plug (struct typec_plug *plug) +{ +if (plug) +device_unregister (&plug->dev); +} +EXPORT_SYMBOL_GPL (typec_unregister_plug); + +/* Type-C Cables */ + +static ssize_t +active_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct typec_cable *cable =to_typec_cable (dev); + +return sprintf (buf,"%d\n" , cable->active); +} +static DEVICE_ATTR_RO (active); + +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 plug_type_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct typec_cable *cable =to_typec_cable (dev); + +return sprintf (buf,"%s\n" , typec_plug_types[cable->type]); +} +static DEVICE_ATTR_RO (plug_type); + +static struct attribute *typec_cable_attrs[] = { + &dev_attr_active.attr, + &dev_attr_plug_type.attr, + &dev_attr_usb_power_delivery_revision.attr, +NULL +}; +ATTRIBUTE_GROUPS (typec_cable); + +static void typec_cable_release (struct device *dev) +{ +struct typec_cable *cable =to_typec_cable (dev); + +kfree (cable); +} + +static const struct device_type typec_cable_dev_type = { + .name ="typec_cable_device" , + .groups = typec_cable_groups, + .release = typec_cable_release, +}; + +/** +* typec_register_cable - Register a USB Type-C Cable +* @port: The USB Type-C Port the cable is connected to +* @desc: Description of the cable
drivers/usb/typec/typec.c line 654
Quoted 10 lines
drivers/usb/typec/typec.c new file +10
-0+* +* Registers a device for USB Type-C Cable described in @desc. The cable will be +* parent for the optional cable plug devises. +* +* Returns handle to the cable on success or NULL on failure. +*/ +struct typec_cable *typec_register_cable (struct typec_port *port, +struct typec_cable_desc *desc) +{ +struct typec_cable *cable =NULL ;
No need to initialize cable.
Quoted 26 lines
drivers/usb/typec/typec.c new file +26
-0+int ret; + + cable =kzalloc (sizeof (*cable),GFP_KERNEL ); +if (!cable) +return NULL ; + + cable->type = desc->type; + cable->vdo = desc->vdo; + cable->active = desc->active; + cable->pd_revision = desc->pd_revision; + + cable->dev.class = typec_class; + cable->dev.parent = &port->dev; + cable->dev.type = &typec_cable_dev_type; +dev_set_name (&cable->dev,"%s-cable" ,dev_name (&port->dev)); + + ret =device_register (&cable->dev); +if (ret) { +dev_err (&port->dev,"failed to register cable (%d)\n" , ret); +put_device (&cable->dev); +kfree (cable); +return NULL ; + } + +return cable; +}
[snip]
drivers/usb/typec/typec.c line 1086
Quoted 12 lines
drivers/usb/typec/typec.c new file +12
-0+/** +* typec_port_register_altmode - Register USB Type-C Port Alternate Mode +* @port: USB Type-C Port that supports the alternate mode +* @desc: Description of the alternate mode +* +* This routine is used to register an alternate mode that @port is capable of +* supporting. +* +* Returns handle to the alternate mode on success or NULL on failure. +*/ +struct typec_altmode +*typec_port_register_altmode(struct typec_port *port,
Again star.
Quoted 192 lines
drivers/usb/typec/typec.c new file +104
-0+ struct typec_altmode_desc *desc) +{ +return typec_register_altmode (&port->dev, desc); +} +EXPORT_SYMBOL_GPL (typec_port_register_altmode); + +/** +* typec_register_port - Register a USB Type-C Port +* @parent: Parent device +* @cap: Description of the port +* +* Registers a device for USB Type-C Port described in @cap. +* +* Returns handle to the port on success or NULL on failure. +*/ +struct typec_port *typec_register_port (struct device *parent, +const struct typec_capability *cap) +{ +struct typec_port *port; +enum typec_role role; +int ret; +int id; + + port =kzalloc (sizeof (*port),GFP_KERNEL ); +if (!port) +return NULL ; + + id =ida_simple_get (&typec_index_ida,0 ,0 ,GFP_KERNEL ); +if (id <0 ) { +kfree (port); +return NULL ; + } + +if (cap->type ==TYPEC_PORT_DFP ) + role =TYPEC_SOURCE ; +else if (cap->type ==TYPEC_PORT_UFP ) + role =TYPEC_SINK ; +else + role = cap->prefer_role; + +if (role ==TYPEC_SOURCE ) { + port->data_role =TYPEC_HOST ; + port->pwr_role =TYPEC_SOURCE ; + port->vconn_role =TYPEC_SOURCE ; + }else { + port->data_role =TYPEC_DEVICE ; + port->pwr_role =TYPEC_SINK ; + port->vconn_role =TYPEC_SINK ; + } + + port->id = id; + port->cap = cap; + port->prefer_role = cap->prefer_role; + + port->dev.type = &typec_port_dev_type; + port->dev.class = typec_class; + port->dev.parent = parent; +dev_set_name (&port->dev,"port%d" , id); + + ret =device_register (&port->dev); +if (ret) { +dev_err (parent,"failed to register port (%d)\n" , ret); +ida_simple_remove (&typec_index_ida, id); +put_device (&port->dev); +kfree (port); +return NULL ; + } + +return port; +} +EXPORT_SYMBOL_GPL (typec_register_port); + +/** +* typec_unregister_port - Unregister a USB Type-C Port +* @port: The port to be unregistered +* +* Unregister device created with typec_register_port(). +*/ +void typec_unregister_port (struct typec_port *port) +{ +if (port) +device_unregister (&port->dev); +} +EXPORT_SYMBOL_GPL (typec_unregister_port); + +static int __init typec_init (void ) +{ + typec_class =class_create (THIS_MODULE ,"typec" ); +if (IS_ERR (typec_class)) +return PTR_ERR (typec_class); +return 0 ; +} +subsys_initcall (typec_init); + +static void __exit typec_exit(void) +{ +class_destroy (typec_class); +ida_destroy (&typec_index_ida); +} +module_exit (typec_exit); + +MODULE_AUTHOR ("Heikki Krogerus <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("USB Type-C Connector Class" );include/linux/usb/typec.h new file +82
-0@@ -0,0 +1,212 @@ + +#ifndef __LINUX_USB_TYPEC_H +#define __LINUX_USB_TYPEC_H + +#include <linux/types.h> + +/* USB Type-C Specification releases */ +#define USB_TYPEC_REV_1_0 0x100/* 1.0 */ +#define USB_TYPEC_REV_1_1 0x110/* 1.1 */ +#define USB_TYPEC_REV_1_2 0x120/* 1.2 */ + +struct typec_altmode ; +struct typec_partner ; +struct typec_cable ; +struct typec_plug ; +struct typec_port ; + +enum typec_port_type { +TYPEC_PORT_DFP , +TYPEC_PORT_UFP , +TYPEC_PORT_DRP , +}; + +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_1_5A , +TYPEC_PWR_MODE_3_0A , +TYPEC_PWR_MODE_PD , +}; + +enum typec_accessory { +TYPEC_ACCESSORY_NONE , +TYPEC_ACCESSORY_AUDIO , +TYPEC_ACCESSORY_DEBUG , +}; + +/* +* struct typec_mode_desc - Individual Mode of an Alternate Mode +* @index: Index of the Mode within the SVID +* @vdo: VDO returned by Discover Modes USB PD command +* @desc: Optional human readable description of the mode +* @roles: Only for ports. DRP if the mode is available in both roles +* +* Description of 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 has the mode being entered or not. +*/ +struct typec_mode_desc { +int index; +u32 vdo; +char *desc; +/* Only used with ports */ +enum typec_port_type roles; +}; + +/* +* struct typec_altmode_desc - USB Type-C Alternate Mode Descriptor +* @svid: Standard or Vendor ID +* @n_modes: Number of modes +* @modes: Array of modes supported by the Alternate Mode +* +* 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
include/linux/usb/typec.h line 92
Quoted 10 lines
include/linux/usb/typec.h new file +10
-0+* a connector, partner of a cable plug. +*/ +struct typec_altmode_desc { +u16 svid; +int n_modes; +struct typec_mode_desc *modes; +}; + +struct typec_altmode +*typec_partner_register_altmode(struct typec_partner *partner,
Again star.
include/linux/usb/typec.h line 95
Quoted 3 lines
include/linux/usb/typec.h new file +3
-0+ struct typec_altmode_desc *desc); +struct typec_altmode +*typec_plug_register_altmode(struct typec_plug *plug,
ditto.
include/linux/usb/typec.h line 98
Quoted 3 lines
include/linux/usb/typec.h new file +3
-0+ struct typec_altmode_desc *desc); +struct typec_altmode +*typec_port_register_altmode(struct typec_port *port,
ditto.
Greg KH
maintainerRe: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 8 lines · Mika Westerberg
Quoted 8 lines
drivers/usb/typec/typec.c new file +8
-0+ + ret =device_register (&alt->dev); +if (ret) { +int i; + +dev_err (parent,"failed to register alternate mode (%d)\n" , + ret); +
Quoted 8 lines
drivers/usb/typec/typec.c line 371
Quoted 5 lines
drivers/usb/typec/typec.c new file +5
-0+put_device (&alt->dev); + +for (i =0 ; i < alt->n_modes; i++) +kfree (alt->modes[i].desc); +kfree (alt);Just checking: ->release() is not called when
device_register()fails and that's why you release memory here?
If so, that's wrong. Please see the very good documentation for device_register in the kernel itself, which says:
* NOTE: _Never_ directly free @dev after calling this function, even
* if it returned an error! Always use put_device() to give up the
* reference initialized in this function instead.
Please read the rest of the documentation there as well, it should answer all of these types of questions...
Sometimes I wonder why I even wrote that stuff if no one ever reads it...
Heikki, did you get others at Intel to review this? I don't see their
signed-off-by: on the patches. Please use the internal Intel kernel developer mailing list for this type of thing, I thought I said I was going to require that before I would accept these patches after the last round of review I did.
I'm not going to look at these until you do that, sorry. You have access to good resources, please use them and don't abuse the community reviewers for basic things like this.
thanks,
greg k-h
Heikki Krogerus
maintainerRe: [PATCHv14 2/3] usb: USB Type-C connector class
In reply to Mika WesterbergHi guys,
Quoted 25 lines · Mika Westerberg
drivers/usb/typec/typec.c line 272
Quoted 11 lines
drivers/usb/typec/typec.c new file +11
-0+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); +ssize_t ret; + +switch (mode->roles) { +case TYPEC_PORT_DFP : + ret =sprintf (buf,"source\n" );Extra space after '='.
drivers/usb/typec/typec.c line 279
Quoted 7 lines
drivers/usb/typec/typec.c new file +7
-0+break ; +case TYPEC_PORT_UFP : + ret =sprintf (buf,"sink\n" ); +break ; +case TYPEC_PORT_DRP : +default : + ret =sprintf (buf,"source\nsink\n" );I wonder if "source sink" instead is better? Along the lines of
/sys/power/state.
Quoted 1 line
Then you can print "[source] sink" when source is selected and so on.
That is more or less how I originally proposed how we list the roles in general. I introduced the separate "current_*_role" and "supported_*_roles" attribute files because somebody wanted them. I don't remember the reason why they were preferred to be in separate attribute files.
Oliver! Guenter! Do we really need to list the current and supported roles in separate attribute files? Can't we just have the "power_role" and "data_role" attribute files for the ports instead of the separate "supported_*_roles" and "current_*_role", and show the current role like Mika proposes? I definitely would prefer it that way because it is similar style used in other places like Mike pointed out.
And since we are talking about the ABI, can we also change the listing of the accessory mode back to just "audio" and "debug" like I originally had it? I don't remember who and why wanted it to be changed to "Audio Adapter Accessory Mode" and "Debug Accessory Mode", but it differs from the style we list the other details.
Thanks,
Signature · 1 line
heikki
Re: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 36 lines · Heikki Krogerus
Hi guys,
Quoted 25 lines · Mika Westerberg
drivers/usb/typec/typec.c line 272
Quoted 11 lines
drivers/usb/typec/typec.c new file +11
-0+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); +ssize_t ret; + +switch (mode->roles) { +case TYPEC_PORT_DFP : + ret =sprintf (buf,"source\n" );Extra space after '='.
drivers/usb/typec/typec.c line 279
Quoted 7 lines
drivers/usb/typec/typec.c new file +7
-0+break ; +case TYPEC_PORT_UFP : + ret =sprintf (buf,"sink\n" ); +break ; +case TYPEC_PORT_DRP : +default : + ret =sprintf (buf,"source\nsink\n" );I wonder if "source sink" instead is better? Along the lines of
/sys/power/state.Quoted 1 line
Then you can print "[source] sink" when source is selected and so on.
That is more or less how I originally proposed how we list the roles in general. I introduced the separate "current_*_role" and "supported_*_roles" attribute files because somebody wanted them. I don't remember the reason why they were preferred to be in separate attribute files.
Quoted 7 lines
Oliver! Guenter! Do we really need to list the current and supported roles in separate attribute files? Can't we just have the "
power_role" and "data_role" attribute files for the ports instead of the separate "supported_*_roles" and "current_*_role", and show the current role like Mika proposes? I definitely would prefer it that way because it is similar style used in other places like Mike pointed out.
Consistency with other drivers/attribute should be preferrable, but either way is ok with me.
Quoted 6 lines
And since we are talking about the ABI, can we also change the listing of the accessory mode back to just "audio" and "debug" like I originally had it? I don't remember who and why wanted it to be changed to "Audio Adapter Accessory Mode" and "Debug Accessory Mode", but it differs from the style we list the other details.
I prefer computer readable attributes over human readable, so the change is fine with me.
Guenter
Re: [PATCHv14 2/3] usb: USB Type-C connector class
In reply to Heikki KrogerusQuoted 7 lines · Heikki Krogerus
Hi guys,
Quoted 3 lines · Mika Westerberg
I wonder if "source sink" instead is better? Along the lines of
/sys/power/state.
Quoted 7 lines
Quoted 1 line
Then you can print "[source] sink" when source is selected and so on.
That is more or less how I originally proposed how we list the roles in general. I introduced the separate "current_*_role" and "supported_*_roles" attribute files because somebody wanted them. I don't remember the reason why they were preferred to be in separate attribute files.
Neither do I.
Quoted 7 lines
Oliver! Guenter! Do we really need to list the current and supported roles in separate attribute files? Can't we just have the "
power_role" and "data_role" attribute files for the ports instead of the separate "supported_*_roles" and "current_*_role", and show the current role like Mika proposes? I definitely would prefer it that way because it is similar style used in other places like Mike pointed out.
Either way would serve.
Quoted 5 lines
And since we are talking about the ABI, can we also change the listing of the accessory mode back to just "audio" and "debug" like I originally had it? I don't remember who and why wanted it to be changed to "Audio Adapter Accessory Mode" and "Debug Accessory Mode", but it differs from the style we list the other details.
Yes, but can we differentiate analog and digital audio?
Regards
Oliver
Heikki Krogerus
maintainerRe: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 7 lines · Oliver Neukum
Quoted 5 lines
And since we are talking about the ABI, can we also change the listing of the accessory mode back to just "audio" and "debug" like I originally had it? I don't remember who and why wanted it to be changed to "Audio Adapter Accessory Mode" and "Debug Accessory Mode", but it differs from the style we list the other details.
Yes, but can we differentiate analog and digital audio?
I guess we need to have values "analog_audio" and "digital_audio" instead of just "audio". Is that OK?
Thanks,
Signature · 1 line
heikki
Re: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 11 lines · Heikki Krogerus
Quoted 7 lines · Oliver Neukum
Quoted 5 lines
And since we are talking about the ABI, can we also change the listing of the accessory mode back to just "audio" and "debug" like I originally had it? I don't remember who and why wanted it to be changed to "Audio Adapter Accessory Mode" and "Debug Accessory Mode", but it differs from the style we list the other details.
Yes, but can we differentiate analog and digital audio?
I guess we need to have values "
analog_audio" and "digital_audio" instead of just "audio". Is that OK?
Perfect.
Regards
Oliver
Re: [PATCHv14 2/3] usb: USB Type-C connector class
In reply to Heikki KrogerusHello Heikki,
Quoted 9 lines · Heikki Krogerus
The purpose of USB Type-C connector class is to provide unified interface for the user space to get the status and basic information about USB Type-C connectors on a system, control over data role swapping, and when the port supports USB Power Delivery, also control over power role swapping and Alternate Modes.
Signed-off-by Heikki Krogerus <[email protected]>---
[ ... ]
drivers/usb/typec/typec.c line 460
Quoted 13 lines
drivers/usb/typec/typec.c new file +13
-0+ +/** +* typec_register_partner - Register a USB Type-C Partner +* @port: The USB Type-C Port the partner is connected to +* @desc: Description of the partner +* +* Registers a device for USB Type-C Partner described in @desc. +* +* Returns handle to the partner on success or NULL on failure. +*/ +struct typec_partner *typec_register_partner (struct typec_port *port, +struct typec_partner_desc *desc) +{
With the changes to hide the actual partner structure, this looks at first glance like a minor API change, but it is substantial.
Reason is that the vdo as required by typec_partner_desc is provided by a VDM command reply, which is completely orthogonal to the PD registration process. So far I was able to set the vdo later, after registering the connection, and after (and if) the vdo was received.
Since the partner may not even respond to the DISCOVER_IDENT message, or not support PD at all, this means that I would have to disconnect partner registration from the PD protocol itself and tie it to the VDO message exchange, with appropriate timeouts to register anyway even if the identity was not received after some period of time or if the partner does not support PD.
This in turn means that I'll have to re-implement and possibly re-architect a substantial amount of code.
What is the reason for this change ? If I spend that time, I would like to understand why it is necessary (compared to setting/updating the vdo if/when it is available).
Thanks,
Guenter
Heikki Krogerus
maintainerRe: [PATCHv14 2/3] usb: USB Type-C connector class
Hi Guenter,
Quoted 16 lines · Guenter Roeck
drivers/usb/typec/typec.c line 460
Quoted 12 lines
drivers/usb/typec/typec.c new file +12
-0+/** +* typec_register_partner - Register a USB Type-C Partner +* @port: The USB Type-C Port the partner is connected to +* @desc: Description of the partner +* +* Registers a device for USB Type-C Partner described in @desc. +* +* Returns handle to the partner on success or NULL on failure. +*/ +struct typec_partner *typec_register_partner (struct typec_port *port, +struct typec_partner_desc *desc) +{With the changes to hide the actual partner structure, this looks at first glance like a minor API change, but it is substantial.
Quoted 4 lines
Reason is that the vdo as required by
typec_partner_descis provided by a VDM command reply, which is completely orthogonal to the PD registration process. So far I was able to set the vdo later, after registering the connection, and after (and if) the vdo was received.
If the identity vdo value is updated after the creation of the device, then the user space needs to be notified separately.
Quoted 9 lines
Since the partner may not even respond to the
DISCOVER_IDENTmessage, or not support PD at all, this means that I would have to disconnect partner registration from the PD protocol itself and tie it to the VDO message exchange, with appropriate timeouts to register anyway even if the identity was not received after some period of time or if the partner does not support PD.This in turn means that I'll have to re-implement and possibly re-architect a substantial amount of code.
We don't need to protect the structures like this, we can change this back. But how about we introduce driver callback function for updating the value instead, which would also notify the uses space?
Thanks,
Signature · 1 line
heikki
Re: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 34 lines · Heikki Krogerus
Hi Guenter,
Quoted 16 lines · Guenter Roeck
drivers/usb/typec/typec.c line 460
Quoted 12 lines
drivers/usb/typec/typec.c new file +12
-0+/** +* typec_register_partner - Register a USB Type-C Partner +* @port: The USB Type-C Port the partner is connected to +* @desc: Description of the partner +* +* Registers a device for USB Type-C Partner described in @desc. +* +* Returns handle to the partner on success or NULL on failure. +*/ +struct typec_partner *typec_register_partner (struct typec_port *port, +struct typec_partner_desc *desc) +{With the changes to hide the actual partner structure, this looks at first glance like a minor API change, but it is substantial.
Quoted 4 lines
Reason is that the vdo as required by
typec_partner_descis provided by a VDM command reply, which is completely orthogonal to the PD registration process. So far I was able to set the vdo later, after registering the connection, and after (and if) the vdo was received.If the identity vdo value is updated after the creation of the device, then the user space needs to be notified separately.
Quoted 7 lines
Since the partner may not even respond to the
DISCOVER_IDENTmessage, or not support PD at all, this means that I would have to disconnect partner registration from the PD protocol itself and tie it to the VDO message exchange, with appropriate timeouts to register anyway even if the identity was not received after some period of time or if the partner does not support PD.
Quoted 7 lines
Quoted 2 lines
This in turn means that I'll have to re-implement and possibly re-architect a substantial amount of code.
We don't need to protect the structures like this, we can change this back. But how about we introduce driver callback function for updating the value instead, which would also notify the uses space?
That would work.
Thanks,
Guenter
Heikki Krogerus
maintainerRe: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 38 lines · Guenter Roeck
Quoted 37 lines · Heikki Krogerus
Hi Guenter,
Quoted 16 lines · Guenter Roeck
drivers/usb/typec/typec.c line 460
Quoted 12 lines
drivers/usb/typec/typec.c new file +12
-0+/** +* typec_register_partner - Register a USB Type-C Partner +* @port: The USB Type-C Port the partner is connected to +* @desc: Description of the partner +* +* Registers a device for USB Type-C Partner described in @desc. +* +* Returns handle to the partner on success or NULL on failure. +*/ +struct typec_partner *typec_register_partner (struct typec_port *port, +struct typec_partner_desc *desc) +{With the changes to hide the actual partner structure, this looks at first glance like a minor API change, but it is substantial.
Quoted 4 lines
Reason is that the vdo as required by
typec_partner_descis provided by a VDM command reply, which is completely orthogonal to the PD registration process. So far I was able to set the vdo later, after registering the connection, and after (and if) the vdo was received.If the identity vdo value is updated after the creation of the device, then the user space needs to be notified separately.
Quoted 9 lines
Since the partner may not even respond to the
DISCOVER_IDENTmessage, or not support PD at all, this means that I would have to disconnect partner registration from the PD protocol itself and tie it to the VDO message exchange, with appropriate timeouts to register anyway even if the identity was not received after some period of time or if the partner does not support PD.This in turn means that I'll have to re-implement and possibly re-architect a substantial amount of code.
Quoted 6 lines
Quoted 4 lines
We don't need to protect the structures like this, we can change this back. But how about we introduce driver callback function for updating the value instead, which would also notify the uses space?
That would work.
OK, cool.
I guess we might as well then split the VDO into header, cert stat and product parts. What do you think?
If it's OK, then should we change that file to "identity" and dump the whole response from Discover Identity command in hex (minus VDM Header), separate the parts in the output, or simply provide separate attribute files for each part?
Just as a reminder, the user space can't rely on that attribute file. We still can't get any of that information from UCSI or for example the Thunderbolt controllers, which is annoying, but I guess it does not matter.
An other question:
I would like to hide the attribute file(s) when the partner does not support USB Power Delivery. Is it OK with you guys?
Thanks,
Signature · 1 line
heikki
Re: [PATCHv14 2/3] usb: USB Type-C connector class
Quoted 48 lines · Heikki Krogerus
Quoted 38 lines · Guenter Roeck
Quoted 37 lines · Heikki Krogerus
Hi Guenter,
Quoted 16 lines · Guenter Roeck
drivers/usb/typec/typec.c line 460
Quoted 12 lines
drivers/usb/typec/typec.c new file +12
-0+/** +* typec_register_partner - Register a USB Type-C Partner +* @port: The USB Type-C Port the partner is connected to +* @desc: Description of the partner +* +* Registers a device for USB Type-C Partner described in @desc. +* +* Returns handle to the partner on success or NULL on failure. +*/ +struct typec_partner *typec_register_partner (struct typec_port *port, +struct typec_partner_desc *desc) +{With the changes to hide the actual partner structure, this looks at first glance like a minor API change, but it is substantial.
Quoted 4 lines
Reason is that the vdo as required by
typec_partner_descis provided by a VDM command reply, which is completely orthogonal to the PD registration process. So far I was able to set the vdo later, after registering the connection, and after (and if) the vdo was received.If the identity vdo value is updated after the creation of the device, then the user space needs to be notified separately.
Quoted 9 lines
Since the partner may not even respond to the
DISCOVER_IDENTmessage, or not support PD at all, this means that I would have to disconnect partner registration from the PD protocol itself and tie it to the VDO message exchange, with appropriate timeouts to register anyway even if the identity was not received after some period of time or if the partner does not support PD.This in turn means that I'll have to re-implement and possibly re-architect a substantial amount of code.
Quoted 6 lines
Quoted 4 lines
We don't need to protect the structures like this, we can change this back. But how about we introduce driver callback function for updating the value instead, which would also notify the uses space?
That would work.
OK, cool.
Quoted 8 lines
I guess we might as well then split the VDO into header, cert stat and product parts. What do you think?
If it's OK, then should we change that file to "identity" and dump the whole response from Discover Identity command in hex (minus VDM Header), separate the parts in the output, or simply provide separate attribute files for each part?
Makes me wonder what you expect in the vdo attribute today. Right now I copy the value from the identity header into it.
Personally I would prefer separate attributes. identity, cert_stat, product, maybe ?
Quoted 9 lines
Just as a reminder, the user space can't rely on that attribute file. We still can't get any of that information from UCSI or for example the Thunderbolt controllers, which is annoying, but I guess it does not matter.
An other question:
I would like to hide the attribute file(s) when the partner does not support USB Power Delivery. Is it OK with you guys?
Ok with me.
Thanks,
Guenter
Heikki Krogerus
maintainerRe: [PATCHv14 2/3] usb: USB Type-C connector class
Hi Guenter,
Quoted 8 lines · Guenter Roeck
Quoted 8 lines
I guess we might as well then split the VDO into header, cert stat and product parts. What do you think?
If it's OK, then should we change that file to "identity" and dump the whole response from Discover Identity command in hex (minus VDM Header), separate the parts in the output, or simply provide separate attribute files for each part?
Quoted 5 lines
Makes me wonder what you expect in the vdo attribute today. Right now I copy the value from the identity header into it.
Personally I would prefer separate attributes. identity,
cert_stat, product, maybe ?
OK.
I'm sorry for bringing this up so late, but I'm still a bit concerned about having those attributes because we can't provide a value for them in every system even when USB power delivery is supported. This will be the case with at least with UCSI systems.
So what I'll do is, I'll group them into separate directory that will not be visible unless those values can actually be made available. We will have "supports_usb_power_delivery" attribute out side that directory.
We can name that directory "identity" or we can call it for example "usb_power_delivery" and have something else usb pd specific in it as well if you like, like attribute for capability. Let me know what you think.
I proposed putting the usb pd details into separate directory already at one point, but not everybody liked the idea if I remember correctly. I don't think there were any real arguments against it, so this time I'll add the group unless you disagree.
Thanks,
Signature · 1 line
heikki
Heikki Krogerus
maintainerPATCH v14 3/3 usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY
In reply to Heikki KrogerusThis adds driver for the USB Type-C PHY on Intel WhiskeyCove PMIC which is available on some of the Intel Broxton SoC based platforms.
--- drivers/usb/typec/Kconfig | 14 ++ drivers/usb/typec/Makefile | 1 + drivers/usb/typec/typec_wcove.c | 377 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 392 insertions(+) create mode 100644 drivers/usb/typec/typec_wcove.c
drivers/usb/typec/Kconfig +14 -0
@@ -4,4 +4,18 @@ menu "USB Power Delivery and Type-C drivers" config TYPEC tristate +config TYPEC_WCOVE + tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver" + depends on ACPI + depends on INTEL_SOC_PMIC + depends on INTEL_PMC_IPC + select TYPEC + help + This driver adds support for USB Type-C detection on Intel Broxton + platforms that have Intel Whiskey Cove PMIC. The driver can detect the + role and cable orientation. + + To compile this driver as module, choose M here: the module will be + called typec_wcove + endmenu
drivers/usb/typec/Makefile +1 -0
@@ -1 +1,2 @@ obj-$(CONFIG_TYPEC) += typec.o +obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o
drivers/usb/typec/typec_wcove.c new file +377 -0
377 lines not on this page · raw message
Signature · 1 line
2.11.0