From: Peter Mamonov <pmamonov@gmail.com>
To: barebox@lists.infradead.org
Cc: Peter Mamonov <pmamonov@gmail.com>
Subject: [PATCH 1/2] mips: c-r4k: detect secondary cache
Date: Mon, 2 Nov 2015 19:30:29 +0300 [thread overview]
Message-ID: <1446481830-25052-2-git-send-email-pmamonov@gmail.com> (raw)
In-Reply-To: <1446481830-25052-1-git-send-email-pmamonov@gmail.com>
---
arch/mips/lib/c-r4k.c | 31 +++++++++++++++++++++++++++++++
arch/mips/lib/cpu-probe.c | 2 --
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/arch/mips/lib/c-r4k.c b/arch/mips/lib/c-r4k.c
index 01b8665..0a9dd0e 100644
--- a/arch/mips/lib/c-r4k.c
+++ b/arch/mips/lib/c-r4k.c
@@ -91,7 +91,38 @@ static void probe_pcache(void)
}
}
+#define CONFIG_M (1 << 31)
+#define CONFIG2_SS_OFFSET 8
+#define CONFIG2_SL_OFFSET 4
+#define CONFIG2_SA_OFFSET 0
+static void probe_scache(void)
+{
+ struct cpuinfo_mips *c = ¤t_cpu_data;
+ unsigned int config2, config1, config = read_c0_config();
+ unsigned int ss, sl, sa;
+
+ if ((config & CONFIG_M) == 0)
+ goto noscache;
+ config1 = read_c0_config1();
+ if ((config1 & CONFIG_M) == 0)
+ goto noscache;
+ config2 = read_c0_config2();
+ ss = 0xf & (config2 >> CONFIG2_SS_OFFSET);
+ sl = 0xf & (config2 >> CONFIG2_SL_OFFSET);
+ sa = 0xf & (config2 >> CONFIG2_SA_OFFSET);
+ if (sl == 0)
+ goto noscache;
+ c->scache.linesz = 1 << (sl + 1);
+ c->scache.sets = 64 << ss;
+ c->scache.ways = 1 + sa;
+ c->scache.waysize = c->scache.linesz * c->scache.sets;
+ return;
+noscache:
+ c->scache.flags = MIPS_CACHE_NOT_PRESENT;
+}
+
void r4k_cache_init(void)
{
probe_pcache();
+ probe_scache();
}
diff --git a/arch/mips/lib/cpu-probe.c b/arch/mips/lib/cpu-probe.c
index 4622bcd..71dbaf6 100644
--- a/arch/mips/lib/cpu-probe.c
+++ b/arch/mips/lib/cpu-probe.c
@@ -75,8 +75,6 @@ static void decode_configs(struct cpuinfo_mips *c)
c->options = MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER |
MIPS_CPU_DIVEC | MIPS_CPU_LLSC | MIPS_CPU_MCHECK;
- c->scache.flags = MIPS_CACHE_NOT_PRESENT;
-
ok = decode_config0(c); /* Read Config registers. */
BUG_ON(!ok); /* Arch spec violation! */
}
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-11-02 16:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 16:30 mips: detect and report secondary cache configuration Peter Mamonov
2015-11-02 16:30 ` Peter Mamonov [this message]
2015-11-02 16:30 ` [PATCH 2/2] mips: cpuinfo: " Peter Mamonov
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=1446481830-25052-2-git-send-email-pmamonov@gmail.com \
--to=pmamonov@gmail.com \
--cc=barebox@lists.infradead.org \
/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