From: Aleksandar Rikalo <arikalo@gmail.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Aleksandar Rikalo <arikalo@gmail.com>,
Chao-ying Fu <cfu@wavecomp.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Greg Ungerer <gerg@kernel.org>, Hauke Mehrtens <hauke@hauke-m.de>,
Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
Marc Zyngier <maz@kernel.org>,
Paul Burton <paulburton@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Serge Semin <fancer.lancer@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Gregory CLEMENT <gregory.clement@bootlin.com>
Subject: [PATCH v7 11/12] MIPS: CPS: Support broken HCI for multicluster
Date: Sat, 19 Oct 2024 09:10:36 +0200 [thread overview]
Message-ID: <20241019071037.145314-12-arikalo@gmail.com> (raw)
In-Reply-To: <20241019071037.145314-1-arikalo@gmail.com>
From: Gregory CLEMENT <gregory.clement@bootlin.com>
Some CM3.5 devices incorrectly report that hardware cache
initialization has completed, and also claim to support hardware cache
initialization when they don't actually do so. This commit fixes this
issue by retrieving the correct information from the device tree and
allowing the system to bypass the hardware cache initialization
step. Instead, it relies on manual operation. As a result, multi-user
support is now possible for these CPUs.
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Aleksandar Rikalo <arikalo@gmail.com>
---
arch/mips/kernel/smp-cps.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index 4f344c890a23..265cf52c0dd1 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -39,6 +39,7 @@ UASM_L_LA(_not_nmi)
static uint32_t core_entry_reg;
static phys_addr_t cps_vec_pa;
+static bool l2_hci_broken;
struct cluster_boot_config *mips_cps_cluster_bootcfg;
static void power_up_other_cluster(unsigned int cluster)
@@ -254,6 +255,22 @@ static void __init cps_smp_setup(void)
#endif /* CONFIG_MIPS_MT_FPAFF */
}
+static void __init check_hci_quirk(void)
+{
+ struct device_node *np;
+
+ np = of_cpu_device_node_get(0);
+ if (!np) {
+ pr_debug("%s: No cpu node in the device tree\n", __func__);
+ return;
+ }
+
+ if (of_property_read_bool(np, "cm3-l2-config-hci-broken")) {
+ pr_info("HCI (Hardware Cache Init for the L2 cache) in GCR_L2_RAM_CONFIG from the CM3 is broken");
+ l2_hci_broken = true;
+ }
+}
+
static void __init cps_prepare_cpus(unsigned int max_cpus)
{
unsigned int nclusters, ncores, core_vpes, c, cl, cca;
@@ -307,6 +324,9 @@ static void __init cps_prepare_cpus(unsigned int max_cpus)
sizeof(*mips_cps_cluster_bootcfg),
GFP_KERNEL);
+ if (nclusters > 1)
+ check_hci_quirk();
+
for (cl = 0; cl < nclusters; cl++) {
/* Allocate core boot configuration structs */
ncores = mips_cps_numcores(cl);
@@ -368,7 +388,7 @@ static void init_cluster_l2(void)
{
u32 l2_cfg, l2sm_cop, result;
- while (1) {
+ while (!l2_hci_broken) {
l2_cfg = read_gcr_redir_l2_ram_config();
/* If HCI is not supported, use the state machine below */
--
2.25.1
next prev parent reply other threads:[~2024-10-19 7:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-19 7:10 [PATCH v7 00/12] MIPS: Support I6500 multi-cluster configuration Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 01/12] irqchip/mips-gic: Introduce for_each_online_cpu_gic() Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 02/12] irqchip/mips-gic: Support multi-cluster in for_each_online_cpu_gic() Aleksandar Rikalo
2024-10-25 22:17 ` Thomas Gleixner
2024-10-19 7:10 ` [PATCH v7 03/12] irqchip/mips-gic: Setup defaults in each cluster Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 04/12] irqchip/mips-gic: Multi-cluster support Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 05/12] clocksource: mips-gic-timer: Always use cluster 0 counter as clocksource Aleksandar Rikalo
2024-10-28 14:54 ` Daniel Lezcano
2024-10-28 15:15 ` Thomas Bogendoerfer
2024-10-28 15:22 ` Daniel Lezcano
2024-10-28 15:47 ` Thomas Bogendoerfer
2024-10-28 16:09 ` Daniel Lezcano
2024-11-13 20:20 ` [tip: timers/core] clocksource/drivers/mips-gic-timer: " tip-bot2 for Paul Burton
2024-10-19 7:10 ` [PATCH v7 06/12] clocksource: mips-gic-timer: Enable counter when CPUs start Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 07/12] MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 08/12] MIPS: CPS: Introduce struct cluster_boot_config Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 09/12] MIPS: CPS: Boot CPUs in secondary clusters Aleksandar Rikalo
2024-10-19 7:10 ` [PATCH v7 10/12] dt-bindings: mips: cpu: Add property for broken HCI information Aleksandar Rikalo
2024-10-21 6:10 ` Krzysztof Kozlowski
2024-10-19 7:10 ` Aleksandar Rikalo [this message]
2024-10-19 7:10 ` [PATCH v7 12/12] MIPS: mobileye: dts: eyeq6h: Enable cluster support Aleksandar Rikalo
2024-10-25 15:07 ` [PATCH v7 00/12] MIPS: Support I6500 multi-cluster configuration Gregory CLEMENT
2024-10-25 15:58 ` Gregory CLEMENT
[not found] ` <CAGQJe6pywUi8dnhxFopkMfP2U1PceHjTPX-CysT0bajSk_AKKg@mail.gmail.com>
2024-10-28 13:39 ` Gregory CLEMENT
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=20241019071037.145314-12-arikalo@gmail.com \
--to=arikalo@gmail.com \
--cc=cfu@wavecomp.com \
--cc=daniel.lezcano@linaro.org \
--cc=fancer.lancer@gmail.com \
--cc=geert@linux-m68k.org \
--cc=gerg@kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=hauke@hauke-m.de \
--cc=ilya.lipnitskiy@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=maz@kernel.org \
--cc=paulburton@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=yangtiezhu@loongson.cn \
/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
all inboxes | Powered by JetHome®