From patchwork Fri Mar 5 17:14:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 393536 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp627497jai; Fri, 5 Mar 2021 09:41:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6hQN15TE8eOm3sPiomlLyNyCnfOLLym4D124X4TvoENeEl/UM266C1OcrjGYl1CIPbJKd X-Received: by 2002:a92:b705:: with SMTP id k5mr9386832ili.16.1614966092005; Fri, 05 Mar 2021 09:41:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614966092; cv=none; d=google.com; s=arc-20160816; b=wOmjCeKYhMFuuzI3yE8z4vChvTR5cGWLNBFtSc/agre037oCltOSNWe5SCVWe58nHs //XHdqv9DTqimVxz+qyj8X7AGKkLXTV7p0Loj+BqXjQcG8QECGCSgSM1xbNnQdkUjwoz 8/m9TxoGiVwCMoFPbsRBGeocN7+6jZkj/suU3Wa5xZxz122BVukUpa1aRQ6rFFYq7bpG +sq4yaqgZ/JtxEcoJVgtXn5YJ0EzEgEQK0/HHe5KP6yk27g5/onsJjPohXU77vuYldOl Vt9IMd8P6Lmm2I/r/7qXYRWH3AYUeg3kEs483uhBoJRaBcquKaw/p147fINZejYfsIIl 3MQQ== 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:to:from :dkim-signature; bh=2hhxDYI5vU3qXX2kxDdWzLG7EDIqI+CmWItPuBlZX/M=; b=h51KqGqMCVzR2J06G37ckx4JP28fXxEpfFVvNnI/mAE6xrmRg//KoaR9prH4KCbb+x 2tLnDz4Rt23i5pTzG205wa6UFyxAwPvJS+QOeh5YRAhlIj0O6D3FHqM4yn0azJrnTqbb 7rH5tMmGND6eBCxx96UHp9Z3SM3phvOEJpTu02g7nRPyPGlT91zbDMcub6GLku2Q8xmx Bv6ZSl9xfii7/ZNma24hEpOhr0cFOPCxZNah1z/oCsUOGZKZdV8lur4+ohmpR5jBxyFl UuoZtaceGjyYj+abS9oYs4i159pGI7cBTuTMkATcMnWMOOaN47+bG/APDdMbEzdlDarE lZHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KD3WoDA9; 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 r2si3218694jak.94.2021.03.05.09.41.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 09:41:31 -0800 (PST) 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=KD3WoDA9; 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]:52772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIESB-0002nI-Eu for patch@linaro.org; Fri, 05 Mar 2021 12:41:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIE3N-0006sL-Bw for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:15:53 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:33190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIE2z-0007Uk-Mt for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:15:53 -0500 Received: by mail-wr1-x42f.google.com with SMTP id 7so2919471wrz.0 for ; Fri, 05 Mar 2021 09:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2hhxDYI5vU3qXX2kxDdWzLG7EDIqI+CmWItPuBlZX/M=; b=KD3WoDA9YGVsMlIc58jgQ7w+JCzSL4QIKWqaykUx0KzOQIfaAqjF2azZemu1tU5+8q cA9sjflcVxFftervn/vOMKWRg3OH3TqTTRbz444zIZP+gJhKEHfMo/pybw9DJdS3vR95 efTPQtP+9y4oiZVe2W0gvvbj5RN7TGnJCIySOyY01GGhAXdIKJjTFsAGQ5v+zAPGP2RY SrZZ2JR13DzrRoHQk7cOTVvwAXDfh6Lcl8ymynXg3q8ht9+Bm7wzj2/b3eacgxfTTlSG /yltTcySJ5MG1AEKNz5+U0dpMI2LwPpbcF5idX90uNAAAJG0qlr/As/aC47HwProW5on l/pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2hhxDYI5vU3qXX2kxDdWzLG7EDIqI+CmWItPuBlZX/M=; b=Ay8CLTofr9yEcHEEDV/UgEZfBUMI0UqWidA/RKqtMW2N90pIJHtffRkWjVxVET1IS3 pgTJ1G0U/DOUxe3M15Dam20rTr9lDZyvEJhSrUCa6RuzVspLAU/apk1AZcBpJBK9IIlm 1VsQdUn+JfvACuFEirTCJalccIgXzqxuUH1bt9LpDxJ8mt3ExSSAmGK+taR4o0Od8xrL f1VKpVl8D+37W11YGaDdGhKMkLds5CLEOx8Eeqx5GGdo9jaELV0/avAMbd1Fv/TPioRm +LHpEp51FAkxZ6TI7f1eSjXNV8T2716SUAVY6g38qRKmx7L66BBiV2sZ9stTSNdWyIfS /GJA== X-Gm-Message-State: AOAM533p0eQtWoFdSnBVwGu58bzKA7tL/qWWKnb2DxHj0E4hhKBHOkgp DL2ng/drMQF2MapCsCbMmw+owNf0d9BURQ== X-Received: by 2002:a5d:4649:: with SMTP id j9mr10054362wrs.259.1614964528096; Fri, 05 Mar 2021 09:15:28 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m132sm5942357wmf.45.2021.03.05.09.15.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:15:27 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/49] target/arm: Restrict v8M IDAU to TCG Date: Fri, 5 Mar 2021 17:14:40 +0000 Message-Id: <20210305171515.1038-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305171515.1038-1-peter.maydell@linaro.org> References: <20210305171515.1038-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" From: Philippe Mathieu-Daudé IDAU is specific to M-profile. KVM only supports A-profile. Restrict this interface to TCG, as it is pointless (and confusing) on a KVM-only build. Reviewed-by: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Message-id: 20210221222617.2579610-2-f4bug@amsat.org Signed-off-by: Peter Maydell --- target/arm/cpu.c | 7 ------- target/arm/cpu_tcg.c | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 058672c9776..2666d4363d0 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2384,12 +2384,6 @@ static const TypeInfo arm_cpu_type_info = { .class_init = arm_cpu_class_init, }; -static const TypeInfo idau_interface_type_info = { - .name = TYPE_IDAU_INTERFACE, - .parent = TYPE_INTERFACE, - .class_size = sizeof(IDAUInterfaceClass), -}; - static void arm_cpu_register_types(void) { const size_t cpu_count = ARRAY_SIZE(arm_cpus); @@ -2403,7 +2397,6 @@ static void arm_cpu_register_types(void) if (cpu_count) { size_t i; - type_register_static(&idau_interface_type_info); for (i = 0; i < cpu_count; ++i) { arm_cpu_register(&arm_cpus[i]); } diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index c29b434c60d..fb07a336939 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -14,6 +14,7 @@ #include "hw/core/tcg-cpu-ops.h" #endif /* CONFIG_TCG */ #include "internals.h" +#include "target/arm/idau.h" /* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) @@ -739,10 +740,17 @@ static const ARMCPUInfo arm_tcg_cpus[] = { { .name = "pxa270-c5", .initfn = pxa270c5_initfn }, }; +static const TypeInfo idau_interface_type_info = { + .name = TYPE_IDAU_INTERFACE, + .parent = TYPE_INTERFACE, + .class_size = sizeof(IDAUInterfaceClass), +}; + static void arm_tcg_cpu_register_types(void) { size_t i; + type_register_static(&idau_interface_type_info); for (i = 0; i < ARRAY_SIZE(arm_tcg_cpus); ++i) { arm_cpu_register(&arm_tcg_cpus[i]); }