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

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
...@@ -57,5 +57,11 @@ ...@@ -57,5 +57,11 @@
#define P3_ADDR_MAX P4SEG #define P3_ADDR_MAX P4SEG
#endif #endif
#ifndef __ASSEMBLY__
#ifdef CONFIG_PMB
extern int __in_29bit_mode(void);
#endif /* CONFIG_PMB */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASM_SH_ADDRSPACE_H */ #endif /* __ASM_SH_ADDRSPACE_H */
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#define PMB_PASCR 0xff000070 #define PMB_PASCR 0xff000070
#define PMB_IRMCR 0xff000078 #define PMB_IRMCR 0xff000078
#define PASCR_SE 0x80000000
#define PMB_ADDR 0xf6100000 #define PMB_ADDR 0xf6100000
#define PMB_DATA 0xf7100000 #define PMB_DATA 0xf7100000
#define PMB_ENTRY_MAX 16 #define PMB_ENTRY_MAX 16
...@@ -75,4 +77,3 @@ void pmb_unmap(unsigned long addr); ...@@ -75,4 +77,3 @@ void pmb_unmap(unsigned long addr);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __MMU_H */ #endif /* __MMU_H */
...@@ -75,13 +75,31 @@ static inline unsigned long long neff_sign_extend(unsigned long val) ...@@ -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 USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE)
#define FIRST_USER_ADDRESS 0 #define FIRST_USER_ADDRESS 0
#ifdef CONFIG_32BIT #define PHYS_ADDR_MASK29 0x1fffffff
#define PHYS_ADDR_MASK 0xffffffff #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 #else
#define PHYS_ADDR_MASK 0x1fffffff static inline unsigned long phys_addr_mask(void)
{
return PHYS_ADDR_MASK29;
}
#endif #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) #define PTE_FLAGS_MASK (~(PTE_PHYS_MASK) << PAGE_SHIFT)
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
......
...@@ -108,7 +108,7 @@ static inline unsigned long copy_ptea_attributes(unsigned long x) ...@@ -108,7 +108,7 @@ static inline unsigned long copy_ptea_attributes(unsigned long x)
#define _PAGE_CLEAR_FLAGS (_PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_FILE) #define _PAGE_CLEAR_FLAGS (_PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_FILE)
#endif #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 */ /* Hardware flags, page size encoding */
#if !defined(CONFIG_MMU) #if !defined(CONFIG_MMU)
......
#ifndef __ASM_SH_SCATTERLIST_H #ifndef __ASM_SH_SCATTERLIST_H
#define __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> #include <asm-generic/scatterlist.h>
......
...@@ -88,12 +88,12 @@ static inline void flush_cache_4096(unsigned long start, ...@@ -88,12 +88,12 @@ static inline void flush_cache_4096(unsigned long start,
unsigned long flags, exec_offset = 0; unsigned long flags, exec_offset = 0;
/* /*
* All types of SH-4 require PC to be in P2 to operate on the I-cache. * All types of SH-4 require PC to be uncached to operate on the I-cache.
* Some types of SH-4 require PC to be in P2 to operate on the D-cache. * Some types of SH-4 require PC to be uncached to operate on the D-cache.
*/ */
if ((boot_cpu_data.flags & CPU_HAS_P2_FLUSH_BUG) || if ((boot_cpu_data.flags & CPU_HAS_P2_FLUSH_BUG) ||
(start < CACHE_OC_ADDRESS_ARRAY)) (start < CACHE_OC_ADDRESS_ARRAY))
exec_offset = 0x20000000; exec_offset = cached_to_uncached;
local_irq_save(flags); local_irq_save(flags);
__flush_cache_4096(start | SH_CACHE_ASSOC, __flush_cache_4096(start | SH_CACHE_ASSOC,
......
...@@ -323,4 +323,12 @@ int memory_add_physaddr_to_nid(u64 addr) ...@@ -323,4 +323,12 @@ int memory_add_physaddr_to_nid(u64 addr)
} }
EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
#endif #endif
#endif /* CONFIG_MEMORY_HOTPLUG */ #endif /* CONFIG_MEMORY_HOTPLUG */
#ifdef CONFIG_PMB
int __in_29bit_mode(void)
{
return !(ctrl_inl(PMB_PASCR) & PASCR_SE);
}
#endif /* CONFIG_PMB */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment