Browse Source

clk: qcom: gdsc: Add support for Memory RET/OFF

Along with the GDSC power switch, there is additional control
to either retain all memory (core and peripheral) within a given
powerdomain or to turn them off while the GDSC is powered down.
Add support for these by modelling a RET state where all
memory is retained and an OFF state where all memory gets turned
off.
The controls provided are granular enough to be able to support
various differnt levels of RET states, like a 'shallow RET' with all memory
retained and a 'deep RET' with some memory retained while some others
are lost. The current patch does not support this and considers
just one RET state where all memory is retained. Futher work, if
needed can support multiple different levels of RET state.

Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Rajendra Nayak 10 years ago
parent
commit
014e193ccd
2 changed files with 46 additions and 0 deletions
  1. 33 0
      drivers/clk/qcom/gdsc.c
  2. 13 0
      drivers/clk/qcom/gdsc.h

+ 33 - 0
drivers/clk/qcom/gdsc.c

@@ -34,6 +34,9 @@
 #define EN_FEW_WAIT_VAL		(0x8 << 16)
 #define EN_FEW_WAIT_VAL		(0x8 << 16)
 #define CLK_DIS_WAIT_VAL	(0x2 << 12)
 #define CLK_DIS_WAIT_VAL	(0x2 << 12)
 
 
+#define RETAIN_MEM		BIT(14)
+#define RETAIN_PERIPH		BIT(13)
+
 #define TIMEOUT_US		100
 #define TIMEOUT_US		100
 
 
 #define domain_to_gdsc(domain) container_of(domain, struct gdsc, pd)
 #define domain_to_gdsc(domain) container_of(domain, struct gdsc, pd)
@@ -81,6 +84,24 @@ static int gdsc_toggle_logic(struct gdsc *sc, bool en)
 	return -ETIMEDOUT;
 	return -ETIMEDOUT;
 }
 }
 
 
+static inline void gdsc_force_mem_on(struct gdsc *sc)
+{
+	int i;
+	u32 mask = RETAIN_MEM | RETAIN_PERIPH;
+
+	for (i = 0; i < sc->cxc_count; i++)
+		regmap_update_bits(sc->regmap, sc->cxcs[i], mask, mask);
+}
+
+static inline void gdsc_clear_mem_on(struct gdsc *sc)
+{
+	int i;
+	u32 mask = RETAIN_MEM | RETAIN_PERIPH;
+
+	for (i = 0; i < sc->cxc_count; i++)
+		regmap_update_bits(sc->regmap, sc->cxcs[i], mask, 0);
+}
+
 static int gdsc_enable(struct generic_pm_domain *domain)
 static int gdsc_enable(struct generic_pm_domain *domain)
 {
 {
 	struct gdsc *sc = domain_to_gdsc(domain);
 	struct gdsc *sc = domain_to_gdsc(domain);
@@ -89,6 +110,10 @@ static int gdsc_enable(struct generic_pm_domain *domain)
 	ret = gdsc_toggle_logic(sc, true);
 	ret = gdsc_toggle_logic(sc, true);
 	if (ret)
 	if (ret)
 		return ret;
 		return ret;
+
+	if (sc->pwrsts & PWRSTS_OFF)
+		gdsc_force_mem_on(sc);
+
 	/*
 	/*
 	 * If clocks to this power domain were already on, they will take an
 	 * If clocks to this power domain were already on, they will take an
 	 * additional 4 clock cycles to re-enable after the power domain is
 	 * additional 4 clock cycles to re-enable after the power domain is
@@ -105,6 +130,9 @@ static int gdsc_disable(struct generic_pm_domain *domain)
 {
 {
 	struct gdsc *sc = domain_to_gdsc(domain);
 	struct gdsc *sc = domain_to_gdsc(domain);
 
 
+	if (sc->pwrsts & PWRSTS_OFF)
+		gdsc_clear_mem_on(sc);
+
 	return gdsc_toggle_logic(sc, false);
 	return gdsc_toggle_logic(sc, false);
 }
 }
 
 
@@ -129,6 +157,11 @@ static int gdsc_init(struct gdsc *sc)
 	if (on < 0)
 	if (on < 0)
 		return on;
 		return on;
 
 
+	if (on || (sc->pwrsts & PWRSTS_RET))
+		gdsc_force_mem_on(sc);
+	else
+		gdsc_clear_mem_on(sc);
+
 	sc->pd.power_off = gdsc_disable;
 	sc->pd.power_off = gdsc_disable;
 	sc->pd.power_on = gdsc_enable;
 	sc->pd.power_on = gdsc_enable;
 	pm_genpd_init(&sc->pd, NULL, !on);
 	pm_genpd_init(&sc->pd, NULL, !on);

+ 13 - 0
drivers/clk/qcom/gdsc.h

@@ -19,16 +19,29 @@
 
 
 struct regmap;
 struct regmap;
 
 
+/* Powerdomain allowable state bitfields */
+#define PWRSTS_OFF		BIT(0)
+#define PWRSTS_RET		BIT(1)
+#define PWRSTS_ON		BIT(2)
+#define PWRSTS_OFF_ON		(PWRSTS_OFF | PWRSTS_ON)
+#define PWRSTS_RET_ON		(PWRSTS_RET | PWRSTS_ON)
+
 /**
 /**
  * struct gdsc - Globally Distributed Switch Controller
  * struct gdsc - Globally Distributed Switch Controller
  * @pd: generic power domain
  * @pd: generic power domain
  * @regmap: regmap for MMIO accesses
  * @regmap: regmap for MMIO accesses
  * @gdscr: gsdc control register
  * @gdscr: gsdc control register
+ * @cxcs: offsets of branch registers to toggle mem/periph bits in
+ * @cxc_count: number of @cxcs
+ * @pwrsts: Possible powerdomain power states
  */
  */
 struct gdsc {
 struct gdsc {
 	struct generic_pm_domain	pd;
 	struct generic_pm_domain	pd;
 	struct regmap			*regmap;
 	struct regmap			*regmap;
 	unsigned int			gdscr;
 	unsigned int			gdscr;
+	unsigned int			*cxcs;
+	unsigned int			cxc_count;
+	const u8			pwrsts;
 };
 };
 
 
 #ifdef CONFIG_QCOM_GDSC
 #ifdef CONFIG_QCOM_GDSC