2013-09-03 23:12:07 +04:00
|
|
|
/*
|
|
|
|
* QEMU AArch64 CPU
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013 Linaro Ltd
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, see
|
|
|
|
* <http://www.gnu.org/licenses/gpl-2.0.html>
|
|
|
|
*/
|
|
|
|
|
2015-12-07 19:23:44 +03:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2013-09-03 23:12:07 +04:00
|
|
|
#include "cpu.h"
|
2019-05-23 17:35:07 +03:00
|
|
|
#include "qemu/module.h"
|
2013-09-03 23:12:07 +04:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
#include "hw/loader.h"
|
|
|
|
#endif
|
|
|
|
#include "sysemu/kvm.h"
|
2018-03-09 20:09:44 +03:00
|
|
|
#include "kvm_arm.h"
|
2018-08-16 16:05:28 +03:00
|
|
|
#include "qapi/visitor.h"
|
2013-09-03 23:12:07 +04:00
|
|
|
|
2014-04-15 22:18:48 +04:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
2015-05-15 05:22:52 +03:00
|
|
|
static uint64_t a57_a53_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
|
2014-04-15 22:18:48 +04:00
|
|
|
{
|
2019-03-23 03:41:14 +03:00
|
|
|
ARMCPU *cpu = env_archcpu(env);
|
2018-03-09 20:09:43 +03:00
|
|
|
|
|
|
|
/* Number of cores is in [25:24]; otherwise we RAZ */
|
|
|
|
return (cpu->core_count - 1) << 24;
|
2014-04-15 22:18:48 +04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2018-10-11 05:19:29 +03:00
|
|
|
static const ARMCPRegInfo cortex_a72_a57_a53_cp_reginfo[] = {
|
2014-04-15 22:18:48 +04:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
{ .name = "L2CTLR_EL1", .state = ARM_CP_STATE_AA64,
|
|
|
|
.opc0 = 3, .opc1 = 1, .crn = 11, .crm = 0, .opc2 = 2,
|
2015-05-15 05:22:52 +03:00
|
|
|
.access = PL1_RW, .readfn = a57_a53_l2ctlr_read,
|
2014-04-15 22:18:48 +04:00
|
|
|
.writefn = arm_cp_write_ignore },
|
|
|
|
{ .name = "L2CTLR",
|
|
|
|
.cp = 15, .opc1 = 1, .crn = 9, .crm = 0, .opc2 = 2,
|
2015-05-15 05:22:52 +03:00
|
|
|
.access = PL1_RW, .readfn = a57_a53_l2ctlr_read,
|
2014-04-15 22:18:48 +04:00
|
|
|
.writefn = arm_cp_write_ignore },
|
|
|
|
#endif
|
|
|
|
{ .name = "L2ECTLR_EL1", .state = ARM_CP_STATE_AA64,
|
|
|
|
.opc0 = 3, .opc1 = 1, .crn = 11, .crm = 0, .opc2 = 3,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
|
|
|
{ .name = "L2ECTLR",
|
|
|
|
.cp = 15, .opc1 = 1, .crn = 9, .crm = 0, .opc2 = 3,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
|
|
|
{ .name = "L2ACTLR", .state = ARM_CP_STATE_BOTH,
|
|
|
|
.opc0 = 3, .opc1 = 1, .crn = 15, .crm = 0, .opc2 = 0,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
|
|
|
{ .name = "CPUACTLR_EL1", .state = ARM_CP_STATE_AA64,
|
|
|
|
.opc0 = 3, .opc1 = 1, .crn = 15, .crm = 2, .opc2 = 0,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
|
|
|
{ .name = "CPUACTLR",
|
|
|
|
.cp = 15, .opc1 = 0, .crm = 15,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST | ARM_CP_64BIT, .resetvalue = 0 },
|
|
|
|
{ .name = "CPUECTLR_EL1", .state = ARM_CP_STATE_AA64,
|
|
|
|
.opc0 = 3, .opc1 = 1, .crn = 15, .crm = 2, .opc2 = 1,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
|
|
|
{ .name = "CPUECTLR",
|
|
|
|
.cp = 15, .opc1 = 1, .crm = 15,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST | ARM_CP_64BIT, .resetvalue = 0 },
|
|
|
|
{ .name = "CPUMERRSR_EL1", .state = ARM_CP_STATE_AA64,
|
|
|
|
.opc0 = 3, .opc1 = 1, .crn = 15, .crm = 2, .opc2 = 2,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
|
|
|
{ .name = "CPUMERRSR",
|
|
|
|
.cp = 15, .opc1 = 2, .crm = 15,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST | ARM_CP_64BIT, .resetvalue = 0 },
|
|
|
|
{ .name = "L2MERRSR_EL1", .state = ARM_CP_STATE_AA64,
|
|
|
|
.opc0 = 3, .opc1 = 1, .crn = 15, .crm = 2, .opc2 = 3,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
|
|
|
{ .name = "L2MERRSR",
|
|
|
|
.cp = 15, .opc1 = 3, .crm = 15,
|
|
|
|
.access = PL1_RW, .type = ARM_CP_CONST | ARM_CP_64BIT, .resetvalue = 0 },
|
|
|
|
REGINFO_SENTINEL
|
|
|
|
};
|
|
|
|
|
2014-04-15 22:18:44 +04:00
|
|
|
static void aarch64_a57_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
|
2015-03-11 16:21:06 +03:00
|
|
|
cpu->dtb_compatible = "arm,cortex-a57";
|
2014-04-15 22:18:44 +04:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_V8);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_NEON);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_AARCH64);
|
2014-04-15 22:18:49 +04:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_CBAR_RO);
|
2017-01-20 14:15:10 +03:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_EL2);
|
2016-02-11 14:17:31 +03:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_EL3);
|
2016-10-28 16:12:31 +03:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_PMU);
|
2014-04-15 22:18:44 +04:00
|
|
|
cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A57;
|
|
|
|
cpu->midr = 0x411fd070;
|
2015-06-15 20:06:08 +03:00
|
|
|
cpu->revidr = 0x00000000;
|
2014-04-15 22:18:44 +04:00
|
|
|
cpu->reset_fpsid = 0x41034070;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.mvfr0 = 0x10110222;
|
|
|
|
cpu->isar.mvfr1 = 0x12111111;
|
|
|
|
cpu->isar.mvfr2 = 0x00000043;
|
2014-04-15 22:18:44 +04:00
|
|
|
cpu->ctr = 0x8444c004;
|
|
|
|
cpu->reset_sctlr = 0x00c50838;
|
2020-09-10 20:38:52 +03:00
|
|
|
cpu->isar.id_pfr0 = 0x00000131;
|
|
|
|
cpu->isar.id_pfr1 = 0x00011011;
|
2020-02-14 20:51:03 +03:00
|
|
|
cpu->isar.id_dfr0 = 0x03010066;
|
2014-04-15 22:18:44 +04:00
|
|
|
cpu->id_afr0 = 0x00000000;
|
2020-02-14 20:51:13 +03:00
|
|
|
cpu->isar.id_mmfr0 = 0x10101105;
|
|
|
|
cpu->isar.id_mmfr1 = 0x40000000;
|
|
|
|
cpu->isar.id_mmfr2 = 0x01260000;
|
|
|
|
cpu->isar.id_mmfr3 = 0x02102211;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_isar0 = 0x02101110;
|
|
|
|
cpu->isar.id_isar1 = 0x13112111;
|
|
|
|
cpu->isar.id_isar2 = 0x21232042;
|
|
|
|
cpu->isar.id_isar3 = 0x01112131;
|
|
|
|
cpu->isar.id_isar4 = 0x00011142;
|
|
|
|
cpu->isar.id_isar5 = 0x00011121;
|
|
|
|
cpu->isar.id_isar6 = 0;
|
|
|
|
cpu->isar.id_aa64pfr0 = 0x00002222;
|
2020-02-14 20:51:04 +03:00
|
|
|
cpu->isar.id_aa64dfr0 = 0x10305106;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_aa64isar0 = 0x00011120;
|
2018-12-13 17:40:56 +03:00
|
|
|
cpu->isar.id_aa64mmfr0 = 0x00001124;
|
2020-02-14 20:51:06 +03:00
|
|
|
cpu->isar.dbgdidr = 0x3516d000;
|
2014-04-15 22:18:44 +04:00
|
|
|
cpu->clidr = 0x0a200023;
|
|
|
|
cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
|
|
|
|
cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
|
|
|
|
cpu->ccsidr[2] = 0x70ffe07a; /* 2048KB L2 cache */
|
|
|
|
cpu->dcz_blocksize = 4; /* 64 bytes */
|
2017-01-20 14:15:09 +03:00
|
|
|
cpu->gic_num_lrs = 4;
|
|
|
|
cpu->gic_vpribits = 5;
|
|
|
|
cpu->gic_vprebits = 5;
|
2018-10-11 05:19:29 +03:00
|
|
|
define_arm_cp_regs(cpu, cortex_a72_a57_a53_cp_reginfo);
|
2014-04-15 22:18:44 +04:00
|
|
|
}
|
|
|
|
|
2015-05-15 05:22:55 +03:00
|
|
|
static void aarch64_a53_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
|
|
|
|
cpu->dtb_compatible = "arm,cortex-a53";
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_V8);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_NEON);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_AARCH64);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_CBAR_RO);
|
2017-01-20 14:15:10 +03:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_EL2);
|
2016-02-11 14:17:31 +03:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_EL3);
|
2016-10-28 16:12:31 +03:00
|
|
|
set_feature(&cpu->env, ARM_FEATURE_PMU);
|
2015-06-15 20:06:08 +03:00
|
|
|
cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A53;
|
2015-05-15 05:22:55 +03:00
|
|
|
cpu->midr = 0x410fd034;
|
2015-06-15 20:06:08 +03:00
|
|
|
cpu->revidr = 0x00000000;
|
2015-05-15 05:22:55 +03:00
|
|
|
cpu->reset_fpsid = 0x41034070;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.mvfr0 = 0x10110222;
|
|
|
|
cpu->isar.mvfr1 = 0x12111111;
|
|
|
|
cpu->isar.mvfr2 = 0x00000043;
|
2015-05-15 05:22:55 +03:00
|
|
|
cpu->ctr = 0x84448004; /* L1Ip = VIPT */
|
|
|
|
cpu->reset_sctlr = 0x00c50838;
|
2020-09-10 20:38:52 +03:00
|
|
|
cpu->isar.id_pfr0 = 0x00000131;
|
|
|
|
cpu->isar.id_pfr1 = 0x00011011;
|
2020-02-14 20:51:03 +03:00
|
|
|
cpu->isar.id_dfr0 = 0x03010066;
|
2015-05-15 05:22:55 +03:00
|
|
|
cpu->id_afr0 = 0x00000000;
|
2020-02-14 20:51:13 +03:00
|
|
|
cpu->isar.id_mmfr0 = 0x10101105;
|
|
|
|
cpu->isar.id_mmfr1 = 0x40000000;
|
|
|
|
cpu->isar.id_mmfr2 = 0x01260000;
|
|
|
|
cpu->isar.id_mmfr3 = 0x02102211;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_isar0 = 0x02101110;
|
|
|
|
cpu->isar.id_isar1 = 0x13112111;
|
|
|
|
cpu->isar.id_isar2 = 0x21232042;
|
|
|
|
cpu->isar.id_isar3 = 0x01112131;
|
|
|
|
cpu->isar.id_isar4 = 0x00011142;
|
|
|
|
cpu->isar.id_isar5 = 0x00011121;
|
|
|
|
cpu->isar.id_isar6 = 0;
|
|
|
|
cpu->isar.id_aa64pfr0 = 0x00002222;
|
2020-02-14 20:51:04 +03:00
|
|
|
cpu->isar.id_aa64dfr0 = 0x10305106;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_aa64isar0 = 0x00011120;
|
2018-12-13 17:40:56 +03:00
|
|
|
cpu->isar.id_aa64mmfr0 = 0x00001122; /* 40 bit physical addr */
|
2020-02-14 20:51:06 +03:00
|
|
|
cpu->isar.dbgdidr = 0x3516d000;
|
2015-05-15 05:22:55 +03:00
|
|
|
cpu->clidr = 0x0a200023;
|
|
|
|
cpu->ccsidr[0] = 0x700fe01a; /* 32KB L1 dcache */
|
|
|
|
cpu->ccsidr[1] = 0x201fe00a; /* 32KB L1 icache */
|
|
|
|
cpu->ccsidr[2] = 0x707fe07a; /* 1024KB L2 cache */
|
|
|
|
cpu->dcz_blocksize = 4; /* 64 bytes */
|
2017-01-20 14:15:09 +03:00
|
|
|
cpu->gic_num_lrs = 4;
|
|
|
|
cpu->gic_vpribits = 5;
|
|
|
|
cpu->gic_vprebits = 5;
|
2018-10-11 05:19:29 +03:00
|
|
|
define_arm_cp_regs(cpu, cortex_a72_a57_a53_cp_reginfo);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void aarch64_a72_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
|
|
|
|
cpu->dtb_compatible = "arm,cortex-a72";
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_V8);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_NEON);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_AARCH64);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_CBAR_RO);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_EL2);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_EL3);
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_PMU);
|
|
|
|
cpu->midr = 0x410fd083;
|
|
|
|
cpu->revidr = 0x00000000;
|
|
|
|
cpu->reset_fpsid = 0x41034080;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.mvfr0 = 0x10110222;
|
|
|
|
cpu->isar.mvfr1 = 0x12111111;
|
|
|
|
cpu->isar.mvfr2 = 0x00000043;
|
2018-10-11 05:19:29 +03:00
|
|
|
cpu->ctr = 0x8444c004;
|
|
|
|
cpu->reset_sctlr = 0x00c50838;
|
2020-09-10 20:38:52 +03:00
|
|
|
cpu->isar.id_pfr0 = 0x00000131;
|
|
|
|
cpu->isar.id_pfr1 = 0x00011011;
|
2020-02-14 20:51:03 +03:00
|
|
|
cpu->isar.id_dfr0 = 0x03010066;
|
2018-10-11 05:19:29 +03:00
|
|
|
cpu->id_afr0 = 0x00000000;
|
2020-02-14 20:51:13 +03:00
|
|
|
cpu->isar.id_mmfr0 = 0x10201105;
|
|
|
|
cpu->isar.id_mmfr1 = 0x40000000;
|
|
|
|
cpu->isar.id_mmfr2 = 0x01260000;
|
|
|
|
cpu->isar.id_mmfr3 = 0x02102211;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_isar0 = 0x02101110;
|
|
|
|
cpu->isar.id_isar1 = 0x13112111;
|
|
|
|
cpu->isar.id_isar2 = 0x21232042;
|
|
|
|
cpu->isar.id_isar3 = 0x01112131;
|
|
|
|
cpu->isar.id_isar4 = 0x00011142;
|
|
|
|
cpu->isar.id_isar5 = 0x00011121;
|
|
|
|
cpu->isar.id_aa64pfr0 = 0x00002222;
|
2020-02-14 20:51:04 +03:00
|
|
|
cpu->isar.id_aa64dfr0 = 0x10305106;
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_aa64isar0 = 0x00011120;
|
2018-12-13 17:40:56 +03:00
|
|
|
cpu->isar.id_aa64mmfr0 = 0x00001124;
|
2020-02-14 20:51:06 +03:00
|
|
|
cpu->isar.dbgdidr = 0x3516d000;
|
2018-10-11 05:19:29 +03:00
|
|
|
cpu->clidr = 0x0a200023;
|
|
|
|
cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
|
|
|
|
cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
|
|
|
|
cpu->ccsidr[2] = 0x707fe07a; /* 1MB L2 cache */
|
|
|
|
cpu->dcz_blocksize = 4; /* 64 bytes */
|
|
|
|
cpu->gic_num_lrs = 4;
|
|
|
|
cpu->gic_vpribits = 5;
|
|
|
|
cpu->gic_vprebits = 5;
|
|
|
|
define_arm_cp_regs(cpu, cortex_a72_a57_a53_cp_reginfo);
|
2015-05-15 05:22:55 +03:00
|
|
|
}
|
|
|
|
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* If any vector lengths are explicitly enabled with sve<N> properties,
|
|
|
|
* then all other lengths are implicitly disabled. If sve-max-vq is
|
|
|
|
* specified then it is the same as explicitly enabling all lengths
|
|
|
|
* up to and including the specified maximum, which means all larger
|
|
|
|
* lengths will be implicitly disabled. If no sve<N> properties
|
|
|
|
* are enabled and sve-max-vq is not specified, then all lengths not
|
|
|
|
* explicitly disabled will be enabled. Additionally, all power-of-two
|
|
|
|
* vector lengths less than the maximum enabled length will be
|
|
|
|
* automatically enabled and all vector lengths larger than the largest
|
|
|
|
* disabled power-of-two vector length will be automatically disabled.
|
|
|
|
* Errors are generated if the user provided input that interferes with
|
|
|
|
* any of the above. Finally, if SVE is not disabled, then at least one
|
|
|
|
* vector length must be enabled.
|
|
|
|
*/
|
2019-10-31 17:27:33 +03:00
|
|
|
DECLARE_BITMAP(kvm_supported, ARM_MAX_VQ);
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
DECLARE_BITMAP(tmp, ARM_MAX_VQ);
|
|
|
|
uint32_t vq, max_vq = 0;
|
|
|
|
|
2019-10-31 17:27:33 +03:00
|
|
|
/* Collect the set of vector lengths supported by KVM. */
|
|
|
|
bitmap_zero(kvm_supported, ARM_MAX_VQ);
|
target/arm: Check supported KVM features globally (not per vCPU)
Since commit d70c996df23f, when enabling the PMU we get:
$ qemu-system-aarch64 -cpu host,pmu=on -M virt,accel=kvm,gic-version=3
Segmentation fault (core dumped)
Thread 1 "qemu-system-aar" received signal SIGSEGV, Segmentation fault.
0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
2588 ret = ioctl(s->fd, type, arg);
(gdb) bt
#0 0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
#1 0x0000aaaaaae31568 in kvm_check_extension (s=0x0, extension=126) at accel/kvm/kvm-all.c:916
#2 0x0000aaaaaafce254 in kvm_arm_pmu_supported (cpu=0xaaaaac214ab0) at target/arm/kvm.c:213
#3 0x0000aaaaaafc0f94 in arm_set_pmu (obj=0xaaaaac214ab0, value=true, errp=0xffffffffe438) at target/arm/cpu.c:1111
#4 0x0000aaaaab5533ac in property_set_bool (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", opaque=0xaaaaac222730, errp=0xffffffffe438) at qom/object.c:2170
#5 0x0000aaaaab5512f0 in object_property_set (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1328
#6 0x0000aaaaab551e10 in object_property_parse (obj=0xaaaaac214ab0, string=0xaaaaac11b4c0 "on", name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1561
#7 0x0000aaaaab54ee8c in object_apply_global_props (obj=0xaaaaac214ab0, props=0xaaaaac018e20, errp=0xaaaaabd6fd88 <error_fatal>) at qom/object.c:407
#8 0x0000aaaaab1dd5a4 in qdev_prop_set_globals (dev=0xaaaaac214ab0) at hw/core/qdev-properties.c:1218
#9 0x0000aaaaab1d9fac in device_post_init (obj=0xaaaaac214ab0) at hw/core/qdev.c:1050
...
#15 0x0000aaaaab54f310 in object_initialize_with_type (obj=0xaaaaac214ab0, size=52208, type=0xaaaaabe237f0) at qom/object.c:512
#16 0x0000aaaaab54fa24 in object_new_with_type (type=0xaaaaabe237f0) at qom/object.c:687
#17 0x0000aaaaab54fa80 in object_new (typename=0xaaaaabe23970 "host-arm-cpu") at qom/object.c:702
#18 0x0000aaaaaaf04a74 in machvirt_init (machine=0xaaaaac0a8550) at hw/arm/virt.c:1770
#19 0x0000aaaaab1e8720 in machine_run_board_init (machine=0xaaaaac0a8550) at hw/core/machine.c:1138
#20 0x0000aaaaaaf95394 in qemu_init (argc=5, argv=0xffffffffea58, envp=0xffffffffea88) at softmmu/vl.c:4348
#21 0x0000aaaaaada3f74 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at softmmu/main.c:48
This is because in frame #2, cpu->kvm_state is still NULL
(the vCPU is not yet realized).
KVM has a hard requirement of all cores supporting the same
feature set. We only need to check if the accelerator supports
a feature, not each vCPU individually.
Fix by removing the 'CPUState *cpu' argument from the
kvm_arm_<FEATURE>_supported() functions.
Fixes: d70c996df23f ('Use CPUState::kvm_state in kvm_arm_pmu_supported')
Reported-by: Haibo Xu <haibo.xu@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-06-23 12:06:22 +03:00
|
|
|
if (kvm_enabled() && kvm_arm_sve_supported()) {
|
2019-10-31 17:27:33 +03:00
|
|
|
kvm_arm_sve_get_vls(CPU(cpu), kvm_supported);
|
|
|
|
} else if (kvm_enabled()) {
|
|
|
|
assert(!cpu_isar_feature(aa64_sve, cpu));
|
|
|
|
}
|
|
|
|
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
/*
|
|
|
|
* Process explicit sve<N> properties.
|
|
|
|
* From the properties, sve_vq_map<N> implies sve_vq_init<N>.
|
|
|
|
* Check first for any sve<N> enabled.
|
|
|
|
*/
|
|
|
|
if (!bitmap_empty(cpu->sve_vq_map, ARM_MAX_VQ)) {
|
|
|
|
max_vq = find_last_bit(cpu->sve_vq_map, ARM_MAX_VQ) + 1;
|
|
|
|
|
|
|
|
if (cpu->sve_max_vq && max_vq > cpu->sve_max_vq) {
|
|
|
|
error_setg(errp, "cannot enable sve%d", max_vq * 128);
|
|
|
|
error_append_hint(errp, "sve%d is larger than the maximum vector "
|
|
|
|
"length, sve-max-vq=%d (%d bits)\n",
|
|
|
|
max_vq * 128, cpu->sve_max_vq,
|
|
|
|
cpu->sve_max_vq * 128);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-10-31 17:27:33 +03:00
|
|
|
if (kvm_enabled()) {
|
|
|
|
/*
|
|
|
|
* For KVM we have to automatically enable all supported unitialized
|
|
|
|
* lengths, even when the smaller lengths are not all powers-of-two.
|
|
|
|
*/
|
|
|
|
bitmap_andnot(tmp, kvm_supported, cpu->sve_vq_init, max_vq);
|
|
|
|
bitmap_or(cpu->sve_vq_map, cpu->sve_vq_map, tmp, max_vq);
|
|
|
|
} else {
|
|
|
|
/* Propagate enabled bits down through required powers-of-two. */
|
|
|
|
for (vq = pow2floor(max_vq); vq >= 1; vq >>= 1) {
|
|
|
|
if (!test_bit(vq - 1, cpu->sve_vq_init)) {
|
|
|
|
set_bit(vq - 1, cpu->sve_vq_map);
|
|
|
|
}
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (cpu->sve_max_vq == 0) {
|
|
|
|
/*
|
|
|
|
* No explicit bits enabled, and no implicit bits from sve-max-vq.
|
|
|
|
*/
|
|
|
|
if (!cpu_isar_feature(aa64_sve, cpu)) {
|
|
|
|
/* SVE is disabled and so are all vector lengths. Good. */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-10-31 17:27:33 +03:00
|
|
|
if (kvm_enabled()) {
|
|
|
|
/* Disabling a supported length disables all larger lengths. */
|
|
|
|
for (vq = 1; vq <= ARM_MAX_VQ; ++vq) {
|
|
|
|
if (test_bit(vq - 1, cpu->sve_vq_init) &&
|
|
|
|
test_bit(vq - 1, kvm_supported)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
max_vq = vq <= ARM_MAX_VQ ? vq - 1 : ARM_MAX_VQ;
|
|
|
|
bitmap_andnot(cpu->sve_vq_map, kvm_supported,
|
|
|
|
cpu->sve_vq_init, max_vq);
|
|
|
|
if (max_vq == 0 || bitmap_empty(cpu->sve_vq_map, max_vq)) {
|
|
|
|
error_setg(errp, "cannot disable sve%d", vq * 128);
|
|
|
|
error_append_hint(errp, "Disabling sve%d results in all "
|
|
|
|
"vector lengths being disabled.\n",
|
|
|
|
vq * 128);
|
|
|
|
error_append_hint(errp, "With SVE enabled, at least one "
|
|
|
|
"vector length must be enabled.\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Disabling a power-of-two disables all larger lengths. */
|
|
|
|
if (test_bit(0, cpu->sve_vq_init)) {
|
|
|
|
error_setg(errp, "cannot disable sve128");
|
|
|
|
error_append_hint(errp, "Disabling sve128 results in all "
|
|
|
|
"vector lengths being disabled.\n");
|
|
|
|
error_append_hint(errp, "With SVE enabled, at least one "
|
|
|
|
"vector length must be enabled.\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (vq = 2; vq <= ARM_MAX_VQ; vq <<= 1) {
|
|
|
|
if (test_bit(vq - 1, cpu->sve_vq_init)) {
|
|
|
|
break;
|
|
|
|
}
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
}
|
2019-10-31 17:27:33 +03:00
|
|
|
max_vq = vq <= ARM_MAX_VQ ? vq - 1 : ARM_MAX_VQ;
|
|
|
|
bitmap_complement(cpu->sve_vq_map, cpu->sve_vq_init, max_vq);
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
max_vq = find_last_bit(cpu->sve_vq_map, max_vq) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Process the sve-max-vq property.
|
|
|
|
* Note that we know from the above that no bit above
|
|
|
|
* sve-max-vq is currently set.
|
|
|
|
*/
|
|
|
|
if (cpu->sve_max_vq != 0) {
|
|
|
|
max_vq = cpu->sve_max_vq;
|
|
|
|
|
|
|
|
if (!test_bit(max_vq - 1, cpu->sve_vq_map) &&
|
|
|
|
test_bit(max_vq - 1, cpu->sve_vq_init)) {
|
|
|
|
error_setg(errp, "cannot disable sve%d", max_vq * 128);
|
|
|
|
error_append_hint(errp, "The maximum vector length must be "
|
|
|
|
"enabled, sve-max-vq=%d (%d bits)\n",
|
|
|
|
max_vq, max_vq * 128);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set all bits not explicitly set within sve-max-vq. */
|
|
|
|
bitmap_complement(tmp, cpu->sve_vq_init, max_vq);
|
|
|
|
bitmap_or(cpu->sve_vq_map, cpu->sve_vq_map, tmp, max_vq);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We should know what max-vq is now. Also, as we're done
|
|
|
|
* manipulating sve-vq-map, we ensure any bits above max-vq
|
|
|
|
* are clear, just in case anybody looks.
|
|
|
|
*/
|
|
|
|
assert(max_vq != 0);
|
|
|
|
bitmap_clear(cpu->sve_vq_map, max_vq, ARM_MAX_VQ - max_vq);
|
|
|
|
|
2019-10-31 17:27:33 +03:00
|
|
|
if (kvm_enabled()) {
|
|
|
|
/* Ensure the set of lengths matches what KVM supports. */
|
|
|
|
bitmap_xor(tmp, cpu->sve_vq_map, kvm_supported, max_vq);
|
|
|
|
if (!bitmap_empty(tmp, max_vq)) {
|
|
|
|
vq = find_last_bit(tmp, max_vq) + 1;
|
|
|
|
if (test_bit(vq - 1, cpu->sve_vq_map)) {
|
|
|
|
if (cpu->sve_max_vq) {
|
|
|
|
error_setg(errp, "cannot set sve-max-vq=%d",
|
|
|
|
cpu->sve_max_vq);
|
|
|
|
error_append_hint(errp, "This KVM host does not support "
|
|
|
|
"the vector length %d-bits.\n",
|
|
|
|
vq * 128);
|
|
|
|
error_append_hint(errp, "It may not be possible to use "
|
|
|
|
"sve-max-vq with this KVM host. Try "
|
|
|
|
"using only sve<N> properties.\n");
|
|
|
|
} else {
|
|
|
|
error_setg(errp, "cannot enable sve%d", vq * 128);
|
|
|
|
error_append_hint(errp, "This KVM host does not support "
|
|
|
|
"the vector length %d-bits.\n",
|
|
|
|
vq * 128);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
error_setg(errp, "cannot disable sve%d", vq * 128);
|
|
|
|
error_append_hint(errp, "The KVM host requires all "
|
|
|
|
"supported vector lengths smaller "
|
|
|
|
"than %d bits to also be enabled.\n",
|
|
|
|
max_vq * 128);
|
|
|
|
}
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
return;
|
|
|
|
}
|
2019-10-31 17:27:33 +03:00
|
|
|
} else {
|
|
|
|
/* Ensure all required powers-of-two are enabled. */
|
|
|
|
for (vq = pow2floor(max_vq); vq >= 1; vq >>= 1) {
|
|
|
|
if (!test_bit(vq - 1, cpu->sve_vq_map)) {
|
|
|
|
error_setg(errp, "cannot disable sve%d", vq * 128);
|
|
|
|
error_append_hint(errp, "sve%d is required as it "
|
|
|
|
"is a power-of-two length smaller than "
|
|
|
|
"the maximum, sve%d\n",
|
|
|
|
vq * 128, max_vq * 128);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now that we validated all our vector lengths, the only question
|
|
|
|
* left to answer is if we even want SVE at all.
|
|
|
|
*/
|
|
|
|
if (!cpu_isar_feature(aa64_sve, cpu)) {
|
|
|
|
error_setg(errp, "cannot enable sve%d", max_vq * 128);
|
|
|
|
error_append_hint(errp, "SVE must be enabled to enable vector "
|
|
|
|
"lengths.\n");
|
|
|
|
error_append_hint(errp, "Add sve=on to the CPU property list.\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* From now on sve_max_vq is the actual maximum supported length. */
|
|
|
|
cpu->sve_max_vq = max_vq;
|
|
|
|
}
|
|
|
|
|
2019-10-31 17:27:28 +03:00
|
|
|
static void cpu_max_get_sve_max_vq(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2018-08-16 16:05:28 +03:00
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
2019-10-31 17:27:28 +03:00
|
|
|
uint32_t value;
|
|
|
|
|
|
|
|
/* All vector lengths are disabled when SVE is off. */
|
|
|
|
if (!cpu_isar_feature(aa64_sve, cpu)) {
|
|
|
|
value = 0;
|
|
|
|
} else {
|
|
|
|
value = cpu->sve_max_vq;
|
|
|
|
}
|
|
|
|
visit_type_uint32(v, name, &value, errp);
|
2018-08-16 16:05:28 +03:00
|
|
|
}
|
|
|
|
|
2019-10-31 17:27:28 +03:00
|
|
|
static void cpu_max_set_sve_max_vq(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2018-08-16 16:05:28 +03:00
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
2019-10-31 17:27:33 +03:00
|
|
|
uint32_t max_vq;
|
|
|
|
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!visit_type_uint32(v, name, &max_vq, errp)) {
|
2019-10-31 17:27:33 +03:00
|
|
|
return;
|
|
|
|
}
|
2018-08-16 16:05:28 +03:00
|
|
|
|
target/arm: Check supported KVM features globally (not per vCPU)
Since commit d70c996df23f, when enabling the PMU we get:
$ qemu-system-aarch64 -cpu host,pmu=on -M virt,accel=kvm,gic-version=3
Segmentation fault (core dumped)
Thread 1 "qemu-system-aar" received signal SIGSEGV, Segmentation fault.
0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
2588 ret = ioctl(s->fd, type, arg);
(gdb) bt
#0 0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
#1 0x0000aaaaaae31568 in kvm_check_extension (s=0x0, extension=126) at accel/kvm/kvm-all.c:916
#2 0x0000aaaaaafce254 in kvm_arm_pmu_supported (cpu=0xaaaaac214ab0) at target/arm/kvm.c:213
#3 0x0000aaaaaafc0f94 in arm_set_pmu (obj=0xaaaaac214ab0, value=true, errp=0xffffffffe438) at target/arm/cpu.c:1111
#4 0x0000aaaaab5533ac in property_set_bool (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", opaque=0xaaaaac222730, errp=0xffffffffe438) at qom/object.c:2170
#5 0x0000aaaaab5512f0 in object_property_set (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1328
#6 0x0000aaaaab551e10 in object_property_parse (obj=0xaaaaac214ab0, string=0xaaaaac11b4c0 "on", name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1561
#7 0x0000aaaaab54ee8c in object_apply_global_props (obj=0xaaaaac214ab0, props=0xaaaaac018e20, errp=0xaaaaabd6fd88 <error_fatal>) at qom/object.c:407
#8 0x0000aaaaab1dd5a4 in qdev_prop_set_globals (dev=0xaaaaac214ab0) at hw/core/qdev-properties.c:1218
#9 0x0000aaaaab1d9fac in device_post_init (obj=0xaaaaac214ab0) at hw/core/qdev.c:1050
...
#15 0x0000aaaaab54f310 in object_initialize_with_type (obj=0xaaaaac214ab0, size=52208, type=0xaaaaabe237f0) at qom/object.c:512
#16 0x0000aaaaab54fa24 in object_new_with_type (type=0xaaaaabe237f0) at qom/object.c:687
#17 0x0000aaaaab54fa80 in object_new (typename=0xaaaaabe23970 "host-arm-cpu") at qom/object.c:702
#18 0x0000aaaaaaf04a74 in machvirt_init (machine=0xaaaaac0a8550) at hw/arm/virt.c:1770
#19 0x0000aaaaab1e8720 in machine_run_board_init (machine=0xaaaaac0a8550) at hw/core/machine.c:1138
#20 0x0000aaaaaaf95394 in qemu_init (argc=5, argv=0xffffffffea58, envp=0xffffffffea88) at softmmu/vl.c:4348
#21 0x0000aaaaaada3f74 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at softmmu/main.c:48
This is because in frame #2, cpu->kvm_state is still NULL
(the vCPU is not yet realized).
KVM has a hard requirement of all cores supporting the same
feature set. We only need to check if the accelerator supports
a feature, not each vCPU individually.
Fix by removing the 'CPUState *cpu' argument from the
kvm_arm_<FEATURE>_supported() functions.
Fixes: d70c996df23f ('Use CPUState::kvm_state in kvm_arm_pmu_supported')
Reported-by: Haibo Xu <haibo.xu@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-06-23 12:06:22 +03:00
|
|
|
if (kvm_enabled() && !kvm_arm_sve_supported()) {
|
2019-10-31 17:27:33 +03:00
|
|
|
error_setg(errp, "cannot set sve-max-vq");
|
|
|
|
error_append_hint(errp, "SVE not supported by KVM on this host\n");
|
|
|
|
return;
|
|
|
|
}
|
2018-08-16 16:05:28 +03:00
|
|
|
|
2019-10-31 17:27:33 +03:00
|
|
|
if (max_vq == 0 || max_vq > ARM_MAX_VQ) {
|
|
|
|
error_setg(errp, "unsupported SVE vector length");
|
|
|
|
error_append_hint(errp, "Valid sve-max-vq in range [1-%d]\n",
|
2018-08-16 16:05:28 +03:00
|
|
|
ARM_MAX_VQ);
|
2019-10-31 17:27:33 +03:00
|
|
|
return;
|
2018-08-16 16:05:28 +03:00
|
|
|
}
|
2019-10-31 17:27:33 +03:00
|
|
|
|
|
|
|
cpu->sve_max_vq = max_vq;
|
2018-08-16 16:05:28 +03:00
|
|
|
}
|
|
|
|
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
static void cpu_arm_get_sve_vq(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
uint32_t vq = atoi(&name[3]) / 128;
|
|
|
|
bool value;
|
|
|
|
|
|
|
|
/* All vector lengths are disabled when SVE is off. */
|
|
|
|
if (!cpu_isar_feature(aa64_sve, cpu)) {
|
|
|
|
value = false;
|
|
|
|
} else {
|
|
|
|
value = test_bit(vq - 1, cpu->sve_vq_map);
|
|
|
|
}
|
|
|
|
visit_type_bool(v, name, &value, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cpu_arm_set_sve_vq(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
uint32_t vq = atoi(&name[3]) / 128;
|
|
|
|
bool value;
|
|
|
|
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!visit_type_bool(v, name, &value, errp)) {
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
target/arm: Check supported KVM features globally (not per vCPU)
Since commit d70c996df23f, when enabling the PMU we get:
$ qemu-system-aarch64 -cpu host,pmu=on -M virt,accel=kvm,gic-version=3
Segmentation fault (core dumped)
Thread 1 "qemu-system-aar" received signal SIGSEGV, Segmentation fault.
0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
2588 ret = ioctl(s->fd, type, arg);
(gdb) bt
#0 0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
#1 0x0000aaaaaae31568 in kvm_check_extension (s=0x0, extension=126) at accel/kvm/kvm-all.c:916
#2 0x0000aaaaaafce254 in kvm_arm_pmu_supported (cpu=0xaaaaac214ab0) at target/arm/kvm.c:213
#3 0x0000aaaaaafc0f94 in arm_set_pmu (obj=0xaaaaac214ab0, value=true, errp=0xffffffffe438) at target/arm/cpu.c:1111
#4 0x0000aaaaab5533ac in property_set_bool (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", opaque=0xaaaaac222730, errp=0xffffffffe438) at qom/object.c:2170
#5 0x0000aaaaab5512f0 in object_property_set (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1328
#6 0x0000aaaaab551e10 in object_property_parse (obj=0xaaaaac214ab0, string=0xaaaaac11b4c0 "on", name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1561
#7 0x0000aaaaab54ee8c in object_apply_global_props (obj=0xaaaaac214ab0, props=0xaaaaac018e20, errp=0xaaaaabd6fd88 <error_fatal>) at qom/object.c:407
#8 0x0000aaaaab1dd5a4 in qdev_prop_set_globals (dev=0xaaaaac214ab0) at hw/core/qdev-properties.c:1218
#9 0x0000aaaaab1d9fac in device_post_init (obj=0xaaaaac214ab0) at hw/core/qdev.c:1050
...
#15 0x0000aaaaab54f310 in object_initialize_with_type (obj=0xaaaaac214ab0, size=52208, type=0xaaaaabe237f0) at qom/object.c:512
#16 0x0000aaaaab54fa24 in object_new_with_type (type=0xaaaaabe237f0) at qom/object.c:687
#17 0x0000aaaaab54fa80 in object_new (typename=0xaaaaabe23970 "host-arm-cpu") at qom/object.c:702
#18 0x0000aaaaaaf04a74 in machvirt_init (machine=0xaaaaac0a8550) at hw/arm/virt.c:1770
#19 0x0000aaaaab1e8720 in machine_run_board_init (machine=0xaaaaac0a8550) at hw/core/machine.c:1138
#20 0x0000aaaaaaf95394 in qemu_init (argc=5, argv=0xffffffffea58, envp=0xffffffffea88) at softmmu/vl.c:4348
#21 0x0000aaaaaada3f74 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at softmmu/main.c:48
This is because in frame #2, cpu->kvm_state is still NULL
(the vCPU is not yet realized).
KVM has a hard requirement of all cores supporting the same
feature set. We only need to check if the accelerator supports
a feature, not each vCPU individually.
Fix by removing the 'CPUState *cpu' argument from the
kvm_arm_<FEATURE>_supported() functions.
Fixes: d70c996df23f ('Use CPUState::kvm_state in kvm_arm_pmu_supported')
Reported-by: Haibo Xu <haibo.xu@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-06-23 12:06:22 +03:00
|
|
|
if (value && kvm_enabled() && !kvm_arm_sve_supported()) {
|
2019-10-31 17:27:33 +03:00
|
|
|
error_setg(errp, "cannot enable %s", name);
|
|
|
|
error_append_hint(errp, "SVE not supported by KVM on this host\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
target/arm/cpu64: max cpu: Introduce sve<N> properties
Introduce cpu properties to give fine control over SVE vector lengths.
We introduce a property for each valid length up to the current
maximum supported, which is 2048-bits. The properties are named, e.g.
sve128, sve256, sve384, sve512, ..., where the number is the number of
bits. See the updates to docs/arm-cpu-features.rst for a description
of the semantics and for example uses.
Note, as sve-max-vq is still present and we'd like to be able to
support qmp_query_cpu_model_expansion with guests launched with e.g.
-cpu max,sve-max-vq=8 on their command lines, then we do allow
sve-max-vq and sve<N> properties to be provided at the same time, but
this is not recommended, and is why sve-max-vq is not mentioned in the
document. If sve-max-vq is provided then it enables all lengths smaller
than and including the max and disables all lengths larger. It also has
the side-effect that no larger lengths may be enabled and that the max
itself cannot be disabled. Smaller non-power-of-two lengths may,
however, be disabled, e.g. -cpu max,sve-max-vq=4,sve384=off provides a
guest the vector lengths 128, 256, and 512 bits.
This patch has been co-authored with Richard Henderson, who reworked
the target/arm/cpu64.c changes in order to push all the validation and
auto-enabling/disabling steps into the finalizer, resulting in a nice
LOC reduction.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Beata Michalska <beata.michalska@linaro.org>
Message-id: 20191031142734.8590-5-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2019-10-31 17:27:29 +03:00
|
|
|
if (value) {
|
|
|
|
set_bit(vq - 1, cpu->sve_vq_map);
|
|
|
|
} else {
|
|
|
|
clear_bit(vq - 1, cpu->sve_vq_map);
|
|
|
|
}
|
|
|
|
set_bit(vq - 1, cpu->sve_vq_init);
|
|
|
|
}
|
|
|
|
|
2019-10-31 17:27:28 +03:00
|
|
|
static void cpu_arm_get_sve(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
bool value = cpu_isar_feature(aa64_sve, cpu);
|
|
|
|
|
|
|
|
visit_type_bool(v, name, &value, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cpu_arm_set_sve(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
bool value;
|
|
|
|
uint64_t t;
|
|
|
|
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!visit_type_bool(v, name, &value, errp)) {
|
2019-10-31 17:27:28 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
target/arm: Check supported KVM features globally (not per vCPU)
Since commit d70c996df23f, when enabling the PMU we get:
$ qemu-system-aarch64 -cpu host,pmu=on -M virt,accel=kvm,gic-version=3
Segmentation fault (core dumped)
Thread 1 "qemu-system-aar" received signal SIGSEGV, Segmentation fault.
0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
2588 ret = ioctl(s->fd, type, arg);
(gdb) bt
#0 0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
#1 0x0000aaaaaae31568 in kvm_check_extension (s=0x0, extension=126) at accel/kvm/kvm-all.c:916
#2 0x0000aaaaaafce254 in kvm_arm_pmu_supported (cpu=0xaaaaac214ab0) at target/arm/kvm.c:213
#3 0x0000aaaaaafc0f94 in arm_set_pmu (obj=0xaaaaac214ab0, value=true, errp=0xffffffffe438) at target/arm/cpu.c:1111
#4 0x0000aaaaab5533ac in property_set_bool (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", opaque=0xaaaaac222730, errp=0xffffffffe438) at qom/object.c:2170
#5 0x0000aaaaab5512f0 in object_property_set (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1328
#6 0x0000aaaaab551e10 in object_property_parse (obj=0xaaaaac214ab0, string=0xaaaaac11b4c0 "on", name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1561
#7 0x0000aaaaab54ee8c in object_apply_global_props (obj=0xaaaaac214ab0, props=0xaaaaac018e20, errp=0xaaaaabd6fd88 <error_fatal>) at qom/object.c:407
#8 0x0000aaaaab1dd5a4 in qdev_prop_set_globals (dev=0xaaaaac214ab0) at hw/core/qdev-properties.c:1218
#9 0x0000aaaaab1d9fac in device_post_init (obj=0xaaaaac214ab0) at hw/core/qdev.c:1050
...
#15 0x0000aaaaab54f310 in object_initialize_with_type (obj=0xaaaaac214ab0, size=52208, type=0xaaaaabe237f0) at qom/object.c:512
#16 0x0000aaaaab54fa24 in object_new_with_type (type=0xaaaaabe237f0) at qom/object.c:687
#17 0x0000aaaaab54fa80 in object_new (typename=0xaaaaabe23970 "host-arm-cpu") at qom/object.c:702
#18 0x0000aaaaaaf04a74 in machvirt_init (machine=0xaaaaac0a8550) at hw/arm/virt.c:1770
#19 0x0000aaaaab1e8720 in machine_run_board_init (machine=0xaaaaac0a8550) at hw/core/machine.c:1138
#20 0x0000aaaaaaf95394 in qemu_init (argc=5, argv=0xffffffffea58, envp=0xffffffffea88) at softmmu/vl.c:4348
#21 0x0000aaaaaada3f74 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at softmmu/main.c:48
This is because in frame #2, cpu->kvm_state is still NULL
(the vCPU is not yet realized).
KVM has a hard requirement of all cores supporting the same
feature set. We only need to check if the accelerator supports
a feature, not each vCPU individually.
Fix by removing the 'CPUState *cpu' argument from the
kvm_arm_<FEATURE>_supported() functions.
Fixes: d70c996df23f ('Use CPUState::kvm_state in kvm_arm_pmu_supported')
Reported-by: Haibo Xu <haibo.xu@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-06-23 12:06:22 +03:00
|
|
|
if (value && kvm_enabled() && !kvm_arm_sve_supported()) {
|
2019-10-31 17:27:31 +03:00
|
|
|
error_setg(errp, "'sve' feature not supported by KVM on this host");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-10-31 17:27:28 +03:00
|
|
|
t = cpu->isar.id_aa64pfr0;
|
|
|
|
t = FIELD_DP64(t, ID_AA64PFR0, SVE, value);
|
|
|
|
cpu->isar.id_aa64pfr0 = t;
|
|
|
|
}
|
|
|
|
|
2019-10-31 17:27:34 +03:00
|
|
|
void aarch64_add_sve_properties(Object *obj)
|
|
|
|
{
|
|
|
|
uint32_t vq;
|
|
|
|
|
|
|
|
object_property_add(obj, "sve", "bool", cpu_arm_get_sve,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
cpu_arm_set_sve, NULL, NULL);
|
2019-10-31 17:27:34 +03:00
|
|
|
|
|
|
|
for (vq = 1; vq <= ARM_MAX_VQ; ++vq) {
|
|
|
|
char name[8];
|
|
|
|
sprintf(name, "sve%d", vq * 128);
|
|
|
|
object_property_add(obj, name, "bool", cpu_arm_get_sve_vq,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
cpu_arm_set_sve_vq, NULL, NULL);
|
2019-10-31 17:27:34 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-09 20:09:44 +03:00
|
|
|
/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host);
|
|
|
|
* otherwise, a CPU with as many features enabled as our emulation supports.
|
|
|
|
* The version of '-cpu max' for qemu-system-arm is defined in cpu.c;
|
|
|
|
* this only needs to handle 64 bits.
|
|
|
|
*/
|
|
|
|
static void aarch64_max_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvm_arm_set_cpu_features_from_host(cpu);
|
|
|
|
} else {
|
2019-10-31 17:27:34 +03:00
|
|
|
uint64_t t;
|
2018-10-24 09:50:16 +03:00
|
|
|
uint32_t u;
|
2018-03-09 20:09:44 +03:00
|
|
|
aarch64_a57_initfn(obj);
|
2018-10-24 09:50:16 +03:00
|
|
|
|
2019-08-15 11:46:41 +03:00
|
|
|
/*
|
|
|
|
* Reset MIDR so the guest doesn't mistake our 'max' CPU type for a real
|
|
|
|
* one and try to apply errata workarounds or use impdef features we
|
|
|
|
* don't provide.
|
|
|
|
* An IMPLEMENTER field of 0 means "reserved for software use";
|
|
|
|
* ARCHITECTURE must be 0xf indicating "v7 or later, check ID registers
|
|
|
|
* to see which features are present";
|
|
|
|
* the VARIANT, PARTNUM and REVISION fields are all implementation
|
|
|
|
* defined and we choose to define PARTNUM just in case guest
|
|
|
|
* code needs to distinguish this QEMU CPU from other software
|
|
|
|
* implementations, though this shouldn't be needed.
|
|
|
|
*/
|
|
|
|
t = FIELD_DP64(0, MIDR_EL1, IMPLEMENTER, 0);
|
|
|
|
t = FIELD_DP64(t, MIDR_EL1, ARCHITECTURE, 0xf);
|
|
|
|
t = FIELD_DP64(t, MIDR_EL1, PARTNUM, 'Q');
|
|
|
|
t = FIELD_DP64(t, MIDR_EL1, VARIANT, 0);
|
|
|
|
t = FIELD_DP64(t, MIDR_EL1, REVISION, 0);
|
|
|
|
cpu->midr = t;
|
|
|
|
|
2018-10-24 09:50:16 +03:00
|
|
|
t = cpu->isar.id_aa64isar0;
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, AES, 2); /* AES + PMULL */
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, SHA1, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, SHA2, 2); /* SHA512 */
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, CRC32, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, ATOMIC, 2);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, RDM, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, SHA3, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, SM3, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, SM4, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, DP, 1);
|
2019-02-28 13:55:17 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, FHM, 1);
|
2019-03-01 23:04:59 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, TS, 2); /* v8.5-CondM */
|
2019-03-13 07:57:35 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR0, RNDR, 1);
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_aa64isar0 = t;
|
|
|
|
|
|
|
|
t = cpu->isar.id_aa64isar1;
|
2019-11-21 03:08:43 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, DPB, 2);
|
2019-02-21 21:17:46 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, JSCVT, 1);
|
2018-10-24 09:50:16 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, FCMA, 1);
|
2019-01-21 13:23:13 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, APA, 1); /* PAuth, architected only */
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, API, 0);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, GPA, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, GPI, 0);
|
2019-03-01 23:04:53 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, SB, 1);
|
2019-03-01 23:04:54 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, SPECRES, 1);
|
2019-03-01 23:05:01 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, FRINTTS, 1);
|
2020-02-24 20:28:46 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64ISAR1, LRCPC, 2); /* ARMv8.4-RCPC */
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_aa64isar1 = t;
|
|
|
|
|
2018-10-24 09:50:17 +03:00
|
|
|
t = cpu->isar.id_aa64pfr0;
|
|
|
|
t = FIELD_DP64(t, ID_AA64PFR0, SVE, 1);
|
2018-10-24 09:50:17 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64PFR0, FP, 1);
|
|
|
|
t = FIELD_DP64(t, ID_AA64PFR0, ADVSIMD, 1);
|
2018-10-24 09:50:17 +03:00
|
|
|
cpu->isar.id_aa64pfr0 = t;
|
|
|
|
|
2019-02-05 19:52:38 +03:00
|
|
|
t = cpu->isar.id_aa64pfr1;
|
|
|
|
t = FIELD_DP64(t, ID_AA64PFR1, BT, 1);
|
2020-06-26 06:31:43 +03:00
|
|
|
/*
|
2020-07-20 12:25:36 +03:00
|
|
|
* Begin with full support for MTE. This will be downgraded to MTE=0
|
|
|
|
* during realize if the board provides no tag memory, much like
|
|
|
|
* we do for EL2 with the virtualization=on property.
|
2020-06-26 06:31:43 +03:00
|
|
|
*/
|
|
|
|
t = FIELD_DP64(t, ID_AA64PFR1, MTE, 2);
|
2019-02-05 19:52:38 +03:00
|
|
|
cpu->isar.id_aa64pfr1 = t;
|
|
|
|
|
2018-12-13 16:48:06 +03:00
|
|
|
t = cpu->isar.id_aa64mmfr1;
|
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, HPDS, 1); /* HPD */
|
2018-12-13 16:48:08 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, LO, 1);
|
2020-02-07 17:04:27 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, VH, 1);
|
2020-02-08 15:58:12 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, PAN, 2); /* ATS1E1 */
|
2020-02-10 15:01:46 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, VMIDBITS, 2); /* VMID16 */
|
2020-03-31 00:04:00 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, XNX, 1); /* TTS2UXN */
|
2018-12-13 16:48:06 +03:00
|
|
|
cpu->isar.id_aa64mmfr1 = t;
|
|
|
|
|
2020-02-08 15:58:16 +03:00
|
|
|
t = cpu->isar.id_aa64mmfr2;
|
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR2, UAO, 1);
|
2020-03-05 19:09:14 +03:00
|
|
|
t = FIELD_DP64(t, ID_AA64MMFR2, CNP, 1); /* TTCNP */
|
2020-02-08 15:58:16 +03:00
|
|
|
cpu->isar.id_aa64mmfr2 = t;
|
|
|
|
|
2018-10-24 09:50:16 +03:00
|
|
|
/* Replicate the same data to the 32-bit id registers. */
|
|
|
|
u = cpu->isar.id_isar5;
|
|
|
|
u = FIELD_DP32(u, ID_ISAR5, AES, 2); /* AES + PMULL */
|
|
|
|
u = FIELD_DP32(u, ID_ISAR5, SHA1, 1);
|
|
|
|
u = FIELD_DP32(u, ID_ISAR5, SHA2, 1);
|
|
|
|
u = FIELD_DP32(u, ID_ISAR5, CRC32, 1);
|
|
|
|
u = FIELD_DP32(u, ID_ISAR5, RDM, 1);
|
|
|
|
u = FIELD_DP32(u, ID_ISAR5, VCMA, 1);
|
|
|
|
cpu->isar.id_isar5 = u;
|
|
|
|
|
|
|
|
u = cpu->isar.id_isar6;
|
2019-02-21 21:17:46 +03:00
|
|
|
u = FIELD_DP32(u, ID_ISAR6, JSCVT, 1);
|
2018-10-24 09:50:16 +03:00
|
|
|
u = FIELD_DP32(u, ID_ISAR6, DP, 1);
|
2019-02-28 13:55:17 +03:00
|
|
|
u = FIELD_DP32(u, ID_ISAR6, FHM, 1);
|
2019-03-01 23:04:53 +03:00
|
|
|
u = FIELD_DP32(u, ID_ISAR6, SB, 1);
|
2019-03-01 23:04:54 +03:00
|
|
|
u = FIELD_DP32(u, ID_ISAR6, SPECRES, 1);
|
2018-10-24 09:50:16 +03:00
|
|
|
cpu->isar.id_isar6 = u;
|
|
|
|
|
2020-02-14 20:51:13 +03:00
|
|
|
u = cpu->isar.id_mmfr3;
|
2020-02-08 15:58:12 +03:00
|
|
|
u = FIELD_DP32(u, ID_MMFR3, PAN, 2); /* ATS1E1 */
|
2020-02-14 20:51:13 +03:00
|
|
|
cpu->isar.id_mmfr3 = u;
|
2020-02-08 15:58:12 +03:00
|
|
|
|
2020-02-14 20:51:16 +03:00
|
|
|
u = cpu->isar.id_mmfr4;
|
2020-02-18 22:09:52 +03:00
|
|
|
u = FIELD_DP32(u, ID_MMFR4, HPDS, 1); /* AA32HPD */
|
2020-02-14 20:51:16 +03:00
|
|
|
u = FIELD_DP32(u, ID_MMFR4, AC2, 1); /* ACTLR2, HACTLR2 */
|
2020-04-22 15:45:01 +03:00
|
|
|
u = FIELD_DP32(u, ID_MMFR4, CNP, 1); /* TTCNP */
|
2020-03-31 00:04:00 +03:00
|
|
|
u = FIELD_DP32(u, ID_MMFR4, XNX, 1); /* TTS2UXN */
|
2020-02-14 20:51:16 +03:00
|
|
|
cpu->isar.id_mmfr4 = u;
|
|
|
|
|
2020-04-23 14:09:15 +03:00
|
|
|
t = cpu->isar.id_aa64dfr0;
|
|
|
|
t = FIELD_DP64(t, ID_AA64DFR0, PMUVER, 5); /* v8.4-PMU */
|
|
|
|
cpu->isar.id_aa64dfr0 = t;
|
2020-02-14 20:51:10 +03:00
|
|
|
|
|
|
|
u = cpu->isar.id_dfr0;
|
|
|
|
u = FIELD_DP32(u, ID_DFR0, PERFMON, 5); /* v8.4-PMU */
|
|
|
|
cpu->isar.id_dfr0 = u;
|
|
|
|
|
2020-08-28 21:33:54 +03:00
|
|
|
u = cpu->isar.mvfr1;
|
|
|
|
u = FIELD_DP32(u, MVFR1, FPHP, 3); /* v8.2-FP16 */
|
|
|
|
u = FIELD_DP32(u, MVFR1, SIMDHP, 2); /* v8.2-FP16 */
|
|
|
|
cpu->isar.mvfr1 = u;
|
2018-10-24 09:50:17 +03:00
|
|
|
|
|
|
|
#ifdef CONFIG_USER_ONLY
|
2018-03-09 20:09:44 +03:00
|
|
|
/* For usermode -cpu max we can use a larger and more efficient DCZ
|
|
|
|
* blocksize since we don't have to follow what the hardware does.
|
2018-03-09 20:09:44 +03:00
|
|
|
*/
|
2018-03-09 20:09:44 +03:00
|
|
|
cpu->ctr = 0x80038003; /* 32 byte I and D cacheline size, VIPT icache */
|
|
|
|
cpu->dcz_blocksize = 7; /* 512 bytes */
|
|
|
|
#endif
|
2018-03-09 20:09:44 +03:00
|
|
|
}
|
2019-10-31 17:27:31 +03:00
|
|
|
|
2019-10-31 17:27:34 +03:00
|
|
|
aarch64_add_sve_properties(obj);
|
2019-10-31 17:27:33 +03:00
|
|
|
object_property_add(obj, "sve-max-vq", "uint32", cpu_max_get_sve_max_vq,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
cpu_max_set_sve_max_vq, NULL, NULL);
|
2018-03-09 20:09:44 +03:00
|
|
|
}
|
|
|
|
|
2013-09-03 23:12:07 +04:00
|
|
|
static const ARMCPUInfo aarch64_cpus[] = {
|
2014-04-15 22:18:44 +04:00
|
|
|
{ .name = "cortex-a57", .initfn = aarch64_a57_initfn },
|
2015-05-15 05:22:55 +03:00
|
|
|
{ .name = "cortex-a53", .initfn = aarch64_a53_initfn },
|
2018-10-11 05:19:29 +03:00
|
|
|
{ .name = "cortex-a72", .initfn = aarch64_a72_initfn },
|
2018-03-09 20:09:44 +03:00
|
|
|
{ .name = "max", .initfn = aarch64_max_initfn },
|
2013-09-03 23:12:07 +04:00
|
|
|
};
|
|
|
|
|
2015-02-13 08:46:08 +03:00
|
|
|
static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
|
|
|
|
return arm_feature(&cpu->env, ARM_FEATURE_AARCH64);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void aarch64_cpu_set_aarch64(Object *obj, bool value, Error **errp)
|
|
|
|
{
|
|
|
|
ARMCPU *cpu = ARM_CPU(obj);
|
|
|
|
|
|
|
|
/* At this time, this property is only allowed if KVM is enabled. This
|
|
|
|
* restriction allows us to avoid fixing up functionality that assumes a
|
|
|
|
* uniform execution state like do_interrupt.
|
|
|
|
*/
|
|
|
|
if (value == false) {
|
target/arm: Check supported KVM features globally (not per vCPU)
Since commit d70c996df23f, when enabling the PMU we get:
$ qemu-system-aarch64 -cpu host,pmu=on -M virt,accel=kvm,gic-version=3
Segmentation fault (core dumped)
Thread 1 "qemu-system-aar" received signal SIGSEGV, Segmentation fault.
0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
2588 ret = ioctl(s->fd, type, arg);
(gdb) bt
#0 0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588
#1 0x0000aaaaaae31568 in kvm_check_extension (s=0x0, extension=126) at accel/kvm/kvm-all.c:916
#2 0x0000aaaaaafce254 in kvm_arm_pmu_supported (cpu=0xaaaaac214ab0) at target/arm/kvm.c:213
#3 0x0000aaaaaafc0f94 in arm_set_pmu (obj=0xaaaaac214ab0, value=true, errp=0xffffffffe438) at target/arm/cpu.c:1111
#4 0x0000aaaaab5533ac in property_set_bool (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", opaque=0xaaaaac222730, errp=0xffffffffe438) at qom/object.c:2170
#5 0x0000aaaaab5512f0 in object_property_set (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1328
#6 0x0000aaaaab551e10 in object_property_parse (obj=0xaaaaac214ab0, string=0xaaaaac11b4c0 "on", name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1561
#7 0x0000aaaaab54ee8c in object_apply_global_props (obj=0xaaaaac214ab0, props=0xaaaaac018e20, errp=0xaaaaabd6fd88 <error_fatal>) at qom/object.c:407
#8 0x0000aaaaab1dd5a4 in qdev_prop_set_globals (dev=0xaaaaac214ab0) at hw/core/qdev-properties.c:1218
#9 0x0000aaaaab1d9fac in device_post_init (obj=0xaaaaac214ab0) at hw/core/qdev.c:1050
...
#15 0x0000aaaaab54f310 in object_initialize_with_type (obj=0xaaaaac214ab0, size=52208, type=0xaaaaabe237f0) at qom/object.c:512
#16 0x0000aaaaab54fa24 in object_new_with_type (type=0xaaaaabe237f0) at qom/object.c:687
#17 0x0000aaaaab54fa80 in object_new (typename=0xaaaaabe23970 "host-arm-cpu") at qom/object.c:702
#18 0x0000aaaaaaf04a74 in machvirt_init (machine=0xaaaaac0a8550) at hw/arm/virt.c:1770
#19 0x0000aaaaab1e8720 in machine_run_board_init (machine=0xaaaaac0a8550) at hw/core/machine.c:1138
#20 0x0000aaaaaaf95394 in qemu_init (argc=5, argv=0xffffffffea58, envp=0xffffffffea88) at softmmu/vl.c:4348
#21 0x0000aaaaaada3f74 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at softmmu/main.c:48
This is because in frame #2, cpu->kvm_state is still NULL
(the vCPU is not yet realized).
KVM has a hard requirement of all cores supporting the same
feature set. We only need to check if the accelerator supports
a feature, not each vCPU individually.
Fix by removing the 'CPUState *cpu' argument from the
kvm_arm_<FEATURE>_supported() functions.
Fixes: d70c996df23f ('Use CPUState::kvm_state in kvm_arm_pmu_supported')
Reported-by: Haibo Xu <haibo.xu@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-06-23 12:06:22 +03:00
|
|
|
if (!kvm_enabled() || !kvm_arm_aarch32_supported()) {
|
2019-08-02 15:25:26 +03:00
|
|
|
error_setg(errp, "'aarch64' feature cannot be disabled "
|
|
|
|
"unless KVM is enabled and 32-bit EL1 "
|
|
|
|
"is supported");
|
|
|
|
return;
|
|
|
|
}
|
2015-02-13 08:46:08 +03:00
|
|
|
unset_feature(&cpu->env, ARM_FEATURE_AARCH64);
|
|
|
|
} else {
|
|
|
|
set_feature(&cpu->env, ARM_FEATURE_AARCH64);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-03 23:12:07 +04:00
|
|
|
static void aarch64_cpu_initfn(Object *obj)
|
|
|
|
{
|
2015-02-13 08:46:08 +03:00
|
|
|
object_property_add_bool(obj, "aarch64", aarch64_cpu_get_aarch64,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
aarch64_cpu_set_aarch64);
|
2015-02-13 08:46:08 +03:00
|
|
|
object_property_set_description(obj, "aarch64",
|
|
|
|
"Set on/off to enable/disable aarch64 "
|
2020-05-05 18:29:15 +03:00
|
|
|
"execution state ");
|
2013-09-03 23:12:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void aarch64_cpu_finalizefn(Object *obj)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2015-12-03 15:14:41 +03:00
|
|
|
static gchar *aarch64_gdb_arch_name(CPUState *cs)
|
|
|
|
{
|
|
|
|
return g_strdup("aarch64");
|
|
|
|
}
|
|
|
|
|
2013-09-03 23:12:07 +04:00
|
|
|
static void aarch64_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
2013-09-03 23:12:10 +04:00
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
|
|
|
|
2014-09-13 20:45:25 +04:00
|
|
|
cc->cpu_exec_interrupt = arm_cpu_exec_interrupt;
|
2013-09-03 23:12:11 +04:00
|
|
|
cc->gdb_read_register = aarch64_cpu_gdb_read_register;
|
|
|
|
cc->gdb_write_register = aarch64_cpu_gdb_write_register;
|
|
|
|
cc->gdb_num_core_regs = 34;
|
|
|
|
cc->gdb_core_xml_file = "aarch64-core.xml";
|
2015-12-03 15:14:41 +03:00
|
|
|
cc->gdb_arch_name = aarch64_gdb_arch_name;
|
2013-09-03 23:12:07 +04:00
|
|
|
}
|
|
|
|
|
2018-11-27 11:55:59 +03:00
|
|
|
static void aarch64_cpu_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
ARMCPUClass *acc = ARM_CPU_GET_CLASS(obj);
|
|
|
|
|
|
|
|
acc->info->initfn(obj);
|
|
|
|
arm_cpu_post_init(obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cpu_register_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
ARMCPUClass *acc = ARM_CPU_CLASS(oc);
|
|
|
|
|
|
|
|
acc->info = data;
|
|
|
|
}
|
|
|
|
|
2020-04-23 10:33:55 +03:00
|
|
|
void aarch64_cpu_register(const ARMCPUInfo *info)
|
2013-09-03 23:12:07 +04:00
|
|
|
{
|
|
|
|
TypeInfo type_info = {
|
|
|
|
.parent = TYPE_AARCH64_CPU,
|
|
|
|
.instance_size = sizeof(ARMCPU),
|
2018-11-27 11:55:59 +03:00
|
|
|
.instance_init = aarch64_cpu_instance_init,
|
2013-09-03 23:12:07 +04:00
|
|
|
.class_size = sizeof(ARMCPUClass),
|
2018-11-27 11:55:59 +03:00
|
|
|
.class_init = info->class_init ?: cpu_register_class_init,
|
|
|
|
.class_data = (void *)info,
|
2013-09-03 23:12:07 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);
|
|
|
|
type_register(&type_info);
|
|
|
|
g_free((void *)type_info.name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo aarch64_cpu_type_info = {
|
|
|
|
.name = TYPE_AARCH64_CPU,
|
|
|
|
.parent = TYPE_ARM_CPU,
|
|
|
|
.instance_size = sizeof(ARMCPU),
|
|
|
|
.instance_init = aarch64_cpu_initfn,
|
|
|
|
.instance_finalize = aarch64_cpu_finalizefn,
|
|
|
|
.abstract = true,
|
|
|
|
.class_size = sizeof(AArch64CPUClass),
|
|
|
|
.class_init = aarch64_cpu_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void aarch64_cpu_register_types(void)
|
|
|
|
{
|
2020-05-04 20:24:46 +03:00
|
|
|
size_t i;
|
2013-09-03 23:12:07 +04:00
|
|
|
|
|
|
|
type_register_static(&aarch64_cpu_type_info);
|
2014-01-13 14:26:16 +04:00
|
|
|
|
2020-05-04 20:24:46 +03:00
|
|
|
for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) {
|
|
|
|
aarch64_cpu_register(&aarch64_cpus[i]);
|
2013-09-03 23:12:07 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(aarch64_cpu_register_types)
|