From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965094AbcIFSRH (ORCPT ); Tue, 6 Sep 2016 14:17:07 -0400 Received: from foss.arm.com ([217.140.101.70]:33260 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964974AbcIFSRF (ORCPT ); Tue, 6 Sep 2016 14:17:05 -0400 Date: Tue, 6 Sep 2016 19:17:10 +0100 From: Will Deacon To: Punit Agrawal Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mark Rutland , Christoffer Dall , Marc Zyngier , Steven Rostedt , Ingo Molnar , Catalin Marinas Subject: Re: [RFC v2 PATCH 4/7] arm64: tlbflush.h: add __tlbi() macro Message-ID: <20160906181710.GF29382@arm.com> References: <1473093097-30932-1-git-send-email-punit.agrawal@arm.com> <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 05, 2016 at 05:31:34PM +0100, Punit Agrawal wrote: > From: Mark Rutland > > As with dsb() and isb(), add a __tlbi() helper so that we can avoid > distracting asm boilerplate every time we want a TLBI. As some TLBI > operations take an argument while others do not, some pre-processor is > used to handle these two cases with different assembly blocks. > > The existing tlbflush.h code is moved over to use the helper. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Marc Zyngier > Cc: Will Deacon > [ rename helper to __tlbi, update commit log ] > Signed-off-by: Punit Agrawal > --- > arch/arm64/include/asm/tlbflush.h | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index b460ae2..e9e42a7 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -25,6 +25,21 @@ > #include > > /* > + * Raw TLBI operations. Drivers and most kernel code should use the TLB > + * management routines below in preference to these. Where necessary, these can > + * be used to avoid asm() boilerplate. > + * > + * Can be used as __tlbi(op) or __tlbi(op, arg), depending on whether a > + * particular TLBI op takes an argument or not. The macros below handle invoking > + * the asm with or without the register argument as appropriate. > + */ > +#define __TLBI_0(op, arg) asm ("tlbi " #op) > +#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0" : : "r" (arg)) > +#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg) > + > +#define __tlbi(op, ...) __TLBI_N(op, ##__VA_ARGS__, 1, 0) This looks ok to me now. With Christoffer's comments address: Reviewed-by: Will Deacon Will From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [RFC v2 PATCH 4/7] arm64: tlbflush.h: add __tlbi() macro Date: Tue, 6 Sep 2016 19:17:10 +0100 Message-ID: <20160906181710.GF29382@arm.com> References: <1473093097-30932-1-git-send-email-punit.agrawal@arm.com> <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Marc Zyngier , Catalin Marinas , linux-kernel@vger.kernel.org, Steven Rostedt , Ingo Molnar , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org To: Punit Agrawal Return-path: Content-Disposition: inline In-Reply-To: <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu List-Id: kvm.vger.kernel.org On Mon, Sep 05, 2016 at 05:31:34PM +0100, Punit Agrawal wrote: > From: Mark Rutland > > As with dsb() and isb(), add a __tlbi() helper so that we can avoid > distracting asm boilerplate every time we want a TLBI. As some TLBI > operations take an argument while others do not, some pre-processor is > used to handle these two cases with different assembly blocks. > > The existing tlbflush.h code is moved over to use the helper. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Marc Zyngier > Cc: Will Deacon > [ rename helper to __tlbi, update commit log ] > Signed-off-by: Punit Agrawal > --- > arch/arm64/include/asm/tlbflush.h | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index b460ae2..e9e42a7 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -25,6 +25,21 @@ > #include > > /* > + * Raw TLBI operations. Drivers and most kernel code should use the TLB > + * management routines below in preference to these. Where necessary, these can > + * be used to avoid asm() boilerplate. > + * > + * Can be used as __tlbi(op) or __tlbi(op, arg), depending on whether a > + * particular TLBI op takes an argument or not. The macros below handle invoking > + * the asm with or without the register argument as appropriate. > + */ > +#define __TLBI_0(op, arg) asm ("tlbi " #op) > +#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0" : : "r" (arg)) > +#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg) > + > +#define __tlbi(op, ...) __TLBI_N(op, ##__VA_ARGS__, 1, 0) This looks ok to me now. With Christoffer's comments address: Reviewed-by: Will Deacon Will From mboxrd@z Thu Jan 1 00:00:00 1970 From: will.deacon@arm.com (Will Deacon) Date: Tue, 6 Sep 2016 19:17:10 +0100 Subject: [RFC v2 PATCH 4/7] arm64: tlbflush.h: add __tlbi() macro In-Reply-To: <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> References: <1473093097-30932-1-git-send-email-punit.agrawal@arm.com> <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> Message-ID: <20160906181710.GF29382@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Sep 05, 2016 at 05:31:34PM +0100, Punit Agrawal wrote: > From: Mark Rutland > > As with dsb() and isb(), add a __tlbi() helper so that we can avoid > distracting asm boilerplate every time we want a TLBI. As some TLBI > operations take an argument while others do not, some pre-processor is > used to handle these two cases with different assembly blocks. > > The existing tlbflush.h code is moved over to use the helper. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Marc Zyngier > Cc: Will Deacon > [ rename helper to __tlbi, update commit log ] > Signed-off-by: Punit Agrawal > --- > arch/arm64/include/asm/tlbflush.h | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index b460ae2..e9e42a7 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -25,6 +25,21 @@ > #include > > /* > + * Raw TLBI operations. Drivers and most kernel code should use the TLB > + * management routines below in preference to these. Where necessary, these can > + * be used to avoid asm() boilerplate. > + * > + * Can be used as __tlbi(op) or __tlbi(op, arg), depending on whether a > + * particular TLBI op takes an argument or not. The macros below handle invoking > + * the asm with or without the register argument as appropriate. > + */ > +#define __TLBI_0(op, arg) asm ("tlbi " #op) > +#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0" : : "r" (arg)) > +#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg) > + > +#define __tlbi(op, ...) __TLBI_N(op, ##__VA_ARGS__, 1, 0) This looks ok to me now. With Christoffer's comments address: Reviewed-by: Will Deacon Will