From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794065005; b=JS+XWEN2/iOyUWQBO0SjeBObixamPK7uIkUqK4KEne5duLxU4lBLCFZTQpnx+IdMlo/o X5crHZ1CNtNEnJrnmKgQDxt6qNpKTzo7vNbp6iVhmZ4lQ8TpWXiLuzeb/ges662aUQg1X Omy4IG3OnqUyx+izc92CuyZryezptYd+g+EsoawkunOctJt17kXyxgTX8Hl8umzy9Q/Na Cr6lUEevYCcn/rxKOC7BX4JwNdnxjtqBB95lKFW+Fbb9hr/h7QSAMpHCJKnC4kCgo+yl+ A/et8RV6YBaB04Y/oIIKhcYB/4GbJkF2nBirxpL+c16w+BvUhNl4RmG79uI6hAGTk0g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794065005; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=eWmcHRePCw3zy9prGrOUkHbXLQMyvvc/NcVk7J2aHnE=; b=Iyybi81ICPSesc9sIifiDSuuPaMNKe8KN2p2ETP3Vb6ovus3GINqZ2IYY3Eyd8e/FopY Gx0wTN9pOLeYSlxL+MTPMWw2vvPKYyOmEQWlNQhfcJpHwRyVeFbWpJfBHDKjRCnS6toxX U+gmtjDUr6mkmYWehhb2feO6Ph/PaLbrUxQ2lkt+VpvswefQbNPcWVrN11+l+ow9maOyu a2vVdHqKUS9CImlV/jZ1S/JHZ58e6i1Vj6/4AOL62FX5SqvMfHYPAV195PDRF5q3RynNs /PnPFf41+ZyoBtQ3a1j5kR/NAriXPbtTBcIFMTwwZqJ3Th63i9tgC1a2Eypo3gWO6rA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=DUNpG0RM; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CE97606A333; Sat, 7 Nov 2026 15:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=DUNpG0RM Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B7201F0089F; Sat, 7 Nov 2026 15:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794065005; bh=eWmcHRePCw3zy9prGrOUkHbXLQMyvvc/NcVk7J2aHnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DUNpG0RMMxXGmWoskCW1iNiWND7P4AStNOnvbasq7Aua/WrdccxsrDFxKuoemOXdN SktdAsOY9CDZ5G3WgK+SjviPXwJp+p7PKGluBd/I7A4wprIqP50yGs3jp6zzDe40UN cCErrymT8FjWn8flsJIfivFHdG+NFPT2wsTr9ue8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xi Ruoyao , Huacai Chen , Zhongqiu Han , Viresh Kumar , Sasha Levin Subject: [PATCH 7.3 0836/1257] cpufreq: loongson3: Replace IOCSR read/write with MMIO ones Date: Sat, 7 Nov 2026 08:52:12 -0500 Message-ID: <20261107135002.419867533@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134939.434104957@linuxfoundation.org> References: <20261107134939.434104957@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Huacai Chen [ Upstream commit 81792daacfb41ca07b04bd3956ea9e672080cc98 ] Our server productions (e.g. Loongson-3D6000/3E6000) can have multiple nodes in one package and SMC mailboxes are also per-node. However, IOCSR read/write can only perform on the current node, while sometimes we want to perform on other nodes (e.g. when switch governor, the get and target callbacks are not run on target core). So replace IOCSR read/write with MMIO ones. Cc: stable@vger.kernel.org Fixes: ccf51454145b ("cpufreq: Add Loongson-3 CPUFreq driver support") Tested-by: Xi Ruoyao Signed-off-by: Huacai Chen Reviewed-by: Zhongqiu Han Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/cpufreq/loongson3_cpufreq.c | 34 +++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/drivers/cpufreq/loongson3_cpufreq.c b/drivers/cpufreq/loongson3_cpufreq.c index 1ae821e265fbf..aea7c31e155a4 100644 --- a/drivers/cpufreq/loongson3_cpufreq.c +++ b/drivers/cpufreq/loongson3_cpufreq.c @@ -17,6 +17,7 @@ #include #include #include +#include /* Message */ union smc_message { @@ -165,6 +166,12 @@ union smc_message { #define FREQ_MAX_LEVEL 16 +#define MMIO_SMCMBX(node) \ + ((void __iomem *)(nid_to_addrbase(node) | IO_BASE | LOONGSON_REG_BASE | LOONGARCH_IOCSR_SMCMBX)) + +#define MMIO_MISC_FUNC(node) \ + ((void __iomem *)(nid_to_addrbase(node) | IO_BASE | LOONGSON_REG_BASE | LOONGARCH_IOCSR_MISC_FUNC)) + struct loongson3_freq_data { unsigned int def_freq_level; struct cpufreq_frequency_table table[]; @@ -177,13 +184,27 @@ static DEFINE_PER_CPU(struct loongson3_freq_data *, freq_data); static inline int do_service_request(u32 id, u32 info, u32 cmd, u32 val, u32 extra) { int retries; - unsigned int cpu = raw_smp_processor_id(); - unsigned int nid = cpu_to_node(cpu); + unsigned int cpu = 0, nid; union smc_message msg, last; +#ifdef CONFIG_SMP + switch (cmd) { + case CMD_GET_FREQ_INFO: + case CMD_SET_FREQ_INFO: + case CMD_GET_FREQ_LEVEL_NUM: + case CMD_GET_FREQ_LEVEL_INFO: + case CMD_GET_FREQ_BOOST_LEVEL: + cpu = cpu_number_map(id); + break; + default: + cpu = raw_smp_processor_id(); + } +#endif + nid = cpu_to_node(cpu); + mutex_lock(&cpufreq_mutex[nid]); - last.value = iocsr_read32(LOONGARCH_IOCSR_SMCMBX); + last.value = readl(MMIO_SMCMBX(nid)); if (!last.complete) { mutex_unlock(&cpufreq_mutex[nid]); return -EPERM; @@ -196,12 +217,11 @@ static inline int do_service_request(u32 id, u32 info, u32 cmd, u32 val, u32 ext msg.extra = extra; msg.complete = 0; - iocsr_write32(msg.value, LOONGARCH_IOCSR_SMCMBX); - iocsr_write32(iocsr_read32(LOONGARCH_IOCSR_MISC_FUNC) | IOCSR_MISC_FUNC_SOFT_INT, - LOONGARCH_IOCSR_MISC_FUNC); + writel(msg.value, MMIO_SMCMBX(nid)); + writel(readl(MMIO_MISC_FUNC(nid)) | IOCSR_MISC_FUNC_SOFT_INT, MMIO_MISC_FUNC(nid)); for (retries = 0; retries < 10000; retries++) { - msg.value = iocsr_read32(LOONGARCH_IOCSR_SMCMBX); + msg.value = readl(MMIO_SMCMBX(nid)); if (msg.complete) break; -- 2.53.0