Merge "power: qpnp-fg-gen4: disable parallel charging during battery removal" (2353e399) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/power/supply/qcom/qpnp-fg-gen4.c

+43 −11

Original line number	Diff line number	Diff line
		@@ -215,8 +215,11 @@ struct fg_gen4_chip {
		struct cap_learning *cl;
		struct ttf *ttf;
		struct votable *delta_esr_irq_en_votable;
		struct votable *pl_disable_votable;
		struct votable *cp_disable_votable;
		struct work_struct esr_calib_work;
		struct alarm esr_fast_cal_timer;
		struct delayed_work pl_enable_work;
		char batt_profile[PROFILE_LEN];
		int delta_esr_count;
		int recharge_soc_thr;
		@@ -1599,10 +1602,12 @@ static void profile_load_work(struct work_struct *work)
		batt_psy_initialized(fg);
		fg_notify_charger(fg);

		schedule_delayed_work(&chip->ttf->ttf_work, 10000);
		schedule_delayed_work(&chip->ttf->ttf_work, msecs_to_jiffies(10000));
		fg_dbg(fg, FG_STATUS, "profile loaded successfully");
		out:
		fg->soc_reporting_ready = true;
		vote(fg->awake_votable, ESR_FCC_VOTER, true, 0);
		schedule_delayed_work(&chip->pl_enable_work, msecs_to_jiffies(5000));
		vote(fg->awake_votable, PROFILE_LOAD, false, 0);
		if (!work_pending(&fg->status_change_work)) {
		pm_stay_awake(fg->dev);
		@@ -2155,6 +2160,12 @@ static irqreturn_t fg_batt_missing_irq_handler(int irq, void *data)
		kfree(chip->ttf->step_chg_data);
		chip->ttf->step_chg_data = NULL;
		mutex_unlock(&chip->ttf->lock);
		cancel_delayed_work_sync(&chip->pl_enable_work);
		vote(fg->awake_votable, ESR_FCC_VOTER, false, 0);
		if (chip->pl_disable_votable)
		vote(chip->pl_disable_votable, ESR_FCC_VOTER, true, 0);
		if (chip->cp_disable_votable)
		vote(chip->cp_disable_votable, ESR_FCC_VOTER, true, 0);
		return IRQ_HANDLED;
		}

		@@ -2727,6 +2738,20 @@ static void esr_calib_work(struct work_struct *work)
		vote(fg->awake_votable, ESR_CALIB, false, 0);
		}

		static void pl_enable_work(struct work_struct *work)
		{
		struct fg_gen4_chip *chip = container_of(work,
		struct fg_gen4_chip,
		pl_enable_work.work);
		struct fg_dev *fg = &chip->fg;

		if (chip->pl_disable_votable)
		vote(chip->pl_disable_votable, ESR_FCC_VOTER, false, 0);
		if (chip->cp_disable_votable)
		vote(chip->cp_disable_votable, ESR_FCC_VOTER, false, 0);
		vote(fg->awake_votable, ESR_FCC_VOTER, false, 0);
		}

		static void status_change_work(struct work_struct *work)
		{
		struct fg_dev *fg = container_of(work,
		@@ -2735,6 +2760,12 @@ static void status_change_work(struct work_struct *work)
		int rc, batt_soc, batt_temp;
		bool input_present, qnovo_en;

		if (!chip->pl_disable_votable)
		chip->pl_disable_votable = find_votable("PL_DISABLE");

		if (!chip->cp_disable_votable)
		chip->cp_disable_votable = find_votable("CP_DISABLE");

		if (!batt_psy_initialized(fg)) {
		fg_dbg(fg, FG_STATUS, "Charger not available?!\n");
		goto out;
		@@ -4166,6 +4197,17 @@ static int fg_gen4_probe(struct platform_device *pdev)
		return -ENXIO;
		}

		mutex_init(&fg->bus_lock);
		mutex_init(&fg->sram_rw_lock);
		mutex_init(&fg->charge_full_lock);
		init_completion(&fg->soc_update);
		init_completion(&fg->soc_ready);
		INIT_WORK(&fg->status_change_work, status_change_work);
		INIT_WORK(&chip->esr_calib_work, esr_calib_work);
		INIT_DELAYED_WORK(&fg->profile_load_work, profile_load_work);
		INIT_DELAYED_WORK(&fg->sram_dump_work, sram_dump_work);
		INIT_DELAYED_WORK(&chip->pl_enable_work, pl_enable_work);

		fg->awake_votable = create_votable("FG_WS", VOTE_SET_ANY,
		fg_awake_cb, fg);
		if (IS_ERR(fg->awake_votable)) {
		@@ -4218,16 +4260,6 @@ static int fg_gen4_probe(struct platform_device *pdev)
		}
		}

		mutex_init(&fg->bus_lock);
		mutex_init(&fg->sram_rw_lock);
		mutex_init(&fg->charge_full_lock);
		init_completion(&fg->soc_update);
		init_completion(&fg->soc_ready);
		INIT_WORK(&fg->status_change_work, status_change_work);
		INIT_DELAYED_WORK(&fg->profile_load_work, profile_load_work);
		INIT_DELAYED_WORK(&fg->sram_dump_work, sram_dump_work);
		INIT_WORK(&chip->esr_calib_work, esr_calib_work);

		rc = fg_memif_init(fg);
		if (rc < 0) {
		dev_err(fg->dev, "Error in initializing FG_MEMIF, rc:%d\n",