From: Paul Cercueil <paul@crapouillou.net>
To: Zhou Yanjie <zhouyanjie@zoho.com>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
ralf@linux-mips.org, paul.burton@mips.com, jhogan@kernel.org,
malat@debian.org, chenhc@lemote.com, tglx@linutronix.de,
allison@lohutok.net, syq@debian.org, jiaxun.yang@flygoat.com
Subject: Re: [PATCH] MIPS: Ingenic: Fix bugs when detecting X1000's parameters.
Date: Tue, 30 Jul 2019 14:02:47 -0400 [thread overview]
Message-ID: <1564509767.15799.0@crapouillou.net> (raw)
In-Reply-To: <1564498510-3751-2-git-send-email-zhouyanjie@zoho.com>
Hi Zhou,
Le mar. 30 juil. 2019 à 10:55, Zhou Yanjie <zhouyanjie@zoho.com> a
écrit :
> 1.fix bugs when detecting L2 cache sets value.
> 2.fix bugs when detecting L2 cache ways value.
> 3.fix bugs when calculate bogoMips and loops_per_jiffy.
>
> Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
> ---
> arch/mips/kernel/cpu-probe.c | 7 ++++++-
> arch/mips/mm/sc-mips.c | 18 +++++++++++++++---
> 2 files changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/arch/mips/kernel/cpu-probe.c
> b/arch/mips/kernel/cpu-probe.c
> index eb527a1..a914435 100644
> --- a/arch/mips/kernel/cpu-probe.c
> +++ b/arch/mips/kernel/cpu-probe.c
> @@ -1960,11 +1960,16 @@ static inline void cpu_probe_ingenic(struct
> cpuinfo_mips *c, unsigned int cpu)
> c->options &= ~MIPS_CPU_COUNTER;
> BUG_ON(!__builtin_constant_p(cpu_has_counter) || cpu_has_counter);
> switch (c->processor_id & PRID_IMP_MASK) {
> - case PRID_IMP_XBURST:
> + case PRID_IMP_XBURST: {
> + unsigned int config7;
> c->cputype = CPU_XBURST;
> c->writecombine = _CACHE_UNCACHED_ACCELERATED;
> __cpu_name[cpu] = "Ingenic XBurst";
> + config7 = read_c0_config7();
> + config7 |= (1 << 4);
> + write_c0_config7(config7);
If you add __BUILD_SET_C0(config7) in arch/mips/include/asm/mipsregs.h
(search for this macro) then you can call directly
set_c0_config7(BIT(4)).
It's preferred to use the BIT(x) macro instead of the (1 << x)
construct.
Finally, what does that bit do? I can't find it any documentation about
it. Please add a comment describing what it does.
> break;
> + }
> default:
> panic("Unknown Ingenic Processor ID!");
> break;
> diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
> index 9385ddb..ed953d4 100644
> --- a/arch/mips/mm/sc-mips.c
> +++ b/arch/mips/mm/sc-mips.c
> @@ -215,6 +215,14 @@ static inline int __init mips_sc_probe(void)
> else
> return 0;
>
> + /*
> + * According to config2 it would be 512-sets, but that is
> contradicted
> + * by all documentation.
> + */
> + if (current_cpu_type() == CPU_XBURST &&
> + mips_machtype == MACH_INGENIC_X1000)
> + c->scache.sets = 256;
> +
> tmp = (config2 >> 0) & 0x0f;
> if (tmp <= 7)
> c->scache.ways = tmp + 1;
> @@ -225,9 +233,13 @@ static inline int __init mips_sc_probe(void)
> * According to config2 it would be 5-ways, but that is contradicted
> * by all documentation.
> */
> - if (current_cpu_type() == CPU_XBURST &&
> - mips_machtype == MACH_INGENIC_JZ4770)
> - c->scache.ways = 4;
> + if (current_cpu_type() == CPU_XBURST) {
> + switch (mips_machtype) {
> + case MACH_INGENIC_JZ4770:
> + case MACH_INGENIC_X1000:
> + c->scache.ways = 4;
> + }
> + }
>
> c->scache.waysize = c->scache.sets * c->scache.linesz;
> c->scache.waybit = __ffs(c->scache.waysize);
> --
> 2.7.4
>
>
next prev parent reply other threads:[~2019-07-30 18:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 14:55 MIPS: Ingenic: Fix bugs when detecting X1000's parameters Zhou Yanjie
2019-07-30 14:55 ` [PATCH] " Zhou Yanjie
2019-07-30 18:02 ` Paul Cercueil [this message]
2019-07-31 4:32 ` Zhou Yanjie
2019-07-31 4:39 ` MIPS: Ingenic: Fix bugs when detecting X1000's parameters v2 Zhou Yanjie
2019-07-31 4:39 ` [PATCH v2] MIPS: Ingenic: Fix bugs when detecting X1000's parameters Zhou Yanjie
2019-07-31 20:34 ` Paul Burton
2019-08-01 10:55 ` Zhou Yanjie
2019-08-01 12:16 ` MIPS: Ingenic: Fix bugs when detecting X1000's parameters v3 Zhou Yanjie
2019-08-01 12:16 ` [PATCH 1/2 v3] MIPS: Ingenic: Fix bugs when detecting X1000's L2 cache Zhou Yanjie
2019-08-01 12:16 ` [PATCH 2/2 v3] MIPS: Ingenic: Fix bugs when calculate bogomips/lpj Zhou Yanjie
2019-08-02 1:26 ` Paul Cercueil
2019-08-02 8:13 ` Zhou Yanjie
2019-08-02 17:32 ` Paul Burton
2019-08-02 8:27 ` MIPS: Ingenic: Fix bugs when detecting X1000's parameters v4 Zhou Yanjie
2019-08-02 8:27 ` [PATCH 1/2 v4] MIPS: Ingenic: Fix bugs when detecting X1000's L2 cache Zhou Yanjie
2019-08-06 23:02 ` Paul Burton
2019-08-02 8:27 ` [PATCH 2/2 v4] MIPS: Ingenic: Disable broken BTB lookup optimization Zhou Yanjie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1564509767.15799.0@crapouillou.net \
--to=paul@crapouillou.net \
--cc=allison@lohutok.net \
--cc=chenhc@lemote.com \
--cc=jhogan@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=malat@debian.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=syq@debian.org \
--cc=tglx@linutronix.de \
--cc=zhouyanjie@zoho.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).