Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562AbbGAMji (ORCPT ); Wed, 1 Jul 2015 08:39:38 -0400 Received: from foss.arm.com ([217.140.101.70]:45382 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751293AbbGAMjb (ORCPT ); Wed, 1 Jul 2015 08:39:31 -0400 Date: Wed, 1 Jul 2015 13:39:08 +0100 From: Mark Rutland To: Vitaly Andrianov Cc: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linux@arm.linux.org.uk" , "ssantosh@kernel.org" , "robh+dt@kernel.org" , Pawel Moll , "ijc+devicetree@hellion.org.uk" , "galak@codeaurora.org" , "devicetree@vger.kernel.org" Subject: Re: [PATCH] ARM: psci: keystone: remove keystone_smp_ops code if psci is supported Message-ID: <20150701123908.GA2310@leverpostej> References: <1435752784-30639-1-git-send-email-vitalya@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1435752784-30639-1-git-send-email-vitalya@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1955 Lines: 59 On Wed, Jul 01, 2015 at 01:13:03PM +0100, Vitaly Andrianov wrote: > If we enable psci support we don't need keystone_smp_ops anymore. You need them for existing users. > > Signed-off-by: Vitaly Andrianov > --- > arch/arm/mach-keystone/Makefile | 2 ++ > arch/arm/mach-keystone/keystone.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile > index 25d9239..5cc5ca4 100644 > --- a/arch/arm/mach-keystone/Makefile > +++ b/arch/arm/mach-keystone/Makefile > @@ -3,7 +3,9 @@ obj-y := keystone.o smc.o > plus_sec := $(call as-instr,.arch_extension sec,+sec) > AFLAGS_smc.o :=-Wa,-march=armv7-a$(plus_sec) > > +ifneq ($(CONFIG_ARM_PSCI),y) > obj-$(CONFIG_SMP) += platsmp.o > +endif > > # PM domain driver for Keystone SOCs > obj-$(CONFIG_ARCH_KEYSTONE) += pm_domain.o > diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c > index e2880105..9cc489c 100644 > --- a/arch/arm/mach-keystone/keystone.c > +++ b/arch/arm/mach-keystone/keystone.c > @@ -105,7 +105,9 @@ DT_MACHINE_START(KEYSTONE, "Keystone") > #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE) > .dma_zone_size = SZ_2G, > #endif > +#ifndef CONFIG_ARM_PSCI > .smp = smp_ops(keystone_smp_ops), > +#endif This will prevent building a kernel that supports PSCI and your legacy SMP bringup. I don't think this is necessary, given the code in setup_arch and the absence of mdesc->smp_init for keystone. A single kernel can support both, and it should support both. Thanks, Mark. > .init_machine = keystone_init, > .dt_compat = keystone_match, > .pv_fixup = keystone_pv_fixup, > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/