On Tue, Mar 16, 2021 at 01:43:19PM +0000, Vladimir Murzin wrote: > Commit 78869f0f0552 ("arm64: Extract parts of el2_setup into a macro") > reorganized el2 setup in such way that virtual cpu id registers set > only in nVHE, yet they used (and need) to be set irrespective VHE > support. > > Fixes: 78869f0f0552 ("arm64: Extract parts of el2_setup into a macro") > Signed-off-by: Vladimir Murzin <vladimir.murzin@xxxxxxx> > --- > Changelog > > v1 -> v2 > - Drop the reference to 32bit guests from commit message (per Marc) > > There is no upstream fix since issue went away due to code there has > been reworked in 5.12: nVHE comes first, so virtual cpu id register > are always set. > > Maintainers, please, Ack. > > arch/arm64/include/asm/el2_setup.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Will Deacon <will@xxxxxxxxxx> It's a bit weird to have a patch in stable that isn't upstream, but I don't see a better option here. Will