Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751981AbdIJW4W (ORCPT ); Sun, 10 Sep 2017 18:56:22 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:38134 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951AbdIJW4U (ORCPT ); Sun, 10 Sep 2017 18:56:20 -0400 X-Google-Smtp-Source: ADKCNb6p5z1GY7XJQXzZcHd6u5MWfEmC/CnQ0c44jrkb3PIgqELn1WQv9AqQTYiKDeU6b2FLAH4/Kg== Subject: Re: [PATCH v2 08/11] staging: typec: tcpm: Set mux to device mode when configured as such To: Hans de Goede , MyungJoo Ham , Chanwoo Choi , Heikki Krogerus , Darren Hart , Andy Shevchenko , Peter Rosin , Mathias Nyman Cc: linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, devel@driverdev.osuosl.org, Kuppuswamy Sathyanarayanan , Sathyanarayanan Kuppuswamy Natarajan , Greg Kroah-Hartman , linux-usb@vger.kernel.org References: <20170905164221.11266-1-hdegoede@redhat.com> <20170905164221.11266-9-hdegoede@redhat.com> From: Guenter Roeck Message-ID: Date: Sun, 10 Sep 2017 15:56:16 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170905164221.11266-9-hdegoede@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3640 Lines: 94 On 09/05/2017 09:42 AM, Hans de Goede wrote: > Setting the mux to TYPEC_MUX_NONE, TCPC_USB_SWITCH_DISCONNECT when the > data-role is device is not correct. Plenty of devices support operating > as USB device through a (separate) USB device controller. > > So this commit instead splits out TYPEC_MUX_USB into TYPEC_MUX_USB_HOST > and TYPEC_MUX_USB_DEVICE and makes tcpm_set_roles() set the mux > accordingly. > > Likewise TCPC_MUX_DP gets renamed to TCPC_MUX_DP_SRC to make clear that > this is for configuring the Type-C port as a Display Port source, not a > sink. > > Last this commit makes tcpm_reset_port() to set the mux to > TYPEC_MUX_NONE, TCPC_USB_SWITCH_DISCONNECT so that it does not and up > staying in host (and with this commit also device) mode after a detach. > This sentence is hard to understand. > Signed-off-by: Hans de Goede Otherwise Reviewed-by: Guenter Roeck > --- > drivers/staging/typec/tcpm.c | 7 ++++--- > drivers/staging/typec/tcpm.h | 22 ++++++++++++++-------- > 2 files changed, 18 insertions(+), 11 deletions(-) > > diff --git a/drivers/staging/typec/tcpm.c b/drivers/staging/typec/tcpm.c > index 8af62e74d54c..ffe7e26d4ed3 100644 > --- a/drivers/staging/typec/tcpm.c > +++ b/drivers/staging/typec/tcpm.c > @@ -752,11 +752,11 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached, > int ret; > > if (data == TYPEC_HOST) > - ret = tcpm_mux_set(port, TYPEC_MUX_USB, > + ret = tcpm_mux_set(port, TYPEC_MUX_USB_HOST, > TCPC_USB_SWITCH_CONNECT); > else > - ret = tcpm_mux_set(port, TYPEC_MUX_NONE, > - TCPC_USB_SWITCH_DISCONNECT); > + ret = tcpm_mux_set(port, TYPEC_MUX_USB_DEVICE, > + TCPC_USB_SWITCH_CONNECT); > if (ret < 0) > return ret; > > @@ -2025,6 +2025,7 @@ static void tcpm_reset_port(struct tcpm_port *port) > tcpm_init_vconn(port); > tcpm_set_current_limit(port, 0, 0); > tcpm_set_polarity(port, TYPEC_POLARITY_CC1); > + tcpm_mux_set(port, TYPEC_MUX_NONE, TCPC_USB_SWITCH_DISCONNECT); > tcpm_set_attached_state(port, false); > port->try_src_count = 0; > port->try_snk_count = 0; > diff --git a/drivers/staging/typec/tcpm.h b/drivers/staging/typec/tcpm.h > index 7e9a6b7b5cd6..f662eed48c86 100644 > --- a/drivers/staging/typec/tcpm.h > +++ b/drivers/staging/typec/tcpm.h > @@ -83,17 +83,23 @@ enum tcpc_usb_switch { > }; > > /* Mux state attributes */ > -#define TCPC_MUX_USB_ENABLED BIT(0) /* USB enabled */ > -#define TCPC_MUX_DP_ENABLED BIT(1) /* DP enabled */ > -#define TCPC_MUX_POLARITY_INVERTED BIT(2) /* Polarity inverted */ > +#define TCPC_MUX_USB_DEVICE_ENABLED BIT(0) /* USB device enabled */ > +#define TCPC_MUX_USB_HOST_ENABLED BIT(1) /* USB host enabled */ > +#define TCPC_MUX_DP_SRC_ENABLED BIT(2) /* DP enabled */ > +#define TCPC_MUX_POLARITY_INVERTED BIT(3) /* Polarity inverted */ > > /* Mux modes, decoded to attributes */ > enum tcpc_mux_mode { > - TYPEC_MUX_NONE = 0, /* Open switch */ > - TYPEC_MUX_USB = TCPC_MUX_USB_ENABLED, /* USB only */ > - TYPEC_MUX_DP = TCPC_MUX_DP_ENABLED, /* DP only */ > - TYPEC_MUX_DOCK = TCPC_MUX_USB_ENABLED | /* Both USB and DP */ > - TCPC_MUX_DP_ENABLED, > + /* Open switch */ > + TYPEC_MUX_NONE = 0, > + /* USB device only */ > + TYPEC_MUX_USB_DEVICE = TCPC_MUX_USB_DEVICE_ENABLED, > + /* USB host only */ > + TYPEC_MUX_USB_HOST = TCPC_MUX_USB_HOST_ENABLED, > + /* DP source only */ > + TYPEC_MUX_DP = TCPC_MUX_DP_SRC_ENABLED, > + /* Both USB host and DP source */ > + TYPEC_MUX_DOCK = TCPC_MUX_USB_HOST_ENABLED | TCPC_MUX_DP_SRC_ENABLED, > }; > > struct tcpc_mux_dev { >