From nobody Wed Feb 11 10:06:20 2026 Received: from wfout1-smtp.messagingengine.com (wfout1-smtp.messagingengine.com [64.147.123.144]) (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 F063114831E; Tue, 21 May 2024 20:12:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.144 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322343; cv=none; b=L5l5pam8korRKldTOCN8DRXwmLXOGK8+vdISxYWJj+S5ltb9NDnzwNxWrPv3uyR9Aqii8f13GxlP6IlLnfkLR5EK9CWMafRt43uVmU7z2qAbFTO288IZQpRs+mOXBI8gmLlArmpBVwsXdHFNiIAK56AH3Hdz0KRU+xIR+jq/JH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322343; c=relaxed/simple; bh=xXIJHAJOc6onemD12GizOeep+GRhVclxjz9KYi4R0ZU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hCw69qKhfBgUBu5rT+lckYdpPzkmn9D0LbUfvPZmUVCw8XXZ16GYODFIs0R0hndZQVpIaAb3ztD7l7cvzypijk5E8zDD9jWKxMPsjrUWeDHvNU9va4yB0Xy0ZJnR3H6JUahxRO0VPDNWFCxzxd8NxRsjP0o21mTA2btar/BCFRY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com; spf=pass smtp.mailfrom=flygoat.com; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b=GPtqFbEz; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=OYYzxXhb; arc=none smtp.client-ip=64.147.123.144 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flygoat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b="GPtqFbEz"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="OYYzxXhb" Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id F338A1C000EF; Tue, 21 May 2024 16:12:19 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 21 May 2024 16:12:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1716322339; x=1716408739; bh=eTTfNISa1AvyB5+NKyzaR4LUuaJMzDBXdrMDNNsuz0c=; b= GPtqFbEzys+1djPR1hiQM1mABmXNhWXHmbryVmCTJJ8qWMGKVJbsL56EO2r5EPxd YuyMFdbyTd9tjJfpjpI/YuypQqQZJfcFj8cH2XB1U4632/skXr02n9aNKsPBopt/ ROd5ATCGjIyWtUO+MQlvS/sUHwozr2UDQ3EjmQ3+dj24oY0b+ts3BhlCT6P0NVRj 58p5a51niINw2zoEaEcGbb1f0CoNuEucrchgI5W6awEN3MAzlWp+2EoaiP3fYjS1 8POVPVk/sYvYEnz9ERDSUKrcyiBa3ST11TatWJ83wzw91gT+ormza5LgPzSIDHz1 9zn11ghXl3drA6Od6vSTyw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1716322339; x= 1716408739; bh=eTTfNISa1AvyB5+NKyzaR4LUuaJMzDBXdrMDNNsuz0c=; b=O YYzxXhbR7hXW6LiuVmJzvGQw22LdNaGj8q/3dHIg0oLIoqLbOl6vV96Yv5Yf0SuM brBtcAJhc4cRCm/2GjA7S1oicRQCIKacAMLID6FWEUeBn/DsjnRpk3B35FKOKQFW HkWckK4o8fzfeW3S0gcjCEGH9stanCL/MPEMouWTW3++pvWYMUXFVZWe1U9BNmVc Rpduy6SmLx4a8fa4Y7BjRdnpWYNUNg0qAy+RAUzE2wP93fixRJuDCRz6u5ug9aMi gk76sc+WVysCAY+0ZbeCpvrSO/cdnA8fuJOEO2XQwFahDQWnM+XxAimZx9N7gy25 lEt4fdJHTtEIWEwmD9Xww== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeivddgudeggecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheplfhi rgiguhhnucgjrghnghcuoehjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhmqe enucggtffrrghtthgvrhhnpedvkeeihfefveekueevteefleffkeegudeghfdtuddugefh ueevgeffgedukeejleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 May 2024 16:12:18 -0400 (EDT) From: Jiaxun Yang Date: Tue, 21 May 2024 21:12:12 +0100 Subject: [PATCH 1/4] LoongArch: Fix built-in DTB detection Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240521-loongarch-booting-fixes-v1-1-659c201c0370@flygoat.com> References: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> In-Reply-To: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> To: Huacai Chen , Binbin Zhou Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Jiaxun Yang , stable@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1332; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=xXIJHAJOc6onemD12GizOeep+GRhVclxjz9KYi4R0ZU=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhjRfBgXx53MP/fBMKai9v3RdxAXtF3av8m5zvirtFXuhy GaqF7Cvo5SFQYyLQVZMkSVEQKlvQ+PFBdcfZP2BmcPKBDKEgYtTACYyfS/DfxffAN24VVy/srij jk+5EnPSYo795JDQHU+OVhyYbjCnbC8jw87ly3O3aIlVvyg0Mg9lKV+uauM8S5qBc/PtRKZbmpM 6+QA= X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 fdt_check_header(__dtb_start) will always success because kernel provided a dummy dtb here, thus fdt passed from firmware will never be taken. Fix by trying to utilise __dtb_start only when CONFIG_BUILTIN_DTB is enabled. Fixes: 5f346a6e5970 ("LoongArch: Allow device trees be built into the kerne= l") Cc: stable@vger.kernel.org Signed-off-by: Jiaxun Yang --- arch/loongarch/kernel/setup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 60e0fe97f61a..ea6d5db6c878 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -275,16 +275,18 @@ static void __init arch_reserve_crashkernel(void) static void __init fdt_setup(void) { #ifdef CONFIG_OF_EARLY_FLATTREE - void *fdt_pointer; + void *fdt_pointer =3D NULL; =20 /* ACPI-based systems do not require parsing fdt */ if (acpi_os_get_root_pointer()) return; =20 +#ifdef CONFIG_BUILTIN_DTB /* Prefer to use built-in dtb, checking its legality first. */ if (!fdt_check_header(__dtb_start)) fdt_pointer =3D __dtb_start; - else +#endif + if (!fdt_pointer) fdt_pointer =3D efi_fdt_pointer(); /* Fallback to firmware dtb */ =20 if (!fdt_pointer || fdt_check_header(fdt_pointer)) --=20 2.43.0 From nobody Wed Feb 11 10:06:20 2026 Received: from wfhigh4-smtp.messagingengine.com (wfhigh4-smtp.messagingengine.com [64.147.123.155]) (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 1E477149C4D; Tue, 21 May 2024 20:12:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322344; cv=none; b=Ui+Ntaiv8ct61jMFA/fmOTKNGyDeo8Qh9vIVOUlAdt+PwlkBSowkPUSxT9kkmFNT/z7TMFy2UkpMh9GwtvhXXc3LBGAW2yflzClcfr+Pz9182r4XhbYCZQRY6FdDjOCoWaqMUJvVQ0NhCNboaKHwrysQ5mecYCvEjZIuvz8V+0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322344; c=relaxed/simple; bh=yVZuZGhQZlh0GBb5JOMcxygXqnWx2vLCWpjVfeLHzuM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J5cz1PlH1OMcpBYJIdJcxkPsQk8H5hHOChgsUtEnGExX4mEy9NxBLS2EsKocw5unUrvOfXwL7wcTfu2RCPP/V1ukTntWi5xiEK0wlB1aiEWULj3hBciz7/TMIvhOEexcWFjs7v2GXtWgGItX//zxuf+da9xtKedfx+UaODhIdGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com; spf=pass smtp.mailfrom=flygoat.com; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b=yIH9eNAQ; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=RNpzSdDS; arc=none smtp.client-ip=64.147.123.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flygoat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b="yIH9eNAQ"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="RNpzSdDS" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.west.internal (Postfix) with ESMTP id 143A118000FE; Tue, 21 May 2024 16:12:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 21 May 2024 16:12:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1716322341; x=1716408741; bh=p2kGiIFKBT2fprtsSCD0V29yACfwyWhwUJ1YJx6S6zY=; b= yIH9eNAQsjg5W2u0uBhrbqcAOJjBmPfDIrQ6EdQAVz+feWyeN6fwoXAn+9oCChYK DYLkS5RYqZeAUu8lAOiC755Vwde2csY+/aFJocxCL/DPt+zcIbZF51/CxrfKuO/K JfvuxWRK7kTzF91IRoZLAjfd8uQHgfV5Le7lLx1E40rCtuAQz8dn8ARktdv9FmEv Av1gTMfdl+kqgZfgwiRWu+jGRX2W0Ds7f8WKr7ECXi0NEkWatGr3u2GbRzGCEsXT +6JK72YLSizGEBzzZctY53Q7v4STRe+FAbX2dFot3wvlddwnr/shs3x8f7hjCSmi 0gfxLIV1wsh7lZUi3q2m3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1716322341; x= 1716408741; bh=p2kGiIFKBT2fprtsSCD0V29yACfwyWhwUJ1YJx6S6zY=; b=R NpzSdDSLzGY6oadjEvc/P3bJJURFBN2+UJaqGAREEN2juEPrhXk+hrecyi8aY3Fn i3Ixr7/QJmxTgYyDKgqgdf1ifKmi2W1+8ChgkAJiKoCfvjO///5V6r1mwfTKTsWN g/EoQATSALOnhREv5n8AUa0M8YGUJhCB76ZIgd5Tg9MwRg8Fk/eO9tOqShLkLzgz 3VkGlrcAY6nuzL6FEMN9Gx+Vuoa0dEdt4CzzxnCiysEc6xG/FWRxV56zA+iEKAjx pmM5LD9xBx7kbMqTzyZsXoL2rXxuZH9HFVSPD8wzwyVxWgDs8IxHRXlvr5odGr/l 5mDSc6XLjI4aA/ri+n5vw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeivddgudeggecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheplfhi rgiguhhnucgjrghnghcuoehjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhmqe enucggtffrrghtthgvrhhnpedvkeeihfefveekueevteefleffkeegudeghfdtuddugefh ueevgeffgedukeejleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 May 2024 16:12:20 -0400 (EDT) From: Jiaxun Yang Date: Tue, 21 May 2024 21:12:13 +0100 Subject: [PATCH 2/4] LoongArch: smp: Add all CPUs enabled by fdt to NUMA node 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240521-loongarch-booting-fixes-v1-2-659c201c0370@flygoat.com> References: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> In-Reply-To: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> To: Huacai Chen , Binbin Zhou Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Jiaxun Yang , stable@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1173; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=yVZuZGhQZlh0GBb5JOMcxygXqnWx2vLCWpjVfeLHzuM=; b=kA0DAAoWQ3EMfdd3KcMByyZiAGZNACChHjrVcsyIHyzheKMNj1SUKWaWkZhhLmsXhkYGfdMve 4h1BAAWCgAdFiEEVBAijrCB0aDX4Gr8Q3EMfdd3KcMFAmZNACAACgkQQ3EMfdd3KcMsVgEA3Rz2 35ZT8Tpot634lFZd4LP2GxGhbR/n7U+p0fLrqEIBALH0+M4jEJ3fyOz+IM4VzffcSxTHMAIC/gv yOPb0Ue4M X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 NUMA enabled kernel on FDT based machine fails to boot because CPUs are all in NUMA_NO_NODE and mm subsystem won't accept that. Fix by adding them to default NUMA node for now. Cc: stable@vger.kernel.org Fixes: 88d4d957edc7 ("LoongArch: Add FDT booting support from efi system ta= ble") Signed-off-by: Jiaxun Yang --- arch/loongarch/kernel/smp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c index 0dfe2388ef41..866757b76ecb 100644 --- a/arch/loongarch/kernel/smp.c +++ b/arch/loongarch/kernel/smp.c @@ -273,7 +273,6 @@ static void __init fdt_smp_setup(void) =20 if (cpuid =3D=3D loongson_sysconf.boot_cpu_id) { cpu =3D 0; - numa_add_cpu(cpu); } else { cpu =3D cpumask_next_zero(-1, cpu_present_mask); } @@ -283,6 +282,10 @@ static void __init fdt_smp_setup(void) set_cpu_present(cpu, true); __cpu_number_map[cpuid] =3D cpu; __cpu_logical_map[cpu] =3D cpuid; + + early_numa_add_cpu(cpu, 0); + set_cpuid_to_node(cpuid, 0); + numa_add_cpu(cpu); } =20 loongson_sysconf.nr_cpus =3D num_processors; --=20 2.43.0 From nobody Wed Feb 11 10:06:20 2026 Received: from wfhigh4-smtp.messagingengine.com (wfhigh4-smtp.messagingengine.com [64.147.123.155]) (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 1EE67149C7B; Tue, 21 May 2024 20:12:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322347; cv=none; b=qSP1C39hb+OBRXSvl8FHzwjsBqxrPm1s0IBjB/B8cJb84hxYzY1GxJE32NIAS+JecqiXLMn9rzlVx0ZF3Zy/TwpFyrEFrBYiUxHNbqCXWnwd4JkeUeyEhan/Do4j+gO92J/ZyA1EzCeCw4kyqJZs2+NoZDbJQr6NeRMNn2m+BF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322347; c=relaxed/simple; bh=VkPWDIMyMkF8CH/V1HlgyS/GkNbF6V6iQ/qLTwf17fE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c64naOhTuMF7zlZnO91umLR+xnfUs1d4qZnRr/x20lQvvT2EOdGRN0jMW73qsyWcRkd21z8wB+BE6mHMNKGVRsxZQ+rUVGNmTY5YlncqdFMmr7A3lih04gki1FkihGvvBVVawKNhI/N0X83Zl1u8u+eqNWbLgKVG4j13wLIZS4k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com; spf=pass smtp.mailfrom=flygoat.com; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b=n/cgO1Fo; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=KnoH1UtI; arc=none smtp.client-ip=64.147.123.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flygoat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b="n/cgO1Fo"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="KnoH1UtI" Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.west.internal (Postfix) with ESMTP id 318D51800107; Tue, 21 May 2024 16:12:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 21 May 2024 16:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1716322343; x=1716408743; bh=iItfwyatQhlxt0H+NrF1YH5otFKvGeFUgxF05vMBPgw=; b= n/cgO1FoEgCjEVWerYjHHXBkTTPNXSdA0Zf6E9EXznVZXXHyvmPXSSNcHPsw1R7G IGsP9havV4TOK1nowRkE61thRIj2Bo1E+k8e7LWfhOf74nUoBXRlUI4XUyC4fc0S AJbG5KhLdqJTRDr7CQ98V+8K0G3MLMG9W8zpD9iSXLWX8oP4kjcMCxnPFm4qaX+w STmCDOZGfdQar/P9W4P9h93uNIhYwLd3CcbQFqdfC0ilgbDJPch53jJ+lvzVLx7Q TxBWJVxtZRsF4iPI4KO77UfnWAIUAAmGUGnnu2HATqS6Afvrf+MDAVhHqa+eCK8u t1vTHR/YoRE0L6G5WcfwPA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1716322343; x= 1716408743; bh=iItfwyatQhlxt0H+NrF1YH5otFKvGeFUgxF05vMBPgw=; b=K noH1UtI358WiL7PVlZyeVwMMu6sxXjv+LNKdAq1a9uIJTbKbWEkoOut6LPmY7+V2 zivsVJeDEHz2zXIOb1Oph+yHHi9Zk6t8k26fAJtlIEB67y20Ab5uBgzBxcM0Mg9Y uKEhC13gVM9EgawXsImT/7yjk0+Ga7QJB3Zjg/FaWpSVA+Q2Vf4bGp/BvLx1EMGY 3yOvZlGcvBISXf90ycr39HeFMn7C/sdjsZ4cIz4pvyHSWHntARRDdgBGeRtOjY1c 3e1MbOJckV5ureC2VaTEvD95LT2qa6JVLYG8821zxJHvT2Drcf8ULNZjy7FEE/Te 5pJ8xguMRgAYDNUNj3YZg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeivddgudegfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheplfhi rgiguhhnucgjrghnghcuoehjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhmqe enucggtffrrghtthgvrhhnpeehgfeuffdugeeuieevfeellefhvefhtdduleehgfdvgeev hfeileevveffuddvgfenucffohhmrghinhephhgvrggurdhssgdphhgvrgguvghrrdhorh hgpdhrrghmrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepjhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomh X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 May 2024 16:12:22 -0400 (EDT) From: Jiaxun Yang Date: Tue, 21 May 2024 21:12:14 +0100 Subject: [PATCH 3/4] LoongArch: Fix entry point in image header Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240521-loongarch-booting-fixes-v1-3-659c201c0370@flygoat.com> References: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> In-Reply-To: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> To: Huacai Chen , Binbin Zhou Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Jiaxun Yang , stable@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1212; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=VkPWDIMyMkF8CH/V1HlgyS/GkNbF6V6iQ/qLTwf17fE=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhjRfBoXi3zbfTuuZOzPsUHaVZ1khFJ6t6XkoX3aXXsX5n UrH5JZ3lLIwiHExyIopsoQIKPVtaLy44PqDrD8wc1iZQIYwcHEKwERWxzP8L1tvr897w3T2ZWO+ r0zHtvjerXSc/fTTxRddZfrHBOIqDjP8L9yyIW7rpFatLOaYq6eWXuLWyGk4vTvlnsb8w9ETDnv 5swEA X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 Currently kernel entry in head.S is in DMW address range, firmware is instructed to jump to this address after loading the image. However kernel should not make any assumption on firmware's DMW setting, thus the entry point should be a physical address falls into direct translation region. Fix by applying a calculation to the entry. Note that due to relocation restriction TO_PHYS can't be used, we can only do plus and minus here. Cc: stable@vger.kernel.org Signed-off-by: Jiaxun Yang --- arch/loongarch/kernel/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/loongarch/kernel/head.S b/arch/loongarch/kernel/head.S index c4f7de2e2805..1a83564023e1 100644 --- a/arch/loongarch/kernel/head.S +++ b/arch/loongarch/kernel/head.S @@ -22,7 +22,7 @@ _head: .word MZ_MAGIC /* "MZ", MS-DOS header */ .org 0x8 - .dword kernel_entry /* Kernel entry point */ + .dword PHYS_LINK_KADDR + (kernel_entry - _head) /* Kernel entry point */ .dword _kernel_asize /* Kernel image effective size */ .quad PHYS_LINK_KADDR /* Kernel image load offset from start of RAM */ .org 0x38 /* 0x20 ~ 0x37 reserved */ --=20 2.43.0 From nobody Wed Feb 11 10:06:20 2026 Received: from wfhigh4-smtp.messagingengine.com (wfhigh4-smtp.messagingengine.com [64.147.123.155]) (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 46904149E09; Tue, 21 May 2024 20:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322348; cv=none; b=kTInMvnbwr/tuh5n77HzpwIWyzKo6UNZwSO8kLzjppjXOavVfXjIn+58r/n6wEHLcuHBVE1l2t35VNQGi0g9krqzdWNgxPerLvvpU1ACkfbt8MJU8tIFeDOJkryyX6TgplLLT76MHVckZu7Y+pqb7Xi2mYFHfoflr9Y2MPglFZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716322348; c=relaxed/simple; bh=FjNRPnFXbgaDrJzH0dco7+80Dl+FmT6vR06xWJ6y13Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GiYULizsEVWuUWjawiH5FUj4ZShG0q97KL69McvaCFHc4Lr4BQgfAnKtbmsODOcAR+xoOrHTIFPfLVAxbGwDBVnrz/QqrX2h1h4tNnrksXP3d13zpr4Hs/eJC7fdhUPHqmjVV10lPTskYHmMlQbS4TGm/yRiFhCvzwSIlGcYPvQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com; spf=pass smtp.mailfrom=flygoat.com; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b=rqud1A2n; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ir7RCShl; arc=none smtp.client-ip=64.147.123.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=flygoat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flygoat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b="rqud1A2n"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ir7RCShl" Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id 750F118000E9; Tue, 21 May 2024 16:12:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 21 May 2024 16:12:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1716322346; x=1716408746; bh=xQxZPFfX2OVgytqkFfLnTy1ZbYhV4pTBmatqarQFr7k=; b= rqud1A2nWSH9uuDCNCmku1HFki18hETLjMeCI1dW34g5ZQSHD8j15jp8yxs3c6Aj FmsOtK0XvlN/zs15Ro77Vd7tzIRg7jFKTPj5GQA4acRw5UViTohDKNSgX5HmqDX0 CK3jmiScRCSdd3DSi+taYTumFvGvg5LFGUuCh77ADD+G6onBFJKuS08JlgkUwzm8 D0WRV5GnDp7ntaTeR+KEDvu6CTyHEisV+SisVB/tmjYYY4ao6xegha8kJ2eKN/fm M1jvN5lCu2P7v1ImlZIsLIPhO9r9RGzxJL+BN1UIqXWGNFmoh6J70YnIoSdm3yRr Ea6T9yAIPJiSG97t8fmFXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1716322346; x= 1716408746; bh=xQxZPFfX2OVgytqkFfLnTy1ZbYhV4pTBmatqarQFr7k=; b=i r7RCShlND6VEzAcQ7iNiNEmXYZQ0prAgVAjFjqf6M98PMJ+GmdLP0Rybr2dfvv8w VLjokAmd4YODrQzv0uXfnMwPqNN2Ur5tsClBSw55X5XpVUI2xUFtN1rKJpC8CNh3 ftwWBN7aQh6b0CqEBK7oJLAnQ7GWay6OsbTO7WM0LhwnzNMYgldhQ6lvST/7ewfc LpP0ydefodivAfzP8REY1qnjtmUHuCJHJhDQOfw9Fe5L9+TDh9oghZSC46TfzRWj gwcavZuGiDoSh86k4+9DAL5/opyL0C7okHvk5n6bofPLCKQvkA8cnjQZxdgXl1TU KPm/ltRxsRS13pT34mRQw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeivddgudeggecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheplfhi rgiguhhnucgjrghnghcuoehjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhmqe enucggtffrrghtthgvrhhnpedvkeeihfefveekueevteefleffkeegudeghfdtuddugefh ueevgeffgedukeejleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 May 2024 16:12:24 -0400 (EDT) From: Jiaxun Yang Date: Tue, 21 May 2024 21:12:15 +0100 Subject: [PATCH 4/4] LoongArch: Clear higher address bits in JUMP_VIRT_ADDR Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240521-loongarch-booting-fixes-v1-4-659c201c0370@flygoat.com> References: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> In-Reply-To: <20240521-loongarch-booting-fixes-v1-0-659c201c0370@flygoat.com> To: Huacai Chen , Binbin Zhou Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Jiaxun Yang , stable@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1180; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=FjNRPnFXbgaDrJzH0dco7+80Dl+FmT6vR06xWJ6y13Y=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhjRfBgUvdseI+vuPSpnrN2aeNWnTVn1wsHxxxYnM1dbzE 1fnmt/uKGVhEONikBVTZAkRUOrb0HhxwfUHWX9g5rAygQxh4OIUgInUVTIyLFzQtodjisrCV38X XrLjm+U2bcGVzIKTJ6pTDxSbVxTH1jP8r5xq9GT3iZYL3mWzrkUlKFtniim3nk/peJohc/fdVP+ jzAA= X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 In JUMP_VIRT_ADDR we are performing an or calculation on address value directly from pcaddi. This will only work if we are currently running from direct translation addresses or firmware's DMW is configured exactly same as kernel. Still, we should not rely on such assumption. Fix by clearing higher bits in address comes from pcaddi, so we can get real physcal address before applying or operator. Cc: stable@vger.kernel.org Signed-off-by: Jiaxun Yang --- arch/loongarch/include/asm/stackframe.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/include/asm/stackframe.h b/arch/loongarch/inclu= de/asm/stackframe.h index 45b507a7b06f..a325d20a4503 100644 --- a/arch/loongarch/include/asm/stackframe.h +++ b/arch/loongarch/include/asm/stackframe.h @@ -42,8 +42,10 @@ .macro JUMP_VIRT_ADDR temp1 temp2 li.d \temp1, CACHE_BASE pcaddi \temp2, 0 + PTR_SLL \temp2, \temp2, (BITS_PER_LONG - DMW_PABITS) + PTR_SRL \temp2, \temp2, (BITS_PER_LONG - DMW_PABITS) or \temp1, \temp1, \temp2 - jirl zero, \temp1, 0xc + jirl zero, \temp1, 0x14 .endm =20 .macro BACKUP_T0T1 --=20 2.43.0