Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 565b60de authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Ralf Baechle
Browse files

MIPS: Move FIXADDR_TOP into spaces.h 



Memory maps and addressing quirks are normally defined in <spaces.h>.
There are already three targets that need to override FIXADDR_TOP, and
others exist.  This will be a cleaner approach than adding lots of
ifdefs in fixmap.h .

Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1573/


Acked-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d0023c4a

arch/mips/include/asm/fixmap.h

+1 −9
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define _ASM_FIXMAP_H

#define _ASM_FIXMAP_H





#include <asm/page.h>

#include <asm/page.h>

#include <spaces.h>

#ifdef CONFIG_HIGHMEM

#ifdef CONFIG_HIGHMEM

#include <linux/threads.h>

#include <linux/threads.h>

#include <asm/kmap_types.h>

#include <asm/kmap_types.h>
@@ -67,15 +68,6 @@ enum fixed_addresses { 
 * the start of the fixmap, and leave one page empty

 * the start of the fixmap, and leave one page empty

 * at the top of mem..

 * at the top of mem..

 */

 */

#ifdef CONFIG_BCM63XX

#define FIXADDR_TOP     ((unsigned long)(long)(int)0xff000000)

#else

#if defined(CONFIG_CPU_TX39XX) || defined(CONFIG_CPU_TX49XX)

#define FIXADDR_TOP	((unsigned long)(long)(int)(0xff000000 - 0x20000))

#else

#define FIXADDR_TOP	((unsigned long)(long)(int)0xfffe0000)

#endif

#endif

#define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)

#define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)

#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)

#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)

arch/mips/include/asm/mach-bcm63xx/spaces.h

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle

 * Copyright (C) 2000, 2002  Maciej W. Rozycki

 * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc.

 */

#ifndef _ASM_BCM63XX_SPACES_H

#define _ASM_BCM63XX_SPACES_H



#define FIXADDR_TOP		((unsigned long)(long)(int)0xff000000)



#include <asm/mach-generic/spaces.h>



#endif /* __ASM_BCM63XX_SPACES_H */

arch/mips/include/asm/mach-generic/spaces.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -82,4 +82,8 @@ 
#define PAGE_OFFSET		(CAC_BASE + PHYS_OFFSET)

#define PAGE_OFFSET		(CAC_BASE + PHYS_OFFSET)

#endif

#endif





#ifndef FIXADDR_TOP

#define FIXADDR_TOP		((unsigned long)(long)(int)0xfffe0000)

#endif



#endif /* __ASM_MACH_GENERIC_SPACES_H */
 
#endif /* __ASM_MACH_GENERIC_SPACES_H */

arch/mips/include/asm/mach-tx39xx/spaces.h

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle

 * Copyright (C) 2000, 2002  Maciej W. Rozycki

 * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc.

 */

#ifndef _ASM_TX39XX_SPACES_H

#define _ASM_TX39XX_SPACES_H



#define FIXADDR_TOP		((unsigned long)(long)(int)0xfefe0000)



#include <asm/mach-generic/spaces.h>



#endif /* __ASM_TX39XX_SPACES_H */

arch/mips/include/asm/mach-tx49xx/spaces.h

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle

 * Copyright (C) 2000, 2002  Maciej W. Rozycki

 * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc.

 */

#ifndef _ASM_TX49XX_SPACES_H

#define _ASM_TX49XX_SPACES_H



#define FIXADDR_TOP		((unsigned long)(long)(int)0xfefe0000)



#include <asm/mach-generic/spaces.h>



#endif /* __ASM_TX49XX_SPACES_H */