Skip to content

arm64: Survival kit for SCR_EL3.HCE==0 conditions

Marc Zyngier linux-arm-kernel lkml 1 version Applied

Status from this message: Applied to arm64 (for-next/misc), thanks!

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 14 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/5arm64: Directly expand __init_el2_nvhe_prepare_eret where neededarch/arm64/include/asm/el2_setup.h arch/arm64/kernel/head.S+2 -60 replies
2/5arm64: Handle UNDEF in the EL2 stub vectorsarch/arm64/kernel/hyp-stub.S+18 -14 replies
3/5arm64: Detect disabled HVC earlyarch/arm64/kernel/head.S+22 -03 replies
4/5arm64: Warn on booting at EL2 with HVC disabledarch/arm64/include/asm/virt.h arch/arm64/kernel/head.S arch/arm64/kernel/smp.c+23 -01 reply
5/5arm64: Document the requirement for SCR_EL3.HCEDocumentation/arm64/booting.rst+5 -02 replies

Reviews trailers per patch

1 of 5 patches has a Reviewed-by or Acked-by.

PatchRafał MiłeckiMark Rutland
1/5
2/5
3/5T-b
4/5T-b
5/5A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/5] arm64: Survival kit for SCR_EL3.HCE==0 conditions

Anyone vaguely familiar with the ARMv8 architecture would quickly understand that entering the kernel at EL2 without enabling the HVC instruction is... living dangerously. But as it turns out [0], there is a whole range of (*cough*) "high quality" (*cough*) Broadcom systems out there configured exactly like that.

If you are speechless, I'm right with you.

These machines have stopped being able to boot an upstream kernel since 5.12, where we changed the way we switch from nVHE to VHE, as this relies on the HVC instruction being usable... It is also worth noting that these systems have never been able to use KVM. Or kexec.

This small series addresses the issue by detecting an UNDEFing HVC in a fairly controlled environment, and in this case pretend that we have booted at EL1. It also documents the requirement for SCR_EL3.HCE to be set to *1* if the kernel is entered at EL2. Turns out that we really have to state the obvious.

This has been tested on a FVP model with a hacked-up boot-wrapper.

Note that I really don't think any of this is -stable material, except maybe for the documentation. It isn't 5.14 material either. Best case, this is 5.15, or maybe even later. If ever.

M. (drink required)

[0] https://lore.kernel.org/r/[email protected]

Marc Zyngier (5):
arm64: Directly expand __init_el2_nvhe_prepare_eret where needed
arm64: Handle UNDEF in the EL2 stub vectors
arm64: Detect disabled HVC early
arm64: Warn on booting at EL2 with HVC disabled
arm64: Document the requirement for SCR_EL3.HCE

 Documentation/arm64/booting.rst    |  5 +++++
 arch/arm64/include/asm/el2_setup.h |  6 ------
 arch/arm64/include/asm/virt.h      | 10 +++++++++
 arch/arm64/kernel/head.S           | 34 ++++++++++++++++++++++++++++++
 arch/arm64/kernel/hyp-stub.S       | 19 ++++++++++++++++-
 arch/arm64/kernel/smp.c            |  3 +++
 6 files changed, 70 insertions(+), 7 deletions(-)
Signature · 1 line
2.30.2