From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f202.google.com (mail-oi1-f202.google.com [209.85.167.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A93783A5422 for ; Wed, 1 Jul 2026 20:43:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782938625; cv=none; b=l69IPWTKFEgbJbrxiLCVosnYh7iqJg0qnBQ6dhfC/cgLhRBOxjLvdGxQX+tPT0rjL+AYlMh0bbZIAs/V7GSAnif1//iWDEm0fDcbPsb6tEEYOK6v+B7oRvoD+neq2CBD+g2mxa8iCYmsJRA3SiGUiFPwAogJLiX4+27+gUUOL3s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782938625; c=relaxed/simple; bh=60S4kFwxnDVBWFD5Z3yw/BFmHxkCUVWvN3+3KkqvXoY=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=a5smNILBG5NPTx2wkkSlkWWnUVfuTn1MQuRtnOMjA7XrxR1RpPQaS1/mhPFl8iH56T4Yg2Dx4oC6m4L+bF790UONKJFwTi3AzUV0m0yDB7PhVwuCH6B+j1ie3JCyEAuJfWL1MG7UBsde+d8/OzCt19S+ZLtDU9WwoEsQ20tu2os= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=o2OyOllU; arc=none smtp.client-ip=209.85.167.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="o2OyOllU" Received: by mail-oi1-f202.google.com with SMTP id 5614622812f47-486e64c8edeso1143795b6e.2 for ; Wed, 01 Jul 2026 13:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782938624; x=1783543424; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=LgbAV7Db884sdO2wBFSay1l144nmKC6A4dcsE5Jnxg8=; b=o2OyOllUrCY3iYeIRZR1htn+aAhTyxx3dj6VkRY2AqomE2ErJSfbWlEQS4lIzu3tEX w4W3tRF/yYRhnHFUDjFrUFw/b23tj3QWEd8uthRCVqnW+gjP8AvvUki8QgQIxqXoAEIF iLMeUVBNcFP8ZpUKZDfooLEljNvto0HbWBQlKwL2AKXsIgD+2WaV2ep9CBSiCZmp4XaI G2MjyzVbmqAvegx4WocEhqd7sa03fY56eFk6WubzM8cc21Si9SDXTBbnrlRUtZCW+xZq gVXnrSByQqLDcQ+wOJMdzPOIugcczUP94X4Jgpcvyr9R4VVbOGfUqTaiDEXoih3jFeTW jD3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782938624; x=1783543424; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LgbAV7Db884sdO2wBFSay1l144nmKC6A4dcsE5Jnxg8=; b=strfHUuTW6lwfYM8y26teCh7eXpca77HvCxo7+XOJoaUxgQmxR+IiwQVuT87qVLbyt d9/DitMRbKnEcuN2q02XwSMG71mjVxWz3+w1Z6n9QLQ/u09Pm2ics7aIgF2Ggs2dhMqn S2WKimbpL0w9xmRj4sd8dxJu+cvNoy4NNv9RLFS75lE46SS+X6JC02aTyosJbuAoFIXH jCa7kZ49vAnNtQ3To4fxscWDLzKOEPWxgIU76V38wz+Gkly+bwqo7MTQay4m4a6Cs4fB ydC8qa+n7MHrMviOWqJXlvivWvJGtPpVQbc5lMIR1xc6pIpfqjCuiVlDFM6q02zpylwo jEQg== X-Forwarded-Encrypted: i=1; AFNElJ84Zm9Aw989u129e66Rx5Xb1tH24yK8ix6umBEKi8b3YVUGw5nI64x1tkW5t62YtyTXCw3a9JIn+H2XYjc=@vger.kernel.org X-Gm-Message-State: AOJu0YxnTkHsr0i8FgRhezXxWk3zcZw21qkhzenPD7a8VHjIGAZQB7VS UgB/T6dmrpkN63gmt6RP9Kbgv9Bf575u1ZrJoNcKak5t1XsBOuLwZSHEG6rroR8wwM1g4aglawO k3c2zAIKBjQVhKzGT9YLYnqG8vw== X-Received: from jablt3.prod.google.com ([2002:a05:6638:ac03:b0:5e7:3fde:8787]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:10d2:b0:496:b7c:274b with SMTP id 5614622812f47-4960edef744mr2368951b6e.19.1782938623414; Wed, 01 Jul 2026 13:43:43 -0700 (PDT) Date: Wed, 1 Jul 2026 20:43:37 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.55.0.rc2.803.g1fd1e6609c-goog Message-ID: <20260701204342.2654385-1-coltonlewis@google.com> Subject: [PATCH 0/5] Backport ARM64 VHE boot fixes to 6.6.y From: Colton Lewis To: stable@vger.kernel.org Cc: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Mingwei Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Colton Lewis Content-Type: text/plain; charset="UTF-8" This series backports VHE CPU boot fixes to the 6.6.y stable branch. These fixes are already present in the 6.12.y stable branch (and newer), but are missing in 6.6.y. They are required to enable booting L1 guests with nested virtualization enabled (kvm-arm.mode=nested). Without these patches, a 6.6.y guest boots with HCR_EL2.E2H incorrectly configured (because it misses VHE-only detection or early initialization), causing early boot hangs/trap loops. Conflict resolutions: - Patch 4 (KVM: arm64: Initialize HCR_EL2.E2H early) had conflicts in arch/arm64/kvm/hyp/nvhe/hyp-init.S due to differences in state initialization. Resolved by extracting EL2 state initialization into __kvm_init_el2_state. - Patch 5 (arm64: Revamp HCR_EL2.E2H RES1 detection) had conflicts in arch/arm64/include/asm/el2_setup.h. Resolved by using raw msr hcr_el2 instead of the missing msr_hcr_el2 macro. Marc Zyngier (4): arm64: sysreg: Add layout for ID_AA64MMFR4_EL1 arm64: Treat HCR_EL2.E2H as RES1 when ID_AA64MMFR4_EL1.E2H0 is negative arm64: Fix early handling of FEAT_E2H0 not being implemented arm64: Revamp HCR_EL2.E2H RES1 detection Mark Rutland (1): KVM: arm64: Initialize HCR_EL2.E2H early arch/arm64/include/asm/el2_setup.h | 52 ++++++++++++++++++++++++++++++ arch/arm64/kernel/head.S | 17 +++------- arch/arm64/kvm/hyp/nvhe/hyp-init.S | 16 +++++++-- arch/arm64/tools/sysreg | 37 +++++++++++++++++++++ 4 files changed, 107 insertions(+), 15 deletions(-) base-commit: d1cfde2d5d15be14123bdd1689162bd27f995a90 -- 2.55.0.rc2.803.g1fd1e6609c-goog