power: import k6a changes

Signed-off-by: Yahya Wessam <yahyawessam2002@gmail.com>

Author: vantoman

drivers/power/supply/qcom/smb5-lib.c

@@ -967,6 +967,7 @@ int smblib_set_fastcharge_mode(struct smb_charger *chg, bool enable)
 	if (enable) {
 		/* ffc need clear 4.4V non_fcc_vfloat_voter first */
 		vote(chg->fv_votable, NON_FFC_VFLOAT_VOTER, false, 0);
+		vote(chg->fcc_votable, PD_UNVERIFED_VOTER, false, 0);
 		rc = power_supply_get_property(chg->bms_psy,
 				POWER_SUPPLY_PROP_FFC_CHG_TERMINATION_CURRENT, &pval);
 		if (rc < 0) {

drivers/power/supply/qcom/smb5-lib.h

@@ -104,6 +104,7 @@ enum print_reason {
 #define BATT_VERIFY_VOTER		"BATT_VERIFY_VOTER"
 
 #define PD_VERIFED_VOTER		"PD_VERIFED_VOTER"
+#define PD_UNVERIFED_VOTER  		"PD_UNVERIFED_VOTER"
 #define PD_REMOVE_COMP_VOTER		"PD_REMOVE_COMP_VOTER"
 
 /* used for bq charge pump solution */

drivers/power/supply/qcom/step-chg-jeita.c

@@ -781,6 +781,9 @@ static int handle_dynamic_fv(struct step_chg_info *chip)
 #define JEITA_SUSPEND_HYST_UV		130000
 #define JEITA_SIX_PIN_BATT_HYST_UV	100000
 #define WARM_VFLOAT_UV			4100000
+#define BATT_HOT_SHUTDOWN_TEMP    580
+#define BATT_TOO_COLD_TEMP        -100
+
 static int handle_jeita(struct step_chg_info *chip)
 {
 	union power_supply_propval pval = {0, };
@@ -790,6 +793,8 @@ static int handle_jeita(struct step_chg_info *chip)
 	int temp, pd_authen_result = 0;
 	static bool fast_mode_dis;
 	int chg_term_current = 0, batt_soc = 0, batt_temp = 0;
+	static int last_fcc_ua = 0;
+	static struct votable *chg_disable_votable;
 
 	rc = power_supply_get_property(chip->batt_psy,
 		POWER_SUPPLY_PROP_SW_JEITA_ENABLED, &pval);
@@ -844,12 +849,44 @@ static int handle_jeita(struct step_chg_info *chip)
 	rc = get_val(chip->jeita_fcc_config->fcc_cfg,
 			chip->jeita_fcc_config->param.hysteresis,
 			chip->jeita_fcc_index,
-			pval.intval,
+			temp,
 			&chip->jeita_fcc_index,
 			&fcc_ua);
 	if (rc < 0)
 		fcc_ua = 0;
 
+	rc = power_supply_get_property(chip->batt_psy,
+				POWER_SUPPLY_PROP_VOLTAGE_NOW, &pval);
+	if (rc < 0) {
+		pr_err("Get battery voltage failed, rc = %d\n", rc);
+		fcc_ua = 0;
+	}
+	curr_vbat_uv = pval.intval;
+
+	if (temp < 0 && temp >= (-100)) {
+		if (curr_vbat_uv < 4200000) {
+			if (last_fcc_ua == 735000 && curr_vbat_uv > 4100000)
+				fcc_ua = 735000;
+			else
+				fcc_ua = 900000;
+		} else
+			fcc_ua = 735000;
+		last_fcc_ua = fcc_ua;
+		pr_err("%S -10 - 0, ibat = %d\n", __func__, fcc_ua);
+	}
+
+	if (!chg_disable_votable)
+		chg_disable_votable = find_votable("CHG_DISABLE");
+	if (temp > BATT_HOT_SHUTDOWN_TEMP
+		|| temp < BATT_TOO_COLD_TEMP) {
+		pr_err("battery too hot/cold, not charging");
+		if (chg_disable_votable)
+			vote(chg_disable_votable, BATT_HOT_SHUTDOWN_TEMP_VOTER, true, 0);
+	} else if (is_client_vote_enabled_locked(chg_disable_votable, BATT_HOT_SHUTDOWN_TEMP_VOTER)) {
+		if (chg_disable_votable)
+			vote(chg_disable_votable, BATT_HOT_SHUTDOWN_TEMP_VOTER, false, 0);
+	}
+
 	if (!chip->fcc_votable)
 		chip->fcc_votable = find_votable("FCC");
 	if (!chip->fcc_votable)
@@ -864,13 +901,13 @@ static int handle_jeita(struct step_chg_info *chip)
 	rc = get_val(chip->jeita_fv_config->fv_cfg,
 			chip->jeita_fv_config->param.hysteresis,
 			chip->jeita_fv_index,
-			pval.intval,
+			temp,
 			&chip->jeita_fv_index,
 			&fv_uv);
 	if (rc < 0)
 		fv_uv = 0;
 	if (chip->ffc_iterm_change_by_temp) {
-		batt_temp = pval.intval;
+		batt_temp = temp;
 		rc = power_supply_get_property(chip->bms_psy,
 					POWER_SUPPLY_PROP_CAPACITY, &pval);
 		if (rc < 0) {
@@ -1029,6 +1066,7 @@ static int handle_jeita(struct step_chg_info *chip)
 	}
 
 set_jeita_fv:
+
 	vote(chip->fv_votable, JEITA_VOTER, fv_uv ? true : false, fv_uv);
 
 update_time:

drivers/power/supply/qcom/step-chg-jeita.h

@@ -34,7 +34,8 @@
 #define FFC_LOW_TEMP_CHG_TERM_CURRENT	-980
 #define FFC_HIGH_TEMP_CHG_TERM_CURRENT	-1110
 #endif
-
+#define BATT_HOT_SHUTDOWN_TEMP_VOTER "BATT_HOT_SHUTDOWN_TEMP_VOTER"
+#define FCC_TAPER_FCC_VOTER				"FCC_TAPER_FCC_VOTER"
 enum hvdcp3_class_type {
 	HVDCP3_CLASS_NONE = 0,
 	HVDCP3_CLASS_A_18W,

drivers/power/supply/ti/pd_policy_manager.c

@@ -44,7 +44,7 @@
 #define BAT_CURR_LOOP_LMT		BATT_FAST_CHG_CURR
 #define BUS_VOLT_LOOP_LMT		BUS_OVP_THRESHOLD
 
-#define PM_WORK_RUN_INTERVAL		100
+#define PM_WORK_RUN_INTERVAL		500
 
 enum {
 	PM_ALGO_RET_OK,
@@ -215,10 +215,10 @@ static bool pd_disable_cp_by_jeita_status(struct usbpd_pm *pdpm)
 	pr_info("warm_thres: %d\n", warm_thres);
 	pr_info("cool_thres: %d\n", cool_thres);
 
-	if (batt_temp >= warm_thres && !pdpm->jeita_triggered) {
+	if (batt_temp > warm_thres && !pdpm->jeita_triggered) {
 		pdpm->jeita_triggered = true;
 		return true;
-	} else if (batt_temp <= cool_thres && !pdpm->jeita_triggered) {
+	} else if (batt_temp < cool_thres && !pdpm->jeita_triggered) {
 		pdpm->jeita_triggered = true;
 		return true;
 	} else if ((batt_temp <= (warm_thres - JEITA_HYSTERESIS))
@@ -883,6 +883,7 @@ static void usbpd_pm_evaluate_src_caps(struct usbpd_pm *pdpm)
 	int ret;
 	int i;
 	union power_supply_propval pval = {0, };
+	int apdo_max = 0;
 
 	if (!pdpm->pd) {
 		pdpm->pd = smb_get_usbpd();
@@ -904,6 +905,13 @@ static void usbpd_pm_evaluate_src_caps(struct usbpd_pm *pdpm)
 	for (i = 0; i < PDO_MAX_NUM; i++) {
 		if (pdpm->pdo[i].type == PD_SRC_PDO_TYPE_AUGMENTED
 			&& pdpm->pdo[i].pps && pdpm->pdo[i].pos) {
+			if (pdpm->pdo[i].max_volt_mv > 11000)
+				pdpm->pdo[i].max_volt_mv = 11000;
+			if (apdo_max < ((pdpm->pdo[i].max_volt_mv/1000) * (pdpm->pdo[i].curr_ma/10) / 100)) {
+				apdo_max = (pdpm->pdo[i].max_volt_mv/1000) * (pdpm->pdo[i].curr_ma/10) / 100;
+			}
+			pr_err("%s max_volt:%d, curr_ma:%d, apdo_max:%d\n", __func__,
+							pdpm->pdo[i].max_volt_mv, pdpm->pdo[i].curr_ma, apdo_max);
 			if (pdpm->pdo[i].max_volt_mv >= pdpm->apdo_max_volt
 					&& pdpm->pdo[i].curr_ma >= pdpm->apdo_max_curr
 					&& pdpm->pdo[i].max_volt_mv <= APDO_MAX_VOLT) {
@@ -922,7 +930,10 @@ static void usbpd_pm_evaluate_src_caps(struct usbpd_pm *pdpm)
 				pdpm->apdo_max_curr);
 		if (pdpm->apdo_max_curr <= LOW_POWER_PPS_CURR_THR)
 			pdpm->apdo_max_curr = XIAOMI_LOW_POWER_PPS_CURR_MAX;
-		pval.intval = (pdpm->apdo_max_volt / 1000) * (pdpm->apdo_max_curr / 1000);
+		pval.intval = (pdpm->apdo_max_volt / 1000) * (pdpm->apdo_max_curr / 10) / 100;
+		if (pval.intval < apdo_max) {
+			pval.intval = apdo_max;
+		}
 		power_supply_set_property(pdpm->usb_psy,
 				POWER_SUPPLY_PROP_APDO_MAX, &pval);
 	} else {
@@ -1137,8 +1148,8 @@ static int usbpd_pm_fc2_charge_algo(struct usbpd_pm *pdpm)
 	pr_info("steps: %d, sw_ctrl_steps:%d, hw_ctrl_steps:%d\n", steps, sw_ctrl_steps, hw_ctrl_steps);
 	pdpm->request_voltage += steps * STEP_MV;
 
-	if (pdpm->apdo_max_volt == PPS_VOL_MAX)
-		pdpm->apdo_max_volt = pdpm->apdo_max_volt - PPS_VOL_HYS;
+//	if (pdpm->apdo_max_volt == PPS_VOL_MAX)
+//		pdpm->apdo_max_volt = pdpm->apdo_max_volt - PPS_VOL_HYS;
 
 	if (pdpm->request_voltage > pdpm->apdo_max_volt)
 		pdpm->request_voltage = pdpm->apdo_max_volt;
@@ -1480,9 +1491,12 @@ static void usbpd_pm_disconnect(struct usbpd_pm *pdpm)
 
 	cancel_delayed_work_sync(&pdpm->pm_work);
 
-	if (pdpm->fcc_votable)
+	if (pdpm->fcc_votable) {
 		vote(pdpm->fcc_votable, BQ_TAPER_FCC_VOTER,
 				false, 0);
+		vote(pdpm->fcc_votable, PD_UNVERIFED_VOTER,
+				false, 0);
+	}
 	pdpm->pps_supported = false;
 	pdpm->jeita_triggered = false;
 	pdpm->is_temp_out_fc2_range = false;
@@ -1527,8 +1541,19 @@ static void usbpd_pps_non_verified_contact(struct usbpd_pm *pdpm, bool connected
 
 	if (connected) {
 		usbpd_pm_evaluate_src_caps(pdpm);
-		if (pdpm->pps_supported)
+		if (pdpm->pps_supported){
+			if (!pdpm->fcc_votable)
+				pdpm->fcc_votable = find_votable("FCC");
+
+			if ((pdpm->apdo_max_volt / 1000) * (pdpm->apdo_max_curr / 1000) < 33) {
+				if (pdpm->fcc_votable)
+					vote(pdpm->fcc_votable, PD_UNVERIFED_VOTER, true, PD_UNVERIFED_CURRENT_LOW);
+			} else {
+				if (pdpm->fcc_votable)
+					vote(pdpm->fcc_votable, PD_UNVERIFED_VOTER, true, PD_UNVERIFED_CURRENT_HIGH);
+			}
 			schedule_delayed_work(&pdpm->pm_work, 5*HZ);
+		}
 	} else {
 		usbpd_pm_disconnect(pdpm);
 	}

drivers/power/supply/ti/pd_policy_manager.h

@@ -68,9 +68,12 @@ enum pm_state {
 /* voters for usbpd */
 #define STEP_BMS_CHG_VOTER	"STEP_BMS_CHG_VOTER"
 #define BQ_TAPER_FCC_VOTER	"BQ_TAPER_FCC_VOTER"
+#define PD_UNVERIFED_VOTER  "PD_UNVERIFED_VOTER"
 
 /* defined for non_verified pps charger maxium fcc */
 #define NON_VERIFIED_PPS_FCC_MAX		3000
+#define PD_UNVERIFED_CURRENT_LOW        4300000
+#define PD_UNVERIFED_CURRENT_HIGH       5600000
 #define MAX_THERMAL_LEVEL			13
 /* jeita related */
 #ifdef CONFIG_K6_CHARGE