diff mbox series

[RFC,2/4] bus: ti-sysc: Add generic enable/disable functions

Message ID 20190402133752.6912-3-rogerq@ti.com
State New
Headers show
Series bus: ti-sysc: Add generic enable/disable & PRUSS | expand

Commit Message

Roger Quadros April 2, 2019, 1:37 p.m. UTC 
For non legacy cases, add generic sysc_enable_module()
and sysc_disable_module() functions.

Signed-off-by: Roger Quadros <rogerq@ti.com>

---
 drivers/bus/ti-sysc.c | 114 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Comments

Tony Lindgren April 2, 2019, 5:14 p.m. UTC | #1 
* Roger Quadros <rogerq@ti.com> [190402 13:38]:
> For non legacy cases, add generic sysc_enable_module()

> and sysc_disable_module() functions.


Looks OK to me. Can you please add a comment mentioning that we're
not currently blocking clockdomain autoidle? See clkdm_deny_idle()
use in omap_hwmod.c.

> +	if (idlemodes & BIT(SYSC_IDLE_SMART_WKUP)) {

> +		best_mode = SYSC_IDLE_SMART_WKUP;

> +	} else if (idlemodes & BIT(SYSC_IDLE_SMART)) {

> +		best_mode = SYSC_IDLE_SMART;

> +	} else if (idlemodes & SYSC_IDLE_FORCE) {

> +		best_mode = SYSC_IDLE_FORCE;

> +	} else {

> +		dev_err(dev, "%s: invalid midlemode\n", __func__);

> +		return -EINVAL;

> +	}

...

> +	if (idlemodes & BIT(SYSC_IDLE_SMART_WKUP)) {

> +		best_mode = SYSC_IDLE_SMART_WKUP;

> +	} else if (idlemodes & BIT(SYSC_IDLE_SMART)) {

> +		best_mode = SYSC_IDLE_SMART;

> +	} else if (idlemodes & SYSC_IDLE_FORCE) {

> +		best_mode = SYSC_IDLE_FORCE;

> +	} else {

> +		dev_err(dev, "%s: invalid sidlemode\n", __func__);

> +		return -EINVAL;

> +	}


Can you please add a helper function for getting the best
idle mode?

Regards,

Tony
diff mbox series

Patch

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 5c0dd80021cc..1e63b6265764 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -793,6 +793,112 @@  static void sysc_show_registers(struct sysc *ddata)
 		buf);
 }
 
+#define SYSC_IDLE_MASK	(SYSC_NR_IDLEMODES - 1)
+
+static int sysc_enable_module(struct device *dev)
+{
+	struct sysc *ddata;
+	const struct sysc_regbits *regbits;
+	u32 reg, idlemodes, best_mode;
+
+	ddata = dev_get_drvdata(dev);
+	if (ddata->offsets[SYSC_SYSCONFIG] == -ENODEV)
+		return 0;
+
+	regbits = ddata->cap->regbits;
+	reg = sysc_read(ddata, ddata->offsets[SYSC_SYSCONFIG]);
+
+	/* Set SIDLE mode */
+	idlemodes = ddata->cfg.sidlemodes;
+	if (!idlemodes || regbits->sidle_shift < 0)
+		goto set_midle;
+
+	best_mode = fls(ddata->cfg.sidlemodes) - 1;
+	if (best_mode > SYSC_IDLE_MASK) {
+		dev_err(dev, "%s: invalid sidlemode\n", __func__);
+		return -EINVAL;
+	}
+
+	reg &= ~(SYSC_IDLE_MASK << regbits->sidle_shift);
+	reg |= best_mode << regbits->sidle_shift;
+	sysc_write(ddata, ddata->offsets[SYSC_SYSCONFIG], reg);
+
+set_midle:
+	/* Set MIDLE mode */
+	idlemodes = ddata->cfg.midlemodes;
+	if (!idlemodes || regbits->midle_shift < 0)
+		return 0;
+
+	best_mode = fls(ddata->cfg.midlemodes) - 1;
+	if (best_mode > SYSC_IDLE_MASK) {
+		dev_err(dev, "%s: invalid midlemode\n", __func__);
+		return -EINVAL;
+	}
+
+	reg &= ~(SYSC_IDLE_MASK << regbits->midle_shift);
+	reg |= best_mode << regbits->midle_shift;
+	sysc_write(ddata, ddata->offsets[SYSC_SYSCONFIG], reg);
+
+	return 0;
+}
+
+static int sysc_disable_module(struct device *dev)
+{
+	struct sysc *ddata;
+	const struct sysc_regbits *regbits;
+	u32 reg, idlemodes, best_mode;
+
+	ddata = dev_get_drvdata(dev);
+	if (ddata->offsets[SYSC_SYSCONFIG] == -ENODEV)
+		return 0;
+
+	regbits = ddata->cap->regbits;
+	reg = sysc_read(ddata, ddata->offsets[SYSC_SYSCONFIG]);
+
+	/* Set MIDLE mode */
+	idlemodes = ddata->cfg.midlemodes;
+	if (!idlemodes || regbits->midle_shift < 0)
+		goto set_sidle;
+
+	if (idlemodes & BIT(SYSC_IDLE_SMART_WKUP)) {
+		best_mode = SYSC_IDLE_SMART_WKUP;
+	} else if (idlemodes & BIT(SYSC_IDLE_SMART)) {
+		best_mode = SYSC_IDLE_SMART;
+	} else if (idlemodes & SYSC_IDLE_FORCE) {
+		best_mode = SYSC_IDLE_FORCE;
+	} else {
+		dev_err(dev, "%s: invalid midlemode\n", __func__);
+		return -EINVAL;
+	}
+
+	reg &= ~(SYSC_IDLE_MASK << regbits->midle_shift);
+	reg |= best_mode << regbits->midle_shift;
+	sysc_write(ddata, ddata->offsets[SYSC_SYSCONFIG], reg);
+
+set_sidle:
+	/* Set SIDLE mode */
+	idlemodes = ddata->cfg.sidlemodes;
+	if (!idlemodes || regbits->sidle_shift < 0)
+		return 0;
+
+	if (idlemodes & BIT(SYSC_IDLE_SMART_WKUP)) {
+		best_mode = SYSC_IDLE_SMART_WKUP;
+	} else if (idlemodes & BIT(SYSC_IDLE_SMART)) {
+		best_mode = SYSC_IDLE_SMART;
+	} else if (idlemodes & SYSC_IDLE_FORCE) {
+		best_mode = SYSC_IDLE_FORCE;
+	} else {
+		dev_err(dev, "%s: invalid sidlemode\n", __func__);
+		return -EINVAL;
+	}
+
+	reg &= ~(SYSC_IDLE_MASK << regbits->sidle_shift);
+	reg |= best_mode << regbits->sidle_shift;
+	sysc_write(ddata, ddata->offsets[SYSC_SYSCONFIG], reg);
+
+	return 0;
+}
+
 static int __maybe_unused sysc_runtime_suspend_legacy(struct device *dev,
 						      struct sysc *ddata)
 {
@@ -849,6 +955,10 @@  static int __maybe_unused sysc_runtime_suspend(struct device *dev)
 		error = sysc_runtime_suspend_legacy(dev, ddata);
 		if (error)
 			return error;
+	} else {
+		error = sysc_disable_module(dev);
+		if (error)
+			return error;
 	}
 
 	sysc_disable_main_clocks(ddata);
@@ -885,6 +995,10 @@  static int __maybe_unused sysc_runtime_resume(struct device *dev)
 		error = sysc_runtime_resume_legacy(dev, ddata);
 		if (error)
 			goto err_main_clocks;
+	} else {
+		error = sysc_enable_module(dev);
+		if (error)
+			goto err_main_clocks;
 	}
 
 	ddata->enabled = true;