All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU
@ 2012-02-20 11:30 Daniel Lezcano
       [not found] ` <4F4785D2.8070200@linaro.org>
  2012-02-27 13:55 ` Samuel Ortiz
  0 siblings, 2 replies; 6+ messages in thread
From: Daniel Lezcano @ 2012-02-20 11:30 UTC (permalink / raw)
  To: sameo; +Cc: linus.walleij, linux-kernel

This patch allows to decouple and recouple the gic from the PRCMU.
This is needed to put the A9 core in retention mode with the cpuidle
driver.

It is based on top of the "DB8500 PRCMU update" patchset.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/mfd/db8500-prcmu.c       |   32 ++++++++++++++++++++++++++++++++
 include/linux/mfd/db8500-prcmu.h |    2 ++
 include/linux/mfd/dbx500-prcmu.h |   16 ++++++++++++++++
 3 files changed, 50 insertions(+)

Index: mfd-2.6/drivers/mfd/db8500-prcmu.c
===================================================================
--- mfd-2.6.orig/drivers/mfd/db8500-prcmu.c
+++ mfd-2.6/drivers/mfd/db8500-prcmu.c
@@ -821,6 +821,38 @@ u8 db8500_prcmu_get_power_state_result(v
 	return readb(tcdm_base + PRCM_ACK_MB0_AP_PWRSTTR_STATUS);
 }
 
+#define PRCMU_A9_MASK_REQ               0x00000328
+#define PRCMU_A9_MASK_REQ_MASK          0x00000001
+#define PRCMU_GIC_DELAY                 1
+
+/* This function decouple the gic from the prcmu */
+int db8500_prcmu_gic_decouple(void)
+{
+	u32 val = readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Set bit 0 register value to 1 */
+	writel(val | PRCMU_A9_MASK_REQ_MASK, _PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Make sure the register is updated */
+	readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Wait a few cycles for the gic mask completion */
+	udelay(PRCMU_GIC_DELAY);
+
+	return 0;
+}
+
+/* This function recouple the gic with the prcmu */
+int db8500_prcmu_gic_recouple(void)
+{
+	u32 val = readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Set bit 0 register value to 0 */
+	writel(val & ~PRCMU_A9_MASK_REQ_MASK, _PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	return 0;
+}
+
 /* This function should only be called while mb0_transfer.lock is held. */
 static void config_wakeups(void)
 {
Index: mfd-2.6/include/linux/mfd/db8500-prcmu.h
===================================================================
--- mfd-2.6.orig/include/linux/mfd/db8500-prcmu.h
+++ mfd-2.6/include/linux/mfd/db8500-prcmu.h
@@ -580,6 +580,8 @@ int db8500_prcmu_load_a9wdog(u8 id, u32
 void db8500_prcmu_system_reset(u16 reset_code);
 int db8500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll);
 u8 db8500_prcmu_get_power_state_result(void);
+int db8500_prcmu_gic_decouple(void);
+int db8500_prcmu_gic_recouple(void);
 void db8500_prcmu_enable_wakeups(u32 wakeups);
 int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state);
 int db8500_prcmu_request_clock(u8 clock, bool enable);
Index: mfd-2.6/include/linux/mfd/dbx500-prcmu.h
===================================================================
--- mfd-2.6.orig/include/linux/mfd/dbx500-prcmu.h
+++ mfd-2.6/include/linux/mfd/dbx500-prcmu.h
@@ -281,6 +281,22 @@ static inline u8 prcmu_get_power_state_r
 		return db8500_prcmu_get_power_state_result();
 }
 
+static inline int prcmu_gic_decouple(void)
+{
+	if (cpu_is_u5500())
+		return -EINVAL;
+	else
+		return db8500_prcmu_gic_decouple();
+}
+
+static inline int prcmu_gic_recouple(void)
+{
+	if (cpu_is_u5500())
+		return -EINVAL;
+	else
+		return db8500_prcmu_gic_recouple();
+}
+
 static inline int prcmu_set_epod(u16 epod_id, u8 epod_state)
 {
 	if (cpu_is_u5500())

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU
       [not found]   ` <4F478D4B.6070602@stericsson.com>
@ 2012-02-24 13:23     ` Daniel Lezcano
  0 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2012-02-24 13:23 UTC (permalink / raw)
  To: Rickard Andersson; +Cc: linus.walleij, sameo, Linux Kernel Mailing List

On 02/24/2012 02:14 PM, Rickard Andersson wrote:
> On 02/24/2012 01:42 PM, Daniel Lezcano wrote:
>> On 02/20/2012 12:30 PM, Daniel Lezcano wrote:
>>> This patch allows to decouple and recouple the gic from the PRCMU.
>>> This is needed to put the A9 core in retention mode with the cpuidle
>>> driver.
>>>
>>> It is based on top of the "DB8500 PRCMU update" patchset.
>> Hi Linus and Rickard,
>>
>> Is it possible you add your acked-by to this patch I sent to Samuel
>> Ortiz ?
>>
>> -- Daniel
>>
>>
> Hi!
>
> It is ok to me.

Thanks Rickard !

Acked-by: Rickard Andersson <rickard.andersson@stericsson.com>


-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU
  2012-02-20 11:30 [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU Daniel Lezcano
       [not found] ` <4F4785D2.8070200@linaro.org>
@ 2012-02-27 13:55 ` Samuel Ortiz
  1 sibling, 0 replies; 6+ messages in thread
From: Samuel Ortiz @ 2012-02-27 13:55 UTC (permalink / raw)
  To: Daniel Lezcano; +Cc: linus.walleij, linux-kernel

Hi Daniel,

On Mon, Feb 20, 2012 at 12:30:26PM +0100, Daniel Lezcano wrote:
> This patch allows to decouple and recouple the gic from the PRCMU.
> This is needed to put the A9 core in retention mode with the cpuidle
> driver.
> 
> It is based on top of the "DB8500 PRCMU update" patchset.
Patch applied, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU
  2012-02-10 10:38 ` Daniel Lezcano
@ 2012-02-13 19:43   ` Linus Walleij
  0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2012-02-13 19:43 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Feb 10, 2012 at 11:38 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:

> I think I addressed all the concerns, is it possible to merge this patch ?

As detailed in another letter: does this build on top of the patch series
"DB8500 PRCMU update" that was submitted some time ago? Please
make sure it is either that or orthogonal so they don't collide.

Second: it's not me merging patches to the MFD subsystem, it's the
MFD subsystem maintainer Saumel Ortiz.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU
  2012-02-10 10:22 Daniel Lezcano
@ 2012-02-10 10:38 ` Daniel Lezcano
  2012-02-13 19:43   ` Linus Walleij
  0 siblings, 1 reply; 6+ messages in thread
From: Daniel Lezcano @ 2012-02-10 10:38 UTC (permalink / raw)
  To: linux-arm-kernel

On 02/10/2012 11:22 AM, Daniel Lezcano wrote:
> This patch allows to decouple and recouple the gic from the PRCMU.
> This is needed to put the A9 core in retention mode with the cpuidle
> driver.
>
> Signed-off-by: Daniel Lezcano<daniel.lezcano@linaro.org>
> ---

Linus,

I think I addressed all the concerns, is it possible to merge this patch ?

Thanks in advance.
-- Daniel


-- 
  <http://www.linaro.org/>  Linaro.org ? Open source software for ARM SoCs

Follow Linaro:<http://www.facebook.com/pages/Linaro>  Facebook |
<http://twitter.com/#!/linaroorg>  Twitter |
<http://www.linaro.org/linaro-blog/>  Blog

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU
@ 2012-02-10 10:22 Daniel Lezcano
  2012-02-10 10:38 ` Daniel Lezcano
  0 siblings, 1 reply; 6+ messages in thread
From: Daniel Lezcano @ 2012-02-10 10:22 UTC (permalink / raw)
  To: linux-arm-kernel

This patch allows to decouple and recouple the gic from the PRCMU.
This is needed to put the A9 core in retention mode with the cpuidle
driver.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/mfd/db8500-prcmu.c       |   32 ++++++++++++++++++++++++++++++++
 include/linux/mfd/db8500-prcmu.h |    2 ++
 include/linux/mfd/dbx500-prcmu.h |   16 ++++++++++++++++
 3 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index af8e0ef..9baf4cd 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -787,6 +787,38 @@ int db8500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll)
 	return 0;
 }
 
+#define PRCMU_A9_MASK_REQ               0x00000328
+#define PRCMU_A9_MASK_REQ_MASK          0x00000001
+#define PRCMU_GIC_DELAY                 1
+
+/* This function decouple the gic from the prcmu */
+int db8500_prcmu_gic_decouple(void)
+{
+	u32 val = readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Set bit 0 register value to 1 */
+	writel(val | PRCMU_A9_MASK_REQ_MASK, _PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Make sure the register is updated */
+	readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Wait a few cycles for the gic mask completion */
+	udelay(PRCMU_GIC_DELAY);
+
+	return 0;
+}
+
+/* This function recouple the gic with the prcmu */
+int db8500_prcmu_gic_recouple(void)
+{
+	u32 val = readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	/* Set bit 0 register value to 0 */
+	writel(val & ~PRCMU_A9_MASK_REQ_MASK, _PRCMU_BASE + PRCMU_A9_MASK_REQ);
+
+	return 0;
+}
+
 /* This function should only be called while mb0_transfer.lock is held. */
 static void config_wakeups(void)
 {
diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
index 60d27f7..a3c7eba 100644
--- a/include/linux/mfd/db8500-prcmu.h
+++ b/include/linux/mfd/db8500-prcmu.h
@@ -536,6 +536,8 @@ int prcmu_load_a9wdog(u8 id, u32 val);
 
 void db8500_prcmu_system_reset(u16 reset_code);
 int db8500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll);
+int db8500_prcmu_gic_decouple(void);
+int db8500_prcmu_gic_recouple(void);
 void db8500_prcmu_enable_wakeups(u32 wakeups);
 int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state);
 int db8500_prcmu_request_clock(u8 clock, bool enable);
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index bac942f..d38cf7d 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -237,6 +237,22 @@ static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
 			keep_ap_pll);
 }
 
+static inline int prcmu_gic_decouple(void)
+{
+	if (machine_is_u5500())
+		return -EINVAL;
+	else
+		return db8500_prcmu_gic_decouple();
+}
+
+static inline int prcmu_gic_recouple(void)
+{
+	if (machine_is_u5500())
+		return -EINVAL;
+	else
+		return db8500_prcmu_gic_recouple();
+}
+
 static inline int prcmu_set_epod(u16 epod_id, u8 epod_state)
 {
 	if (machine_is_u5500())
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-27 13:48 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-20 11:30 [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU Daniel Lezcano
     [not found] ` <4F4785D2.8070200@linaro.org>
     [not found]   ` <4F478D4B.6070602@stericsson.com>
2012-02-24 13:23     ` Daniel Lezcano
2012-02-27 13:55 ` Samuel Ortiz
  -- strict thread matches above, loose matches on Subject: below --
2012-02-10 10:22 Daniel Lezcano
2012-02-10 10:38 ` Daniel Lezcano
2012-02-13 19:43   ` Linus Walleij

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.