power_supply: rt9455_charger: Properly notify userspace about charging events

Charging events this patch refers to are:
- charger is connected to/disconnected from the power source
- battery is reconnected to the charger, after it was absent.

When the charger is connected to/disconnected from the power source, CHRVPI
interrupt occurs and PWR_RDY bit is either set or cleared. PWR_RDY bit is
updated after 1-2 seconds CHRVPI interrupt has occurred.
power_supply_changed() should be called after PWR_RDY bit is updated.
/sys/class/power_supply/rt9455-charger/online file displays the value of
PWR_RDY bit.
This way, if the userspace is notified that a charging event has occurred
and the userspace reads /sys/class/power_supply/rt9455-charger/online file,
this file is properly updated when the userspace reads it.
This is the reason why power_supply_changed() is called in
rt9455_pwr_rdy_work_callback(), instead of being called in interrupt
handler.

Since no interrupt is triggered when the battery is reconnected to the
charger, the userspace is never notified that the battery is reconnected.
This is why power_supply_changed() is called in
rt9455_max_charging_time_work_callback(), so that the userspace is notified
that the battery is reconnected.

Signed-off-by: Anda-Maria Nicolae <anda-maria.nicolae@intel.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/power/rt9455_charger.c b/drivers/power/rt9455_charger.c
index 08baac6e3ada..a49a9d44bdda 100644
--- a/drivers/power/rt9455_charger.c
+++ b/drivers/power/rt9455_charger.c
@@ -973,7 +973,6 @@ static int rt9455_irq_handler_check_irq2_register(struct rt9455_info *info,
 
         if (irq2 & GET_MASK(F_CHRVPI)) {
                 dev_dbg(dev, "Charger fault occurred\n");
-                alert_userspace = true;
                 /*
                  * CHRVPI bit is set in 2 cases:
                  * 1. when the power source is connected to the charger.
@@ -981,6 +980,9 @@ static int rt9455_irq_handler_check_irq2_register(struct rt9455_info *info,
                  * To identify the case, PWR_RDY bit is checked. Because
                  * PWR_RDY bit is set / cleared after CHRVPI interrupt is
                  * triggered, it is used delayed_work to later read PWR_RDY bit.
+                 * Also, do not set to true alert_userspace, because there is no
+                 * need to notify userspace when CHRVPI interrupt has occurred.
+                 * Userspace will be notified after PWR_RDY bit is read.
                  */
                 queue_delayed_work(system_power_efficient_wq,
                                    &info->pwr_rdy_work,
@@ -1178,7 +1180,7 @@ static irqreturn_t rt9455_irq_handler_thread(int irq, void *data)
                 /*
                  * Sometimes, an interrupt occurs while rt9455_probe() function
                  * is executing and power_supply_register() is not yet called.
-                 * Do not call power_supply_charged() in this case.
+                 * Do not call power_supply_changed() in this case.
                  */
                 if (info->charger)
                         power_supply_changed(info->charger);
@@ -1478,6 +1480,11 @@ static void rt9455_pwr_rdy_work_callback(struct work_struct *work)
                                    RT9455_MAX_CHARGING_TIME * HZ);
                 break;
         }
+        /*
+         * Notify userspace that the charger has been either connected to or
+         * disconnected from the power source.
+         */
+        power_supply_changed(info->charger);
 }
 
 static void rt9455_max_charging_time_work_callback(struct work_struct *work)
@@ -1533,6 +1540,11 @@ static void rt9455_batt_presence_work_callback(struct work_struct *work)
                         if (ret)
                                 dev_err(dev, "Failed to unmask BATAB interrupt\n");
                 }
+                /*
+                 * Notify userspace that the battery is now connected to the
+                 * charger.
+                 */
+                power_supply_changed(info->charger);
         }
 }