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

Commit b41a4385 authored by Anirudh Ghayal's avatar Anirudh Ghayal Committed by Gerrit - the friendly Code Review server
Browse files

regulator: cpr-regulator: Disable closed-loop CPR in power-collapse 



Add logic to disable closed-loop CPR in power-collapse by
registering for PM notifications.

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

Documentation/devicetree/bindings/regulator/cpr-regulator.txt

+3 −1
Original line number Diff line number Diff line
@@ -719,7 +719,9 @@ Optional properties: 
				closed-loop is enabled. CPR closed-loop will stay enabled above this

				temperature threshold. This property is required only if

				'qcom,cpr-thermal-sensor-id' is present.



- qcom,disable-closed-loop-in-pc:	Bool property to disable closed-loop CPR during

				power-collapse. This can be enabled only for single core

				designs. The property 'qcom,cpr-cpus' is required to enable this logic.

Example:

	apc_vreg_corner: regulator@f9018000 {

		status = "okay";

drivers/regulator/cpr-regulator.c

+82 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/module.h>

#include <linux/cpu.h>

#include <linux/cpu_pm.h>

#include <linux/cpumask.h>

#include <linux/delay.h>

#include <linux/err.h>
@@ -396,6 +397,8 @@ struct cpr_regulator { 
	bool			adj_cpus_open_loop_volt_as_ceiling;

	struct notifier_block	cpu_notifier;

	cpumask_t		cpu_mask;

	bool			cpr_disabled_in_pc;

	struct notifier_block	pm_notifier;



	bool		is_cpr_suspended;

	bool		skip_voltage_change_during_suspend;
@@ -4605,6 +4608,56 @@ done: 
	return NOTIFY_OK;

}



static void cpr_pm_disable(struct cpr_regulator *cpr_vreg, bool disable)

{

	u32 reg_val;



	if (cpr_vreg->is_cpr_suspended)

		return;



	reg_val = cpr_read(cpr_vreg, REG_RBCPR_CTL);



	if (disable) {

		/* Proceed only if CPR is enabled */

		if (!(reg_val & RBCPR_CTL_LOOP_EN))

			return;

		cpr_ctl_disable(cpr_vreg);

		cpr_vreg->cpr_disabled_in_pc = true;

	} else {

		/* Proceed only if CPR was disabled in PM_ENTER */

		if (!cpr_vreg->cpr_disabled_in_pc)

			return;

		cpr_vreg->cpr_disabled_in_pc = false;

		cpr_ctl_enable(cpr_vreg, cpr_vreg->corner);

	}



	/* Make sure register write is complete */

	mb();

}



static int cpr_pm_callback(struct notifier_block *nb,

			    unsigned long action, void *data)

{

	struct cpr_regulator *cpr_vreg = container_of(nb,

			struct cpr_regulator, pm_notifier);



	if (action != CPU_PM_ENTER && action != CPU_PM_ENTER_FAILED &&

			action != CPU_PM_EXIT)

		return NOTIFY_OK;



	switch (action) {

	case CPU_PM_ENTER:

		cpr_pm_disable(cpr_vreg, true);

		break;

	case CPU_PM_ENTER_FAILED:

	case CPU_PM_EXIT:

		cpr_pm_disable(cpr_vreg, false);

		break;

	}



	return NOTIFY_OK;

}



static int cpr_parse_adj_cpus_init_voltage(struct cpr_regulator *cpr_vreg,

		struct device *dev)

{
@@ -4915,6 +4968,25 @@ static int cpr_init_per_cpu_adjustments(struct cpr_regulator *cpr_vreg, 
	return rc;

}



static int cpr_init_pm_notification(struct cpr_regulator *cpr_vreg)

{

	int rc;



	/* enabled only for single-core designs */

	if (cpr_vreg->num_adj_cpus != 1) {

		pr_warn("qcom,cpr-cpus not defined or invalid %d\n",

					cpr_vreg->num_adj_cpus);

		return 0;

	}



	cpr_vreg->pm_notifier.notifier_call = cpr_pm_callback;

	rc = cpu_pm_register_notifier(&cpr_vreg->pm_notifier);

	if (rc)

		cpr_err(cpr_vreg, "Unable to register pm notifier rc=%d\n", rc);



	return rc;

}



static int cpr_rpm_apc_init(struct platform_device *pdev,

			       struct cpr_regulator *cpr_vreg)

{
@@ -6077,6 +6149,16 @@ static int cpr_regulator_probe(struct platform_device *pdev) 
		return rc;

	}



	if (of_property_read_bool(pdev->dev.of_node,

				"qcom,disable-closed-loop-in-pc")) {

		rc = cpr_init_pm_notification(cpr_vreg);

		if (rc) {

			cpr_err(cpr_vreg,

				"cpr_init_pm_notification failed rc=%d\n", rc);

			return rc;

		}

	}



	/* Load per-online CPU adjustment data */

	rc = cpr_init_per_cpu_adjustments(cpr_vreg, &pdev->dev);

	if (rc) {