From patchwork Fri Jun 29 00:15:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 140487 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp199364ljj; Thu, 28 Jun 2018 17:19:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdWNt2n18xMNHU33QdpRjvS8bBiW+TYAsmG10+fCVdQFy9TlLdFvdr+qMlfcZohgsYZWtua X-Received: by 2002:ac8:36f0:: with SMTP id b45-v6mr11319126qtc.249.1530231557457; Thu, 28 Jun 2018 17:19:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530231557; cv=none; d=google.com; s=arc-20160816; b=VVbChmxXo1JGEUD4MSB2UgNy4iwkAOxa8uui8TtLFdjFvwBkdZuEuZhQYVES231UmO JfEb0MBY/pdx55MuURlJxUJKQestk33gFeBwJiP8F3PxcOQCPweZKNHrKE6bSR1CwceK uxMfvBj4ePZIJNwAdr8LWXB7OVBcsaiEQs4fROEtWiV4eWMcLv+C4v0Mez8M1coTHmEB mCxwACTGSMsXLMtaa1lBPIOfW4TIM6E9jxjWAk9OcxfHXZ6KAf3rrVn3omQ49WbNCKO6 wAs2jjEnnf8+Qk5BNAMyHDMuhzt0G722lo1StBzg43vx59e39yXMgnMBFAaXESSI9wMH S12A== 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:arc-authentication-results; bh=zcgc074MhgPb88dn8j3LBz2LriQUpfV1TTmj3EVQ6yA=; b=zvEGXb/nWAMxjLgVn3TESfs5zbk3KmKhq/koCuEAd8ZiJHWWWYQ3Q2IEsuwTSq0Ows Xk7mj/Es3O86SAdXy+bhVP3OBgMISxHNx4rvvwfEntuNu9u+Z9h+VmoMvRF0GF7kW9Dq Lu1/JXPLv/OpKf88KScCjZH6DJhcao7iT6B3skvxoy3NwbniEDvaLwgBEdB6c5VAkTZc w86biocHJlXaPqVEG5wI/nJ6mAU1OhoiSZQKLH9fQoGXLeqpg8dBZNe3vPe8SBubdiia bvktwLlur9NlgXG+ULgWzJYGryotLGfwZGjR6Wxe9/o0Rz1eglTVTzoJeVsHW4iRzruG Eqtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IcyAqCX9; 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 x4-v6si2807666qvc.198.2018.06.28.17.19.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Jun 2018 17:19:17 -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=IcyAqCX9; 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]:39245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYh88-0006VW-V8 for patch@linaro.org; Thu, 28 Jun 2018 20:19:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYh4o-00043l-85 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 20:15:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYh4n-0006hb-42 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 20:15:50 -0400 Received: from mail-pl0-x22c.google.com ([2607:f8b0:400e:c01::22c]:41159) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYh4m-0006h4-Mr for qemu-devel@nongnu.org; Thu, 28 Jun 2018 20:15:49 -0400 Received: by mail-pl0-x22c.google.com with SMTP id w8-v6so3553480ply.8 for ; Thu, 28 Jun 2018 17:15:48 -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=zcgc074MhgPb88dn8j3LBz2LriQUpfV1TTmj3EVQ6yA=; b=IcyAqCX9xSyd/ARFsTXrSmSgRpwk0XQUx/fTRZXmAS8HWZkcPQCAVo48/Hf50jhI4f LsslSORfaZHMsOsxLdRcDd0XCuu+w3nYJDco4veb7NVOKcqVnrRWTgwhOauxAtgSnnpA YR+Q0fo6npppyN8I7B6GtpTWWZW16UvCcj70o= 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=zcgc074MhgPb88dn8j3LBz2LriQUpfV1TTmj3EVQ6yA=; b=l3zh5tmh7NX5jmZQ4ugzxk/RaIv38vDX9X0M01nIAtbHEHggy/UK4wu2mtxhB95MkO 2OdzHvOtL//V6OqgS7sovuw4RyHZ0E0Hzl0ELTeanUYx/zDUv5LqN7eiyw5jMRcq6X/F aiNkhbjZvtVvjtttLvbo9D5St6QzRW6xp6VnYUtGEHAI3nstGtJekUcHVBb8MptU8Vn2 KWWp/g+/P9PX+v0dHE7BOHYk6ftvD5XAJS/SExuHSnlqtw/AL4qSPIti0lFVlp3mbtQQ kw6W4XcTLpis8HNNomY8kDjXaeHsPc0tEewDhx3/SSXr448jgfYt7qFsjHC/EWQ2oLSf 7LsQ== X-Gm-Message-State: APt69E0E3M3+89hjm8GAoQQCEw35dsC/QJKlup7WUI811Rk9EGeWv7hs HcGW6YrVbvXrTP6ykrc03v25BNuVPbk= X-Received: by 2002:a17:902:46e:: with SMTP id 101-v6mr12682203ple.39.1530231347585; Thu, 28 Jun 2018 17:15:47 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-112-211.tukw.qwest.net. [97.126.112.211]) by smtp.gmail.com with ESMTPSA id j3-v6sm11687618pff.35.2018.06.28.17.15.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 17:15:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 17:15:37 -0700 Message-Id: <20180629001538.11415-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629001538.11415-1-richard.henderson@linaro.org> References: <20180629001538.11415-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22c Subject: [Qemu-devel] [PATCH 5/6] target/arm: Add ID_ISAR6 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This register was added to aa32 state by ARMv8.2. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 1 + target/arm/cpu.c | 4 ++++ target/arm/cpu64.c | 2 ++ target/arm/helper.c | 5 ++--- 4 files changed, 9 insertions(+), 3 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 6a8441c2dd..1505ac936e 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -813,6 +813,7 @@ struct ARMCPU { uint32_t id_isar3; uint32_t id_isar4; uint32_t id_isar5; + uint32_t id_isar6; uint64_t id_aa64pfr0; uint64_t id_aa64pfr1; uint64_t id_aa64dfr0; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 878cc6c7e8..de1a07a9f1 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1262,6 +1262,7 @@ static void cortex_m3_initfn(Object *obj) cpu->id_isar3 = 0x01111110; cpu->id_isar4 = 0x01310102; cpu->id_isar5 = 0x00000000; + cpu->id_isar6 = 0x00000000; } static void cortex_m4_initfn(Object *obj) @@ -1288,6 +1289,7 @@ static void cortex_m4_initfn(Object *obj) cpu->id_isar3 = 0x01111110; cpu->id_isar4 = 0x01310102; cpu->id_isar5 = 0x00000000; + cpu->id_isar6 = 0x00000000; } static void cortex_m33_initfn(Object *obj) @@ -1316,6 +1318,7 @@ static void cortex_m33_initfn(Object *obj) cpu->id_isar3 = 0x01111131; cpu->id_isar4 = 0x01310132; cpu->id_isar5 = 0x00000000; + cpu->id_isar6 = 0x00000000; cpu->clidr = 0x00000000; cpu->ctr = 0x8000c000; } @@ -1366,6 +1369,7 @@ static void cortex_r5_initfn(Object *obj) cpu->id_isar3 = 0x01112131; cpu->id_isar4 = 0x0010142; cpu->id_isar5 = 0x0; + cpu->id_isar6 = 0x0; cpu->mp_is_up = true; cpu->pmsav7_dregion = 16; define_arm_cp_regs(cpu, cortexr5_cp_reginfo); diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 8040493d5c..d0581d59d8 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -139,6 +139,7 @@ static void aarch64_a57_initfn(Object *obj) cpu->id_isar3 = 0x01112131; cpu->id_isar4 = 0x00011142; cpu->id_isar5 = 0x00011121; + cpu->id_isar6 = 0; cpu->id_aa64pfr0 = 0x00002222; cpu->id_aa64dfr0 = 0x10305106; cpu->pmceid0 = 0x00000000; @@ -199,6 +200,7 @@ static void aarch64_a53_initfn(Object *obj) cpu->id_isar3 = 0x01112131; cpu->id_isar4 = 0x00011142; cpu->id_isar5 = 0x00011121; + cpu->id_isar6 = 0; cpu->id_aa64pfr0 = 0x00002222; cpu->id_aa64dfr0 = 0x10305106; cpu->id_aa64isar0 = 0x00011120; diff --git a/target/arm/helper.c b/target/arm/helper.c index a855da045b..e62f02d4e5 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4851,11 +4851,10 @@ void register_cp_regs_for_features(ARMCPU *cpu) .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 2, .opc2 = 6, .access = PL1_R, .type = ARM_CP_CONST, .resetvalue = cpu->id_mmfr4 }, - /* 7 is as yet unallocated and must RAZ */ - { .name = "ID_ISAR7_RESERVED", .state = ARM_CP_STATE_BOTH, + { .name = "ID_ISAR6", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 2, .opc2 = 7, .access = PL1_R, .type = ARM_CP_CONST, - .resetvalue = 0 }, + .resetvalue = cpu->id_isar6 }, REGINFO_SENTINEL }; define_arm_cp_regs(cpu, v6_idregs);