From patchwork Tue Oct 16 22:31:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 985023 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="j1zFNUmL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ZVVX2d9Xz9s47 for ; Wed, 17 Oct 2018 09:34:44 +1100 (AEDT) Received: from localhost ([::1]:60406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCXvF-0003be-To for incoming@patchwork.ozlabs.org; Tue, 16 Oct 2018 18:34:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCXsA-0001Tk-GY for qemu-devel@nongnu.org; Tue, 16 Oct 2018 18:31:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCXs8-0005Na-1r for qemu-devel@nongnu.org; Tue, 16 Oct 2018 18:31:30 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:40428) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCXs6-000579-BH for qemu-devel@nongnu.org; Tue, 16 Oct 2018 18:31:26 -0400 Received: by mail-pl1-x644.google.com with SMTP id 1-v6so11674383plv.7 for ; Tue, 16 Oct 2018 15:31:23 -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=Pk44j7DiwNxDeMQd2V/NrCjIKJpV86I02fjGrWjjq34=; b=j1zFNUmLA2pI93+Nzbu9fECb9R3m3qdHQ6AqMmtr59k1loWlebbKFiY8kPP7unfdmj glYcbeSjw6PXLVusb9CBOen6JSSvLwThcH3yO0q5Azf6rDzMKP1blk9JLKaWGQ3/n/AZ nispY808ZclqrNYOxFWLZBrhDx4U4+oH1ChDA= 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=Pk44j7DiwNxDeMQd2V/NrCjIKJpV86I02fjGrWjjq34=; b=JG1BdwIR1Xbs245ga64vn4j8bbW2P8rb2qQbj9HSe7G0EGue2LEPDYfCabhX7XBIup B4PsbBCrXxRz2l60chWINJhMopa21kVvarsG+JR19wbYF/FAXgThUYfUTTLbhZBtV05V /aLs5icPb28O14IRAFoaeHVwLY7CHpC6X3TmKySCUlboXUg9pE4t/nMNVoXV/0wcd4F0 aioYeJQ32IY0j+yCdYX/qgaZMZd6cF/J6qL3Po9a96UDbAy36TIG1LkEOBcmSghJGfO7 cIdvQarhekZ/20MyborIYOmbdqqUP9eJwzpDaJMOCwva6MF/60GvEr9QmxLLq6l0RaG4 ULQw== X-Gm-Message-State: ABuFfoh5wJUmqdteRBQB0H4LfAMTMubFfrUBErDZXV1uMx+XkyTwDqZr iHE2SSltDoleCO/zxuFlcQon+2jgGXw= X-Google-Smtp-Source: ACcGV63gZP6Y70ZZ8hJGbiurDhlEt+AFIiCsVvq+X5GC6lTxq7zDdWiyD1JgQpeyFL9HzYPtGLat2w== X-Received: by 2002:a17:902:2805:: with SMTP id e5-v6mr23452790plb.169.1539729082087; Tue, 16 Oct 2018 15:31:22 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id a79-v6sm23094458pfa.124.2018.10.16.15.31.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Oct 2018 15:31:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Oct 2018 15:31:09 -0700 Message-Id: <20181016223115.24100-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181016223115.24100-1-richard.henderson@linaro.org> References: <20181016223115.24100-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::644 Subject: [Qemu-devel] [PATCH v4 2/8] target/arm: V8M should not imply V7VE 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Instantiating mps2-an505 (cortex-m33) will fail make check when V7VE asserts that ID_ISAR0.Divide includes ARM division. It is also wrong to include ARM_FEATURE_LPAE. Signed-off-by: Richard Henderson --- target/arm/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4f6756a4e2..12e6273d60 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -814,7 +814,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) /* Some features automatically imply others: */ if (arm_feature(env, ARM_FEATURE_V8)) { - set_feature(env, ARM_FEATURE_V7VE); + if (arm_feature(env, ARM_FEATURE_M)) { + set_feature(env, ARM_FEATURE_V7); + } else { + set_feature(env, ARM_FEATURE_V7VE); + } } if (arm_feature(env, ARM_FEATURE_V7VE)) { /* v7 Virtualization Extensions. In real hardware this implies