From: Greg Ungerer <gerg@linux-m68k.org>
To: Mike Rapoport <rppt@kernel.org>, linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>, Borislav Petkov <bp@alien8.de>,
Brian Cain <bcain@codeaurora.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Chris Zankel <chris@zankel.net>,
"David S. Miller" <davem@davemloft.net>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Greentime Hu <green.hu@gmail.com>, Guan Xuetao <gxt@pku.edu.cn>,
Guo Ren <guoren@kernel.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Helge Deller <deller@gmx.de>, Ingo Molnar <mingo@redhat.com>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Mark Salter <msalter@redhat.com>,
Matt Turner <mattst88@gmail.com>,
Max Filippov <jcmvbkbc@gmail.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Michal Simek <monstr@monstr.eu>, Nick Hu <nickhu@andestech.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Richard Weinberger <richard@nod.at>,
Rich Felker <dalias@libc.org>,
Russell King <linux@armlinux.org.uk>,
Stafford Horne <shorne@gmail.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Thomas Gleixner <tglx@linutronix.de>,
Tony Luck <tony.luck@intel.com>,
Vincent Chen <deanbo422@gmail.com>,
Vineet Gupta <vgupta@synopsys.com>, Will Deacon <will@kernel.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
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 <rppt@linux.ibm.com>
Subject: Re: [PATCH 06/12] m68k/mm: move {cache,nocahe}_page() definitions close to their user
Date: Wed, 13 May 2020 21:19:45 +1000 [thread overview]
Message-ID: <b59ef7eb-537e-c092-949f-225322f94e2c@linux-m68k.org> (raw)
In-Reply-To: <20200512184422.12418-7-rppt@kernel.org>
Hi Mike,
On 13/5/20 4:44 am, Mike Rapoport wrote:
> From: Mike Rapoport <rppt@linux.ibm.com>
>
> 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 <rppt@linux.ibm.com>
Acked-by: Greg Ungerer <gerg@linux-m68k.org>
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
>
next prev parent reply other threads:[~2020-05-13 11:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 18:44 [PATCH 00/12] mm: consolidate definitions of page table accessors Mike Rapoport
2020-05-12 18:44 ` [PATCH 01/12] mm: don't include asm/pgtable.h if linux/mm.h is already included Mike Rapoport
2020-05-12 18:44 ` [PATCH 02/12] mm: introduce include/linux/pgtable.h Mike Rapoport
2020-05-12 18:44 ` [PATCH 03/12] mm: reorder includes after introduction of linux/pgtable.h Mike Rapoport
2020-05-12 19:20 ` Matthew Wilcox
2020-05-13 5:21 ` Mike Rapoport
2020-05-12 18:44 ` [PATCH 04/12] csky: replace definitions of __pXd_offset() with pXd_index() Mike Rapoport
2020-05-12 18:44 ` [PATCH 05/12] m68k/mm/motorola: move comment about page table allocation funcitons Mike Rapoport
2020-05-12 18:44 ` [PATCH 06/12] m68k/mm: move {cache,nocahe}_page() definitions close to their user Mike Rapoport
2020-05-13 11:19 ` Greg Ungerer [this message]
2020-05-12 18:44 ` [PATCH 07/12] x86/mm: simplify init_trampoline() and surrounding logic Mike Rapoport
2020-05-12 18:44 ` [PATCH 08/12] mm: pgtable: add shortcuts for accessing kernel PMD and PTE Mike Rapoport
2020-05-12 19:24 ` Matthew Wilcox
2020-05-13 5:23 ` Mike Rapoport
2020-05-12 18:44 ` [PATCH 09/12] mm: consolidate pte_index() and pte_offset_*() definitions Mike Rapoport
2020-05-12 18:44 ` [PATCH 10/12] mm: consolidate pmd_index() and pmd_offset() definitions Mike Rapoport
2020-05-12 18:44 ` [PATCH 11/12] mm: consolidate pud_index() and pud_offset() definitions Mike Rapoport
2020-05-12 18:44 ` [PATCH 12/12] mm: consolidate pgd_index() and pgd_offset{_k}() definitions Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b59ef7eb-537e-c092-949f-225322f94e2c@linux-m68k.org \
--to=gerg@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bcain@codeaurora.org \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=chris@zankel.net \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=deanbo422@gmail.com \
--cc=deller@gmx.de \
--cc=geert@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=heiko.carstens@de.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=ley.foon.tan@intel.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-um@lists.infradead.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=msalter@redhat.com \
--cc=nickhu@andestech.com \
--cc=openrisc@lists.librecores.org \
--cc=paul.walmsley@sifive.com \
--cc=richard@nod.at \
--cc=rppt@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=shorne@gmail.com \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=tsbogend@alpha.franken.de \
--cc=vgupta@synopsys.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).