Merge "power: qpnp-bms: estimate OCVs based on temperature" (aee01321) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qpnp-bms.c

+28 −29

Original line number	Diff line number	Diff line
		@@ -907,13 +907,32 @@ static int get_simultaneous_batt_v_and_i(struct qpnp_bms_chip *chip,
		return 0;
		}

		static int estimate_ocv(struct qpnp_bms_chip *chip)
		static int get_rbatt(struct qpnp_bms_chip *chip,
		int soc_rbatt_mohm, int batt_temp)
		{
		int ibat_ua, vbat_uv, ocv_est_uv;
		int rc;
		int rbatt_mohm = chip->default_rbatt_mohm + chip->r_conn_mohm
		+ chip->rbatt_capacitive_mohm;
		int rbatt_mohm, scalefactor;

		rbatt_mohm = chip->default_rbatt_mohm;
		if (chip->rbatt_sf_lut == NULL) {
		pr_debug("RBATT = %d\n", rbatt_mohm);
		return rbatt_mohm;
		}
		/* Convert the batt_temp to DegC from deciDegC */
		scalefactor = interpolate_scalingfactor(chip->rbatt_sf_lut,
		batt_temp, soc_rbatt_mohm);
		rbatt_mohm = (rbatt_mohm * scalefactor) / 100;

		rbatt_mohm += chip->r_conn_mohm;
		rbatt_mohm += chip->rbatt_capacitive_mohm;
		return rbatt_mohm;
		}

		#define DEFAULT_RBATT_SOC 50
		static int estimate_ocv(struct qpnp_bms_chip *chip, int batt_temp)
		{
		int ibat_ua, vbat_uv, ocv_est_uv, rbatt_mohm, rc;

		rbatt_mohm = get_rbatt(chip, DEFAULT_RBATT_SOC, batt_temp);
		rc = get_simultaneous_batt_v_and_i(chip, &ibat_ua, &vbat_uv);
		if (rc) {
		pr_err("simultaneous failed rc = %d\n", rc);
		@@ -921,7 +940,8 @@ static int estimate_ocv(struct qpnp_bms_chip *chip)
		}

		ocv_est_uv = vbat_uv + (ibat_ua * rbatt_mohm) / 1000;
		pr_debug("estimated pon ocv = %d\n", ocv_est_uv);
		pr_debug("estimated pon ocv = %d, vbat_uv = %d ibat_ua = %d rbatt_mohm = %d\n",
		ocv_est_uv, vbat_uv, ibat_ua, rbatt_mohm);
		return ocv_est_uv;
		}

		@@ -1046,10 +1066,9 @@ static int read_soc_params_raw(struct qpnp_bms_chip *chip,
		pr_debug("PON_OCV_UV = %d, cc = %llx\n",
		chip->last_ocv_uv, raw->cc);
		warm_reset = qpnp_pon_is_warm_reset();
		if (raw->last_good_ocv_uv < MIN_OCV_UV
		\|\| warm_reset > 0) {
		if (raw->last_good_ocv_uv < MIN_OCV_UV \|\| warm_reset > 0) {
		pr_debug("OCV is stale or bad, estimating new OCV.\n");
		chip->last_ocv_uv = estimate_ocv(chip);
		chip->last_ocv_uv = estimate_ocv(chip, batt_temp);
		raw->last_good_ocv_uv = chip->last_ocv_uv;
		reset_cc(chip, CLEAR_CC \| CLEAR_SHDW_CC);
		pr_debug("New PON_OCV_UV = %d, cc = %llx\n",
		@@ -1218,26 +1237,6 @@ static int calculate_cc(struct qpnp_bms_chip *chip, int64_t cc,
		}
		}

		static int get_rbatt(struct qpnp_bms_chip *chip,
		int soc_rbatt_mohm, int batt_temp)
		{
		int rbatt_mohm, scalefactor;

		rbatt_mohm = chip->default_rbatt_mohm;
		if (chip->rbatt_sf_lut == NULL) {
		pr_debug("RBATT = %d\n", rbatt_mohm);
		return rbatt_mohm;
		}
		/* Convert the batt_temp to DegC from deciDegC */
		scalefactor = interpolate_scalingfactor(chip->rbatt_sf_lut,
		batt_temp, soc_rbatt_mohm);
		rbatt_mohm = (rbatt_mohm * scalefactor) / 100;

		rbatt_mohm += chip->r_conn_mohm;
		rbatt_mohm += chip->rbatt_capacitive_mohm;
		return rbatt_mohm;
		}

		#define IAVG_MINIMAL_TIME 2
		static void calculate_iavg(struct qpnp_bms_chip *chip, int cc_uah,
		int *iavg_ua, int delta_time_s)