From patchwork Fri Nov 2 14:54:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150045 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2178800ljp; Fri, 2 Nov 2018 07:59:36 -0700 (PDT) X-Google-Smtp-Source: AJdET5cyIWVJvv9G0xA6N5zKXTlu2VsUhNnjecATFzPCSHgtmbBqqI4IBQyCshlI9zzq4oq4MvnO X-Received: by 2002:ac8:101a:: with SMTP id z26-v6mr11172052qti.308.1541170776829; Fri, 02 Nov 2018 07:59:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541170776; cv=none; d=google.com; s=arc-20160816; b=IRXDOIJxBpfm6xUeTxhpVIGQ35nMA+yBbwE/UQ99ZjZ/cjRmecHkZZplw8WIObxlGu e2j4t3rSTsxBddo5cEzIim3Hr/UPU49ovm0ldcdDzXLZ1hFaRyCzhjZSdRqMz8qEmvzn /snmayNwcgCPaUXOLAHUDD7HQ0gXR82PizxoYXTInCaBAVZomLslM/Zby7VnCPgepJc0 EVX6sSxI1G16a5Gp45G1OPJytzaFrcJqAtTsd2zy1dZCdIwCTDaubsc3qXW6OyzVW8Wu VBorDhs9F4iNRXd8I9kxBFGcP0hlgtz24xx14EBaiHYRLEeT/YrnkKj2su5v9g81jl1m 0mFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=gYge3JpLCAszNSWZKrrE6al9e3ChMpf2vAek9PkFKjE=; b=EPhelUb62xu3/LOucDhdWBbsTvNPjxzgQAoF4XaWZWZhXXRzxbTFL0JanbJk7OxpTe 2kOwfHGMpRaZsBJyH/7yB8vmsC6cKDMHwtX7f8IeTGHHULbmQbzq1Od312BkKFINP5fj loySKnj4W3rVNnwGu34Aikun75gMI1op9kQqFhVlJh8fUQZGc4NpXhZ9+H827nHBhi3q /1/yBySCS1NUnJN2fy+8CYr+TIH5Hbx58rQixFl1I+TcNSqLxotGHJkLMVPsjsrRBue7 H9yPjd+C45ThJgceq1KHYT38MkGi1WShDD2mL37Qjnbz0uT0mrDVoeWE48eGOd9lvZqA luTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D6lyjo2E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k6si5527685qtp.367.2018.11.02.07.59.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 02 Nov 2018 07:59:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D6lyjo2E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIavA-0007QR-BV for patch@linaro.org; Fri, 02 Nov 2018 10:59:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIaqX-0002Fn-9B for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIaqV-0003IX-R9 for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:49 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIaqV-0003GA-Dz for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:47 -0400 Received: by mail-wr1-x443.google.com with SMTP id z16-v6so2299839wrv.2 for ; Fri, 02 Nov 2018 07:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gYge3JpLCAszNSWZKrrE6al9e3ChMpf2vAek9PkFKjE=; b=D6lyjo2EhDFZR6R+dExJAJ+tCB5dzPbRemOKLpQDlUaMxddUG0naBZbF8mtGwkHJuZ G6UzQSK29PC2ltfakMN+8rNCDM4RnpGgpJZvWQdyN/wBJjgWts6SBM1eqyCHr4HJEEwV DTxHcBaPZAz1zei/oSgzagiTTsX/VGwESR+ic= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gYge3JpLCAszNSWZKrrE6al9e3ChMpf2vAek9PkFKjE=; b=arABIO5c6Wo4OUliSopwcNaCa9QvsMuD8Y7wX5MUblk68E+v7cnzBEeK3OiI0GsGzV QCROTtRN7/tQ0Jc8ZOANYpO+YGqEp40ljFWZKp/90eQach3KYvDQgSF7b9GhK1R4I9Vr EZ9xl3/Y0f1L6OOpcmSNG8vQw0aWTQbLtwWk/6XTPAu2x1ZL7VJilhGPQbTDpKrJBLlM ilhq+Z7b2xyK70rTBRfdxExAOypLjbPaoh6eaa/x1E8xtzZ0xjlQyW1PyD1gYJ9iFUKf rHKIw6HD09CkjMdc4pr3UicgK1OLnBb5HoPapAczCX01lLwbjtR4n2vF5FKSTUMlWixj sfDQ== X-Gm-Message-State: AGRZ1gIqUQSNYRz0ifwcQlh71UxEsLMUkkVlpHiQMnjyPnH/0qTP00+w vNsdUZoK2g9XmDZeowDT1i90co5XMhM= X-Received: by 2002:adf:fdc8:: with SMTP id i8-v6mr11143944wrs.276.1541170483105; Fri, 02 Nov 2018 07:54:43 -0700 (PDT) Received: from cloudburst.Home ([2a02:c7f:504f:6300:a3de:88d8:75ae:bf4c]) by smtp.gmail.com with ESMTPSA id l5-v6sm10698454wrv.84.2018.11.02.07.54.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Nov 2018 07:54:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 14:54:33 +0000 Message-Id: <20181102145433.4553-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181102145433.4553-1-richard.henderson@linaro.org> References: <20181102145433.4553-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v2 5/5] target/arm: Convert t32ee from feature bit to isar3 test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.h | 6 +++++- linux-user/elfload.c | 2 +- target/arm/cpu.c | 4 ---- target/arm/helper.c | 2 +- target/arm/kvm32.c | 3 --- target/arm/machine.c | 3 +-- 6 files changed, 8 insertions(+), 12 deletions(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 8e6779936e..895f9909d8 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1575,7 +1575,6 @@ enum arm_features { ARM_FEATURE_NEON, ARM_FEATURE_M, /* Microcontroller profile. */ ARM_FEATURE_OMAPCP, /* OMAP specific CP15 ops handling. */ - ARM_FEATURE_THUMB2EE, ARM_FEATURE_V7MP, /* v7 Multiprocessing Extensions */ ARM_FEATURE_V7VE, /* v7 Virtualization Extensions (non-EL2 parts) */ ARM_FEATURE_V4T, @@ -3172,6 +3171,11 @@ static inline bool isar_feature_jazelle(const ARMISARegisters *id) return FIELD_EX32(id->id_isar1, ID_ISAR1, JAZELLE) != 0; } +static inline bool isar_feature_t32ee(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_isar3, ID_ISAR3, T32EE) != 0; +} + static inline bool isar_feature_aa32_aes(const ARMISARegisters *id) { return FIELD_EX32(id->id_isar5, ID_ISAR5, AES) != 0; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 5bccd2e243..a3503c83c9 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -466,7 +466,7 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE(ARM_FEATURE_V5, ARM_HWCAP_ARM_EDSP); GET_FEATURE(ARM_FEATURE_VFP, ARM_HWCAP_ARM_VFP); GET_FEATURE(ARM_FEATURE_IWMMXT, ARM_HWCAP_ARM_IWMMXT); - GET_FEATURE(ARM_FEATURE_THUMB2EE, ARM_HWCAP_ARM_THUMBEE); + GET_FEATURE_ID(t32ee, ARM_HWCAP_ARM_THUMBEE); GET_FEATURE(ARM_FEATURE_NEON, ARM_HWCAP_ARM_NEON); GET_FEATURE(ARM_FEATURE_VFP3, ARM_HWCAP_ARM_VFPv3); GET_FEATURE(ARM_FEATURE_V6K, ARM_HWCAP_ARM_TLS); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 8f16e96b6c..e08a2d2d79 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1440,7 +1440,6 @@ static void cortex_a8_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7); set_feature(&cpu->env, ARM_FEATURE_VFP3); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->midr = 0x410fc080; @@ -1509,7 +1508,6 @@ static void cortex_a9_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_VFP3); set_feature(&cpu->env, ARM_FEATURE_VFP_FP16); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_EL3); /* Note that A9 supports the MP extensions even for * A9UP and single-core A9MP (which are both different @@ -1572,7 +1570,6 @@ static void cortex_a7_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7VE); set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); @@ -1618,7 +1615,6 @@ static void cortex_a15_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7VE); set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); diff --git a/target/arm/helper.c b/target/arm/helper.c index 0ea95b0815..bea4d5350d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5455,7 +5455,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, vmsa_pmsa_cp_reginfo); define_arm_cp_regs(cpu, vmsa_cp_reginfo); } - if (arm_feature(env, ARM_FEATURE_THUMB2EE)) { + if (cpu_isar_feature(t32ee, cpu)) { define_arm_cp_regs(cpu, t2ee_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) { diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index 9ededa3c73..8b2c9b3075 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -115,9 +115,6 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) set_feature(&features, ARM_FEATURE_VFP3); set_feature(&features, ARM_FEATURE_GENERIC_TIMER); - if (extract32(id_pfr0, 12, 4) == 1) { - set_feature(&features, ARM_FEATURE_THUMB2EE); - } if (extract32(ahcf->isar.mvfr1, 20, 4) == 1) { set_feature(&features, ARM_FEATURE_VFP_FP16); } diff --git a/target/arm/machine.c b/target/arm/machine.c index 239fe4e84d..07f904709a 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -321,9 +321,8 @@ static const VMStateDescription vmstate_m = { static bool thumb2ee_needed(void *opaque) { ARMCPU *cpu = opaque; - CPUARMState *env = &cpu->env; - return arm_feature(env, ARM_FEATURE_THUMB2EE); + return cpu_isar_feature(t32ee, cpu); } static const VMStateDescription vmstate_thumb2ee = {