diff options
author | Wu Zhangjin <wuzhangjin@gmail.com> | 2009-11-06 05:45:05 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-12-16 20:57:10 -0500 |
commit | 6f7a251a259e5bf58a9ff334bdcfa3e42b6cb7a3 (patch) | |
tree | f5b65babda54c52073819629cc0f1047b5d1b413 /arch/mips/loongson/common/mem.c | |
parent | 937893cf5be53203eabc6f4db29f86b1fdeea203 (diff) |
MIPS: Loongson: Add basic Loongson 2F support
Loongson 2F has built-in DDR2 and PCI-X controller. The PCI-X controller
has a programming interface similiar to the the FPGA northbridge used on
Loongson 2E.
The main differences between Loongson 2E and Loongson 2F include:
1. Loongson 2F has an extra address window configuration module, which
is used to map CPU address space to DDR or PCI address space, or map
the PCI-DMA address space to DDR or LIO address space.
2. Loongson 2F supports 8 levels of software configurable CPu frequency
which can be configured in the LOONGSON_CHIPCFG0 register. The coming
cpufreq and standby support are based on this feature.
Loongson.h abstracts the modules and corresponding methods are abstracted.
Add other Loongson-2F-specific source code including gcc 4.4 support, PCI
memory space, PCI IO space, DMA address.
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/loongson/common/mem.c')
-rw-r--r-- | arch/mips/loongson/common/mem.c | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/arch/mips/loongson/common/mem.c b/arch/mips/loongson/common/mem.c index 3f7f153b1974..e93551dbc9ea 100644 --- a/arch/mips/loongson/common/mem.c +++ b/arch/mips/loongson/common/mem.c | |||
@@ -21,14 +21,31 @@ void __init prom_init_memory(void) | |||
21 | add_memory_region(memsize << 20, LOONGSON_PCI_MEM_START - (memsize << | 21 | add_memory_region(memsize << 20, LOONGSON_PCI_MEM_START - (memsize << |
22 | 20), BOOT_MEM_RESERVED); | 22 | 20), BOOT_MEM_RESERVED); |
23 | #ifdef CONFIG_64BIT | 23 | #ifdef CONFIG_64BIT |
24 | if (highmemsize > 0) | 24 | #ifdef CONFIG_CPU_LOONGSON2F |
25 | add_memory_region(LOONGSON_HIGHMEM_START, | 25 | { |
26 | highmemsize << 20, BOOT_MEM_RAM); | 26 | int bit; |
27 | 27 | ||
28 | add_memory_region(LOONGSON_PCI_MEM_END + 1, LOONGSON_HIGHMEM_START - | 28 | bit = fls(memsize + highmemsize); |
29 | LOONGSON_PCI_MEM_END - 1, BOOT_MEM_RESERVED); | 29 | if (bit != ffs(memsize + highmemsize)) |
30 | 30 | bit += 20; | |
31 | #endif /* CONFIG_64BIT */ | 31 | else |
32 | bit = bit + 20 - 1; | ||
33 | |||
34 | /* set cpu window3 to map CPU to DDR: 2G -> 2G */ | ||
35 | LOONGSON_ADDRWIN_CPUTODDR(ADDRWIN_WIN3, 0x80000000ul, | ||
36 | 0x80000000ul, (1 << bit)); | ||
37 | mmiowb(); | ||
38 | } | ||
39 | #endif /* CONFIG_CPU_LOONGSON2F */ | ||
40 | |||
41 | if (highmemsize > 0) | ||
42 | add_memory_region(LOONGSON_HIGHMEM_START, | ||
43 | highmemsize << 20, BOOT_MEM_RAM); | ||
44 | |||
45 | add_memory_region(LOONGSON_PCI_MEM_END + 1, LOONGSON_HIGHMEM_START - | ||
46 | LOONGSON_PCI_MEM_END - 1, BOOT_MEM_RESERVED); | ||
47 | |||
48 | #endif /* CONFIG_64BIT */ | ||
32 | } | 49 | } |
33 | 50 | ||
34 | /* override of arch/mips/mm/cache.c: __uncached_access */ | 51 | /* override of arch/mips/mm/cache.c: __uncached_access */ |