ca15ca406f
Patch series "mm: cleanup usage of <asm/pgalloc.h>"
Most architectures have very similar versions of pXd_alloc_one() and
pXd_free_one() for intermediate levels of page table. These patches add
generic versions of these functions in <asm-generic/pgalloc.h> and enable
use of the generic functions where appropriate.
In addition, functions declared and defined in <asm/pgalloc.h> headers are
used mostly by core mm and early mm initialization in arch and there is no
actual reason to have the <asm/pgalloc.h> included all over the place.
The first patch in this series removes unneeded includes of
<asm/pgalloc.h>
In the end it didn't work out as neatly as I hoped and moving
pXd_alloc_track() definitions to <asm-generic/pgalloc.h> would require
unnecessary changes to arches that have custom page table allocations, so
I've decided to move lib/ioremap.c to mm/ and make pgalloc-track.h local
to mm/.
This patch (of 8):
In most cases <asm/pgalloc.h> header is required only for allocations of
page table memory. Most of the .c files that include that header do not
use symbols declared in <asm/pgalloc.h> and do not require that header.
As for the other header files that used to include <asm/pgalloc.h>, it is
possible to move that include into the .c file that actually uses symbols
from <asm/pgalloc.h> and drop the include from the header file.
The process was somewhat automated using
sed -i -E '/[<"]asm\/pgalloc\.h/d' \
$(grep -L -w -f /tmp/xx \
$(git grep -E -l '[<"]asm/pgalloc\.h'))
where /tmp/xx contains all the symbols defined in
arch/*/include/asm/pgalloc.h.
[rppt@linux.ibm.com: fix powerpc warning]
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> [m68k]
Cc: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Matthew Wilcox <willy@infradead.org>
Link: http://lkml.kernel.org/r/20200627143453.31835-1-rppt@kernel.org
Link: http://lkml.kernel.org/r/20200627143453.31835-2-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
98 lines
2.2 KiB
C
98 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* ide.h: SPARC PCI specific IDE glue.
|
|
*
|
|
* Copyright (C) 1997 David S. Miller (davem@davemloft.net)
|
|
* Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
|
|
* Adaptation from sparc64 version to sparc by Pete Zaitcev.
|
|
*/
|
|
|
|
#ifndef _SPARC_IDE_H
|
|
#define _SPARC_IDE_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm/io.h>
|
|
#ifdef CONFIG_SPARC64
|
|
#include <asm/spitfire.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/page.h>
|
|
#else
|
|
#include <linux/pgtable.h>
|
|
#include <asm/psr.h>
|
|
#endif
|
|
|
|
#define __ide_insl(data_reg, buffer, wcount) \
|
|
__ide_insw(data_reg, buffer, (wcount)<<1)
|
|
#define __ide_outsl(data_reg, buffer, wcount) \
|
|
__ide_outsw(data_reg, buffer, (wcount)<<1)
|
|
|
|
/* On sparc, I/O ports and MMIO registers are accessed identically. */
|
|
#define __ide_mm_insw __ide_insw
|
|
#define __ide_mm_insl __ide_insl
|
|
#define __ide_mm_outsw __ide_outsw
|
|
#define __ide_mm_outsl __ide_outsl
|
|
|
|
static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
|
|
{
|
|
#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
|
|
unsigned long end = (unsigned long)dst + (count << 1);
|
|
#endif
|
|
u16 *ps = dst;
|
|
u32 *pi;
|
|
|
|
if(((unsigned long)ps) & 0x2) {
|
|
*ps++ = __raw_readw(port);
|
|
count--;
|
|
}
|
|
pi = (u32 *)ps;
|
|
while(count >= 2) {
|
|
u32 w;
|
|
|
|
w = __raw_readw(port) << 16;
|
|
w |= __raw_readw(port);
|
|
*pi++ = w;
|
|
count -= 2;
|
|
}
|
|
ps = (u16 *)pi;
|
|
if(count)
|
|
*ps++ = __raw_readw(port);
|
|
|
|
#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
|
|
__flush_dcache_range((unsigned long)dst, end);
|
|
#endif
|
|
}
|
|
|
|
static inline void __ide_outsw(void __iomem *port, const void *src, u32 count)
|
|
{
|
|
#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
|
|
unsigned long end = (unsigned long)src + (count << 1);
|
|
#endif
|
|
const u16 *ps = src;
|
|
const u32 *pi;
|
|
|
|
if(((unsigned long)src) & 0x2) {
|
|
__raw_writew(*ps++, port);
|
|
count--;
|
|
}
|
|
pi = (const u32 *)ps;
|
|
while(count >= 2) {
|
|
u32 w;
|
|
|
|
w = *pi++;
|
|
__raw_writew((w >> 16), port);
|
|
__raw_writew(w, port);
|
|
count -= 2;
|
|
}
|
|
ps = (const u16 *)pi;
|
|
if(count)
|
|
__raw_writew(*ps, port);
|
|
|
|
#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
|
|
__flush_dcache_range((unsigned long)src, end);
|
|
#endif
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _SPARC_IDE_H */
|