OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: Add PMSAv8r registers 

Signed-off-by: Tobias Röhmel <tobias.roehmel@rwth-aachen.de>
Message-id: 20221206102504.165775-6-tobias.roehmel@rwth-aachen.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Tobias Röhmel 2022-12-06 11:25:02 +01:00 committed by Peter Maydell
parent 452c67a427
commit 761c46425e
4 changed files with 360 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/arm/cpu.c
View File

@ -491,6 +491,14 @@ static void arm_cpu_reset_hold(Object *obj)
sizeof(*env->pmsav7.dracr) * cpu->pmsav7_dregion);
}
}
if (cpu->pmsav8r_hdregion > 0) {
memset(env->pmsav8.hprbar, 0,
sizeof(*env->pmsav8.hprbar) * cpu->pmsav8r_hdregion);
memset(env->pmsav8.hprlar, 0,
sizeof(*env->pmsav8.hprlar) * cpu->pmsav8r_hdregion);
}
env->pmsav7.rnr[M_REG_NS] = 0;
env->pmsav7.rnr[M_REG_S] = 0;
env->pmsav8.mair0[M_REG_NS] = 0;
@ -2002,11 +2010,10 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
/* MPU can be configured out of a PMSA CPU either by setting has-mpu
* to false or by setting pmsav7-dregion to 0.
*/
if (!cpu->has_mpu) {
cpu->pmsav7_dregion = 0;
}
if (cpu->pmsav7_dregion == 0) {
if (!cpu->has_mpu || cpu->pmsav7_dregion == 0) {
cpu->has_mpu = false;
cpu->pmsav7_dregion = 0;
cpu->pmsav8r_hdregion = 0;
}
if (arm_feature(env, ARM_FEATURE_PMSA) &&
@ -2033,6 +2040,19 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
env->pmsav7.dracr = g_new0(uint32_t, nr);
}
}
if (cpu->pmsav8r_hdregion > 0xff) {
error_setg(errp, "PMSAv8 MPU EL2 #regions invalid %" PRIu32,
cpu->pmsav8r_hdregion);
return;
}
if (cpu->pmsav8r_hdregion) {
env->pmsav8.hprbar = g_new0(uint32_t,
cpu->pmsav8r_hdregion);
env->pmsav8.hprlar = g_new0(uint32_t,
cpu->pmsav8r_hdregion);
}
}
if (arm_feature(env, ARM_FEATURE_M_SECURITY)) {

6
target/arm/cpu.h
View File

@ -309,6 +309,7 @@ typedef struct CPUArchState {
};
uint64_t sctlr_el[4];
};
uint64_t vsctlr; /* Virtualization System control register. */
uint64_t cpacr_el1; /* Architectural feature access control register */
uint64_t cptr_el[4]; /* ARMv8 feature trap registers */
uint32_t c1_xscaleauxcr; /* XScale auxiliary control register. */
@ -745,8 +746,11 @@ typedef struct CPUArchState {
*/
uint32_t *rbar[M_REG_NUM_BANKS];
uint32_t *rlar[M_REG_NUM_BANKS];
uint32_t *hprbar;
uint32_t *hprlar;
uint32_t mair0[M_REG_NUM_BANKS];
uint32_t mair1[M_REG_NUM_BANKS];
uint32_t hprselr;
} pmsav8;
/* v8M SAU */
@ -906,6 +910,8 @@ struct ArchCPU {
bool has_mpu;
/* PMSAv7 MPU number of supported regions */
uint32_t pmsav7_dregion;
/* PMSAv8 MPU number of supported hyp regions */
uint32_t pmsav8r_hdregion;
/* v8M SAU number of supported regions */
uint32_t sau_sregion;

302
target/arm/helper.c
View File

@ -3682,6 +3682,222 @@ static void pmsav7_rgnr_write(CPUARMState *env, const ARMCPRegInfo *ri,
raw_write(env, ri, value);
}
static void prbar_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
ARMCPU *cpu = env_archcpu(env);
tlb_flush(CPU(cpu)); /* Mappings may have changed - purge! */
env->pmsav8.rbar[M_REG_NS][env->pmsav7.rnr[M_REG_NS]] = value;
}
static uint64_t prbar_read(CPUARMState *env, const ARMCPRegInfo *ri)
{
return env->pmsav8.rbar[M_REG_NS][env->pmsav7.rnr[M_REG_NS]];
}
static void prlar_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
ARMCPU *cpu = env_archcpu(env);
tlb_flush(CPU(cpu)); /* Mappings may have changed - purge! */
env->pmsav8.rlar[M_REG_NS][env->pmsav7.rnr[M_REG_NS]] = value;
}
static uint64_t prlar_read(CPUARMState *env, const ARMCPRegInfo *ri)
{
return env->pmsav8.rlar[M_REG_NS][env->pmsav7.rnr[M_REG_NS]];
}
static void prselr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
ARMCPU *cpu = env_archcpu(env);
/*
* Ignore writes that would select not implemented region.
* This is architecturally UNPREDICTABLE.
*/
if (value >= cpu->pmsav7_dregion) {
return;
}
env->pmsav7.rnr[M_REG_NS] = value;
}
static void hprbar_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
ARMCPU *cpu = env_archcpu(env);
tlb_flush(CPU(cpu)); /* Mappings may have changed - purge! */
env->pmsav8.hprbar[env->pmsav8.hprselr] = value;
}
static uint64_t hprbar_read(CPUARMState *env, const ARMCPRegInfo *ri)
{
return env->pmsav8.hprbar[env->pmsav8.hprselr];
}
static void hprlar_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
ARMCPU *cpu = env_archcpu(env);
tlb_flush(CPU(cpu)); /* Mappings may have changed - purge! */
env->pmsav8.hprlar[env->pmsav8.hprselr] = value;
}
static uint64_t hprlar_read(CPUARMState *env, const ARMCPRegInfo *ri)
{
return env->pmsav8.hprlar[env->pmsav8.hprselr];
}
static void hprenr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
uint32_t n;
uint32_t bit;
ARMCPU *cpu = env_archcpu(env);
/* Ignore writes to unimplemented regions */
int rmax = MIN(cpu->pmsav8r_hdregion, 32);
value &= MAKE_64BIT_MASK(0, rmax);
tlb_flush(CPU(cpu)); /* Mappings may have changed - purge! */
/* Register alias is only valid for first 32 indexes */
for (n = 0; n < rmax; ++n) {
bit = extract32(value, n, 1);
env->pmsav8.hprlar[n] = deposit32(
env->pmsav8.hprlar[n], 0, 1, bit);
}
}
static uint64_t hprenr_read(CPUARMState *env, const ARMCPRegInfo *ri)
{
uint32_t n;
uint32_t result = 0x0;
ARMCPU *cpu = env_archcpu(env);
/* Register alias is only valid for first 32 indexes */
for (n = 0; n < MIN(cpu->pmsav8r_hdregion, 32); ++n) {
if (env->pmsav8.hprlar[n] & 0x1) {
result |= (0x1 << n);
}
}
return result;
}
static void hprselr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
ARMCPU *cpu = env_archcpu(env);
/*
* Ignore writes that would select not implemented region.
* This is architecturally UNPREDICTABLE.
*/
if (value >= cpu->pmsav8r_hdregion) {
return;
}
env->pmsav8.hprselr = value;
}
static void pmsav8r_regn_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
ARMCPU *cpu = env_archcpu(env);
uint8_t index = (extract32(ri->opc0, 0, 1) << 4) |
(extract32(ri->crm, 0, 3) << 1) | extract32(ri->opc2, 2, 1);
tlb_flush(CPU(cpu)); /* Mappings may have changed - purge! */
if (ri->opc1 & 4) {
if (index >= cpu->pmsav8r_hdregion) {
return;
}
if (ri->opc2 & 0x1) {
env->pmsav8.hprlar[index] = value;
} else {
env->pmsav8.hprbar[index] = value;
}
} else {
if (index >= cpu->pmsav7_dregion) {
return;
}
if (ri->opc2 & 0x1) {
env->pmsav8.rlar[M_REG_NS][index] = value;
} else {
env->pmsav8.rbar[M_REG_NS][index] = value;
}
}
}
static uint64_t pmsav8r_regn_read(CPUARMState *env, const ARMCPRegInfo *ri)
{
ARMCPU *cpu = env_archcpu(env);
uint8_t index = (extract32(ri->opc0, 0, 1) << 4) |
(extract32(ri->crm, 0, 3) << 1) | extract32(ri->opc2, 2, 1);
if (ri->opc1 & 4) {
if (index >= cpu->pmsav8r_hdregion) {
return 0x0;
}
if (ri->opc2 & 0x1) {
return env->pmsav8.hprlar[index];
} else {
return env->pmsav8.hprbar[index];
}
} else {
if (index >= cpu->pmsav7_dregion) {
return 0x0;
}
if (ri->opc2 & 0x1) {
return env->pmsav8.rlar[M_REG_NS][index];
} else {
return env->pmsav8.rbar[M_REG_NS][index];
}
}
}
static const ARMCPRegInfo pmsav8r_cp_reginfo[] = {
{ .name = "PRBAR",
.cp = 15, .opc1 = 0, .crn = 6, .crm = 3, .opc2 = 0,
.access = PL1_RW, .type = ARM_CP_NO_RAW,
.accessfn = access_tvm_trvm,
.readfn = prbar_read, .writefn = prbar_write },
{ .name = "PRLAR",
.cp = 15, .opc1 = 0, .crn = 6, .crm = 3, .opc2 = 1,
.access = PL1_RW, .type = ARM_CP_NO_RAW,
.accessfn = access_tvm_trvm,
.readfn = prlar_read, .writefn = prlar_write },
{ .name = "PRSELR", .resetvalue = 0,
.cp = 15, .opc1 = 0, .crn = 6, .crm = 2, .opc2 = 1,
.access = PL1_RW, .accessfn = access_tvm_trvm,
.writefn = prselr_write,
.fieldoffset = offsetof(CPUARMState, pmsav7.rnr[M_REG_NS]) },
{ .name = "HPRBAR", .resetvalue = 0,
.cp = 15, .opc1 = 4, .crn = 6, .crm = 3, .opc2 = 0,
.access = PL2_RW, .type = ARM_CP_NO_RAW,
.readfn = hprbar_read, .writefn = hprbar_write },
{ .name = "HPRLAR",
.cp = 15, .opc1 = 4, .crn = 6, .crm = 3, .opc2 = 1,
.access = PL2_RW, .type = ARM_CP_NO_RAW,
.readfn = hprlar_read, .writefn = hprlar_write },
{ .name = "HPRSELR", .resetvalue = 0,
.cp = 15, .opc1 = 4, .crn = 6, .crm = 2, .opc2 = 1,
.access = PL2_RW,
.writefn = hprselr_write,
.fieldoffset = offsetof(CPUARMState, pmsav8.hprselr) },
{ .name = "HPRENR",
.cp = 15, .opc1 = 4, .crn = 6, .crm = 1, .opc2 = 1,
.access = PL2_RW, .type = ARM_CP_NO_RAW,
.readfn = hprenr_read, .writefn = hprenr_write },
};
static const ARMCPRegInfo pmsav7_cp_reginfo[] = {
/* Reset for all these registers is handled in arm_cpu_reset(),
* because the PMSAv7 is also used by M-profile CPUs, which do
@ -8207,6 +8423,13 @@ void register_cp_regs_for_features(ARMCPU *cpu)
.access = PL1_R, .type = ARM_CP_CONST,
.resetvalue = cpu->pmsav7_dregion << 8
};
/* HMPUIR is specific to PMSA V8 */
ARMCPRegInfo id_hmpuir_reginfo = {
.name = "HMPUIR",
.cp = 15, .opc1 = 4, .crn = 0, .crm = 0, .opc2 = 4,
.access = PL2_R, .type = ARM_CP_CONST,
.resetvalue = cpu->pmsav8r_hdregion
};
static const ARMCPRegInfo crn0_wi_reginfo = {
.name = "CRN0_WI", .cp = 15, .crn = 0, .crm = CP_ANY,
.opc1 = CP_ANY, .opc2 = CP_ANY, .access = PL1_W,
@ -8249,6 +8472,74 @@ void register_cp_regs_for_features(ARMCPU *cpu)
define_arm_cp_regs(cpu, id_cp_reginfo);
if (!arm_feature(env, ARM_FEATURE_PMSA)) {
define_one_arm_cp_reg(cpu, &id_tlbtr_reginfo);
} else if (arm_feature(env, ARM_FEATURE_PMSA) &&
arm_feature(env, ARM_FEATURE_V8)) {
uint32_t i = 0;
char *tmp_string;
define_one_arm_cp_reg(cpu, &id_mpuir_reginfo);
define_one_arm_cp_reg(cpu, &id_hmpuir_reginfo);
define_arm_cp_regs(cpu, pmsav8r_cp_reginfo);
/* Register alias is only valid for first 32 indexes */
for (i = 0; i < MIN(cpu->pmsav7_dregion, 32); ++i) {
uint8_t crm = 0b1000 | extract32(i, 1, 3);
uint8_t opc1 = extract32(i, 4, 1);
uint8_t opc2 = extract32(i, 0, 1) << 2;
tmp_string = g_strdup_printf("PRBAR%u", i);
ARMCPRegInfo tmp_prbarn_reginfo = {
.name = tmp_string, .type = ARM_CP_ALIAS | ARM_CP_NO_RAW,
.cp = 15, .opc1 = opc1, .crn = 6, .crm = crm, .opc2 = opc2,
.access = PL1_RW, .resetvalue = 0,
.accessfn = access_tvm_trvm,
.writefn = pmsav8r_regn_write, .readfn = pmsav8r_regn_read
};
define_one_arm_cp_reg(cpu, &tmp_prbarn_reginfo);
g_free(tmp_string);
opc2 = extract32(i, 0, 1) << 2 | 0x1;
tmp_string = g_strdup_printf("PRLAR%u", i);
ARMCPRegInfo tmp_prlarn_reginfo = {
.name = tmp_string, .type = ARM_CP_ALIAS | ARM_CP_NO_RAW,
.cp = 15, .opc1 = opc1, .crn = 6, .crm = crm, .opc2 = opc2,
.access = PL1_RW, .resetvalue = 0,
.accessfn = access_tvm_trvm,
.writefn = pmsav8r_regn_write, .readfn = pmsav8r_regn_read
};
define_one_arm_cp_reg(cpu, &tmp_prlarn_reginfo);
g_free(tmp_string);
}
/* Register alias is only valid for first 32 indexes */
for (i = 0; i < MIN(cpu->pmsav8r_hdregion, 32); ++i) {
uint8_t crm = 0b1000 | extract32(i, 1, 3);
uint8_t opc1 = 0b100 | extract32(i, 4, 1);
uint8_t opc2 = extract32(i, 0, 1) << 2;
tmp_string = g_strdup_printf("HPRBAR%u", i);
ARMCPRegInfo tmp_hprbarn_reginfo = {
.name = tmp_string,
.type = ARM_CP_NO_RAW,
.cp = 15, .opc1 = opc1, .crn = 6, .crm = crm, .opc2 = opc2,
.access = PL2_RW, .resetvalue = 0,
.writefn = pmsav8r_regn_write, .readfn = pmsav8r_regn_read
};
define_one_arm_cp_reg(cpu, &tmp_hprbarn_reginfo);
g_free(tmp_string);
opc2 = extract32(i, 0, 1) << 2 | 0x1;
tmp_string = g_strdup_printf("HPRLAR%u", i);
ARMCPRegInfo tmp_hprlarn_reginfo = {
.name = tmp_string,
.type = ARM_CP_NO_RAW,
.cp = 15, .opc1 = opc1, .crn = 6, .crm = crm, .opc2 = opc2,
.access = PL2_RW, .resetvalue = 0,
.writefn = pmsav8r_regn_write, .readfn = pmsav8r_regn_read
};
define_one_arm_cp_reg(cpu, &tmp_hprlarn_reginfo);
g_free(tmp_string);
}
} else if (arm_feature(env, ARM_FEATURE_V7)) {
define_one_arm_cp_reg(cpu, &id_mpuir_reginfo);
}
@ -8370,6 +8661,17 @@ void register_cp_regs_for_features(ARMCPU *cpu)
sctlr.type |= ARM_CP_SUPPRESS_TB_END;
}
define_one_arm_cp_reg(cpu, &sctlr);
if (arm_feature(env, ARM_FEATURE_PMSA) &&
arm_feature(env, ARM_FEATURE_V8)) {
ARMCPRegInfo vsctlr = {
.name = "VSCTLR", .state = ARM_CP_STATE_AA32,
.cp = 15, .opc1 = 4, .crn = 2, .crm = 0, .opc2 = 0,
.access = PL2_RW, .resetvalue = 0x0,
.fieldoffset = offsetoflow32(CPUARMState, cp15.vsctlr),
};
define_one_arm_cp_reg(cpu, &vsctlr);
}
}
if (cpu_isar_feature(aa64_lor, cpu)) {

28
target/arm/machine.c
View File

@ -487,6 +487,30 @@ static bool pmsav8_needed(void *opaque)
arm_feature(env, ARM_FEATURE_V8);
}
static bool pmsav8r_needed(void *opaque)
{
ARMCPU *cpu = opaque;
CPUARMState *env = &cpu->env;
return arm_feature(env, ARM_FEATURE_PMSA) &&
arm_feature(env, ARM_FEATURE_V8) &&
!arm_feature(env, ARM_FEATURE_M);
}
static const VMStateDescription vmstate_pmsav8r = {
.name = "cpu/pmsav8/pmsav8r",
.version_id = 1,
.minimum_version_id = 1,
.needed = pmsav8r_needed,
.fields = (VMStateField[]) {
VMSTATE_VARRAY_UINT32(env.pmsav8.hprbar, ARMCPU,
pmsav8r_hdregion, 0, vmstate_info_uint32, uint32_t),
VMSTATE_VARRAY_UINT32(env.pmsav8.hprlar, ARMCPU,
pmsav8r_hdregion, 0, vmstate_info_uint32, uint32_t),
VMSTATE_END_OF_LIST()
},
};
static const VMStateDescription vmstate_pmsav8 = {
.name = "cpu/pmsav8",
.version_id = 1,
@ -500,6 +524,10 @@ static const VMStateDescription vmstate_pmsav8 = {
VMSTATE_UINT32(env.pmsav8.mair0[M_REG_NS], ARMCPU),
VMSTATE_UINT32(env.pmsav8.mair1[M_REG_NS], ARMCPU),
VMSTATE_END_OF_LIST()
},
.subsections = (const VMStateDescription * []) {
&vmstate_pmsav8r,
NULL
}
};