Merge pull request #378 from FrameworkComputer/batt_disconnect

[modify] double check battery D-FET state

Author: kiram9

board/hx20/battery.c

@@ -40,6 +40,7 @@ static const struct battery_info info = {
 	.discharging_max_c = 62,
 };
 
+static enum battery_present batt_pres_prev = BP_NOT_SURE;
 static uint8_t charging_maximum_level = NEED_RESTORE;
 static int old_btp;
 
@@ -80,19 +81,51 @@ __override void battery_charger_notify(uint8_t flag)
 	}
 }
 
+static int battery_check_disconnect(void)
+{
+	int rv;
+	uint8_t data[6];
+
+	/* Check if battery charging + discharging is disabled. */
+	rv = sb_read_mfgacc(PARAM_OPERATION_STATUS,
+			    SB_ALT_MANUFACTURER_ACCESS, data, sizeof(data));
+	if (rv)
+		return BATTERY_DISCONNECT_ERROR;
+
+	if (data[3] & BATTERY_DISCHARGING_DISABLED)
+		return BATTERY_DISCONNECTED;
+
+
+	return BATTERY_NOT_DISCONNECTED;
+}
+
 enum battery_present battery_is_present(void)
 {
-	enum battery_present bp;
+	enum battery_present batt_pres;
 	int mv;
 
 	mv = adc_read_channel(ADC_VCIN1_BATT_TEMP);
+	batt_pres = (mv < 3000 ? BP_YES : BP_NO);
 
 	if (mv == ADC_READ_ERROR)
-		return -1;
+		return BP_NO;
+
+	/*
+	 * If the battery is present now and was present last time we checked,
+	 * return early.
+	 */
+	if (batt_pres == BP_YES && batt_pres_prev == batt_pres)
+		return batt_pres;
+
+
+	if (!batt_pres)
+		return BP_NO;
+	else if (battery_check_disconnect() != BATTERY_NOT_DISCONNECTED)
+		return BP_NOT_SURE;
 
-	bp = (mv < 3000 ? BP_YES : BP_NO);
+	batt_pres_prev = batt_pres;
 
-	return bp;
+	return batt_pres;
 }
 
 #ifdef CONFIG_EMI_REGION1
@@ -111,7 +144,7 @@ void battery_customize(struct charge_state_data *emi_info)
 	int year = 0;
 
 	/* manufacture date is static data */
-	if (!read_manuf_date && battery_is_present()) {
+	if (!read_manuf_date && battery_is_present() == BP_YES) {
 		rv = battery_manufacture_date(&year, &month, &day);
 		if (rv == EC_SUCCESS) {
 			ccprintf("Batt manufacturer date: %d.%d.%d\n", year, month, day);

board/hx20/board.h

@@ -161,6 +161,7 @@
 
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_BATTERY_SMART
+#define CONFIG_BATTERY_PRESENT_CUSTOM
 #define CONFIG_BOARD_VERSION_CUSTOM
 #define CONFIG_CHARGE_MANAGER
 /* #define CONFIG_CHARGE_RAMP_SW */

board/hx20/cypress5525.c

@@ -357,8 +357,7 @@ void cypd_update_power(void)
 	}
 
 	if (extpower_is_present() ||
-	 (charger_current_battery_params()->flags & BATT_FLAG_RESPONSIVE &&
-		 charger_current_battery_params()->state_of_charge > 0))
+		battery_is_present() == BP_YES)
 		system_power_present = 1;
 	else
 		system_power_present = 0;
@@ -369,8 +368,7 @@ int cypd_update_power_status(void)
 	int i;
 	int rv = EC_SUCCESS;
 	int power_stat = 0;
-	if (charger_current_battery_params()->flags & BATT_FLAG_RESPONSIVE &&
-		charger_current_battery_params()->state_of_charge > 0) {
+	if (battery_is_present() == BP_YES) {
 		power_stat |= BIT(3);
 	}
 	if (extpower_is_present()) {
@@ -670,7 +668,7 @@ void cypd_response_get_battery_capability(int controller, int port,
 	/* Set PID */
 	msg[1] = PRODUCT_ID;
 
-	if (battery_is_present()) {
+	if (battery_is_present() == BP_YES) {
 		/*
 		 * We only have one fixed battery,
 		 * so make sure batt cap ref is 0.
@@ -735,7 +733,7 @@ int cypd_response_get_battery_status(int controller, int port, uint32_t pd_heade
 	uint32_t header = PD_DATA_BATTERY_STATUS + PD_HEADER_SOP(sop_type);
 	int port_idx = (controller << 1) + port;
 
-	if (battery_is_present()) {
+	if (battery_is_present() == BP_YES) {
 		/*
 		 * We only have one fixed battery,
 		 * so make sure batt cap ref is 0.