lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 202/255] usb: typec: ucsi: Report power supply changes
    Date
    From: Heikki Krogerus <heikki.krogerus@linux.intel.com>

    commit 0e6371fbfba3a4f76489e6e97c1c7f8386ad5fd2 upstream.

    When the ucsi power supply goes online/offline, and when the
    power levels change, the power supply class needs to be
    notified so it can inform the user space.

    Fixes: 992a60ed0d5e ("usb: typec: ucsi: register with power_supply class")
    Cc: stable@vger.kernel.org
    Reported-and-tested-by: Vladimir Yerilov <openmindead@gmail.com>
    Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    Link: https://lore.kernel.org/r/20201110120547.67922-1-heikki.krogerus@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/typec/ucsi/psy.c | 9 +++++++++
    drivers/usb/typec/ucsi/ucsi.c | 7 ++++++-
    drivers/usb/typec/ucsi/ucsi.h | 2 ++
    3 files changed, 17 insertions(+), 1 deletion(-)

    --- a/drivers/usb/typec/ucsi/psy.c
    +++ b/drivers/usb/typec/ucsi/psy.c
    @@ -238,4 +238,13 @@ void ucsi_unregister_port_psy(struct ucs
    return;

    power_supply_unregister(con->psy);
    + con->psy = NULL;
    +}
    +
    +void ucsi_port_psy_changed(struct ucsi_connector *con)
    +{
    + if (IS_ERR_OR_NULL(con->psy))
    + return;
    +
    + power_supply_changed(con->psy);
    }
    --- a/drivers/usb/typec/ucsi/ucsi.c
    +++ b/drivers/usb/typec/ucsi/ucsi.c
    @@ -643,8 +643,10 @@ static void ucsi_handle_connector_change
    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)
    + 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);
    @@ -674,6 +676,8 @@ static void ucsi_handle_connector_change
    ucsi_register_partner(con);
    else
    ucsi_unregister_partner(con);
    +
    + ucsi_port_psy_changed(con);
    }

    if (con->status.change & UCSI_CONSTAT_CAM_CHANGE) {
    @@ -994,6 +998,7 @@ static int ucsi_register_port(struct ucs
    !!(con->status.flags & UCSI_CONSTAT_PWR_DIR));
    ucsi_pwr_opmode_change(con);
    ucsi_register_partner(con);
    + ucsi_port_psy_changed(con);
    }

    if (con->partner) {
    --- a/drivers/usb/typec/ucsi/ucsi.h
    +++ b/drivers/usb/typec/ucsi/ucsi.h
    @@ -340,9 +340,11 @@ int ucsi_resume(struct ucsi *ucsi);
    #if IS_ENABLED(CONFIG_POWER_SUPPLY)
    int ucsi_register_port_psy(struct ucsi_connector *con);
    void ucsi_unregister_port_psy(struct ucsi_connector *con);
    +void ucsi_port_psy_changed(struct ucsi_connector *con);
    #else
    static inline int ucsi_register_port_psy(struct ucsi_connector *con) { return 0; }
    static inline void ucsi_unregister_port_psy(struct ucsi_connector *con) { }
    +static inline void ucsi_port_psy_changed(struct ucsi_connector *con) { }
    #endif /* CONFIG_POWER_SUPPLY */

    #if IS_ENABLED(CONFIG_TYPEC_DP_ALTMODE)

    \
     
     \ /
      Last update: 2020-11-17 15:10    [W:4.143 / U:0.788 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site