From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=91.218.175.230 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795195801; b=Uxmxi3SIQgxKjkDKRj70SAPdCPLqNKncTl+tHweAq+tMWHDERdFhVYj8j2iDSk/XYwDc nbNRbx7GeMeBUVWaRerkK6f4AD/qSjA/iLV0z9ekxJolk1X67qQ2DojCl3422o+bcOjJn HHHtzjQlVhy3BOar709SEy4sFhlDMD7kjb19kfKpmAJXNpl4XgOYSI60CPNuhEikBxsFI tAxlY1H6EuUQF06NLwAmJa6yw+L1nmV8eQf8cY1X83nUDPXuScOGlFLZpRGAMFwhCZkdW i483Oy+lBSxp6Dfb6TNuvv92x9TJSzBjPLt/z4U5yNWEQVGMyqPSTDqNyn97VnL56Wg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795195801; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=UufVZfwgbCp92kFZnwng07BVnO7E58HSMy79wKEDlQs=; b=L4z4YuUobtwOaXLiZK4Q100NRRtN1WEAXdaRgevcuBumCjf6KpL03GInyZ1WStmJF2Pe JQ2hkW/1TJ2skNfVCUZqacyRCk4vycrOdFj7KuU41dw5qLxUpEyjw+67zknGIGjnY2YVL MR3urSiEm0oTfa5thKYt8xHRouUgI337a2dJgWxXw1USQ7FuwLA6h59y/Pigj0kvuTA0p IUbGqIeEfk7Z9IELs+pPznljImOAMD9s/Bq1pgSGEGSxXx9+7CE3gdV1IfrE+FMSaSoBd xavmtBC9ZOU+svXn8/IQyGLb+neKbAIWGEg9BCrRoDbhoDzsd/t2EzmlUYEUtU7xx6Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=XaH2XKGU; arc=none smtp.remote-ip=91.218.175.230 Received: from mta0.migadu.com (out-230.mta0.migadu.com [91.218.175.230]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB53B60A2623 for ; Fri, 20 Nov 2026 17:30:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org AB53B60A2623 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=XaH2XKGU X-Envelope-To: stable@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=nCbmDgNV7wby3LpZePh1npWx21ru0gynBSaNnpEAK/w=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795195798; v=1; x=1795800598; b=XaH2XKGUfbfslLCrh/VW4GNjswwMdzZlfBaS8casedBelYBruue+ZxhTqBTPvwoSZv++t6lK 5rx/0kd1PqeAjf0MhoIQw0XuV5DL3y2yKeWUS3lTW5aq/PNznVmUC8riS/ub0sMpvztwsuqWX7u AsJSfGUn9FWlMu8DixMobTwE= X-Envelope-To: stable@vger.kernel.org Received: by mta10.migadu.com with ESMTPS id cd7cd70153efb88e; Fri, 20 Nov 2026 17:29:58 +0000 X-Mizu-Trace-ID: cd7cd70153efb88e X-Migadu-Flow: FLOW_OUT From: Bradley Morgan To: Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy Cc: Ritesh Harjani , Shrikanth Hegde , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Bradley Morgan Subject: [PATCH 2/2] powerpc/64: Set r3 to physical CPU ID before kexec_wait on !SMP Date: Fri, 20 Nov 2026 17:29:49 +0000 Message-ID: <20261120172949.3494131-3-bradley.morgan@linux.dev> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261120172949.3494131-1-bradley.morgan@linux.dev> References: <20261120172949.3494131-1-bradley.morgan@linux.dev> 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 In generic_secondary_common_init(), secondary processors on non SMP kernels branch directly to kexec_wait without copying their physical CPU ID from r24 into r3. kexec_wait() assumes r3 contains the physical CPU ID and passes it along to __secondary_hold at 0x60 once the next kernel starts. This is bad because secondary processors end up acknowledging the next kernel with garbage, which can hang the boot or report the wrong CPU number. To fix this, copy r24 into r3 before branching to kexec_wait, matching what the PACA lookup failure path already does. Fixes: 768d18ad6d5e ("powerpc: Don't search for paca in freed memory") Cc: stable@vger.kernel.org Signed-off-by: Bradley Morgan --- arch/powerpc/kernel/head_64.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 0077ce148a5a6..6219f474d00bd 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -401,6 +401,7 @@ generic_secondary_common_init: * which logical id maps to our physical one. */ #ifndef CONFIG_SMP + mr r3,r24 b kexec_wait /* wait for next kernel if !SMP */ #else LOAD_REG_ADDR(r8, paca_ptrs) /* Load paca_ptrs pointe */ -- 2.53.0