From: Azhar Shaikh <azhar.shaikh@intel.com>
To: bleung@chromium.org, enric.balletbo@collabora.com,
groeck@chromium.org, pmalani@chromium.org,
linux-kernel@vger.kernel.org
Cc: heikki.krogerus@linux.intel.com, azhar.shaikh@intel.com,
utkarsh.h.patel@intel.com, casey.g.bowman@intel.com,
rajmohan.mani@intel.com
Subject: [PATCH] platform/chrome: cros_ec_typec: Avoid setting usb role twice during disconnect
Date: Thu, 30 Jul 2020 15:52:57 -0700 [thread overview]
Message-ID: <20200730225257.7208-3-azhar.shaikh@intel.com> (raw)
In-Reply-To: <20200730225257.7208-1-azhar.shaikh@intel.com>
On disconnect port partner is removed and usb role is set to NONE.
But then in cros_typec_port_update() the role is set again.
Avoid this by moving usb_role_switch_set_role() to
cros_typec_configure_mux().
Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
Suggested-by: Prashant Malani <pmalani@chromium.org>
---
drivers/platform/chrome/cros_ec_typec.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index eb4713b7ae14..df97431b2275 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -515,6 +515,12 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
if (ret)
return ret;
+ ret = usb_role_switch_set_role(typec->ports[port_num]->role_sw,
+ pd_ctrl->role & PD_CTRL_RESP_ROLE_DATA
+ ? USB_ROLE_HOST : USB_ROLE_DEVICE);
+ if (ret)
+ return ret;
+
if (mux_flags & USB_PD_MUX_TBT_COMPAT_ENABLED) {
ret = cros_typec_enable_tbt(typec, port_num, pd_ctrl);
} else if (mux_flags & USB_PD_MUX_DP_ENABLED) {
@@ -589,9 +595,7 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
if (ret)
dev_warn(typec->dev, "Configure muxes failed, err = %d\n", ret);
- return usb_role_switch_set_role(typec->ports[port_num]->role_sw,
- resp.role & PD_CTRL_RESP_ROLE_DATA
- ? USB_ROLE_HOST : USB_ROLE_DEVICE);
+ return ret;
}
static int cros_typec_get_cmd_version(struct cros_typec_data *typec)
--
2.17.1
next prev parent reply other threads:[~2020-07-30 22:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 22:52 [PATCH v2 0/2] TypeC Connector Class driver improvements Azhar Shaikh
2020-07-30 22:52 ` [PATCH v2 1/2] platform/chrome: cros_ec_typec: Send enum values to usb_role_switch_set_role() Azhar Shaikh
2020-07-31 13:33 ` Heikki Krogerus
2020-07-30 22:52 ` Azhar Shaikh [this message]
2020-07-31 13:36 ` [PATCH] platform/chrome: cros_ec_typec: Avoid setting usb role twice during disconnect Heikki Krogerus
2020-08-03 15:57 ` Shaikh, Azhar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730225257.7208-3-azhar.shaikh@intel.com \
--to=azhar.shaikh@intel.com \
--cc=bleung@chromium.org \
--cc=casey.g.bowman@intel.com \
--cc=enric.balletbo@collabora.com \
--cc=groeck@chromium.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pmalani@chromium.org \
--cc=rajmohan.mani@intel.com \
--cc=utkarsh.h.patel@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox