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

Commit 1f69b6af authored by Matt Fleming's avatar Matt Fleming Committed by Paul Mundt
Browse files

sh: Prepare for dynamic PMB support 



To allow the MMU to be switched between 29bit and 32bit mode at runtime
some constants need to swapped for functions that return a runtime
value.

Signed-off-by: default avatarMatt Fleming <matt@console-pimps.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 8bd642b1

arch/sh/include/asm/addrspace.h

+6 −0
Original line number Diff line number Diff line
@@ -57,5 +57,11 @@ 
#define P3_ADDR_MAX		P4SEG

#endif



#ifndef __ASSEMBLY__

#ifdef CONFIG_PMB

extern int __in_29bit_mode(void);

#endif /* CONFIG_PMB */

#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */

#endif /* __ASM_SH_ADDRSPACE_H */

arch/sh/include/asm/mmu.h

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#define PMB_PASCR		0xff000070

#define PMB_IRMCR		0xff000078



#define PASCR_SE		0x80000000



#define PMB_ADDR		0xf6100000

#define PMB_DATA		0xf7100000

#define PMB_ENTRY_MAX		16
@@ -75,4 +77,3 @@ void pmb_unmap(unsigned long addr); 
#endif /* __ASSEMBLY__ */



#endif /* __MMU_H */

arch/sh/include/asm/pgtable.h

+22 −4
Original line number Diff line number Diff line
@@ -75,13 +75,31 @@ static inline unsigned long long neff_sign_extend(unsigned long val) 
#define USER_PTRS_PER_PGD	(TASK_SIZE/PGDIR_SIZE)

#define FIRST_USER_ADDRESS	0



#ifdef CONFIG_32BIT

#define PHYS_ADDR_MASK		0xffffffff

#define PHYS_ADDR_MASK29		0x1fffffff

#define PHYS_ADDR_MASK32		0xffffffff



#ifdef CONFIG_PMB

static inline unsigned long phys_addr_mask(void)

{

	/* Is the MMU in 29bit mode? */

	if (__in_29bit_mode())

		return PHYS_ADDR_MASK29;



	return PHYS_ADDR_MASK32;

}

#elif CONFIG_32BIT

static inline unsigned long phys_addr_mask(void)

{

	return PHYS_ADDR_MASK32;

}

#else

#define PHYS_ADDR_MASK		0x1fffffff

static inline unsigned long phys_addr_mask(void)

{

	return PHYS_ADDR_MASK29;

}

#endif



#define PTE_PHYS_MASK		(PHYS_ADDR_MASK & PAGE_MASK)

#define PTE_PHYS_MASK		(phys_addr_mask() & PAGE_MASK)

#define PTE_FLAGS_MASK		(~(PTE_PHYS_MASK) << PAGE_SHIFT)



#ifdef CONFIG_SUPERH32

arch/sh/include/asm/pgtable_32.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static inline unsigned long copy_ptea_attributes(unsigned long x) 
#define _PAGE_CLEAR_FLAGS	(_PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_FILE)

#endif



#define _PAGE_FLAGS_HARDWARE_MASK	(PHYS_ADDR_MASK & ~(_PAGE_CLEAR_FLAGS))

#define _PAGE_FLAGS_HARDWARE_MASK	(phys_addr_mask() & ~(_PAGE_CLEAR_FLAGS))



/* Hardware flags, page size encoding */

#if !defined(CONFIG_MMU)

arch/sh/include/asm/scatterlist.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __ASM_SH_SCATTERLIST_H

#define __ASM_SH_SCATTERLIST_H



#define ISA_DMA_THRESHOLD	PHYS_ADDR_MASK

#define ISA_DMA_THRESHOLD	phys_addr_mask()



#include <asm-generic/scatterlist.h>