Patchwork [GIT,PULL] arm-soc: Xilinx zynq core - smp for v3.10

login
register
mail settings
Submitter Michal Simek
Date April 4, 2013, 7:47 a.m.
Message ID <890ef3b8-f536-4b00-9bd8-5ea50de3bf51@DB8EHSMHS032.ehs.local>
Download mbox
Permalink /patch/233776/
State New
Headers show

Pull-request

git://git.xilinx.com/linux-xlnx.git zynq/core-smp

Comments

Michal Simek - April 4, 2013, 7:47 a.m.
Hi Arnd and Olof,

please pull the following smp support to your arm-soc tree.

This branch is based on zynq/clksrc/cleanup parts because
there are some dependencies on moving timer to generic location.

I could based it on standard Linux tagged version but you will get
several conflicts you will have to resolve.
If you are OK to resolving these problems, please let me know
I will create another branch with core-smp changes which are not based
on zynq/clksrc/cleanup branch.

Thanks,
Michal


The following changes since commit 4f0f234fce1d263cc9881456352e8fd56ead0514:

   arm: zynq: Move timer to generic location (2013-04-04 09:22:09 +0200)

are available in the git repository at:

   git://git.xilinx.com/linux-xlnx.git zynq/core-smp

for you to fetch changes up to c7c28b0fdd06d8eb9414d21f8956b7c773ceea93:

   arm: zynq: Add hotplug support (2013-04-04 09:24:00 +0200)

----------------------------------------------------------------
Michal Simek (7):
       arm: zynq: Load scu baseaddress at run time
       arm: zynq: Move slcr initialization to separate file
       arm: zynq: Add support for system reset
       arm: zynq: Get rid of xilinx function prefix
       arm: zynq: Add smp_twd timer
       arm: zynq: Add smp support
       arm: zynq: Add hotplug support

  arch/arm/boot/dts/zynq-7000.dtsi |    7 ++
  arch/arm/mach-zynq/Kconfig       |    1 +
  arch/arm/mach-zynq/Makefile      |    6 +-
  arch/arm/mach-zynq/common.c      |   67 +++++++++--------
  arch/arm/mach-zynq/common.h      |   20 +++++
  arch/arm/mach-zynq/headsmp.S     |   24 ++++++
  arch/arm/mach-zynq/hotplug.c     |  104 ++++++++++++++++++++++++++
  arch/arm/mach-zynq/platsmp.c     |  152 ++++++++++++++++++++++++++++++++++++++
  arch/arm/mach-zynq/slcr.c        |  125 +++++++++++++++++++++++++++++++
  9 files changed, 476 insertions(+), 30 deletions(-)
  create mode 100644 arch/arm/mach-zynq/headsmp.S
  create mode 100644 arch/arm/mach-zynq/hotplug.c
  create mode 100644 arch/arm/mach-zynq/platsmp.c
  create mode 100644 arch/arm/mach-zynq/slcr.c
Arnd Bergmann - April 8, 2013, 5:05 p.m.
On Thursday 04 April 2013, Michal Simek wrote:
> Hi Arnd and Olof,
> 
> please pull the following smp support to your arm-soc tree.
> 
> This branch is based on zynq/clksrc/cleanup parts because
> there are some dependencies on moving timer to generic location.
> 
> I could based it on standard Linux tagged version but you will get
> several conflicts you will have to resolve.
> If you are OK to resolving these problems, please let me know
> I will create another branch with core-smp changes which are not based
> on zynq/clksrc/cleanup branch.
> 

This one gave me a little trouble because of conflicts with Catalin's
gic/cleanup branch. Could both of you (Michal and Catalin) have a look
at my resolution? I basically just removed the zynq_secondary_init()
function added in this branch.

I've merged it all into next/soc2 and added a merge with gic/cleanup
to resolve the conflict.

Also, please use signed tags for sending pull requests and include
a description of the branch contents that will end up in the merge
commit.

	Arnd
Russell King - ARM Linux - May 24, 2013, 11:26 a.m.
On Thu, Apr 04, 2013 at 09:47:09AM +0200, Michal Simek wrote:
> Hi Arnd and Olof,
>
> please pull the following smp support to your arm-soc tree.
>
> This branch is based on zynq/clksrc/cleanup parts because
> there are some dependencies on moving timer to generic location.
>
> I could based it on standard Linux tagged version but you will get
> several conflicts you will have to resolve.
> If you are OK to resolving these problems, please let me know
> I will create another branch with core-smp changes which are not based
> on zynq/clksrc/cleanup branch.

You might want to resolve this new warning:

arch/arm/mach-zynq/hotplug.c:1:0: warning: switch -mcpu=cortex-a9 conflicts with -march= switch

found by lastnights OMAP4430 randconfig build.
Michal Simek - May 24, 2013, 12:10 p.m.
Hi Russell,

On 05/24/2013 01:26 PM, Russell King - ARM Linux wrote:
> On Thu, Apr 04, 2013 at 09:47:09AM +0200, Michal Simek wrote:
>> Hi Arnd and Olof,
>>
>> please pull the following smp support to your arm-soc tree.
>>
>> This branch is based on zynq/clksrc/cleanup parts because
>> there are some dependencies on moving timer to generic location.
>>
>> I could based it on standard Linux tagged version but you will get
>> several conflicts you will have to resolve.
>> If you are OK to resolving these problems, please let me know
>> I will create another branch with core-smp changes which are not based
>> on zynq/clksrc/cleanup branch.
> 
> You might want to resolve this new warning:
> 
> arch/arm/mach-zynq/hotplug.c:1:0: warning: switch -mcpu=cortex-a9 conflicts with -march= switch
> 
> found by lastnights OMAP4430 randconfig build.

Do you have that randconfig file?
And can you please point me to the repo which is is used for this build?

Thanks,
Michal
Russell King - ARM Linux - May 24, 2013, 12:31 p.m.
On Fri, May 24, 2013 at 02:10:32PM +0200, Michal Simek wrote:
> Hi Russell,
> 
> On 05/24/2013 01:26 PM, Russell King - ARM Linux wrote:
> > You might want to resolve this new warning:
> > 
> > arch/arm/mach-zynq/hotplug.c:1:0: warning: switch -mcpu=cortex-a9 conflicts with -march= switch
> > 
> > found by lastnights OMAP4430 randconfig build.
> 
> Do you have that randconfig file?
> And can you please point me to the repo which is is used for this build?

Everything which is public is at:

http://www.home.arm.linux.org.uk/developer/build/

I don't make the build tree available because it changes too often and
I don't want _anyone_ to make the mistake of assuming that anything
which is in there is stable.  However, the above URL tells you how it's
generated.  As it is mainline+arm-soc+my tree (including some bits I'm
not publishing), it's pretty much publically available anyway.
Russell King - ARM Linux - May 24, 2013, 12:31 p.m.
On Fri, May 24, 2013 at 01:31:05PM +0100, Russell King - ARM Linux wrote:
> On Fri, May 24, 2013 at 02:10:32PM +0200, Michal Simek wrote:
> > Hi Russell,
> > 
> > On 05/24/2013 01:26 PM, Russell King - ARM Linux wrote:
> > > You might want to resolve this new warning:
> > > 
> > > arch/arm/mach-zynq/hotplug.c:1:0: warning: switch -mcpu=cortex-a9 conflicts with -march= switch
> > > 
> > > found by lastnights OMAP4430 randconfig build.
> > 
> > Do you have that randconfig file?
> > And can you please point me to the repo which is is used for this build?
> 
> Everything which is public is at:
> 
> http://www.home.arm.linux.org.uk/developer/build/

Err, drop the .home bit out of that.
Michal Simek - May 24, 2013, 12:37 p.m.
On 05/24/2013 02:31 PM, Russell King - ARM Linux wrote:
> On Fri, May 24, 2013 at 01:31:05PM +0100, Russell King - ARM Linux wrote:
>> On Fri, May 24, 2013 at 02:10:32PM +0200, Michal Simek wrote:
>>> Hi Russell,
>>>
>>> On 05/24/2013 01:26 PM, Russell King - ARM Linux wrote:
>>>> You might want to resolve this new warning:
>>>>
>>>> arch/arm/mach-zynq/hotplug.c:1:0: warning: switch -mcpu=cortex-a9 conflicts with -march= switch
>>>>
>>>> found by lastnights OMAP4430 randconfig build.
>>>
>>> Do you have that randconfig file?
>>> And can you please point me to the repo which is is used for this build?
>>
>> Everything which is public is at:
>>
>> http://www.home.arm.linux.org.uk/developer/build/
> 
> Err, drop the .home bit out of that.

Thanks that's everything what I need.
Michal
Michal Simek - May 27, 2013, 2:05 p.m.
Hi Russell,

On 05/24/2013 01:26 PM, Russell King - ARM Linux wrote:
> On Thu, Apr 04, 2013 at 09:47:09AM +0200, Michal Simek wrote:
>> Hi Arnd and Olof,
>>
>> please pull the following smp support to your arm-soc tree.
>>
>> This branch is based on zynq/clksrc/cleanup parts because
>> there are some dependencies on moving timer to generic location.
>>
>> I could based it on standard Linux tagged version but you will get
>> several conflicts you will have to resolve.
>> If you are OK to resolving these problems, please let me know
>> I will create another branch with core-smp changes which are not based
>> on zynq/clksrc/cleanup branch.
> 
> You might want to resolve this new warning:
> 
> arch/arm/mach-zynq/hotplug.c:1:0: warning: switch -mcpu=cortex-a9 conflicts with -march= switch
> 
> found by lastnights OMAP4430 randconfig build.

I have looked at it. (I downloaded .config last week to have).
I have tried gcc 4.6.3 from kernel.org
https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.6.3/
and also (Sourcery CodeBench Lite 2011.09-50) 4.6.1 toolchain
but I can't see this warning.

Which gcc version do you use?

Thanks,
Michal