mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-04 04:03:04 +09:00
eba129ae15
Expose PSCI version v1.1 to the guest by default. The only difference for now is that an updated version number is reported by PSCI_VERSION. Cc: Marc Zyngier <maz@kernel.org> Cc: James Morse <james.morse@arm.com> Cc: Alexandru Elisei <alexandru.elisei@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20220221153524.15397-2-will@kernel.org (cherry picked from commit512865d83f) [willdeacon@: Resolved conflict in arm64/kvm/psci.c the same way as upstream merge commit1a48ce9264("Merge branch kvm-arm64/psci-1.1 into kvmarm-master/next")] Signed-off-by: Will Deacon <willdeacon@google.com> Bug: 233587962 Bug: 233588291 Change-Id: Icb7bfc49936ab5214370cb2c53087d6cca1b6154