Commit bd19ac98 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

usb: typec: ucsi: Read the PDOs in separate work 



Polling also the PDOs, just like the alt modes.

After this ucsi_handle_connector_change() doesn't execute
any commands.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20210920142419.54493-7-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6cbe4b2d

drivers/usb/typec/ucsi/ucsi.c

+17 −13
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int ucsi_get_pdos(struct ucsi_connector *con, int is_partner, 
	command |= UCSI_GET_PDOS_SRC_PDOS;

	ret = ucsi_send_command(ucsi, command, pdos + offset,

				num_pdos * sizeof(u32));

	if (ret < 0)

	if (ret < 0 && ret != -ETIMEDOUT)

		dev_err(ucsi->dev, "UCSI_GET_PDOS failed (%d)\n", ret);

	if (ret == 0 && offset == 0)

		dev_warn(ucsi->dev, "UCSI_GET_PDOS returned 0 bytes\n");
@@ -579,26 +579,30 @@ static int ucsi_get_pdos(struct ucsi_connector *con, int is_partner, 
	return ret;

}



static void ucsi_get_src_pdos(struct ucsi_connector *con, int is_partner)

static int ucsi_get_src_pdos(struct ucsi_connector *con)

{

	int ret;



	/* UCSI max payload means only getting at most 4 PDOs at a time */

	ret = ucsi_get_pdos(con, 1, con->src_pdos, 0, UCSI_MAX_PDOS);

	if (ret < 0)

		return;

		return ret;



	con->num_pdos = ret / sizeof(u32); /* number of bytes to 32-bit PDOs */

	if (con->num_pdos < UCSI_MAX_PDOS)

		return;

		return 0;



	/* get the remaining PDOs, if any */

	ret = ucsi_get_pdos(con, 1, con->src_pdos, UCSI_MAX_PDOS,

			    PDO_MAX_OBJECTS - UCSI_MAX_PDOS);

	if (ret < 0)

		return;

		return ret;



	con->num_pdos += ret / sizeof(u32);



	ucsi_port_psy_changed(con);



	return 0;

}



static int ucsi_check_altmodes(struct ucsi_connector *con)
@@ -626,7 +630,7 @@ static void ucsi_pwr_opmode_change(struct ucsi_connector *con) 
	case UCSI_CONSTAT_PWR_OPMODE_PD:

		con->rdo = con->status.request_data_obj;

		typec_set_pwr_opmode(con->port, TYPEC_PWR_MODE_PD);

		ucsi_get_src_pdos(con, 1);

		ucsi_partner_task(con, ucsi_get_src_pdos, 30, 0);

		ucsi_partner_task(con, ucsi_check_altmodes, 30, 0);

		break;

	case UCSI_CONSTAT_PWR_OPMODE_TYPEC1_5:
@@ -844,12 +848,6 @@ static void ucsi_handle_connector_change(struct work_struct *work) 


	role = !!(con->status.flags & UCSI_CONSTAT_PWR_DIR);



	if (con->status.change & UCSI_CONSTAT_POWER_OPMODE_CHANGE ||

	    con->status.change & UCSI_CONSTAT_POWER_LEVEL_CHANGE) {

		ucsi_pwr_opmode_change(con);

		ucsi_port_psy_changed(con);

	}



	if (con->status.change & UCSI_CONSTAT_POWER_DIR_CHANGE) {

		typec_set_pwr_role(con->port, role);
@@ -900,6 +898,10 @@ static void ucsi_handle_connector_change(struct work_struct *work) 
				con->num, u_role);

	}



	if (con->status.change & UCSI_CONSTAT_POWER_OPMODE_CHANGE ||

	    con->status.change & UCSI_CONSTAT_POWER_LEVEL_CHANGE)

		ucsi_pwr_opmode_change(con);



	if (con->status.change & UCSI_CONSTAT_PARTNER_CHANGE)

		ucsi_partner_change(con);
@@ -1248,8 +1250,10 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) 
		ret = 0;

	}



	if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) == UCSI_CONSTAT_PWR_OPMODE_PD)

	if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) == UCSI_CONSTAT_PWR_OPMODE_PD) {

		ucsi_get_src_pdos(con);

		ucsi_check_altmodes(con);

	}



	trace_ucsi_register_port(con->num, &con->status);