Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9208710 authored by Anirudh Ghayal's avatar Anirudh Ghayal
Browse files

power: qpnp-vm-bms: Manage state-change IRQ only during charging 



Managing (enable/disable) the state-change IRQ during suspend/resume
may cause this IRQ trigger very frequently. The real use of this IRQ
is only during charging, hence enable/disable the IRQ only when we
start charging/discharging.

Change-Id: I962d442520315be41fdab860e71963bf49fa29bf
Signed-off-by: default avatarAnirudh Ghayal <aghayal@codeaurora.org>
parent be34c286

drivers/power/qpnp-vm-bms.c

+26 −15
Original line number Diff line number Diff line
@@ -889,6 +889,12 @@ static void charging_began(struct qpnp_bms_chip *chip) 


	mutex_unlock(&chip->last_soc_mutex);



	/*

	 * Enable the state change irq to handle state

	 * changes while charging

	 */

	enable_bms_irq(&chip->fsm_state_change_irq);



	if (chip->dt.cfg_force_s2_in_charging) {

		pr_debug("Forcing S2 state\n");

		force_fsm_state(chip, S2_STATE);
@@ -913,6 +919,12 @@ static void charging_ended(struct qpnp_bms_chip *chip) 
		pr_debug("Unforcing S2 state, setting AUTO\n");

		set_auto_fsm_state(chip);

	}



	/*

	 * Disable the state change IRQ to ignore state

	 * changes while we are not charging

	 */

	disable_bms_irq(&chip->fsm_state_change_irq);

}



static int estimate_ocv(struct qpnp_bms_chip *chip)
@@ -2155,12 +2167,16 @@ static int bms_request_irqs(struct qpnp_bms_chip *chip) 
	SPMI_REQUEST_IRQ(chip, rc, fifo_update_done);

	if (rc < 0)

		return rc;



	SPMI_REQUEST_IRQ(chip, rc, fsm_state_change);

	if (rc < 0)

		return rc;



	/*

	 * Disable the state change IRQ here, it will

	 * be enabled based on the charging status

	 */

	disable_bms_irq(&chip->fsm_state_change_irq);

	enable_irq_wake(chip->fifo_update_done_irq.irq);

	enable_irq_wake(chip->fsm_state_change_irq.irq);



	return 0;

}
@@ -2722,6 +2738,14 @@ static int qpnp_vm_bms_probe(struct spmi_device *spmi) 


	bms_init_defaults(chip);

	bms_load_hw_defaults(chip);



	rc = bms_request_irqs(chip);

	if (rc) {

		pr_err("error requesting bms irqs, rc = %d\n", rc);

		return rc;

	}



	battery_insertion_check(chip);

	battery_status_check(chip);



	/* character device to pass data to the userspace */
@@ -2760,12 +2784,6 @@ static int qpnp_vm_bms_probe(struct spmi_device *spmi) 
		goto fail_get_vtg;

	}



	rc = bms_request_irqs(chip);

	if (rc) {

		pr_err("error requesting bms irqs, rc = %d\n", rc);

		goto fail_get_vtg;

	}



	chip->debug_root = debugfs_create_dir("qpnp_vmbms", NULL);

	if (!chip->debug_root)

		pr_err("Couldn't create debug dir\n");
@@ -2919,13 +2937,6 @@ static int bms_suspend(struct device *dev) 
	chip->charging_while_suspended = is_battery_charging(chip);



	if (!chip->charging_while_suspended) {

		/*

		 * if we are not charging disable state

		 * change IRQ to avoid S1->S3 oscillations

		 */

		disable_irq_wake(chip->fsm_state_change_irq.irq);

		disable_bms_irq(&chip->fsm_state_change_irq);



		if (chip->dt.cfg_force_s3_on_suspend) {

			pr_debug("Forcing S3 state\n");

			force_fsm_state(chip, S3_STATE);