From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EFAACA90AF for ; Wed, 13 May 2020 11:20:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C9A4420753 for ; Wed, 13 May 2020 11:20:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9A4420753 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7A1B9900125; Wed, 13 May 2020 07:20:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 72BB79000F3; Wed, 13 May 2020 07:20:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6196B900125; Wed, 13 May 2020 07:20:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id 445809000F3 for ; Wed, 13 May 2020 07:20:10 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 02C2C824805A for ; Wed, 13 May 2020 11:20:10 +0000 (UTC) X-FDA: 76811451780.25.size73_75ced7762100c X-HE-Tag: size73_75ced7762100c X-Filterd-Recvd-Size: 8989 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 May 2020 11:20:09 +0000 (UTC) Received: from [10.44.0.192] (unknown [103.48.210.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2F70206E5; Wed, 13 May 2020 11:19:49 +0000 (UTC) Subject: Re: [PATCH 06/12] m68k/mm: move {cache,nocahe}_page() definitions close to their user To: Mike Rapoport , linux-kernel@vger.kernel.org Cc: Andrew Morton , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Chris Zankel , "David S. Miller" , Geert Uytterhoeven , Greentime Hu , Guan Xuetao , Guo Ren , Heiko Carstens , Helge Deller , Ingo Molnar , Ley Foon Tan , Mark Salter , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Nick Hu , Paul Walmsley , Richard Weinberger , Rich Felker , Russell King , Stafford Horne , Thomas Bogendoerfer , Thomas Gleixner , Tony Luck , Vincent Chen , Vineet Gupta , Will Deacon , Yoshinori Sato , linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, x86@kernel.org, Mike Rapoport References: <20200512184422.12418-1-rppt@kernel.org> <20200512184422.12418-7-rppt@kernel.org> From: Greg Ungerer Message-ID: Date: Wed, 13 May 2020 21:19:45 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200512184422.12418-7-rppt@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Mike, On 13/5/20 4:44 am, Mike Rapoport wrote: > From: Mike Rapoport > > The cache_page() and nocache_page() functions are only used by the morotola ^^^^^^^^ motorola > MMU variant for setting caching attributes for the page table pages. > > Move the definitions of these functions from > arch/m68k/include/asm/motorola_pgtable.h closer to their usage in > arch/m68k/mm/motorola.c and drop unused definition in > arch/m68k/include/asm/mcf_pgtable.h. > > Signed-off-by: Mike Rapoport Acked-by: Greg Ungerer Regards Greg > --- > arch/m68k/include/asm/mcf_pgtable.h | 40 --------------------- > arch/m68k/include/asm/motorola_pgtable.h | 44 ------------------------ > arch/m68k/mm/motorola.c | 43 +++++++++++++++++++++++ > 3 files changed, 43 insertions(+), 84 deletions(-) > > diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h > index 0031cd387b75..737e826294f3 100644 > --- a/arch/m68k/include/asm/mcf_pgtable.h > +++ b/arch/m68k/include/asm/mcf_pgtable.h > @@ -328,46 +328,6 @@ extern pgd_t kernel_pg_dir[PTRS_PER_PGD]; > #define pte_offset_kernel(dir, address) \ > ((pte_t *) __pmd_page(*(dir)) + __pte_offset(address)) > > -/* > - * Disable caching for page at given kernel virtual address. > - */ > -static inline void nocache_page(void *vaddr) > -{ > - pgd_t *dir; > - p4d_t *p4dp; > - pud_t *pudp; > - pmd_t *pmdp; > - pte_t *ptep; > - unsigned long addr = (unsigned long) vaddr; > - > - dir = pgd_offset_k(addr); > - p4dp = p4d_offset(dir, addr); > - pudp = pud_offset(p4dp, addr); > - pmdp = pmd_offset(pudp, addr); > - ptep = pte_offset_kernel(pmdp, addr); > - *ptep = pte_mknocache(*ptep); > -} > - > -/* > - * Enable caching for page at given kernel virtual address. > - */ > -static inline void cache_page(void *vaddr) > -{ > - pgd_t *dir; > - p4d_t *p4dp; > - pud_t *pudp; > - pmd_t *pmdp; > - pte_t *ptep; > - unsigned long addr = (unsigned long) vaddr; > - > - dir = pgd_offset_k(addr); > - p4dp = p4d_offset(dir, addr); > - pudp = pud_offset(p4dp, addr); > - pmdp = pmd_offset(pudp, addr); > - ptep = pte_offset_kernel(pmdp, addr); > - *ptep = pte_mkcache(*ptep); > -} > - > /* > * Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) > */ > diff --git a/arch/m68k/include/asm/motorola_pgtable.h b/arch/m68k/include/asm/motorola_pgtable.h > index 9e5a3de21e15..e1594acf7c7e 100644 > --- a/arch/m68k/include/asm/motorola_pgtable.h > +++ b/arch/m68k/include/asm/motorola_pgtable.h > @@ -227,50 +227,6 @@ static inline pte_t *pte_offset_kernel(pmd_t *pmdp, unsigned long address) > #define pte_offset_map(pmdp,address) ((pte_t *)__pmd_page(*pmdp) + (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) > #define pte_unmap(pte) ((void)0) > > -/* Prior to calling these routines, the page should have been flushed > - * from both the cache and ATC, or the CPU might not notice that the > - * cache setting for the page has been changed. -jskov > - */ > -static inline void nocache_page(void *vaddr) > -{ > - unsigned long addr = (unsigned long)vaddr; > - > - if (CPU_IS_040_OR_060) { > - pgd_t *dir; > - p4d_t *p4dp; > - pud_t *pudp; > - pmd_t *pmdp; > - pte_t *ptep; > - > - dir = pgd_offset_k(addr); > - p4dp = p4d_offset(dir, addr); > - pudp = pud_offset(p4dp, addr); > - pmdp = pmd_offset(pudp, addr); > - ptep = pte_offset_kernel(pmdp, addr); > - *ptep = pte_mknocache(*ptep); > - } > -} > - > -static inline void cache_page(void *vaddr) > -{ > - unsigned long addr = (unsigned long)vaddr; > - > - if (CPU_IS_040_OR_060) { > - pgd_t *dir; > - p4d_t *p4dp; > - pud_t *pudp; > - pmd_t *pmdp; > - pte_t *ptep; > - > - dir = pgd_offset_k(addr); > - p4dp = p4d_offset(dir, addr); > - pudp = pud_offset(p4dp, addr); > - pmdp = pmd_offset(pudp, addr); > - ptep = pte_offset_kernel(pmdp, addr); > - *ptep = pte_mkcache(*ptep); > - } > -} > - > /* Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */ > #define __swp_type(x) (((x).val >> 4) & 0xff) > #define __swp_offset(x) ((x).val >> 12) > diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c > index 904c2a663977..8e5e74121a78 100644 > --- a/arch/m68k/mm/motorola.c > +++ b/arch/m68k/mm/motorola.c > @@ -45,6 +45,49 @@ unsigned long mm_cachebits; > EXPORT_SYMBOL(mm_cachebits); > #endif > > +/* Prior to calling these routines, the page should have been flushed > + * from both the cache and ATC, or the CPU might not notice that the > + * cache setting for the page has been changed. -jskov > + */ > +static inline void nocache_page(void *vaddr) > +{ > + unsigned long addr = (unsigned long)vaddr; > + > + if (CPU_IS_040_OR_060) { > + pgd_t *dir; > + p4d_t *p4dp; > + pud_t *pudp; > + pmd_t *pmdp; > + pte_t *ptep; > + > + dir = pgd_offset_k(addr); > + p4dp = p4d_offset(dir, addr); > + pudp = pud_offset(p4dp, addr); > + pmdp = pmd_offset(pudp, addr); > + ptep = pte_offset_kernel(pmdp, addr); > + *ptep = pte_mknocache(*ptep); > + } > +} > + > +static inline void cache_page(void *vaddr) > +{ > + unsigned long addr = (unsigned long)vaddr; > + > + if (CPU_IS_040_OR_060) { > + pgd_t *dir; > + p4d_t *p4dp; > + pud_t *pudp; > + pmd_t *pmdp; > + pte_t *ptep; > + > + dir = pgd_offset_k(addr); > + p4dp = p4d_offset(dir, addr); > + pudp = pud_offset(p4dp, addr); > + pmdp = pmd_offset(pudp, addr); > + ptep = pte_offset_kernel(pmdp, addr); > + *ptep = pte_mkcache(*ptep); > + } > +} > > /* > * Motorola 680x0 user's manual recommends using uncached memory for address >