From patchwork Sat Jan 30 01:52:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12057039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B71BC433DB for ; Sat, 30 Jan 2021 10:12:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED43464DE4 for ; Sat, 30 Jan 2021 10:12:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231179AbhA3KMQ (ORCPT ); Sat, 30 Jan 2021 05:12:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233005AbhA3Bxp (ORCPT ); Fri, 29 Jan 2021 20:53:45 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B008C061786 for ; Fri, 29 Jan 2021 17:52:57 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id e15so8527750wme.0 for ; Fri, 29 Jan 2021 17:52:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7FgMXEaeMqaVd+Y46GoSMFA7B1XefkRzbvqiN7p+wqE=; b=VxuQC/tgKHUMfQfr97MNiO38xSrcPNb3RCXXTu7K7defWmZ2lWCUz5+Kh6V8X7mpHw 0J6VIbGesbLnIehvEqvJErp2aWJ4F9jmu0YuZ4mrhMFxU02SGvL9g1WbC0P0SuKVnxso /LPUPNIt4+waPa/XVjsYNRFNNYvVbFcz0fFJT5utW+ufusAk27lPQl1XxPqmQiiAd3pp qe/SQwRSLVYzQxU7AOIOiiOlk/8lF5orJ/TrtQhmsYHqAy1bmaYpH25ys4vl4Okyaj2T NZugbFH3h2ssWB+VpMEIt5tbGX3Imu86QimIhkHSRsdQGvfOz69XHVauBKz9wAiCgt85 VVAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7FgMXEaeMqaVd+Y46GoSMFA7B1XefkRzbvqiN7p+wqE=; b=p9r+0Mk2hAnedEhuj77VwNIgVmrw3kL7bK/nL0JyC9cii40SQ2LINZEdc9aRVwU1yM 8WXjrJxGMBdj9PUJNNfdg5/Ba8KVb0sZc6reZ9xK0dT2O86lpIfWjy5hXs/algNUHN1S GNXj1jpWNzxL6GUSnYFSwB1cDrqftYPa+VL+v8n0+z+A7mYKnJ4X0OCu0x1YPr97u8sq zc0NVa0MPHlTYZodu36HLAa+dH6/s6hGaWt6S861NGyv01szL3EeWrRVNh+E2DL+VVCB cL8LqI+Q3RbfJny8pzwSw42hx3tXnZVzB/VYwSICwp0U7FuYSx+icvMTTaAOoaifHygt aCWg== X-Gm-Message-State: AOAM531m2LYMsWdm/Vsq1PqII+qiAUEGLh+/Mbxq/14fR+vAI9/FaM5B gJDljU2ZI05LTS3NItPzNDA= X-Google-Smtp-Source: ABdhPJxAsrG1xJpOA8SfzNM1/ozsjXKBF7jjRMH5K7BqGyRUpbGN9MIHDfPmoi4udW3y5o7qEUABGw== X-Received: by 2002:a1c:7c03:: with SMTP id x3mr5942123wmc.103.1611971575878; Fri, 29 Jan 2021 17:52:55 -0800 (PST) Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id g12sm11835695wmh.14.2021.01.29.17.52.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 17:52:55 -0800 (PST) Sender: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Fam Zheng , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Claudio Fontana , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 05/11] target/arm: Restrict ARMv6 cpus to TCG accel Date: Sat, 30 Jan 2021 02:52:21 +0100 Message-Id: <20210130015227.4071332-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210130015227.4071332-1-f4bug@amsat.org> References: <20210130015227.4071332-1-f4bug@amsat.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org KVM requires a cpu based on (at least) the ARMv7 architecture. Only enable the following ARMv6 CPUs when TCG is available: - ARM1136 - ARM1176 - ARM11MPCore - Cortex-M0 The following machines are no more built when TCG is disabled: - kzm ARM KZM Emulation Baseboard (ARM1136) - microbit BBC micro:bit (Cortex-M0) - n800 Nokia N800 tablet aka. RX-34 (OMAP2420) - n810 Nokia N810 tablet aka. RX-44 (OMAP2420) - realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore) Signed-off-by: Philippe Mathieu-Daudé --- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/realview.c | 2 +- hw/arm/Kconfig | 11 +++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak index 5b25fafc9ab..ee80bf15150 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -10,9 +10,7 @@ CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y -CONFIG_FSL_IMX31=y CONFIG_MUSCA=y -CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VEXPRESS=y diff --git a/hw/arm/realview.c b/hw/arm/realview.c index cd37b501287..57a37608e39 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -463,8 +463,8 @@ static void realview_machine_init(void) { if (tcg_enabled()) { type_register_static(&realview_eb_type); + type_register_static(&realview_eb_mpcore_type); } - type_register_static(&realview_eb_mpcore_type); type_register_static(&realview_pb_a8_type); type_register_static(&realview_pbx_a9_type); } diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index bdb8c63af7b..daab7081994 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -6,6 +6,11 @@ config ARM_V5 bool depends on TCG +config ARM_V6 + bool + depends on TCG + select ARM_COMPATIBLE_SEMIHOSTING + config ARM_VIRT bool imply PCI_DEVICES @@ -131,6 +136,8 @@ config NETDUINOPLUS2 config NSERIES bool + default y if TCG + select ARM_V6 select OMAP select TMP105 # tempature sensor select BLIZZARD # LCD/TV controller @@ -411,6 +418,8 @@ config FSL_IMX25 config FSL_IMX31 bool + default y if TCG + select ARM_V6 select SERIAL select IMX select IMX_I2C @@ -488,11 +497,13 @@ config FSL_IMX6UL config MICROBIT bool + default y if TCG select NRF51_SOC config NRF51_SOC bool select I2C + select ARM_V6 select ARM_V7M select UNIMP