From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ralf Baechle Subject: Re: [PATCH 05/15] MIPS: Don't build fast TLB refill handler with 32-bit kernels. Date: Wed, 21 May 2014 15:04:20 +0200 Message-ID: <20140521130420.GR10287@linux-mips.org> References: <1400597236-11352-1-git-send-email-andreas.herrmann@caviumnetworks.com> <1400597236-11352-6-git-send-email-andreas.herrmann@caviumnetworks.com> <537C741F.60104@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Andreas Herrmann , linux-mips@linux-mips.org, David Daney , kvm@vger.kernel.org, David Daney To: James Hogan Return-path: Received: from eddie.linux-mips.org ([78.24.191.182]:60820 "EHLO cvs.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750761AbaEUNFE (ORCPT ); Wed, 21 May 2014 09:05:04 -0400 Received: from localhost.localdomain ([127.0.0.1]:51428 "EHLO linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by eddie.linux-mips.org with ESMTP id S6843081AbaEUNFCp34An (ORCPT ); Wed, 21 May 2014 15:05:02 +0200 Content-Disposition: inline In-Reply-To: <537C741F.60104@imgtec.com> Sender: kvm-owner@vger.kernel.org List-ID: On Wed, May 21, 2014 at 10:38:39AM +0100, James Hogan wrote: > On 20/05/14 15:47, Andreas Herrmann wrote: > > From: David Daney > > > > The fast handler only supports 64-bit kernels. > > > > Signed-off-by: David Daney > > Signed-off-by: Andreas Herrmann > > --- > > arch/mips/mm/tlbex.c | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c > > index ee88367..781e183 100644 > > --- a/arch/mips/mm/tlbex.c > > +++ b/arch/mips/mm/tlbex.c > > @@ -1250,13 +1250,17 @@ static void build_r4000_tlb_refill_handler(void) > > unsigned int final_len; > > struct mips_huge_tlb_info htlb_info __maybe_unused; > > enum vmalloc64_mode vmalloc_mode __maybe_unused; > > - > > +#ifdef CONFIG_64BIT > > + bool is64bit = true; > > +#else > > + bool is64bit = false; > > +#endif > > memset(tlb_handler, 0, sizeof(tlb_handler)); > > memset(labels, 0, sizeof(labels)); > > memset(relocs, 0, sizeof(relocs)); > > memset(final_handler, 0, sizeof(final_handler)); > > > > - if ((scratch_reg >= 0 || scratchpad_available()) && use_bbit_insns()) { > > + if (is64bit && (scratch_reg >= 0 || scratchpad_available()) && use_bbit_insns()) { > > htlb_info = build_fast_tlb_refill_handler(&p, &l, &r, K0, K1, > > scratch_reg); > > vmalloc_mode = refill_scratch; > > > > This looks like a good place to use IS_ENABLED(CONFIG_64BIT) to reduce > ifdefery. Or even the classic "if (sizeof(unsigned long) == 8)" which is a little less expressive but more portable. Ralf