From patchwork Tue Sep 29 22:43:44 2020 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: 304109 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 F105CC4727C for ; Tue, 29 Sep 2020 22:45:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E16020756 for ; Tue, 29 Sep 2020 22:45:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P2gRsD4z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E16020756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNONL-0006nt-5Z for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:45:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOLx-0004yq-Rx for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20740) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOLv-0004Z0-Be for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=66DSIrlhCeV+xyo2otn2L+hQAxSXyWg/ic5Sp/vZwto=; b=P2gRsD4zgeBbihXz4fdnsT263Af1b1iWdxljRPd2Imco4dBS/Q97k+XbZjEvctfXCOp+BI ErFSt0zN/xtYeIgiPkbAYakV7L5o9vvFA30drPAr221/duEBx6LopbDz5XMS2XUD2eX6Wi mSw05E4yybQ1YlC4YHpdYERyC9wgkes= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-ABZxz2n9PNSPWjI_cnOcRg-1; Tue, 29 Sep 2020 18:44:04 -0400 X-MC-Unique: ABZxz2n9PNSPWjI_cnOcRg-1 Received: by mail-wr1-f70.google.com with SMTP id w7so2370078wrp.2 for ; Tue, 29 Sep 2020 15:44:04 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=66DSIrlhCeV+xyo2otn2L+hQAxSXyWg/ic5Sp/vZwto=; b=s9sB1aYHwhYRY+j7rq9jcsl3nz3nu1INSV8smQRYzDHkgoC57KAi/Kr72b0Szxz0mf thQDoIoo+0KQJNI13O5C3F9g4hP5dqxQLrK/KKI5n8AUv/3sz0SkfHKopLY9dC0bunHe e2z/89vWONnNe82L80lBC3xj7qOR95aByPOz3tclibW5OOxjpAGzUToykDGOsFLPbC70 xwFBAt6LuffnJ68nxAv3nqhpYfK12KXvHnos1Zhi9UidmZzP+xNTfFSgqp9faz4nBPoQ UWlHpK1ZQkJkZZsXQTtWUAjeR5Idr/beAf78Va73t7eIpKUPWRof2/mh6Tl1erRZwsLs /9gQ== X-Gm-Message-State: AOAM531W8g2/YzMlQ0AKwQpnS+ZekHBiMNZMSC3iks3GtIt44WK9is2T eMURvM+4JRhxV73DJJm2LPUti/J2nKLS8zcpoPExgvqpq+0h97QCh774DM0OfOIXCK9KhcVKogr oDdIdGnRrCZlML38= X-Received: by 2002:adf:efc9:: with SMTP id i9mr6933044wrp.187.1601419443279; Tue, 29 Sep 2020 15:44:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/JFirmQq0FLOkZYRppQAwyrCFiFhW/sOaJqe1ygyRV//BqkXnJHjtm0eIPBJooqWr+G3TNQ== X-Received: by 2002:adf:efc9:: with SMTP id i9mr6933012wrp.187.1601419442929; Tue, 29 Sep 2020 15:44:02 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id t202sm7798963wmt.14.2020.09.29.15.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 01/12] accel/tcg: Add stub for cpu_loop_exit() Date: Wed, 30 Sep 2020 00:43:44 +0200 Message-Id: <20200929224355.1224017-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 22:47:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , Keith Packard , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since the support of SYS_READC in commit 8de702cb67 the semihosting code is strongly depedent of the TCG accelerator via a call to cpu_loop_exit(). Ideally we would only build semihosting support when TCG is available, but unfortunately this is not trivial because semihosting is used by many targets in different configurations. For now add a simple stub to avoid link failure when building with --disable-tcg: hw/semihosting/console.c:160: undefined reference to `cpu_loop_exit' Cc: Keith Packard Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- accel/stubs/tcg-stub.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index e4bbf997aa..1eec7fb90e 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -29,3 +29,8 @@ void *probe_access(CPUArchState *env, target_ulong addr, int size, /* Handled by hardware accelerator. */ g_assert_not_reached(); } + +void cpu_loop_exit(CPUState *cpu) +{ + g_assert_not_reached(); +} From patchwork Tue Sep 29 22:43:45 2020 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: 304107 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 B0199C4727C for ; Tue, 29 Sep 2020 22:48:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3351520756 for ; Tue, 29 Sep 2020 22:48:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MVZaWTj3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3351520756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOPf-0001XE-5c for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:47:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOM1-000556-LM for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOLz-0004ZY-Vn for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fnVaKlxSjgosYNWUZ3C9BB5KnUFHrX+zW6dbopznvYU=; b=MVZaWTj3uuEWiAJX7mnLgvCR1qJdqbNF7Nh0l4y4x/JPJrz8tRNUAuG6j33lDKNGvmWG2G daNojlzfhWL7Kmw6Pq3P6/F8zJ90dEURNaiaEeB+rcIrVqXHwbZ7nUxo76h2bXdHpavGdR mrDR+0DUrG8Yr5Fo45KvI9Bd2gamV4o= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-55-Bn0Rml5nPHqAneVBULJ8tQ-1; Tue, 29 Sep 2020 18:44:09 -0400 X-MC-Unique: Bn0Rml5nPHqAneVBULJ8tQ-1 Received: by mail-wr1-f69.google.com with SMTP id s8so2338449wrb.15 for ; Tue, 29 Sep 2020 15:44:09 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=fnVaKlxSjgosYNWUZ3C9BB5KnUFHrX+zW6dbopznvYU=; b=hECtpd/exQx+0ZCyPxqB8zQ/XIUzH+d5BuEdoeACFVIA7dXX+DgWD5iqMoX8dIvBsi EwnXT/UX33/IEkzNFFiMq8Rl8gmBwk7lCKi4bKgnLUFuZKgHdE4IlI6OdYVQxtjgH2UR y2YUJbr8+s3UamAE77bUjjlEWkn0wpAL9qsBqo9R0egP1ZQO8vgRttjQb0r25bQ2rsBB 7oZtnqN4xXR9ApKthSQ1Wvp0RjT8o/IeOZBG0fDlxphjHYTNOqwxTFtGmPbphumoSB7z nnTFxKTV9Dgu6Q48k/I5sBzyYwhI4bvFRjGy0/BUb/ibS78nvoe9HWIu3k9515iFUBNK HUwg== X-Gm-Message-State: AOAM532GAJiivnlZs6UKIQjkhQJ5bRHqp3ORzjl1vaydKj1Ydjy+C05t xYfGmacko09A7ctQmyo/PiqTGIqPQJTm4cb1IuZ+PXu6Nz44SoPeGZuhhGdRBQi4UUETOMaiLmD wyFpekl05vp6u008= X-Received: by 2002:adf:f2d0:: with SMTP id d16mr6386597wrp.332.1601419448303; Tue, 29 Sep 2020 15:44:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz32LQg/FraBPNB2aGTQWNffth7R+ByzmBlrprh0rhJbQuVc73LtYh8e6YQu2ibVKmeTxTjoQ== X-Received: by 2002:adf:f2d0:: with SMTP id d16mr6386570wrp.332.1601419448124; Tue, 29 Sep 2020 15:44:08 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id e13sm8276536wre.60.2020.09.29.15.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig Date: Wed, 30 Sep 2020 00:43:45 +0200 Message-Id: <20200929224355.1224017-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 02:22:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Claudio Fontana , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Extend the generic Meson script to pass optional target Kconfig file to the minikconf script. Signed-off-by: Philippe Mathieu-Daudé --- We could use fs.exists() but is_file() is more specific (can not be a directory). Cc: Paolo Bonzini Cc: Claudio Fontana --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d36dd085b5..9ab5d514d7 100644 --- a/meson.build +++ b/meson.build @@ -529,6 +529,7 @@ kconfig_external_symbols = [ ] ignored = ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] +fs = import('fs') foreach target : target_dirs config_target = keyval.load(meson.current_build_dir() / target / 'config-target.mak') @@ -569,8 +570,13 @@ foreach target : target_dirs endforeach config_devices_mak = target + '-config-devices.mak' + target_kconfig = 'target' / config_target['TARGET_BASE_ARCH'] / 'Kconfig' + minikconf_input = ['default-configs' / target + '.mak', 'Kconfig'] + if fs.is_file(target_kconfig) + minikconf_input += [target_kconfig] + endif config_devices_mak = configure_file( - input: ['default-configs' / target + '.mak', 'Kconfig'], + input: minikconf_input, output: config_devices_mak, depfile: config_devices_mak + '.d', capture: true, From patchwork Tue Sep 29 22:43:46 2020 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: 272434 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 1A1C5C4727D for ; Tue, 29 Sep 2020 22:48:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B2CE20756 for ; Tue, 29 Sep 2020 22:47:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WpZdOjbH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B2CE20756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOPe-0001VS-AJ for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOM7-0005HA-L9 for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOM6-0004a9-1T for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:19 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fVtzhoPQ9oRe5A4whgi5/tX3r24KuxvOyig0n+4hw6k=; b=WpZdOjbH3DkBcuD37XIZDrvB8TfBcDznx4QoeAdwwx53qGjMnnHadu1vHLlhNZaWd6zVdY ax1B3a325SULXCRQA4nChYnzEZGIB3mT2Fi7ZSVMIdTC+CSFTxwUsyaqVGczwJrtPj2sRu MUYDlBWSAD6xvbH2n6ikP0VEenjPWjI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-163-bGrD3NEbPoGogs7UNJcPzA-1; Tue, 29 Sep 2020 18:44:15 -0400 X-MC-Unique: bGrD3NEbPoGogs7UNJcPzA-1 Received: by mail-wr1-f72.google.com with SMTP id 33so2341658wrk.12 for ; Tue, 29 Sep 2020 15:44:15 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=fVtzhoPQ9oRe5A4whgi5/tX3r24KuxvOyig0n+4hw6k=; b=mCT2i/xeZbH+GvGkbkiYRdyPRopkWhEGhmRet3qQUo6p/C13g4KlHRuveQo+msFN5W waGlexJqLwpuzjqOfQ0cgHOiNDxSSo8BqzCHlwKeZrfsh4uPhEtXk3VQYRiyoutqREne TQi4AFeGHz6dNd9lMVo8qGxuHbrCsvRf7qu6eJ/Xnlc52BKANKQz4mxqMDtRJKCzELce woilGU5C4nBjqf6XGmgbdolKWiY+4xc50q+ehOFHozKFP4SujKJ9DEqOUSL+UW3ZYXoO ZPIwHhaykxhwqb5PAA8UhUovpJzxskpPSG3UrrtpmTJDVDat8OXfDN40+NTKVfLJQTPD CH+w== X-Gm-Message-State: AOAM532L6B6mYpkZUW0Bcepda7NaCP5Ug5nCa9HbPAZJbF0MDJKUtGBl BOGjs8CFbvDk6FhATTIruosS+YSdxda0gmtA2x8S+CmolynQCFaZvCXYP8/bpDdXqlPgCHmYzYV HjGdIVkZcm/u6v/E= X-Received: by 2002:a5d:5261:: with SMTP id l1mr6619436wrc.193.1601419453412; Tue, 29 Sep 2020 15:44:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeOEbx68Td8hBaYyIFzxkCzoKhQ+EE4XU8IG3LB8RbTCWtKeOlhoOS8sgyI3yT3aeSBndgRw== X-Received: by 2002:a5d:5261:: with SMTP id l1mr6619416wrc.193.1601419453250; Tue, 29 Sep 2020 15:44:13 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id l18sm7902646wrp.84.2020.09.29.15.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 03/12] target/arm: Select SEMIHOSTING if TCG is available Date: Wed, 30 Sep 2020 00:43:46 +0200 Message-Id: <20200929224355.1224017-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 02:22:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add a kconfig entry which not explicitly selected by another entry, but which selects SEMIHOSTING if TCG is available. This avoids: /usr/bin/ld: libqemu-aarch64-softmmu.fa.p/target_arm_arm-semi.c.o: in function `do_arm_semihosting': target/arm/arm-semi.c:784: undefined reference to `qemu_semihosting_console_outc' target/arm/arm-semi.c:787: undefined reference to `qemu_semihosting_console_outs' /usr/bin/ld: target/arm/arm-semi.c:815: undefined reference to `qemu_semihosting_console_inc' Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 target/arm/Kconfig diff --git a/target/arm/Kconfig b/target/arm/Kconfig new file mode 100644 index 0000000000..972d9a1b9a --- /dev/null +++ b/target/arm/Kconfig @@ -0,0 +1,4 @@ +# arch-specific rule to select SEMIHOSTING if ARM && TCG +config ARM_SEMIHOSTING +   default y if TCG + select SEMIHOSTING From patchwork Tue Sep 29 22:43:47 2020 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: 304105 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 88CE7C4727C for ; Tue, 29 Sep 2020 22:51:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 028ED20756 for ; Tue, 29 Sep 2020 22:51:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ABzl7VNu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 028ED20756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOSy-0005S5-UV for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:51:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMC-0005RQ-1F for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMA-0004aZ-As for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:23 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9dR9Nk0eM9jSf6djV760qyeufq0GIQie0fmgNB3aO7w=; b=ABzl7VNu1PaIwvHqYBjXD9sL92SzShanvI7/wPHo5VkZ/djlfFseeq/RaRxhCGK9k45Fpo Qfdj6qsoHQnDoMYZD2S6+G38u8rIzApA/r7q8/O6F2MBrdjUebf3HXzIgWbHjqR3+p7O2v s+8IWxyVrC/kJxl5I5wAcrwgBcf5PkQ= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-1PgIH-n4PGeCWxR7FD0nCA-1; Tue, 29 Sep 2020 18:44:20 -0400 X-MC-Unique: 1PgIH-n4PGeCWxR7FD0nCA-1 Received: by mail-wr1-f71.google.com with SMTP id g6so2366503wrv.3 for ; Tue, 29 Sep 2020 15:44:19 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=9dR9Nk0eM9jSf6djV760qyeufq0GIQie0fmgNB3aO7w=; b=eDarASBoID+NUK4+Nx2lCytO6fF8bHqeVIwam3mGZwdgxGM++QxvF/u0x9KP4NnJAY b7Q32+X7XFxW+HKYiBLzHwb8LEMxNv8FrpfSYuVWy9mlagyyJJheaP3iht+m2uziA1Ia xkEKNdp7DV8K/cHTW8cuOJPGrOSlg9zM+gyerkPG9boy8Et4tRiVtTTUAE4rmQF+rJ5V rhD8jlJ+/X9jnzB20sxv3aQe4j9LpjC2178DB4QpViAX6b7jb9ZygYCFO2qCIhmAAUtz HbSrIz+8nmzyXe3F8TCnl0n3HBQtJOXddLhmeUVC+X3VEjCuQrj2zxtSNWfGIbalJtiJ eOVw== X-Gm-Message-State: AOAM530WWS5WOdAh634DDM/CjkqvvYth78mjIrT2KBPPAdSkp02vb4WZ +j5jLntHKg4w4tvoijG8uVIymHU6TNeLWpogRVN6onSPwODMs1GOiHcZwMglE8HQRvdespxBJtg a8oHs/pwxvfTEZxg= X-Received: by 2002:adf:fd01:: with SMTP id e1mr6312408wrr.44.1601419458525; Tue, 29 Sep 2020 15:44:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwh51NEq7twr61W/5e9Rg5U9losDLPsHpgTL0nTFBNwMoNiIws2/CzkKqcV0aZDFoO9xffGw== X-Received: by 2002:adf:fd01:: with SMTP id e1mr6312389wrr.44.1601419458354; Tue, 29 Sep 2020 15:44:18 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id y1sm7440740wmi.36.2020.09.29.15.44.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 04/12] target/arm: Restrict ARMv4 cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:47 +0200 Message-Id: <20200929224355.1224017-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 22:47:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" KVM requires a cpu based on (at least) the ARMv7 architecture. Only enable the following ARMv4 CPUs when TCG is available: - StrongARM (SA1100/1110) - OMAP1510 (TI925T) Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7d040827af..b546b20654 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,3 +1,7 @@ +config ARM_V4 + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -30,6 +34,7 @@ config ARM_VIRT config CHEETAH bool + select ARM_V4 select OMAP select TSC210X @@ -244,6 +249,7 @@ config COLLIE config SX1 bool + select ARM_V4 select OMAP config VERSATILE From patchwork Tue Sep 29 22:43:48 2020 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: 272433 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 9D83FC4727D for ; Tue, 29 Sep 2020 22:51:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0724620756 for ; Tue, 29 Sep 2020 22:51:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FkFf5Ij4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0724620756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOSd-0004xK-UH for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:51:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMJ-0005ic-2d for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44126) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMH-0004b0-Dg for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o4HjcXP3qwr6X7IJP4D/f1xvLwTdd8bPvM5GyTvUpNE=; b=FkFf5Ij41zCOn7dYNCLzUE2DTM4mv3RpTx0tyOdWu9jOYAQlorbAMTCbK41VhXF1yFntJz ztV8xfQV2PqN+nt6Fs01xCgh4uNa7uF7ZDyXnyiJF5YAyWfwdWXEzpShQD5/Wgu0lbXpmJ wUS59jgNCFiDYnRuSoWH9SHD3xBREww= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-3dNZJy3gM9W8NzT5YdoyVg-1; Tue, 29 Sep 2020 18:44:25 -0400 X-MC-Unique: 3dNZJy3gM9W8NzT5YdoyVg-1 Received: by mail-wr1-f70.google.com with SMTP id i10so2346927wrq.5 for ; Tue, 29 Sep 2020 15:44:24 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=o4HjcXP3qwr6X7IJP4D/f1xvLwTdd8bPvM5GyTvUpNE=; b=dRXQHLmYUC8frp6y2HyPLY2Db5t5bmjoCKQSHi1HWtREMgS18GX7s5dVkB6D4wyya5 VgrdfijWn/2+c0lRaZ3WkYbqmS0SzgpkhI/PTJtgOZP0tmPfwaXzSi0wiHQuT/dordqJ spVF/mXugfBUydduhoUcfVb89rLvVWaSx2yBLrCwqdCvKfYkAcFvv2zm8TgEONShwlKQ jb7K2KMCa5Lx7AZokp0U3IsymVMdwgjPfbeXltpo4h6Qy2nMdzcZ6AdBmLCiHs0vsZ5n al6Aeo+UvPQ/fT/kLUUyEyAmozOOC3OWqRRnt+2l3lSDSxsCLqL5S9o0r8lV7n4FBLwR rI6w== X-Gm-Message-State: AOAM531lac6KTB+jixi3DFHWjmYg4PleDBr0zcDmqJ6OOA/h6Fwhjy11 bRaQYMejm2ndhZKH/Q25mZ9v6Jyyrf0p1W+eR/l+ITc+uefOonp0bqXOTE7OnlAc0KVwwlu7cat t+JMxM5+EnQQ0hww= X-Received: by 2002:adf:83c3:: with SMTP id 61mr6487537wre.287.1601419463554; Tue, 29 Sep 2020 15:44:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiKG03zq+uHxa3VA+7jIh3VXyDityJ8NdNAGTWh+0EeM/7OentrHFt37Qc69GgvEZbvFzI7w== X-Received: by 2002:adf:83c3:: with SMTP id 61mr6487523wre.287.1601419463375; Tue, 29 Sep 2020 15:44:23 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id l4sm8483138wrc.14.2020.09.29.15.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 05/12] target/arm: Restrict ARMv5 cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:48 +0200 Message-Id: <20200929224355.1224017-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 02:22:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" KVM requires a cpu based on (at least) the ARMv7 architecture. Only enable the following ARMv5 CPUs when TCG is available: - ARM926 - ARM946 - ARM1026 - XScale (PXA250/255/260/261/262/270) Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b546b20654..d2876b2c8b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -2,6 +2,10 @@ config ARM_V4 bool select TCG +config ARM_V5 + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -44,6 +48,7 @@ config CUBIEBOARD config DIGIC bool + select ARM_V5 select PTIMER select PFLASH_CFI02 @@ -73,6 +78,7 @@ config HIGHBANK config INTEGRATOR bool + select ARM_V5 select ARM_TIMER select INTEGRATOR_DEBUG select PL011 # UART @@ -99,6 +105,7 @@ config MUSCA config MUSICPAL bool + select ARM_V5 select BITBANG_I2C select MARVELL_88W8618 select PTIMER @@ -138,6 +145,7 @@ config OMAP config PXA2XX bool + select ARM_V5 select FRAMEBUFFER select I2C select SERIAL @@ -254,6 +262,7 @@ config SX1 config VERSATILE bool + select ARM_V5 select ARM_TIMER # sp804 select PFLASH_CFI01 select LSI_SCSI_PCI @@ -373,6 +382,7 @@ config NPCM7XX config FSL_IMX25 bool + select ARM_V5 select IMX select IMX_FEC select IMX_I2C @@ -399,6 +409,7 @@ config FSL_IMX6 config ASPEED_SOC bool + select ARM_V5 select DS1338 select FTGMAC100 select I2C From patchwork Tue Sep 29 22:43:49 2020 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: 272431 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 BBE1FC4727C for ; Tue, 29 Sep 2020 22:54:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D1B520756 for ; Tue, 29 Sep 2020 22:54:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GpG+b/lW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D1B520756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOWJ-0000Qw-2Y for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:54:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMM-0005py-2h for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55299) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMK-0004bL-Du for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:33 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i7QZwS1vfY6pxc/yL3I5YaiK5BX/yKl7ag6KjP4fakU=; b=GpG+b/lWH5CaNRA7+1GUQ57KcLCLoLgqp74gvQPvjXvBHIwc/RKgzni9R7q1xtS0MLzQlI eGIrcgR3ShObSxtLSWOAjvjdp0jyLP7MY8SqrOtt+0k/45lAyhZO7AGuINbmKq44QCFSAk sSYEwiL6MNKOCWrLN8Eyz4j3Mky8uww= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-410-SnJ6O-4pM6qZIXjX7fIRZQ-1; Tue, 29 Sep 2020 18:44:30 -0400 X-MC-Unique: SnJ6O-4pM6qZIXjX7fIRZQ-1 Received: by mail-wr1-f72.google.com with SMTP id d9so2348346wrv.16 for ; Tue, 29 Sep 2020 15:44:29 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=i7QZwS1vfY6pxc/yL3I5YaiK5BX/yKl7ag6KjP4fakU=; b=aQJSZcwwIQdDDXdQcUsLFOuY3PXMtca0c7E46MzMWYmsFxgn6BGhsRXTBrf34RHVKh zDziqv5xIANbwBSa+DGHUYJuDZskYKKd+ygCRGk6hdy5wYCL4qFXzImTPqYWayttBngl nMJbTQ9f/rZ40/LnzpYg7E96c8rCnXxeG0mtNvaLfpfi8jb6o/8pH1I/2GXTdTvwyJyO /1oiiv2lMd4DiFOEzMqki3mDbLpxkRmgV9rR4OREWhW2ANsl8/1dA6pu9zB7O6cJVvMj Rv+QBGgsdt+RYmaIi3BvPUrvsqrhDB4V50hhk7F9yyw9WcE5de10nUeN5BkWiNGdXHdx G+wA== X-Gm-Message-State: AOAM531NBep4wyFUXPo7ZdG9j+pSZK+Eo3p4ut8vS3jSWOTPYkoVWMvV 0xQvjrYUqrtZh394RdCXvtIHnZYvGJbeYvbD1aIhj/PsmJXk9HJuZyOVbwxdstMneX3XBrm2Ifp /ui9SID5Hxu5FqgE= X-Received: by 2002:adf:dcd1:: with SMTP id x17mr7104484wrm.150.1601419468594; Tue, 29 Sep 2020 15:44:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweTjjV4JKSEFC7bdGe1az/c9DKmrvmR/EC6wrTRHkRT+Xz0xLKGZVKIrTri3by7ejJMMBAyw== X-Received: by 2002:adf:dcd1:: with SMTP id x17mr7104459wrm.150.1601419468383; Tue, 29 Sep 2020 15:44:28 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id j10sm7850036wrn.2.2020.09.29.15.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 06/12] target/arm: Restrict ARMv6 cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:49 +0200 Message-Id: <20200929224355.1224017-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 22:47:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d2876b2c8b..e01eb55bc0 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -6,6 +6,10 @@ config ARM_V5 bool select TCG +config ARM_V6 + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -123,6 +127,7 @@ config NETDUINOPLUS2 config NSERIES bool + select ARM_V6 select OMAP select TMP105 # tempature sensor select BLIZZARD # LCD/TV controller @@ -391,6 +396,7 @@ config FSL_IMX25 config FSL_IMX31 bool + select ARM_V6 select SERIAL select IMX select IMX_I2C From patchwork Tue Sep 29 22:43:50 2020 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: 304108 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 40D25C4727C for ; Tue, 29 Sep 2020 22:46:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE39720756 for ; Tue, 29 Sep 2020 22:46:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="h2P8CiVA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE39720756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNONt-0007ha-Mz for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:46:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMR-00062y-1X for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMP-0004bi-EH for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:38 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O2ptRm8f/lOeml0jS1cRqmJHNlSkXaKtAQigKfi/TLU=; b=h2P8CiVAm7wyUrLUqboHeVVgybVe3tNogJsmTeQy10jxr0bdyQdFz0NXv6cZgJIb637cFx 28XSlyuCXfyKBfonbSvQhSpusbiMqJWf+wA4Wb27X+DiJcIWvIlNanhI7LO9sRilkxdd37 lmCKBWMlo+LGSAJ3YlVq5N1Y8XDn5Og= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-531-n0M6fAjLNUioBqZoSh382Q-1; Tue, 29 Sep 2020 18:44:35 -0400 X-MC-Unique: n0M6fAjLNUioBqZoSh382Q-1 Received: by mail-wr1-f70.google.com with SMTP id a10so2314318wrw.22 for ; Tue, 29 Sep 2020 15:44:35 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=O2ptRm8f/lOeml0jS1cRqmJHNlSkXaKtAQigKfi/TLU=; b=iazuqX2BgmkYMoCKF4gGCu0c9G7vrVByXhZZ4h3BU5wcqvLXnPMhXN7gHMre8fy5RL /sS5lBjbxoD+utxwBGsLJfi0m6A5k+5iw4zgEmDS9QK9ewBBjvh8Kgceel6MHbNWSIAR 6ZP2ueeM6n7kbvLjSKmGSQtgZKl8FpAnpvSF10WQav6TzkSWFBmVwpEAuS8l96NfLfoE VeeCFg3TcvPmCyynKhqoOw6XTjCcZHCFxz4IBfB225f8CmXv36S5ffjYxpe0teh5z0i7 pcy+E8wzhciab4qJBEQdhZ8wtyQxv5ZgKUvTmFoPL9SdcKFMYCRM0SUZudcDSwucM+m1 26nw== X-Gm-Message-State: AOAM533HKdFT0Z9ZOt4RuWd4Q5sARtLMrX8KcfSpEnWV2jZ9HtLQ5y5+ c6dZsG9c3tta/uFVPi09CaNi8hbHoMmxZAaoOuvJ/kJVkwQv1kkSNMsNOA/jygazn59BSq82tOH hFIXuCVvXwrf5ao4= X-Received: by 2002:a5d:444b:: with SMTP id x11mr6634818wrr.402.1601419473912; Tue, 29 Sep 2020 15:44:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4aaS54Wk933OJIRQKbP4cZ/YFPBu2pchNU62vp4qGrFYgoGCxMVfKfqvmCyuVMDLcMh8vXQ== X-Received: by 2002:a5d:444b:: with SMTP id x11mr6634802wrr.402.1601419473707; Tue, 29 Sep 2020 15:44:33 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id m10sm7056524wmi.9.2020.09.29.15.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 07/12] target/arm: Restrict ARMv7 R-profile cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:50 +0200 Message-Id: <20200929224355.1224017-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 02:22:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" A KVM-only build won't be able to run R-profile cpus. Only enable the following ARMv7 R-Profile CPUs when TCG is available: - Cortex-R5 - Cortex-R5F Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e01eb55bc0..7f19872722 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -10,6 +10,10 @@ config ARM_V6 bool select TCG +config ARM_V7R + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -358,6 +362,7 @@ config XLNX_ZYNQMP_ARM bool select AHCI select ARM_GIC + select ARM_V7R select CADENCE select DDC select DPCD From patchwork Tue Sep 29 22:43:51 2020 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: 304106 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 C02EFC4727C for ; Tue, 29 Sep 2020 22:49:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 100E620756 for ; Tue, 29 Sep 2020 22:49:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dX3/d53c" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 100E620756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOR5-0002iD-Vl for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:49:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMZ-0006NE-K2 for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMW-0004cM-Qj for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:47 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VMKffrN5obKOm6UxS550K4u6DmnYBBMm9AG93ufLP5A=; b=dX3/d53cc/OQ5ZJwSNpFB27aNssc/1+w4FzLIglKoNg5uLKzopaFVfgRfLmgNnWHTQvPIl hOelDFnCeS+KKdMki3o9wvXyGCK5ZkjJQe1w1aI8AAs1OIW6qoWqOBQBrQAiDTPauaj56P iVGeiJsHsJqHstsovuu5CLWi1UZr1Js= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-212-0BYgPhcCNoSr6K5VgsRObg-1; Tue, 29 Sep 2020 18:44:40 -0400 X-MC-Unique: 0BYgPhcCNoSr6K5VgsRObg-1 Received: by mail-wm1-f72.google.com with SMTP id y6so195719wmi.7 for ; Tue, 29 Sep 2020 15:44:40 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=VMKffrN5obKOm6UxS550K4u6DmnYBBMm9AG93ufLP5A=; b=HPjYYGF6nKCDGbQvqn3EnVzJPi17gY4xtt8lEgTIdGbFFk1/GUrW78QQOG53AWvwM+ /nW7L8HlMP/h+SramX+bZRBxvNEtHBxAbS8IxYLLbPqgoeBFYmJX9hfj9muPPwBH+aIO xAPIcBDt7raG++FiejemIT3tTEdVdIwRJfJMK11dJFQGAuZJi8pRae4xgFD5SkDPXTKh 7jloHmnciZM1osg3uE3sHCGvHRfqBgvLE5PJCeggD/gTSqddwHTnira2nsFL7xEIAvYR DAcVMc0ZdonzfhYiuCfXXnqjNeJ//sQLlA0CBxes9GvPvO/mMyrvJkrdgoOk6qK+Ddp3 SjsA== X-Gm-Message-State: AOAM530WpMAiHnC59xoA7cgjB0wRpFd/7ylQLxiotGVfFgCK3KJ2s/OO 5xn5h4LUxqOGbEitCltByJpuCe7JbjAXzpWwlHwS9BlttL6UFq8KwBR/PFHIdpnHaMsa9YXz8QL t3xEzpC/VCLlcBig= X-Received: by 2002:a7b:c76d:: with SMTP id x13mr6762360wmk.10.1601419478956; Tue, 29 Sep 2020 15:44:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd5/l6Pz82+iT32jI8EMtGES+WPwtktxL0xH6iDe0EYmyk+iEByXkfuzuL6KdhyW+6NVNK1w== X-Received: by 2002:a7b:c76d:: with SMTP id x13mr6762351wmk.10.1601419478789; Tue, 29 Sep 2020 15:44:38 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id l17sm6922065wme.11.2020.09.29.15.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 08/12] target/arm: Restrict ARMv7 M-profile cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:51 +0200 Message-Id: <20200929224355.1224017-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 22:47:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" A KVM-only build won't be able to run M-profile cpus. Only enable the following ARMv7 M-Profile CPUs when TCG is available: - Cortex-M0 - Cortex-M3 - Cortex-M4 - Cortex-M33 We don't need to enforce CONFIG_ARM_V7M in default-configs because all machines using a Cortex-M are already explicitly selected. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/arm-softmmu.mak | 3 --- hw/arm/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 08a32123b4..002c97862b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,8 +1,5 @@ # Default configuration for arm-softmmu -# TODO: ARM_V7M is currently always required - make this more flexible! -CONFIG_ARM_V7M=y - # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7f19872722..15faa2f2d7 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -14,6 +14,10 @@ config ARM_V7R bool select TCG +config ARM_V7M + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES From patchwork Tue Sep 29 22:43:52 2020 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: 272432 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 8DAE8C4727C for ; Tue, 29 Sep 2020 22:52:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB6A420756 for ; Tue, 29 Sep 2020 22:52:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U7kHhnTu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB6A420756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOTo-0006Q9-TS for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:52:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMf-0006R8-79 for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMa-0004cj-1X for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:52 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p7uLIKQXb5D6cyBHRbAjul4kYmamhdwITN6LVBpYWc0=; b=U7kHhnTuuN+eHfGW+yfg9PTjCe4QEaHHVwZUZRgwxlSLEqkFkA51yJNw6Em77Q3WSG4wPe pbOtTCmyFgD9O+oeV6SOTzajVAVBH3OSFPVAAl0jUyXVBmoH3f9+MOL5vTxIocTU/AFvej ioUjGmda4Jf+dl3WaTZkNa2M+xPuMtY= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306-ZewTTowgOOeVyhl0lZoVwg-1; Tue, 29 Sep 2020 18:44:45 -0400 X-MC-Unique: ZewTTowgOOeVyhl0lZoVwg-1 Received: by mail-wm1-f70.google.com with SMTP id 73so553607wma.5 for ; Tue, 29 Sep 2020 15:44:45 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=p7uLIKQXb5D6cyBHRbAjul4kYmamhdwITN6LVBpYWc0=; b=nkn1RD+4yBmd2FKAIlqLH1KAMNijYfpnd9rOefymPxqoUpzK/cMztryPIqITejsoIm XKPaYU3s1VxFbSrkblYBDMgtw/2BF32G8/uS8e1xPtjD9FMLzTVUvK/4JOgLzsSeE7RY uI3yBwGmx+sHnc9QWKQTAV35WPGNEGW85acwQKGwIsDD+jHFypKWfLe6qk5/3SXij60h 4S24q8OKsoHEcPaZq/sK7shaA2jcBo/jrIskrHG1Bd1SyU5Ar+2tRWvLJiHkUzXlA1X/ N4eqpVlfCWgcPm5JSVtMZFlUflqpW0cStCihIvIGsbDkrsVddHvzMfYyJJP1fLOHcyV9 j5zg== X-Gm-Message-State: AOAM532QjyWNH4+rm4/MlKP7kYLRBTjBcXGw5pPh88/oEfcF0bvLaM8R Mhu0piy9bbtsh6PHsPtm46LqJVnC9PF0Js4uJyRyfWTMAgNthkBqpwGWrOqWXAhVDTqmfUdzyh6 7zBtqHnnjqRpHSt8= X-Received: by 2002:a1c:7215:: with SMTP id n21mr7195524wmc.154.1601419483974; Tue, 29 Sep 2020 15:44:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9RqoWhYxxMGceyGdVBz1Ep153XBWsJa08idXxAaedi/xi2UMsikdfSG5GMUTBNffkCC6uig== X-Received: by 2002:a1c:7215:: with SMTP id n21mr7195501wmc.154.1601419483746; Tue, 29 Sep 2020 15:44:43 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id 70sm7516873wme.15.2020.09.29.15.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 09/12] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M Date: Wed, 30 Sep 2020 00:43:52 +0200 Message-Id: <20200929224355.1224017-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 22:47:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We've already got the CONFIG_ARM_V7M switch, but it currently can not be disabled yet. The m_helper.c code should not be compiled into the binary if the switch is not enabled. We also have to provide some stubs in a separate file to make sure that we still can link the other code without CONFIG_ARM_V7M. Signed-off-by: Thomas Huth Message-Id: <20190903154810.27365-4-thuth@redhat.com> [PMD: Keep m_helper-stub.c but extend it, rewrite the rest] Signed-off-by: Philippe Mathieu-Daudé --- Rewrite since v3, therefore removed Richard R-b tag. --- target/arm/cpu.h | 12 ------- target/arm/cpu_tcg.c | 4 ++- target/arm/helper.c | 7 ---- target/arm/m_helper-stub.c | 73 ++++++++++++++++++++++++++++++++++++++ target/arm/meson.build | 4 ++- 5 files changed, 79 insertions(+), 21 deletions(-) create mode 100644 target/arm/m_helper-stub.c diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 6036f61d60..c5f4c1b181 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2117,12 +2117,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx, /* Interface between CPU and Interrupt controller. */ #ifndef CONFIG_USER_ONLY bool armv7m_nvic_can_take_pending_exception(void *opaque); -#else -static inline bool armv7m_nvic_can_take_pending_exception(void *opaque) -{ - return true; -} -#endif /** * armv7m_nvic_set_pending: mark the specified exception as pending * @opaque: the NVIC @@ -2228,13 +2222,7 @@ int armv7m_nvic_raw_execution_priority(void *opaque); * @secure: the security state to test * This corresponds to the pseudocode IsReqExecPriNeg(). */ -#ifndef CONFIG_USER_ONLY bool armv7m_nvic_neg_prio_requested(void *opaque, bool secure); -#else -static inline bool armv7m_nvic_neg_prio_requested(void *opaque, bool secure) -{ - return false; -} #endif /* Interface for defining coprocessor registers. diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 00b0e08f33..563b0e82bc 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -15,6 +15,7 @@ /* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) +#ifndef CONFIG_USER_ONLY static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc = CPU_GET_CLASS(cs); @@ -38,6 +39,7 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) } return ret; } +#endif /* CONFIG_USER_ONLY */ static void arm926_initfn(Object *obj) { @@ -602,9 +604,9 @@ static void arm_v7m_class_init(ObjectClass *oc, void *data) acc->info = data; #ifndef CONFIG_USER_ONLY cc->do_interrupt = arm_v7m_cpu_do_interrupt; + cc->cpu_exec_interrupt = arm_v7m_cpu_exec_interrupt; #endif - cc->cpu_exec_interrupt = arm_v7m_cpu_exec_interrupt; cc->gdb_core_xml_file = "arm-m-profile.xml"; } diff --git a/target/arm/helper.c b/target/arm/helper.c index 88bd9dd35d..5196a17bdb 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12653,13 +12653,6 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) } } -#ifndef CONFIG_TCG -ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) -{ - g_assert_not_reached(); -} -#endif - ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) { if (arm_feature(env, ARM_FEATURE_M)) { diff --git a/target/arm/m_helper-stub.c b/target/arm/m_helper-stub.c new file mode 100644 index 0000000000..6d751424e8 --- /dev/null +++ b/target/arm/m_helper-stub.c @@ -0,0 +1,73 @@ +/* + * ARM V7M related stubs. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include "qemu/osdep.h" +#include "cpu.h" +#include "exec/helper-proto.h" +#include "internals.h" + +void HELPER(v7m_bxns)(CPUARMState *env, uint32_t dest) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest) +{ + g_assert_not_reached(); +} + +uint32_t HELPER(v7m_mrs)(CPUARMState *env, uint32_t reg) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val) +{ + g_assert_not_reached(); +} + +uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_preserve_fp_state)(CPUARMState *env) +{ + g_assert_not_reached(); +} + +void write_v7m_exception(CPUARMState *env, uint32_t new_exc) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_vlldm)(CPUARMState *env, uint32_t fptr) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t fptr) +{ + g_assert_not_reached(); +} + +ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) +{ + g_assert_not_reached(); +} + +#ifndef CONFIG_USER_ONLY + +bool armv7m_nvic_can_take_pending_exception(void *opaque) +{ + g_assert_not_reached(); +} + +void arm_v7m_cpu_do_interrupt(CPUState *cs) +{ + g_assert_not_reached(); +} + +#endif /* CONFIG_USER_ONLY */ diff --git a/target/arm/meson.build b/target/arm/meson.build index f5de2a77b8..f6a88297a8 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -21,7 +21,6 @@ arm_ss.add(files( 'gdbstub.c', 'helper.c', 'iwmmxt_helper.c', - 'm_helper.c', 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', @@ -30,9 +29,12 @@ arm_ss.add(files( 'vfp_helper.c', 'cpu_tcg.c', )) +arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) + arm_ss.add(zlib) arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c')) +arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) From patchwork Tue Sep 29 22:43:53 2020 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: 272430 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,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 8FD5FC4727C for ; Tue, 29 Sep 2020 22:56:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFFD52083B for ; Tue, 29 Sep 2020 22:56:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="B3vaolFA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFFD52083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOYE-0002SL-Uv for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:56:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMn-0006UD-22 for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:45:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMh-0004dZ-3r for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:44:59 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HavTR5jlyYY+4DgutSw3BluUcAU3B5yxPF0wWIdw1vM=; b=B3vaolFATMUgiN6x4OmWtIzi0Q1ltMBGFSnW73IW8hn8KOPjLR3145Spc6SJRJzo4kua2d 7Z+UjR2yPXB36rvyKQJ4afFRsQm1qDB+khtS0ZKURRJm76fYLpzdoy224heAuG5cFhnNKW nJ42VBYy1dVLiN4YXMEiXgBBrG9+UqE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-565--R2Wd9FxN_6L0vuCZ0uLzg-1; Tue, 29 Sep 2020 18:44:50 -0400 X-MC-Unique: -R2Wd9FxN_6L0vuCZ0uLzg-1 Received: by mail-wr1-f72.google.com with SMTP id 33so2342102wrk.12 for ; Tue, 29 Sep 2020 15:44:50 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=HavTR5jlyYY+4DgutSw3BluUcAU3B5yxPF0wWIdw1vM=; b=KI5JMUzeBl7GRTgMkbgOIRy1wR/JnStUBxmyYsxvLljhO8v9o//Tf/G3lCJN46siQY 6B3DzjlAgp9cE/45bJeggA7k28VkNtcZYQyY7KvzorSr3XtHxlLE4hoYgzq/XUjnu+xr ZbrreFblUM6KupIOBaoSqs5o/WUZsPMwhd7ExlNnNN1hoGSSYPbBd1v85YxCNGli0pRE gGJjKPcs27vICL7P0SYfqKcVbkKJjKaEDdyFR3ov30v1FQNqrzcKP+IvBi4Gc2B8P8nc 6uwq/oF9jlDJcfk74foujbuPub+bv4sqMbqMDtNKcjq0q0bnEL05ItXUzI8fE1RKYDF7 0vVQ== X-Gm-Message-State: AOAM530RjcWzEEHwX+faiI8e2U7MbL07atdXT6yupiKJ+uVVBA/i+kyr rxdcYNd2u7FmEtFbfFPzHuwuoNGqjUtHkByc4T68o8sz0YngA3ob5DX/9yPOrp4xpGhgFuAtstV oAl4Tbv8efOLSd0E= X-Received: by 2002:adf:f552:: with SMTP id j18mr7126144wrp.128.1601419489040; Tue, 29 Sep 2020 15:44:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8PSYX9/XyNa0d4ovucJYi4QupKVwuKDBSqVqoLbQhr626hwpDLMGmdduFj20kYY9OEgIMog== X-Received: by 2002:adf:f552:: with SMTP id j18mr7126125wrp.128.1601419488887; Tue, 29 Sep 2020 15:44:48 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id t4sm8074682wrr.26.2020.09.29.15.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off Date: Wed, 30 Sep 2020 00:43:53 +0200 Message-Id: <20200929224355.1224017-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 02:22:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , Samuel Ortiz , kvm@vger.kernel.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Samuel Ortiz We can now safely turn all TCG dependent build off when CONFIG_TCG is off. This allows building ARM binaries with --disable-tcg. Signed-off-by: Samuel Ortiz [PMD: Heavily rebased during almost 2 years then finally rewritten =) ] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/meson.build | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index f6a88297a8..9b7727d4bb 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -16,24 +16,29 @@ arm_ss = ss.source_set() arm_ss.add(gen) arm_ss.add(files( 'cpu.c', - 'crypto_helper.c', - 'debug_helper.c', 'gdbstub.c', 'helper.c', + 'vfp_helper.c', +)) + +arm_tcg_ss = ss.source_set() +arm_tcg_ss.add(files( + 'arm-semi.c', + 'cpu_tcg.c', + 'crypto_helper.c', + 'debug_helper.c', 'iwmmxt_helper.c', 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', 'translate.c', 'vec_helper.c', - 'vfp_helper.c', - 'cpu_tcg.c', )) -arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) + +arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) arm_ss.add(zlib) -arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c')) arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) @@ -41,6 +46,9 @@ arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: fil arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', 'gdbstub64.c', +)) + +arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files( 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c', @@ -49,14 +57,16 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'translate-sve.c', )) +arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss) + arm_softmmu_ss = ss.source_set() arm_softmmu_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', 'machine.c', 'monitor.c', - 'psci.c', )) +arm_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('psci.c')) target_arch += {'arm': arm_ss} target_softmmu_arch += {'arm': arm_softmmu_ss} From patchwork Tue Sep 29 22:43:54 2020 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: 304104 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 CD3C0C4727C for ; Tue, 29 Sep 2020 22:53:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E22520756 for ; Tue, 29 Sep 2020 22:53:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gkkc6MuV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E22520756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOVS-00087U-5e for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:53:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMn-0006UF-5c for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:45:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMj-0004dn-Ll for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:45:00 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mwQAv7GT5EoZ2YwHLMCVUEVsXLr1pwlweOoW7BxG2J0=; b=gkkc6MuVVkg8IntSrsYZxzjw2QpnvUv3rVhqunb2QZb9FzwDamE7fG9aYmSacamT52d1bk kTWR4VO1Dj67bEOkLAPvHZnWhFeWI39XJ08mVcdhrhHKTvhRQRKSb4u1i39Ad/DH+DfPFu XvJfWUmthmuTHz2ILOBiNOiC3hOzkgo= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-579-ScTBRYe9MQmxcsKtTC0o7A-1; Tue, 29 Sep 2020 18:44:55 -0400 X-MC-Unique: ScTBRYe9MQmxcsKtTC0o7A-1 Received: by mail-wr1-f71.google.com with SMTP id v12so2362207wrm.9 for ; Tue, 29 Sep 2020 15:44:55 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=mwQAv7GT5EoZ2YwHLMCVUEVsXLr1pwlweOoW7BxG2J0=; b=aMHL56yWgeE/1uhSizV5GxCSv3p+K0lxl1WJ/E0TGt90/xl/sMBl/pBaBHMPZDJDHb X3BtdppVsog3Ymnmj+KfxJmdrUT6sP++ssEYC5sWYaLOrX8Xm2laoJrrAA9jCd8Nsa/F OE4pCtTk3IK1ZWmzJlbSEs0VLq0ko28K5ofqJ0lywSdzuULx7qd2gL9UyugsToVGGmmt LF2/duZ7lLdbQN0GCpom9uid0dgZeUYEs3sOmjzF8RizT1ySOrf7e4sUJWIzC0a26q5E EO8ZOnH3iWD25t1Z9YLKB77fJ1009zbHQTbPZ3KDvNVaFk/BkDxawMpBVYGwZaN3NOBN NcKg== X-Gm-Message-State: AOAM530gMsMzhEQo3ALljlbCS3twopxhUiaOFphj781HNXCfuwzCkZ+g UJQHbc41ykM2PjCAndS2l58XdzCRaOXUmkHQfMzlGXOO1sXc84YZnoHVA0Fn9zrWC25zXCxqwRn 3p5tiFHpg7EbhCgA= X-Received: by 2002:a5d:680b:: with SMTP id w11mr7120263wru.73.1601419494004; Tue, 29 Sep 2020 15:44:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaezhlYa4iLWEZHwZ0kS7XLDzMCgEOlneNy29+EtQChDtpMkw2+jc9ZW303waN+0a4Rlb8Xw== X-Received: by 2002:a5d:680b:: with SMTP id w11mr7120247wru.73.1601419493850; Tue, 29 Sep 2020 15:44:53 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id u66sm15214592wme.1.2020.09.29.15.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 11/12] target/arm: Reorder meson.build rules Date: Wed, 30 Sep 2020 00:43:54 +0200 Message-Id: <20200929224355.1224017-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 02:22:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reorder the rules to make this file easier to modify. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- I prefer to not squash that with the previous patch, as it makes it harder to review. --- target/arm/meson.build | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 9b7727d4bb..341af8f2ca 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -14,6 +14,7 @@ gen = [ arm_ss = ss.source_set() arm_ss.add(gen) +arm_ss.add(zlib) arm_ss.add(files( 'cpu.c', 'gdbstub.c', @@ -21,6 +22,13 @@ arm_ss.add(files( 'vfp_helper.c', )) +arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) + +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c', +)) + arm_tcg_ss = ss.source_set() arm_tcg_ss.add(files( 'arm-semi.c', @@ -35,26 +43,16 @@ arm_tcg_ss.add(files( 'vec_helper.c', )) -arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) - -arm_ss.add(zlib) - arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) - -arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) - -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', - 'gdbstub64.c', -)) +arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files( 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c', - 'sve_helper.c', 'translate-a64.c', 'translate-sve.c', + 'sve_helper.c', )) arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss) From patchwork Tue Sep 29 22:43:55 2020 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: 272429 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C1652C4727C for ; Tue, 29 Sep 2020 22:58:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B55F2083B for ; Tue, 29 Sep 2020 22:58:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="R5Jwe8wi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B55F2083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNOZt-0004EQ-Vb for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 18:58:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNOMt-0006gP-Cu for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:45:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNOMq-0004gj-Sr for qemu-devel@nongnu.org; Tue, 29 Sep 2020 18:45:07 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LDAC3FC/MEaPD4LUvl2bkbirLPCAiqLo/YtDEMBCclM=; b=R5Jwe8wix09pVIeYCw+Jtdse4VcVJmmF9cw4E+SJX+F0bWR6wQQdZChe0K5knG54Yg2Nxo jyaybuhtCBRKXg1HO19DuFYD/LCbVA0HiZhWtSCBl8YsDHWOWUV4MqXFoUJJ5vHhxmEPks JU8Fh0nxWNAAk5pkuMsKessdg42gptQ= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-xmtR7E0UNbO2yWjc0OCAAw-1; Tue, 29 Sep 2020 18:45:00 -0400 X-MC-Unique: xmtR7E0UNbO2yWjc0OCAAw-1 Received: by mail-wr1-f70.google.com with SMTP id v5so2326292wrs.17 for ; Tue, 29 Sep 2020 15:45:00 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=LDAC3FC/MEaPD4LUvl2bkbirLPCAiqLo/YtDEMBCclM=; b=Xcg6wliLArvw9SzekdtWBlTYiiHYO4uWqEy3xrreBe90LafLVedwnCpNLNzzmPVY4l SCFoDIIBGiQtLlm3ChnD/USEypJI8kJGZg2z6AxJ9r9mHVTvUSlI4b+dqycCEwpSlI66 fE6dmv0hoIaYBy7MrMoJxqhCiMecCFGhWlPIAKcZJGB/tWroGXi/BpxvYcavLkJ3cL7d +ghDRaDNeaiJKw904Pw5j8bxaSD5uUTz0dLna1KXoq80Yud68jh3KftwwS1dtJikxO/K 7ozMtl4z/F51AE9K32L88YnFU1CvVx2Rs5sXC7LypXEanqsIh2rEs2LQLE31byoKWnq3 RGig== X-Gm-Message-State: AOAM531W8W8S4r14KaPyVR+EhGQ5dRly99tPGx0b8J29k0uBtv2MLN3N GjXyrfEWtM4DDNAB1/wtJTUf2TLpBgEMID/EJvjgECsHmb0PW4/E4D3vzFwJjdTR+ZA20HIthiq 9ccdLQMKEKchDrpU= X-Received: by 2002:a5d:43cf:: with SMTP id v15mr6808328wrr.269.1601419499107; Tue, 29 Sep 2020 15:44:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwH+Rg1xe9gd9DlTZs7Ar3VzsQvPodRcCF6Ci4iIpufBqC6fONYRBje8t5F8NeD4ocLB3USiA== X-Received: by 2002:a5d:43cf:: with SMTP id v15mr6808303wrr.269.1601419498855; Tue, 29 Sep 2020 15:44:58 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id 76sm7666468wma.42.2020.09.29.15.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 12/12] .travis.yml: Add a KVM-only Aarch64 job Date: Wed, 30 Sep 2020 00:43:55 +0200 Message-Id: <20200929224355.1224017-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 22:47:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , kvm@vger.kernel.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add a job to build QEMU on Aarch64 with TCG disabled, so this configuration won't bitrot over time. We explicitly modify default-configs/aarch64-softmmu.mak to only select the 'virt' and 'SBSA-REF' machines. Signed-off-by: Philippe Mathieu-Daudé --- Job ran for 7 min 30 sec https://travis-ci.org/github/philmd/qemu/jobs/731428859 --- .travis.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.travis.yml b/.travis.yml index c75221dca3..cad65cf181 100644 --- a/.travis.yml +++ b/.travis.yml @@ -402,6 +402,41 @@ jobs: - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS}" - UNRELIABLE=true + - name: "[aarch64] GCC (disable-tcg)" + arch: arm64 + dist: bionic + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libiscsi-dev + - liblttng-ust-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + # Tests dependencies + - genisoimage + env: + - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools" + - TEST_CMD="make check-unit" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-aarch64" + before_script: + # Only use the 'virt' and 'sbsa-ref' machine which don't need TCG. + - echo CONFIG_ARM_VIRT=y > default-configs/aarch64-softmmu.mak + - echo CONFIG_SBSA_REF=y >> default-configs/aarch64-softmmu.mak + - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} + - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; } + - name: "[ppc64] GCC check-tcg" arch: ppc64le dist: xenial