From patchwork Thu Jun 2 21:48:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 578181 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp980645max; Thu, 2 Jun 2022 15:56:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzk/B+UIIn3jD9fGToljD6KGftJGl5GuB4lUAgZ7sHr2G/mUCCO2Htd+8WsbYAiADlSMeQr X-Received: by 2002:a05:620a:29c9:b0:6a6:4f4d:637e with SMTP id s9-20020a05620a29c900b006a64f4d637emr4731033qkp.43.1654210596143; Thu, 02 Jun 2022 15:56:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654210596; cv=none; d=google.com; s=arc-20160816; b=XngpL3NkUHmQyH0ugV+HNbOoCzJ/W5q4Ux87KHx5l7hxCWvOCmjGejjiz2PngrCB1n aiAOT3lcNplM2JybS/VZ13gp3mAaDqHyD7LbQ22rpffugUfoCTIv2+9Mc5eiH79lE/N6 6MGjAkk99B1XvamKV7r27GbyW9em0OcI1Q8sJH/55HRtm1v+vBm91j3QIm7Z/6EAkuj7 yyWCFPfG6LLakDMq4aBlVJUrV+ve47KqPSoEMjBt2/O8wu6qr8xlzHDI+/FpVKRr0aHk IL1y2XWSVF+HQR+sgUQ3IvevSSdgQ3d4Ix9ljs+7f9uDuix/zzBsRMA9z0AeV48m8FF5 AnNw== 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:cc:to :from:dkim-signature; bh=8ss3EaTY1TKvXRQ5t3puVtJ4SylwysppKIF75i7g6zo=; b=RsLXI3jwVrMjBCRUwF/F5qPzqHtZUOuYU+ns7tUySJvW9iHQJLbmljl1IhhW6qTC26 Am5pX/rjFZV1euFU++tPuISRfiK+sGQjckFJ8eF0zsnvvFX8AW+HdARDo0+6ku220g/V gvQzg2esVV421eQu3sYKghqRIOXXBuhM3ikxhRksP3NNJj0tADrqBZFzLMsrXXTB8fKR t5Zmsgh6JqH8mDSWyDpZCzgcFCNmJ09rJKzjcVpswJFeZM9CRs9cqb0S6gFKTOdcR8lD dBORSVS6buRowLtVNlu0lCU8nYwtvgHlw4I5BglQ14WmlSIZgK0ENFVR3EzhCW6SbCX7 n8Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e0Dzgjp6; 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 z14-20020a05622a060e00b002f3d3476fafsi2860632qta.241.2022.06.02.15.56.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Jun 2022 15:56:36 -0700 (PDT) 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=e0Dzgjp6; 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]:35792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwtk3-0005Dj-O7 for patch@linaro.org; Thu, 02 Jun 2022 18:56:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwskW-0001jF-Cy for qemu-devel@nongnu.org; Thu, 02 Jun 2022 17:53:03 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:41937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwskS-00010X-1w for qemu-devel@nongnu.org; Thu, 02 Jun 2022 17:53:00 -0400 Received: by mail-pf1-x42c.google.com with SMTP id p8so5801462pfh.8 for ; Thu, 02 Jun 2022 14:52:55 -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 :mime-version:content-transfer-encoding; bh=8ss3EaTY1TKvXRQ5t3puVtJ4SylwysppKIF75i7g6zo=; b=e0Dzgjp6I8jGOEppACdfsKJaSp7FXZyc8E20KQp3Cuhp7s8vPjzW0NSt3pLhGncxFX tyImvZGGwCsfTg76sDRvWAX/fbxkgIxjLRZ7usEyBJu7kUuxLF4It65jm5QZFEDMltvE YUtx8l010oEn9Uon4FXWl/QK442US0lIavmq92Ulrsllh5id14U3VpgdL7UOVoSDP7bo 8jZjCR8uuqrZCED9bc4X+Qy9xu5mT1/BYpAmdGTJgUfUpiC0LKFMIryOGuQie1TI/i3F BvKUk8dZVfb6Iby+kEO259A1Atr0odW86Q3PV8abusC0D8COa7aRwbVXlFMcZUeKPf43 v25g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8ss3EaTY1TKvXRQ5t3puVtJ4SylwysppKIF75i7g6zo=; b=y3yYmSGVkgQkTCFzCSrT2LYqi2iA988LQkxQknuGAqCW4tk5yt17wkIXvo7idMM221 CSmcp19LvK7zAvi84g6LTTa/4FCC5q5ALToOGmANckLCUAR9c2Ltrd+N59fS5l4AWRyy NaL2E+6xu2a/ELTf/+gX4qiJoRYId24kBzuarsLb+oV7FWjebTMGNHiuJPAiWmXJFQdQ Zj92yjnbfk4V8EHbhyuhRIvuHK6JMV89qp9OErEp9pOfV+n6v76qz1XcxN5SsBtMfN4l BpnFXgkadgjTjwYDIobMjdGz9D4RQH5631FIftrCjIYjxAPg+fgmaMCaWY+R7j5akgpC wEbg== X-Gm-Message-State: AOAM532FMBGQ75a+vdZ4JufaxtzAB/hEZcwjvOkKYZXzepIc7LR6ge68 1GLS7+LNZUeoP5hP4uN+URWr0xbROSR6WA== X-Received: by 2002:a62:1784:0:b0:51b:bc40:28a7 with SMTP id 126-20020a621784000000b0051bbc4028a7mr7121646pfx.55.1654206774809; Thu, 02 Jun 2022 14:52:54 -0700 (PDT) Received: from stoup.. (174-21-71-225.tukw.qwest.net. [174.21.71.225]) by smtp.gmail.com with ESMTPSA id e14-20020a170902ed8e00b0015edfccfdb5sm4039605plj.50.2022.06.02.14.52.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 14:52:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 69/71] target/arm: Only set ZEN in reset if SVE present Date: Thu, 2 Jun 2022 14:48:51 -0700 Message-Id: <20220602214853.496211-70-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220602214853.496211-1-richard.henderson@linaro.org> References: <20220602214853.496211-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" There's no reason to set CPACR_EL1.ZEN if SVE disabled. Signed-off-by: Richard Henderson --- target/arm/cpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 75295a14a3..5cb9f9f02c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -203,11 +203,10 @@ static void arm_cpu_reset(DeviceState *dev) /* and to the FP/Neon instructions */ env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1, CPACR_EL1, FPEN, 3); - /* and to the SVE instructions */ - env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1, - CPACR_EL1, ZEN, 3); - /* with reasonable vector length */ + /* and to the SVE instructions, with default vector length */ if (cpu_isar_feature(aa64_sve, cpu)) { + env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1, + CPACR_EL1, ZEN, 3); env->vfp.zcr_el[1] = cpu->sve_default_vq - 1; } /*