2013-03-23 15:07:18

by Sebastian Hesselbarth

[permalink] [raw]
Subject: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable
iWMMXt extensions on Dove.

Signed-off-by: Sebastian Hesselbarth <[email protected]>
---
Cc: Russell King <[email protected]>
Cc: Jason Cooper <[email protected]>
Cc: Andrew Lunn <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/arm/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2c3bdce..4fc9bca 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -556,7 +556,7 @@ config ARCH_IXP4XX
config ARCH_DOVE
bool "Marvell Dove"
select ARCH_REQUIRE_GPIOLIB
- select CPU_V7
+ select CPU_PJ4
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
select PINCTRL
--
1.7.10.4


2013-03-26 08:28:46

by Andrew Lunn

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

On Sat, Mar 23, 2013 at 04:06:51PM +0100, Sebastian Hesselbarth wrote:
> The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
> CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable
> iWMMXt extensions on Dove.
>
> Signed-off-by: Sebastian Hesselbarth <[email protected]>

Acked-by: Andrew Lunn <[email protected]>

> ---
> Cc: Russell King <[email protected]>
> Cc: Jason Cooper <[email protected]>
> Cc: Andrew Lunn <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> arch/arm/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 2c3bdce..4fc9bca 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -556,7 +556,7 @@ config ARCH_IXP4XX
> config ARCH_DOVE
> bool "Marvell Dove"
> select ARCH_REQUIRE_GPIOLIB
> - select CPU_V7
> + select CPU_PJ4
> select GENERIC_CLOCKEVENTS
> select MIGHT_HAVE_PCI
> select PINCTRL
> --
> 1.7.10.4
>

2013-03-28 17:07:01

by Jason Cooper

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

On Sat, Mar 23, 2013 at 04:06:51PM +0100, Sebastian Hesselbarth wrote:
> The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
> CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable
> iWMMXt extensions on Dove.
>
> Signed-off-by: Sebastian Hesselbarth <[email protected]>
> ---
> Cc: Russell King <[email protected]>
> Cc: Jason Cooper <[email protected]>
> Cc: Andrew Lunn <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> arch/arm/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Hmmm, I'm getting (with dove_defconfig):

arch/arm/kernel/built-in.o: In function `iwmmxt_do':
/.../arch/arm/kernel/pj4-cp0.c:36: undefined reference to `iwmmxt_task_release'
/.../arch/arm/kernel/pj4-cp0.c:40: undefined reference to `iwmmxt_task_switch'
make: *** [vmlinux] Error 1

thx,

Jason.

2013-03-28 18:14:44

by Russell King - ARM Linux

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

On Thu, Mar 28, 2013 at 01:06:54PM -0400, Jason Cooper wrote:
> On Sat, Mar 23, 2013 at 04:06:51PM +0100, Sebastian Hesselbarth wrote:
> > The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
> > CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable
> > iWMMXt extensions on Dove.
> >
> > Signed-off-by: Sebastian Hesselbarth <[email protected]>
> > ---
> > Cc: Russell King <[email protected]>
> > Cc: Jason Cooper <[email protected]>
> > Cc: Andrew Lunn <[email protected]>
> > Cc: [email protected]
> > Cc: [email protected]
> > ---
> > arch/arm/Kconfig | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Hmmm, I'm getting (with dove_defconfig):
>
> arch/arm/kernel/built-in.o: In function `iwmmxt_do':
> /.../arch/arm/kernel/pj4-cp0.c:36: undefined reference to `iwmmxt_task_release'
> /.../arch/arm/kernel/pj4-cp0.c:40: undefined reference to `iwmmxt_task_switch'
> make: *** [vmlinux] Error 1

Looks to me like PJ4 IWMMXT support wasn't properly tested out when it
was submitted - it's possible to end up with pj4-cp0.c built without
the IWMMXT code that it depends on being built...

2013-03-28 20:19:09

by Sebastian Hesselbarth

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

On 03/28/2013 07:14 PM, Russell King - ARM Linux wrote:
> On Thu, Mar 28, 2013 at 01:06:54PM -0400, Jason Cooper wrote:
>> On Sat, Mar 23, 2013 at 04:06:51PM +0100, Sebastian Hesselbarth wrote:
>>> The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
>>> CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable
>>> iWMMXt extensions on Dove.
>>>
>>> Signed-off-by: Sebastian Hesselbarth<[email protected]>
>>> ---
>>> Cc: Russell King<[email protected]>
>>> Cc: Jason Cooper<j[email protected]>
>>> Cc: Andrew Lunn<[email protected]>
>>> Cc: [email protected]
>>> Cc: [email protected]
>>> ---
>>> arch/arm/Kconfig | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Hmmm, I'm getting (with dove_defconfig):
>>
>> arch/arm/kernel/built-in.o: In function `iwmmxt_do':
>> /.../arch/arm/kernel/pj4-cp0.c:36: undefined reference to `iwmmxt_task_release'
>> /.../arch/arm/kernel/pj4-cp0.c:40: undefined reference to `iwmmxt_task_switch'
>> make: *** [vmlinux] Error 1
>
> Looks to me like PJ4 IWMMXT support wasn't properly tested out when it
> was submitted - it's possible to end up with pj4-cp0.c built without
> the IWMMXT code that it depends on being built...

Russel, Jason,

do we force iWMMXt on CPU_PJ4 or should there be some #ifdef'ery if
IWMMXT is not selected?

Sebastian

2013-03-28 21:04:30

by Russell King - ARM Linux

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

On Thu, Mar 28, 2013 at 09:19:01PM +0100, Sebastian Hesselbarth wrote:
> On 03/28/2013 07:14 PM, Russell King - ARM Linux wrote:
>> On Thu, Mar 28, 2013 at 01:06:54PM -0400, Jason Cooper wrote:
>>> On Sat, Mar 23, 2013 at 04:06:51PM +0100, Sebastian Hesselbarth wrote:
>>>> The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
>>>> CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable
>>>> iWMMXt extensions on Dove.
>>>>
>>>> Signed-off-by: Sebastian Hesselbarth<[email protected]>
>>>> ---
>>>> Cc: Russell King<[email protected]>
>>>> Cc: Jason Cooper<[email protected]>
>>>> Cc: Andrew Lunn<[email protected]>
>>>> Cc: [email protected]
>>>> Cc: [email protected]
>>>> ---
>>>> arch/arm/Kconfig | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> Hmmm, I'm getting (with dove_defconfig):
>>>
>>> arch/arm/kernel/built-in.o: In function `iwmmxt_do':
>>> /.../arch/arm/kernel/pj4-cp0.c:36: undefined reference to `iwmmxt_task_release'
>>> /.../arch/arm/kernel/pj4-cp0.c:40: undefined reference to `iwmmxt_task_switch'
>>> make: *** [vmlinux] Error 1
>>
>> Looks to me like PJ4 IWMMXT support wasn't properly tested out when it
>> was submitted - it's possible to end up with pj4-cp0.c built without
>> the IWMMXT code that it depends on being built...
>
> Russel, Jason,
>
> do we force iWMMXt on CPU_PJ4 or should there be some #ifdef'ery if
> IWMMXT is not selected?

>From what I could see, there's not much point to pj4-cp0.c without
iwmmxt.S also being built. So, what I'd suggest is this, which will
ensure IWMMXT is enabled when PJ4 is set, otherwise giving people the
choice as it used to be.

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 67874b8..ef6733a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1171,9 +1171,9 @@ config ARM_NR_BANKS
default 8

config IWMMXT
- bool "Enable iWMMXt support"
+ bool "Enable iWMMXt support" if !CPU_PJ4
depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
- default y if PXA27x || PXA3xx || ARCH_MMP
+ default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4
help
Enable support for iWMMXt context switching at run time if
running on a CPU that supports it.

2013-03-29 01:18:11

by Jason Cooper

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

On Thu, Mar 28, 2013 at 09:04:12PM +0000, Russell King - ARM Linux wrote:
...
> From what I could see, there's not much point to pj4-cp0.c without
> iwmmxt.S also being built. So, what I'd suggest is this, which will
> ensure IWMMXT is enabled when PJ4 is set, otherwise giving people the
> choice as it used to be.
>

Russell,

Are you going to take these two patches? I don't want to assume and
have them potentially get lost.

thx,

Jason.

> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 67874b8..ef6733a 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1171,9 +1171,9 @@ config ARM_NR_BANKS
> default 8
>
> config IWMMXT
> - bool "Enable iWMMXt support"
> + bool "Enable iWMMXt support" if !CPU_PJ4
> depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
> - default y if PXA27x || PXA3xx || ARCH_MMP
> + default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4
> help
> Enable support for iWMMXt context switching at run time if
> running on a CPU that supports it.
>

2013-04-29 16:50:20

by Jason Cooper

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4

On Sat, Mar 23, 2013 at 04:06:51PM +0100, Sebastian Hesselbarth wrote:
> The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
> CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable
> iWMMXt extensions on Dove.
>
> Signed-off-by: Sebastian Hesselbarth <[email protected]>
> ---
> Cc: Russell King <[email protected]>
> Cc: Jason Cooper <[email protected]>
> Cc: Andrew Lunn <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> arch/arm/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Sebastian,

It looks as though Russell's fix for IWMMXT made it in. Please place
this patch in Russell's patch tracker. If you don't have the original
thread, Andrew Lunn gave this an Acked-by. Now me as well:

Acked-by: Jason Cooper <[email protected]>

thx,

Jason.

>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 2c3bdce..4fc9bca 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -556,7 +556,7 @@ config ARCH_IXP4XX
> config ARCH_DOVE
> bool "Marvell Dove"
> select ARCH_REQUIRE_GPIOLIB
> - select CPU_V7
> + select CPU_PJ4
> select GENERIC_CLOCKEVENTS
> select MIGHT_HAVE_PCI
> select PINCTRL
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

2013-04-29 19:27:19

by Sebastian Hesselbarth

[permalink] [raw]
Subject: [PATCH RESEND] ARM: dove: fix Dove cpu type from V7 to PJ4

The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using
CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will enable iWMMXt
extensions on Dove.

Signed-off-by: Sebastian Hesselbarth <[email protected]>
Acked-by: Jason Cooper <[email protected]>
Acked-by: Andrew Lunn <[email protected]>
---
Note: This patch is rebased on v3.9 and patch message has been modified
to point out that iWMMXt is now enforced on CPU_PJ4.

Cc: Jason Cooper <[email protected]>
Cc: Andrew Lunn <[email protected]>
Cc: Russell King <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/arm/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1cacda4..3c5e4da 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -555,7 +555,7 @@ config ARCH_IXP4XX
config ARCH_DOVE
bool "Marvell Dove"
select ARCH_REQUIRE_GPIOLIB
- select CPU_V7
+ select CPU_PJ4
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
select PINCTRL
--
1.7.10.4