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

Commit 6c7a1c1e authored by David Collins's avatar David Collins
Browse files

clk: qcom: gdsc-regulator: use mode control for disable skipping feature 



If the disable skipping feature is allowed in device tree, then
use regulator_set_mode() to control the feature's usage at
runtime.  This is needed for SM8150 gpu_cx_gdsc in order to
facilitate GMU hang recovery.

REGULATOR_MODE_NORMAL (default) --> physical GDSC disable skipped
REGULATOR_MODE_IDLE             --> physical GDSC disable occurs

Change-Id: I7eac1cbdd3f505d96bdffd30a7e8b36bcaafb26e
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent df788c95

drivers/clk/qcom/gdsc-regulator.c

+36 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct gdsc { 
	bool			force_root_en;

	bool			no_status_check_on_disable;

	bool			skip_disable;

	bool			bypass_skip_disable;

	bool			is_gdsc_enabled;

	bool			allow_clear;

	bool			reset_aon;
@@ -467,7 +468,7 @@ static int gdsc_disable(struct regulator_dev *rdev) 
	/* Delay to account for staggered memory powerdown. */

	udelay(1);



	if (sc->skip_disable) {

	if (sc->skip_disable && !sc->bypass_skip_disable) {

		/*

		 * Don't change the GDSCR register state on disable.  AOP will

		 * handle this during system sleep.
@@ -538,6 +539,12 @@ static unsigned int gdsc_get_mode(struct regulator_dev *rdev) 
	uint32_t regval;

	int ret;



	if (sc->skip_disable) {

		if (sc->bypass_skip_disable)

			return REGULATOR_MODE_IDLE;

		return REGULATOR_MODE_NORMAL;

	}



	mutex_lock(&gdsc_seq_lock);



	if (sc->parent_regulator) {
@@ -597,6 +604,23 @@ static int gdsc_set_mode(struct regulator_dev *rdev, unsigned int mode) 


	mutex_lock(&gdsc_seq_lock);



	if (sc->skip_disable) {

		switch (mode) {

		case REGULATOR_MODE_IDLE:

			sc->bypass_skip_disable = true;

			break;

		case REGULATOR_MODE_NORMAL:

			sc->bypass_skip_disable = false;

			break;

		default:

			ret = -EINVAL;

			break;

		}



		mutex_unlock(&gdsc_seq_lock);

		return ret;

	}



	if (sc->parent_regulator) {

		ret = regulator_set_voltage(sc->parent_regulator,

				RPMH_REGULATOR_LEVEL_LOW_SVS, INT_MAX);
@@ -920,6 +944,17 @@ static int gdsc_probe(struct platform_device *pdev) 
				REGULATOR_MODE_NORMAL | REGULATOR_MODE_FAST;

	}



	if (sc->skip_disable) {

		/*

		 * If the disable skipping feature is allowed, then use mode

		 * control to enable and disable the feature at runtime instead

		 * of using it to enable and disable hardware triggering.

		 */

		init_data->constraints.valid_ops_mask |= REGULATOR_CHANGE_MODE;

		init_data->constraints.valid_modes_mask =

				REGULATOR_MODE_NORMAL | REGULATOR_MODE_IDLE;

	}



	if (!sc->toggle_logic) {

		sc->reset_count = of_property_count_strings(pdev->dev.of_node,

					    "reset-names");