From patchwork Thu Feb 13 14:41:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183388 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp642033ile; Thu, 13 Feb 2020 07:12:20 -0800 (PST) X-Google-Smtp-Source: APXvYqwJ1i8Owb09BzTwN2gK71hIzJlqb7XaZWclVUzWB0WBJpuXO3pVY6l/3fNVJonm0ie8mxTF X-Received: by 2002:a37:356:: with SMTP id 83mr12654312qkd.409.1581606740424; Thu, 13 Feb 2020 07:12:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581606740; cv=none; d=google.com; s=arc-20160816; b=FFK0p3LfcwWrHgxpzBJ3aM0LJonsVNMBAEss5vxOMLrPF9A+NcGrtxISAD1gvY87xv kIkCjY/IZGJiBmarbU7EHQczLqU1hUq6+c0lWXHRpUple4sREa9t5RJEko4a4t7/3XcY Sef98hre4PCF8E6IjmHM+qS1QLpSR98uh8ci/vtctkL1JcmX0K3BByG0aO61toxRsYxl UBEiJCifiexF7jmLswTTaIdKEtmkCZhL+EYyly+wM2UX0b3fz0q/VM4oCwt7qRFCqnCH 3yJSAEeT5cd5tKQu3fL2Xzha3OLhEQE6yypRIl1WQPVD+qd/ZAiFptkUVem4XAlMv263 Qh1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=JVK/7D63GFoiZgv/DDpmGioUcmsvRCEg+fgmQJe/Src=; b=hm9iLOU5DQxkMoEplgZVzBd0ulUor7LbQAFUA0UfGkr8WUXu5sqou/yni0ObDaI07f sOjlM7TMfCt7xeXIf61JSSprb2jbcn+1OWGxYE3jybFgl/C3SaEqIWEPb9d8T8tRQ56g mY7CHQVdKGt79M8JQtvSx/ZSTOSg7xwxKaGaqFJkYa298AdjYf36hWttIicXHPl6DdCY Smb+L9EKfHLjUYzOF+V8YEdxK733QmngBO8+MPqs970677iWdSCI9RAcjlC49UBY28k8 TagJgLmyubzK2wwo00DKdcDhEnDxHvowUqVORBt0qXWfj0WuXSpiDvj/fvkI77qU/vWU WJ8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T+vh/geg"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e7si1567498qtw.140.2020.02.13.07.12.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 07:12:20 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T+vh/geg"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2GA7-0001wq-TB for patch@linaro.org; Thu, 13 Feb 2020 10:12:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60398) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fh7-0004b6-Gs for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2Fh6-00028k-82 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:21 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:34930) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Fh6-00027R-1B for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:20 -0500 Received: by mail-wm1-x32e.google.com with SMTP id b17so7044898wmb.0 for ; Thu, 13 Feb 2020 06:42:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JVK/7D63GFoiZgv/DDpmGioUcmsvRCEg+fgmQJe/Src=; b=T+vh/gegkmEKjrN+Yml+MXRe4MrnXjFVUj+eONjv0EKA+N495xA630UnRx5wpF54qK Tx5YxcwLq8yI2yfU0qUZATyqkXPboCO2aZ19lGbV+9VvuThEwlo1J3SEEgvnBvaC8QoG TXu7JBHw2FbYqN5helsNauBQtOh5FUTkumZUzwOuWSZ9c0+3EmMCcG0skqcnHzE4kg2P rhALq4c9yAGX2w1q3KLdakm7/IlpXqe6mEl9sP6z+HYNZgtIA0ee8YlIufsYTYkzOT+U ICTL0FFsU2fmAMDizAfb0OTkSbU2wmOHkSC+5SndzySC6Tf9Nu70w6g0CEcLbR41R+9d EzLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JVK/7D63GFoiZgv/DDpmGioUcmsvRCEg+fgmQJe/Src=; b=joBLJSDYCH4IpLvUXPc6wtLvPVTuNQPj0KwbPAzJUVtEUPQhjpr8IDrKgc07TGvPyL HypKXQTrw+iIudIM6tY6aR0cTKWvsRD83WFc1pJmdKcxNlaWQ6YYJFJdKDlQYK/+F/vz 4JMAEBjAYDsSYL2g1yEwz++z4t50uOnHmDwPSr2C8PK1ShWItXF8gzQdYLDsrDosc47P x7X9uKBEl5S/pXh6d3wGUVIFAebvO7qqIyeVztGBsbhpiAgQ6WV3yEF8k7GUSurqX2r/ W3SVKB+pAHGBYJERikAaarqnESG3GYyW8BzdiVvLy7eVJ5ui0Btp05RKcJf3/6f0a0aN zKyQ== X-Gm-Message-State: APjAAAUydP1kpv8zSuQ9j67HB0KHRshht5Xwo5mm9De8osUMj6RQkNcU kSD0X4sJAOqhkCqf2gb4kNHad9MSvfQ= X-Received: by 2002:a05:600c:2c13:: with SMTP id q19mr6369076wmg.144.1581604938838; Thu, 13 Feb 2020 06:42:18 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e22sm3362454wme.45.2020.02.13.06.42.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:42:18 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 27/46] target/arm: Update MSR access to UAO Date: Thu, 13 Feb 2020 14:41:26 +0000 Message-Id: <20200213144145.818-28-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213144145.818-1-peter.maydell@linaro.org> References: <20200213144145.818-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200208125816.14954-19-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 6 ++++++ target/arm/internals.h | 3 +++ target/arm/helper.c | 21 +++++++++++++++++++++ target/arm/translate-a64.c | 14 ++++++++++++++ 4 files changed, 44 insertions(+) -- 2.20.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 71879393c22..e943ffe8a9a 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1253,6 +1253,7 @@ void pmu_init(ARMCPU *cpu); #define PSTATE_IL (1U << 20) #define PSTATE_SS (1U << 21) #define PSTATE_PAN (1U << 22) +#define PSTATE_UAO (1U << 23) #define PSTATE_V (1U << 28) #define PSTATE_C (1U << 29) #define PSTATE_Z (1U << 30) @@ -3642,6 +3643,11 @@ static inline bool isar_feature_aa64_ats1e1(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, PAN) >= 2; } +static inline bool isar_feature_aa64_uao(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, UAO) != 0; +} + static inline bool isar_feature_aa64_bti(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64pfr1, ID_AA64PFR1, BT) != 0; diff --git a/target/arm/internals.h b/target/arm/internals.h index 4a139644b54..58c4d707c5d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1112,6 +1112,9 @@ static inline uint32_t aarch64_pstate_valid_mask(const ARMISARegisters *id) if (isar_feature_aa64_pan(id)) { valid |= PSTATE_PAN; } + if (isar_feature_aa64_uao(id)) { + valid |= PSTATE_UAO; + } return valid; } diff --git a/target/arm/helper.c b/target/arm/helper.c index d29722d8acb..11a5f0be52f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4191,6 +4191,24 @@ static const ARMCPRegInfo pan_reginfo = { .readfn = aa64_pan_read, .writefn = aa64_pan_write }; +static uint64_t aa64_uao_read(CPUARMState *env, const ARMCPRegInfo *ri) +{ + return env->pstate & PSTATE_UAO; +} + +static void aa64_uao_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + env->pstate = (env->pstate & ~PSTATE_UAO) | (value & PSTATE_UAO); +} + +static const ARMCPRegInfo uao_reginfo = { + .name = "UAO", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 4, .crm = 2, .opc2 = 4, + .type = ARM_CP_NO_RAW, .access = PL1_RW, + .readfn = aa64_uao_read, .writefn = aa64_uao_write +}; + static CPAccessResult aa64_cacheop_access(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) @@ -7664,6 +7682,9 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, ats1cp_reginfo); } #endif + if (cpu_isar_feature(aa64_uao, cpu)) { + define_one_arm_cp_reg(cpu, &uao_reginfo); + } if (arm_feature(env, ARM_FEATURE_EL2) && cpu_isar_feature(aa64_vh, cpu)) { define_arm_cp_regs(cpu, vhe_reginfo); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index d8ba240a155..7c26c3bfebb 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1602,6 +1602,20 @@ static void handle_msr_i(DisasContext *s, uint32_t insn, s->base.is_jmp = DISAS_NEXT; break; + case 0x03: /* UAO */ + if (!dc_isar_feature(aa64_uao, s) || s->current_el == 0) { + goto do_unallocated; + } + if (crm & 1) { + set_pstate_bits(PSTATE_UAO); + } else { + clear_pstate_bits(PSTATE_UAO); + } + t1 = tcg_const_i32(s->current_el); + gen_helper_rebuild_hflags_a64(cpu_env, t1); + tcg_temp_free_i32(t1); + break; + case 0x04: /* PAN */ if (!dc_isar_feature(aa64_pan, s) || s->current_el == 0) { goto do_unallocated;