From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from devianza.investici.org (devianza.investici.org [198.167.222.108]) (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 3B8BD3126B0 for ; Sun, 9 Aug 2026 21:36:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.167.222.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786311386; cv=none; b=L0iaENTjmYE6If/KrDEDQPPOrGPfZChU9YrvTuz6LT/kyni75p67dFVpIP/ou0CEHzt24R0iV2iSslmGv+vZWHP5la/FJ/C3xKk27Ssg93dlUYFIWP6U0RUlrwUml8s2mG6PBurQKv6n5V6bnpfskSsaivMeTwYbGwdH9m/TAe0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786311386; c=relaxed/simple; bh=kj9Uz3/iYPNeRFcgxFCWh+JGjzIoe2SYrKcrCWYGM0s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ejkETAy8FcXy1qN4EkQvpLu4taWGPK3irvWlSQ/Vp8N28ZprVihTw9VAhykOvDyQA0vtFjWiHKvYr1ehauJt5BhCkRQv5SGYh9MUNRKwc6RJwrL4GmbrpapT0vP8nMhr0sBKZHwJe8V29Nrt9bW6xuQvWoWLua7pwfttf/UE5rc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=grrlz.net; spf=pass smtp.mailfrom=grrlz.net; dkim=pass (1024-bit key) header.d=grrlz.net header.i=@grrlz.net header.b=kl2gDOH7; arc=none smtp.client-ip=198.167.222.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=grrlz.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=grrlz.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=grrlz.net header.i=@grrlz.net header.b="kl2gDOH7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grrlz.net; s=stigmate; t=1786311375; bh=U54iBc5U8WWYJkiiO/xs08z3ruV1SM6Nmun6JHAzDSE=; h=From:To:Cc:Subject:Date:From; b=kl2gDOH7X/PtQp6hyyX1hELB05zpwwLobktlFIXyzeR6fVzhcgm2u96us5XNHIIjC Dy+bY/gfMuZWGEF+ZwXC4tQ7Cem60AyBKvNHQruBUAc1TeZkKBOr/C+sF9F+Pe05bl 2sdhxsISEPtL34JQ/XcpDhZmywoW2L90Py3aWqvQ= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with UTF8SMTP id 4hJB5q3wdQz6vNp; Sun, 09 Aug 2026 21:36:15 +0000 (UTC) Received: by mx2.investici.org (Postfix) id 4hJB5q1cVZz4y43; Sun, 09 Aug 2026 21:36:15 +0000 (UTC) From: Bradley Morgan To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Pasha Tatashin , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, include@grrlz.net Subject: [PATCH] arm64: hibernate: pass HVC_SET_VECTORS args to the resume hvc Date: Sun, 9 Aug 2026 21:36:15 +0000 Message-ID: <20260809213615.11646-1-include@grrlz.net> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit swsusp_arch_suspend_exit() reinstalls the restored kernel's hyp stub vectors with an hvc, but never passes the arguments. x0 is not set to HVC_SET_VECTORS and x1 is not set to the vector address, so the stub dispatch falls through and returns without writing vbar_el2. EL2 is left pointing at the trans_pgd copy of the vectors, a page that swsusp_free() releases right after resume. Set the arguments up the same way __hyp_set_vectors() does. Fixes: 788bfdd97434 ("arm64: trans_pgd: hibernate: Add trans_pgd_copy_el2_vectors") Cc: stable@vger.kernel.org Signed-off-by: Bradley Morgan --- arch/arm64/kernel/hibernate-asm.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kernel/hibernate-asm.S b/arch/arm64/kernel/hibernate-asm.S index 0e1d9c3c6a93..2baefe7a82d3 100644 --- a/arch/arm64/kernel/hibernate-asm.S +++ b/arch/arm64/kernel/hibernate-asm.S @@ -89,6 +89,8 @@ alternative_insn "dc cvau, x4", "dc civac, x4", ARM64_WORKAROUND_CLEAN_CACHE isb cbz x24, 3f /* Do we need to re-initialise EL2? */ + mov x1, x24 + mov x0, #HVC_SET_VECTORS hvc #0 3: ret SYM_CODE_END(swsusp_arch_suspend_exit) -- 2.47.3