From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B4059221290 for ; Mon, 5 Jan 2026 05:35:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767591352; cv=none; b=axhsQa9sF8phRcbAvtkBDmv71vvmD0VZp9i/fqjYqLqDmG/teE3DMb8/tyzQ6nTYf/niQp1DIiXDkjlmLN3nlmU1R4JhpGLg3W1Tku4PYQcmW9rv5eO6JS6qvb0++kfVObwN9YqBEuS+3nWX4RJMLMZEI9UPlLFDi1HLVx7DBo8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767591352; c=relaxed/simple; bh=7vq0ooFOhDeqVBK4JyI/82C7BJ7tb+pL/+b/YKH7evc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=imn8nuD1QtPTNDmtySAn4v2Srale2wZUOsgc4Av3+23Gbwycn/YV5GN86BOAlQ2BH31sKgseBS6vZOQBSpW79LTVmfZKZDholYnZ0hepmIPW6k6pPYk3idhQ4vtYEEBHLqCljR6iMeg1RbJwSo1NhzmUeFuxlUckfrjdG7p+PJg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D7EF6339; Sun, 4 Jan 2026 21:35:41 -0800 (PST) Received: from localhost (a079125.arm.com [10.164.21.37]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DE4123F694; Sun, 4 Jan 2026 21:35:47 -0800 (PST) Date: Mon, 5 Jan 2026 11:05:44 +0530 From: Linu Cherian To: Ryan Roberts Cc: Will Deacon , Ard Biesheuvel , Catalin Marinas , Mark Rutland , Linus Torvalds , Oliver Upton , Marc Zyngier , Dev Jain , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 05/13] arm64: mm: Inline __TLBI_VADDR_RANGE() into __tlbi_range() Message-ID: References: <20251216144601.2106412-1-ryan.roberts@arm.com> <20251216144601.2106412-6-ryan.roberts@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20251216144601.2106412-6-ryan.roberts@arm.com> On Tue, Dec 16, 2025 at 02:45:50PM +0000, Ryan Roberts wrote: > From: Will Deacon > > The __TLBI_VADDR_RANGE() macro is only used in one place and isn't > something that's generally useful outside of the low-level range > invalidation gubbins. > > Inline __TLBI_VADDR_RANGE() into the __tlbi_range() function so that the > macro can be removed entirely. > > Signed-off-by: Will Deacon > Signed-off-by: Ryan Roberts > --- > arch/arm64/include/asm/tlbflush.h | 32 +++++++++++++------------------ > 1 file changed, 13 insertions(+), 19 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index 39717f98c31e..887dd1f05a89 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -195,19 +195,6 @@ static inline void __tlbi_level(tlbi_op op, u64 addr, u32 level) > #define TLBIR_TTL_MASK GENMASK_ULL(38, 37) > #define TLBIR_BADDR_MASK GENMASK_ULL(36, 0) > > -#define __TLBI_VADDR_RANGE(baddr, asid, scale, num, ttl) \ > - ({ \ > - unsigned long __ta = 0; \ > - unsigned long __ttl = (ttl >= 1 && ttl <= 3) ? ttl : 0; \ > - __ta |= FIELD_PREP(TLBIR_BADDR_MASK, baddr); \ > - __ta |= FIELD_PREP(TLBIR_TTL_MASK, __ttl); \ > - __ta |= FIELD_PREP(TLBIR_NUM_MASK, num); \ > - __ta |= FIELD_PREP(TLBIR_SCALE_MASK, scale); \ > - __ta |= FIELD_PREP(TLBIR_TG_MASK, get_trans_granule()); \ > - __ta |= FIELD_PREP(TLBIR_ASID_MASK, asid); \ > - __ta; \ > - }) > - > /* These macros are used by the TLBI RANGE feature. */ > #define __TLBI_RANGE_PAGES(num, scale) \ > ((unsigned long)((num) + 1) << (5 * (scale) + 1)) > @@ -488,8 +475,19 @@ static __always_inline void ripas2e1is(u64 arg) > __tlbi(ripas2e1is, arg); > } > > -static __always_inline void __tlbi_range(tlbi_op op, u64 arg) > +static __always_inline void __tlbi_range(tlbi_op op, u64 addr, > + u16 asid, int scale, int num, > + u32 level, bool lpa2) > { > + u64 arg = 0; > + > + arg |= FIELD_PREP(TLBIR_BADDR_MASK, addr >> (lpa2 ? 16 : PAGE_SHIFT)); > + arg |= FIELD_PREP(TLBIR_TTL_MASK, level > 3 ? 0 : level); > + arg |= FIELD_PREP(TLBIR_NUM_MASK, num); > + arg |= FIELD_PREP(TLBIR_SCALE_MASK, scale); > + arg |= FIELD_PREP(TLBIR_TG_MASK, get_trans_granule()); > + arg |= FIELD_PREP(TLBIR_ASID_MASK, asid); > + > op(arg); > } > > @@ -500,8 +498,6 @@ do { \ > typeof(pages) __flush_pages = pages; \ > int num = 0; \ > int scale = 3; \ > - int shift = lpa2 ? 16 : PAGE_SHIFT; \ > - unsigned long addr; \ > \ > while (__flush_pages > 0) { \ > if (!system_supports_tlb_range() || \ > @@ -515,9 +511,7 @@ do { \ > \ > num = __TLBI_RANGE_NUM(__flush_pages, scale); \ > if (num >= 0) { \ > - addr = __TLBI_VADDR_RANGE(__flush_start >> shift, asid, \ > - scale, num, tlb_level); \ > - __tlbi_range(r##op, addr); \ > + __tlbi_range(r##op, __flush_start, asid, scale, num, tlb_level, lpa2); \ > __flush_start += __TLBI_RANGE_PAGES(num, scale) << PAGE_SHIFT; \ > __flush_pages -= __TLBI_RANGE_PAGES(num, scale);\ > } \ > -- > 2.43.0 > Reviewed-by: Linu Cherian