From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC90E1DF965; Tue, 6 Jan 2026 17:56:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767722202; cv=none; b=kNukMUCAp294E/LlqolZB5Gp9cXT3c/vmM07lNcDtAr1COcwj5hHpyxDNkpzVWyolbPH8E1CwPr0IDM9+BKv1KbA7AIEBAblM+cHOXJc0+fpuw1ittjSEMEr6at2ZP2Gpm61Tc0soFHdv0Om4eZ10Dn7vJZ3YUlITTrXD+46MgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767722202; c=relaxed/simple; bh=NEqmGtvI8PGmcIHp2JfRdlVqZYKv4U3+ZcpE2k+wim4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G8o2ixEXWvYbTXXoFpYx7q7v9fU75F773ybhjNZ1pNfBTaDBYB0YIuYksFTdQn23IhzDs67hJHaoGKJIsTX4f7u175tPU+XumS2XextapaTiqnEa+57ujeVzYGxY3dJPpcjiROwKhcCDqKjeep2PhI1CBawPqMrTdOF9pkXyKcY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Q8Xm0ArZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Q8Xm0ArZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2A5FC16AAE; Tue, 6 Jan 2026 17:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767722202; bh=NEqmGtvI8PGmcIHp2JfRdlVqZYKv4U3+ZcpE2k+wim4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q8Xm0ArZTk8I6YKbTz6XRyL46NmFBbtjc0C0WArLPZLnkR1meFBbbvgRS78o/+6Og 2+qggJi+7vjeX15stIX60cDxZX05EY1qK+zyGAagIlwsGNY3Z1/zuFtxKkuYNKn1p9 thn8YqtQfe4dmx6WlQOScG9EI+KksCitwYzB74OY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qiang Ma , Huacai Chen Subject: [PATCH 6.18 193/312] LoongArch: Correct the calculation logic of thread_count Date: Tue, 6 Jan 2026 18:04:27 +0100 Message-ID: <20260106170554.808736263@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106170547.832845344@linuxfoundation.org> References: <20260106170547.832845344@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qiang Ma commit 1de0ae21f136efa6c5d8a4d3e07b7d1ca39c750f upstream. For thread_count, the current calculation method has a maximum of 255, which may not be sufficient in the future. Therefore, we are correcting it now. Reference: SMBIOS Specification, 7.5 Processor Information (Type 4)[1] [1]: https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.9.0.pdf Cc: stable@vger.kernel.org Signed-off-by: Qiang Ma Signed-off-by: Huacai Chen Signed-off-by: Greg Kroah-Hartman --- arch/loongarch/kernel/setup.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -56,6 +56,7 @@ #define SMBIOS_FREQLOW_MASK 0xFF #define SMBIOS_CORE_PACKAGE_OFFSET 0x23 #define SMBIOS_THREAD_PACKAGE_OFFSET 0x25 +#define SMBIOS_THREAD_PACKAGE_2_OFFSET 0x2E #define LOONGSON_EFI_ENABLE (1 << 3) unsigned long fw_arg0, fw_arg1, fw_arg2; @@ -126,7 +127,12 @@ static void __init parse_cpu_table(const cpu_clock_freq = freq_temp * 1000000; loongson_sysconf.cpuname = (void *)dmi_string_parse(dm, dmi_data[16]); - loongson_sysconf.cores_per_package = *(dmi_data + SMBIOS_THREAD_PACKAGE_OFFSET); + loongson_sysconf.cores_per_package = *(u8 *)(dmi_data + SMBIOS_THREAD_PACKAGE_OFFSET); + if (dm->length >= 0x30 && loongson_sysconf.cores_per_package == 0xff) { + /* SMBIOS 3.0+ has ThreadCount2 for more than 255 threads */ + loongson_sysconf.cores_per_package = + *(u16 *)(dmi_data + SMBIOS_THREAD_PACKAGE_2_OFFSET); + } pr_info("CpuClock = %llu\n", cpu_clock_freq); }