* [PATCH 6/7] arm: mmp&dove: modify tauros2_init call
@ 2012-07-31 7:01 Andrew Lunn
2012-07-31 7:09 ` Chao Xie
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2012-07-31 7:01 UTC (permalink / raw)
To: linux-arm-kernel
Hi Chao
When making changes to Dove, or any other Orion system, please could
you CC: the orion maintainers:
ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
M: Jason Cooper <jason@lakedaemon.net>
M: Andrew Lunn <andrew@lunn.ch>
L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-dove/
F: arch/arm/mach-kirkwood/
F: arch/arm/mach-mv78xx0/
F: arch/arm/mach-orion5x/
F: arch/arm/plat-orion/
Does this also affect Armada 370 and Armada XP SOC? I've no idea what
cache it uses.
Thanks
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6/7] arm: mmp&dove: modify tauros2_init call
2012-07-31 7:01 [PATCH 6/7] arm: mmp&dove: modify tauros2_init call Andrew Lunn
@ 2012-07-31 7:09 ` Chao Xie
2012-07-31 7:17 ` Andrew Lunn
2012-07-31 7:18 ` Gregory CLEMENT
0 siblings, 2 replies; 6+ messages in thread
From: Chao Xie @ 2012-07-31 7:09 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 31, 2012 at 3:01 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> Hi Chao
>
> When making changes to Dove, or any other Orion system, please could
> you CC: the orion maintainers:
>
> ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
> M: Jason Cooper <jason@lakedaemon.net>
> M: Andrew Lunn <andrew@lunn.ch>
> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> F: arch/arm/mach-dove/
> F: arch/arm/mach-kirkwood/
> F: arch/arm/mach-mv78xx0/
> F: arch/arm/mach-orion5x/
> F: arch/arm/plat-orion/
>
> Does this also affect Armada 370 and Armada XP SOC? I've no idea what
> cache it uses.
>
> Thanks
> Andrew
It will impact Armada 370. The patch will make the user has choice to
enable extra features of tauros2
I have searched the code, only dove will use tauros2_init, and the
tauros2 default has its extra features off, so i directly pass 0x0 for
dove
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6/7] arm: mmp&dove: modify tauros2_init call
2012-07-31 7:09 ` Chao Xie
@ 2012-07-31 7:17 ` Andrew Lunn
2012-07-31 7:18 ` Gregory CLEMENT
1 sibling, 0 replies; 6+ messages in thread
From: Andrew Lunn @ 2012-07-31 7:17 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 31, 2012 at 03:09:12PM +0800, Chao Xie wrote:
> On Tue, Jul 31, 2012 at 3:01 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> > Hi Chao
> >
> > When making changes to Dove, or any other Orion system, please could
> > you CC: the orion maintainers:
> >
> > ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
> > M: Jason Cooper <jason@lakedaemon.net>
> > M: Andrew Lunn <andrew@lunn.ch>
> > L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> > S: Maintained
> > F: arch/arm/mach-dove/
> > F: arch/arm/mach-kirkwood/
> > F: arch/arm/mach-mv78xx0/
> > F: arch/arm/mach-orion5x/
> > F: arch/arm/plat-orion/
> >
> > Does this also affect Armada 370 and Armada XP SOC? I've no idea what
> > cache it uses.
> >
> > Thanks
> > Andrew
> It will impact Armada 370.
Then please keep Gregory Clement <gregory.clement@free-electrons.com>
in the loop as well.
> The patch will make the user has choice to
> enable extra features of tauros2
> I have searched the code, only dove will use tauros2_init, and the
> tauros2 default has its extra features off, so i directly pass 0x0 for
> dove
Can you recommend any benchmark tools, to see if its worth turning on
these features? Sebastian Hesselbarth is doing a lot of work on Dove
at the moment, so might be interested in investigating this.
Thanks
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6/7] arm: mmp&dove: modify tauros2_init call
2012-07-31 7:09 ` Chao Xie
2012-07-31 7:17 ` Andrew Lunn
@ 2012-07-31 7:18 ` Gregory CLEMENT
2012-08-04 4:13 ` Haojian Zhuang
1 sibling, 1 reply; 6+ messages in thread
From: Gregory CLEMENT @ 2012-07-31 7:18 UTC (permalink / raw)
To: linux-arm-kernel
On 07/31/2012 09:09 AM, Chao Xie wrote:
> On Tue, Jul 31, 2012 at 3:01 PM, Andrew Lunn <andrew@lunn.ch> wrote:
>> Hi Chao
>>
>> When making changes to Dove, or any other Orion system, please could
>> you CC: the orion maintainers:
>>
>> ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
>> M: Jason Cooper <jason@lakedaemon.net>
>> M: Andrew Lunn <andrew@lunn.ch>
>> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
>> S: Maintained
>> F: arch/arm/mach-dove/
>> F: arch/arm/mach-kirkwood/
>> F: arch/arm/mach-mv78xx0/
>> F: arch/arm/mach-orion5x/
>> F: arch/arm/plat-orion/
>>
>> Does this also affect Armada 370 and Armada XP SOC? I've no idea what
>> cache it uses.
>>
>> Thanks
>> Andrew
> It will impact Armada 370. The patch will make the user has choice to
> enable extra features of tauros2
As far as I know it wouldn't impact the Armada370 as it use an other L2
called Aurora. We are currently working on it to submit it really soon.
The ArmadaXP also use the Aurora L2 cache controller.
> I have searched the code, only dove will use tauros2_init, and the
> tauros2 default has its extra features off, so i directly pass 0x0 for
> dove
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6/7] arm: mmp&dove: modify tauros2_init call
2012-07-31 7:18 ` Gregory CLEMENT
@ 2012-08-04 4:13 ` Haojian Zhuang
0 siblings, 0 replies; 6+ messages in thread
From: Haojian Zhuang @ 2012-08-04 4:13 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 31, 2012 at 3:18 PM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> On 07/31/2012 09:09 AM, Chao Xie wrote:
>> On Tue, Jul 31, 2012 at 3:01 PM, Andrew Lunn <andrew@lunn.ch> wrote:
>>> Hi Chao
>>>
>>> When making changes to Dove, or any other Orion system, please could
>>> you CC: the orion maintainers:
>>>
>>> ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
>>> M: Jason Cooper <jason@lakedaemon.net>
>>> M: Andrew Lunn <andrew@lunn.ch>
>>> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
>>> S: Maintained
>>> F: arch/arm/mach-dove/
>>> F: arch/arm/mach-kirkwood/
>>> F: arch/arm/mach-mv78xx0/
>>> F: arch/arm/mach-orion5x/
>>> F: arch/arm/plat-orion/
>>>
>>> Does this also affect Armada 370 and Armada XP SOC? I've no idea what
>>> cache it uses.
>>>
>>> Thanks
>>> Andrew
>> It will impact Armada 370. The patch will make the user has choice to
>> enable extra features of tauros2
>
> As far as I know it wouldn't impact the Armada370 as it use an other L2
> called Aurora. We are currently working on it to submit it really soon.
> The ArmadaXP also use the Aurora L2 cache controller.
>
OK. I'll merge these patches.
Regards
Haojian
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/7] ARM: pxa: support CKENC in clk_enable
@ 2012-07-31 6:13 Chao Xie
2012-07-31 6:13 ` [PATCH 6/7] arm: mmp&dove: modify tauros2_init call Chao Xie
0 siblings, 1 reply; 6+ messages in thread
From: Chao Xie @ 2012-07-31 6:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Chao Xie <chao.xie@marvell.com>
Since more device clock is supported in PXA95x, add CKENC support.
Signed-off-by: Chao Xie <xiechao.mail@gmail.com>
---
arch/arm/mach-pxa/clock-pxa3xx.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-pxa/clock-pxa3xx.c b/arch/arm/mach-pxa/clock-pxa3xx.c
index 2a37a9a..d4e9499 100644
--- a/arch/arm/mach-pxa/clock-pxa3xx.c
+++ b/arch/arm/mach-pxa/clock-pxa3xx.c
@@ -127,8 +127,10 @@ void clk_pxa3xx_cken_enable(struct clk *clk)
if (clk->cken < 32)
CKENA |= mask;
- else
+ else if (clk->cken < 64)
CKENB |= mask;
+ else
+ CKENC |= mask;
}
void clk_pxa3xx_cken_disable(struct clk *clk)
@@ -137,8 +139,10 @@ void clk_pxa3xx_cken_disable(struct clk *clk)
if (clk->cken < 32)
CKENA &= ~mask;
- else
+ else if (clk->cken < 64)
CKENB &= ~mask;
+ else
+ CKENC &= ~mask;
}
const struct clkops clk_pxa3xx_cken_ops = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 6/7] arm: mmp&dove: modify tauros2_init call
2012-07-31 6:13 [PATCH 1/7] ARM: pxa: support CKENC in clk_enable Chao Xie
@ 2012-07-31 6:13 ` Chao Xie
0 siblings, 0 replies; 6+ messages in thread
From: Chao Xie @ 2012-07-31 6:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Chao Xie <chao.xie@marvell.com>
The tauros2_init has argument, change the calling of tauros2_init
to support argument.
Signed-off-by: Chao Xie <xiechao.mail@gmail.com>
---
arch/arm/mach-dove/common.c | 2 +-
arch/arm/mach-mmp/mmp2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 9493076..aeca4e9 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -288,7 +288,7 @@ void __init dove_init(void)
printk(KERN_INFO "TCLK = %dMHz\n", (get_tclk() + 499999) / 1000000);
#ifdef CONFIG_CACHE_TAUROS2
- tauros2_init();
+ tauros2_init(0);
#endif
dove_setup_cpu_mbus();
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index c709a24..c2bb95c 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -163,7 +163,7 @@ static int __init mmp2_init(void)
{
if (cpu_is_mmp2()) {
#ifdef CONFIG_CACHE_TAUROS2
- tauros2_init();
+ tauros2_init(0);
#endif
mfp_init_base(MFPR_VIRT_BASE);
mfp_init_addr(mmp2_addr_map);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-08-04 4:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-31 7:01 [PATCH 6/7] arm: mmp&dove: modify tauros2_init call Andrew Lunn
2012-07-31 7:09 ` Chao Xie
2012-07-31 7:17 ` Andrew Lunn
2012-07-31 7:18 ` Gregory CLEMENT
2012-08-04 4:13 ` Haojian Zhuang
-- strict thread matches above, loose matches on Subject: below --
2012-07-31 6:13 [PATCH 1/7] ARM: pxa: support CKENC in clk_enable Chao Xie
2012-07-31 6:13 ` [PATCH 6/7] arm: mmp&dove: modify tauros2_init call Chao Xie
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.