On 30.06.19 17:19, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
>
> The only difference between the currently supported A15 and A7 target
> cores is the reset state of bit 11 in SCTLR. This bit is RES1 or RAO/WI
> in other ARM cores, including ARMv8 ones. By promoting A7 to a generic
> default target, this allows to use yet unsupported core types. E.g.,
> this enables KVM on the A72 of the RPi4.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
> ---
> arch/arm/include/uapi/asm/kvm.h | 1 +
> arch/arm/kvm/Makefile | 2 +-
> arch/arm/kvm/{coproc_a7.c => coproc_generic.c} | 18 +++++++++---------
> arch/arm/kvm/guest.c | 4 +---
> arch/arm/kvm/reset.c | 5 +----
> 5 files changed, 13 insertions(+), 17 deletions(-)
> rename arch/arm/kvm/{coproc_a7.c => coproc_generic.c} (70%)
>
> diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h
> index 4602464ebdfb..e0c5bbec3d3d 100644
> --- a/arch/arm/include/uapi/asm/kvm.h
> +++ b/arch/arm/include/uapi/asm/kvm.h
> @@ -70,6 +70,7 @@ struct kvm_regs {
> /* Supported Processor Types */
> #define KVM_ARM_TARGET_CORTEX_A15 0
> #define KVM_ARM_TARGET_CORTEX_A7 1
> +#define KVM_ARM_TARGET_GENERIC_V7 KVM_ARM_TARGET_CORTEX_A7
> #define KVM_ARM_NUM_TARGETS 2
>
> /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */
> diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile
> index 531e59f5be9c..d959f89135d6 100644
> --- a/arch/arm/kvm/Makefile
> +++ b/arch/arm/kvm/Makefile
> @@ -21,7 +21,7 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp/
>
> obj-y += kvm-arm.o init.o interrupts.o
> obj-y += handle_exit.o guest.o emulate.o reset.o
> -obj-y += coproc.o coproc_a15.o coproc_a7.o vgic-v3-coproc.o
> +obj-y += coproc.o coproc_a15.o coproc_generic.o vgic-v3-coproc.o
> obj-y += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o
> obj-y += $(KVM)/arm/psci.o $(KVM)/arm/perf.o
> obj-y += $(KVM)/arm/aarch32.o
> diff --git a/arch/arm/kvm/coproc_a7.c b/arch/arm/kvm/coproc_generic.c
> similarity index 70%
> rename from arch/arm/kvm/coproc_a7.c
> rename to arch/arm/kvm/coproc_generic.c
> index 40f643e1e05c..b32a541ad7bf 100644
> --- a/arch/arm/kvm/coproc_a7.c
> +++ b/arch/arm/kvm/coproc_generic.c
> @@ -15,28 +15,28 @@
> #include "coproc.h"
>
> /*
> - * Cortex-A7 specific CP15 registers.
> + * Generic CP15 registers.
> * CRn denotes the primary register number, but is copied to the CRm in the
> * user space API for 64-bit register access in line with the terminology used
> * in the ARM ARM.
> * Important: Must be sorted ascending by CRn, CRM, Op1, Op2 and with 64-bit
> * registers preceding 32-bit ones.
> */
> -static const struct coproc_reg a7_regs[] = {
> +static const struct coproc_reg generic_regs[] = {
> /* SCTLR: swapped by interrupt.S. */
> { CRn( 1), CRm( 0), Op1( 0), Op2( 0), is32,
> access_vm_reg, reset_val, c1_SCTLR, 0x00C50878 },
> };
>
> -static struct kvm_coproc_target_table a7_target_table = {
> - .target = KVM_ARM_TARGET_CORTEX_A7,
> - .table = a7_regs,
> - .num = ARRAY_SIZE(a7_regs),
> +static struct kvm_coproc_target_table generic_target_table = {
> + .target = KVM_ARM_TARGET_GENERIC_V7,
> + .table = generic_regs,
> + .num = ARRAY_SIZE(generic_regs),
> };
>
> -static int __init coproc_a7_init(void)
> +static int __init coproc_generic_init(void)
> {
> - kvm_register_target_coproc_table(&a7_target_table);
> + kvm_register_target_coproc_table(&generic_target_table);
> return 0;
> }
> -late_initcall(coproc_a7_init);
> +late_initcall(coproc_generic_init);
> diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c
> index 684cf64b4033..d33a24e70f49 100644
> --- a/arch/arm/kvm/guest.c
> +++ b/arch/arm/kvm/guest.c
> @@ -275,12 +275,10 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu,
> int __attribute_const__ kvm_target_cpu(void)
> {
> switch (read_cpuid_part()) {
> - case ARM_CPU_PART_CORTEX_A7:
> - return KVM_ARM_TARGET_CORTEX_A7;
> case ARM_CPU_PART_CORTEX_A15:
> return KVM_ARM_TARGET_CORTEX_A15;
> default:
> - return -EINVAL;
> + return KVM_ARM_TARGET_GENERIC_V7;
> }
> }
>
> diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
> index eb4174f6ebbd..d6e07500bab4 100644
> --- a/arch/arm/kvm/reset.c
> +++ b/arch/arm/kvm/reset.c
> @@ -43,13 +43,10 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
> struct kvm_regs *reset_regs;
>
> switch (vcpu->arch.target) {
> - case KVM_ARM_TARGET_CORTEX_A7:
> - case KVM_ARM_TARGET_CORTEX_A15:
> + default:
> reset_regs = &cortexa_regs_reset;
> vcpu->arch.midr = read_cpuid_id();
> break;
> - default:
> - return -ENODEV;
> }
>
> /* Reset core registers */
> --
> 2.16.4
>
Any comments on this one now? Vladimir, you had some concerns in the other
thread. I'm not sure if I got them correctly, if they apply here.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
