lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 077/107] usb: typec: tcpm: Return ENOTSUPP for power supply prop writes
    Date
    From: Badhri Jagan Sridharan <badhri@google.com>

    commit f2d38edc5e3375e56b4a30d5b66cefd385a2b38c upstream.

    When the port does not support USB PD, prevent transition to PD
    only states when power supply property is written. In this case,
    TCPM transitions to SNK_NEGOTIATE_CAPABILITIES
    which should not be the case given that the port is not pd_capable.

    [ 84.308251] state change SNK_READY -> SNK_NEGOTIATE_CAPABILITIES [rev3 NONE_AMS]
    [ 84.308335] Setting usb_comm capable false
    [ 84.323367] set_auto_vbus_discharge_threshold mode:3 pps_active:n vbus:5000 ret:0
    [ 84.323376] state change SNK_NEGOTIATE_CAPABILITIES -> SNK_WAIT_CAPABILITIES [rev3 NONE_AMS]

    Fixes: e9e6e164ed8f6 ("usb: typec: tcpm: Support non-PD mode")
    Cc: stable@vger.kernel.org
    Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
    Link: https://lore.kernel.org/r/20220817215410.1807477-1-badhri@google.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/typec/tcpm/tcpm.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/drivers/usb/typec/tcpm/tcpm.c
    +++ b/drivers/usb/typec/tcpm/tcpm.c
    @@ -6213,6 +6213,13 @@ static int tcpm_psy_set_prop(struct powe
    struct tcpm_port *port = power_supply_get_drvdata(psy);
    int ret;

    + /*
    + * All the properties below are related to USB PD. The check needs to be
    + * property specific when a non-pd related property is added.
    + */
    + if (!port->pd_supported)
    + return -EOPNOTSUPP;
    +
    switch (psp) {
    case POWER_SUPPLY_PROP_ONLINE:
    ret = tcpm_psy_set_online(port, val);

    \
     
     \ /
      Last update: 2022-09-06 15:56    [W:2.216 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site