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: 149003 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp5670540lji; Tue, 16 Oct 2018 15:36:34 -0700 (PDT) X-Google-Smtp-Source: ACcGV60qAbaluqSy+ARb11wcJcRHSTE4LIlg8GeOpwQ8QD6Rcm6J7aTXAgtDHUR7q0yOsFLOYuwN X-Received: by 2002:ac8:1c75:: with SMTP id j50-v6mr23303210qtk.320.1539729394487; Tue, 16 Oct 2018 15:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539729394; cv=none; d=google.com; s=arc-20160816; b=dJrfjPqEGG31iSdOjzNzVFHMxDfM/pBIPLA18QoBPwFUmuIZ0wMe4Fg8q2lrBb9eLl 6HWXTbVde9k+2mzRgCqWclhupD2wKPaS4BP7WM1L75UwTJjAU37aKhQlEYSQw/9D2FhZ eCYg97fBu8Avu7avYBxsfsXzEacWm7hzzuNfuc1FpWoayHRJWaw30IB1Q8Qh6PCrwNnN 7X1G2UGSGd6jlIMN71EMAgMdBE6AIChUdqvrQ700zd1MoLN8GMFqUAsDHcqSeoKuEa7w Tvcr64wisJWxFtKtYJBZjL7EEkQ/ToUcvT/0pZN7gzaY60fx+7tx6mSyki4devynyWC/ +aCA== 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; bh=Pk44j7DiwNxDeMQd2V/NrCjIKJpV86I02fjGrWjjq34=; b=d3tbatjTaxV1wNyG7Z1+PrEJwCN2RjukBscCl4Sm0K1jD+q8Du+TBHSRtqPreImRvQ h+2h37WFZQX7cV1yab2Qchje76A95/WW/OBqDovi/pZPZ7O/ELF3IuBvEE87UmSxl/XZ Xt5IGjS35g/OAmerEarhimWm0Ayfi1KAmf7ubhY5Kh8ie/F1KtGTmWuRkB/oN3YLOSwS jZ9OqaotB10lBq9tt+xPkgRK8PeRgIfJE+AovMgRIlnfKWj8p6Hw2rQ06lUvKBAbHz4C 0H1eYJBzkC/ctZplMBNtYBm2PsAqir2LfwKBXjLJg8sqwzza5hOIZpYmVgH4ljkNN0Zv q0/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=j1zFNUmL; 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 a27-v6si3901779qtc.162.2018.10.16.15.36.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 16 Oct 2018 15:36:34 -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=j1zFNUmL; 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]:60422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCXx4-0005Ml-0S for patch@linaro.org; Tue, 16 Oct 2018 18:36:34 -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-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+patch=linaro.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(-) -- 2.17.2 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