From 8d4593af7b886280630e54d779af0c2f524abbfb Mon Sep 17 00:00:00 2001 From: kumarv Date: Wed, 11 Mar 2020 15:08:57 +0530 Subject: [PATCH] SDM710: Reduce the spam charger related logs When charger plugged in or not, Below logs are seen flooded in the kernel logs accordingly. One log for every 10 seconds would get printed even when there is no change in the charger rate state. Solution: dump the logs when there is actual change in charger present state and charge rate. 03-09 08:52:14.869 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:52:35.527 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:52:46.024 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:52:56.460 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:05.426 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=None 03-09 08:53:05.532 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=None 03-09 08:53:08.230 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:08.578 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:09.392 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:09.890 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:20.267 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:30.528 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:40.112 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal 03-09 08:53:50.360 0 0 E power_supply battery: smb_mmi_power_supply_changed: POWER_SUPPLY_CHARGE_RATE=Normal NO_PROP_NEEDED for bq-shm2018. SDM710 is under project bq-sh2018. Hence this change propagation not needed for branch bq-shm2018. Change-Id: I840a8c242c8478fc6221763c67f9246dda607f4e Signed-off-by: kumarv Reviewed-on: https://gerrit.mot.com/1514199 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c b/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c index c612d069f105..854a7347079f 100644 --- a/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c +++ b/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c @@ -383,6 +383,7 @@ struct smb_mmi_charger { int last_reported_status; struct regulator *vbus; bool vbus_enabled; + int prev_chg_rate; int charger_rate; int age; int cycles; @@ -2186,7 +2187,6 @@ void mmi_chrg_rate_check(struct smb_mmi_charger *chg) int chrg_v_mv = 0; int chrg_cm_ma = 0; int chrg_cs_ma = 0; - int prev_chg_rate = chg->charger_rate; int rc = -EINVAL; if (!chg->usb_psy) { @@ -2195,6 +2195,8 @@ void mmi_chrg_rate_check(struct smb_mmi_charger *chg) } val.intval = 0; + chg->prev_chg_rate = chg->charger_rate; + rc = get_prop_charger_present(chg, &val); if (rc < 0) { mmi_err(chg, "Error getting Charger Present rc = %d\n", rc); @@ -2243,15 +2245,15 @@ void mmi_chrg_rate_check(struct smb_mmi_charger *chg) (chrg_cs_ma < WEAK_CHRG_THRSH) && test_bit(EVENT_WEAK_CHARGER_WAIT, &chg->flags)) chg->charger_rate = POWER_SUPPLY_CHARGE_RATE_WEAK; - else if (prev_chg_rate == POWER_SUPPLY_CHARGE_RATE_NONE) + else if (chg->prev_chg_rate == POWER_SUPPLY_CHARGE_RATE_NONE) chg->charger_rate = POWER_SUPPLY_CHARGE_RATE_NORMAL; - else if ((prev_chg_rate == POWER_SUPPLY_CHARGE_RATE_WEAK) && + else if ((chg->prev_chg_rate == POWER_SUPPLY_CHARGE_RATE_WEAK) && (chrg_cm_ma > WEAK_CHRG_THRSH) && (chrg_cs_ma >= WEAK_CHRG_THRSH)) chg->charger_rate = POWER_SUPPLY_CHARGE_RATE_NORMAL; end_rate_check: - if (prev_chg_rate != chg->charger_rate) { + if (chg->prev_chg_rate != chg->charger_rate) { clear_bit(EVENT_WEAK_CHARGER_WAIT, &chg->flags); cancel_delayed_work(&chg->weakcharger_work); if(chg->charger_rate == POWER_SUPPLY_CHARGE_RATE_NORMAL) @@ -3275,7 +3277,9 @@ static int __smb_mmi_ps_changed(struct device *dev, void *data) static void smb_mmi_power_supply_changed(struct power_supply *psy, char *envp_ext[]) { - dev_err(&psy->dev, "SMBMMI: %s: %s\n", __func__, envp_ext[0]); + if (this_chip && this_chip->prev_chg_rate != this_chip->charger_rate) { + dev_err(&psy->dev, "SMBMMI: %s: %s\n", __func__, envp_ext[0]); + } class_for_each_device(power_supply_class, NULL, psy, __smb_mmi_ps_changed);