From patchwork Thu Mar 14 04:55:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1056342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="yyCFqKgD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44KcCz4vKHz9s55 for ; Thu, 14 Mar 2019 16:07:59 +1100 (AEDT) Received: from localhost ([127.0.0.1]:57006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4Iay-0004dv-96 for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2019 01:07:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4IPE-0004dq-3D for qemu-devel@nongnu.org; Thu, 14 Mar 2019 00:55:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4IPD-0007TD-5c for qemu-devel@nongnu.org; Thu, 14 Mar 2019 00:55:48 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:39626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h4IPC-0007So-Ud for qemu-devel@nongnu.org; Thu, 14 Mar 2019 00:55:47 -0400 Received: by mail-pg1-x543.google.com with SMTP id h8so3147164pgp.6 for ; Wed, 13 Mar 2019 21:55:46 -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=D2d2Ekku2Ab6AUXv8SytBYGltSiFV/Xsi168amKsjOE=; b=yyCFqKgDQcZ1MLF523Ew4u4hiLNiypQ8G1l3Uio54ryK3c+7oUtSzRQYWPDVopI389 XxUK7Ef16TrbGKqtwbYfBKiOxL6CNyc+wJ07AIh3wfiFrayUlZBu5oM6I8DHd6W4kl31 fI7AxCrqZY4FF2M+ZyclWjmkgOoupMYaTmJf0g5tzVzaz/JgMuaPlWFMzIJSsSc9ur27 IP6K1ZZjOpxqAgdrJDMx20IH2qZrKT9EdC84Ewufcw6rS57yD5pPevVb0jpdZ0J/ZRZz CxBBG/FA5pQENfawm/e1FLSdw5AgdWnukc2xNZYQXfHy6yCsTu2I2v5qWBXu6FuLafbt easQ== 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=D2d2Ekku2Ab6AUXv8SytBYGltSiFV/Xsi168amKsjOE=; b=Fq/tMw3tm19/InSDDqFc+R5Nt+iJI58iM9CPLHjtUlDkCtDAhsvSiCYslPN7jpur0x coAw2OJy0rUNVL5ny0Q45E/j/h3J+CI7KA0GXAK7xQaRgiCUTajt36eWgfcyAjBpjhsv az9i4S7J4zjJT4IizrKoF43cNfRfKXHqIcgICVE9oapNk71FuetkIF853MvXvEMFMmwd sOESLTZOWZ/H35bF5T/dna3x1lxtb7dDVdlQ6m0vEl2sy8wSJ4MB/enkazn+sjKhYNq0 EE9ZsLZjYHK8/DrHeydUMsZ2rBC5bdRWI/wPcPE65vBuyWiC0bhQGWMjZ2F0VdypZwOz vSeA== X-Gm-Message-State: APjAAAW70v2aoUD2akn5SwtnS6tuq0yRFPUH0kL2NT8ILyGLVKBd4Zni 8wpkY5EFS43Z1568GXaQN7gZRv9qUfg= X-Google-Smtp-Source: APXvYqxul5XpPTrIeASTOGxUqfUwe18hbZTsY2b0dDDRFzLzJyP1pzWWixJBIsrgYSsDFxYO07hJlQ== X-Received: by 2002:aa7:81c5:: with SMTP id c5mr48659905pfn.217.1552539345105; Wed, 13 Mar 2019 21:55:45 -0700 (PDT) Received: from localhost.localdomain (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id d9sm16185027pgq.6.2019.03.13.21.55.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 21:55:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 13 Mar 2019 21:55:26 -0700 Message-Id: <20190314045526.13342-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190314045526.13342-1-richard.henderson@linaro.org> References: <20190314045526.13342-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH v2 14/14] target/arm: Implement ARMv8.5-RNG 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Cc: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.h | 5 +++++ target/arm/cpu64.c | 1 + target/arm/helper.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5f23c62132..aaa9e02e78 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3441,6 +3441,11 @@ static inline bool isar_feature_aa64_condm_5(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64isar0, ID_AA64ISAR0, TS) >= 2; } +static inline bool isar_feature_aa64_rndr(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64isar0, ID_AA64ISAR0, RNDR) != 0; +} + static inline bool isar_feature_aa64_jscvt(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, JSCVT) != 0; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 228906f267..835f73cceb 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -310,6 +310,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64ISAR0, DP, 1); t = FIELD_DP64(t, ID_AA64ISAR0, FHM, 1); t = FIELD_DP64(t, ID_AA64ISAR0, TS, 2); /* v8.5-CondM */ + t = FIELD_DP64(t, ID_AA64ISAR0, RNDR, 1); cpu->isar.id_aa64isar0 = t; t = cpu->isar.id_aa64isar1; diff --git a/target/arm/helper.c b/target/arm/helper.c index 2607d39ad1..3fe7dc8719 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -20,6 +20,7 @@ #include "fpu/softfloat.h" #include "qemu/range.h" #include "qapi/qapi-commands-target.h" +#include "qemu/random.h" #define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */ @@ -5717,6 +5718,34 @@ static const ARMCPRegInfo pauth_reginfo[] = { .fieldoffset = offsetof(CPUARMState, apib_key.hi) }, REGINFO_SENTINEL }; + +static uint64_t rndr_readfn(CPUARMState *env, const ARMCPRegInfo *ri) +{ + uint64_t ret; + + /* Success sets NZCV = 0000. */ + env->NF = env->CF = env->VF = 0, env->ZF = 1; + if (likely(qemu_getrandom(&ret, sizeof(ret), true))) { + return ret; + } + + /* Failure sets Z = 1 and returns 0. */ + env->ZF = 0; + return 0; +} + +/* We do not support re-seeding, so the two registers operate the same. */ +static const ARMCPRegInfo rndr_reginfo[] = { + { .name = "RNDR", .state = ARM_CP_STATE_AA64, + .type = ARM_CP_NO_RAW | ARM_CP_SUPPRESS_TB_END, + .opc0 = 3, .opc1 = 3, .crn = 2, .crm = 4, .opc2 = 0, + .access = PL0_R, .readfn = rndr_readfn }, + { .name = "RNDRRS", .state = ARM_CP_STATE_AA64, + .type = ARM_CP_NO_RAW | ARM_CP_SUPPRESS_TB_END, + .opc0 = 3, .opc1 = 3, .crn = 2, .crm = 4, .opc2 = 1, + .access = PL0_R, .readfn = rndr_readfn }, + REGINFO_SENTINEL +}; #endif static CPAccessResult access_predinv(CPUARMState *env, const ARMCPRegInfo *ri, @@ -6661,6 +6690,9 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (cpu_isar_feature(aa64_pauth, cpu)) { define_arm_cp_regs(cpu, pauth_reginfo); } + if (cpu_isar_feature(aa64_rndr, cpu)) { + define_arm_cp_regs(cpu, rndr_reginfo); + } #endif /*