From: Prashant Malani <pmalani@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Prashant Malani <pmalani@chromium.org>,
Benson Leung <bleung@chromium.org>,
chrome-platform@lists.linux.dev (open list:CHROMEOS EC USB
TYPE-C DRIVER), Guenter Roeck <groeck@chromium.org>
Subject: [PATCH 2/4] platform/chrome: cros_ec_typec: Get mux state inside configure_mux
Date: Mon, 7 Feb 2022 21:40:26 +0000 [thread overview]
Message-ID: <20220207214026.1526151-3-pmalani@chromium.org> (raw)
In-Reply-To: <20220207214026.1526151-1-pmalani@chromium.org>
Move the function which gets current mux state inside the
cros_typec_configure_mux() function. It is better to group those
bits of functionality together, and it makes it easier to move around
cros_typec_configure_mux() later.
While we are doing this, also inline the cros_typec_get_mux_info() inside
of cros_typec_configure_mux().
Signed-off-by: Prashant Malani <pmalani@chromium.org>
---
drivers/platform/chrome/cros_ec_typec.c | 55 +++++++++++--------------
1 file changed, 23 insertions(+), 32 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 445da4f122e7..671d3569faf6 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -513,27 +513,38 @@ static int cros_typec_enable_usb4(struct cros_typec_data *typec,
}
static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
- uint8_t mux_flags,
struct ec_response_usb_pd_control_v2 *pd_ctrl)
{
struct cros_typec_port *port = typec->ports[port_num];
+ struct ec_response_usb_pd_mux_info mux_resp;
+ struct ec_params_usb_pd_mux_info req = {
+ .port = port_num,
+ };
struct ec_params_usb_pd_mux_ack mux_ack;
enum typec_orientation orientation;
int ret = 0;
+ ret = cros_ec_command(typec->ec, 0, EC_CMD_USB_PD_MUX_INFO,
+ &req, sizeof(req), &mux_resp, sizeof(mux_resp));
+ if (ret < 0) {
+ dev_warn(typec->dev, "Failed to get mux info for port: %d, err = %d\n",
+ port_num, ret);
+ return ret;
+ }
+
/* No change needs to be made, let's exit early. */
- if (port->mux_flags == mux_flags && port->role == pd_ctrl->role)
+ if (port->mux_flags == mux_resp.flags && port->role == pd_ctrl->role)
return 0;
- port->mux_flags = mux_flags;
+ port->mux_flags = mux_resp.flags;
port->role = pd_ctrl->role;
- if (mux_flags == USB_PD_MUX_NONE) {
+ if (port->mux_flags == USB_PD_MUX_NONE) {
ret = cros_typec_usb_disconnect_state(port);
goto mux_ack;
}
- if (mux_flags & USB_PD_MUX_POLARITY_INVERTED)
+ if (port->mux_flags & USB_PD_MUX_POLARITY_INVERTED)
orientation = TYPEC_ORIENTATION_REVERSE;
else
orientation = TYPEC_ORIENTATION_NORMAL;
@@ -548,22 +559,22 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
if (ret)
return ret;
- if (mux_flags & USB_PD_MUX_USB4_ENABLED) {
+ if (port->mux_flags & USB_PD_MUX_USB4_ENABLED) {
ret = cros_typec_enable_usb4(typec, port_num, pd_ctrl);
- } else if (mux_flags & USB_PD_MUX_TBT_COMPAT_ENABLED) {
+ } else if (port->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) {
+ } else if (port->mux_flags & USB_PD_MUX_DP_ENABLED) {
ret = cros_typec_enable_dp(typec, port_num, pd_ctrl);
- } else if (mux_flags & USB_PD_MUX_SAFE_MODE) {
+ } else if (port->mux_flags & USB_PD_MUX_SAFE_MODE) {
ret = cros_typec_usb_safe_state(port);
- } else if (mux_flags & USB_PD_MUX_USB_ENABLED) {
+ } else if (port->mux_flags & USB_PD_MUX_USB_ENABLED) {
port->state.alt = NULL;
port->state.mode = TYPEC_STATE_USB;
ret = typec_mux_set(port->mux, &port->state);
} else {
dev_dbg(typec->dev,
"Unrecognized mode requested, mux flags: %x\n",
- mux_flags);
+ port->mux_flags);
}
mux_ack:
@@ -638,17 +649,6 @@ static void cros_typec_set_port_params_v1(struct cros_typec_data *typec,
}
}
-static int cros_typec_get_mux_info(struct cros_typec_data *typec, int port_num,
- struct ec_response_usb_pd_mux_info *resp)
-{
- struct ec_params_usb_pd_mux_info req = {
- .port = port_num,
- };
-
- return cros_ec_command(typec->ec, 0, EC_CMD_USB_PD_MUX_INFO, &req,
- sizeof(req), resp, sizeof(*resp));
-}
-
/*
* Helper function to register partner/plug altmodes.
*/
@@ -946,7 +946,6 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
{
struct ec_params_usb_pd_control req;
struct ec_response_usb_pd_control_v2 resp;
- struct ec_response_usb_pd_mux_info mux_resp;
int ret;
if (port_num < 0 || port_num >= typec->num_ports) {
@@ -982,15 +981,7 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
cros_typec_handle_status(typec, port_num);
/* Update the switches if they exist, according to requested state */
- ret = cros_typec_get_mux_info(typec, port_num, &mux_resp);
- if (ret < 0) {
- dev_warn(typec->dev,
- "Failed to get mux info for port: %d, err = %d\n",
- port_num, ret);
- return 0;
- }
-
- ret = cros_typec_configure_mux(typec, port_num, mux_resp.flags, &resp);
+ ret = cros_typec_configure_mux(typec, port_num, &resp);
if (ret)
dev_warn(typec->dev, "Configure muxes failed, err = %d\n", ret);
--
2.35.0.263.gb82422642f-goog
next prev parent reply other threads:[~2022-02-07 21:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-07 21:40 [PATCH 0/4] platform/chrome: cros_ec_typec: Reorganize mux configuration Prashant Malani
2022-02-07 21:40 ` [PATCH 1/4] platform/chrome: cros_ec_typec: Move mux flag checks Prashant Malani
2022-02-08 5:33 ` Tzung-Bi Shih
2022-02-08 6:03 ` Prashant Malani
2022-02-07 21:40 ` Prashant Malani [this message]
2022-02-08 5:35 ` [PATCH 2/4] platform/chrome: cros_ec_typec: Get mux state inside configure_mux Tzung-Bi Shih
2022-02-08 6:04 ` Prashant Malani
2022-02-07 21:40 ` [PATCH 3/4] platform/chrome: cros_ec_typec: Configure muxes at start of port update Prashant Malani
2022-02-08 5:38 ` Tzung-Bi Shih
2022-02-08 6:12 ` Prashant Malani
2022-02-08 11:15 ` Tzung-Bi Shih
2022-02-08 18:35 ` Prashant Malani
2022-02-08 22:58 ` Prashant Malani
2022-02-09 3:31 ` Tzung-Bi Shih
2022-02-09 3:41 ` Prashant Malani
2022-02-07 21:40 ` [PATCH 4/4] platform/chrome: cros_ec_typec: Update mux flags during partner removal Prashant Malani
2022-02-08 5:38 ` Tzung-Bi Shih
2022-02-08 6:15 ` Prashant Malani
2022-02-08 11:15 ` Tzung-Bi Shih
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=20220207214026.1526151-3-pmalani@chromium.org \
--to=pmalani@chromium.org \
--cc=bleung@chromium.org \
--cc=chrome-platform@lists.linux.dev \
--cc=groeck@chromium.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).