Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932903AbbDNP7y (ORCPT ); Tue, 14 Apr 2015 11:59:54 -0400 Received: from foss.arm.com ([217.140.101.70]:34328 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755652AbbDNP7q (ORCPT ); Tue, 14 Apr 2015 11:59:46 -0400 Date: Tue, 14 Apr 2015 16:59:41 +0100 From: Mark Rutland To: Kumar Gala Cc: "linux-arm-msm@vger.kernel.org" , Catalin Marinas , Will Deacon , "linux-kernel@vger.kernel.org" , "arm@kernel.org" , Abhimanyu Kapur , "linux-arm-kernel@lists.infradead.org" Subject: Re: [RFC PATCH 4/5] arm64: smp: move the pen to a header file Message-ID: <20150414155941.GK28709@leverpostej> References: <1428601031-5366-1-git-send-email-galak@codeaurora.org> <1428601031-5366-5-git-send-email-galak@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1428601031-5366-5-git-send-email-galak@codeaurora.org> 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: 2840 Lines: 83 On Thu, Apr 09, 2015 at 06:37:10PM +0100, Kumar Gala wrote: > From: Abhimanyu Kapur > > Move the secondary_pen_release variable and the secondary_holding_pen > entry function to asm/smp_plat.h so that the other cpu ops implementations > can share them. If anything, this should all be moved into smp_spin_table.c, and made static. We made a mistake with the pen (and allowing multiple CPUs to enter the kernel at once). That mistake shouldn't be spread further. Mark. > > Signed-off-by: Abhimanyu Kapur > Signed-off-by: Kumar Gala > --- > arch/arm64/include/asm/smp_plat.h | 2 ++ > arch/arm64/kernel/smp.c | 1 + > arch/arm64/kernel/smp_spin_table.c | 3 --- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/include/asm/smp_plat.h b/arch/arm64/include/asm/smp_plat.h > index 59e2823..235ff04 100644 > --- a/arch/arm64/include/asm/smp_plat.h > +++ b/arch/arm64/include/asm/smp_plat.h > @@ -34,10 +34,12 @@ static inline u32 mpidr_hash_size(void) > return 1 << mpidr_hash.bits; > } > > +extern void secondary_holding_pen(void); > /* > * Logical CPU mapping. > */ > extern u64 __cpu_logical_map[NR_CPUS]; > #define cpu_logical_map(cpu) __cpu_logical_map[cpu] > +extern volatile unsigned long secondary_holding_pen_release; > > #endif /* __ASM_SMP_PLAT_H */ > diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c > index 328b8ce..4ce1f23 100644 > --- a/arch/arm64/kernel/smp.c > +++ b/arch/arm64/kernel/smp.c > @@ -61,6 +61,7 @@ > * where to place its SVC stack > */ > struct secondary_data secondary_data; > +volatile unsigned long secondary_holding_pen_release = INVALID_HWID; > > enum ipi_msg_type { > IPI_RESCHEDULE, > diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c > index b41a8b4..be833b9 100644 > --- a/arch/arm64/kernel/smp_spin_table.c > +++ b/arch/arm64/kernel/smp_spin_table.c > @@ -28,9 +28,6 @@ > #include > #include > > -extern void secondary_holding_pen(void); > -volatile unsigned long secondary_holding_pen_release = INVALID_HWID; > - > static phys_addr_t cpu_release_addr[NR_CPUS]; > > /* > -- > Qualcomm Innovation Center, Inc. > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- 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/