Unverified Commit c8ec21c6 authored by Prashant Malani's avatar Prashant Malani Committed by Benson Leung
Browse files

platform/chrome: cros_ec_typec: Clear Type C disc events 



Clear USB Type C discovery events from the Chrome EC once they've been
successfully handled.

Signed-off-by: default avatarPrashant Malani <pmalani@chromium.org>
Reported-by: default avatarBenson Leung <bleung@chromium.org>
Tested-by: default avatarBenson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20210203021539.745239-2-pmalani@chromium.org


Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
parent b64afd94

drivers/platform/chrome/cros_ec_typec.c

+26 −3
Original line number Diff line number Diff line
@@ -870,6 +870,18 @@ static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_nu 
	return ret;

}



static int cros_typec_send_clear_event(struct cros_typec_data *typec, int port_num, u32 events_mask)

{

	struct ec_params_typec_control req = {

		.port = port_num,

		.command = TYPEC_CONTROL_COMMAND_CLEAR_EVENTS,

		.clear_events_mask = events_mask,

	};



	return cros_typec_ec_command(typec, 0, EC_CMD_TYPEC_CONTROL, &req,

				     sizeof(req), NULL, 0);

}



static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num)

{

	struct ec_response_typec_status resp;
@@ -894,9 +906,14 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num 
		ret = cros_typec_handle_sop_disc(typec, port_num, sop_revision);

		if (ret < 0)

			dev_err(typec->dev, "Couldn't parse SOP Disc data, port: %d\n", port_num);

		else

		else {

			typec->ports[port_num]->sop_disc_done = true;



			ret = cros_typec_send_clear_event(typec, port_num,

							  PD_STATUS_EVENT_SOP_DISC_DONE);

			if (ret < 0)

				dev_warn(typec->dev,

					 "Failed SOP Disc event clear, port: %d\n", port_num);

		}

		if (resp.sop_connected)

			typec_set_pwr_opmode(typec->ports[port_num]->port, TYPEC_PWR_MODE_PD);

	}
@@ -910,8 +927,14 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num 
		ret = cros_typec_handle_sop_prime_disc(typec, port_num, sop_prime_revision);

		if (ret < 0)

			dev_err(typec->dev, "Couldn't parse SOP' Disc data, port: %d\n", port_num);

		else

		else {

			typec->ports[port_num]->sop_prime_disc_done = true;

			ret = cros_typec_send_clear_event(typec, port_num,

							  PD_STATUS_EVENT_SOP_PRIME_DISC_DONE);

			if (ret < 0)

				dev_warn(typec->dev,

					 "Failed SOP Disc event clear, port: %d\n", port_num);

		}

	}

}