2012-02-20 11:30:28

by Daniel Lezcano

Subject: [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU

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 <[email protected]>
---
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())

2012-02-24 13:23:16

by Daniel Lezcano

Subject: Re: [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU

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 <[email protected]>


--
<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

2012-02-27 13:48:23

by Samuel Ortiz

Subject: Re: [PATCH][V3] ux500 : decouple/recouple gic from the PRCMU

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/