[GIT PULL] generic arm MSM changes for v2.6.37

[GIT PULL] generic arm MSM changes for v2.6.37

[Daniel Walker]

Russell,

I'm sending out the actual patches even tho most of this has been
discussed already. The proc-info change was suggested by Catalin, but
I didn't see you given an Ack so I wanted to make sure that was OK.
The other thing is that I know there are changes in your devel tree
which conflict with the Kconfig changes I'm making.

If it's all ok, please consider pulling this.

Daniel


The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c:

  Linux 2.6.36-rc3 (2010-08-29 08:36:04 -0700)

are available in the git repository at:
  git://codeaurora.org/quic/kernel/dwalker/linux-msm.git for-russell

Abhijeet Dharmapurikar (1):
      GIC: Dont disable INT in ack callback

Daniel Walker (2):
      arm: dis-allow hotplug on MSM
      arm: mm: add proc info for ARM11MPCore/Cortex-A9 from ARM

Steve Muckle (1):
      arm: Kconfig option for ARCH_MSM_SCORPIONMP

 arch/arm/Kconfig          |    7 +++++--
 arch/arm/common/gic.c     |   14 --------------
 arch/arm/mach-msm/Kconfig |    2 ++
 arch/arm/mm/proc-v7.S     |   26 +++++++++++++++++++++++++-
 4 files changed, 32 insertions(+), 17 deletions(-)

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Daniel Walker]

From: Steve Muckle <smuckle@codeaurora.org>

ScorpionMP is a configuration of Scorpion processors. It supports local
timers.

Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
 arch/arm/Kconfig          |    6 ++++--
 arch/arm/mach-msm/Kconfig |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a7ed21f..d2dfbc2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1144,7 +1144,8 @@ config SMP
 	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
 	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
 		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
-		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
+		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4||\
+		 ARCH_MSM_SCORPIONMP)
 	depends on GENERIC_CLOCKEVENTS
 	select USE_GENERIC_SMP_HELPERS
 	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
@@ -1218,7 +1219,8 @@ config LOCAL_TIMERS
 	bool "Use local timer interrupts"
 	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
 		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
-		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
+		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\
+		ARCH_MSM_SCORPIONMP)
 	default y
 	select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
 		ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 47264a7..cc59b0c 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -35,6 +35,8 @@ config  ARCH_MSM_ARM11
 	bool
 config  ARCH_MSM_SCORPION
 	bool
+config  ARCH_MSM_SCORPIONMP
+	bool
 
 config  MSM_VIC
 	bool
-- 
1.7.1

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Sergei Shtylyov]

Hello.

On 09-09-2010 23:58, Daniel Walker wrote:

> From: Steve Muckle<smuckle@codeaurora.org>

> ScorpionMP is a configuration of Scorpion processors. It supports local
> timers.

> Signed-off-by: Steve Muckle<smuckle@codeaurora.org>
> Signed-off-by: Jeff Ohlstein<johlstei@codeaurora.org>
> Signed-off-by: Daniel Walker<dwalker@codeaurora.org>
[...]
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index a7ed21f..d2dfbc2 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1144,7 +1144,8 @@ config SMP
>   	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
>   	depends on EXPERIMENTAL&&  (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
>   		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
> -		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
> +		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4||\
> +		 ARCH_MSM_SCORPIONMP)
>   	depends on GENERIC_CLOCKEVENTS
>   	select USE_GENERIC_SMP_HELPERS
>   	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
> @@ -1218,7 +1219,8 @@ config LOCAL_TIMERS
>   	bool "Use local timer interrupts"
>   	depends on SMP&&  (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
>   		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
> -		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
> +		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\

    Could you put spce before \ to keep the style consistent?

> +		ARCH_MSM_SCORPIONMP)
>   	default y
>   	select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
>   		ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS

WBR, Sergei

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Uwe Kleine-König]

Hello Sergei,

On Fri, Sep 10, 2010 at 02:14:25PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 09-09-2010 23:58, Daniel Walker wrote:
>
>> From: Steve Muckle<smuckle@codeaurora.org>
>
>> ScorpionMP is a configuration of Scorpion processors. It supports local
>> timers.
>
>> Signed-off-by: Steve Muckle<smuckle@codeaurora.org>
>> Signed-off-by: Jeff Ohlstein<johlstei@codeaurora.org>
>> Signed-off-by: Daniel Walker<dwalker@codeaurora.org>
> [...]
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index a7ed21f..d2dfbc2 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -1144,7 +1144,8 @@ config SMP
>>   	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
>>   	depends on EXPERIMENTAL&&  (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
>>   		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
>> -		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
>> +		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4||\
>> +		 ARCH_MSM_SCORPIONMP)
>>   	depends on GENERIC_CLOCKEVENTS
>>   	select USE_GENERIC_SMP_HELPERS
>>   	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
>> @@ -1218,7 +1219,8 @@ config LOCAL_TIMERS
>>   	bool "Use local timer interrupts"
>>   	depends on SMP&&  (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
>>   		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
>> -		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
>> +		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\
>
>    Could you put spce before \ to keep the style consistent?
It's at least locally consistent, isn't it?

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Daniel Walker]

On Fri, 2010-09-10 at 16:51 +0200, Uwe Kleine-K?nig wrote:
> Hello Sergei,
> 
> On Fri, Sep 10, 2010 at 02:14:25PM +0400, Sergei Shtylyov wrote:
> > Hello.
> >
> > On 09-09-2010 23:58, Daniel Walker wrote:
> >
> >> From: Steve Muckle<smuckle@codeaurora.org>
> >
> >> ScorpionMP is a configuration of Scorpion processors. It supports local
> >> timers.
> >
> >> Signed-off-by: Steve Muckle<smuckle@codeaurora.org>
> >> Signed-off-by: Jeff Ohlstein<johlstei@codeaurora.org>
> >> Signed-off-by: Daniel Walker<dwalker@codeaurora.org>
> > [...]
> >> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> >> index a7ed21f..d2dfbc2 100644
> >> --- a/arch/arm/Kconfig
> >> +++ b/arch/arm/Kconfig
> >> @@ -1144,7 +1144,8 @@ config SMP
> >>   	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
> >>   	depends on EXPERIMENTAL&&  (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
> >>   		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
> >> -		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
> >> +		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4||\
> >> +		 ARCH_MSM_SCORPIONMP)
> >>   	depends on GENERIC_CLOCKEVENTS
> >>   	select USE_GENERIC_SMP_HELPERS
> >>   	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
> >> @@ -1218,7 +1219,8 @@ config LOCAL_TIMERS
> >>   	bool "Use local timer interrupts"
> >>   	depends on SMP&&  (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
> >>   		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
> >> -		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
> >> +		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\
> >
> >    Could you put spce before \ to keep the style consistent?
> It's at least locally consistent, isn't it?


It's sort of depends which line you look at, some have spaces some
don't. I can send an additional patch to make it all consistent.

Daniel

-- 
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum.

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Sergei Shtylyov]

Hello.

On 10-09-2010 18:51, Uwe Kleine-K?nig wrote:

>>> From: Steve Muckle<smuckle@codeaurora.org>

>>> ScorpionMP is a configuration of Scorpion processors. It supports local
>>> timers.

>>> Signed-off-by: Steve Muckle<smuckle@codeaurora.org>
>>> Signed-off-by: Jeff Ohlstein<johlstei@codeaurora.org>
>>> Signed-off-by: Daniel Walker<dwalker@codeaurora.org>
>> [...]
>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>> index a7ed21f..d2dfbc2 100644
>>> --- a/arch/arm/Kconfig
>>> +++ b/arch/arm/Kconfig
>>> @@ -1144,7 +1144,8 @@ config SMP
>>>    	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
>>>    	depends on EXPERIMENTAL&&   (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
>>>    		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
>>> -		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
>>> +		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4||\
>>> +		 ARCH_MSM_SCORPIONMP)
>>>    	depends on GENERIC_CLOCKEVENTS
>>>    	select USE_GENERIC_SMP_HELPERS
>>>    	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
>>> @@ -1218,7 +1219,8 @@ config LOCAL_TIMERS
>>>    	bool "Use local timer interrupts"
>>>    	depends on SMP&&   (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
>>>    		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
>>> -		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
>>> +		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\

>>     Could you put spce before \ to keep the style consistent?

> It's at least locally consistent, isn't it?

    Not really. The second 'bool' has spaces before \, only the first one 
doesn't...

> Uwe

WBR, Sergei

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Lorenzo Pieralisi]

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium.  Thank you.
-------------- next part --------------
An embedded message was scrubbed...
From: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>
Subject: Re: Re: [PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP
Date: Fri, 10 Sep 2010 16:15:01 +0100
Size: 16583
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100910/32c2d4bc/attachment-0001.mht>

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Russell King - ARM Linux]

On Thu, Sep 09, 2010 at 12:58:06PM -0700, Daniel Walker wrote:
> From: Steve Muckle <smuckle@codeaurora.org>
> 
> ScorpionMP is a configuration of Scorpion processors. It supports local
> timers.

Beware - things have changed around here - relevant hunks from my
devel branch:

@@ -1142,13 +1145,13 @@ source "kernel/time/Kconfig"

 config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
-                MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
-                ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
+       depends on EXPERIMENTAL
        depends on GENERIC_CLOCKEVENTS
+       depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
+                MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
+                ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4        select USE_GENERIC_SMP_HELPERS
-       select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
-                ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
+       select HAVE_ARM_SCU
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@ -1216,12 +1232,9 @@ config HOTPLUG_CPU

 config LOCAL_TIMERS
        bool "Use local timer interrupts"
-       depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
-               REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
-               ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)+       depends on SMP
        default y
-       select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
-               ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS
+       select HAVE_ARM_TWD
        help
          Enable support for local timers on SMP platforms, rather then the
          legacy IPI broadcast method.  Local timers allows the system

Basically, everyone who was supporting SMP also supported local timers,
TWD and SCU, so having the big long lists of dependencies was becoming
silly.

If anyone (ever) creates a SMP implementation not using ARMs TWD/GIC/SCU,
then we can see about changing the way we handle the support for these.

[PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP

[Daniel Walker]

On Fri, 2010-09-10 at 21:36 +0100, Russell King - ARM Linux wrote:
> On Thu, Sep 09, 2010 at 12:58:06PM -0700, Daniel Walker wrote:
> > From: Steve Muckle <smuckle@codeaurora.org>
> > 
> > ScorpionMP is a configuration of Scorpion processors. It supports local
> > timers.
> 
> Beware - things have changed around here - relevant hunks from my
> devel branch:

Yeah, that's why I wanted to send out these patches.. I saw an earlier
email that suggested you changed this area. I didn't want to base my
tree off your devel branch tho.

> @@ -1142,13 +1145,13 @@ source "kernel/time/Kconfig"
> 
>  config SMP
>         bool "Symmetric Multi-Processing (EXPERIMENTAL)"
> -       depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
> -                MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
> -                ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
> +       depends on EXPERIMENTAL
>         depends on GENERIC_CLOCKEVENTS
> +       depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
> +                MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
> +                ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4        select USE_GENERIC_SMP_HELPERS
> -       select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
> -                ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
> +       select HAVE_ARM_SCU
>         help
>           This enables support for systems with more than one CPU. If you have
>           a system with only one CPU, like most personal computers, say N. If
> @@ -1216,12 +1232,9 @@ config HOTPLUG_CPU
> 
>  config LOCAL_TIMERS
>         bool "Use local timer interrupts"
> -       depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
> -               REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
> -               ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)+       depends on SMP
>         default y
> -       select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
> -               ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS
> +       select HAVE_ARM_TWD
>         help
>           Enable support for local timers on SMP platforms, rather then the
>           legacy IPI broadcast method.  Local timers allows the system
> 
> Basically, everyone who was supporting SMP also supported local timers,
> TWD and SCU, so having the big long lists of dependencies was becoming
> silly.
> 
> If anyone (ever) creates a SMP implementation not using ARMs TWD/GIC/SCU,
> then we can see about changing the way we handle the support for these.

We actually don't have SCU or TWD. So I suppose we can just have
"if !ARCH_MSM" for SCU/TWD , if that's reasonable. How do you want to me
to make changes to this area tho?

Daniel

-- 
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum.

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Daniel Walker]

MSM doesn't support hotplug, so we prevent it from being
select with this added line.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
 arch/arm/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d2dfbc2..829dd67 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1211,6 +1211,7 @@ config NR_CPUS
 config HOTPLUG_CPU
 	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
 	depends on SMP && HOTPLUG && EXPERIMENTAL
+	depends on !ARCH_MSM
 	help
 	  Say Y here to experiment with turning CPUs off and on.  CPUs
 	  can be controlled through /sys/devices/system/cpu.
-- 
1.7.1

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Pavel Machek]

Hi!

> MSM doesn't support hotplug, so we prevent it from being
> select with this added line.
> 
> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
> ---
>  arch/arm/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index d2dfbc2..829dd67 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1211,6 +1211,7 @@ config NR_CPUS
>  config HOTPLUG_CPU
>  	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
>  	depends on SMP && HOTPLUG && EXPERIMENTAL
> +	depends on !ARCH_MSM
>  	help
>  	  Say Y here to experiment with turning CPUs off and on.  CPUs
>  	  can be controlled through /sys/devices/system/cpu.

This is goodbye to s2ram support, AFAICT.

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Daniel Walker]

On Thu, 2010-09-30 at 09:19 +0200, Pavel Machek wrote:
> Hi!
> 
> > MSM doesn't support hotplug, so we prevent it from being
> > select with this added line.
> > 
> > Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
> > ---
> >  arch/arm/Kconfig |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index d2dfbc2..829dd67 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -1211,6 +1211,7 @@ config NR_CPUS
> >  config HOTPLUG_CPU
> >  	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
> >  	depends on SMP && HOTPLUG && EXPERIMENTAL
> > +	depends on !ARCH_MSM
> >  	help
> >  	  Say Y here to experiment with turning CPUs off and on.  CPUs
> >  	  can be controlled through /sys/devices/system/cpu.
> 
> This is goodbye to s2ram support, AFAICT.

This depends on SMP tho. It's like saying,

depends on 
-- 

Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Daniel Walker]

On Thu, 2010-09-30 at 09:45 -0700, Daniel Walker wrote:
> On Thu, 2010-09-30 at 09:19 +0200, Pavel Machek wrote:
> > Hi!
> > 
> > > MSM doesn't support hotplug, so we prevent it from being
> > > select with this added line.
> > > 
> > > Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
> > > ---
> > >  arch/arm/Kconfig |    1 +
> > >  1 files changed, 1 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > > index d2dfbc2..829dd67 100644
> > > --- a/arch/arm/Kconfig
> > > +++ b/arch/arm/Kconfig
> > > @@ -1211,6 +1211,7 @@ config NR_CPUS
> > >  config HOTPLUG_CPU
> > >  	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
> > >  	depends on SMP && HOTPLUG && EXPERIMENTAL
> > > +	depends on !ARCH_MSM
> > >  	help
> > >  	  Say Y here to experiment with turning CPUs off and on.  CPUs
> > >  	  can be controlled through /sys/devices/system/cpu.
> > 
> > This is goodbye to s2ram support, AFAICT.
> 
> This depends on SMP tho. It's like saying,
> 
> depends on 

That's weird, there was more to this email..

It's like saying,

depends on SMP && HOTPLUG && EXPERIMENTAL && !ARCH_MSM

But ARCH_MSM has no SMP, so the whole thing should short circuit right
at the start. It's only when you bring in SMP that it get interesting.

suspend to ram works on UP tho, so UP boards shouldn't be effected.

Daniel

-- 

Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Pavel Machek]

Hi!

> > > > Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
> > > > ---
> > > >  arch/arm/Kconfig |    1 +
> > > >  1 files changed, 1 insertions(+), 0 deletions(-)
> > > > 
> > > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > > > index d2dfbc2..829dd67 100644
> > > > --- a/arch/arm/Kconfig
> > > > +++ b/arch/arm/Kconfig
> > > > @@ -1211,6 +1211,7 @@ config NR_CPUS
> > > >  config HOTPLUG_CPU
> > > >  	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
> > > >  	depends on SMP && HOTPLUG && EXPERIMENTAL
> > > > +	depends on !ARCH_MSM
> > > >  	help
> > > >  	  Say Y here to experiment with turning CPUs off and on.  CPUs
> > > >  	  can be controlled through /sys/devices/system/cpu.
> > > 
> > > This is goodbye to s2ram support, AFAICT.
> > 
> > This depends on SMP tho. It's like saying,
> > 
> > depends on 
> 
> That's weird, there was more to this email..
> 
> It's like saying,
> 
> depends on SMP && HOTPLUG && EXPERIMENTAL && !ARCH_MSM
> 
> But ARCH_MSM has no SMP, so the whole thing should short circuit right
> at the start. It's only when you bring in SMP that it get interesting.

If arch_msm has no SMP, then why is change needed?

(I was trying to warn you that you'll need HOTPLUG support to get SMP
suspend support.)
									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Daniel Walker]

On Thu, 2010-09-30 at 21:52 +0200, Pavel Machek wrote:
> Hi!
> 
> > > > > Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
> > > > > ---
> > > > >  arch/arm/Kconfig |    1 +
> > > > >  1 files changed, 1 insertions(+), 0 deletions(-)
> > > > > 
> > > > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > > > > index d2dfbc2..829dd67 100644
> > > > > --- a/arch/arm/Kconfig
> > > > > +++ b/arch/arm/Kconfig
> > > > > @@ -1211,6 +1211,7 @@ config NR_CPUS
> > > > >  config HOTPLUG_CPU
> > > > >  	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
> > > > >  	depends on SMP && HOTPLUG && EXPERIMENTAL
> > > > > +	depends on !ARCH_MSM
> > > > >  	help
> > > > >  	  Say Y here to experiment with turning CPUs off and on.  CPUs
> > > > >  	  can be controlled through /sys/devices/system/cpu.
> > > > 
> > > > This is goodbye to s2ram support, AFAICT.
> > > 
> > > This depends on SMP tho. It's like saying,
> > > 
> > > depends on 
> > 
> > That's weird, there was more to this email..
> > 
> > It's like saying,
> > 
> > depends on SMP && HOTPLUG && EXPERIMENTAL && !ARCH_MSM
> > 
> > But ARCH_MSM has no SMP, so the whole thing should short circuit right
> > at the start. It's only when you bring in SMP that it get interesting.
> 
> If arch_msm has no SMP, then why is change needed?

I'm getting it ready for SMP .. It's not there yet but will be.

> (I was trying to warn you that you'll need HOTPLUG support to get SMP
> suspend support.)

Yeah, I'm aware of it.. We haven't implemented hotplug yet, so we don't
have suspend support yet for SMP.

Daniel
-- 

Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Pavel Machek]

Hi!

> > > > > This is goodbye to s2ram support, AFAICT.
> > > > 
> > > > This depends on SMP tho. It's like saying,
> > > > 
> > > > depends on 
> > > 
> > > That's weird, there was more to this email..
> > > 
> > > It's like saying,
> > > 
> > > depends on SMP && HOTPLUG && EXPERIMENTAL && !ARCH_MSM
> > > 
> > > But ARCH_MSM has no SMP, so the whole thing should short circuit right
> > > at the start. It's only when you bring in SMP that it get interesting.
> > 
> > If arch_msm has no SMP, then why is change needed?
> 
> I'm getting it ready for SMP .. It's not there yet but will be.

Ok. It makes sense, then.

> > (I was trying to warn you that you'll need HOTPLUG support to get SMP
> > suspend support.)
> 
> Yeah, I'm aware of it.. We haven't implemented hotplug yet, so we don't
> have suspend support yet for SMP.

Still, it might be better to just provide stubs that return -ENOTSUPP
or something, and leave it enabled in config. Same results, you'll
need to provide full functions in future, anyway, and no churn in
shared config files.
								Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Daniel Walker]

On Thu, 2010-09-30 at 22:02 +0200, Pavel Machek wrote:
> Hi!
> 
> > > > > > This is goodbye to s2ram support, AFAICT.
> > > > > 
> > > > > This depends on SMP tho. It's like saying,
> > > > > 
> > > > > depends on 
> > > > 
> > > > That's weird, there was more to this email..
> > > > 
> > > > It's like saying,
> > > > 
> > > > depends on SMP && HOTPLUG && EXPERIMENTAL && !ARCH_MSM
> > > > 
> > > > But ARCH_MSM has no SMP, so the whole thing should short circuit right
> > > > at the start. It's only when you bring in SMP that it get interesting.
> > > 
> > > If arch_msm has no SMP, then why is change needed?
> > 
> > I'm getting it ready for SMP .. It's not there yet but will be.
> 
> Ok. It makes sense, then.
> 
> > > (I was trying to warn you that you'll need HOTPLUG support to get SMP
> > > suspend support.)
> > 
> > Yeah, I'm aware of it.. We haven't implemented hotplug yet, so we don't
> > have suspend support yet for SMP.
> 
> Still, it might be better to just provide stubs that return -ENOTSUPP
> or something, and leave it enabled in config. Same results, you'll
> need to provide full functions in future, anyway, and no churn in
> shared config files.

That's actually what I had original, Russell offered this as an
alternative. Now that I think about the stubs tho, I'm not sure it's
that bad an idea. All the stubs would do is not put the core into a
lower powermode, but would allow suspend. It wouldn't be very
efficient , but suspend would work.

Daniel


-- 

Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Russell King - ARM Linux]

On Thu, Sep 30, 2010 at 01:08:07PM -0700, Daniel Walker wrote:
> That's actually what I had original, Russell offered this as an
> alternative. Now that I think about the stubs tho, I'm not sure it's
> that bad an idea. All the stubs would do is not put the core into a
> lower powermode, but would allow suspend. It wouldn't be very
> efficient , but suspend would work.

If you just provide empty stubs, esp. for platform_cpu_die(), then an
attempt to take a CPU offline will result in it immediately restarting
back into the kernel - which will probably result in an oops as the
kernel won't be expecting the CPU to come back.

If you make them spin, you'll eat power until the system powers them off.
As things currently stand though, we don't have enough code out of the
init sections to allow a SMP restart from power-off.  So, S2RAM isn't
going to work on secondary processors at the moment _anyway_.

Current CPU hotplug implementations are based around taking CPUs offline
without powering them off for run-time power saving only.

I have been working on a set of patches recently to reorganize the
various head.S code to allow SMP restart from a CPU power-down, which
is almost ready.

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Daniel Walker]

On Thu, 2010-09-30 at 21:17 +0100, Russell King - ARM Linux wrote:
> On Thu, Sep 30, 2010 at 01:08:07PM -0700, Daniel Walker wrote:
> > That's actually what I had original, Russell offered this as an
> > alternative. Now that I think about the stubs tho, I'm not sure it's
> > that bad an idea. All the stubs would do is not put the core into a
> > lower powermode, but would allow suspend. It wouldn't be very
> > efficient , but suspend would work.
> 
> If you just provide empty stubs, esp. for platform_cpu_die(), then an
> attempt to take a CPU offline will result in it immediately restarting
> back into the kernel - which will probably result in an oops as the
> kernel won't be expecting the CPU to come back.

Ok ..

> If you make them spin, you'll eat power until the system powers them off.
> As things currently stand though, we don't have enough code out of the
> init sections to allow a SMP restart from power-off.  So, S2RAM isn't
> going to work on secondary processors at the moment _anyway_.

When you say "SMP restart" do you mean resume? If I did make them spin
wouldn't suspend and resume work at that point?

> Current CPU hotplug implementations are based around taking CPUs offline
> without powering them off for run-time power saving only.

What I was thinking with the stubs is to fake the offlining. So it's not
power efficient , but suspend still works.

Daniel

-- 

Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCH 2/4] arm: dis-allow hotplug on MSM

[Russell King - ARM Linux]

On Thu, Sep 30, 2010 at 01:40:45PM -0700, Daniel Walker wrote:
> On Thu, 2010-09-30 at 21:17 +0100, Russell King - ARM Linux wrote:
> > If you make them spin, you'll eat power until the system powers them off.
> > As things currently stand though, we don't have enough code out of the
> > init sections to allow a SMP restart from power-off.  So, S2RAM isn't
> > going to work on secondary processors at the moment _anyway_.
> 
> When you say "SMP restart" do you mean resume?

Yes.

> If I did make them spin wouldn't suspend and resume work at that point?

Normally with S2RAM, CPU state is saved, and the CPU is powered down.
That's how it seems to work on all the ARM UP platforms, and I don't
see any reason why someone implementing suspend would want to leave
the CPUs powered during S2RAM - they'd gobble power.

> > Current CPU hotplug implementations are based around taking CPUs offline
> > without powering them off for run-time power saving only.
> 
> What I was thinking with the stubs is to fake the offlining. So it's not
> power efficient , but suspend still works.

The question you need to research is: does putting the system into
suspend mode result in power being lost to the CPUs?

If the answer is yes, then as things currently stand you'll lose the
secondary CPUs when you try to resume the system as the code necessary
to bring them back online will have been discarded.

If the answer is no, suspend won't be useful because the other CPUs will
be spinning, thereby consuming more power than an idle system would be.

I think you'll find though that suspend mode will result in power being
lost to all CPUs.

[PATCH 3/4] arm: mm: add proc info for ARM11MPCore/Cortex-A9 from ARM

[Daniel Walker]

Setting of these bits can cause issues on other SMP SoC's not produced
by ARM.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
 arch/arm/mm/proc-v7.S |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 6a8506d..60cfab9 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -186,13 +186,14 @@ cpu_v7_name:
  *	It is assumed that:
  *	- cache type register is implemented
  */
-__v7_setup:
+__v7_ca9mp_setup:
 #ifdef CONFIG_SMP
 	mrc	p15, 0, r0, c1, c0, 1
 	tst	r0, #(1 << 6)			@ SMP/nAMP mode enabled?
 	orreq	r0, r0, #(1 << 6) | (1 << 0)	@ Enable SMP/nAMP mode and
 	mcreq	p15, 0, r0, c1, c0, 1		@ TLB ops broadcasting
 #endif
+__v7_setup:
 	adr	r12, __v7_setup_stack		@ the local stack
 	stmia	r12, {r0-r5, r7, r9, r11, lr}
 	bl	v7_flush_dcache_all
@@ -323,6 +324,29 @@ cpu_elf_name:
 
 	.section ".proc.info.init", #alloc, #execinstr
 
+	.type   __v7_ca9mp_proc_info, #object
+__v7_ca9mp_proc_info:
+	.long	0x410fc090		@ Required ID value
+	.long	0xff0ffff0		@ Mask for ID
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ | \
+		PMD_FLAGS
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_XN | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ
+	b	__v7_ca9mp_setup
+	.long	cpu_arch_name
+	.long	cpu_elf_name
+	.long	HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
+	.long	cpu_v7_name
+	.long	v7_processor_functions
+	.long	v7wbi_tlb_fns
+	.long	v6_user_fns
+	.long	v7_cache_fns
+	.size	__v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
+
 	/*
 	 * Match any ARMv7 processor core.
 	 */
-- 
1.7.1

[PATCH 3/4] arm: mm: add proc info for ARM11MPCore/Cortex-A9 from ARM

[Catalin Marinas]

On Thu, 2010-09-09 at 12:58 -0700, Daniel Walker wrote:
> Setting of these bits can cause issues on other SMP SoC's not produced
> by ARM.
> 
> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>

Acked-by: Catalin Marinas <catalin.marinas@arm.com>

[PATCH 4/4] GIC: Dont disable INT in ack callback

[Daniel Walker]

From: Abhijeet Dharmapurikar <adharmap@codeaurora.org>

Unless gic_ack_irq is called from __do_IRQ, interrupt should not
be disabled in the ack function.

Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
 arch/arm/common/gic.c |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 7dfa9a8..ada6359 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -67,25 +67,11 @@ static inline unsigned int gic_irq(unsigned int irq)
 
 /*
  * Routines to acknowledge, disable and enable interrupts
- *
- * Linux assumes that when we're done with an interrupt we need to
- * unmask it, in the same way we need to unmask an interrupt when
- * we first enable it.
- *
- * The GIC has a separate notion of "end of interrupt" to re-enable
- * an interrupt after handling, in order to support hardware
- * prioritisation.
- *
- * We can make the GIC behave in the way that Linux expects by making
- * our "acknowledge" routine disable the interrupt, then mark it as
- * complete.
  */
 static void gic_ack_irq(unsigned int irq)
 {
-	u32 mask = 1 << (irq % 32);
 
 	spin_lock(&irq_controller_lock);
-	writel(mask, gic_dist_base(irq) + GIC_DIST_ENABLE_CLEAR + (gic_irq(irq) / 32) * 4);
 	writel(gic_irq(irq), gic_cpu_base(irq) + GIC_CPU_EOI);
 	spin_unlock(&irq_controller_lock);
 }
-- 
1.7.1