* [PATCH V5 01/18] MIPS: Loongson: Add basic Loongson-3 definition.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 02/18] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
` (16 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Loongson-3 is a multi-core MIPS family CPU, it support MIPS64R2
fully. Loongson-3 has the same IMP field (0x6300) as Loongson-2.
Loongson-3 has a hardware-maintained cache, system software doesn't
need to maintain coherency.
Loongson-3A is the first revision of Loongson-3, and it is the quad-
core version of Loongson-2G. Loongson-3A has a simplified version named
Loongson-2Gq, the main difference between Loongson-3A/2Gq is 3A has two
HyperTransport controller but 2Gq has only one. HT0 is used for cross-
chip interconnection and HT1 is used to link PCI bus. Therefore, 2Gq
cannot support NUMA but 3A can. For software, Loongson-2Gq is simply
identified as Loongson-3A.
Exsisting Loongson family CPUs:
Loongson-1: Loongson-1A, Loongson-1B, they are 32-bit MIPS CPUs.
Loongson-2: Loongson-2E, Loongson-2F, Loongson-2G, they are 64-bit
single-core MIPS CPUs.
Loongson-3: Loongson-3A(including so-called Loongson-2Gq), they are
64-bit multi-core MIPS CPUs.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/include/asm/addrspace.h | 6 ++++++
arch/mips/include/asm/cpu.h | 6 ++++--
arch/mips/include/asm/mach-loongson/spaces.h | 15 +++++++++++++++
arch/mips/include/asm/module.h | 2 ++
arch/mips/include/asm/pgtable-bits.h | 7 +++++++
arch/mips/loongson/Platform | 1 +
6 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 arch/mips/include/asm/mach-loongson/spaces.h
diff --git a/arch/mips/include/asm/addrspace.h b/arch/mips/include/asm/addrspace.h
index 569f80a..cf62bfb 100644
--- a/arch/mips/include/asm/addrspace.h
+++ b/arch/mips/include/asm/addrspace.h
@@ -116,7 +116,13 @@
#define K_CALG_UNCACHED 2
#define K_CALG_NONCOHERENT 3
#define K_CALG_COH_EXCL 4
+
+#ifdef CONFIG_CPU_LOONGSON3
+#define K_CALG_COH_SHAREABLE 3
+#else
#define K_CALG_COH_SHAREABLE 5
+#endif
+
#define K_CALG_NOTUSED 6
#define K_CALG_UNCACHED_ACCEL 7
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index f21b7c0..75b6127 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -72,6 +72,7 @@
#define PRID_IMP_R5432 0x5400
#define PRID_IMP_R5500 0x5500
#define PRID_IMP_LOONGSON2 0x6300
+#define PRID_IMP_LOONGSON3 0x6300
#define PRID_IMP_UNKNOWN 0xff00
@@ -200,6 +201,7 @@
#define PRID_REV_LOONGSON1B 0x0020
#define PRID_REV_LOONGSON2E 0x0002
#define PRID_REV_LOONGSON2F 0x0003
+#define PRID_REV_LOONGSON3A 0x0005
/*
* Older processors used to encode processor version and revision in two
@@ -268,8 +270,8 @@ enum cpu_type_enum {
* MIPS64 class processors
*/
CPU_5KC, CPU_5KE, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,
- CPU_CAVIUM_OCTEON, CPU_CAVIUM_OCTEON_PLUS, CPU_CAVIUM_OCTEON2,
- CPU_XLR, CPU_XLP,
+ CPU_LOONGSON3, CPU_CAVIUM_OCTEON, CPU_CAVIUM_OCTEON_PLUS,
+ CPU_CAVIUM_OCTEON2, CPU_XLR, CPU_XLP,
CPU_LAST
};
diff --git a/arch/mips/include/asm/mach-loongson/spaces.h b/arch/mips/include/asm/mach-loongson/spaces.h
new file mode 100644
index 0000000..1e82804
--- /dev/null
+++ b/arch/mips/include/asm/mach-loongson/spaces.h
@@ -0,0 +1,15 @@
+#ifndef __ASM_MACH_LOONGSON_SPACES_H_
+#define __ASM_MACH_LOONGSON_SPACES_H_
+
+#ifndef CAC_BASE
+#if defined(CONFIG_64BIT)
+#if defined(CONFIG_DMA_NONCOHERENT) || defined(CONFIG_CPU_LOONGSON3)
+#define CAC_BASE _AC(0x9800000000000000, UL)
+#else
+#define CAC_BASE _AC(0xa800000000000000, UL)
+#endif /* CONFIG_DMA_NONCOHERENT || CONFIG_CPU_LOONGSON3 */
+#endif /* CONFIG_64BIT */
+#endif /* CONFIG_CAC_BASE */
+
+#include <asm/mach-generic/spaces.h>
+#endif
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index dca8bce..523600f 100644
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -122,6 +122,8 @@ search_module_dbetables(unsigned long addr)
#define MODULE_PROC_FAMILY "LOONGSON1 "
#elif defined CONFIG_CPU_LOONGSON2
#define MODULE_PROC_FAMILY "LOONGSON2 "
+#elif defined CONFIG_CPU_LOONGSON3
+#define MODULE_PROC_FAMILY "LOONGSON3 "
#elif defined CONFIG_CPU_CAVIUM_OCTEON
#define MODULE_PROC_FAMILY "OCTEON "
#elif defined CONFIG_CPU_XLR
diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h
index e9fe7e9..1afd39a 100644
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@ -206,6 +206,13 @@ static inline uint64_t pte_to_entrylo(unsigned long pte_val)
#define _CACHE_UNCACHED _CACHE_UC_B
#define _CACHE_CACHABLE_NONCOHERENT _CACHE_WB
+#elif defined(CONFIG_CPU_LOONGSON3)
+
+#define _CACHE_UNCACHED (2<<_CACHE_SHIFT) /* LOONGSON */
+#define _CACHE_CACHABLE_NONCOHERENT (3<<_CACHE_SHIFT) /* LOONGSON */
+#define _CACHE_CACHABLE_COHERENT (3<<_CACHE_SHIFT) /* LOONGSON-3 */
+#define _CACHE_UNCACHED_ACCELERATED (7<<_CACHE_SHIFT) /* LOONGSON */
+
#else
#define _CACHE_CACHABLE_NO_WA (0<<_CACHE_SHIFT) /* R4600 only */
diff --git a/arch/mips/loongson/Platform b/arch/mips/loongson/Platform
index 29692e5..6205372 100644
--- a/arch/mips/loongson/Platform
+++ b/arch/mips/loongson/Platform
@@ -30,3 +30,4 @@ platform-$(CONFIG_MACH_LOONGSON) += loongson/
cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson -mno-branch-likely
load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000
load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
+load-$(CONFIG_CPU_LOONGSON3) += 0xffffffff80200000
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 02/18] MIPS: Loongson: Add basic Loongson-3 CPU support.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 01/18] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 03/18] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
` (15 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Basic Loongson-3 CPU support include: CPU probing, TLB and cache
initializing, cache flushing method, etc.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/kernel/Makefile | 1 +
arch/mips/kernel/cpu-probe.c | 12 ++++-
arch/mips/lib/Makefile | 1 +
arch/mips/mm/Makefile | 1 +
arch/mips/mm/c-r4k.c | 94 +++++++++++++++++++++++++++++++++++++++++-
arch/mips/mm/tlb-r4k.c | 2 +-
arch/mips/mm/tlbex.c | 1 +
7 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index fdaf65e..a0fc07f 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_MODULES) += mips_ksyms.o module.o
obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
obj-$(CONFIG_CPU_LOONGSON2) += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_LOONGSON3) += r4k_fpu.o r4k_switch.o
obj-$(CONFIG_CPU_MIPS32) += r4k_fpu.o r4k_switch.o
obj-$(CONFIG_CPU_MIPS64) += r4k_fpu.o r4k_switch.o
obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 8ea65c5..515c5e3 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -768,16 +768,22 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
c->tlbsize = 64;
break;
case PRID_IMP_LOONGSON2:
- c->cputype = CPU_LOONGSON2;
- __cpu_name[cpu] = "ICT Loongson-2";
-
switch (c->processor_id & PRID_REV_MASK) {
case PRID_REV_LOONGSON2E:
+ c->cputype = CPU_LOONGSON2;
+ __cpu_name[cpu] = "ICT Loongson-2";
set_elf_platform(cpu, "loongson2e");
break;
case PRID_REV_LOONGSON2F:
+ c->cputype = CPU_LOONGSON2;
+ __cpu_name[cpu] = "ICT Loongson-2";
set_elf_platform(cpu, "loongson2f");
break;
+ case PRID_REV_LOONGSON3A:
+ c->cputype = CPU_LOONGSON3;
+ __cpu_name[cpu] = "ICT Loongson-3";
+ set_elf_platform(cpu, "loongson3a");
+ break;
}
c->isa_level = MIPS_CPU_ISA_III;
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 399a50a..2ef5535 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -9,6 +9,7 @@ obj-y += iomap.o
obj-$(CONFIG_PCI) += iomap-pci.o
obj-$(CONFIG_CPU_LOONGSON2) += dump_tlb.o
+obj-$(CONFIG_CPU_LOONGSON3) += dump_tlb.o
obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o
obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o
obj-$(CONFIG_CPU_NEVADA) += dump_tlb.o
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index fd6203f..a79b6d1 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_HIGHMEM) += highmem.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_CPU_LOONGSON2) += c-r4k.o cex-gen.o tlb-r4k.o
+obj-$(CONFIG_CPU_LOONGSON3) += c-r4k.o cex-gen.o tlb-r4k.o
obj-$(CONFIG_CPU_MIPS32) += c-r4k.o cex-gen.o tlb-r4k.o
obj-$(CONFIG_CPU_MIPS64) += c-r4k.o cex-gen.o tlb-r4k.o
obj-$(CONFIG_CPU_NEVADA) += c-r4k.o cex-gen.o tlb-r4k.o
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index ce0dbee..3462094 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -60,6 +60,13 @@ static inline void r4k_on_each_cpu(void (*func) (void *info), void *info)
#define cpu_has_safe_index_cacheops 1
#endif
+/* Loongson-3 maintain cache coherency by hardware */
+#if defined(CONFIG_CPU_LOONGSON3)
+#define cpu_has_coherent_cache 1
+#else
+#define cpu_has_coherent_cache 0
+#endif
+
/*
* Must die.
*/
@@ -345,6 +352,10 @@ static inline void local_r4k___flush_cache_all(void * args)
r4k_blast_scache();
return;
#endif
+
+ if (cpu_has_coherent_cache)
+ return;
+
r4k_blast_dcache();
r4k_blast_icache();
@@ -382,11 +393,17 @@ static inline int has_valid_asid(const struct mm_struct *mm)
static void r4k__flush_cache_vmap(void)
{
+ if (cpu_has_coherent_cache)
+ return;
+
r4k_blast_dcache();
}
static void r4k__flush_cache_vunmap(void)
{
+ if (cpu_has_coherent_cache)
+ return;
+
r4k_blast_dcache();
}
@@ -406,8 +423,12 @@ static inline void local_r4k_flush_cache_range(void * args)
static void r4k_flush_cache_range(struct vm_area_struct *vma,
unsigned long start, unsigned long end)
{
- int exec = vma->vm_flags & VM_EXEC;
+ int exec __maybe_unused;
+
+ if (cpu_has_coherent_cache)
+ return;
+ exec = vma->vm_flags & VM_EXEC;
if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc))
r4k_on_each_cpu(local_r4k_flush_cache_range, vma);
}
@@ -527,7 +548,10 @@ static inline void local_r4k_flush_cache_page(void *args)
static void r4k_flush_cache_page(struct vm_area_struct *vma,
unsigned long addr, unsigned long pfn)
{
- struct flush_cache_page_args args;
+ struct flush_cache_page_args args __maybe_unused;
+
+ if (cpu_has_coherent_cache)
+ return;
args.vma = vma;
args.addr = addr;
@@ -543,6 +567,9 @@ static inline void local_r4k_flush_data_cache_page(void * addr)
static void r4k_flush_data_cache_page(unsigned long addr)
{
+ if (cpu_has_coherent_cache)
+ return;
+
if (in_atomic())
local_r4k_flush_data_cache_page((void *)addr);
else
@@ -701,6 +728,9 @@ static void local_r4k_flush_cache_sigtramp(void * arg)
static void r4k_flush_cache_sigtramp(unsigned long addr)
{
+ if (cpu_has_coherent_cache)
+ return;
+
r4k_on_each_cpu(local_r4k_flush_cache_sigtramp, (void *) addr);
}
@@ -952,6 +982,31 @@ static void __cpuinit probe_pcache(void)
c->dcache.waybit = 0;
break;
+ case CPU_LOONGSON3:
+ config1 = read_c0_config1();
+ if ((lsize = ((config1 >> 19) & 7)))
+ c->icache.linesz = 2 << lsize;
+ else
+ c->icache.linesz = lsize;
+ c->icache.sets = 64 << ((config1 >> 22) & 7);
+ c->icache.ways = 1 + ((config1 >> 16) & 7);
+ icache_size = c->icache.sets *
+ c->icache.ways *
+ c->icache.linesz;
+ c->icache.waybit = 0;
+
+ if ((lsize = ((config1 >> 10) & 7)))
+ c->dcache.linesz = 2 << lsize;
+ else
+ c->dcache.linesz = lsize;
+ c->dcache.sets = 64 << ((config1 >> 13) & 7);
+ c->dcache.ways = 1 + ((config1 >> 7) & 7);
+ dcache_size = c->dcache.sets *
+ c->dcache.ways *
+ c->dcache.linesz;
+ c->dcache.waybit = 0;
+ break;
+
default:
if (!(config & MIPS_CONF_M))
panic("Don't know how to probe P-caches on this cpu.");
@@ -1170,6 +1225,34 @@ static void __init loongson2_sc_init(void)
}
#endif
+#if defined(CONFIG_CPU_LOONGSON3)
+static void __init loongson3_sc_init(void)
+{
+ struct cpuinfo_mips *c = ¤t_cpu_data;
+ unsigned int config2, lsize;
+
+ config2 = read_c0_config2();
+ if ((lsize = ((config2 >> 4) & 15)))
+ c->scache.linesz = 2 << lsize;
+ else
+ c->scache.linesz = lsize;
+ c->scache.sets = 64 << ((config2 >> 8) & 15);
+ c->scache.ways = 1 + (config2 & 15);
+
+ scache_size = c->scache.sets *
+ c->scache.ways *
+ c->scache.linesz;
+ /* Loongson-3 has 4 cores, 1MB scache for each. scaches are shared */
+ scache_size *= 4;
+ c->scache.waybit = 0;
+ pr_info("Unified secondary cache %ldkB %s, linesize %d bytes.\n",
+ scache_size >> 10, way_string[c->scache.ways], c->scache.linesz);
+ if (scache_size)
+ c->options |= MIPS_CPU_INCLUSIVE_CACHES;
+ return;
+}
+#endif
+
extern int r5k_sc_init(void);
extern int rm7k_sc_init(void);
extern int mips_sc_init(void);
@@ -1224,6 +1307,13 @@ static void __cpuinit setup_scache(void)
loongson2_sc_init();
return;
#endif
+
+#if defined(CONFIG_CPU_LOONGSON3)
+ case CPU_LOONGSON3:
+ loongson3_sc_init();
+ return;
+#endif
+
case CPU_XLP:
/* don't need to worry about L2, fully coherent */
return;
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index d2572cb..11b9c88 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -50,7 +50,7 @@ extern void build_tlb_refill_handler(void);
#endif /* CONFIG_MIPS_MT_SMTC */
-#if defined(CONFIG_CPU_LOONGSON2)
+#if defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_LOONGSON3)
/*
* LOONGSON2 has a 4 entry itlb which is a subset of dtlb,
* unfortrunately, itlb is not totally transparent to software.
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 03eb0ef..4420250 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -507,6 +507,7 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l,
case CPU_BMIPS4380:
case CPU_BMIPS5000:
case CPU_LOONGSON2:
+ case CPU_LOONGSON3:
case CPU_R5500:
if (m4kc_tlbp_war())
uasm_i_nop(p);
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 03/18] MIPS: Loongson 3: Add Lemote-3A machtypes definition.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 01/18] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
2012-08-11 9:32 ` [PATCH V5 02/18] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 04/18] MIPS: Loongson: Make Loongson-3 to use BCD format for RTC Huacai Chen
` (14 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Add four Loongson-3 based machine types:
MACH_LEMOTE_A1004/MACH_LEMOTE_A1201 are laptops;
MACH_LEMOTE_A1101 is mini-itx;
MACH_LEMOTE_A1205 is all-in-one machine.
The most significant differrent between A1004/A1201 and A1101/A1205 is
the laptops have EC but others don't.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/include/asm/bootinfo.h | 24 +++++++++++++++---------
arch/mips/include/asm/mach-loongson/machine.h | 6 ++++++
arch/mips/loongson/common/machtype.c | 20 ++++++++++++--------
3 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 7a51d87..118f525 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -61,15 +61,21 @@
/*
* Valid machtype for Loongson family
*/
-#define MACH_LOONGSON_UNKNOWN 0
-#define MACH_LEMOTE_FL2E 1
-#define MACH_LEMOTE_FL2F 2
-#define MACH_LEMOTE_ML2F7 3
-#define MACH_LEMOTE_YL2F89 4
-#define MACH_DEXXON_GDIUM2F10 5
-#define MACH_LEMOTE_NAS 6
-#define MACH_LEMOTE_LL2F 7
-#define MACH_LOONGSON_END 8
+enum loongson_machine_type {
+ MACH_LOONGSON_UNKNOWN,
+ MACH_LEMOTE_FL2E,
+ MACH_LEMOTE_FL2F,
+ MACH_LEMOTE_ML2F7,
+ MACH_LEMOTE_YL2F89,
+ MACH_DEXXON_GDIUM2F10,
+ MACH_LEMOTE_NAS,
+ MACH_LEMOTE_LL2F,
+ MACH_LEMOTE_A1004,
+ MACH_LEMOTE_A1101,
+ MACH_LEMOTE_A1201,
+ MACH_LEMOTE_A1205,
+ MACH_LOONGSON_END
+};
/*
* Valid machtype for group INGENIC
diff --git a/arch/mips/include/asm/mach-loongson/machine.h b/arch/mips/include/asm/mach-loongson/machine.h
index 4321338..481c5d9 100644
--- a/arch/mips/include/asm/mach-loongson/machine.h
+++ b/arch/mips/include/asm/mach-loongson/machine.h
@@ -24,4 +24,10 @@
#endif
+#ifdef CONFIG_LEMOTE_MACH3A
+
+#define LOONGSON_MACHTYPE MACH_LEMOTE_A1004
+
+#endif /* CONFIG_LEMOTE_MACH3A */
+
#endif /* __ASM_MACH_LOONGSON_MACHINE_H */
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 2efd5d9..e13e13d 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -19,15 +19,19 @@
#define MACHTYPE_LEN 50
static const char *system_types[] = {
- [MACH_LOONGSON_UNKNOWN] "unknown loongson machine",
- [MACH_LEMOTE_FL2E] "lemote-fuloong-2e-box",
- [MACH_LEMOTE_FL2F] "lemote-fuloong-2f-box",
- [MACH_LEMOTE_ML2F7] "lemote-mengloong-2f-7inches",
- [MACH_LEMOTE_YL2F89] "lemote-yeeloong-2f-8.9inches",
- [MACH_DEXXON_GDIUM2F10] "dexxon-gdium-2f",
+ [MACH_LOONGSON_UNKNOWN] "unknown loongson machine",
+ [MACH_LEMOTE_FL2E] "lemote-fuloong-2e-box",
+ [MACH_LEMOTE_FL2F] "lemote-fuloong-2f-box",
+ [MACH_LEMOTE_ML2F7] "lemote-mengloong-2f-7inches",
+ [MACH_LEMOTE_YL2F89] "lemote-yeeloong-2f-8.9inches",
+ [MACH_DEXXON_GDIUM2F10] "dexxon-gdium-2f",
[MACH_LEMOTE_NAS] "lemote-nas-2f",
- [MACH_LEMOTE_LL2F] "lemote-lynloong-2f",
- [MACH_LOONGSON_END] NULL,
+ [MACH_LEMOTE_LL2F] "lemote-lynloong-2f",
+ [MACH_LEMOTE_A1004] "lemote-3a-notebook-a1004",
+ [MACH_LEMOTE_A1101] "lemote-3a-itx-a1101",
+ [MACH_LEMOTE_A1201] "lemote-2gq-notebook-a1201",
+ [MACH_LEMOTE_A1205] "lemote-2gq-aio-a1205",
+ [MACH_LOONGSON_END] NULL,
};
const char *get_system_type(void)
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 04/18] MIPS: Loongson: Make Loongson-3 to use BCD format for RTC.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (2 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 03/18] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 05/18] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
` (13 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/include/asm/mach-loongson/mc146818rtc.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/mips/include/asm/mach-loongson/mc146818rtc.h b/arch/mips/include/asm/mach-loongson/mc146818rtc.h
index ed7fe97..6b10159 100644
--- a/arch/mips/include/asm/mach-loongson/mc146818rtc.h
+++ b/arch/mips/include/asm/mach-loongson/mc146818rtc.h
@@ -27,7 +27,11 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
outb_p(data, RTC_PORT(1));
}
+#ifdef CONFIG_CPU_LOONGSON3
+#define RTC_ALWAYS_BCD 1
+#else
#define RTC_ALWAYS_BCD 0
+#endif
#ifndef mc146818_decode_year
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970)
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 05/18] MIPS: Loongson: Add UEFI-like firmware interface support.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (3 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 04/18] MIPS: Loongson: Make Loongson-3 to use BCD format for RTC Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 06/18] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
` (12 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
The new UEFI-like firmware interface has 3 advantages:
1, Firmware export a physical memory map which is similar to X86's
E820 map, so prom_init_memory() will be more elegant that #ifdef
clauses can be removed.
2, Firmware export a pci irq routing table, we no longer need pci
irq routing fixup in kernel's code.
3, Firmware has a built-in vga bios, and its address is exported,
the linux kernel no longer need an embedded blob.
With the new interface, Loongson-3A/2G and all their successors can use
a unified kernel. All Loongson-based machines support this new interface
except 2E/2F series.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/include/asm/mach-loongson/boot_param.h | 151 ++++++++++++++++++++++
arch/mips/include/asm/mach-loongson/loongson.h | 4 +-
arch/mips/loongson/common/env.c | 67 ++++++++--
arch/mips/loongson/common/init.c | 9 +-
arch/mips/loongson/common/mem.c | 42 ++++++
arch/mips/loongson/common/pci.c | 6 +-
arch/mips/loongson/common/reset.c | 14 ++
7 files changed, 273 insertions(+), 20 deletions(-)
create mode 100644 arch/mips/include/asm/mach-loongson/boot_param.h
diff --git a/arch/mips/include/asm/mach-loongson/boot_param.h b/arch/mips/include/asm/mach-loongson/boot_param.h
new file mode 100644
index 0000000..9ab243c
--- /dev/null
+++ b/arch/mips/include/asm/mach-loongson/boot_param.h
@@ -0,0 +1,151 @@
+#ifndef __ASM_MACH_LOONGSON_BOOT_PARAM_H_
+#define __ASM_MACH_LOONGSON_BOOT_PARAM_H_
+
+#define SYSTEM_RAM_LOW 1
+#define SYSTEM_RAM_HIGH 2
+#define MEM_RESERVED 3
+#define PCI_IO 4
+#define PCI_MEM 5
+#define LOONGSON_CFG_REG 6
+#define VIDEO_ROM 7
+#define ADAPTER_ROM 8
+#define ACPI_TABLE 9
+#define MAX_MEMORY_TYPE 10
+
+#define LOONGSON3_BOOT_MEM_MAP_MAX 128
+struct efi_memory_map_loongson{
+ u16 vers; /* version of efi_memory_map */
+ u32 nr_map; /* number of memory_maps */
+ u32 mem_freq; /* memory frequence */
+ struct mem_map{
+ u32 node_id; /* node_id which memory attached to */
+ u32 mem_type; /* system memory, pci memory, pci io, etc. */
+ u64 mem_start; /* memory map start address */
+ u32 mem_size; /* each memory_map size, not the total size */
+ }map[LOONGSON3_BOOT_MEM_MAP_MAX];
+}__attribute__((packed));
+
+enum loongson_cpu_type
+{
+ Loongson_2E,
+ Loongson_2F,
+ Loongson_3A,
+ Loongson_3B,
+ Loongson_1A,
+ Loongson_1B
+};
+
+/*
+ * Capability and feature descriptor structure for MIPS CPU
+ */
+struct efi_cpuinfo_loongson {
+ u16 vers; /* version of efi_cpuinfo_loongson */
+ u32 processor_id; /* PRID, e.g. 6305, 6306 */
+ enum loongson_cpu_type cputype; /* 3A, 3B, etc. */
+ u32 total_node; /* num of total numa nodes */
+ u32 cpu_startup_core_id; /* Core id: */
+ u32 cpu_clock_freq; /* cpu_clock */
+ u32 nr_cpus;
+}__attribute__((packed));
+
+struct system_loongson{
+ u16 vers; /* version of system_loongson */
+ u32 ccnuma_smp; /* 0:no numa; 1: has numa */
+ u32 sing_double_channel; /* 1:single; 2:double */
+}__attribute__((packed));
+
+struct irq_source_routing_table {
+ u16 vers;
+ u16 size;
+ u16 rtr_bus;
+ u16 rtr_devfn;
+ u32 vendor;
+ u32 device;
+ u32 PIC_type; /* conform use HT or PCI to route to CPU-PIC */
+ u64 ht_int_bit; /* 3A: 1<<24; 3B:1<<16 */
+ u64 ht_enable; /* irqs used in this PIC.eg:3a-0x0000d17a */
+ u32 node_id; /* node id, 0x0—0, 0x1—1; 0x10—2；0x11—3；0x100—4 */
+ u64 pci_mem_start_addr;
+ u64 pci_mem_end_addr;
+ u64 pci_io_start_addr;
+ u64 pci_io_end_addr;
+ u64 pci_config_addr;
+}__attribute__((packed));
+
+struct interface_info{
+ u16 vers; /* version of the specificition */
+ u16 size;
+ u8 flag;
+ char description[64];
+}__attribute__((packed));
+
+#define MAX_RESOURCE_NUMBER 128
+struct resource_loongson {
+ u64 start; /* resource start address */
+ u64 end; /* resource end address */
+ char name[64];
+ u32 flags;
+};
+
+struct archdev_data {}; /* arch specific additions */
+
+struct board_devices{
+ char name[64]; /* hold the device name */
+ u32 num_resources; /* number of device_resource */
+ struct resource_loongson resource[MAX_RESOURCE_NUMBER]; /* for each device's resource */
+ /* arch specific additions */
+ struct archdev_data archdata;
+};
+
+struct loongson_special_attribute{
+ u16 vers; /* version of this special */
+ char special_name[64]; /* special_atribute_name */
+ u32 loongson_special_type; /* type of special device */
+ struct resource_loongson resource[MAX_RESOURCE_NUMBER]; /* for each device's resource */
+};
+
+struct loongson_params{
+ u64 memory_offset; /* efi_memory_map_loongson struct offset */
+ u64 cpu_offset; /* efi_cpuinfo_loongson struct offset */
+ u64 system_offset; /* system_loongson struct offset */
+ u64 irq_offset; /* irq_source_routing_table struct offset */
+ u64 interface_offset; /* interface_info struct offset */
+ u64 special_offset; /* loongson_special_attribute struct offset */
+ u64 boarddev_table_offset; /* board_devices offset */
+};
+
+struct smbios_tables {
+ u16 vers; /* version of smbios */
+ u64 vga_bios; /* vga_bios address */
+ struct loongson_params lp;
+};
+
+struct efi_reset_system_t{
+ u64 ResetCold;
+ u64 ResetWarm;
+ u64 ResetType;
+ u64 Shutdown;
+};
+
+struct efi_loongson {
+ u64 mps; /* MPS table */
+ u64 acpi; /* ACPI table (IA64 ext 0.71) */
+ u64 acpi20; /* ACPI table (ACPI 2.0) */
+ struct smbios_tables smbios; /* SM BIOS table */
+ u64 sal_systab; /* SAL system table */
+ u64 boot_info; /* boot info table */
+};
+
+struct boot_params{
+ struct efi_loongson efi;
+ struct efi_reset_system_t reset_system;
+};
+
+extern u32 nr_cpus_loongson;
+extern enum loongson_cpu_type cputype;
+extern struct efi_memory_map_loongson *emap;
+extern u64 ht_control_base;
+extern u64 pci_mem_start_addr, pci_mem_end_addr;
+extern u64 loongson_pciio_base;
+extern u64 vgabios_addr;
+#endif
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index 5222a00..6a1bcf3 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -24,8 +24,8 @@ extern void mach_prepare_reboot(void);
extern void mach_prepare_shutdown(void);
/* environment arguments from bootloader */
-extern unsigned long cpu_clock_freq;
-extern unsigned long memsize, highmemsize;
+extern u32 cpu_clock_freq;
+extern u32 memsize, highmemsize;
/* loongson-specific command line, env and memory initialization */
extern void __init prom_init_memory(void);
diff --git a/arch/mips/loongson/common/env.c b/arch/mips/loongson/common/env.c
index d93830a..d2d8613 100644
--- a/arch/mips/loongson/common/env.c
+++ b/arch/mips/loongson/common/env.c
@@ -18,37 +18,53 @@
* option) any later version.
*/
#include <linux/module.h>
-
#include <asm/bootinfo.h>
-
#include <loongson.h>
+#include <boot_param.h>
+
+struct boot_params *boot_p;
+struct loongson_params *loongson_p;
+
+struct efi_cpuinfo_loongson *ecpu;
+struct efi_memory_map_loongson *emap;
+struct system_loongson *esys;
+struct irq_source_routing_table *eirq_source;
+
+u64 ht_control_base;
+u64 pci_mem_start_addr, pci_mem_end_addr;
+u64 loongson_pciio_base;
+u64 vgabios_addr;
+u64 poweroff_addr, restart_addr;
-unsigned long cpu_clock_freq;
+enum loongson_cpu_type cputype;
+unsigned int nr_cpus_loongson = NR_CPUS;
+
+u32 cpu_clock_freq;
EXPORT_SYMBOL(cpu_clock_freq);
-unsigned long memsize, highmemsize;
#define parse_even_earlier(res, option, p) \
do { \
unsigned int tmp __maybe_unused; \
\
if (strncmp(option, (char *)p, strlen(option)) == 0) \
- tmp = strict_strtol((char *)p + strlen(option"="), 10, &res); \
+ tmp = kstrtou32((char *)p + strlen(option"="), 10, &res); \
} while (0)
void __init prom_init_env(void)
{
/* pmon passes arguments in 32bit pointers */
- int *_prom_envp;
- unsigned long bus_clock;
unsigned int processor_id;
+
+#ifndef CONFIG_UEFI_FIRMWARE_INTERFACE
+ int *_prom_envp;
long l;
+ extern u32 memsize, highmemsize;
/* firmware arguments are initialized in head.S */
_prom_envp = (int *)fw_arg2;
l = (long)*_prom_envp;
while (l != 0) {
- parse_even_earlier(bus_clock, "busclock", l);
parse_even_earlier(cpu_clock_freq, "cpuclock", l);
parse_even_earlier(memsize, "memsize", l);
parse_even_earlier(highmemsize, "highmemsize", l);
@@ -57,8 +73,32 @@ void __init prom_init_env(void)
}
if (memsize == 0)
memsize = 256;
- if (bus_clock == 0)
- bus_clock = 66000000;
+#else
+ /* firmware arguments are initialized in head.S */
+ boot_p = (struct boot_params *)fw_arg2;
+ loongson_p = &(boot_p->efi.smbios.lp);
+
+ ecpu = (struct efi_cpuinfo_loongson *)((u64)loongson_p + loongson_p->cpu_offset);
+ emap = (struct efi_memory_map_loongson *)((u64)loongson_p + loongson_p->memory_offset);
+ eirq_source = (struct irq_source_routing_table *)((u64)loongson_p + loongson_p->irq_offset);
+
+ cputype = ecpu->cputype;
+ nr_cpus_loongson = ecpu->nr_cpus;
+ cpu_clock_freq = ecpu->cpu_clock_freq;
+ if (nr_cpus_loongson > NR_CPUS || nr_cpus_loongson == 0)
+ nr_cpus_loongson = NR_CPUS;
+
+ pci_mem_start_addr = eirq_source->pci_mem_start_addr;
+ pci_mem_end_addr = eirq_source->pci_mem_end_addr;
+ loongson_pciio_base = eirq_source->pci_io_start_addr;
+
+ poweroff_addr = boot_p->reset_system.Shutdown;
+ restart_addr = boot_p->reset_system.ResetWarm;
+ pr_info("Shutdown Addr: %llx Reset Addr: %llx\n", poweroff_addr, restart_addr);
+
+ ht_control_base = 0x90000EFDFB000000; /* has no interface now */
+ vgabios_addr = boot_p->efi.smbios.vga_bios;
+#endif
if (cpu_clock_freq == 0) {
processor_id = (¤t_cpu_data)->processor_id;
switch (processor_id & PRID_REV_MASK) {
@@ -68,12 +108,13 @@ void __init prom_init_env(void)
case PRID_REV_LOONGSON2F:
cpu_clock_freq = 797000000;
break;
+ case PRID_REV_LOONGSON3A:
+ cpu_clock_freq = 900000000;
+ break;
default:
cpu_clock_freq = 100000000;
break;
}
}
-
- pr_info("busclock=%ld, cpuclock=%ld, memsize=%ld, highmemsize=%ld\n",
- bus_clock, cpu_clock_freq, memsize, highmemsize);
+ pr_info("CpuClock = %u\n", cpu_clock_freq);
}
diff --git a/arch/mips/loongson/common/init.c b/arch/mips/loongson/common/init.c
index 19d3415..1c29b19 100644
--- a/arch/mips/loongson/common/init.c
+++ b/arch/mips/loongson/common/init.c
@@ -17,10 +17,6 @@ unsigned long __maybe_unused _loongson_addrwincfg_base;
void __init prom_init(void)
{
- /* init base address of io space */
- set_io_port_base((unsigned long)
- ioremap(LOONGSON_PCIIO_BASE, LOONGSON_PCIIO_SIZE));
-
#ifdef CONFIG_CPU_SUPPORTS_ADDRWINCFG
_loongson_addrwincfg_base = (unsigned long)
ioremap(LOONGSON_ADDRWINCFG_BASE, LOONGSON_ADDRWINCFG_SIZE);
@@ -28,6 +24,11 @@ void __init prom_init(void)
prom_init_cmdline();
prom_init_env();
+
+ /* init base address of io space */
+ set_io_port_base((unsigned long)
+ ioremap(LOONGSON_PCIIO_BASE, LOONGSON_PCIIO_SIZE));
+
prom_init_memory();
/*init the uart base address */
diff --git a/arch/mips/loongson/common/mem.c b/arch/mips/loongson/common/mem.c
index 30eba60..8a24b04 100644
--- a/arch/mips/loongson/common/mem.c
+++ b/arch/mips/loongson/common/mem.c
@@ -11,9 +11,14 @@
#include <asm/bootinfo.h>
#include <loongson.h>
+#include <boot_param.h>
#include <mem.h>
#include <pci.h>
+#ifndef CONFIG_UEFI_FIRMWARE_INTERFACE
+
+u32 memsize, highmemsize;
+
void __init prom_init_memory(void)
{
add_memory_region(0x0, (memsize << 20), BOOT_MEM_RAM);
@@ -49,6 +54,43 @@ void __init prom_init_memory(void)
#endif /* !CONFIG_64BIT */
}
+#else /* CONFIG_UEFI_FIRMWARE_INTERFACE */
+
+void __init prom_init_memory(void)
+{
+ int i;
+ u32 node_id;
+ u32 mem_type;
+
+ /* parse memory information */
+ for (i = 0; i < emap->nr_map; i++){
+ node_id = emap->map[i].node_id;
+ mem_type = emap->map[i].mem_type;
+
+ if (node_id == 0) {
+ switch (mem_type) {
+ case SYSTEM_RAM_LOW:
+ add_memory_region(emap->map[i].mem_start,
+ emap->map[i].mem_size << 20,
+ BOOT_MEM_RAM);
+ break;
+ case SYSTEM_RAM_HIGH:
+ add_memory_region(emap->map[i].mem_start,
+ emap->map[i].mem_size << 20,
+ BOOT_MEM_RAM);
+ break;
+ case MEM_RESERVED:
+ add_memory_region(emap->map[i].mem_start,
+ emap->map[i].mem_size << 20,
+ BOOT_MEM_RESERVED);
+ break;
+ }
+ }
+ }
+}
+
+#endif /* CONFIG_UEFI_FIRMWARE_INTERFACE */
+
/* override of arch/mips/mm/cache.c: __uncached_access */
int __uncached_access(struct file *file, unsigned long addr)
{
diff --git a/arch/mips/loongson/common/pci.c b/arch/mips/loongson/common/pci.c
index 31d8c5e..0da387a 100644
--- a/arch/mips/loongson/common/pci.c
+++ b/arch/mips/loongson/common/pci.c
@@ -11,6 +11,7 @@
#include <pci.h>
#include <loongson.h>
+#include <boot_param.h>
static struct resource loongson_pci_mem_resource = {
.name = "pci memory space",
@@ -82,7 +83,10 @@ static int __init pcibios_init(void)
setup_pcimap();
loongson_pci_controller.io_map_base = mips_io_port_base;
-
+#ifdef CONFIG_UEFI_FIRMWARE_INTERFACE
+ loongson_pci_mem_resource.start = pci_mem_start_addr;
+ loongson_pci_mem_resource.end = pci_mem_end_addr;
+#endif
register_pci_controller(&loongson_pci_controller);
return 0;
diff --git a/arch/mips/loongson/common/reset.c b/arch/mips/loongson/common/reset.c
index 9e10d62..55c666b 100644
--- a/arch/mips/loongson/common/reset.c
+++ b/arch/mips/loongson/common/reset.c
@@ -36,17 +36,31 @@ static inline void loongson_reboot(void)
static void loongson_restart(char *command)
{
+#ifndef CONFIG_UEFI_FIRMWARE_INTERFACE
/* do preparation for reboot */
mach_prepare_reboot();
/* reboot via jumping to boot base address */
loongson_reboot();
+#else
+ extern u64 restart_addr;
+ void (*fw_restart)(void) = (void *)restart_addr;
+
+ fw_restart();
+#endif
}
static void loongson_poweroff(void)
{
+#ifndef CONFIG_UEFI_FIRMWARE_INTERFACE
mach_prepare_shutdown();
unreachable();
+#else
+ extern u64 poweroff_addr;
+ void (*fw_poweroff)(void) = (void *)poweroff_addr;
+
+ fw_poweroff();
+#endif
}
static void loongson_halt(void)
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 06/18] MIPS: Loongson 3: Add HT-linked PCI support.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (4 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 05/18] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 07/18] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
` (11 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Loongson family machines use Hyper-Transport bus for inter-core
connection and device connection. The PCI bus is a subordinate
linked at HT1.
With UEFI-like firmware interface, We don't need fixup for PCI irq
routing.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/include/asm/mach-loongson/loongson.h | 7 ++
arch/mips/include/asm/mach-loongson/pci.h | 5 +
arch/mips/pci/Makefile | 1 +
arch/mips/pci/fixup-loongson3.c | 64 +++++++++++++++
arch/mips/pci/ops-loongson3.c | 104 ++++++++++++++++++++++++
5 files changed, 181 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/pci/fixup-loongson3.c
create mode 100644 arch/mips/pci/ops-loongson3.c
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index 6a1bcf3..960811a 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/kconfig.h>
+#include <boot_param.h>
/* loongson internal northbridge initialization */
extern void bonito_irq_init(void);
@@ -101,7 +102,13 @@ static inline void do_perfcnt_IRQ(void)
#define LOONGSON_PCICFG_BASE 0x1fe80000
#define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */
#define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1)
+
+#if defined(CONFIG_HT_PCI)
+#define LOONGSON_PCIIO_BASE loongson_pciio_base
+#else
#define LOONGSON_PCIIO_BASE 0x1fd00000
+#endif
+
#define LOONGSON_PCIIO_SIZE 0x00100000 /* 1M */
#define LOONGSON_PCIIO_TOP (LOONGSON_PCIIO_BASE+LOONGSON_PCIIO_SIZE-1)
diff --git a/arch/mips/include/asm/mach-loongson/pci.h b/arch/mips/include/asm/mach-loongson/pci.h
index bc99dab..1212774 100644
--- a/arch/mips/include/asm/mach-loongson/pci.h
+++ b/arch/mips/include/asm/mach-loongson/pci.h
@@ -40,8 +40,13 @@ extern struct pci_ops loongson_pci_ops;
#else /* loongson2f/32bit & loongson2e */
/* this pci memory space is mapped by pcimap in pci.c */
+#ifdef CONFIG_CPU_LOONGSON3
+#define LOONGSON_PCI_MEM_START 0x40000000UL
+#define LOONGSON_PCI_MEM_END 0x7effffffUL
+#else
#define LOONGSON_PCI_MEM_START LOONGSON_PCILO1_BASE
#define LOONGSON_PCI_MEM_END (LOONGSON_PCILO1_BASE + 0x04000000 * 2)
+#endif
/* this is an offset from mips_io_port_base */
#define LOONGSON_PCI_IO_START 0x00004000UL
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index e13a71c..0723723 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o
obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o
obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o
obj-$(CONFIG_LEMOTE_MACH2F) += fixup-lemote2f.o ops-loongson2.o
+obj-$(CONFIG_LEMOTE_MACH3A) += fixup-loongson3.o ops-loongson3.o
obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o
obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o
obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o
diff --git a/arch/mips/pci/fixup-loongson3.c b/arch/mips/pci/fixup-loongson3.c
new file mode 100644
index 0000000..d716567
--- /dev/null
+++ b/arch/mips/pci/fixup-loongson3.c
@@ -0,0 +1,64 @@
+/*
+ * fixup-loongson3.c
+ *
+ * Copyright (C) 2012 Lemote, Inc.
+ * Author: Xiang Yu, xiangy@lemote.com
+ * Chen Huacai, chenhc@lemote.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/pci.h>
+#include <boot_param.h>
+
+static void print_fixup_info(const struct pci_dev * pdev)
+{
+ printk(KERN_INFO "Fixup: bus%d dev%xh fun%xh %x:%x irq %d\n",
+ pdev->bus->number, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+ pdev->vendor, pdev->device, pdev->irq);
+
+}
+
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+ print_fixup_info(dev);
+ return dev->irq;
+}
+
+static void __init pci_fixup_radeon(struct pci_dev *pdev)
+{
+ if (pdev->resource[PCI_ROM_RESOURCE].start)
+ return;
+
+ pdev->resource[PCI_ROM_RESOURCE].start = vgabios_addr;
+ pdev->resource[PCI_ROM_RESOURCE].end = vgabios_addr + 256*1024 - 1;
+ pdev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_COPY;
+}
+
+DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, PCI_ANY_ID,
+ PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_radeon);
+
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+ return 0;
+}
diff --git a/arch/mips/pci/ops-loongson3.c b/arch/mips/pci/ops-loongson3.c
new file mode 100644
index 0000000..b29d333
--- /dev/null
+++ b/arch/mips/pci/ops-loongson3.c
@@ -0,0 +1,104 @@
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+
+#include <asm/mips-boards/bonito64.h>
+
+#include <loongson.h>
+
+#define PCI_ACCESS_READ 0
+#define PCI_ACCESS_WRITE 1
+
+#define HT1LO_PCICFG_BASE 0x1a000000
+#define HT1LO_PCICFG_BASE_TP1 0x1b000000
+
+static int loongson3_pci_config_access(unsigned char access_type,
+ struct pci_bus *bus, unsigned int devfn,
+ int where, u32 *data)
+{
+ unsigned char busnum = bus->number;
+ u_int64_t addr, type;
+ void *addrp;
+ int device = PCI_SLOT(devfn);
+ int function = PCI_FUNC(devfn);
+ int reg = where & ~3;
+
+ if (busnum == 0) {
+ if (device > 31)
+ return PCIBIOS_DEVICE_NOT_FOUND;
+ addr = (device << 11) | (function << 8) | reg;
+ addrp = (void *)(TO_UNCAC(HT1LO_PCICFG_BASE) | (addr & 0xffff));
+ type = 0;
+
+ } else {
+ addr = (busnum << 16) | (device << 11) | (function << 8) | reg;
+ addrp = (void *)(TO_UNCAC(HT1LO_PCICFG_BASE_TP1) | (addr));
+ type = 0x10000;
+ }
+
+ if (access_type == PCI_ACCESS_WRITE)
+ *(volatile unsigned int *)addrp = cpu_to_le32(*data);
+ else {
+ *data = le32_to_cpu(*(volatile unsigned int *)addrp);
+ if (*data == 0xffffffff) {
+ *data = -1;
+ return PCIBIOS_DEVICE_NOT_FOUND;
+ }
+ }
+ return PCIBIOS_SUCCESSFUL;
+}
+
+static int loongson3_pci_pcibios_read(struct pci_bus *bus, unsigned int devfn,
+ int where, int size, u32 * val)
+{
+ u32 data = 0;
+ int ret = loongson3_pci_config_access(PCI_ACCESS_READ,
+ bus, devfn, where, &data);
+
+ if (ret != PCIBIOS_SUCCESSFUL)
+ return ret;
+
+ if (size == 1)
+ *val = (data >> ((where & 3) << 3)) & 0xff;
+ else if (size == 2)
+ *val = (data >> ((where & 3) << 3)) & 0xffff;
+ else
+ *val = data;
+
+ return PCIBIOS_SUCCESSFUL;
+}
+
+static int loongson3_pci_pcibios_write(struct pci_bus *bus, unsigned int devfn,
+ int where, int size, u32 val)
+{
+ u32 data = 0;
+ int ret;
+
+ if (size == 4)
+ data = val;
+ else {
+ ret = loongson3_pci_config_access(PCI_ACCESS_READ,
+ bus, devfn, where, &data);
+ if (ret != PCIBIOS_SUCCESSFUL)
+ return ret;
+
+ if (size == 1)
+ data = (data & ~(0xff << ((where & 3) << 3))) |
+ (val << ((where & 3) << 3));
+ else if (size == 2)
+ data = (data & ~(0xffff << ((where & 3) << 3))) |
+ (val << ((where & 3) << 3));
+ }
+
+ ret = loongson3_pci_config_access(PCI_ACCESS_WRITE,
+ bus, devfn, where, &data);
+ if (ret != PCIBIOS_SUCCESSFUL)
+ return ret;
+
+ return PCIBIOS_SUCCESSFUL;
+}
+
+struct pci_ops loongson_pci_ops = {
+ .read = loongson3_pci_pcibios_read,
+ .write = loongson3_pci_pcibios_write
+};
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 07/18] MIPS: Loongson 3: Add IRQ init and dispatch support.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (5 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 06/18] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 08/18] MIPS: Loongson 3: Add serial port support Huacai Chen
` (10 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
IRQ routing path of Loongson-3:
Devices(most) --> I8259 --> HT Controller --> IRQ Routing Table --> CPU
^
|
Device(legacy devices such as UART) --> Bonito ---|
IRQ Routing Table route 32 INTs to CPU's INT0~INT3(IP2~IP5 of CP0), 32
INTs include 16 HT INTs(mostly), 4 PCI INTs, 1 LPC INT, etc. IP6 is used
for IPI and IP7 is used for internal MIPS timer. LOONGSON_INT_ROUTER_*
are IRQ Routing Table registers.
I8259 IRQs are 1:1 mapped to HT1 INTs. LOONGSON_HT1_* are configuration
registers of HT1 controller.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/include/asm/mach-loongson/irq.h | 24 +++++++
arch/mips/include/asm/mach-loongson/loongson.h | 9 +++
arch/mips/loongson/Makefile | 6 ++
arch/mips/loongson/loongson-3/Makefile | 4 +
arch/mips/loongson/loongson-3/irq.c | 87 ++++++++++++++++++++++++
5 files changed, 130 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/include/asm/mach-loongson/irq.h
create mode 100644 arch/mips/loongson/loongson-3/Makefile
create mode 100644 arch/mips/loongson/loongson-3/irq.c
diff --git a/arch/mips/include/asm/mach-loongson/irq.h b/arch/mips/include/asm/mach-loongson/irq.h
new file mode 100644
index 0000000..4787cd0
--- /dev/null
+++ b/arch/mips/include/asm/mach-loongson/irq.h
@@ -0,0 +1,24 @@
+#ifndef __ASM_MACH_LOONGSON_IRQ_H_
+#define __ASM_MACH_LOONGSON_IRQ_H_
+
+#include <boot_param.h>
+
+/* cpu core interrupt numbers */
+#define MIPS_CPU_IRQ_BASE 56
+
+#ifdef CONFIG_CPU_LOONGSON3
+
+#define LOONGSON_UART_IRQ (MIPS_CPU_IRQ_BASE + 2) /* uart */
+#define LOONGSON_I8259_IRQ (MIPS_CPU_IRQ_BASE + 3) /* i8259 */
+#define LOONGSON_TIMER_IRQ (MIPS_CPU_IRQ_BASE + 7) /* cpu timer */
+
+#define LOONGSON_HT1_CFG_BASE ht_control_base
+#define LOONGSON_HT1_INT_VECTOR_BASE LOONGSON_HT1_CFG_BASE + 0x80
+#define LOONGSON_HT1_INT_EN_BASE LOONGSON_HT1_CFG_BASE + 0xa0
+#define LOONGSON_HT1_INT_VECTOR(n) LOONGSON3_REG32(LOONGSON_HT1_INT_VECTOR_BASE, 4 * n)
+#define LOONGSON_HT1_INTN_EN(n) LOONGSON3_REG32(LOONGSON_HT1_INT_EN_BASE, 4 * n)
+
+#endif
+
+#include_next <irq.h>
+#endif /* __ASM_MACH_LOONGSON_IRQ_H_ */
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index 960811a..f573e47 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -62,6 +62,12 @@ extern int mach_i8259_irq(void);
#define LOONGSON_REG(x) \
(*(volatile u32 *)((char *)CKSEG1ADDR(LOONGSON_REG_BASE) + (x)))
+#define LOONGSON3_REG8(base, x) \
+ (*(volatile u8 *)((char *)TO_UNCAC(base) + (x)))
+
+#define LOONGSON3_REG32(base, x) \
+ (*(volatile u32 *)((char *)TO_UNCAC(base) + (x)))
+
#define LOONGSON_IRQ_BASE 32
#define LOONGSON2_PERFCNT_IRQ (MIPS_CPU_IRQ_BASE + 6) /* cpu perf counter */
@@ -87,6 +93,9 @@ static inline void do_perfcnt_IRQ(void)
#define LOONGSON_REG_BASE 0x1fe00000
#define LOONGSON_REG_SIZE 0x00100000 /* 256Bytes + 256Bytes + ??? */
#define LOONGSON_REG_TOP (LOONGSON_REG_BASE+LOONGSON_REG_SIZE-1)
+#define LOONGSON3_REG_BASE 0x3ff00000
+#define LOONGSON3_REG_SIZE 0x00100000 /* 256Bytes + 256Bytes + ??? */
+#define LOONGSON3_REG_TOP (LOONGSON3_REG_BASE+LOONGSON3_REG_SIZE-1)
#define LOONGSON_LIO1_BASE 0x1ff00000
#define LOONGSON_LIO1_SIZE 0x00100000 /* 1M */
diff --git a/arch/mips/loongson/Makefile b/arch/mips/loongson/Makefile
index 2b76cb0..b1e4f05 100644
--- a/arch/mips/loongson/Makefile
+++ b/arch/mips/loongson/Makefile
@@ -15,3 +15,9 @@ obj-$(CONFIG_LEMOTE_FULOONG2E) += fuloong-2e/
#
obj-$(CONFIG_LEMOTE_MACH2F) += lemote-2f/
+
+#
+# All Loongson-3 family machines
+#
+
+obj-$(CONFIG_CPU_LOONGSON3) += loongson-3/
diff --git a/arch/mips/loongson/loongson-3/Makefile b/arch/mips/loongson/loongson-3/Makefile
new file mode 100644
index 0000000..b9968cd
--- /dev/null
+++ b/arch/mips/loongson/loongson-3/Makefile
@@ -0,0 +1,4 @@
+#
+# Makefile for Loongson-3 family machines
+#
+obj-y += irq.o
diff --git a/arch/mips/loongson/loongson-3/irq.c b/arch/mips/loongson/loongson-3/irq.c
new file mode 100644
index 0000000..27aef31
--- /dev/null
+++ b/arch/mips/loongson/loongson-3/irq.c
@@ -0,0 +1,87 @@
+#include <loongson.h>
+#include <irq.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+
+#include <asm/irq_cpu.h>
+#include <asm/i8259.h>
+#include <asm/mipsregs.h>
+
+#define LOONGSON_INT_ROUTER_OFFSET 0x1400
+#define LOONGSON_INT_ROUTER_INTEN LOONGSON3_REG32(LOONGSON3_REG_BASE, LOONGSON_INT_ROUTER_OFFSET + 0x24)
+#define LOONGSON_INT_ROUTER_INTENSET LOONGSON3_REG32(LOONGSON3_REG_BASE, LOONGSON_INT_ROUTER_OFFSET + 0x28)
+#define LOONGSON_INT_ROUTER_INTENCLR LOONGSON3_REG32(LOONGSON3_REG_BASE, LOONGSON_INT_ROUTER_OFFSET + 0x2c)
+#define LOONGSON_INT_ROUTER_ENTRY(n) LOONGSON3_REG8(LOONGSON3_REG_BASE, LOONGSON_INT_ROUTER_OFFSET + n)
+#define LOONGSON_INT_ROUTER_LPC LOONGSON_INT_ROUTER_ENTRY(0x0a)
+#define LOONGSON_INT_ROUTER_HT1(n) LOONGSON_INT_ROUTER_ENTRY(n + 0x18)
+
+#define LOONGSON_INT_CORE0_INT0 0x11 /* route to int 0 of core 0 */
+#define LOONGSON_INT_CORE0_INT1 0x21 /* route to int 1 of core 0 */
+
+extern void loongson3_ipi_interrupt(struct pt_regs *regs);
+
+static void ht_irqdispatch(void)
+{
+ unsigned int i, irq;
+ unsigned int ht_irq[] = {1, 3, 4, 5, 6, 7, 8, 12, 14, 15};
+
+ irq = LOONGSON_HT1_INT_VECTOR(0);
+ LOONGSON_HT1_INT_VECTOR(0) = irq;
+
+ for (i = 0; i < (sizeof(ht_irq) / sizeof(*ht_irq)); i++) {
+ if (irq & (0x1 << ht_irq[i]))
+ do_IRQ(ht_irq[i]);
+ }
+}
+
+void mach_irq_dispatch(unsigned int pending)
+{
+ if (pending & CAUSEF_IP7)
+ do_IRQ(LOONGSON_TIMER_IRQ);
+#if defined(CONFIG_SMP)
+ else if (pending & CAUSEF_IP6)
+ loongson3_ipi_interrupt(NULL);
+#endif
+ else if (pending & CAUSEF_IP3)
+ ht_irqdispatch();
+ else if (pending & CAUSEF_IP2)
+ do_IRQ(LOONGSON_UART_IRQ);
+ else {
+ printk(KERN_ERR "%s : spurious interrupt\n", __func__);
+ spurious_interrupt();
+ }
+}
+
+static struct irqaction cascade_irqaction = {
+ .handler = no_action,
+ .name = "cascade",
+};
+
+void irq_router_init(void)
+{
+ int i;
+
+ /* route LPC int to cpu core0 int 0 */
+ LOONGSON_INT_ROUTER_LPC = LOONGSON_INT_CORE0_INT0;
+ /* route HT1 int0 ~ int7 to cpu core0 INT1*/
+ for (i = 0; i < 8; i++)
+ LOONGSON_INT_ROUTER_HT1(i) = LOONGSON_INT_CORE0_INT1;
+ /* enable HT1 interrupt */
+ LOONGSON_HT1_INTN_EN(0) = 0xffffffff;
+ /* enable router interrupt intenset */
+ LOONGSON_INT_ROUTER_INTENSET = LOONGSON_INT_ROUTER_INTEN | (0xffff << 16) | 0x1 << 10;
+}
+
+void __init mach_init_irq(void)
+{
+ clear_c0_status(ST0_IM | ST0_BEV);
+
+ irq_router_init();
+ mips_cpu_irq_init();
+ init_i8259_irqs();
+
+ /* setup i8259 irq */
+ setup_irq(LOONGSON_I8259_IRQ, &cascade_irqaction);
+
+ set_c0_status(STATUSF_IP2 | STATUSF_IP6);
+}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 08/18] MIPS: Loongson 3: Add serial port support.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (6 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 07/18] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
` (9 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Loongson family machines has three types of serial port: PCI UART, LPC
UART and CPU internal UART. Loongson-2E and parts of Loongson-2F based
machines use PCI UART; most Loongson-2F based machines use LPC UART;
Loongson-2G/3A has both LPC and CPU UART but usually use CPU UART.
Port address of UARTs:
CPU UART: REG_BASE + OFFSET;
LPC UART: LIO1_BASE + OFFSET;
PCI UART: PCIIO_BASE + OFFSET.
Since LPC UART are linked in "Local Bus", both CPU UART and LPC UART
are called "CPU provided serial port".
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/loongson/common/serial.c | 26 +++++++++++++++-----------
arch/mips/loongson/common/uart_base.c | 9 ++++++++-
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c
index 7580873..59c76b5 100644
--- a/arch/mips/loongson/common/serial.c
+++ b/arch/mips/loongson/common/serial.c
@@ -19,19 +19,19 @@
#include <loongson.h>
#include <machine.h>
-#define PORT(int) \
+#define PORT(int, clk) \
{ \
.irq = int, \
- .uartclk = 1843200, \
+ .uartclk = clk, \
.iotype = UPIO_PORT, \
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, \
.regshift = 0, \
}
-#define PORT_M(int) \
+#define PORT_M(int, clk) \
{ \
.irq = MIPS_CPU_IRQ_BASE + (int), \
- .uartclk = 3686400, \
+ .uartclk = clk, \
.iotype = UPIO_MEM, \
.membase = (void __iomem *)NULL, \
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, \
@@ -40,13 +40,17 @@
static struct plat_serial8250_port uart8250_data[][2] = {
[MACH_LOONGSON_UNKNOWN] {},
- [MACH_LEMOTE_FL2E] {PORT(4), {} },
- [MACH_LEMOTE_FL2F] {PORT(3), {} },
- [MACH_LEMOTE_ML2F7] {PORT_M(3), {} },
- [MACH_LEMOTE_YL2F89] {PORT_M(3), {} },
- [MACH_DEXXON_GDIUM2F10] {PORT_M(3), {} },
- [MACH_LEMOTE_NAS] {PORT_M(3), {} },
- [MACH_LEMOTE_LL2F] {PORT(3), {} },
+ [MACH_LEMOTE_FL2E] {PORT(4, 1843200), {} },
+ [MACH_LEMOTE_FL2F] {PORT(3, 1843200), {} },
+ [MACH_LEMOTE_ML2F7] {PORT_M(3, 3686400), {} },
+ [MACH_LEMOTE_YL2F89] {PORT_M(3, 3686400), {} },
+ [MACH_DEXXON_GDIUM2F10] {PORT_M(3, 3686400), {} },
+ [MACH_LEMOTE_NAS] {PORT_M(3, 3686400), {} },
+ [MACH_LEMOTE_LL2F] {PORT(3, 1843200), {} },
+ [MACH_LEMOTE_A1004] {PORT_M(2, 33177600), {} },
+ [MACH_LEMOTE_A1101] {PORT_M(2, 25000000), {} },
+ [MACH_LEMOTE_A1201] {PORT_M(2, 25000000), {} },
+ [MACH_LEMOTE_A1205] {PORT_M(2, 25000000), {} },
[MACH_LOONGSON_END] {},
};
diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c
index d69ea54..ea8b501 100644
--- a/arch/mips/loongson/common/uart_base.c
+++ b/arch/mips/loongson/common/uart_base.c
@@ -35,9 +35,16 @@ void prom_init_loongson_uart_base(void)
case MACH_DEXXON_GDIUM2F10:
case MACH_LEMOTE_NAS:
default:
- /* The CPU provided serial port */
+ /* The CPU provided serial port (LPC) */
loongson_uart_base = LOONGSON_LIO1_BASE + 0x3f8;
break;
+ case MACH_LEMOTE_A1004:
+ case MACH_LEMOTE_A1101:
+ case MACH_LEMOTE_A1201:
+ case MACH_LEMOTE_A1205:
+ /* The CPU provided serial port (CPU) */
+ loongson_uart_base = LOONGSON_REG_BASE + 0x1e0;
+ break;
}
_loongson_uart_base =
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (7 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 08/18] MIPS: Loongson 3: Add serial port support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-13 17:54 ` Konrad Rzeszutek Wilk
2012-08-11 9:32 ` [PATCH V5 10/18] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
` (8 subsequent siblings)
17 siblings, 1 reply; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
This is probably a workaround because Loongson doesn't support DMA
address above 4GB. If memory is more than 4GB, CONFIG_SWIOTLB and
ZONE_DMA32 should be selected. In this way, DMA pages are allocated
below 4GB preferably.
However, CONFIG_SWIOTLB+ZONE_DMA32 is not enough, so, we provide a
platform-specific dma_map_ops::set_dma_mask() to make sure each
driver's dma_mask and coherent_dma_mask is below 32-bit.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/include/asm/dma-mapping.h | 5 +
.../mips/include/asm/mach-loongson/dma-coherence.h | 25 +++-
arch/mips/loongson/common/Makefile | 5 +
arch/mips/loongson/common/dma-swiotlb.c | 159 ++++++++++++++++++++
arch/mips/mm/dma-default.c | 13 ++-
5 files changed, 202 insertions(+), 5 deletions(-)
create mode 100644 arch/mips/loongson/common/dma-swiotlb.c
diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index be39a12..35f91bc 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -46,9 +46,14 @@ static inline int dma_mapping_error(struct device *dev, u64 mask)
static inline int
dma_set_mask(struct device *dev, u64 mask)
{
+ struct dma_map_ops *ops = get_dma_ops(dev);
+
if(!dev->dma_mask || !dma_supported(dev, mask))
return -EIO;
+ if (ops->set_dma_mask)
+ return ops->set_dma_mask(dev, mask);
+
*dev->dma_mask = mask;
return 0;
diff --git a/arch/mips/include/asm/mach-loongson/dma-coherence.h b/arch/mips/include/asm/mach-loongson/dma-coherence.h
index e143305..b1dc286 100644
--- a/arch/mips/include/asm/mach-loongson/dma-coherence.h
+++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h
@@ -13,26 +13,43 @@
struct device;
+extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
+extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,
size_t size)
{
+#ifdef CONFIG_CPU_LOONGSON3
+ return virt_to_phys(addr) < 0x10000000 ?
+ (virt_to_phys(addr) | 0x0000000080000000) : virt_to_phys(addr);
+#else
return virt_to_phys(addr) | 0x80000000;
+#endif
}
static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
struct page *page)
{
+#ifdef CONFIG_CPU_LOONGSON3
+ return page_to_phys(page) < 0x10000000 ?
+ (page_to_phys(page) | 0x0000000080000000) : page_to_phys(page);
+#else
return page_to_phys(page) | 0x80000000;
+#endif
}
static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
dma_addr_t dma_addr)
{
-#if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)
+#if defined(CONFIG_64BIT)
+#if defined(CONFIG_CPU_LOONGSON3)
+ return (dma_addr < 0x90000000 && dma_addr >= 0x80000000) ?
+ (dma_addr & 0x0fffffff) : dma_addr;
+#elif defined(CONFIG_CPU_LOONGSON2F)
return (dma_addr > 0x8fffffff) ? dma_addr : (dma_addr & 0x0fffffff);
+#endif /* CONFIG_CPU_LOONGSON3 */
#else
return dma_addr & 0x7fffffff;
-#endif
+#endif /* CONFIG_64BIT */
}
static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,
@@ -65,7 +82,11 @@ static inline int plat_dma_mapping_error(struct device *dev,
static inline int plat_device_is_coherent(struct device *dev)
{
+#ifdef CONFIG_DMA_NONCOHERENT
return 0;
+#else
+ return 1;
+#endif /* CONFIG_DMA_NONCOHERENT */
}
#endif /* __ASM_MACH_LOONGSON_DMA_COHERENCE_H */
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index e526488..3a26109 100644
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -25,3 +25,8 @@ obj-$(CONFIG_CS5536) += cs5536/
#
obj-$(CONFIG_LOONGSON_SUSPEND) += pm.o
+
+#
+# Big Memory Support
+#
+obj-$(CONFIG_LOONGSON_BIGMEM) += dma-swiotlb.o
diff --git a/arch/mips/loongson/common/dma-swiotlb.c b/arch/mips/loongson/common/dma-swiotlb.c
new file mode 100644
index 0000000..b87a21e
--- /dev/null
+++ b/arch/mips/loongson/common/dma-swiotlb.c
@@ -0,0 +1,159 @@
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/scatterlist.h>
+#include <linux/swiotlb.h>
+#include <linux/bootmem.h>
+
+#include <asm/bootinfo.h>
+#include <dma-coherence.h>
+
+static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
+ dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
+{
+ void *ret;
+
+ if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
+ return ret;
+
+ /* ignore region specifiers */
+ gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
+
+#ifdef CONFIG_ZONE_DMA
+ if (dev == NULL)
+ gfp |= __GFP_DMA;
+ else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
+ gfp |= __GFP_DMA;
+ else
+#endif
+#ifdef CONFIG_ZONE_DMA32
+ if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
+ gfp |= __GFP_DMA32;
+ else
+#endif
+ ;
+ gfp |= __GFP_NORETRY;
+
+ ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
+ mb();
+ return ret;
+}
+
+static void loongson_dma_free_coherent(struct device *dev, size_t size,
+ void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
+{
+ int order = get_order(size);
+
+ if (dma_release_from_coherent(dev, order, vaddr))
+ return;
+
+ swiotlb_free_coherent(dev, size, vaddr, dma_handle);
+}
+
+static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
+ unsigned long offset, size_t size,
+ enum dma_data_direction dir,
+ struct dma_attrs *attrs)
+{
+ dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
+ dir, attrs);
+ mb();
+ return daddr;
+}
+
+static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
+ int nents, enum dma_data_direction dir,
+ struct dma_attrs *attrs)
+{
+ int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
+ mb();
+
+ return r;
+}
+
+static void loongson_dma_sync_single_for_device(struct device *dev,
+ dma_addr_t dma_handle, size_t size,
+ enum dma_data_direction dir)
+{
+ swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
+ mb();
+}
+
+static void loongson_dma_sync_sg_for_device(struct device *dev,
+ struct scatterlist *sg, int nents,
+ enum dma_data_direction dir)
+{
+ swiotlb_sync_sg_for_device(dev, sg, nents, dir);
+ mb();
+}
+
+static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
+{
+ return (paddr < 0x10000000) ?
+ (paddr | 0x0000000080000000) : paddr;
+}
+
+static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
+{
+ return (daddr < 0x90000000 && daddr >= 0x80000000) ?
+ (daddr & 0x0fffffff) : daddr;
+}
+
+struct loongson_dma_map_ops {
+ struct dma_map_ops dma_map_ops;
+ dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
+ phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
+};
+
+dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
+{
+ struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
+ struct loongson_dma_map_ops, dma_map_ops);
+
+ return ops->phys_to_dma(dev, paddr);
+}
+
+phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
+{
+ struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
+ struct loongson_dma_map_ops, dma_map_ops);
+
+ return ops->dma_to_phys(dev, daddr);
+}
+
+static int loongson_dma_set_mask(struct device *dev, u64 mask)
+{
+ /* Loongson doesn't support DMA above 32-bit */
+ if (mask > DMA_BIT_MASK(32))
+ return -EIO;
+
+ *dev->dma_mask = mask;
+
+ return 0;
+}
+
+static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
+ .dma_map_ops = {
+ .alloc = loongson_dma_alloc_coherent,
+ .free = loongson_dma_free_coherent,
+ .map_page = loongson_dma_map_page,
+ .unmap_page = swiotlb_unmap_page,
+ .map_sg = loongson_dma_map_sg,
+ .unmap_sg = swiotlb_unmap_sg_attrs,
+ .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
+ .sync_single_for_device = loongson_dma_sync_single_for_device,
+ .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
+ .sync_sg_for_device = loongson_dma_sync_sg_for_device,
+ .mapping_error = swiotlb_dma_mapping_error,
+ .dma_supported = swiotlb_dma_supported,
+ .set_dma_mask = loongson_dma_set_mask
+ },
+ .phys_to_dma = loongson_unity_phys_to_dma,
+ .dma_to_phys = loongson_unity_dma_to_phys
+};
+
+void __init plat_swiotlb_setup(void)
+{
+ swiotlb_init(1);
+ mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
+}
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 3fab204..122f4f8 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
current_cpu_type() == CPU_R12000);
}
+static inline int cpu_is_noncoherent_loongson(struct device *dev)
+{
+ return !plat_device_is_coherent(dev) &&
+ (current_cpu_type() == CPU_LOONGSON2 ||
+ current_cpu_type() == CPU_LOONGSON3);
+}
+
static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
{
gfp_t dma_flag;
@@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
{
- if (cpu_is_noncoherent_r10000(dev))
+ if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
__dma_sync(dma_addr_to_page(dev, dma_addr),
dma_addr & ~PAGE_MASK, size, direction);
@@ -260,7 +267,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
static void mips_dma_sync_single_for_cpu(struct device *dev,
dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
{
- if (cpu_is_noncoherent_r10000(dev))
+ if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
__dma_sync(dma_addr_to_page(dev, dma_handle),
dma_handle & ~PAGE_MASK, size, direction);
}
@@ -281,7 +288,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
/* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++) {
- if (cpu_is_noncoherent_r10000(dev))
+ if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
__dma_sync(sg_page(sg), sg->offset, sg->length,
direction);
}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-11 9:32 ` [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
@ 2012-08-13 17:54 ` Konrad Rzeszutek Wilk
2012-08-14 2:29 ` Huacai Chen
` (3 more replies)
0 siblings, 4 replies; 32+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-08-13 17:54 UTC (permalink / raw)
To: Huacai Chen
Cc: Ralf Baechle, linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Huacai Chen, Hongliang Tao, Hua Yan
> +static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
> + dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
> +{
> + void *ret;
> +
> + if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
> + return ret;
> +
> + /* ignore region specifiers */
> + gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
> +
> +#ifdef CONFIG_ZONE_DMA
> + if (dev == NULL)
> + gfp |= __GFP_DMA;
When would this happen? dev == NULL?
> + else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
> + gfp |= __GFP_DMA;
> + else
> +#endif
> +#ifdef CONFIG_ZONE_DMA32
> + if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
> + gfp |= __GFP_DMA32;
> + else
Why the 'else'
> +#endif
> + ;
why?
> + gfp |= __GFP_NORETRY;
> +
> + ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
> + mb();
Why the 'mb()' ? Can you just do
return swiotlb_alloc_coherent(...)
> + return ret;
> +}
> +
> +static void loongson_dma_free_coherent(struct device *dev, size_t size,
> + void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
> +{
> + int order = get_order(size);
> +
> + if (dma_release_from_coherent(dev, order, vaddr))
> + return;
> +
> + swiotlb_free_coherent(dev, size, vaddr, dma_handle);
> +}
> +
> +static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
> + unsigned long offset, size_t size,
> + enum dma_data_direction dir,
> + struct dma_attrs *attrs)
> +{
> + dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
> + dir, attrs);
> + mb();
Please do 'return swiotlb_map_page(..)'..
But if you are doing that why don't you just set the dma_ops.map_page = swiotlb_map_page
?
> + return daddr;
> +}
> +
> +static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
> + int nents, enum dma_data_direction dir,
> + struct dma_attrs *attrs)
> +{
> + int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
> + mb();
> +
> + return r;
> +}
> +
> +static void loongson_dma_sync_single_for_device(struct device *dev,
> + dma_addr_t dma_handle, size_t size,
> + enum dma_data_direction dir)
> +{
> + swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
> + mb();
> +}
> +
> +static void loongson_dma_sync_sg_for_device(struct device *dev,
> + struct scatterlist *sg, int nents,
> + enum dma_data_direction dir)
> +{
> + swiotlb_sync_sg_for_device(dev, sg, nents, dir);
> + mb();
> +}
> +
I am not really sure why you have these extra functions, when you could
just modify the dma_ops to point to the swiotlb ones
> +static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
> +{
> + return (paddr < 0x10000000) ?
> + (paddr | 0x0000000080000000) : paddr;
> +}
> +
> +static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
> +{
> + return (daddr < 0x90000000 && daddr >= 0x80000000) ?
> + (daddr & 0x0fffffff) : daddr;
> +}
> +
> +struct loongson_dma_map_ops {
> + struct dma_map_ops dma_map_ops;
> + dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
> + phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
> +};
> +
> +dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
> +{
> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
> + struct loongson_dma_map_ops, dma_map_ops);
> +
> + return ops->phys_to_dma(dev, paddr);
> +}
> +
> +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
> +{
> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
> + struct loongson_dma_map_ops, dma_map_ops);
> +
> + return ops->dma_to_phys(dev, daddr);
> +}
> +
> +static int loongson_dma_set_mask(struct device *dev, u64 mask)
> +{
> + /* Loongson doesn't support DMA above 32-bit */
> + if (mask > DMA_BIT_MASK(32))
> + return -EIO;
> +
> + *dev->dma_mask = mask;
> +
> + return 0;
> +}
> +
> +static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
> + .dma_map_ops = {
> + .alloc = loongson_dma_alloc_coherent,
> + .free = loongson_dma_free_coherent,
> + .map_page = loongson_dma_map_page,
But why not 'swiotlb_map_page'?
> + .unmap_page = swiotlb_unmap_page,
> + .map_sg = loongson_dma_map_sg,
> + .unmap_sg = swiotlb_unmap_sg_attrs,
> + .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
> + .sync_single_for_device = loongson_dma_sync_single_for_device,
> + .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
> + .sync_sg_for_device = loongson_dma_sync_sg_for_device,
> + .mapping_error = swiotlb_dma_mapping_error,
> + .dma_supported = swiotlb_dma_supported,
> + .set_dma_mask = loongson_dma_set_mask
> + },
> + .phys_to_dma = loongson_unity_phys_to_dma,
> + .dma_to_phys = loongson_unity_dma_to_phys
Why do you need these? I am not seeing it being used here by any external code?
> +};
> +
> +void __init plat_swiotlb_setup(void)
> +{
> + swiotlb_init(1);
> + mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
> +}
> diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
> index 3fab204..122f4f8 100644
> --- a/arch/mips/mm/dma-default.c
> +++ b/arch/mips/mm/dma-default.c
> @@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
> current_cpu_type() == CPU_R12000);
> }
>
> +static inline int cpu_is_noncoherent_loongson(struct device *dev)
> +{
> + return !plat_device_is_coherent(dev) &&
> + (current_cpu_type() == CPU_LOONGSON2 ||
> + current_cpu_type() == CPU_LOONGSON3);
> +}
> +
> static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
> {
> gfp_t dma_flag;
> @@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
> static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
> size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
> {
> - if (cpu_is_noncoherent_r10000(dev))
> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
> __dma_sync(dma_addr_to_page(dev, dma_addr),
> dma_addr & ~PAGE_MASK, size, direction);
>
> @@ -260,7 +267,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
> static void mips_dma_sync_single_for_cpu(struct device *dev,
> dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
> {
> - if (cpu_is_noncoherent_r10000(dev))
> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
> __dma_sync(dma_addr_to_page(dev, dma_handle),
> dma_handle & ~PAGE_MASK, size, direction);
> }
> @@ -281,7 +288,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
>
> /* Make sure that gcc doesn't leave the empty loop body. */
> for (i = 0; i < nelems; i++, sg++) {
> - if (cpu_is_noncoherent_r10000(dev))
> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
> __dma_sync(sg_page(sg), sg->offset, sg->length,
> direction);
> }
> --
> 1.7.7.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-13 17:54 ` Konrad Rzeszutek Wilk
@ 2012-08-14 2:29 ` Huacai Chen
2012-08-14 5:57 ` Huacai Chen
` (2 subsequent siblings)
3 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-14 2:29 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Ralf Baechle, linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Hongliang Tao, Hua Yan
Most of the code are copied from arch/mips/cavium-octeon/dma-octeon.c
and they work well.
Anyway, I'll try your suggestions, thank you.
On Tue, Aug 14, 2012 at 1:54 AM, Konrad Rzeszutek Wilk
<konrad.wilk@oracle.com> wrote:
>> +static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
>> + dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
>> +{
>> + void *ret;
>> +
>> + if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
>> + return ret;
>> +
>> + /* ignore region specifiers */
>> + gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
>> +
>> +#ifdef CONFIG_ZONE_DMA
>> + if (dev == NULL)
>> + gfp |= __GFP_DMA;
>
> When would this happen? dev == NULL?
>
>> + else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
>> + gfp |= __GFP_DMA;
>> + else
>> +#endif
>> +#ifdef CONFIG_ZONE_DMA32
>> + if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
>> + gfp |= __GFP_DMA32;
>> + else
>
> Why the 'else'
>> +#endif
>> + ;
>
> why?
>> + gfp |= __GFP_NORETRY;
>> +
>> + ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
>> + mb();
>
> Why the 'mb()' ? Can you just do
> return swiotlb_alloc_coherent(...)
>
>> + return ret;
>> +}
>> +
>> +static void loongson_dma_free_coherent(struct device *dev, size_t size,
>> + void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
>> +{
>> + int order = get_order(size);
>> +
>> + if (dma_release_from_coherent(dev, order, vaddr))
>> + return;
>> +
>> + swiotlb_free_coherent(dev, size, vaddr, dma_handle);
>> +}
>> +
>> +static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
>> + unsigned long offset, size_t size,
>> + enum dma_data_direction dir,
>> + struct dma_attrs *attrs)
>> +{
>> + dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
>> + dir, attrs);
>> + mb();
>
> Please do 'return swiotlb_map_page(..)'..
>
> But if you are doing that why don't you just set the dma_ops.map_page = swiotlb_map_page
> ?
>
>
>> + return daddr;
>> +}
>> +
>> +static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
>> + int nents, enum dma_data_direction dir,
>> + struct dma_attrs *attrs)
>> +{
>> + int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
>> + mb();
>> +
>> + return r;
>> +}
>> +
>> +static void loongson_dma_sync_single_for_device(struct device *dev,
>> + dma_addr_t dma_handle, size_t size,
>> + enum dma_data_direction dir)
>> +{
>> + swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
>> + mb();
>> +}
>> +
>> +static void loongson_dma_sync_sg_for_device(struct device *dev,
>> + struct scatterlist *sg, int nents,
>> + enum dma_data_direction dir)
>> +{
>> + swiotlb_sync_sg_for_device(dev, sg, nents, dir);
>> + mb();
>> +}
>> +
>
> I am not really sure why you have these extra functions, when you could
> just modify the dma_ops to point to the swiotlb ones
>
>> +static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
>> +{
>> + return (paddr < 0x10000000) ?
>> + (paddr | 0x0000000080000000) : paddr;
>> +}
>> +
>> +static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
>> +{
>> + return (daddr < 0x90000000 && daddr >= 0x80000000) ?
>> + (daddr & 0x0fffffff) : daddr;
>> +}
>> +
>> +struct loongson_dma_map_ops {
>> + struct dma_map_ops dma_map_ops;
>> + dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
>> + phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
>> +};
>> +
>> +dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
>> +{
>> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> + struct loongson_dma_map_ops, dma_map_ops);
>> +
>> + return ops->phys_to_dma(dev, paddr);
>> +}
>> +
>> +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
>> +{
>> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> + struct loongson_dma_map_ops, dma_map_ops);
>> +
>> + return ops->dma_to_phys(dev, daddr);
>> +}
>> +
>> +static int loongson_dma_set_mask(struct device *dev, u64 mask)
>> +{
>> + /* Loongson doesn't support DMA above 32-bit */
>> + if (mask > DMA_BIT_MASK(32))
>> + return -EIO;
>> +
>> + *dev->dma_mask = mask;
>> +
>> + return 0;
>> +}
>> +
>> +static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
>> + .dma_map_ops = {
>> + .alloc = loongson_dma_alloc_coherent,
>> + .free = loongson_dma_free_coherent,
>> + .map_page = loongson_dma_map_page,
>
> But why not 'swiotlb_map_page'?
>
>> + .unmap_page = swiotlb_unmap_page,
>> + .map_sg = loongson_dma_map_sg,
>> + .unmap_sg = swiotlb_unmap_sg_attrs,
>> + .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
>> + .sync_single_for_device = loongson_dma_sync_single_for_device,
>> + .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
>> + .sync_sg_for_device = loongson_dma_sync_sg_for_device,
>> + .mapping_error = swiotlb_dma_mapping_error,
>> + .dma_supported = swiotlb_dma_supported,
>> + .set_dma_mask = loongson_dma_set_mask
>> + },
>> + .phys_to_dma = loongson_unity_phys_to_dma,
>> + .dma_to_phys = loongson_unity_dma_to_phys
>
> Why do you need these? I am not seeing it being used here by any external code?
>
>> +};
>> +
>> +void __init plat_swiotlb_setup(void)
>> +{
>> + swiotlb_init(1);
>> + mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
>> +}
>> diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
>> index 3fab204..122f4f8 100644
>> --- a/arch/mips/mm/dma-default.c
>> +++ b/arch/mips/mm/dma-default.c
>> @@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
>> current_cpu_type() == CPU_R12000);
>> }
>>
>> +static inline int cpu_is_noncoherent_loongson(struct device *dev)
>> +{
>> + return !plat_device_is_coherent(dev) &&
>> + (current_cpu_type() == CPU_LOONGSON2 ||
>> + current_cpu_type() == CPU_LOONGSON3);
>> +}
>> +
>> static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
>> {
>> gfp_t dma_flag;
>> @@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
>> static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
>> size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
>> {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(dma_addr_to_page(dev, dma_addr),
>> dma_addr & ~PAGE_MASK, size, direction);
>>
>> @@ -260,7 +267,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
>> static void mips_dma_sync_single_for_cpu(struct device *dev,
>> dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
>> {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(dma_addr_to_page(dev, dma_handle),
>> dma_handle & ~PAGE_MASK, size, direction);
>> }
>> @@ -281,7 +288,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
>>
>> /* Make sure that gcc doesn't leave the empty loop body. */
>> for (i = 0; i < nelems; i++, sg++) {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(sg_page(sg), sg->offset, sg->length,
>> direction);
>> }
>> --
>> 1.7.7.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-13 17:54 ` Konrad Rzeszutek Wilk
2012-08-14 2:29 ` Huacai Chen
@ 2012-08-14 5:57 ` Huacai Chen
2012-08-14 16:26 ` David Daney
2012-08-15 2:18 ` Huacai Chen
2012-08-15 20:24 ` Ralf Baechle
3 siblings, 1 reply; 32+ messages in thread
From: Huacai Chen @ 2012-08-14 5:57 UTC (permalink / raw)
To: David Daney, Konrad Rzeszutek Wilk
Cc: Ralf Baechle, linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Hongliang Tao, Hua Yan
Hi, David,
Seems like you are the original author of code in
arch/mips/cavium-octeon/dma-octeon.c. Could you please tell me why we
need mb() in alloc_coherent(), map_page(), map_sg()? It seems like
because of cache coherency (CPU write some data, then map the page for
a device, if without mb(), then device may read wrong data.) but I'm
not sure.
On Tue, Aug 14, 2012 at 1:54 AM, Konrad Rzeszutek Wilk
<konrad.wilk@oracle.com> wrote:
>> +static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
>> + dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
>> +{
>> + void *ret;
>> +
>> + if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
>> + return ret;
>> +
>> + /* ignore region specifiers */
>> + gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
>> +
>> +#ifdef CONFIG_ZONE_DMA
>> + if (dev == NULL)
>> + gfp |= __GFP_DMA;
>
> When would this happen? dev == NULL?
>
>> + else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
>> + gfp |= __GFP_DMA;
>> + else
>> +#endif
>> +#ifdef CONFIG_ZONE_DMA32
>> + if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
>> + gfp |= __GFP_DMA32;
>> + else
>
> Why the 'else'
>> +#endif
>> + ;
>
> why?
>> + gfp |= __GFP_NORETRY;
>> +
>> + ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
>> + mb();
>
> Why the 'mb()' ? Can you just do
> return swiotlb_alloc_coherent(...)
>
>> + return ret;
>> +}
>> +
>> +static void loongson_dma_free_coherent(struct device *dev, size_t size,
>> + void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
>> +{
>> + int order = get_order(size);
>> +
>> + if (dma_release_from_coherent(dev, order, vaddr))
>> + return;
>> +
>> + swiotlb_free_coherent(dev, size, vaddr, dma_handle);
>> +}
>> +
>> +static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
>> + unsigned long offset, size_t size,
>> + enum dma_data_direction dir,
>> + struct dma_attrs *attrs)
>> +{
>> + dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
>> + dir, attrs);
>> + mb();
>
> Please do 'return swiotlb_map_page(..)'..
>
> But if you are doing that why don't you just set the dma_ops.map_page = swiotlb_map_page
> ?
>
>
>> + return daddr;
>> +}
>> +
>> +static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
>> + int nents, enum dma_data_direction dir,
>> + struct dma_attrs *attrs)
>> +{
>> + int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
>> + mb();
>> +
>> + return r;
>> +}
>> +
>> +static void loongson_dma_sync_single_for_device(struct device *dev,
>> + dma_addr_t dma_handle, size_t size,
>> + enum dma_data_direction dir)
>> +{
>> + swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
>> + mb();
>> +}
>> +
>> +static void loongson_dma_sync_sg_for_device(struct device *dev,
>> + struct scatterlist *sg, int nents,
>> + enum dma_data_direction dir)
>> +{
>> + swiotlb_sync_sg_for_device(dev, sg, nents, dir);
>> + mb();
>> +}
>> +
>
> I am not really sure why you have these extra functions, when you could
> just modify the dma_ops to point to the swiotlb ones
>
>> +static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
>> +{
>> + return (paddr < 0x10000000) ?
>> + (paddr | 0x0000000080000000) : paddr;
>> +}
>> +
>> +static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
>> +{
>> + return (daddr < 0x90000000 && daddr >= 0x80000000) ?
>> + (daddr & 0x0fffffff) : daddr;
>> +}
>> +
>> +struct loongson_dma_map_ops {
>> + struct dma_map_ops dma_map_ops;
>> + dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
>> + phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
>> +};
>> +
>> +dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
>> +{
>> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> + struct loongson_dma_map_ops, dma_map_ops);
>> +
>> + return ops->phys_to_dma(dev, paddr);
>> +}
>> +
>> +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
>> +{
>> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> + struct loongson_dma_map_ops, dma_map_ops);
>> +
>> + return ops->dma_to_phys(dev, daddr);
>> +}
>> +
>> +static int loongson_dma_set_mask(struct device *dev, u64 mask)
>> +{
>> + /* Loongson doesn't support DMA above 32-bit */
>> + if (mask > DMA_BIT_MASK(32))
>> + return -EIO;
>> +
>> + *dev->dma_mask = mask;
>> +
>> + return 0;
>> +}
>> +
>> +static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
>> + .dma_map_ops = {
>> + .alloc = loongson_dma_alloc_coherent,
>> + .free = loongson_dma_free_coherent,
>> + .map_page = loongson_dma_map_page,
>
> But why not 'swiotlb_map_page'?
>
>> + .unmap_page = swiotlb_unmap_page,
>> + .map_sg = loongson_dma_map_sg,
>> + .unmap_sg = swiotlb_unmap_sg_attrs,
>> + .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
>> + .sync_single_for_device = loongson_dma_sync_single_for_device,
>> + .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
>> + .sync_sg_for_device = loongson_dma_sync_sg_for_device,
>> + .mapping_error = swiotlb_dma_mapping_error,
>> + .dma_supported = swiotlb_dma_supported,
>> + .set_dma_mask = loongson_dma_set_mask
>> + },
>> + .phys_to_dma = loongson_unity_phys_to_dma,
>> + .dma_to_phys = loongson_unity_dma_to_phys
>
> Why do you need these? I am not seeing it being used here by any external code?
>
>> +};
>> +
>> +void __init plat_swiotlb_setup(void)
>> +{
>> + swiotlb_init(1);
>> + mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
>> +}
>> diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
>> index 3fab204..122f4f8 100644
>> --- a/arch/mips/mm/dma-default.c
>> +++ b/arch/mips/mm/dma-default.c
>> @@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
>> current_cpu_type() == CPU_R12000);
>> }
>>
>> +static inline int cpu_is_noncoherent_loongson(struct device *dev)
>> +{
>> + return !plat_device_is_coherent(dev) &&
>> + (current_cpu_type() == CPU_LOONGSON2 ||
>> + current_cpu_type() == CPU_LOONGSON3);
>> +}
>> +
>> static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
>> {
>> gfp_t dma_flag;
>> @@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
>> static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
>> size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
>> {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(dma_addr_to_page(dev, dma_addr),
>> dma_addr & ~PAGE_MASK, size, direction);
>>
>> @@ -260,7 +267,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
>> static void mips_dma_sync_single_for_cpu(struct device *dev,
>> dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
>> {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(dma_addr_to_page(dev, dma_handle),
>> dma_handle & ~PAGE_MASK, size, direction);
>> }
>> @@ -281,7 +288,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
>>
>> /* Make sure that gcc doesn't leave the empty loop body. */
>> for (i = 0; i < nelems; i++, sg++) {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(sg_page(sg), sg->offset, sg->length,
>> direction);
>> }
>> --
>> 1.7.7.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-14 5:57 ` Huacai Chen
@ 2012-08-14 16:26 ` David Daney
0 siblings, 0 replies; 32+ messages in thread
From: David Daney @ 2012-08-14 16:26 UTC (permalink / raw)
To: Huacai Chen
Cc: Konrad Rzeszutek Wilk, Ralf Baechle, linux-mips, linux-kernel,
Fuxin Zhang, Zhangjin Wu, Hongliang Tao, Hua Yan
On 08/13/2012 10:57 PM, Huacai Chen wrote:
> Hi, David,
>
> Seems like you are the original author of code in
> arch/mips/cavium-octeon/dma-octeon.c. Could you please tell me why we
> need mb() in alloc_coherent(), map_page(), map_sg()? It seems like
> because of cache coherency (CPU write some data, then map the page for
> a device, if without mb(), then device may read wrong data.) but I'm
> not sure.
>
That is essentially correct.
The DMA API requires certain memory barrier semantics. These are
achieved with the mb() in the OCTEON code.
> On Tue, Aug 14, 2012 at 1:54 AM, Konrad Rzeszutek Wilk
> <konrad.wilk@oracle.com> wrote:
>>> +static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
>>> + dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
I know nothing about Loongson, so I cannot comment on what is required
for it.
David Daney
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-13 17:54 ` Konrad Rzeszutek Wilk
2012-08-14 2:29 ` Huacai Chen
2012-08-14 5:57 ` Huacai Chen
@ 2012-08-15 2:18 ` Huacai Chen
2012-08-15 20:24 ` Ralf Baechle
3 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-15 2:18 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Ralf Baechle, linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Hongliang Tao, Hua Yan
On Tue, Aug 14, 2012 at 1:54 AM, Konrad Rzeszutek Wilk
<konrad.wilk@oracle.com> wrote:
>> +static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
>> + dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
>> +{
>> + void *ret;
>> +
>> + if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
>> + return ret;
>> +
>> + /* ignore region specifiers */
>> + gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
>> +
>> +#ifdef CONFIG_ZONE_DMA
>> + if (dev == NULL)
>> + gfp |= __GFP_DMA;
>
> When would this happen? dev == NULL?
This can really happen, "grep dma_alloc_coherent drivers/ -rwI | grep
NULL" will get lots of information.
>
>> + else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
>> + gfp |= __GFP_DMA;
>> + else
>> +#endif
>> +#ifdef CONFIG_ZONE_DMA32
>> + if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
>> + gfp |= __GFP_DMA32;
>> + else
>
> Why the 'else'
>> +#endif
>> + ;
>
> why?
>> + gfp |= __GFP_NORETRY;
>> +
>> + ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
>> + mb();
>
> Why the 'mb()' ? Can you just do
> return swiotlb_alloc_coherent(...)
>
>> + return ret;
>> +}
>> +
>> +static void loongson_dma_free_coherent(struct device *dev, size_t size,
>> + void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
>> +{
>> + int order = get_order(size);
>> +
>> + if (dma_release_from_coherent(dev, order, vaddr))
>> + return;
>> +
>> + swiotlb_free_coherent(dev, size, vaddr, dma_handle);
>> +}
>> +
>> +static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
>> + unsigned long offset, size_t size,
>> + enum dma_data_direction dir,
>> + struct dma_attrs *attrs)
>> +{
>> + dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
>> + dir, attrs);
>> + mb();
>
> Please do 'return swiotlb_map_page(..)'..
mb() is needed because of cache coherency (CPU write some data, then
map the page for a device, if without mb(), then device may read wrong
data.)
>
> But if you are doing that why don't you just set the dma_ops.map_page = swiotlb_map_page
> ?
>
>
>> + return daddr;
>> +}
>> +
>> +static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
>> + int nents, enum dma_data_direction dir,
>> + struct dma_attrs *attrs)
>> +{
>> + int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
>> + mb();
>> +
>> + return r;
>> +}
>> +
>> +static void loongson_dma_sync_single_for_device(struct device *dev,
>> + dma_addr_t dma_handle, size_t size,
>> + enum dma_data_direction dir)
>> +{
>> + swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
>> + mb();
>> +}
>> +
>> +static void loongson_dma_sync_sg_for_device(struct device *dev,
>> + struct scatterlist *sg, int nents,
>> + enum dma_data_direction dir)
>> +{
>> + swiotlb_sync_sg_for_device(dev, sg, nents, dir);
>> + mb();
>> +}
>> +
>
> I am not really sure why you have these extra functions, when you could
> just modify the dma_ops to point to the swiotlb ones
>
>> +static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
>> +{
>> + return (paddr < 0x10000000) ?
>> + (paddr | 0x0000000080000000) : paddr;
>> +}
>> +
>> +static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
>> +{
>> + return (daddr < 0x90000000 && daddr >= 0x80000000) ?
>> + (daddr & 0x0fffffff) : daddr;
>> +}
>> +
>> +struct loongson_dma_map_ops {
>> + struct dma_map_ops dma_map_ops;
>> + dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
>> + phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
>> +};
>> +
>> +dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
>> +{
>> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> + struct loongson_dma_map_ops, dma_map_ops);
>> +
>> + return ops->phys_to_dma(dev, paddr);
>> +}
>> +
>> +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
>> +{
>> + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> + struct loongson_dma_map_ops, dma_map_ops);
>> +
>> + return ops->dma_to_phys(dev, daddr);
>> +}
>> +
>> +static int loongson_dma_set_mask(struct device *dev, u64 mask)
>> +{
>> + /* Loongson doesn't support DMA above 32-bit */
>> + if (mask > DMA_BIT_MASK(32))
>> + return -EIO;
>> +
>> + *dev->dma_mask = mask;
>> +
>> + return 0;
>> +}
>> +
>> +static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
>> + .dma_map_ops = {
>> + .alloc = loongson_dma_alloc_coherent,
>> + .free = loongson_dma_free_coherent,
>> + .map_page = loongson_dma_map_page,
>
> But why not 'swiotlb_map_page'?
>
>> + .unmap_page = swiotlb_unmap_page,
>> + .map_sg = loongson_dma_map_sg,
>> + .unmap_sg = swiotlb_unmap_sg_attrs,
>> + .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
>> + .sync_single_for_device = loongson_dma_sync_single_for_device,
>> + .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
>> + .sync_sg_for_device = loongson_dma_sync_sg_for_device,
>> + .mapping_error = swiotlb_dma_mapping_error,
>> + .dma_supported = swiotlb_dma_supported,
>> + .set_dma_mask = loongson_dma_set_mask
>> + },
>> + .phys_to_dma = loongson_unity_phys_to_dma,
>> + .dma_to_phys = loongson_unity_dma_to_phys
>
> Why do you need these? I am not seeing it being used here by any external code?
phys_to_dma() and dma_to_phys() are called in lib/swiotlb.c
>
>> +};
>> +
>> +void __init plat_swiotlb_setup(void)
>> +{
>> + swiotlb_init(1);
>> + mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
>> +}
>> diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
>> index 3fab204..122f4f8 100644
>> --- a/arch/mips/mm/dma-default.c
>> +++ b/arch/mips/mm/dma-default.c
>> @@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
>> current_cpu_type() == CPU_R12000);
>> }
>>
>> +static inline int cpu_is_noncoherent_loongson(struct device *dev)
>> +{
>> + return !plat_device_is_coherent(dev) &&
>> + (current_cpu_type() == CPU_LOONGSON2 ||
>> + current_cpu_type() == CPU_LOONGSON3);
>> +}
>> +
>> static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
>> {
>> gfp_t dma_flag;
>> @@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
>> static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
>> size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
>> {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(dma_addr_to_page(dev, dma_addr),
>> dma_addr & ~PAGE_MASK, size, direction);
>>
>> @@ -260,7 +267,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
>> static void mips_dma_sync_single_for_cpu(struct device *dev,
>> dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
>> {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(dma_addr_to_page(dev, dma_handle),
>> dma_handle & ~PAGE_MASK, size, direction);
>> }
>> @@ -281,7 +288,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
>>
>> /* Make sure that gcc doesn't leave the empty loop body. */
>> for (i = 0; i < nelems; i++, sg++) {
>> - if (cpu_is_noncoherent_r10000(dev))
>> + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>> __dma_sync(sg_page(sg), sg->offset, sg->length,
>> direction);
>> }
>> --
>> 1.7.7.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-13 17:54 ` Konrad Rzeszutek Wilk
` (2 preceding siblings ...)
2012-08-15 2:18 ` Huacai Chen
@ 2012-08-15 20:24 ` Ralf Baechle
2012-08-16 3:19 ` Huacai Chen
3 siblings, 1 reply; 32+ messages in thread
From: Ralf Baechle @ 2012-08-15 20:24 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Huacai Chen, linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Huacai Chen, Hongliang Tao, Hua Yan
On Mon, Aug 13, 2012 at 01:54:47PM -0400, Konrad Rzeszutek Wilk wrote:
> > +static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
> > + dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
> > +{
> > + void *ret;
> > +
> > + if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
> > + return ret;
> > +
> > + /* ignore region specifiers */
> > + gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
> > +
> > +#ifdef CONFIG_ZONE_DMA
> > + if (dev == NULL)
> > + gfp |= __GFP_DMA;
>
> When would this happen? dev == NULL?
A legacy (ISA) device driver. Some of the Loongsons have some kind of
southbridge which incorporates legacy devices though of the top of my
head I'm not sure which if any of these are actually being used. Huacai?
> > + else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
> > + gfp |= __GFP_DMA;
> > + else
> > +#endif
> > +#ifdef CONFIG_ZONE_DMA32
> > + if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
> > + gfp |= __GFP_DMA32;
> > + else
>
> Why the 'else'
> > +#endif
> > + ;
>
> why?
> > + gfp |= __GFP_NORETRY;
> > +
> > + ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
> > + mb();
>
> Why the 'mb()' ? Can you just do
> return swiotlb_alloc_coherent(...)
>
> > + return ret;
> > +}
> > +
> > +static void loongson_dma_free_coherent(struct device *dev, size_t size,
> > + void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
> > +{
> > + int order = get_order(size);
> > +
> > + if (dma_release_from_coherent(dev, order, vaddr))
> > + return;
> > +
> > + swiotlb_free_coherent(dev, size, vaddr, dma_handle);
> > +}
> > +
> > +static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
> > + unsigned long offset, size_t size,
> > + enum dma_data_direction dir,
> > + struct dma_attrs *attrs)
> > +{
> > + dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
> > + dir, attrs);
> > + mb();
>
> Please do 'return swiotlb_map_page(..)'..
>
> But if you are doing that why don't you just set the dma_ops.map_page = swiotlb_map_page
> ?
>
>
> > + return daddr;
> > +}
> > +
> > +static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
> > + int nents, enum dma_data_direction dir,
> > + struct dma_attrs *attrs)
> > +{
> > + int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
> > + mb();
> > +
> > + return r;
> > +}
> > +
> > +static void loongson_dma_sync_single_for_device(struct device *dev,
> > + dma_addr_t dma_handle, size_t size,
> > + enum dma_data_direction dir)
> > +{
> > + swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
> > + mb();
> > +}
> > +
> > +static void loongson_dma_sync_sg_for_device(struct device *dev,
> > + struct scatterlist *sg, int nents,
> > + enum dma_data_direction dir)
> > +{
> > + swiotlb_sync_sg_for_device(dev, sg, nents, dir);
> > + mb();
> > +}
> > +
>
> I am not really sure why you have these extra functions, when you could
> just modify the dma_ops to point to the swiotlb ones
>
> > +static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
> > +{
> > + return (paddr < 0x10000000) ?
> > + (paddr | 0x0000000080000000) : paddr;
> > +}
> > +
> > +static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
> > +{
> > + return (daddr < 0x90000000 && daddr >= 0x80000000) ?
> > + (daddr & 0x0fffffff) : daddr;
> > +}
> > +
> > +struct loongson_dma_map_ops {
> > + struct dma_map_ops dma_map_ops;
> > + dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
> > + phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
> > +};
> > +
> > +dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
> > +{
> > + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
> > + struct loongson_dma_map_ops, dma_map_ops);
> > +
> > + return ops->phys_to_dma(dev, paddr);
> > +}
> > +
> > +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
> > +{
> > + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
> > + struct loongson_dma_map_ops, dma_map_ops);
> > +
> > + return ops->dma_to_phys(dev, daddr);
> > +}
> > +
> > +static int loongson_dma_set_mask(struct device *dev, u64 mask)
> > +{
> > + /* Loongson doesn't support DMA above 32-bit */
> > + if (mask > DMA_BIT_MASK(32))
> > + return -EIO;
> > +
> > + *dev->dma_mask = mask;
> > +
> > + return 0;
> > +}
> > +
> > +static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
> > + .dma_map_ops = {
> > + .alloc = loongson_dma_alloc_coherent,
> > + .free = loongson_dma_free_coherent,
> > + .map_page = loongson_dma_map_page,
>
> But why not 'swiotlb_map_page'?
>
> > + .unmap_page = swiotlb_unmap_page,
> > + .map_sg = loongson_dma_map_sg,
> > + .unmap_sg = swiotlb_unmap_sg_attrs,
> > + .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
> > + .sync_single_for_device = loongson_dma_sync_single_for_device,
> > + .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
> > + .sync_sg_for_device = loongson_dma_sync_sg_for_device,
> > + .mapping_error = swiotlb_dma_mapping_error,
> > + .dma_supported = swiotlb_dma_supported,
> > + .set_dma_mask = loongson_dma_set_mask
> > + },
> > + .phys_to_dma = loongson_unity_phys_to_dma,
> > + .dma_to_phys = loongson_unity_dma_to_phys
>
> Why do you need these? I am not seeing it being used here by any external code?
>
> > +};
> > +
> > +void __init plat_swiotlb_setup(void)
> > +{
> > + swiotlb_init(1);
> > + mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
> > +}
> > diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
> > index 3fab204..122f4f8 100644
> > --- a/arch/mips/mm/dma-default.c
> > +++ b/arch/mips/mm/dma-default.c
> > @@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
> > current_cpu_type() == CPU_R12000);
> > }
> >
> > +static inline int cpu_is_noncoherent_loongson(struct device *dev)
> > +{
> > + return !plat_device_is_coherent(dev) &&
> > + (current_cpu_type() == CPU_LOONGSON2 ||
> > + current_cpu_type() == CPU_LOONGSON3);
> > +}
> > +
> > static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
> > {
> > gfp_t dma_flag;
> > @@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
> > static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
> > size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
> > {
> > - if (cpu_is_noncoherent_r10000(dev))
> > + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
Why this? I hope you're not claiming the Loongson has the same very weird
behaviour as the R10000 in a non-coherent system. No sane CPU should ...
Ralf
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
2012-08-15 20:24 ` Ralf Baechle
@ 2012-08-16 3:19 ` Huacai Chen
0 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-16 3:19 UTC (permalink / raw)
To: Ralf Baechle
Cc: Konrad Rzeszutek Wilk, linux-mips, linux-kernel, Fuxin Zhang,
Zhangjin Wu, Hongliang Tao, Hua Yan
On Thu, Aug 16, 2012 at 4:24 AM, Ralf Baechle <ralf@linux-mips.org> wrote:
> On Mon, Aug 13, 2012 at 01:54:47PM -0400, Konrad Rzeszutek Wilk wrote:
>
>> > +static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
>> > + dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
>> > +{
>> > + void *ret;
>> > +
>> > + if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
>> > + return ret;
>> > +
>> > + /* ignore region specifiers */
>> > + gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
>> > +
>> > +#ifdef CONFIG_ZONE_DMA
>> > + if (dev == NULL)
>> > + gfp |= __GFP_DMA;
>>
>> When would this happen? dev == NULL?
>
> A legacy (ISA) device driver. Some of the Loongsons have some kind of
> southbridge which incorporates legacy devices though of the top of my
> head I'm not sure which if any of these are actually being used. Huacai?
ISA driver isn't used now, but I think keep "dev == NULL" here has no
side effect.
BTW, "dev == NULL" only happend in ISA case? I use "grep
pci_alloc_consistent drivers/ -rwI | grep NULL" and also get some
lines.
>
>> > + else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
>> > + gfp |= __GFP_DMA;
>> > + else
>> > +#endif
>> > +#ifdef CONFIG_ZONE_DMA32
>> > + if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
>> > + gfp |= __GFP_DMA32;
>> > + else
>>
>> Why the 'else'
>> > +#endif
>> > + ;
>>
>> why?
>> > + gfp |= __GFP_NORETRY;
>> > +
>> > + ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
>> > + mb();
>>
>> Why the 'mb()' ? Can you just do
>> return swiotlb_alloc_coherent(...)
>>
>> > + return ret;
>> > +}
>> > +
>> > +static void loongson_dma_free_coherent(struct device *dev, size_t size,
>> > + void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
>> > +{
>> > + int order = get_order(size);
>> > +
>> > + if (dma_release_from_coherent(dev, order, vaddr))
>> > + return;
>> > +
>> > + swiotlb_free_coherent(dev, size, vaddr, dma_handle);
>> > +}
>> > +
>> > +static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
>> > + unsigned long offset, size_t size,
>> > + enum dma_data_direction dir,
>> > + struct dma_attrs *attrs)
>> > +{
>> > + dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
>> > + dir, attrs);
>> > + mb();
>>
>> Please do 'return swiotlb_map_page(..)'..
>>
>> But if you are doing that why don't you just set the dma_ops.map_page = swiotlb_map_page
>> ?
>>
>>
>> > + return daddr;
>> > +}
>> > +
>> > +static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
>> > + int nents, enum dma_data_direction dir,
>> > + struct dma_attrs *attrs)
>> > +{
>> > + int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
>> > + mb();
>> > +
>> > + return r;
>> > +}
>> > +
>> > +static void loongson_dma_sync_single_for_device(struct device *dev,
>> > + dma_addr_t dma_handle, size_t size,
>> > + enum dma_data_direction dir)
>> > +{
>> > + swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
>> > + mb();
>> > +}
>> > +
>> > +static void loongson_dma_sync_sg_for_device(struct device *dev,
>> > + struct scatterlist *sg, int nents,
>> > + enum dma_data_direction dir)
>> > +{
>> > + swiotlb_sync_sg_for_device(dev, sg, nents, dir);
>> > + mb();
>> > +}
>> > +
>>
>> I am not really sure why you have these extra functions, when you could
>> just modify the dma_ops to point to the swiotlb ones
>>
>> > +static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
>> > +{
>> > + return (paddr < 0x10000000) ?
>> > + (paddr | 0x0000000080000000) : paddr;
>> > +}
>> > +
>> > +static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
>> > +{
>> > + return (daddr < 0x90000000 && daddr >= 0x80000000) ?
>> > + (daddr & 0x0fffffff) : daddr;
>> > +}
>> > +
>> > +struct loongson_dma_map_ops {
>> > + struct dma_map_ops dma_map_ops;
>> > + dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
>> > + phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
>> > +};
>> > +
>> > +dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
>> > +{
>> > + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> > + struct loongson_dma_map_ops, dma_map_ops);
>> > +
>> > + return ops->phys_to_dma(dev, paddr);
>> > +}
>> > +
>> > +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
>> > +{
>> > + struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
>> > + struct loongson_dma_map_ops, dma_map_ops);
>> > +
>> > + return ops->dma_to_phys(dev, daddr);
>> > +}
>> > +
>> > +static int loongson_dma_set_mask(struct device *dev, u64 mask)
>> > +{
>> > + /* Loongson doesn't support DMA above 32-bit */
>> > + if (mask > DMA_BIT_MASK(32))
>> > + return -EIO;
>> > +
>> > + *dev->dma_mask = mask;
>> > +
>> > + return 0;
>> > +}
>> > +
>> > +static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
>> > + .dma_map_ops = {
>> > + .alloc = loongson_dma_alloc_coherent,
>> > + .free = loongson_dma_free_coherent,
>> > + .map_page = loongson_dma_map_page,
>>
>> But why not 'swiotlb_map_page'?
>>
>> > + .unmap_page = swiotlb_unmap_page,
>> > + .map_sg = loongson_dma_map_sg,
>> > + .unmap_sg = swiotlb_unmap_sg_attrs,
>> > + .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
>> > + .sync_single_for_device = loongson_dma_sync_single_for_device,
>> > + .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
>> > + .sync_sg_for_device = loongson_dma_sync_sg_for_device,
>> > + .mapping_error = swiotlb_dma_mapping_error,
>> > + .dma_supported = swiotlb_dma_supported,
>> > + .set_dma_mask = loongson_dma_set_mask
>> > + },
>> > + .phys_to_dma = loongson_unity_phys_to_dma,
>> > + .dma_to_phys = loongson_unity_dma_to_phys
>>
>> Why do you need these? I am not seeing it being used here by any external code?
>>
>> > +};
>> > +
>> > +void __init plat_swiotlb_setup(void)
>> > +{
>> > + swiotlb_init(1);
>> > + mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
>> > +}
>> > diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
>> > index 3fab204..122f4f8 100644
>> > --- a/arch/mips/mm/dma-default.c
>> > +++ b/arch/mips/mm/dma-default.c
>> > @@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
>> > current_cpu_type() == CPU_R12000);
>> > }
>> >
>> > +static inline int cpu_is_noncoherent_loongson(struct device *dev)
>> > +{
>> > + return !plat_device_is_coherent(dev) &&
>> > + (current_cpu_type() == CPU_LOONGSON2 ||
>> > + current_cpu_type() == CPU_LOONGSON3);
>> > +}
>> > +
>> > static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
>> > {
>> > gfp_t dma_flag;
>> > @@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
>> > static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
>> > size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
>> > {
>> > - if (cpu_is_noncoherent_r10000(dev))
>> > + if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
>
> Why this? I hope you're not claiming the Loongson has the same very weird
> behaviour as the R10000 in a non-coherent system. No sane CPU should ...
This can be removed on Loongson, thank you.
>
> Ralf
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH V5 10/18] MIPS: Loongson: Add Loongson-3 Kconfig options.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (8 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 11/18] drm/radeon: Include swiotlb.h if SWIOTLB configured Huacai Chen
` (7 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Added Kconfig options include: Loongson-3 CPU and machine definition,
UEFI-like firmware interface, HT-linked PCI, big memory support, etc.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/Kconfig | 22 ++++++++++++++++++
arch/mips/loongson/Kconfig | 52 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 331d574..9e8e86c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1571,6 +1571,16 @@ config CPU_LOONGSON2
select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM
+config CPU_LOONGSON3
+ bool "Loongson 3 CPU"
+ depends on SYS_HAS_CPU_LOONGSON3
+ select CPU_SUPPORTS_32BIT_KERNEL
+ select CPU_SUPPORTS_64BIT_KERNEL
+ select CPU_SUPPORTS_HIGHMEM
+ help
+ The Loongson 3 processor implements the MIPS III instruction set
+ with many extensions.
+
config CPU_LOONGSON1
bool
select CPU_MIPS32
@@ -1597,6 +1607,9 @@ config SYS_HAS_CPU_LOONGSON2F
select CPU_SUPPORTS_ADDRWINCFG if 64BIT
select CPU_SUPPORTS_UNCACHED_ACCELERATED
+config SYS_HAS_CPU_LOONGSON3
+ bool
+
config SYS_HAS_CPU_LOONGSON1B
bool
@@ -2399,6 +2412,15 @@ config PCI
your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
say Y, otherwise N.
+config HT_PCI
+ bool "Support for HT-linked PCI"
+ select PCI_DOMAINS
+ help
+ Loongson family machines use Hyper-Transport bus for inter-core
+ connection and device connection. The PCI bus is a subordinate
+ linked at HT. Choose Y unless you are using Loongson 2E/2F based
+ machines.
+
config PCI_DOMAINS
bool
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
index 263beb9..dd951b8 100644
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
@@ -59,6 +59,33 @@ config LEMOTE_MACH2F
These family machines include fuloong2f mini PC, yeeloong2f notebook,
LingLoong allinone PC and so forth.
+
+config LEMOTE_MACH3A
+ bool "Lemote Loongson 3A family machines"
+ select ARCH_SPARSEMEM_ENABLE
+ select GENERIC_ISA_DMA_SUPPORT_BROKEN
+ select GENERIC_HARDIRQS_NO__DO_IRQ
+ select BOOT_ELF32
+ select BOARD_SCACHE
+ select CSRC_R4K
+ select CEVT_R4K
+ select CPU_HAS_WB
+ select HW_HAS_PCI
+ select ISA
+ select I8259
+ select IRQ_CPU
+ select SYS_HAS_CPU_LOONGSON3
+ select SYS_HAS_EARLY_PRINTK
+ select SYS_SUPPORTS_SMP
+ select SYS_SUPPORTS_32BIT_KERNEL
+ select SYS_SUPPORTS_64BIT_KERNEL
+ select SYS_SUPPORTS_HIGHMEM
+ select SYS_SUPPORTS_LITTLE_ENDIAN
+ select LOONGSON_MC146818
+ select UEFI_FIRMWARE_INTERFACE
+ help
+ Lemote Loongson 3A family machines utilize the 3A revision of
+ Loongson processor and RS780/SBX00 chipset.
endchoice
config CS5536
@@ -86,8 +113,33 @@ config LOONGSON_UART_BASE
default y
depends on EARLY_PRINTK || SERIAL_8250
+config LOONGSON_BIGMEM
+ bool "Soft IOMMU Support for Big Memory (>4GB)"
+ depends on CPU_LOONGSON3
+ select SWIOTLB
+ select ZONE_DMA32
+
+config IOMMU_HELPER
+ bool
+
+config NEED_SG_DMA_LENGTH
+ bool
+
+config SWIOTLB
+ bool
+ select IOMMU_HELPER
+ select NEED_SG_DMA_LENGTH
+ select NEED_DMA_MAP_STATE
+
config LOONGSON_MC146818
bool
default n
+config ARCH_SPARSEMEM_ENABLE
+ bool
+ select SPARSEMEM_STATIC
+
+config UEFI_FIRMWARE_INTERFACE
+ bool
+
endif # MACH_LOONGSON
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 11/18] drm/radeon: Include swiotlb.h if SWIOTLB configured.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (9 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 10/18] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 12/18] drm: Handle io prot correctly for MIPS Huacai Chen
` (6 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan, dri-devel
Loongson has SWIOTLB configured, if without this patch kernel
compilation fails.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
---
drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5b71c71..fc3ac22 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -41,6 +41,10 @@
#include "radeon_reg.h"
#include "radeon.h"
+#ifdef CONFIG_SWIOTLB
+#include <linux/swiotlb.h>
+#endif
+
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 12/18] drm: Handle io prot correctly for MIPS.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (10 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 11/18] drm/radeon: Include swiotlb.h if SWIOTLB configured Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB) Huacai Chen
` (5 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan, dri-devel
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
---
drivers/gpu/drm/drm_vm.c | 2 +-
drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 961ee08..3f06166 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -62,7 +62,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
tmp = pgprot_writecombine(tmp);
else
tmp = pgprot_noncached(tmp);
-#elif defined(__sparc__) || defined(__arm__)
+#elif defined(__sparc__) || defined(__arm__) || defined(__mips__)
tmp = pgprot_noncached(tmp);
#endif
return tmp;
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index f8187ea..0df71ea 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -472,7 +472,7 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
else
tmp = pgprot_noncached(tmp);
#endif
-#if defined(__sparc__)
+#if defined(__sparc__) || defined(__mips__)
if (!(caching_flags & TTM_PL_FLAG_CACHED))
tmp = pgprot_noncached(tmp);
#endif
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (11 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 12/18] drm: Handle io prot correctly for MIPS Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-15 21:31 ` Ralf Baechle
2012-08-16 1:58 ` Matt Turner
2012-08-11 9:32 ` [PATCH V5 14/18] ALSA: HDA: Make hda sound card usable for Loongson Huacai Chen
` (4 subsequent siblings)
17 siblings, 2 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan, dri-devel
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
---
include/drm/drm_sarea.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
index ee5389d..1d1a858 100644
--- a/include/drm/drm_sarea.h
+++ b/include/drm/drm_sarea.h
@@ -37,6 +37,8 @@
/* SAREA area needs to be at least a page */
#if defined(__alpha__)
#define SAREA_MAX 0x2000U
+#elif defined(__mips__)
+#define SAREA_MAX 0x4000U
#elif defined(__ia64__)
#define SAREA_MAX 0x10000U /* 64kB */
#else
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
2012-08-11 9:32 ` [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB) Huacai Chen
@ 2012-08-15 21:31 ` Ralf Baechle
2012-08-16 0:43 ` Huacai Chen
2012-08-16 1:58 ` Matt Turner
1 sibling, 1 reply; 32+ messages in thread
From: Ralf Baechle @ 2012-08-15 21:31 UTC (permalink / raw)
To: Huacai Chen
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan, dri-devel
On Sat, Aug 11, 2012 at 05:32:18PM +0800, Huacai Chen wrote:
> Subject: [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
But your code doesn't define it just for Loongsson as the log message claims
but rather for all MIPS.
> diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
> index ee5389d..1d1a858 100644
> --- a/include/drm/drm_sarea.h
> +++ b/include/drm/drm_sarea.h
> @@ -37,6 +37,8 @@
> /* SAREA area needs to be at least a page */
> #if defined(__alpha__)
> #define SAREA_MAX 0x2000U
> +#elif defined(__mips__)
> +#define SAREA_MAX 0x4000U
How about replacing this whole #ifdef mess with something like:
#include <linux/kernel.h>
#include <asm/page.h>
/* Intel 830M driver needs at least 8k SAREA */
#define SAREA_MAX max(PAGE_SIZE, 0x2000U)
MIPS also uses 64K page size and your patch as posted would break with 64k
pages.
Ralf
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
2012-08-15 21:31 ` Ralf Baechle
@ 2012-08-16 0:43 ` Huacai Chen
0 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-16 0:43 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Hongliang Tao, Hua Yan, dri-devel
On Thu, Aug 16, 2012 at 5:31 AM, Ralf Baechle <ralf@linux-mips.org> wrote:
> On Sat, Aug 11, 2012 at 05:32:18PM +0800, Huacai Chen wrote:
>
>> Subject: [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
>
> But your code doesn't define it just for Loongsson as the log message claims
> but rather for all MIPS.
>
>> diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
>> index ee5389d..1d1a858 100644
>> --- a/include/drm/drm_sarea.h
>> +++ b/include/drm/drm_sarea.h
>> @@ -37,6 +37,8 @@
>> /* SAREA area needs to be at least a page */
>> #if defined(__alpha__)
>> #define SAREA_MAX 0x2000U
>> +#elif defined(__mips__)
>> +#define SAREA_MAX 0x4000U
>
> How about replacing this whole #ifdef mess with something like:
>
> #include <linux/kernel.h>
> #include <asm/page.h>
>
> /* Intel 830M driver needs at least 8k SAREA */
> #define SAREA_MAX max(PAGE_SIZE, 0x2000U)
>
> MIPS also uses 64K page size and your patch as posted would break with 64k
> pages.
Yes, I think this is better. Thank you.
>
> Ralf
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
2012-08-11 9:32 ` [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB) Huacai Chen
2012-08-15 21:31 ` Ralf Baechle
@ 2012-08-16 1:58 ` Matt Turner
2012-08-16 3:20 ` Huacai Chen
1 sibling, 1 reply; 32+ messages in thread
From: Matt Turner @ 2012-08-16 1:58 UTC (permalink / raw)
To: Huacai Chen
Cc: Ralf Baechle, linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Huacai Chen, Hongliang Tao, Hua Yan, dri-devel
On Sat, Aug 11, 2012 at 2:32 AM, Huacai Chen <chenhuacai@gmail.com> wrote:
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> Signed-off-by: Hongliang Tao <taohl@lemote.com>
> Signed-off-by: Hua Yan <yanh@lemote.com>
> Cc: dri-devel@lists.freedesktop.org
> ---
> include/drm/drm_sarea.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
> index ee5389d..1d1a858 100644
> --- a/include/drm/drm_sarea.h
> +++ b/include/drm/drm_sarea.h
> @@ -37,6 +37,8 @@
> /* SAREA area needs to be at least a page */
> #if defined(__alpha__)
> #define SAREA_MAX 0x2000U
> +#elif defined(__mips__)
> +#define SAREA_MAX 0x4000U
> #elif defined(__ia64__)
> #define SAREA_MAX 0x10000U /* 64kB */
> #else
> --
> 1.7.7.3
SAREA is a DRI-1 concept. The Radeon drivers you're using is DRI-2, so
what do you need this for? All the DRI-1 drivers have been removed
from Mesa, so I think the answer is nothing.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
2012-08-16 1:58 ` Matt Turner
@ 2012-08-16 3:20 ` Huacai Chen
0 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-16 3:20 UTC (permalink / raw)
To: Matt Turner
Cc: Ralf Baechle, linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu,
Hongliang Tao, Hua Yan, dri-devel
On Thu, Aug 16, 2012 at 9:58 AM, Matt Turner <mattst88@gmail.com> wrote:
> On Sat, Aug 11, 2012 at 2:32 AM, Huacai Chen <chenhuacai@gmail.com> wrote:
>> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>> Signed-off-by: Hongliang Tao <taohl@lemote.com>
>> Signed-off-by: Hua Yan <yanh@lemote.com>
>> Cc: dri-devel@lists.freedesktop.org
>> ---
>> include/drm/drm_sarea.h | 2 ++
>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
>> index ee5389d..1d1a858 100644
>> --- a/include/drm/drm_sarea.h
>> +++ b/include/drm/drm_sarea.h
>> @@ -37,6 +37,8 @@
>> /* SAREA area needs to be at least a page */
>> #if defined(__alpha__)
>> #define SAREA_MAX 0x2000U
>> +#elif defined(__mips__)
>> +#define SAREA_MAX 0x4000U
>> #elif defined(__ia64__)
>> #define SAREA_MAX 0x10000U /* 64kB */
>> #else
>> --
>> 1.7.7.3
>
> SAREA is a DRI-1 concept. The Radeon drivers you're using is DRI-2, so
> what do you need this for? All the DRI-1 drivers have been removed
> from Mesa, so I think the answer is nothing.
This patch will be drop, thank you.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH V5 14/18] ALSA: HDA: Make hda sound card usable for Loongson.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (12 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB) Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-13 8:00 ` [alsa-devel] " Takashi Iwai
2012-08-11 9:32 ` [PATCH V5 15/18] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
` (3 subsequent siblings)
17 siblings, 1 reply; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Jie Chen, Hongliang Tao, Hua Yan, alsa-devel
Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec,
this patch modify patch_conexant.c to add Lemote specific code.
Signed-off-by: Jie Chen <chenj@lemote.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: alsa-devel@alsa-project.org
---
include/linux/pci_ids.h | 2 ++
sound/pci/hda/patch_conexant.c | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index fc35260..b28270e 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2918,3 +2918,5 @@
#define PCI_DEVICE_ID_XEN_PLATFORM 0x0001
#define PCI_VENDOR_ID_OCZ 0x1b85
+
+#define PCI_VENDOR_ID_LEMOTE 0x1c06
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 1436118..b7de368 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -4414,6 +4414,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
enum {
CXT_PINCFG_LENOVO_X200,
CXT_PINCFG_LENOVO_TP410,
+ CXT_PINCFG_LEMOTE_A1004,
+ CXT_PINCFG_LEMOTE_A1205,
CXT_FIXUP_STEREO_DMIC,
};
@@ -4441,6 +4443,18 @@ static const struct hda_pintbl cxt_pincfg_lenovo_tp410[] = {
{}
};
+/* Lemote A1004/A1205 with cxt5066 */
+static const struct hda_pintbl cxt_pincfg_lemote[] = {
+ { 0x1a, 0x90a10020 }, /* Internal mic */
+ { 0x1b, 0x03a11020 }, /* External mic */
+ { 0x1d, 0x400101f0 }, /* Not used */
+ { 0x1e, 0x40a701f0 }, /* Not used */
+ { 0x20, 0x404501f0 }, /* Not used */
+ { 0x22, 0x404401f0 }, /* Not used */
+ { 0x23, 0x40a701f0 }, /* Not used */
+ {}
+};
+
static const struct hda_fixup cxt_fixups[] = {
[CXT_PINCFG_LENOVO_X200] = {
.type = HDA_FIXUP_PINS,
@@ -4450,6 +4464,14 @@ static const struct hda_fixup cxt_fixups[] = {
.type = HDA_FIXUP_PINS,
.v.pins = cxt_pincfg_lenovo_tp410,
},
+ [CXT_PINCFG_LEMOTE_A1004] = {
+ .type = HDA_FIXUP_PINS,
+ .v.pins = cxt_pincfg_lemote,
+ },
+ [CXT_PINCFG_LEMOTE_A1205] = {
+ .type = HDA_FIXUP_PINS,
+ .v.pins = cxt_pincfg_lemote,
+ },
[CXT_FIXUP_STEREO_DMIC] = {
.type = HDA_FIXUP_FUNC,
.v.func = cxt_fixup_stereo_dmic,
@@ -4467,6 +4489,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410),
SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),
SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),
SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
{}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [alsa-devel] [PATCH V5 14/18] ALSA: HDA: Make hda sound card usable for Loongson.
2012-08-11 9:32 ` [PATCH V5 14/18] ALSA: HDA: Make hda sound card usable for Loongson Huacai Chen
@ 2012-08-13 8:00 ` Takashi Iwai
2012-08-13 8:22 ` Huacai Chen
0 siblings, 1 reply; 32+ messages in thread
From: Takashi Iwai @ 2012-08-13 8:00 UTC (permalink / raw)
To: Huacai Chen
Cc: Ralf Baechle, linux-mips, alsa-devel, Zhangjin Wu, Hua Yan,
Fuxin Zhang, linux-kernel, Hongliang Tao, Jie Chen, Huacai Chen
At Sat, 11 Aug 2012 17:32:19 +0800,
Huacai Chen wrote:
>
> Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec,
> this patch modify patch_conexant.c to add Lemote specific code.
>
> Signed-off-by: Jie Chen <chenj@lemote.com>
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> Signed-off-by: Hongliang Tao <taohl@lemote.com>
> Signed-off-by: Hua Yan <yanh@lemote.com>
> Cc: alsa-devel@alsa-project.org
> ---
> include/linux/pci_ids.h | 2 ++
> sound/pci/hda/patch_conexant.c | 24 ++++++++++++++++++++++++
> 2 files changed, 26 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index fc35260..b28270e 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2918,3 +2918,5 @@
> #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001
>
> #define PCI_VENDOR_ID_OCZ 0x1b85
> +
> +#define PCI_VENDOR_ID_LEMOTE 0x1c06
> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
> index 1436118..b7de368 100644
> --- a/sound/pci/hda/patch_conexant.c
> +++ b/sound/pci/hda/patch_conexant.c
> @@ -4414,6 +4414,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
> enum {
> CXT_PINCFG_LENOVO_X200,
> CXT_PINCFG_LENOVO_TP410,
> + CXT_PINCFG_LEMOTE_A1004,
> + CXT_PINCFG_LEMOTE_A1205,
> CXT_FIXUP_STEREO_DMIC,
> };
>
> @@ -4441,6 +4443,18 @@ static const struct hda_pintbl cxt_pincfg_lenovo_tp410[] = {
> {}
> };
>
> +/* Lemote A1004/A1205 with cxt5066 */
> +static const struct hda_pintbl cxt_pincfg_lemote[] = {
> + { 0x1a, 0x90a10020 }, /* Internal mic */
> + { 0x1b, 0x03a11020 }, /* External mic */
> + { 0x1d, 0x400101f0 }, /* Not used */
> + { 0x1e, 0x40a701f0 }, /* Not used */
> + { 0x20, 0x404501f0 }, /* Not used */
> + { 0x22, 0x404401f0 }, /* Not used */
> + { 0x23, 0x40a701f0 }, /* Not used */
> + {}
> +};
> +
> static const struct hda_fixup cxt_fixups[] = {
> [CXT_PINCFG_LENOVO_X200] = {
> .type = HDA_FIXUP_PINS,
> @@ -4450,6 +4464,14 @@ static const struct hda_fixup cxt_fixups[] = {
> .type = HDA_FIXUP_PINS,
> .v.pins = cxt_pincfg_lenovo_tp410,
> },
> + [CXT_PINCFG_LEMOTE_A1004] = {
> + .type = HDA_FIXUP_PINS,
> + .v.pins = cxt_pincfg_lemote,
> + },
> + [CXT_PINCFG_LEMOTE_A1205] = {
> + .type = HDA_FIXUP_PINS,
> + .v.pins = cxt_pincfg_lemote,
> + },
Well, if both point to the same pin configuration, there is no merit
to create two distinct fixup types.
Just create CXT_PINCFG_LEMOTE_A1X05, then pass it in your both device
entries.
> [CXT_FIXUP_STEREO_DMIC] = {
> .type = HDA_FIXUP_FUNC,
> .v.func = cxt_fixup_stereo_dmic,
> @@ -4467,6 +4489,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
> SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410),
> SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),
> SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),
> + SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),
> + SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),
> SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
> SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
Don't put entries suddenly in the middle of others.
As you can see, the list is sorted in the order of id numbers.
Also, in this case, we prefer having numbers over PCI_* literals.
It's easier to check through the table in the end.
thanks,
Takashi
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [alsa-devel] [PATCH V5 14/18] ALSA: HDA: Make hda sound card usable for Loongson.
2012-08-13 8:00 ` [alsa-devel] " Takashi Iwai
@ 2012-08-13 8:22 ` Huacai Chen
0 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-13 8:22 UTC (permalink / raw)
To: Takashi Iwai
Cc: Ralf Baechle, linux-mips, alsa-devel, Zhangjin Wu, Hua Yan,
Fuxin Zhang, linux-kernel, Hongliang Tao, Jie Chen, Huacai Chen
OK, I will improve the code.
On Mon, Aug 13, 2012 at 4:00 PM, Takashi Iwai <tiwai@suse.de> wrote:
> At Sat, 11 Aug 2012 17:32:19 +0800,
> Huacai Chen wrote:
>>
>> Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec,
>> this patch modify patch_conexant.c to add Lemote specific code.
>>
>> Signed-off-by: Jie Chen <chenj@lemote.com>
>> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>> Signed-off-by: Hongliang Tao <taohl@lemote.com>
>> Signed-off-by: Hua Yan <yanh@lemote.com>
>> Cc: alsa-devel@alsa-project.org
>> ---
>> include/linux/pci_ids.h | 2 ++
>> sound/pci/hda/patch_conexant.c | 24 ++++++++++++++++++++++++
>> 2 files changed, 26 insertions(+), 0 deletions(-)
>>
>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index fc35260..b28270e 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -2918,3 +2918,5 @@
>> #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001
>>
>> #define PCI_VENDOR_ID_OCZ 0x1b85
>> +
>> +#define PCI_VENDOR_ID_LEMOTE 0x1c06
>> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
>> index 1436118..b7de368 100644
>> --- a/sound/pci/hda/patch_conexant.c
>> +++ b/sound/pci/hda/patch_conexant.c
>> @@ -4414,6 +4414,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
>> enum {
>> CXT_PINCFG_LENOVO_X200,
>> CXT_PINCFG_LENOVO_TP410,
>> + CXT_PINCFG_LEMOTE_A1004,
>> + CXT_PINCFG_LEMOTE_A1205,
>> CXT_FIXUP_STEREO_DMIC,
>> };
>>
>> @@ -4441,6 +4443,18 @@ static const struct hda_pintbl cxt_pincfg_lenovo_tp410[] = {
>> {}
>> };
>>
>> +/* Lemote A1004/A1205 with cxt5066 */
>> +static const struct hda_pintbl cxt_pincfg_lemote[] = {
>> + { 0x1a, 0x90a10020 }, /* Internal mic */
>> + { 0x1b, 0x03a11020 }, /* External mic */
>> + { 0x1d, 0x400101f0 }, /* Not used */
>> + { 0x1e, 0x40a701f0 }, /* Not used */
>> + { 0x20, 0x404501f0 }, /* Not used */
>> + { 0x22, 0x404401f0 }, /* Not used */
>> + { 0x23, 0x40a701f0 }, /* Not used */
>> + {}
>> +};
>> +
>> static const struct hda_fixup cxt_fixups[] = {
>> [CXT_PINCFG_LENOVO_X200] = {
>> .type = HDA_FIXUP_PINS,
>> @@ -4450,6 +4464,14 @@ static const struct hda_fixup cxt_fixups[] = {
>> .type = HDA_FIXUP_PINS,
>> .v.pins = cxt_pincfg_lenovo_tp410,
>> },
>> + [CXT_PINCFG_LEMOTE_A1004] = {
>> + .type = HDA_FIXUP_PINS,
>> + .v.pins = cxt_pincfg_lemote,
>> + },
>> + [CXT_PINCFG_LEMOTE_A1205] = {
>> + .type = HDA_FIXUP_PINS,
>> + .v.pins = cxt_pincfg_lemote,
>> + },
>
> Well, if both point to the same pin configuration, there is no merit
> to create two distinct fixup types.
> Just create CXT_PINCFG_LEMOTE_A1X05, then pass it in your both device
> entries.
>
>
>> [CXT_FIXUP_STEREO_DMIC] = {
>> .type = HDA_FIXUP_FUNC,
>> .v.func = cxt_fixup_stereo_dmic,
>> @@ -4467,6 +4489,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
>> SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410),
>> SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),
>> SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),
>> + SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),
>> + SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),
>> SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
>> SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
>
> Don't put entries suddenly in the middle of others.
> As you can see, the list is sorted in the order of id numbers.
>
> Also, in this case, we prefer having numbers over PCI_* literals.
> It's easier to check through the table in the end.
>
>
> thanks,
>
> Takashi
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH V5 15/18] MIPS: Loongson 3: Add Loongson-3 SMP support.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (13 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 14/18] ALSA: HDA: Make hda sound card usable for Loongson Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 16/18] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
` (2 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
IPI registers of Loongson-3 include IPI_SET, IPI_CLEAR, IPI_STATUS,
IPI_EN and IPI_MAILBOX_BUF. Each bit of IPI_STATUS indicate a type of
IPI and IPI_EN indicate whether the IPI is enabled. The sender write 1
to IPI_SET bits generate IPIs in IPI_STATUS, and receiver write 1 to
bits of IPI_CLEAR to clear IPIs. IPI_MAILBOX_BUF are used to deliver
more information about IPIs.
Why we change code in arch/mips/loongson/common/setup.c?
If without this change, when SMP configured, system cannot boot since
it hang at printk() in cgroup_init_early(). The root cause is:
console_trylock()
\-->down_trylock(&console_sem)
\-->raw_spin_unlock_irqrestore(&sem->lock, flags)
\-->_raw_spin_unlock_irqrestore()(SMP/UP have different versions)
\-->__raw_spin_unlock_irqrestore() (following is the SMP case)
\-->do_raw_spin_unlock()
\-->arch_spin_unlock()
\-->nudge_writes()
\-->mb()
\-->wbflush()
\-->__wbflush()
In previous code __wbflush() is initialized in plat_mem_setup(), but
cgroup_init_early() is called before plat_mem_setup(). Therefore, In
this patch we make changes to avoid boot failure.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/loongson/common/init.c | 5 +
arch/mips/loongson/common/setup.c | 8 +-
arch/mips/loongson/loongson-3/Makefile | 2 +
arch/mips/loongson/loongson-3/smp.c | 278 ++++++++++++++++++++++++++++++++
arch/mips/loongson/loongson-3/smp.h | 24 +++
5 files changed, 312 insertions(+), 5 deletions(-)
create mode 100644 arch/mips/loongson/loongson-3/smp.c
create mode 100644 arch/mips/loongson/loongson-3/smp.h
diff --git a/arch/mips/loongson/common/init.c b/arch/mips/loongson/common/init.c
index 1c29b19..30d20ad 100644
--- a/arch/mips/loongson/common/init.c
+++ b/arch/mips/loongson/common/init.c
@@ -12,6 +12,8 @@
#include <loongson.h>
+extern struct plat_smp_ops loongson3_smp_ops;
+
/* Loongson CPU address windows config space base address */
unsigned long __maybe_unused _loongson_addrwincfg_base;
@@ -33,6 +35,9 @@ void __init prom_init(void)
/*init the uart base address */
prom_init_uart_base();
+#if defined(CONFIG_SMP)
+ register_smp_ops(&loongson3_smp_ops);
+#endif
}
void __init prom_free_prom_memory(void)
diff --git a/arch/mips/loongson/common/setup.c b/arch/mips/loongson/common/setup.c
index 27d826b..464cc5a 100644
--- a/arch/mips/loongson/common/setup.c
+++ b/arch/mips/loongson/common/setup.c
@@ -18,9 +18,6 @@
#include <linux/screen_info.h>
#endif
-void (*__wbflush)(void);
-EXPORT_SYMBOL(__wbflush);
-
static void wbflush_loongson(void)
{
asm(".set\tpush\n\t"
@@ -32,10 +29,11 @@ static void wbflush_loongson(void)
".set mips0\n\t");
}
+void (*__wbflush)(void) = wbflush_loongson;
+EXPORT_SYMBOL(__wbflush);
+
void __init plat_mem_setup(void)
{
- __wbflush = wbflush_loongson;
-
#ifdef CONFIG_VT
#if defined(CONFIG_VGA_CONSOLE)
conswitchp = &vga_con;
diff --git a/arch/mips/loongson/loongson-3/Makefile b/arch/mips/loongson/loongson-3/Makefile
index b9968cd..70152b2 100644
--- a/arch/mips/loongson/loongson-3/Makefile
+++ b/arch/mips/loongson/loongson-3/Makefile
@@ -2,3 +2,5 @@
# Makefile for Loongson-3 family machines
#
obj-y += irq.o
+
+obj-$(CONFIG_SMP) += smp.o
diff --git a/arch/mips/loongson/loongson-3/smp.c b/arch/mips/loongson/loongson-3/smp.c
new file mode 100644
index 0000000..8923117
--- /dev/null
+++ b/arch/mips/loongson/loongson-3/smp.c
@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2010, 2011, 2012, Lemote, Inc.
+ * Author: Chen Huacai, chenhc@lemote.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/cpu.h>
+#include <linux/sched.h>
+#include <linux/smp.h>
+#include <linux/cpufreq.h>
+#include <asm/processor.h>
+#include <asm/time.h>
+#include <asm/clock.h>
+#include <asm/tlbflush.h>
+#include <loongson.h>
+
+#include "smp.h"
+
+/* write a 64bit value to ipi register */
+void loongson3_ipi_write64(uint64_t action, void * addr)
+{
+ *((uint64_t *)addr) = action;
+};
+
+/* read a 64bit value from ipi register */
+uint64_t loongson3_ipi_read64(void * addr)
+{
+ return *((uint64_t *)addr);
+};
+
+/* write a 32bit value to ipi register */
+void loongson3_ipi_write32(uint32_t action, void * addr)
+{
+ *((uint32_t *)addr) = action;
+};
+
+/* read a 32bit value from ipi register */
+uint32_t loongson3_ipi_read32(void * addr)
+{
+ return *((uint32_t *)addr);
+};
+
+static void *ipi_set0_regs[] = {
+ (void *)(smp_core_group0_base + smp_core0_offset + SET0),
+ (void *)(smp_core_group0_base + smp_core1_offset + SET0),
+ (void *)(smp_core_group0_base + smp_core2_offset + SET0),
+ (void *)(smp_core_group0_base + smp_core3_offset + SET0),
+ (void *)(smp_core_group1_base + smp_core0_offset + SET0),
+ (void *)(smp_core_group1_base + smp_core1_offset + SET0),
+ (void *)(smp_core_group1_base + smp_core2_offset + SET0),
+ (void *)(smp_core_group1_base + smp_core3_offset + SET0),
+ (void *)(smp_core_group2_base + smp_core0_offset + SET0),
+ (void *)(smp_core_group2_base + smp_core1_offset + SET0),
+ (void *)(smp_core_group2_base + smp_core2_offset + SET0),
+ (void *)(smp_core_group2_base + smp_core3_offset + SET0),
+ (void *)(smp_core_group3_base + smp_core0_offset + SET0),
+ (void *)(smp_core_group3_base + smp_core1_offset + SET0),
+ (void *)(smp_core_group3_base + smp_core2_offset + SET0),
+ (void *)(smp_core_group3_base + smp_core3_offset + SET0),
+};
+
+static void *ipi_clear0_regs[] = {
+ (void *)(smp_core_group0_base + smp_core0_offset + CLEAR0),
+ (void *)(smp_core_group0_base + smp_core1_offset + CLEAR0),
+ (void *)(smp_core_group0_base + smp_core2_offset + CLEAR0),
+ (void *)(smp_core_group0_base + smp_core3_offset + CLEAR0),
+ (void *)(smp_core_group1_base + smp_core0_offset + CLEAR0),
+ (void *)(smp_core_group1_base + smp_core1_offset + CLEAR0),
+ (void *)(smp_core_group1_base + smp_core2_offset + CLEAR0),
+ (void *)(smp_core_group1_base + smp_core3_offset + CLEAR0),
+ (void *)(smp_core_group2_base + smp_core0_offset + CLEAR0),
+ (void *)(smp_core_group2_base + smp_core1_offset + CLEAR0),
+ (void *)(smp_core_group2_base + smp_core2_offset + CLEAR0),
+ (void *)(smp_core_group2_base + smp_core3_offset + CLEAR0),
+ (void *)(smp_core_group3_base + smp_core0_offset + CLEAR0),
+ (void *)(smp_core_group3_base + smp_core1_offset + CLEAR0),
+ (void *)(smp_core_group3_base + smp_core2_offset + CLEAR0),
+ (void *)(smp_core_group3_base + smp_core3_offset + CLEAR0),
+};
+
+static void *ipi_status_regs0[] = {
+ (void *)(smp_core_group0_base + smp_core0_offset + STATUS0),
+ (void *)(smp_core_group0_base + smp_core1_offset + STATUS0),
+ (void *)(smp_core_group0_base + smp_core2_offset + STATUS0),
+ (void *)(smp_core_group0_base + smp_core3_offset + STATUS0),
+ (void *)(smp_core_group1_base + smp_core0_offset + STATUS0),
+ (void *)(smp_core_group1_base + smp_core1_offset + STATUS0),
+ (void *)(smp_core_group1_base + smp_core2_offset + STATUS0),
+ (void *)(smp_core_group1_base + smp_core3_offset + STATUS0),
+ (void *)(smp_core_group2_base + smp_core0_offset + STATUS0),
+ (void *)(smp_core_group2_base + smp_core1_offset + STATUS0),
+ (void *)(smp_core_group2_base + smp_core2_offset + STATUS0),
+ (void *)(smp_core_group2_base + smp_core3_offset + STATUS0),
+ (void *)(smp_core_group3_base + smp_core0_offset + STATUS0),
+ (void *)(smp_core_group3_base + smp_core1_offset + STATUS0),
+ (void *)(smp_core_group3_base + smp_core2_offset + STATUS0),
+ (void *)(smp_core_group3_base + smp_core3_offset + STATUS0),
+};
+
+static void *ipi_en0_regs[] = {
+ (void *)(smp_core_group0_base + smp_core0_offset + EN0),
+ (void *)(smp_core_group0_base + smp_core1_offset + EN0),
+ (void *)(smp_core_group0_base + smp_core2_offset + EN0),
+ (void *)(smp_core_group0_base + smp_core3_offset + EN0),
+ (void *)(smp_core_group1_base + smp_core0_offset + EN0),
+ (void *)(smp_core_group1_base + smp_core1_offset + EN0),
+ (void *)(smp_core_group1_base + smp_core2_offset + EN0),
+ (void *)(smp_core_group1_base + smp_core3_offset + EN0),
+ (void *)(smp_core_group2_base + smp_core0_offset + EN0),
+ (void *)(smp_core_group2_base + smp_core1_offset + EN0),
+ (void *)(smp_core_group2_base + smp_core2_offset + EN0),
+ (void *)(smp_core_group2_base + smp_core3_offset + EN0),
+ (void *)(smp_core_group3_base + smp_core0_offset + EN0),
+ (void *)(smp_core_group3_base + smp_core1_offset + EN0),
+ (void *)(smp_core_group3_base + smp_core2_offset + EN0),
+ (void *)(smp_core_group3_base + smp_core3_offset + EN0),
+};
+
+static volatile void *ipi_mailbox_buf[] = {
+ (void *)(smp_core_group0_base + smp_core0_offset + BUF),
+ (void *)(smp_core_group0_base + smp_core1_offset + BUF),
+ (void *)(smp_core_group0_base + smp_core2_offset + BUF),
+ (void *)(smp_core_group0_base + smp_core3_offset + BUF),
+ (void *)(smp_core_group1_base + smp_core0_offset + BUF),
+ (void *)(smp_core_group1_base + smp_core1_offset + BUF),
+ (void *)(smp_core_group1_base + smp_core2_offset + BUF),
+ (void *)(smp_core_group1_base + smp_core3_offset + BUF),
+ (void *)(smp_core_group2_base + smp_core0_offset + BUF),
+ (void *)(smp_core_group2_base + smp_core1_offset + BUF),
+ (void *)(smp_core_group2_base + smp_core2_offset + BUF),
+ (void *)(smp_core_group2_base + smp_core3_offset + BUF),
+ (void *)(smp_core_group3_base + smp_core0_offset + BUF),
+ (void *)(smp_core_group3_base + smp_core1_offset + BUF),
+ (void *)(smp_core_group3_base + smp_core2_offset + BUF),
+ (void *)(smp_core_group3_base + smp_core3_offset + BUF),
+};
+
+/*
+ * Simple enough, just poke the appropriate ipi register
+ */
+static void loongson3_send_ipi_single(int cpu, unsigned int action)
+{
+ loongson3_ipi_write32((u32)action, ipi_set0_regs[cpu]);
+}
+
+static void loongson3_send_ipi_mask(const struct cpumask *mask, unsigned int action)
+{
+ unsigned int i;
+
+ for_each_cpu(i, mask)
+ loongson3_send_ipi_single(i, action);
+}
+
+void loongson3_ipi_interrupt(struct pt_regs *regs)
+{
+ int cpu = smp_processor_id();
+ unsigned int action;
+
+ /* Load the ipi register to figure out what we're supposed to do */
+ action = loongson3_ipi_read32(ipi_status_regs0[cpu]);
+
+ /* Clear the ipi register to clear the interrupt */
+ loongson3_ipi_write32((u32)action, ipi_clear0_regs[cpu]);
+
+ if (action & SMP_RESCHEDULE_YOURSELF) {
+ scheduler_ipi();
+ }
+
+ if (action & SMP_CALL_FUNCTION) {
+ smp_call_function_interrupt();
+ }
+}
+
+/*
+ * SMP init and finish on secondary CPUs
+ */
+void __cpuinit loongson3_init_secondary(void)
+{
+ int i;
+ unsigned int imask = STATUSF_IP7 | STATUSF_IP6 | STATUSF_IP5 |
+ STATUSF_IP4 | STATUSF_IP3 | STATUSF_IP2;
+
+ /* Set interrupt mask, but don't enable */
+ change_c0_status(ST0_IM, imask);
+
+ for (i = 0; i < NR_CPUS; i++) {
+ loongson3_ipi_write32(0xffffffff, ipi_en0_regs[i]);
+ }
+}
+
+void __cpuinit loongson3_smp_finish(void)
+{
+ write_c0_compare(read_c0_count() + mips_hpt_frequency/HZ);
+ local_irq_enable();
+ loongson3_ipi_write64(0, (void *)(ipi_mailbox_buf[smp_processor_id()]+0x0));
+ printk(KERN_INFO "CPU#%d finished, CP0_ST=%x\n",
+ smp_processor_id(), read_c0_status());
+}
+
+void __init loongson3_smp_setup(void)
+{
+ int i, num;
+
+ init_cpu_possible(cpu_none_mask);
+ set_cpu_possible(0, true);
+
+ __cpu_number_map[0] = 0;
+ __cpu_logical_map[0] = 0;
+
+ /* For unified kernel, NR_CPUS is the maximum possible value,
+ * nr_cpus_loongson is the really present value */
+ for (i = 1, num = 0; i < nr_cpus_loongson; i++) {
+ set_cpu_possible(i, true);
+ __cpu_number_map[i] = ++num;
+ __cpu_logical_map[num] = i;
+ }
+ printk(KERN_INFO "Detected %i available secondary CPU(s)\n", num);
+}
+
+void __init loongson3_prepare_cpus(unsigned int max_cpus)
+{
+}
+
+/*
+ * Setup the PC, SP, and GP of a secondary processor and start it runing!
+ */
+void __cpuinit loongson3_boot_secondary(int cpu, struct task_struct *idle)
+{
+ volatile unsigned long startargs[4];
+
+ printk(KERN_INFO "Booting CPU#%d...\n", cpu);
+
+ /* startargs[] are initial PC, SP and GP for secondary CPU */
+ startargs[0] = (unsigned long)&smp_bootstrap;
+ startargs[1] = (unsigned long)__KSTK_TOS(idle);
+ startargs[2] = (unsigned long)task_thread_info(idle);
+ startargs[3] = 0;
+
+ printk(KERN_DEBUG "CPU#%d, func_pc=%lx, sp=%lx, gp=%lx\n",
+ cpu, startargs[0], startargs[1], startargs[2]);
+
+ loongson3_ipi_write64(startargs[3], (void *)(ipi_mailbox_buf[cpu]+0x18));
+ loongson3_ipi_write64(startargs[2], (void *)(ipi_mailbox_buf[cpu]+0x10));
+ loongson3_ipi_write64(startargs[1], (void *)(ipi_mailbox_buf[cpu]+0x8));
+ loongson3_ipi_write64(startargs[0], (void *)(ipi_mailbox_buf[cpu]+0x0));
+}
+
+/*
+ * Final cleanup after all secondaries booted
+ */
+void __init loongson3_cpus_done(void)
+{
+}
+
+struct plat_smp_ops loongson3_smp_ops = {
+ .send_ipi_single = loongson3_send_ipi_single,
+ .send_ipi_mask = loongson3_send_ipi_mask,
+ .init_secondary = loongson3_init_secondary,
+ .smp_finish = loongson3_smp_finish,
+ .cpus_done = loongson3_cpus_done,
+ .boot_secondary = loongson3_boot_secondary,
+ .smp_setup = loongson3_smp_setup,
+ .prepare_cpus = loongson3_prepare_cpus,
+};
diff --git a/arch/mips/loongson/loongson-3/smp.h b/arch/mips/loongson/loongson-3/smp.h
new file mode 100644
index 0000000..dc9ce69
--- /dev/null
+++ b/arch/mips/loongson/loongson-3/smp.h
@@ -0,0 +1,24 @@
+/* for Loongson-3A smp support */
+
+/* 4 groups(nodes) in maximum in numa case */
+#define smp_core_group0_base 0x900000003ff01000
+#define smp_core_group1_base 0x900010003ff01000
+#define smp_core_group2_base 0x900020003ff01000
+#define smp_core_group3_base 0x900030003ff01000
+
+/* 4 cores in each group(node) */
+#define smp_core0_offset 0x000
+#define smp_core1_offset 0x100
+#define smp_core2_offset 0x200
+#define smp_core3_offset 0x300
+
+/* ipi registers offsets */
+#define STATUS0 0x00
+#define EN0 0x04
+#define SET0 0x08
+#define CLEAR0 0x0c
+#define STATUS1 0x10
+#define MASK1 0x14
+#define SET1 0x18
+#define CLEAR1 0x1c
+#define BUF 0x20
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 16/18] MIPS: Loongson 3: Add CPU hotplug support.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (14 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 15/18] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 17/18] MIPS: Fix poweroff failure when HOTPLUG_CPU configured Huacai Chen
2012-08-11 9:32 ` [PATCH V5 18/18] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Tips of Loongson's CPU hotplug:
1, To fully shutdown a core in Loongson 3, the target core should go to
CKSEG1 and flush all L2 cache entries at first. Then, another core
(usually Core 0) can safely disable the clock of the target core. So
play_dead() call loongson3_play_dead() via CKSEG1 (both uncached and
unmmaped).
2, The default clocksource of Loongson is MIPS. Since clock source is a
global device, timekeeping need the CP0' Count registers of each core
be synchronous. Thus, when a core is up, we use a SMP_ASK_C0COUNT IPI
to ask Core-0's Count.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/Kconfig | 1 +
arch/mips/include/asm/mach-loongson/loongson.h | 6 +-
arch/mips/include/asm/smp.h | 1 +
arch/mips/loongson/loongson-3/irq.c | 10 ++
arch/mips/loongson/loongson-3/smp.c | 177 +++++++++++++++++++++++-
5 files changed, 189 insertions(+), 6 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9e8e86c..6c18566 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -261,6 +261,7 @@ config LASAT
config MACH_LOONGSON
bool "Loongson family of machines"
select SYS_SUPPORTS_ZBOOT
+ select SYS_SUPPORTS_HOTPLUG_CPU
help
This enables the support of Loongson family of machines.
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index f573e47..573eed8 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -247,6 +247,9 @@ static inline void do_perfcnt_IRQ(void)
#define LOONGSON_PXARB_CFG LOONGSON_REG(LOONGSON_REGBASE + 0x68)
#define LOONGSON_PXARB_STATUS LOONGSON_REG(LOONGSON_REGBASE + 0x6c)
+/* Chip Config */
+#define LOONGSON_CHIPCFG0 LOONGSON_REG(LOONGSON_REGBASE + 0x80)
+
/* pcimap */
#define LOONGSON_PCIMAP_PCIMAP_LO0 0x0000003f
@@ -262,9 +265,6 @@ static inline void do_perfcnt_IRQ(void)
#ifdef CONFIG_CPU_SUPPORTS_CPUFREQ
#include <linux/cpufreq.h>
extern struct cpufreq_frequency_table loongson2_clockmod_table[];
-
-/* Chip Config */
-#define LOONGSON_CHIPCFG0 LOONGSON_REG(LOONGSON_REGBASE + 0x80)
#endif
/*
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index d4fb4d8..a6edbbf 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -40,6 +40,7 @@ extern int __cpu_logical_map[NR_CPUS];
#define SMP_CALL_FUNCTION 0x2
/* Octeon - Tell another core to flush its icache */
#define SMP_ICACHE_FLUSH 0x4
+#define SMP_ASK_C0COUNT 0x8
extern volatile cpumask_t cpu_callin_map;
diff --git a/arch/mips/loongson/loongson-3/irq.c b/arch/mips/loongson/loongson-3/irq.c
index 27aef31..83f84e6 100644
--- a/arch/mips/loongson/loongson-3/irq.c
+++ b/arch/mips/loongson/loongson-3/irq.c
@@ -85,3 +85,13 @@ void __init mach_init_irq(void)
set_c0_status(STATUSF_IP2 | STATUSF_IP6);
}
+
+#ifdef CONFIG_HOTPLUG_CPU
+
+void fixup_irqs(void)
+{
+ irq_cpu_offline();
+ clear_c0_status(ST0_IM);
+}
+
+#endif
diff --git a/arch/mips/loongson/loongson-3/smp.c b/arch/mips/loongson/loongson-3/smp.c
index 8923117..c2a5158 100644
--- a/arch/mips/loongson/loongson-3/smp.c
+++ b/arch/mips/loongson/loongson-3/smp.c
@@ -30,6 +30,9 @@
#include "smp.h"
+DEFINE_PER_CPU(int, cpu_state);
+DEFINE_PER_CPU(uint32_t, core0_c0count);
+
/* write a 64bit value to ipi register */
void loongson3_ipi_write64(uint64_t action, void * addr)
{
@@ -167,8 +170,8 @@ static void loongson3_send_ipi_mask(const struct cpumask *mask, unsigned int act
void loongson3_ipi_interrupt(struct pt_regs *regs)
{
- int cpu = smp_processor_id();
- unsigned int action;
+ int i, cpu = smp_processor_id();
+ unsigned int action, c0count;
/* Load the ipi register to figure out what we're supposed to do */
action = loongson3_ipi_read32(ipi_status_regs0[cpu]);
@@ -183,14 +186,24 @@ void loongson3_ipi_interrupt(struct pt_regs *regs)
if (action & SMP_CALL_FUNCTION) {
smp_call_function_interrupt();
}
+
+ if (action & SMP_ASK_C0COUNT) {
+ BUG_ON(cpu != 0);
+ c0count = read_c0_count();
+ for (i=1; i<NR_CPUS; i++)
+ per_cpu(core0_c0count, i) = c0count;
+ }
}
+#define MAX_LOOPS 1250
/*
* SMP init and finish on secondary CPUs
*/
void __cpuinit loongson3_init_secondary(void)
{
int i;
+ uint32_t initcount;
+ unsigned int cpu = smp_processor_id();
unsigned int imask = STATUSF_IP7 | STATUSF_IP6 | STATUSF_IP5 |
STATUSF_IP4 | STATUSF_IP3 | STATUSF_IP2;
@@ -200,11 +213,24 @@ void __cpuinit loongson3_init_secondary(void)
for (i = 0; i < NR_CPUS; i++) {
loongson3_ipi_write32(0xffffffff, ipi_en0_regs[i]);
}
+
+ per_cpu(cpu_state, cpu) = CPU_ONLINE;
+
+ i = 0;
+ __get_cpu_var(core0_c0count) = 0;
+ loongson3_send_ipi_single(0, SMP_ASK_C0COUNT);
+ while (!__get_cpu_var(core0_c0count))
+ i++;
+
+ if (i > MAX_LOOPS)
+ i = MAX_LOOPS;
+ initcount = __get_cpu_var(core0_c0count) + i;
+ write_c0_count(initcount);
+ write_c0_compare(initcount + mips_hpt_frequency/HZ);
}
void __cpuinit loongson3_smp_finish(void)
{
- write_c0_compare(read_c0_count() + mips_hpt_frequency/HZ);
local_irq_enable();
loongson3_ipi_write64(0, (void *)(ipi_mailbox_buf[smp_processor_id()]+0x0));
printk(KERN_INFO "CPU#%d finished, CP0_ST=%x\n",
@@ -233,6 +259,8 @@ void __init loongson3_smp_setup(void)
void __init loongson3_prepare_cpus(unsigned int max_cpus)
{
+ init_cpu_present(cpu_possible_mask);
+ per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
}
/*
@@ -266,6 +294,145 @@ void __init loongson3_cpus_done(void)
{
}
+#ifdef CONFIG_HOTPLUG_CPU
+
+extern void fixup_irqs(void);
+
+static int loongson3_cpu_disable(void)
+{
+ extern void (*flush_cache_all)(void);
+ unsigned int cpu = smp_processor_id();
+
+ if (cpu == 0)
+ return -EBUSY;
+
+ set_cpu_online(cpu, false);
+ cpu_clear(cpu, cpu_callin_map);
+ local_irq_disable();
+ fixup_irqs();
+ local_irq_enable();
+ flush_cache_all();
+ local_flush_tlb_all();
+
+ return 0;
+}
+
+
+static void loongson3_cpu_die(unsigned int cpu)
+{
+ while (per_cpu(cpu_state, cpu) != CPU_DEAD)
+ cpu_relax();
+
+ mb();
+}
+
+/* To shutdown a core in Loongson 3, the target core should go to CKSEG1 and
+ * flush all L2 entries at first. Then, another core (usually Core 0) can
+ * safely disable the clock of the target core. loongson3_play_dead() is
+ * called via CKSEG1 (uncached and unmmaped) */
+void loongson3_play_dead(int *state_addr)
+{
+ __asm__ __volatile__(
+ " .set push \n"
+ " .set noreorder \n"
+ " li $t0, 0x80000000 \n" /* KSEG0 */
+ " li $t1, 512 \n" /* num of L2 entries */
+ "flush_loop: \n" /* flush L2 */
+ " cache 0, 0($t0) \n" /* ICache */
+ " cache 0, 1($t0) \n"
+ " cache 0, 2($t0) \n"
+ " cache 0, 3($t0) \n"
+ " cache 1, 0($t0) \n" /* DCache */
+ " cache 1, 1($t0) \n"
+ " cache 1, 2($t0) \n"
+ " cache 1, 3($t0) \n"
+ " addiu $t0, $t0, 0x20 \n"
+ " bnez $t1, flush_loop \n"
+ " addiu $t1, $t1, -1 \n"
+ " li $t0, 0x7 \n" /* *state_addr = CPU_DEAD; */
+ " sw $t0, 0($a0) \n"
+ " sync \n"
+ " cache 21, 0($a0) \n" /* flush entry of *state_addr */
+ " .set pop \n");
+
+ __asm__ __volatile__(
+ " .set push \n"
+ " .set noreorder \n"
+ " .set mips64 \n"
+ " mfc0 $t2, $15, 1 \n"
+ " andi $t2, 0x3ff \n"
+ " .set mips3 \n"
+ " dli $t0, 0x900000003ff01000 \n"
+ " andi $t3, $t2, 0x3 \n"
+ " sll $t3, 8 \n" /* get cpu id */
+ " or $t0, $t0, $t3 \n"
+ " andi $t1, $t2, 0xc \n"
+ " dsll $t1, 42 \n" /* get node id */
+ " or $t0, $t0, $t1 \n"
+ "wait_for_init: \n"
+ " li $a0, 0x100 \n"
+ "idle_loop: \n"
+ " bnez $a0, idle_loop \n"
+ " addiu $a0, -1 \n"
+ " lw $v0, 0x20($t0) \n" /* get PC via mailbox */
+ " nop \n"
+ " beqz $v0, wait_for_init \n"
+ " nop \n"
+ " ld $sp, 0x28($t0) \n" /* get SP via mailbox */
+ " nop \n"
+ " ld $gp, 0x30($t0) \n" /* get GP via mailbox */
+ " nop \n"
+ " ld $a1, 0x38($t0) \n"
+ " nop \n"
+ " jr $v0 \n" /* jump to initial PC */
+ " nop \n"
+ " .set pop \n");
+}
+
+void play_dead(void)
+{
+ int *state_addr;
+ unsigned int cpu = smp_processor_id();
+ void (*play_dead_at_ckseg1)(int *);
+
+ idle_task_exit();
+ play_dead_at_ckseg1 = (void *)CKSEG1ADDR((unsigned long)loongson3_play_dead);
+ state_addr = &per_cpu(cpu_state, cpu);
+ mb();
+ play_dead_at_ckseg1(state_addr);
+}
+
+#define CPU_POST_DEAD_FROZEN (CPU_POST_DEAD | CPU_TASKS_FROZEN)
+static int __cpuinit loongson3_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
+{
+ unsigned int cpu = (unsigned long)hcpu;
+
+ switch (action) {
+ case CPU_POST_DEAD:
+ case CPU_POST_DEAD_FROZEN:
+ printk(KERN_INFO "Disable clock for CPU#%d\n", cpu);
+ LOONGSON_CHIPCFG0 &= ~(1 << (12 + cpu));
+ break;
+ case CPU_UP_PREPARE:
+ case CPU_UP_PREPARE_FROZEN:
+ printk(KERN_INFO "Enable clock for CPU#%d\n", cpu);
+ LOONGSON_CHIPCFG0 |= 1 << (12 + cpu);
+ break;
+ }
+
+ return NOTIFY_OK;
+}
+
+static int __cpuinit register_loongson3_notifier(void)
+{
+ hotcpu_notifier(loongson3_cpu_callback, 0);
+ return 0;
+}
+early_initcall(register_loongson3_notifier);
+
+#endif
+
struct plat_smp_ops loongson3_smp_ops = {
.send_ipi_single = loongson3_send_ipi_single,
.send_ipi_mask = loongson3_send_ipi_mask,
@@ -275,4 +442,8 @@ struct plat_smp_ops loongson3_smp_ops = {
.boot_secondary = loongson3_boot_secondary,
.smp_setup = loongson3_smp_setup,
.prepare_cpus = loongson3_prepare_cpus,
+#ifdef CONFIG_HOTPLUG_CPU
+ .cpu_disable = loongson3_cpu_disable,
+ .cpu_die = loongson3_cpu_die,
+#endif
};
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 17/18] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (15 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 16/18] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 18/18] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan, stable
When poweroff machine, kernel_power_off() call disable_nonboot_cpus().
And if we have HOTPLUG_CPU configured, disable_nonboot_cpus() is not an
empty function but attempt to actually disable the nonboot cpus. Since
system state is SYSTEM_POWER_OFF, play_dead() won't be called and thus
disable_nonboot_cpus() hangs. Therefore, we make this patch to avoid
poweroff failure.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: stable@vger.kernel.org
---
arch/mips/kernel/process.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index e9a5fd7..69b17a9 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -72,9 +72,7 @@ void __noreturn cpu_idle(void)
}
}
#ifdef CONFIG_HOTPLUG_CPU
- if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map) &&
- (system_state == SYSTEM_RUNNING ||
- system_state == SYSTEM_BOOTING))
+ if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map))
play_dead();
#endif
rcu_idle_exit();
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH V5 18/18] MIPS: Loongson: Add a Loongson-3 default config file.
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
` (16 preceding siblings ...)
2012-08-11 9:32 ` [PATCH V5 17/18] MIPS: Fix poweroff failure when HOTPLUG_CPU configured Huacai Chen
@ 2012-08-11 9:32 ` Huacai Chen
17 siblings, 0 replies; 32+ messages in thread
From: Huacai Chen @ 2012-08-11 9:32 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, linux-kernel, Fuxin Zhang, Zhangjin Wu, Huacai Chen,
Hongliang Tao, Hua Yan
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
arch/mips/configs/loongson3_defconfig | 283 +++++++++++++++++++++++++++++++++
1 files changed, 283 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/configs/loongson3_defconfig
diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig
new file mode 100644
index 0000000..4a0722f
--- /dev/null
+++ b/arch/mips/configs/loongson3_defconfig
@@ -0,0 +1,283 @@
+CONFIG_MACH_LOONGSON=y
+CONFIG_LEMOTE_MACH3A=y
+CONFIG_LOONGSON_BIGMEM=y
+CONFIG_CPU_LOONGSON3=y
+CONFIG_64BIT=y
+CONFIG_PAGE_SIZE_16KB=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_KSM=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+CONFIG_HZ_256=y
+CONFIG_PREEMPT=y
+CONFIG_KEXEC=y
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CPUSETS=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_BLK_CGROUP=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_EMBEDDED=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_PCI=y
+CONFIG_HT_PCI=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_MIPS32_COMPAT=y
+CONFIG_MIPS32_O32=y
+CONFIG_MIPS32_N32=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_CFG80211=y
+CONFIG_LIB80211=y
+CONFIG_MAC80211=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_TGT=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_ZERO=y
+CONFIG_NETDEVICES=y
+CONFIG_R8169=y
+CONFIG_ATH_COMMON=y
+CONFIG_ATH9K=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_RAW=m
+CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_N_HDLC=m
+CONFIG_STALDRV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_R3964=m
+CONFIG_RAW_DRIVER=m
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_PIIX4=y
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_DRM=y
+CONFIG_DRM_RADEON=y
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB_RADEON=y
+CONFIG_FB_ATY128=y
+CONFIG_FB_ATY=y
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_DUMMY=y
+CONFIG_SND_ALOOP=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_HID_A4TECH=m
+CONFIG_USB=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_STORAGE=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_DMADEVICES=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_QUOTA=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=936
+CONFIG_FAT_DEFAULT_IOCHARSET="gb2312"
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_CIFS=m
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_936=y
+CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_DEBUG_SECTION_MISMATCH=y
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRC_T10DIF=m
+CONFIG_LIBCRC32C=m
--
1.7.7.3
^ permalink raw reply related [flat|nested] 32+ messages in thread