From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King - ARM Linux Subject: Re: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap Date: Sat, 4 Sep 2010 12:05:12 +0100 Message-ID: <20100904110512.GD12674@n2100.arm.linux.org.uk> References: <20100819073810.GR12184@atomide.com> <4C6CFBAF.6020407@canonical.com> <20100819095705.GU12184@atomide.com> <20100819102025.GA32151@n2100.arm.linux.org.uk> <20100820120622.GL25742@atomide.com> <20100830225527.GC11597@atomide.com> <20100902133637.GJ26319@n2100.arm.linux.org.uk> <20100902161659.GJ11597@atomide.com> <20100902162337.GP11597@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from caramon.arm.linux.org.uk ([78.32.30.218]:53685 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752376Ab0IDLFZ (ORCPT ); Sat, 4 Sep 2010 07:05:25 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Shilimkar, Santosh" Cc: Tony Lindgren , "linux-omap@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Bryan Wu , Will Deacon On Fri, Sep 03, 2010 at 05:36:27PM +0530, Shilimkar, Santosh wrote: > > -----Original Message----- > > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap- > > owner@vger.kernel.org] On Behalf Of Tony Lindgren > > Sent: Thursday, September 02, 2010 9:54 PM > > To: Russell King - ARM Linux > > Cc: linux-omap@vger.kernel.org; linux-arm-kernel@lists.infradead.org; > > Bryan Wu; Will Deacon > > Subject: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap > > > > From c04a57fc3b41d886f56ccdc27cf9758de0c95202 Mon Sep 17 00:00:00 2001 > > From: Tony Lindgren > > Date: Tue, 17 Aug 2010 13:33:23 +0300 > > Subject: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap > > > > Fix SMP on UP interrupt handling for multi-omap > > > > Signed-off-by: Tony Lindgren > > --- > > arch/arm/mach-omap2/omap-smp.c | 13 +++++++++---- > > arch/arm/mach-omap2/timer-gp.c | 7 +++++-- > > 2 files changed, 14 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap- > > smp.c > > index 9e9f70e..a8bb49c 100644 > > --- a/arch/arm/mach-omap2/omap-smp.c > > +++ b/arch/arm/mach-omap2/omap-smp.c > > @@ -22,6 +22,7 @@ > > > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -114,11 +115,15 @@ void __init smp_init_cpus(void) > > { > > unsigned int i, ncores; > > > > - /* Never released */ > > - scu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256); > > - BUG_ON(!scu_base); > > + if (smp_on_up()) { > > + ncores = 1; > I am not sure if this is the correct approach. The SCU > hardware is not present other than OMAP4. So we should > just return here when the silicon is not omap4. > if (!cpu_is_omap44xx()) > return -ENODEV; void function returning a value? Just a simple return statement will do. From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@arm.linux.org.uk (Russell King - ARM Linux) Date: Sat, 4 Sep 2010 12:05:12 +0100 Subject: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap In-Reply-To: References: <20100819073810.GR12184@atomide.com> <4C6CFBAF.6020407@canonical.com> <20100819095705.GU12184@atomide.com> <20100819102025.GA32151@n2100.arm.linux.org.uk> <20100820120622.GL25742@atomide.com> <20100830225527.GC11597@atomide.com> <20100902133637.GJ26319@n2100.arm.linux.org.uk> <20100902161659.GJ11597@atomide.com> <20100902162337.GP11597@atomide.com> Message-ID: <20100904110512.GD12674@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Sep 03, 2010 at 05:36:27PM +0530, Shilimkar, Santosh wrote: > > -----Original Message----- > > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- > > owner at vger.kernel.org] On Behalf Of Tony Lindgren > > Sent: Thursday, September 02, 2010 9:54 PM > > To: Russell King - ARM Linux > > Cc: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org; > > Bryan Wu; Will Deacon > > Subject: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap > > > > From c04a57fc3b41d886f56ccdc27cf9758de0c95202 Mon Sep 17 00:00:00 2001 > > From: Tony Lindgren > > Date: Tue, 17 Aug 2010 13:33:23 +0300 > > Subject: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap > > > > Fix SMP on UP interrupt handling for multi-omap > > > > Signed-off-by: Tony Lindgren > > --- > > arch/arm/mach-omap2/omap-smp.c | 13 +++++++++---- > > arch/arm/mach-omap2/timer-gp.c | 7 +++++-- > > 2 files changed, 14 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap- > > smp.c > > index 9e9f70e..a8bb49c 100644 > > --- a/arch/arm/mach-omap2/omap-smp.c > > +++ b/arch/arm/mach-omap2/omap-smp.c > > @@ -22,6 +22,7 @@ > > > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -114,11 +115,15 @@ void __init smp_init_cpus(void) > > { > > unsigned int i, ncores; > > > > - /* Never released */ > > - scu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256); > > - BUG_ON(!scu_base); > > + if (smp_on_up()) { > > + ncores = 1; > I am not sure if this is the correct approach. The SCU > hardware is not present other than OMAP4. So we should > just return here when the silicon is not omap4. > if (!cpu_is_omap44xx()) > return -ENODEV; void function returning a value? Just a simple return statement will do.