[PATCH] added Loongson cpu-feature-overrides.h

[PATCH] added Loongson cpu-feature-overrides.h

[Zhang Le]

added Loongson cpu-feature-overrides.h

I have taken Wu Zhangjin's and Philippe Vachon's version as references, did a
little modification and tested on 16K page size kernel. It works well.

Unfornately although it already has defined cpu_has_dc_aliases as 1, 4k page
size still not working. More work needed here.

Signed-off-by: Zhang Le <r0bertz@gentoo.org>
---
 .../asm/mach-lemote/cpu-feature-overrides.h        |   59 ++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 deletions(-)
 create mode 100644 arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h

diff --git a/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
new file mode 100644
index 0000000..550a10d
--- /dev/null
+++ b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
@@ -0,0 +1,59 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2009 Wu Zhangjin <wuzj@lemote.com>
+ * Copyright (C) 2009 Philippe Vachon <philippe@cowpig.ca>
+ * Copyright (C) 2009 Zhang Le <r0bertz@gentoo.org>
+ *
+ * reference: /proc/cpuinfo,
+ * 	arch/mips/kernel/cpu-probe.c(cpu_probe_legacy),
+ * 	arch/mips/kernel/proc.c(show_cpuinfo),
+ *      loongson2f user manual.
+ */
+
+#ifndef __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_dcache_line_size()	32
+#define cpu_icache_line_size()	32
+#define cpu_scache_line_size()	32
+
+
+#define cpu_has_32fpr		1
+#define cpu_has_3k_cache	0
+#define cpu_has_4k_cache	1
+#define cpu_has_4kex		1
+#define cpu_has_64bits		1
+#define cpu_has_cache_cdex_p	0
+#define cpu_has_cache_cdex_s	0
+#define cpu_has_counter		1
+#define cpu_has_dc_aliases	1
+#define cpu_has_divec		0
+#define cpu_has_dsp		0
+#define cpu_has_ejtag		0
+#define cpu_has_fpu		1
+#define cpu_has_ic_fills_f_dc	0
+#define cpu_has_inclusive_pcaches	1
+#define cpu_has_llsc 		1
+#define cpu_has_mcheck		0
+#define cpu_has_mdmx		0
+#define cpu_has_mips16		0
+#define cpu_has_mips32r1	0
+#define cpu_has_mips32r2	0
+#define cpu_has_mips3d		0
+#define cpu_has_mips64r1	0
+#define cpu_has_mips64r2	0
+#define cpu_has_mipsmt		0
+#define cpu_has_prefetch	0
+#define cpu_has_smartmips	0
+#define cpu_has_tlb		1
+#define cpu_has_tx39_cache	0
+#define cpu_has_userlocal	0
+#define cpu_has_vce		0
+#define cpu_has_vtag_icache	0
+#define cpu_has_watch		1
+#define cpu_icache_snoops_remote_store	1
+
+#endif /* __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H */
-- 
1.6.2

Re: [PATCH] added Loongson cpu-feature-overrides.h

[Zhang Le]

On 15:41 Thu 02 Apr     , Zhang Le wrote:
> diff --git a/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
> new file mode 100644
> index 0000000..550a10d
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h

[snip]

> +#define cpu_icache_snoops_remote_store	1

This maybe should not exist here, since this only matters on SMP.
It exists in Wu's version. Maybe Wu could explain it. Maybe it is just a typo.

Pulling him in.

Zhang Le

> +
> +#endif /* __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H */
> -- 
> 1.6.2
> 

Re: [PATCH] added Loongson cpu-feature-overrides.h

[Ralf Baechle]

On Thu, Apr 02, 2009 at 06:56:13PM +0800, Zhang Le wrote:

> On 15:41 Thu 02 Apr     , Zhang Le wrote:
> > diff --git a/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
> > new file mode 100644
> > index 0000000..550a10d
> > --- /dev/null
> > +++ b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
> 
> [snip]
> 
> > +#define cpu_icache_snoops_remote_store	1
> 
> This maybe should not exist here, since this only matters on SMP.
> It exists in Wu's version. Maybe Wu could explain it. Maybe it is just a typo.
> 
> Pulling him in.

This simply doesn't matter on a uniprocessor system.

  Ralf

Re: [PATCH] added Loongson cpu-feature-overrides.h

[Ralf Baechle]

On Thu, Apr 02, 2009 at 03:41:45PM +0800, Zhang Le wrote:

> I have taken Wu Zhangjin's and Philippe Vachon's version as references, did a
> little modification and tested on 16K page size kernel. It works well.
> 
> Unfornately although it already has defined cpu_has_dc_aliases as 1, 4k page
> size still not working. More work needed here.

Adding this file is only a matter of kernel optimization.  You may have
saved as much as several hundred kb!  But it won't get a kernel
that wasn't working before to work.  If anything the opposite ...

  Ralf

Re: [PATCH] added Loongson cpu-feature-overrides.h

[Ralf Baechle]

On Thu, Apr 02, 2009 at 01:16:07PM +0200, Ralf Baechle wrote:

> > I have taken Wu Zhangjin's and Philippe Vachon's version as references, did a
> > little modification and tested on 16K page size kernel. It works well.
> > 
> > Unfornately although it already has defined cpu_has_dc_aliases as 1, 4k page
> > size still not working. More work needed here.
> 
> Adding this file is only a matter of kernel optimization.  You may have
> saved as much as several hundred kb!  But it won't get a kernel
> that wasn't working before to work.  If anything the opposite ...

Forgot to say that I applied your patch.

Thanks!

  Ralf

Re: [PATCH] added Loongson cpu-feature-overrides.h

[Zhang Le]

On 13:16 Thu 02 Apr     , Ralf Baechle wrote:
> On Thu, Apr 02, 2009 at 03:41:45PM +0800, Zhang Le wrote:
> 
> > I have taken Wu Zhangjin's and Philippe Vachon's version as references, did a
> > little modification and tested on 16K page size kernel. It works well.
> > 
> > Unfornately although it already has defined cpu_has_dc_aliases as 1, 4k page
> > size still not working. More work needed here.
> 
> Adding this file is only a matter of kernel optimization.  You may have
> saved as much as several hundred kb!  But it won't get a kernel
> that wasn't working before to work.  If anything the opposite ...

I see. Thanks.
BTW, I have just made another little change:

#define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)

Since waysize is 16k.

Anyway, it is good to include this file now, or postpone it a little later?
If yes, then I will send a new version soon.

Zhang, Le

Re: [PATCH] added Loongson cpu-feature-overrides.h

[Ralf Baechle]

On Thu, Apr 02, 2009 at 07:27:39PM +0800, Zhang Le wrote:

> > > I have taken Wu Zhangjin's and Philippe Vachon's version as references, did a
> > > little modification and tested on 16K page size kernel. It works well.
> > > 
> > > Unfornately although it already has defined cpu_has_dc_aliases as 1, 4k page
> > > size still not working. More work needed here.
> > 
> > Adding this file is only a matter of kernel optimization.  You may have
> > saved as much as several hundred kb!  But it won't get a kernel
> > that wasn't working before to work.  If anything the opposite ...
> 
> I see. Thanks.
> BTW, I have just made another little change:
> 
> #define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)
> 
> Since waysize is 16k.
> 
> Anyway, it is good to include this file now, or postpone it a little later?
> If yes, then I will send a new version soon.

Correct - but this alone doesn't get all 4k or 64k pages to work so how
about we deal with this one later?

  Ralf

Re: [PATCH] added Loongson cpu-feature-overrides.h

[Zhang Le]

On 13:47 Thu 02 Apr     , Ralf Baechle wrote:
> On Thu, Apr 02, 2009 at 07:27:39PM +0800, Zhang Le wrote:
> 
> > > > I have taken Wu Zhangjin's and Philippe Vachon's version as references, did a
> > > > little modification and tested on 16K page size kernel. It works well.
> > > > 
> > > > Unfornately although it already has defined cpu_has_dc_aliases as 1, 4k page
> > > > size still not working. More work needed here.
> > > 
> > > Adding this file is only a matter of kernel optimization.  You may have
> > > saved as much as several hundred kb!  But it won't get a kernel
> > > that wasn't working before to work.  If anything the opposite ...
> > 
> > I see. Thanks.
> > BTW, I have just made another little change:
> > 
> > #define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)
> > 
> > Since waysize is 16k.
> > 
> > Anyway, it is good to include this file now, or postpone it a little later?
> > If yes, then I will send a new version soon.
> 
> Correct - but this alone doesn't get all 4k or 64k pages to work so how
> about we deal with this one later?

OK, then, ;)

Zhang, Le

Re: [PATCH] added Loongson cpu-feature-overrides.h

[吴章金]

> On Thu, Apr 02, 2009 at 06:56:13PM +0800, Zhang Le wrote:
>
>> On 15:41 Thu 02 Apr     , Zhang Le wrote:
>> > diff --git a/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
>> b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
>> > new file mode 100644
>> > index 0000000..550a10d
>> > --- /dev/null
>> > +++ b/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h
>>
>> [snip]
>>
>> > +#define cpu_icache_snoops_remote_store	1
>>
>> This maybe should not exist here, since this only matters on SMP.
>> It exists in Wu's version. Maybe Wu could explain it. Maybe it is just a
>> typo.

ooh, sorry, when i firstly edit this file, I really only need cpu_has_llsc
there, so the other options are copied from another mips board and only
be checked via the "loongson2f user manual" and "cat /proc/cpuinfo" with a
modified cpu_showinfo function.

>>
>> Pulling him in.
>
> This simply doesn't matter on a uniprocessor system.
>
>   Ralf
>