From 7ce2dadc301085ff8df43f754947c5883066a7a4 Mon Sep 17 00:00:00 2001
From: Haijian Ma <mahj8@motorola.com>
Date: Mon, 25 Jul 2022 09:36:40 +0800
Subject: [PATCH] FG: Monotonic SoC to prevent SoC jump

Monotonic SoC to prevent SoC jump while Charging or Discharging
for miami

Change-Id: I5a7c0ac6031c0e4908b1dcff12b385e312247712
Signed-off-by: Haijian Ma <mahj8@motorola.com>
Reviewed-on: https://gerrit.mot.com/2343050
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 .../power/mm8013c_fg_mmi/mm8013c_battery.c    | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c b/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c
index ae264f98b5c5..a10e05393943 100644
--- a/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c
+++ b/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c
@@ -70,6 +70,8 @@ struct mm8xxx_device_info {
 	struct delayed_work work;
 	struct power_supply *psy;
 	struct power_supply *batt_psy;
+	struct power_supply *usb_psy;
+	struct power_supply *dc_psy;
 	struct list_head list;
 	struct mutex lock;
 	u8 *cmds;
@@ -1445,9 +1447,46 @@ static int mm8xxx_battery_read_elapsedhours(struct mm8xxx_device_info *di)
 	return elapsed;
 }
 
+static bool is_input_present(struct mm8xxx_device_info *di)
+{
+	int rc = 0, input_present = 0;
+	union power_supply_propval pval = {0, };
+
+	if (!di->usb_psy)
+		di->usb_psy = power_supply_get_by_name("usb");
+	if (di->usb_psy) {
+		rc = power_supply_get_property(di->usb_psy,
+				POWER_SUPPLY_PROP_PRESENT, &pval);
+		if (rc < 0)
+			pr_err("Couldn't read USB Present status, rc=%d\n", rc);
+		else
+			input_present |= pval.intval;
+	}
+
+	if (!di->dc_psy)
+		di->dc_psy = power_supply_get_by_name("dc");
+	if (di->dc_psy) {
+		rc = power_supply_get_property(di->dc_psy,
+				POWER_SUPPLY_PROP_PRESENT, &pval);
+		if (rc < 0)
+			pr_err("Couldn't read DC Present status, rc=%d\n", rc);
+		else
+			input_present |= pval.intval;
+	}
+	pr_info("input present = %d\n", input_present);
+	if (input_present)
+		return true;
+
+	return false;
+}
+
+#define CAP(min, max, value)			\
+		((min > value) ? min : ((value > max) ? max : value))
+
 static void mm8xxx_battery_update(struct mm8xxx_device_info *di)
 {
 	struct mm8xxx_state_cache cache = {0, };
+	bool input_present = is_input_present(di);
 #ifdef CONFIG_BATTERY_MM8XXX_DYNAMIC_CHARGE_VOLTAGE
 	int cv;
 	int req = 0;
@@ -1475,6 +1514,23 @@ static void mm8xxx_battery_update(struct mm8xxx_device_info *di)
 	cache.cycle_count = mm8xxx_battery_read_cyclecount(di);
 	mm8xxx_battery_temp_to_FG(di);
 
+	mm_info("soc = %d, ui_soc = %d\n", cache.soc, di->cache.soc);
+	if (di->cache.soc == 0)
+		di->cache.soc = cache.soc;
+
+	if (cache.soc > di->cache.soc) {
+		/* SOC increased */
+		if (input_present) {/* Increment if input is present */
+			cache.soc = di->cache.soc + 1;
+		} else
+			cache.soc = di->cache.soc;
+
+	} else if (cache.soc < di->cache.soc) {
+		/* SOC dropped */
+		cache.soc = di->cache.soc - 1;
+	}
+	cache.soc = CAP(0, 100, cache.soc);
+
 	if (di->charge_design_full <= 0)
 		di->charge_design_full = mm8xxx_battery_read_designcapacity(di);