From patchwork Fri Aug 10 19:31:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 956454 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=2001:4830:134:3::11; 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" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jt1NzKxX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41nFdg0vd8z9s47 for ; Sat, 11 Aug 2018 05:32:55 +1000 (AEST) Received: from localhost ([::1]:57703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1foD9Y-0002ms-Nn for incoming@patchwork.ozlabs.org; Fri, 10 Aug 2018 15:32:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1foD8K-0002Q6-9R for qemu-devel@nongnu.org; Fri, 10 Aug 2018 15:31:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1foD8I-0005Ym-Eq for qemu-devel@nongnu.org; Fri, 10 Aug 2018 15:31:36 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:40657) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1foD8I-0005Xm-9N for qemu-devel@nongnu.org; Fri, 10 Aug 2018 15:31:34 -0400 Received: by mail-pl0-x242.google.com with SMTP id s17-v6so4429158plp.7 for ; Fri, 10 Aug 2018 12:31:34 -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=bk9aNg5b9FKQDk0OVcl2sW6P1/ZLeQzrd0wUOLiKWxY=; b=jt1NzKxXeoGE0JBtRi/R31Wpd4eF7xIDxZCY5MgAlwBOyH7xUc/UgftkOlUfXRhaTV y6wAr0+mYaC3QvpxU8R7Jnq92sDtfksbZrVvv8Bdh/Jd8Dov6LOwNbO009342jDYMWhr 7E/leNea5Txfdv/l4a49D0TUY+uweNJz1Icw4= 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=bk9aNg5b9FKQDk0OVcl2sW6P1/ZLeQzrd0wUOLiKWxY=; b=Z0RDWn5UsBt9K6LYpGMcmGjTjx7+sU1HUnsNh274iv6JOLV+uNWos/qh3bS7qqfnan /+g/nrYLsK6u7/6hrqbE0wl6CMMpgsKqLhOpeIH5VSKrpsXloG3XvY4L1kRVkrnhJCY4 HPAv39UNqOr4cLRILUmcn3qqBlpAhJp/dBU1OmChG7dpx0a2Am3yJZKgCgdOcO9oPOwV RkhMIkq1dvQO8ltNWJM1bW8Vnn9JjG+GXzFcJBwk8BaZqqQ9kYQb/iE4TR7+OqYOZL1+ 0kzXG0TRX1u7651lWKGo2YKoIOnlcypTueUJ4+gdHDiHepmqkwVgSQPQKllrcM0kx63L Ul+w== X-Gm-Message-State: AOUpUlE3tZqqGR0ersSbd3jJp5KT5TPr1K3oOl2kDiMgvuvkBOdZazDt qtyxwRBEwXNoUFKFqojTHHioNUkwalI= X-Google-Smtp-Source: AA+uWPzAj7gJjXKFpIe8EuN/mxU2Wz9uQbDvW5iD/2VXtC2UJkBEBp7IYa5YqLQMFAoG98xd9DO8kA== X-Received: by 2002:a17:902:c6b:: with SMTP id 98-v6mr7158092pls.233.1533929493079; Fri, 10 Aug 2018 12:31:33 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id g28-v6sm20500949pfe.41.2018.08.10.12.31.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Aug 2018 12:31:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2018 12:31:24 -0700 Message-Id: <20180810193129.1556-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180810193129.1556-1-richard.henderson@linaro.org> References: <20180810193129.1556-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::242 Subject: [Qemu-devel] [PATCH 1/6] target/arm: Adjust FPCR_MASK for FZ16 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: laurent.desnogues@gmail.com, peter.maydell@linaro.org, alex.bennee@linaro.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When support for FZ16 was added, we failed to include the bit within FPCR_MASK, which means that it could never be set. Continue to zero FZ16 when ARMv8.2-FP16 is not enabled. Fixes: d81ce0ef2c4 Cc: qemu-stable@nongnu.org (3.0.1) Reported-by: Laurent Desnogues Signed-off-by: Richard Henderson Tested-by: Laurent Desnogues Reviewed-by: Laurent Desnogues --- target/arm/cpu.h | 2 +- target/arm/helper.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 33d06f2340..0176716a70 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1279,7 +1279,7 @@ void vfp_set_fpscr(CPUARMState *env, uint32_t val); * we store the underlying state in fpscr and just mask on read/write. */ #define FPSR_MASK 0xf800009f -#define FPCR_MASK 0x07f79f00 +#define FPCR_MASK 0x07ff9f00 #define FPCR_FZ16 (1 << 19) /* ARMv8.2+, FP16 flush-to-zero */ #define FPCR_FZ (1 << 24) /* Flush-to-zero enable bit */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 64ff71b722..452d5e182a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11351,6 +11351,11 @@ void HELPER(vfp_set_fpscr)(CPUARMState *env, uint32_t val) int i; uint32_t changed; + /* When ARMv8.2-FP16 is not supported, FZ16 is RES0. */ + if (!arm_feature(env, ARM_FEATURE_V8_FP16)) { + val &= ~FPCR_FZ16; + } + changed = env->vfp.xregs[ARM_VFP_FPSCR]; env->vfp.xregs[ARM_VFP_FPSCR] = (val & 0xffc8ffff); env->vfp.vec_len = (val >> 16) & 7;