Re: [PATCH v8 03/13] clk: qcom: gdsc: Add support for Memory RET/OFF

2015-08-11 Thread Stephen Boyd
On 08/06, Rajendra Nayak wrote:
 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 rna...@codeaurora.org
 ---

Applied to clk-next

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line unsubscribe linux-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v8 03/13] clk: qcom: gdsc: Add support for Memory RET/OFF

2015-08-06 Thread Rajendra Nayak
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 rna...@codeaurora.org
---
 drivers/clk/qcom/gdsc.c | 33 +
 drivers/clk/qcom/gdsc.h | 13 +
 2 files changed, 46 insertions(+)

diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c
index 469b4c4..e6bbb76 100644
--- a/drivers/clk/qcom/gdsc.c
+++ b/drivers/clk/qcom/gdsc.c
@@ -34,6 +34,9 @@
 #define EN_FEW_WAIT_VAL(0x8  16)
 #define CLK_DIS_WAIT_VAL   (0x2  12)
 
+#define RETAIN_MEM BIT(14)
+#define RETAIN_PERIPH  BIT(13)
+
 #define TIMEOUT_US 100
 
 #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;
 }
 
+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)
 {
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);
if (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
 * 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);
 
+   if (sc-pwrsts  PWRSTS_OFF)
+   gdsc_clear_mem_on(sc);
+
return gdsc_toggle_logic(sc, false);
 }
 
@@ -129,6 +157,11 @@ static int gdsc_init(struct gdsc *sc)
if (on  0)
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_on = gdsc_enable;
pm_genpd_init(sc-pd, NULL, !on);
diff --git a/drivers/clk/qcom/gdsc.h b/drivers/clk/qcom/gdsc.h
index f578a0c..0ff251a 100644
--- a/drivers/clk/qcom/gdsc.h
+++ b/drivers/clk/qcom/gdsc.h
@@ -19,16 +19,29 @@
 
 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
  * @pd: generic power domain
  * @regmap: regmap for MMIO accesses
  * @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 generic_pm_domainpd;
struct regmap   *regmap;
unsigned intgdscr;
+   unsigned int*cxcs;
+   unsigned intcxc_count;
+   const u8pwrsts;
 };
 
 #ifdef CONFIG_QCOM_GDSC
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

--
To unsubscribe from this list: send the line unsubscribe linux-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html