TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/chrome: cros_ec_typec: Make disc_done flag partner-only

Browse Source 
Change the disc_done flag, which indicates whether PD discovery is
complete, to sop_disc_done instead, since we will process SOP and SOP'
discovery data separately.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20201116201150.2919178-5-pmalani@chromium.org
This commit is contained in:
Prashant Malani
2020-11-16 12:11:44 -08:00
committed by Benson Leung
parent e71ba9452f
commit a906f45d14
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/platform/chrome/cros_ec_typec.c
+7 -12
View File
@@ -57,8 +57,8 @@ struct cros_typec_port {
/* Port alt modes. */ /* Port alt modes. */
struct typec_altmode p_altmode[CROS_EC_ALTMODE_MAX]; struct typec_altmode p_altmode[CROS_EC_ALTMODE_MAX];
/* Flag indicating that PD discovery data parsing is completed. */ /* Flag indicating that PD partner discovery data parsing is completed. */
bool disc_done; bool sop_disc_done;
struct ec_response_typec_discovery *sop_disc; struct ec_response_typec_discovery *sop_disc;
struct list_head partner_mode_list; struct list_head partner_mode_list;
}; };
@@ -210,7 +210,7 @@ static void cros_typec_remove_partner(struct cros_typec_data *typec,
typec_unregister_partner(port->partner); typec_unregister_partner(port->partner);
port->partner = NULL; port->partner = NULL;
memset(&port->p_identity, 0, sizeof(port->p_identity)); memset(&port->p_identity, 0, sizeof(port->p_identity));
port->disc_done = false; port->sop_disc_done = false;
} }
static void cros_unregister_ports(struct cros_typec_data *typec) static void cros_unregister_ports(struct cros_typec_data *typec)
@@ -725,18 +725,13 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num
return; return;
} }
if (typec->ports[port_num]->disc_done)
return;
/* Handle any events appropriately. */ /* Handle any events appropriately. */
if (resp.events & PD_STATUS_EVENT_SOP_DISC_DONE) { if (resp.events & PD_STATUS_EVENT_SOP_DISC_DONE && !typec->ports[port_num]->sop_disc_done) {
ret = cros_typec_handle_sop_disc(typec, port_num); ret = cros_typec_handle_sop_disc(typec, port_num);
if (ret < 0) { if (ret < 0)
dev_err(typec->dev, "Couldn't parse SOP Disc data, port: %d\n", port_num); dev_err(typec->dev, "Couldn't parse SOP Disc data, port: %d\n", port_num);
return; else
} typec->ports[port_num]->sop_disc_done = true;
typec->ports[port_num]->disc_done = true;
} }
} }