On Sat, Aug 26, 2017 at 10:23:24PM -0700, Badhri Jagan Sridharan wrote:
> The port type callback call enquires the tcpc_dev if
> the requested port type is supported. If supported, then
> performs a tcpm reset if required after setting the tcpm
> internal port_type variable.
>
> Check against the tcpm port_type instead of checking
> against caps.type as port_type reflects the current
> configuration.
>
> Signed-off-by: Badhri Jagan Sridharan <bad...@google.com>
Reviewed-by: Guenter Roeck <li...@roeck-us.net>
> ---
> drivers/staging/typec/tcpm.c | 52
> ++++++++++++++++++++++++++++++++++----------
> 1 file changed, 41 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/typec/tcpm.c b/drivers/staging/typec/tcpm.c
> index a911cad41a59..6c045ac9c42a 100644
> --- a/drivers/staging/typec/tcpm.c
> +++ b/drivers/staging/typec/tcpm.c
> @@ -197,6 +197,7 @@ struct tcpm_port {
>
> bool attached;
> bool connected;
> + enum typec_port_type port_type;
> bool vbus_present;
> bool vbus_never_low;
> bool vbus_source;
> @@ -334,7 +335,7 @@ struct pd_rx_event {
>
> static enum tcpm_state tcpm_default_state(struct tcpm_port *port)
> {
> - if (port->typec_caps.type == TYPEC_PORT_DRP) {
> + if (port->port_type == TYPEC_PORT_DRP) {
> if (port->try_role == TYPEC_SINK)
> return SNK_UNATTACHED;
> else if (port->try_role == TYPEC_SOURCE)
> @@ -342,7 +343,7 @@ static enum tcpm_state tcpm_default_state(struct
> tcpm_port *port)
> else if (port->tcpc->config->default_role == TYPEC_SINK)
> return SNK_UNATTACHED;
> /* Fall through to return SRC_UNATTACHED */
> - } else if (port->typec_caps.type == TYPEC_PORT_UFP) {
> + } else if (port->port_type == TYPEC_PORT_UFP) {
> return SNK_UNATTACHED;
> }
> return SRC_UNATTACHED;
> @@ -1458,7 +1459,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port,
> tcpm_set_state(port, SOFT_RESET, 0);
> break;
> case PD_CTRL_DR_SWAP:
> - if (port->typec_caps.type != TYPEC_PORT_DRP) {
> + if (port->port_type != TYPEC_PORT_DRP) {
> tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
> break;
> }
> @@ -1478,7 +1479,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port,
> }
> break;
> case PD_CTRL_PR_SWAP:
> - if (port->typec_caps.type != TYPEC_PORT_DRP) {
> + if (port->port_type != TYPEC_PORT_DRP) {
> tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
> break;
> }
> @@ -1853,7 +1854,7 @@ static bool tcpm_start_drp_toggling(struct tcpm_port
> *port)
> int ret;
>
> if (port->tcpc->start_drp_toggling &&
> - port->typec_caps.type == TYPEC_PORT_DRP) {
> + port->port_type == TYPEC_PORT_DRP) {
> tcpm_log_force(port, "Start DRP toggling");
> ret = port->tcpc->start_drp_toggling(port->tcpc,
> tcpm_rp_cc(port));
> @@ -2163,7 +2164,7 @@ static void run_state_machine(struct tcpm_port *port)
> break;
> }
> tcpm_set_cc(port, tcpm_rp_cc(port));
> - if (port->typec_caps.type == TYPEC_PORT_DRP)
> + if (port->port_type == TYPEC_PORT_DRP)
> tcpm_set_state(port, SNK_UNATTACHED, PD_T_DRP_SNK);
> break;
> case SRC_ATTACH_WAIT:
> @@ -2320,7 +2321,7 @@ static void run_state_machine(struct tcpm_port *port)
> break;
> }
> tcpm_set_cc(port, TYPEC_CC_RD);
> - if (port->typec_caps.type == TYPEC_PORT_DRP)
> + if (port->port_type == TYPEC_PORT_DRP)
> tcpm_set_state(port, SRC_UNATTACHED, PD_T_DRP_SRC);
> break;
> case SNK_ATTACH_WAIT:
> @@ -2411,7 +2412,7 @@ static void run_state_machine(struct tcpm_port *port)
> * see USB power delivery specification, section 8.3.3.6.1.5.1).
> */
> tcpm_set_state(port, hard_reset_state(port),
> - port->typec_caps.type == TYPEC_PORT_DRP ?
> + port->port_type == TYPEC_PORT_DRP ?
> PD_T_DB_DETECT : PD_T_NO_RESPONSE);
> break;
> case SNK_DISCOVERY_DEBOUNCE:
> @@ -3167,7 +3168,7 @@ static int tcpm_dr_set(const struct typec_capability
> *cap,
> mutex_lock(&port->swap_lock);
> mutex_lock(&port->lock);
>
> - if (port->typec_caps.type != TYPEC_PORT_DRP) {
> + if (port->port_type != TYPEC_PORT_DRP) {
> ret = -EINVAL;
> goto port_unlock;
> }
> @@ -3235,7 +3236,7 @@ static int tcpm_pr_set(const struct typec_capability
> *cap,
> mutex_lock(&port->swap_lock);
> mutex_lock(&port->lock);
>
> - if (port->typec_caps.type != TYPEC_PORT_DRP) {
> + if (port->port_type != TYPEC_PORT_DRP) {
> ret = -EINVAL;
> goto port_unlock;
> }
> @@ -3357,6 +3358,34 @@ static void tcpm_init(struct tcpm_port *port)
> tcpm_set_state(port, PORT_RESET, 0);
> }
>
> +static int tcpm_port_type_set(const struct typec_capability *cap,
> + enum typec_port_type type)
> +{
> + struct tcpm_port *port = typec_cap_to_tcpm(cap);
> +
> + mutex_lock(&port->lock);
> + if (type == port->port_type)
> + goto port_unlock;
> +
> + port->port_type = type;
> +
> + if (!port->connected) {
> + tcpm_set_state(port, PORT_RESET, 0);
> + } else if (type == TYPEC_PORT_UFP) {
> + if (!(port->pwr_role == TYPEC_SINK &&
> + port->data_role == TYPEC_DEVICE))
> + tcpm_set_state(port, PORT_RESET, 0);
> + } else if (type == TYPEC_PORT_DFP) {
> + if (!(port->pwr_role == TYPEC_SOURCE &&
> + port->data_role == TYPEC_HOST))
> + tcpm_set_state(port, PORT_RESET, 0);
> + }
> +
> +port_unlock:
> + mutex_unlock(&port->lock);
> + return 0;
> +}
> +
> void tcpm_tcpc_reset(struct tcpm_port *port)
> {
> mutex_lock(&port->lock);
> @@ -3504,9 +3533,10 @@ struct tcpm_port *tcpm_register_port(struct device
> *dev, struct tcpc_dev *tcpc)
> port->typec_caps.pr_set = tcpm_pr_set;
> port->typec_caps.vconn_set = tcpm_vconn_set;
> port->typec_caps.try_role = tcpm_try_role;
> + port->typec_caps.port_type_set = tcpm_port_type_set;
>
> port->partner_desc.identity = &port->partner_ident;
> -
> + port->port_type = tcpc->config->type;
> /*
> * TODO:
> * - alt_modes, set_alt_mode
> --
> 2.14.1.342.g6490525c54-goog
>
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
