@@ -952,6 +952,16 @@ static int tcpm_set_current_limit(struct tcpm_port *port, u32 max_ma, u32 mv)
return ret;
}
+static void tcpm_set_pd_capable(struct tcpm_port *port, bool capable)
+{
+ tcpm_log(port, "Partner pd capable %s", capable ? "true" : "false");
+
+ if (port->tcpc->set_pd_capable)
+ port->tcpc->set_pd_capable(port->tcpc, capable);
+
+ port->pd_capable = capable;
+}
+
static int tcpm_set_attached_state(struct tcpm_port *port, bool attached)
{
return port->tcpc->set_roles(port->tcpc, attached, port->pwr_role,
@@ -3444,7 +3454,7 @@ static int tcpm_src_attach(struct tcpm_port *port)
if (ret < 0)
goto out_disable_vconn;
- port->pd_capable = false;
+ tcpm_set_pd_capable(port, false);
port->partner = NULL;
@@ -3509,7 +3519,7 @@ static void tcpm_reset_port(struct tcpm_port *port)
tcpm_unregister_altmodes(port);
tcpm_typec_disconnect(port);
port->attached = false;
- port->pd_capable = false;
+ tcpm_set_pd_capable(port, false);
port->pps_data.supported = false;
tcpm_set_partner_usb_comm_capable(port, false);
@@ -3583,7 +3593,7 @@ static int tcpm_snk_attach(struct tcpm_port *port)
if (ret < 0)
return ret;
- port->pd_capable = false;
+ tcpm_set_pd_capable(port, false);
port->partner = NULL;
@@ -3813,7 +3823,7 @@ static void run_state_machine(struct tcpm_port *port)
*/
/* port->hard_reset_count = 0; */
port->caps_count = 0;
- port->pd_capable = true;
+ tcpm_set_pd_capable(port, true);
tcpm_set_state_cond(port, SRC_SEND_CAPABILITIES_TIMEOUT,
PD_T_SEND_SOURCE_CAP);
}
@@ -4074,7 +4084,7 @@ static void run_state_machine(struct tcpm_port *port)
}
break;
case SNK_NEGOTIATE_CAPABILITIES:
- port->pd_capable = true;
+ tcpm_set_pd_capable(port, true);
tcpm_set_partner_usb_comm_capable(port,
!!(port->source_caps[0] & PDO_FIXED_USB_COMM));
port->hard_reset_count = 0;
@@ -112,6 +112,8 @@ enum tcpm_transmit_type {
* Optional; The USB Communications Capable bit indicates if port
* partner is capable of communication over the USB data lines
* (e.g. D+/- or SS Tx/Rx). Called to notify the status of the bit.
+ * @set_pd_capable:
+ * Optional; Called to notify if the partner is pd capable.
*/
struct tcpc_dev {
struct fwnode_handle *fwnode;
@@ -144,6 +146,7 @@ struct tcpc_dev {
bool pps_active, u32 requested_vbus_voltage);
bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);
void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);
+ void (*set_pd_capable)(struct tcpc_dev *dev, bool enable);
};
struct tcpm_port;
This change informs lower level tcpc drivers of pd_capable partner. This is useful while setting current limit for the charging path. Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> --- drivers/usb/typec/tcpm/tcpm.c | 20 +++++++++++++++----- include/linux/usb/tcpm.h | 3 +++ 2 files changed, 18 insertions(+), 5 deletions(-)