From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093833; cv=none; d=zohomail.com; s=zohoarc; b=GxikUNtkoCCv/FqXVP6YrBU2LyJJs4Ndwm4SSHBS3Vyu4hi1ukJKF0hOzHVjhz8tbjIK+SVUS1x+3PYCzbARbOoC2zc8aowTeIkqOXUgMgImqjCpOWecPSP6fAn+thxT5nu5XI7EGvEUPk0VaOnXspWHNvmS4gtOWC38TwgtAVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093833; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NbTS4eSvhYMRXHU2vVjE8jfBdk95n+pM+UWftFmVvfU=; b=G2cA0Y0CVjG3mNiwLwCL5PVwepXiTA6/QmSzD7FPG2Y8YGKkCofmT2/DPF9q97jiWpMxmqNkK0fLduPwadJu1qyq6UqbEQgOK2gN4A+GwHmbFi8QhnSg65whh4ZpU55jVPI1O/9X8hUhT4mfdhBG+pIEgxvAUy9lt5vdf9XmN4k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1612093833337676.3594046863574; Sun, 31 Jan 2021 03:50:33 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id m13so13502235wro.12 for ; Sun, 31 Jan 2021 03:50:32 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id c62sm5346752wmd.43.2021.01.31.03.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:50:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NbTS4eSvhYMRXHU2vVjE8jfBdk95n+pM+UWftFmVvfU=; b=h1LzEJAXnr2fpxrCr74qTa92E0dAQb5YiEWfKSWN16Ei7mKBJSZQMVHDtkutWVDdYD QqYbWZZHSoxyuWQZ0pIEs9v6rLkDln3JPGHTftQ6RA5bwJSd93SlGR2L+ITnjWAutK0g tIS1BhDZkCAnE9y0tqhEZkdrRtZlLeW8E5mcViIcVkm0C6Wv07Py5VZXtuO1xTDY3Dc7 mvaI5qvAC6+T8+Mvqn86Ru7LvFhZ9yPMrtGUe0qq02OGSlaFwVC0zKhpVON0ICphi4MA y3ISRBAX0Z+MYNv5DS5/to54WQKzMmf73GoOvsshWv3hWIjt2qa4xFrh33b18Zx6xf8E pYWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NbTS4eSvhYMRXHU2vVjE8jfBdk95n+pM+UWftFmVvfU=; b=EnrFoZByJ0npvW9PJ67L0LF1Rry6OANofgotqAZ4+Xw5yq0uYhhNcSfMW1WuZTNdrX 0n+7w97bysZhzDCLQlGlg6VF9A8WuC6Ldz2h45BZr5wRvQ7xnJ90qMvMCr4o3ZFj3kFR RS2kff7qp8AUMQPbDmlKZs5wj65DF9K56HXqCxap/bW/1tT8fGpGJDrupzmnYXryc+nf 2PO+f5mKHDIJrf+L1KqAZd+PxA0lQFZ4S1gLbck49T4YTRTG85c52EcVAjC6X87LJQ7l MlcLBRP/Qf/RIGioB+yRWnx1EgMWL49P0bG2jdPtfXMOJkdl+sIxBlqweS3R1qp86Gut Ib5g== X-Gm-Message-State: AOAM532TcVvTHDNeLoV8QkCNqvMjg0S8v8sdd6/Y+AZb/3hzdDDPawsF x44b2HqxZCZOLDp+uIz+y7FvLWRpvcE= X-Google-Smtp-Source: ABdhPJzbicD1HJnXpjT27xzPC9x3I2AWZtVjzXvYLMRzjxZrSarnOD5x4M7qz2f/ytk+RI73IOJ3pg== X-Received: by 2002:a5d:458a:: with SMTP id p10mr13399523wrq.168.1612093831543; Sun, 31 Jan 2021 03:50:31 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster Subject: [PATCH v6 01/11] sysemu/tcg: Introduce tcg_builtin() helper Date: Sun, 31 Jan 2021 12:50:12 +0100 Message-Id: <20210131115022.242570-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Modules are registered early with type_register_static(). We would like to call tcg_enabled() when registering QOM types, but tcg_enabled() returns tcg_allowed which is a runtime property initialized later (See commit 2f181fbd5a9 which introduced the MachineInitPhase in "hw/qdev-core.h" representing the different phases of machine initialization and commit 0427b6257e2 which document the initialization order). As we are only interested if the TCG accelerator is builtin, regardless of being enabled, introduce the tcg_builtin() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Markus Armbruster --- include/sysemu/tcg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sysemu/tcg.h b/include/sysemu/tcg.h index 00349fb18a7..6ac5c2ca89d 100644 --- a/include/sysemu/tcg.h +++ b/include/sysemu/tcg.h @@ -13,8 +13,10 @@ void tcg_exec_init(unsigned long tb_size, int splitwx); #ifdef CONFIG_TCG extern bool tcg_allowed; #define tcg_enabled() (tcg_allowed) +#define tcg_builtin() 1 #else #define tcg_enabled() 0 +#define tcg_builtin() 0 #endif =20 #endif --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093838; cv=none; d=zohomail.com; s=zohoarc; b=Jz3h82EJIVtYa+eo0hdVw/OYx/Cnf0dg40Rbx3VX512UTScUuJEbzL8DCY1MnXG0KPYXJ9okbBgt7m6Y23RjqvWL9R1SX71xD3liyPsJ30yZVMVJqXAimfwomAfsyu+NTsRq5jTCbqw+H5cs9Fvn1MAxqrhGBSy5JzLb4N7CaEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093838; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VqrmhVxmrVpTinVk4e74EOokFJxAnJGleMWOvxObkGo=; b=eAiGGzRH3rhKRSxjyGkC/2VOCvMVSmEcvlnj9wADa3vYOoFoAJV34iM2g6SWBNXNtaZ9n31swh9XMHXZB3BjeEyX/Z6uhi9f9YF041BSzXrskMR40yy8yWBJK2aPG2k/VUBFiL5J2vyzeSBbS6gW5WsDI5MaZa7ix+gTFIZLY+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1612093838619339.0547833976095; Sun, 31 Jan 2021 03:50:38 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id u14so10751255wmq.4 for ; Sun, 31 Jan 2021 03:50:38 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id a17sm19517259wrx.63.2021.01.31.03.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:50:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VqrmhVxmrVpTinVk4e74EOokFJxAnJGleMWOvxObkGo=; b=lyvsp3J4UkNurQZJVFz9o4JYa1UA1x5dEPXNh3rSqZoz/D+ftmCq5kSipCIzpP4yYJ nSMUwmKcyyFsbqMKa8oxpCNGlXb93gGlqm4bjingFBgZuIWD7AbI0OZpdaMufJDvHG9c qC5+dIBepWCX6LFsUMA77xsp6mvys75KRB+jURkPOHD/pN99OOtyoQ9btbVCGzoyfl6G MxbJzJi5FBOYnndo2ohyVKrRVbQ75AEh0rEWOFzVWJCmjvCGgSofwmaqh36oRozeOnfA jlgBJb1qNwvqao+3AOuUECbxkneAizqC36qIYrHOlMkRF5uKw5qN2ZdR2YCXPAzeFzfO Mz/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VqrmhVxmrVpTinVk4e74EOokFJxAnJGleMWOvxObkGo=; b=Kt/UDFuM2Ot0z9VV/IsSkGISPuQodL4xiVP1Ib/t3Y24bEGNXqj3ZkBNMkdzfADsVv kJE7317GKE3hXzZB02LtehA9pMP/dl6LVInz9uSIee/1r7favaTxs32ZeKuBTLCdFfgD 1hql320jkXpuftyQ2Wle3yfnIKAZE/62VnZrC3E0N8LFspmfUdSoyFJAhy5Ja2Btevrk xiotkn5VvdKwJVimoMeS1hBw2eMrHpvySR3eBgdR9YWQmZQQVQWjwSaiQAFE9UOCFZj8 a2ua5jeYxAggAzSOX2DBe8XOJIIw9XjgPZ2+BvGaBYJTY1cHvhZiK0077ZLz6F/ScI+I ohkA== X-Gm-Message-State: AOAM533lSxJjGx9cV7q2rwAzU4TSPakg4F4a6UGyM/jv9I6/lqnJnNnC rMCTAtUsNdB8u25oOeCHmWY= X-Google-Smtp-Source: ABdhPJzlUZ0PoftyMhnvPgCuDfPl7bBhNXVdBlytKA4JLNnnwx1y1kPvC5kny0EUlqDJX52wkKjIyA== X-Received: by 2002:a7b:c196:: with SMTP id y22mr10912502wmi.91.1612093836938; Sun, 31 Jan 2021 03:50:36 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 02/11] exec: Restrict TCG specific headers Date: Sun, 31 Jan 2021 12:50:13 +0100 Message-Id: <20210131115022.242570-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Fixes when building with --disable-tcg on ARM: In file included from target/arm/helper.c:16: include/exec/helper-proto.h:42:10: fatal error: tcg-runtime.h: No such fi= le or directory 42 | #include "tcg-runtime.h" | ^~~~~~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Claudio Fontana --- include/exec/helper-proto.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index 659f9298e8f..740bff3bb4d 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -39,8 +39,10 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), = dh_ctype(t3), \ =20 #include "helper.h" #include "trace/generated-helpers.h" +#ifdef CONFIG_TCG #include "tcg-runtime.h" #include "plugin-helpers.h" +#endif /* CONFIG_TCG */ =20 #undef IN_HELPER_PROTO =20 --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093844; cv=none; d=zohomail.com; s=zohoarc; b=dNc1KhFfazTpF6ZecKKSz7TJjNBNBq9lRhMAP2aZrXTUk5amZ6flVAQuuoIFCJ6GC2H5Jq2CrgY8jAojoHcGCAy8rpEA2quUvv8vId3X7K6F9BG8yON3kBHMZ7/dCdRd9rA0G279Sw27lV5ojEeO6pwk0X9Q2L9FbFH1+agt9mQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093844; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fh28JukriQ8n71FXrOcLQmLKpZgUpaavJogE1lG2lKE=; b=ey9le+G2R7nx7t90cnwrE+Zw98WKs0DFfUzNuceRQDIFLKuTAwaROesPQnkdiiKc9F2CH3jlt2Ct5LaGi7nV7eLc7EqLdUo55B0yfLnZachGUxpP3eS5sNh/Jr0gE65UMDT3W6aVg7m+xmZilIYXR0UOCEzFBeTw0VbewmJ1sPA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1612093844128771.835041161251; Sun, 31 Jan 2021 03:50:44 -0800 (PST) Received: by mail-wr1-f41.google.com with SMTP id q7so13468026wre.13 for ; Sun, 31 Jan 2021 03:50:43 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id c18sm27536097wmk.0.2021.01.31.03.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:50:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fh28JukriQ8n71FXrOcLQmLKpZgUpaavJogE1lG2lKE=; b=V9jvv1aL3pv839Xy1/0k6WXm66MH9MuJ++7EvsG8qCa8S/wu6yqaRlsHWM/6QNB9nq otF67bI38HB/w9Q6MYBXxVOV5UBCfzchBKzB7qzo23tC+CtVSDEiuDhSZgH2dTnQIoYd 6joAcsNUIBk61d62T+9j0tEWV0NdSA6ytJkUxnBG0i3S908YNLWEon8evQ47X9B2sLl4 nYV4yaQ2owvFrejRRcFu4R05XEV7WMKV9GrqyrPq04KqW0pgCUzJ6KMZIWHx1H0HXq9X d3lwh952RSMVU6+mG+0RM+tLEOoLrQ673P9FK4aAUMuTDxUGUjXBbhRSvwjSbsfKJ1+J eQvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fh28JukriQ8n71FXrOcLQmLKpZgUpaavJogE1lG2lKE=; b=fiN/JdZ6jZPUkKWZbl9s8NUJlfq6cDaSxS/DKKCwJVvVdbPGptU7NZfHEkCcUz/VoT 4KU+nPxypf0G36rzbP91iQYFNWaJ5HTfcDEGFQ9ZW2yHhwQ/u1wm08Nj3tHZG2q5i8HC o6LIkZ2eUp9lkjZL6vEcJqiFDV36Rr7IxsSh08a5zNFUBVLOWlhnYFqp4z6O/BAXgAjK ZjQ2UbWTk1q58mqrVInJDpBYZa1U4QKVPzr+yIRyixW7jqdWF4YI1Vn0jg6fIXXSKLXd npGSwKir9jSyxydBIVbvcLQgmTuu7SBG9A/rmlHvUF/FE++HhqZfTI+CGeMqFZSnPIch nv0w== X-Gm-Message-State: AOAM532yQPP4uPF6LlhqPdPo+2n8tcf5cEBZUvC/8FwuvPp//ttDN+WJ DoT6MoL13rn28KJ5yQKQArk= X-Google-Smtp-Source: ABdhPJzPZYCyk9Lid3tGRWhj4ZiT3g9tiJCZJewZhjiHAEXNm3DGC368mGAO4xLutOTTbFfAQmbXoQ== X-Received: by 2002:adf:f303:: with SMTP id i3mr13248696wro.60.1612093842413; Sun, 31 Jan 2021 03:50:42 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 03/11] target/arm: Restrict ARMv4 cpus to TCG accel Date: Sun, 31 Jan 2021 12:50:14 +0100 Message-Id: <20210131115022.242570-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce: "target/arm: Remove KVM support for 32-bit Arm hosts"). Only enable the following ARMv4 CPUs when TCG is available: - StrongARM (SA1100/1110) - OMAP1510 (TI925T) The following machines are no more built when TCG is disabled: - cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310) - sx1 Siemens SX1 (OMAP310) V2 - sx1-v1 Siemens SX1 (OMAP310) V1 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Claudio Fontana Reviewed-by: Alex Benn=C3=A9e --- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 4 ++++ target/arm/Kconfig | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devi= ces/arm-softmmu.mak index 0824e9be795..6ae964c14fd 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -14,8 +14,6 @@ CONFIG_INTEGRATOR=3Dy CONFIG_FSL_IMX31=3Dy CONFIG_MUSICPAL=3Dy CONFIG_MUSCA=3Dy -CONFIG_CHEETAH=3Dy -CONFIG_SX1=3Dy CONFIG_NSERIES=3Dy CONFIG_STELLARIS=3Dy CONFIG_REALVIEW=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f3ecb73a3d8..f2957b33bee 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -31,6 +31,8 @@ config ARM_VIRT =20 config CHEETAH bool + default y if TCG && ARM + select ARM_V4 select OMAP select TSC210X =20 @@ -249,6 +251,8 @@ config COLLIE =20 config SX1 bool + default y if TCG && ARM + select ARM_V4 select OMAP =20 config VERSATILE diff --git a/target/arm/Kconfig b/target/arm/Kconfig index ae89d05c7e5..811e1e81652 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -6,6 +6,10 @@ config AARCH64 bool select ARM =20 +config ARM_V4 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093850; cv=none; d=zohomail.com; s=zohoarc; b=T24NdTwS+6q8d91sCklqykALhqgvOIrmKNdgoaPbj1FMzFcMoHL45rzCtHuH3aYt1op98ome6JUY0jL6AoxrU34a/pDt0+/ma+aC8aKCW5o1AdXRq4EqGYeYieguv6SkgeANGppUtVvBJ8dJznC4+gwBwqYgrNsDqA/JC2aKo4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093850; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jAQNkZyQmguYUbpG6RAooFLTF+LkPeMScVQdPuM6a40=; b=aEnS5FHDmsHxDrhfmqTWQ0tpak6/gO1rufYK9/K89SrnBmlf6IBPOkXY9ikkMaDmlgrneRgYLb13q9ubZ0RjXntwlMqpRxtt4Mjg1gocFPArB1ieRQQ7Oi7sdjJeXPUE6BJyQyZLKRUEZ+eH/MQPwUToOmBYVz8AjcQBgOVkZbU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1612093850094355.5650620642631; Sun, 31 Jan 2021 03:50:50 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id v15so13528467wrx.4 for ; Sun, 31 Jan 2021 03:50:49 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id q19sm6049801wmj.23.2021.01.31.03.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:50:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jAQNkZyQmguYUbpG6RAooFLTF+LkPeMScVQdPuM6a40=; b=ixKvjc/EM+COzd/8zxx92XqGNuV3/KESCLzWaBkZIRcantYLmcmpylMmMK1AJx2jFE cuGm88zp9PC+wZ+KY57F2pigz8jKDIGbtvjWcoU8aEM/nGEg27OQm5dGfgVezOdw1Gd0 1FkULN2tU2CmTtGU2cbXW4wpUoB9wJt3wC0xkiwOWN4HKbkf7ezFy/qfSmw5qWkNJafh L2NoH+RgS9jT/5Srq/FaVLqx5TFXZSmvu/NPvrbpb/stecX4jUwzkXAxNa8OGss5YV/s TVK2rJKTCYy448KHIZDG1ALx4Y0vk3f1zUClD6O1RYBuCUV4B33Liak3YWHgZxQ6JvxS +UcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jAQNkZyQmguYUbpG6RAooFLTF+LkPeMScVQdPuM6a40=; b=Pf5bqUwyj6gS3B5NI5SlhhtY81ckMej6StFrlFKenwylW5Kvfp5xrVR9X7syAVIMjX 87JZC5bjn/32qfyGym2vwHw3RJhUlExuTf5Gh9qSRA92Rj1dMXG2f35FnNkMWB3kZZqj 4nk6wdPmu747AdBobg2HiLxZ9/FqMN/kmQ6DaCGkNDF1331z8q8i+PeYfg0Iya/slPbs sCLvjo2bV+EijMP5fMFy3hykoD+v6fPF7vxeKDX+IHQZnQhnPVHfWPSQZ6gzfLPkkaFa HExGpBpyRU7oJxLCHYgfmp1wQhYav+lXtLkuak/OzMZl1tXCgR/KRZ8e7eoAzc52Bz/d SOWw== X-Gm-Message-State: AOAM531/NXWjOA530iH+mBLWqqQmOzqJl1VmLJ0TN77MN/8jOB5ogcLw UX6Jl0+rrbANcixfeQNl0NI= X-Google-Smtp-Source: ABdhPJxm51d3yxh6L+XBF7RlyMnDsyEgQnz37oiRF4PWsrAoOK263P8yLKKWDXW81l+tMCZwpYvWfw== X-Received: by 2002:a05:6000:1546:: with SMTP id 6mr13099821wry.398.1612093848309; Sun, 31 Jan 2021 03:50:48 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 04/11] target/arm: Restrict ARMv5 cpus to TCG accel Date: Sun, 31 Jan 2021 12:50:15 +0100 Message-Id: <20210131115022.242570-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce: "target/arm: Remove KVM support for 32-bit Arm hosts"). Only enable the following ARMv5 CPUs when TCG is available: - ARM926 - ARM946 - ARM1026 - XScale (PXA250/255/260/261/262/270) The following machines are no more built when TCG is disabled: - akita Sharp SL-C1000 (Akita) PDA (PXA270) - ast2500-evb Aspeed AST2500 EVB (ARM1176) - ast2600-evb Aspeed AST2600 EVB (Cortex A7) - borzoi Sharp SL-C3100 (Borzoi) PDA (PXA270) - canon-a1100 Canon PowerShot A1100 IS (ARM946) - collie Sharp SL-5500 (Collie) PDA (SA-1110) - connex Gumstix Connex (PXA255) - g220a-bmc Bytedance G220A BMC (ARM1176) - imx25-pdk ARM i.MX25 PDK board (ARM926) - integratorcp ARM Integrator/CP (ARM926EJ-S) - mainstone Mainstone II (PXA27x) - musicpal Marvell 88w8618 / MusicPal (ARM926EJ-S) - palmetto-bmc OpenPOWER Palmetto BMC (ARM926EJ-S) - realview-eb ARM RealView Emulation Baseboard (ARM926EJ-S) - romulus-bmc OpenPOWER Romulus BMC (ARM1176) - sonorapass-bmc OCP SonoraPass BMC (ARM1176) - spitz Sharp SL-C3000 (Spitz) PDA (PXA270) - supermicrox11-bmc Supermicro X11 BMC (ARM926EJ-S) - swift-bmc OpenPOWER Swift BMC (ARM1176) - tacoma-bmc OpenPOWER Tacoma BMC (Cortex A7) - terrier Sharp SL-C3200 (Terrier) PDA (PXA270) - tosa Sharp SL-6000 (Tosa) PDA (PXA255) - verdex Gumstix Verdex (PXA270) - versatileab ARM Versatile/AB (ARM926EJ-S) - versatilepb ARM Versatile/PB (ARM926EJ-S) - witherspoon-bmc OpenPOWER Witherspoon BMC (ARM1176) - z2 Zipit Z2 (PXA27x) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Claudio Fontana --- default-configs/devices/arm-softmmu.mak | 12 ------------ hw/arm/realview.c | 5 ++++- tests/qtest/cdrom-test.c | 6 +++++- hw/arm/Kconfig | 19 +++++++++++++++++++ target/arm/Kconfig | 4 ++++ 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devi= ces/arm-softmmu.mak index 6ae964c14fd..0aad35da0c4 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -10,33 +10,21 @@ CONFIG_ARM_VIRT=3Dy CONFIG_CUBIEBOARD=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy -CONFIG_INTEGRATOR=3Dy CONFIG_FSL_IMX31=3Dy -CONFIG_MUSICPAL=3Dy CONFIG_MUSCA=3Dy CONFIG_NSERIES=3Dy CONFIG_STELLARIS=3Dy CONFIG_REALVIEW=3Dy -CONFIG_VERSATILE=3Dy CONFIG_VEXPRESS=3Dy CONFIG_ZYNQ=3Dy -CONFIG_MAINSTONE=3Dy -CONFIG_GUMSTIX=3Dy -CONFIG_SPITZ=3Dy -CONFIG_TOSA=3Dy -CONFIG_Z2=3Dy CONFIG_NPCM7XX=3Dy -CONFIG_COLLIE=3Dy -CONFIG_ASPEED_SOC=3Dy CONFIG_NETDUINO2=3Dy CONFIG_NETDUINOPLUS2=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy -CONFIG_DIGIC=3Dy CONFIG_SABRELITE=3Dy CONFIG_EMCRAFT_SF2=3Dy CONFIG_MICROBIT=3Dy -CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy CONFIG_ALLWINNER_H3=3Dy diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 0831159d158..2dcf0a4c23e 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -18,6 +18,7 @@ #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "exec/address-spaces.h" @@ -460,7 +461,9 @@ static const TypeInfo realview_pbx_a9_type =3D { =20 static void realview_machine_init(void) { - type_register_static(&realview_eb_type); + if (tcg_builtin()) { + type_register_static(&realview_eb_type); + } type_register_static(&realview_eb_mpcore_type); type_register_static(&realview_pb_a8_type); type_register_static(&realview_pbx_a9_type); diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index 5af944a5fb7..1f1bc26fa7a 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -222,7 +222,11 @@ int main(int argc, char **argv) add_cdrom_param_tests(mips64machines); } else if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) { const char *armmachines[] =3D { - "realview-eb", "realview-eb-mpcore", "realview-pb-a8", +#ifdef CONFIG_TCG + "realview-eb", +#endif /* CONFIG_TCG */ + "realview-eb-mpcore", + "realview-pb-a8", "realview-pbx-a9", "versatileab", "versatilepb", "vexpress-a15= ", "vexpress-a9", "virt", NULL }; diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f2957b33bee..560442bfc5c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -42,6 +42,8 @@ config CUBIEBOARD =20 config DIGIC bool + default y if TCG && ARM + select ARM_V5 select PTIMER select PFLASH_CFI02 =20 @@ -72,6 +74,8 @@ config HIGHBANK =20 config INTEGRATOR bool + default y if TCG && ARM + select ARM_V5 select ARM_TIMER select INTEGRATOR_DEBUG select PL011 # UART @@ -84,6 +88,7 @@ config INTEGRATOR =20 config MAINSTONE bool + default y if TCG && ARM select PXA2XX select PFLASH_CFI01 select SMC91C111 @@ -98,6 +103,8 @@ config MUSCA =20 config MUSICPAL bool + default y if TCG && ARM + select ARM_V5 select OR_IRQ select BITBANG_I2C select MARVELL_88W8618 @@ -138,6 +145,7 @@ config OMAP =20 config PXA2XX bool + select ARM_V5 select FRAMEBUFFER select I2C select SERIAL @@ -147,12 +155,14 @@ config PXA2XX =20 config GUMSTIX bool + default y if TCG && ARM select PFLASH_CFI01 select SMC91C111 select PXA2XX =20 config TOSA bool + default y if TCG && ARM select ZAURUS # scoop select MICRODRIVE select PXA2XX @@ -160,6 +170,7 @@ config TOSA =20 config SPITZ bool + default y if TCG && ARM select ADS7846 # touch-screen controller select MAX111X # A/D converter select WM8750 # audio codec @@ -172,6 +183,7 @@ config SPITZ =20 config Z2 bool + default y if TCG && ARM select PFLASH_CFI01 select WM8750 select PL011 # UART @@ -245,6 +257,7 @@ config STRONGARM =20 config COLLIE bool + default y if TCG && ARM select PFLASH_CFI01 select ZAURUS # scoop select STRONGARM @@ -257,6 +270,8 @@ config SX1 =20 config VERSATILE bool + default y if TCG && ARM + select ARM_V5 select ARM_TIMER # sp804 select PFLASH_CFI01 select LSI_SCSI_PCI @@ -376,6 +391,8 @@ config NPCM7XX =20 config FSL_IMX25 bool + default y if TCG && ARM + select ARM_V5 select IMX select IMX_FEC select IMX_I2C @@ -402,6 +419,8 @@ config FSL_IMX6 =20 config ASPEED_SOC bool + default y if TCG && ARM + select ARM_V5 select DS1338 select FTGMAC100 select I2C diff --git a/target/arm/Kconfig b/target/arm/Kconfig index 811e1e81652..9b3635617dc 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -10,6 +10,10 @@ config ARM_V4 bool depends on TCG && ARM =20 +config ARM_V5 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093857; cv=none; d=zohomail.com; s=zohoarc; b=InPVyeQIcuw8hSpFViZgI0euXbmkikQsgbRjRvs7BGzVohiE4emSQ+SKyHogpBxJhm532LCFAy9PscV74IPmZOvT6xsdhAOaRG8TsIfq1oUKvnW8gYCHPHLho6VpshvFT6u7AG6YyxSAW6GYndllCE/5OkTkDbnhEWVGnBB2ZZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093857; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ELWTSu1rl/DhvuIH4cal4USbDecgDqC8O4/05ndhpXE=; b=kRwAhFbyPAIXVJaTWdKchaljy8k9GPPvubFibur3t5bacpGJL6lXMrVkS5C1eEndFSHxMBPi7vXKDdfnqcX/k5t8mJS8DqC2MGl8MFAravazT6zeUaqbyGItAkFfbGv1ychvVeWY7XroMTjZG57UuvmZEN/ypa5aLwsmB/YAQ4k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1612093857521615.0370584913499; Sun, 31 Jan 2021 03:50:57 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id 6so13493010wri.3 for ; Sun, 31 Jan 2021 03:50:54 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id w4sm2862428wrt.69.2021.01.31.03.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:50:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ELWTSu1rl/DhvuIH4cal4USbDecgDqC8O4/05ndhpXE=; b=atxpO5/Camn9p7jABxjl2WTPortxY8V1F0jxEhdR2VF0SBEfPL9LK5Vq47+Eod8YM4 aSZuSFtkdwJyK3FzZaGake8jsnv3T1MqlWW+JvnWt/YTtBuI0fzJvdhdooOiQHAYpA8U UVFjEvV4zBNtllHFhkwQzhLAeGmiSs62p2SIMZjyQGGHFYpj8/nWFB0rzW5VU5sTmUgU qArFne3BXB4GxsdEsUtx2RothKht8yJaLcLGwCRcFLJ64xxggBPETOdIxL3w2xWx/eHW kp9nxOa9ngRX8eU7jbkiS5Yj9hDjtee2VaqEn0fy7cAe7jyw4/p9JLsxgkBb5WKz3a/P MdEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ELWTSu1rl/DhvuIH4cal4USbDecgDqC8O4/05ndhpXE=; b=fgtMyZLky4SzagQr/hfC65cHp9ekeZS5/Dd8Z5Nn0iuJg9aLrPI7qhAnuzFsgh95D5 2ktyf53+bSCG9V4/zi+II31Zbm3IDFxaJCzruhlAOJeWBaPDOgRjdJ4EX/Jjizql0BRf 7J7O8oPYL7f0UOXUHr3RPIpAd4AXfOgAizpgHpDSzao2qo/J+zx0AU0pnltrCgBz5v/X geHVlWIh7tp4PuHqq6aSDKZoch1eMRpMSYeFGEMizcshMuH7EVvu6nfhNnNyyyaCJNs8 y2LBNITX/9xTAYw5VMerrWWaFVu9XG1uuM+0UksGGi19SvF/x+RHilKbgG2y8dJYrJjq 66qg== X-Gm-Message-State: AOAM530F6QhpWSwc3dR38oBaTl1jB697sCT7pLaTw+770+VTd6sNK5XD GcEbmACTpZgPKGVAlhfH9Vg= X-Google-Smtp-Source: ABdhPJw052bc5n0sg8qrUOVnPuK+eGRq0Nn6pE/jzM3JbJxgQX3UIdClky2OLAwF4K5l6GeEHLBoOw== X-Received: by 2002:adf:9427:: with SMTP id 36mr13393596wrq.271.1612093853746; Sun, 31 Jan 2021 03:50:53 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 05/11] target/arm: Restrict ARMv6 cpus to TCG accel Date: Sun, 31 Jan 2021 12:50:16 +0100 Message-Id: <20210131115022.242570-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce: "target/arm: Remove KVM support for 32-bit Arm hosts"). Only enable the following ARMv6 CPUs when TCG is available: - ARM1136 - ARM1176 - ARM11MPCore - Cortex-M0 The following machines are no more built when TCG is disabled: - kzm ARM KZM Emulation Baseboard (ARM1136) - microbit BBC micro:bit (Cortex-M0) - n800 Nokia N800 tablet aka. RX-34 (OMAP2420) - n810 Nokia N810 tablet aka. RX-44 (OMAP2420) - realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Claudio Fontana Reviewed-by: Alex Benn=C3=A9e --- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/realview.c | 2 +- tests/qtest/cdrom-test.c | 2 +- hw/arm/Kconfig | 6 ++++++ target/arm/Kconfig | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devi= ces/arm-softmmu.mak index 0aad35da0c4..175530595ce 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -10,9 +10,7 @@ CONFIG_ARM_VIRT=3Dy CONFIG_CUBIEBOARD=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy -CONFIG_FSL_IMX31=3Dy CONFIG_MUSCA=3Dy -CONFIG_NSERIES=3Dy CONFIG_STELLARIS=3Dy CONFIG_REALVIEW=3Dy CONFIG_VEXPRESS=3Dy diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 2dcf0a4c23e..0606d22da14 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -463,8 +463,8 @@ static void realview_machine_init(void) { if (tcg_builtin()) { type_register_static(&realview_eb_type); + type_register_static(&realview_eb_mpcore_type); } - type_register_static(&realview_eb_mpcore_type); type_register_static(&realview_pb_a8_type); type_register_static(&realview_pbx_a9_type); } diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index 1f1bc26fa7a..cb0409c5a11 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -224,8 +224,8 @@ int main(int argc, char **argv) const char *armmachines[] =3D { #ifdef CONFIG_TCG "realview-eb", -#endif /* CONFIG_TCG */ "realview-eb-mpcore", +#endif /* CONFIG_TCG */ "realview-pb-a8", "realview-pbx-a9", "versatileab", "versatilepb", "vexpress-a15= ", "vexpress-a9", "virt", NULL diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 560442bfc5c..6c4bce4d637 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -123,6 +123,8 @@ config NETDUINOPLUS2 =20 config NSERIES bool + default y if TCG && ARM + select ARM_V6 select OMAP select TMP105 # tempature sensor select BLIZZARD # LCD/TV controller @@ -401,6 +403,8 @@ config FSL_IMX25 =20 config FSL_IMX31 bool + default y if TCG && ARM + select ARM_V6 select SERIAL select IMX select IMX_I2C @@ -478,11 +482,13 @@ config FSL_IMX6UL =20 config MICROBIT bool + default y if TCG && ARM select NRF51_SOC =20 config NRF51_SOC bool select I2C + select ARM_V6 select ARM_V7M select UNIMP =20 diff --git a/target/arm/Kconfig b/target/arm/Kconfig index 9b3635617dc..fbb7bba9018 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -14,6 +14,10 @@ config ARM_V5 bool depends on TCG && ARM =20 +config ARM_V6 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093861; cv=none; d=zohomail.com; s=zohoarc; b=WCqoDa46B5IrAREkNFEeePSyZNgsZGDg66ZFw1ij9IcEhx00rXGsEJxkU9QaWZWYXO28u55CZuvFYqEofRcn8ocCrCR6q1G9GhgFpHa47ozsMZspcjdjnhZt0zy7H0hdCzfYI9xwoAhWDt0/w/2QeIBaq7Mo0RPXQ81wFaZVzTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093861; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=55M93vKE1ahVgefWyZvIGcKvoJvAwdKqopFIoeHKkkA=; b=EN/b4VaidMCM57xSg1M7bRvdvEhaqvhHZzTajtMeZdxLqY4rOlQe6duoWIdlCYrSrUetKTQyvQIUzK15egK/X/rHFq1ND/DVu1hOeFkExRe6jnGAVlmP8QV37q/uIfdGvrEEphpoI1O/APiJs5QeccDreVgg1k5fCGWd3XCh8jY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1612093861613388.9044104627329; Sun, 31 Jan 2021 03:51:01 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id s24so9641895wmj.0 for ; Sun, 31 Jan 2021 03:51:00 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id u5sm18602187wmg.9.2021.01.31.03.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:50:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=55M93vKE1ahVgefWyZvIGcKvoJvAwdKqopFIoeHKkkA=; b=freBR3tIPtKMjI2+MuKbji7ZAmhWoqg3OKGAyKpW5xTZpNL67hf8t/x55QZPJTsMKz yEgpK6BA74aoPJ3neWrEuMTCkKXHqYvDm8EEuhQyQq+J9Qdipr6EZ9TB9ia301pTOoz9 vv9A7BlPEvFHTRQ3M8w0tWlUePeXhLMgnZjd3JfMdtm30/IKP2UnSGsQS5fQkz5uSsxt ceUquXDjHUU1rTo7hKFajd/mUnA7Mi6K/dt+TtlgJYUl86XLQH7/EFyjqFqD7mwzCzQ0 iT9EJe0qFQ90dsHDB1V8YvULyo5X3sBy5qnHmUGWDwe8TzgD3Z9yRx6ltBfOJRZHPZow zY3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=55M93vKE1ahVgefWyZvIGcKvoJvAwdKqopFIoeHKkkA=; b=axSKCH9G+ePlh2jzCjV3PlEtwT0XOIUWq1EiFAhsGKI7sAyrE1SDE0+BCh9kv2bVam QzGJr13CwIsA02DeupBqO4gT35xZ/mpUxvWFKTKjlWzeiJuVGzqhIxG+RvAZqvYUMz8g Jcm152mBBbplYFGK1nKvMIK2ORH4dtuLjZTjU9A02jmY0kPRZnmx1wPnT/JlWEqycuYX KtjSkYPVAsjqJDtLJvW86hEbTSnv+pPUDod6YWzlQD/0vayC70WI9CUJmO7GAnxMNKz6 A0tvNF3JZimlbfLPXNkBx8JYk72isyEINRCEEBh/zUvUvHmnCy4hKnk5ZgcEnAQobZDW ma4A== X-Gm-Message-State: AOAM5301MAMwyahXuiDvDU1qHFEjTUZlN5JD5Xc3boF7SOX04lsAA5zr 4HmhuKx5ssTwLXEqYmBeBn2o7rz21aM= X-Google-Smtp-Source: ABdhPJwJ9hes8lhe7OgVqiDeXshE4pGmaMbjuBMuK73ScXw3dz3Zg0MEOl283XRP7LZaLbEaQLBqZA== X-Received: by 2002:a1c:a406:: with SMTP id n6mr10935564wme.53.1612093858925; Sun, 31 Jan 2021 03:50:58 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 06/11] target/arm: Restrict ARMv7 R-profile cpus to TCG accel Date: Sun, 31 Jan 2021 12:50:17 +0100 Message-Id: <20210131115022.242570-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce: "target/arm: Remove KVM support for 32-bit Arm hosts"). Beside, KVM only supports A-profile, thus 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 The following machine is no more built when TCG is disabled: - xlnx-zcu102 Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Claudio Fontana Reviewed-by: Alex Benn=C3=A9e --- default-configs/devices/aarch64-softmmu.mak | 1 - hw/arm/Kconfig | 2 ++ target/arm/Kconfig | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/default-configs/devices/aarch64-softmmu.mak b/default-configs/= devices/aarch64-softmmu.mak index 958b1e08e40..a4202f56817 100644 --- a/default-configs/devices/aarch64-softmmu.mak +++ b/default-configs/devices/aarch64-softmmu.mak @@ -3,6 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak =20 -CONFIG_XLNX_ZYNQMP_ARM=3Dy CONFIG_XLNX_VERSAL=3Dy CONFIG_SBSA_REF=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 6c4bce4d637..4baf1f97694 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -360,8 +360,10 @@ config STM32F405_SOC =20 config XLNX_ZYNQMP_ARM bool + default y if TCG && ARM select AHCI select ARM_GIC + select ARM_V7R select CADENCE select DDC select DPCD diff --git a/target/arm/Kconfig b/target/arm/Kconfig index fbb7bba9018..4dc96c46520 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -18,6 +18,10 @@ config ARM_V6 bool depends on TCG && ARM =20 +config ARM_V7R + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093866; cv=none; d=zohomail.com; s=zohoarc; b=AIUPq2dwtrmH7UXpW64jb9Ng5rIwO2iXQX7w1IK1FHoFT5qWmNYHErYb8Wm/4wW1yy2g3lh92Xhxcmc5fcUm5Ht73Any2rXdk356/p4yKrOdPp+ej9ogwoihBE1iH2te8HX1UzI4sBzoi3Wg0B+HUEz3bIumMWGsDp4beIfEd7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093866; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7kgwIK0JyvDkmF9iFWkCY48/6oYK9JNsR3MYb3v4QG8=; b=abPnWUViPgBV1LWmouJQTY+UsyHcoXyYbdfuIV4q40I5baYXdef9LNUFyGa1LfQFGenK03XZ/kj78jlIeqlWqV2yLRuLsxndHB0FgdNwMMhslK3gWaRI0C+0p2VxtHKoOnlycZpz3QgfJkj45nkRPctuLa10hsFdb8oKqyFN57E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1612093866177275.37120521440477; Sun, 31 Jan 2021 03:51:06 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id j18so10241481wmi.3 for ; Sun, 31 Jan 2021 03:51:05 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id b3sm19907224wme.32.2021.01.31.03.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:51:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7kgwIK0JyvDkmF9iFWkCY48/6oYK9JNsR3MYb3v4QG8=; b=n9AyWszsjAaoRnFwXuUuw7rPY7wzSZ+hzO0UZXdKnF4wDfUQB4I9DojR0AhRbjsTLK RErB2otDkUoKNEiWYP7Yrt2aw15d+dA9Y+3SPIUOmfZEwJvOXmWuZDbs9Uev0LzyKGeJ yDVt/DifjreigZ5eStSOamXH4eV9/eir1F4f2l6Fn9Nlx5Z843nIFbYQOvaXPCTWSr/m ImY/2H/l+FJF6NVSjLklW8AsZtX3R2VsCSVDWXo9WA0Q9unws98XkDEzUeay/3mKFLGR S3ffbtd2B9J1qthp8co9d2yLBB0wOHCn1rfSTDfa7bbKiVPnqcucletQRJHJusUlHlUL EDUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7kgwIK0JyvDkmF9iFWkCY48/6oYK9JNsR3MYb3v4QG8=; b=Tc+7zUsXFBITW+BI3r1DXo9Jgfp1gJxbq6aHgzpx+AK7/SLbM5ILQmSzRshxqUihVo yBkhynLEalOSBc+k5vorM85LAvDHA7yicv0n9kF7c2utuwchmEKB3E9vcvGaYEEXnbEj HgrrSpAQ2OcPTVZ71eDzJ+D8/oeEy0P9Fa/xUnTpn1kxNJ1x6rpaEyOaJD7/Qd1xfR4C 7/GPcacrND4Ge26b/aIELq0ga+qJytdTLyJvak2mGkTjH14cYZ1FcmsELOh+x4mnEK4M e97ouDd4me+EQTj/K2Nj/t6cmloXrJb5qtDfoxi7TlYkR1E9j/kY8vNg5ldcPb0QFabG ZaNQ== X-Gm-Message-State: AOAM533MLjlp9ZVrKEvGFqZ2lo7NH/ysEXx7eyr4hEaChLxRveGxQf+h 86IZApM0oksydEQfsdIxeok= X-Google-Smtp-Source: ABdhPJz3tlrMcRRpjd4PUI1yHaP/ipcEQ3/LURnJ6uV5ubC8GeKt0km9ort6jH4+M4qdcEM7EgRM5g== X-Received: by 2002:a05:600c:4f07:: with SMTP id l7mr5555519wmq.111.1612093864376; Sun, 31 Jan 2021 03:51:04 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 07/11] target/arm: Restrict ARMv7 M-profile cpus to TCG accel Date: Sun, 31 Jan 2021 12:50:18 +0100 Message-Id: <20210131115022.242570-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce: "target/arm: Remove KVM support for 32-bit Arm hosts"). Beside, KVM only supports A-profile, thus 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 The following machines are no more built when TCG is disabled: - emcraft-sf2 SmartFusion2 SOM kit from Emcraft (M2S010) - highbank Calxeda Highbank (ECX-1000) - lm3s6965evb Stellaris LM3S6965EVB (Cortex-M3) - lm3s811evb Stellaris LM3S811EVB (Cortex-M3) - midway Calxeda Midway (ECX-2000) - mps2-an385 ARM MPS2 with AN385 FPGA image for Cortex-M3 - mps2-an386 ARM MPS2 with AN386 FPGA image for Cortex-M4 - mps2-an500 ARM MPS2 with AN500 FPGA image for Cortex-M7 - mps2-an505 ARM MPS2 with AN505 FPGA image for Cortex-M33 - mps2-an511 ARM MPS2 with AN511 DesignStart FPGA image for Cor= tex-M3 - mps2-an521 ARM MPS2 with AN521 FPGA image for dual Cortex-M33 - musca-a ARM Musca-A board (dual Cortex-M33) - musca-b1 ARM Musca-B1 board (dual Cortex-M33) - netduino2 Netduino 2 Machine (Cortex-M3) - netduinoplus2 Netduino Plus 2 Machine(Cortex-M4) We don't need to enforce CONFIG_ARM_V7M in default-configs anymore. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Claudio Fontana --- default-configs/devices/arm-softmmu.mak | 11 ----------- hw/arm/Kconfig | 7 +++++++ target/arm/Kconfig | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devi= ces/arm-softmmu.mak index 175530595ce..0fc80d7d6df 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -1,28 +1,17 @@ # Default configuration for arm-softmmu =20 -# TODO: ARM_V7M is currently always required - make this more flexible! -CONFIG_ARM_V7M=3Dy - # CONFIG_PCI_DEVICES=3Dn # CONFIG_TEST_DEVICES=3Dn =20 CONFIG_ARM_VIRT=3Dy CONFIG_CUBIEBOARD=3Dy CONFIG_EXYNOS4=3Dy -CONFIG_HIGHBANK=3Dy -CONFIG_MUSCA=3Dy -CONFIG_STELLARIS=3Dy CONFIG_REALVIEW=3Dy CONFIG_VEXPRESS=3Dy CONFIG_ZYNQ=3Dy CONFIG_NPCM7XX=3Dy -CONFIG_NETDUINO2=3Dy -CONFIG_NETDUINOPLUS2=3Dy -CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_SABRELITE=3Dy -CONFIG_EMCRAFT_SF2=3Dy -CONFIG_MICROBIT=3Dy CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy CONFIG_ALLWINNER_H3=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 4baf1f97694..62f8b0d24e7 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -60,6 +60,7 @@ config EXYNOS4 =20 config HIGHBANK bool + default y if TCG && ARM select A9MPCORE select A15MPCORE select AHCI @@ -95,6 +96,7 @@ config MAINSTONE =20 config MUSCA bool + default y if TCG && ARM select ARMSSE select PL011 select PL031 @@ -115,10 +117,12 @@ config MUSICPAL =20 config NETDUINO2 bool + default y if TCG && ARM select STM32F205_SOC =20 config NETDUINOPLUS2 bool + default y if TCG && ARM select STM32F405_SOC =20 config NSERIES @@ -240,6 +244,7 @@ config SABRELITE =20 config STELLARIS bool + default y if TCG && ARM select ARM_V7M select CMSDK_APB_WATCHDOG select I2C @@ -443,6 +448,7 @@ config ASPEED_SOC =20 config MPS2 bool + default y if TCG && ARM select ARMSSE select LAN9118 select MPS2_FPGAIO @@ -496,6 +502,7 @@ config NRF51_SOC =20 config EMCRAFT_SF2 bool + default y if TCG && ARM select MSF2 select SSI_M25P80 =20 diff --git a/target/arm/Kconfig b/target/arm/Kconfig index 4dc96c46520..07a2fad7a2b 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -24,4 +24,5 @@ config ARM_V7R =20 config ARM_V7M bool + depends on TCG && ARM select PTIMER --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093871; cv=none; d=zohomail.com; s=zohoarc; b=AUkvEyc1Ybx34sxhg4um9QkVNOizxveagG2kHFHiqHbmmT2Q+q3fZUZe91S8aV31lj12s5UB6bwVqUt4W0+6CLvMJpx8j6OmLljm+vCKbqBAloEqNMuQcHg9/kWYHnkRTSh4I0QS+CETNkNKsxWVp8WSXf2cy/UYC9XVoVM/wVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093871; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9aLdl19C96C3GXRdvC9mwI7cbyJbYzl+Xi4/pdqV71I=; b=clw8V/3FTeQxq0/cBgFt4e3HQge/eZ6MQbAZ+m7sD5X9JWV9SOo3ARbWQkKm26BNLs4OC6adXzlf9tYrXrKUGlAHAFz1+AP4sOr76Abd04MbXpV+Se+I5L6l8qltnqUV4Yl24EKO5SRZU+zlJigqSIVFKkZKqMTaOglkMnpBByk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1612093871690901.2143257047376; Sun, 31 Jan 2021 03:51:11 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id u14so10751906wmq.4 for ; Sun, 31 Jan 2021 03:51:11 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id c62sm3325143wme.16.2021.01.31.03.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:51:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9aLdl19C96C3GXRdvC9mwI7cbyJbYzl+Xi4/pdqV71I=; b=sRiuwmALg9U8wrF+nK7mVUs+HXcy3GG/kZwoT3Ky0fRx9392Xk6PlerBKMECc3uHhq +yEZaCAi2myKtOwXsL10XN5dYu8Q4lK7UBTHJ3cMuwjgLxM9+XSiRL3YrTJPe0l8/a/u h+naApUI8PLoHdg3NlxtwFO6hG3iOnqc8AADrzk3ryeB4Xm5F4S0d8qwaf5oc8cZ5hAR YgxVZapFmkxXd0HX5bwBqbhZkgHKgaJzj/4J7yPtjueODMnIOooBfdV/qgcFB8zCxzv5 EUR/LB1cNPPQXtqQGokgkIe/EGWziL1d1OtZbsb2cxJwAnHXJ/H+ySW/Hl2kSIvnb2Es KUZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9aLdl19C96C3GXRdvC9mwI7cbyJbYzl+Xi4/pdqV71I=; b=cj2V4a+75h/6lKQyEpGNIz3idFig5iZJPA0rjYNQhTKH3fEyKBC6WOIoP9OaMVGlbc +3dZxgb5UUhstNsUg79hK6MBeFqLc5ZMAsXoxQOPiEMyKLoFlnuAHuEklHWIAJ0q7d+P tL3WjYBH2M3UYOFAceQcAE1p97c572RH/pJo5ZTT4OVQzwfWFB3rXkkk1YGyScTqruLv rmxv7KclzL+Sy6cQGYYTyBDeP/qyLUhjzi+XCv0B3GGAh7lc6F3oJ/GXFL4gdy7mjJus nM3UASakLrkLwcmZ+5OcHPApeAmPb/oVOTnvdg2gmESJ1C4XJBrVXLA3u9rfEFhxSVZY 4ufQ== X-Gm-Message-State: AOAM533bxsZSOzCM7vgAVFG6ky1vWVtrWQsLyrLOI9J5SBOS+INHBxLA gapspqu7Y1pijG/5pWIJ7qRrqlzArIQ= X-Google-Smtp-Source: ABdhPJwEOUHvqTzGHiWAoaq4Jn7Z8VpdizCzuGier0I9RK/FHNRiq3u4Ge8nQolOUjmT1NuInZpoKw== X-Received: by 2002:a05:600c:4f48:: with SMTP id m8mr1541406wmq.12.1612093869810; Sun, 31 Jan 2021 03:51:09 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 08/11] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M Date: Sun, 31 Jan 2021 12:50:19 +0100 Message-Id: <20210131115022.242570-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 --- Rewrite since v3, therefore removed Richard R-b tag. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 d080239863c..0bd0e51e498 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2281,12 +2281,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint3= 2_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 @@ -2392,13 +2386,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 secur= e) -{ - return false; -} #endif =20 /* Interface for defining coprocessor registers. diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 98544db2df3..3e1c9b40353 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) =20 +#ifndef CONFIG_USER_ONLY static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc =3D 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 */ =20 static void arm926_initfn(Object *obj) { @@ -666,9 +668,9 @@ static void arm_v7m_class_init(ObjectClass *oc, void *d= ata) acc->info =3D data; #ifndef CONFIG_USER_ONLY cc->do_interrupt =3D arm_v7m_cpu_do_interrupt; + cc->cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt; #endif =20 - cc->cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt; cc->gdb_core_xml_file =3D "arm-m-profile.xml"; } =20 diff --git a/target/arm/helper.c b/target/arm/helper.c index 47e266d7e64..fe3d0291f9c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12825,13 +12825,6 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) } } =20 -#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) { ARMMMUIdx idx; diff --git a/target/arm/m_helper-stub.c b/target/arm/m_helper-stub.c new file mode 100644 index 00000000000..6d751424e86 --- /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 15b936c1010..6c6081966cd 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -21,7 +21,6 @@ 'gdbstub.c', 'helper.c', 'iwmmxt_helper.c', - 'm_helper.c', 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', @@ -32,6 +31,9 @@ )) arm_ss.add(zlib) =20 +arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false:= files('m_helper-stub.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_fals= e: files('kvm-stub.c')) =20 arm_ss.add(when: 'TARGET_AARCH64', if_true: files( --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093877; cv=none; d=zohomail.com; s=zohoarc; b=kIjkVgwQ7FuMGvV+naKo1CvnMy3WXEjvy/hrH2BFb2zGV3zsoOEeIIqEkP9M0n85oS3jHjDSU7vZHPDfuV/+YWbCU4nUXFf/wycyMcqCOQ3mGHbNDXsD0kN2z62Pd7bkpPB3ptMzwvBwGpk60eshZBOANLzOdi1xAQFxeKIQsp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093877; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sHwmePAwBZnB/6MQG332p6aeurp1aOW9YUVHNzJgQQk=; b=R+FJBf5Klhui2PCOXZKXz+2WhgXId8eZooDyGij3igguZs9dh0BeOeceueM78xFwyMqQ4O9AKWZT4q/prqMsfHsoPR3DK2dTctCSwTVRH3VjWCWQ0pql2/a8QOk1u33ERlCovhk4grtZliqmmWbi8gqJuoulFBz1RRg3mxtgoOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1612093877035390.21901764537995; Sun, 31 Jan 2021 03:51:17 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id u14so10752020wmq.4 for ; Sun, 31 Jan 2021 03:51:16 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id r16sm1563538wrt.68.2021.01.31.03.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sHwmePAwBZnB/6MQG332p6aeurp1aOW9YUVHNzJgQQk=; b=gl98KYub5B29/tDooPia1xnr8+DmGiIx/UpfjZiG2dzed7ztMbOcE8dmG/zmD7gDo/ m3xjb2iOLwq4AAnp936pJB2UouZ3Pp0jvFX0EsfKlRJ2IQmdAGNbxE9BodCmgzqA3Ct0 TLXHEvox2NBLbAcOgZDzUhtVagwSvVh+EsbIlZWKE051QySQy3QpembGI0HzfLJ9puRy Xc9uTGEJSYwRLljm4PblNNWj8OU/kwtZNbNwvbfxiI6dFrNbjLw1T9pEqCv3Q5LxRi+F 3FtUQXdmzCR18IAHolP9KhcEobiw7hrsRc8eUqk1F42n4Xisy1QOrEZgC5TAU0cnF0oB 3m4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sHwmePAwBZnB/6MQG332p6aeurp1aOW9YUVHNzJgQQk=; b=DyRF8QEhTB/bmK8XPLLCDTM1Pz6Vfg0VBTkXtnSRkWPdDxi/P2T6Ow7IGla5RDh2bU V+u/wm4hQrQHiUw203V+Z4CorraGdq2jEpaiigymawDWLQ0z5nwLo2holcvp8v85cRzQ Qh1j/QT1FMfeAoQLUHdZsvgWaomdMtjm1+dauXjx/COTDjQHCZ1DwmEEp2AapoVI06qv HaDLPDl4p3dKMwUxvLAesSm6YyShDnK4wCpaUL4hzB9D4U4P0QdubCEnQahb58d3Iwln AnKl6D2EPhD6tEnjfHptDNLSpW9d+3+8SDueefg0LgZnfU6tQ1ZGKfrPBCH0ysi2dVvJ lP5A== X-Gm-Message-State: AOAM5339n1lhyQhGxE0+uCkbbU8gpm5u91Lu+a0357YrtLrCCcOBo+Ks jDzQ++AQ7MteZzqR9AG1axs= X-Google-Smtp-Source: ABdhPJy9DTxPrkq+mLcZ2GZAl5OyfPZtxNOXX4s39rpFzMKgY9kX7aWG61oNhcsR+ZIgBSBAHI6dug== X-Received: by 2002:a05:600c:210b:: with SMTP id u11mr11134979wml.16.1612093875310; Sun, 31 Jan 2021 03:51:15 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell Subject: [PATCH v6 09/11] target/arm: Reorder meson.build rules Date: Sun, 31 Jan 2021 12:50:20 +0100 Message-Id: <20210131115022.242570-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Philippe Mathieu-Daud=C3=A9 Reorder the rules to make this file easier to modify. No logical change introduced in this commit. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/meson.build | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 6c6081966cd..aac9a383a61 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -14,31 +14,36 @@ =20 arm_ss =3D ss.source_set() arm_ss.add(gen) +arm_ss.add(zlib) arm_ss.add(files( 'cpu.c', - 'crypto_helper.c', - 'debug_helper.c', 'gdbstub.c', 'helper.c', + 'vfp_helper.c', +)) + +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c', +)) + +arm_ss.add(files( + '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(zlib) - arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false:= files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) =20 arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_fals= e: files('kvm-stub.c')) =20 arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', - 'gdbstub64.c', 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c', --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612093882; cv=none; d=zohomail.com; s=zohoarc; b=aAEgh5JwhY3wteQAdqnTBRChyprFEEgXNE1teD79wtrlUdj5W+1jVPBGK3rnBBtBvBJbk0yrC6uzpsWzXQs210Xou8ZZdK3mqUGBzqQeMGJwkE7xw7nS0A/5VZz4Hr5T09pEqBjsWt1N3RenwiUL8h/3bSKGzyZ8QmMfvdyipAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093882; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Rd+PClqm9GCes/hSRY8Vwer9UM1+ZxmgnVmbkhC6bwQ=; b=AXIKKgxW1asRUpSxUNqB2w0YgBvDghUPk264snCzLYCD24NjIwKupd+SFYNcYUx3CyX3UWnAfWIioVS91iFRx62XaRWU3fMDmY3b6Q+QnNSpw0i00Pmf9BI1/Ye8sY0w2tq4td/FXYxZit4bF+/mf+XJWM92Fm89MZr4zVGOZzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1612093882706663.3432146642738; Sun, 31 Jan 2021 03:51:22 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id z6so13442647wrq.10 for ; Sun, 31 Jan 2021 03:51:22 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id h23sm17669371wmi.26.2021.01.31.03.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:51:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rd+PClqm9GCes/hSRY8Vwer9UM1+ZxmgnVmbkhC6bwQ=; b=slxe/n+gWVTJ0YqCL3Bn1rdJcLxnKsXS1n7WF9oDy93hJBrTu2I3a2iCbMx2QDDRf6 cvW4fsFH+RBNOH8Xizz/iAt4S26E5y/x/GNkhqNZmKoFK0IiYXFUyThdM4/jwqc/fgDh Y8sSf3tw+ovhP/bOMS00qPGcsrcwEr4MAVjaD4Adx0t14YzqI1NvnOJU9VgFgQeaG54O V+6f04a2Rwu6cmu95TNxszsXA3x1TBUu0rBat0w9gSOTxcp7PNPqNvAJyHXskdJMCaKx yFY9GcHTyxHSb+UJ+i+xVssw6kxrn3Nc/CZDLYpgrtE9kqvzklrUNMRkM1Y9GXFVF1zD r1Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Rd+PClqm9GCes/hSRY8Vwer9UM1+ZxmgnVmbkhC6bwQ=; b=KaMs74w4OXclAGznLkpR/4ZB2nwQVZS21O3EnieLacG5ADf4r7UXkuKrfIH28Mupe1 Nxn7Hz2/e7aMyhRKVh+NZNXw/v03AHJMwbB6LjF/HdiN2i2HY6VLMEGbB4QVjgxojA+4 omsSKlpQD9w5d8izz1A3Nv5pEkZwrro35I5sySAUXItx6wmOUd+6h9YNV8RFb4aUQskF P6l0DyD6hBH3PGKHQjp1a7lY7G0FrngtMBbysNwo6PiU3UHUYxnt2/6+i6z3DOMn+51s JOISZmApaWP4F2j9yE0pFvrlCluR/ns6nqS40m0B9tZzIdHnr0aat+xSNqbW3cEayx2f ifbQ== X-Gm-Message-State: AOAM532JextGDUjmBrkr4nmKr7+/S6rItx/TGoFZagNLrovd9prxDQpt EWAiI5DjQe0qhev+4sE0ktY= X-Google-Smtp-Source: ABdhPJyhH4FzLWznIwV2JMINXQ8Kq1HB+Q7Ewfh1h/EdNga37TZknXhQRMlYya4ZrjBKEH1uV/ip3A== X-Received: by 2002:a5d:6c6b:: with SMTP id r11mr13497246wrz.38.1612093880944; Sun, 31 Jan 2021 03:51:20 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell , Samuel Ortiz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 10/11] target/arm: Do not build TCG objects when TCG is off Date: Sun, 31 Jan 2021 12:50:21 +0100 Message-Id: <20210131115022.242570-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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 more than 2 years then finally rewritten] Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index aac9a383a61..11b7c0e18fe 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -27,7 +27,8 @@ 'gdbstub64.c', )) =20 -arm_ss.add(files( +arm_tcg_ss =3D ss.source_set() +arm_tcg_ss.add(files( 'crypto_helper.c', 'debug_helper.c', 'iwmmxt_helper.c', @@ -38,12 +39,12 @@ 'vec_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_fa= lse: files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) =20 arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_fals= e: files('kvm-stub.c')) =20 -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( +arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files( 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c', @@ -52,14 +53,16 @@ 'translate-sve.c', )) =20 +arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss) + arm_softmmu_ss =3D 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')) =20 target_arch +=3D {'arm': arm_ss} target_softmmu_arch +=3D {'arm': arm_softmmu_ss} --=20 2.26.2 From nobody Fri May 17 10:13:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1612093889; cv=none; d=zohomail.com; s=zohoarc; b=OJcGHlM0N+PbeTzNmYtZTBB/oDR8QWAATiMkqs1IeOuFVftMF5QHoUdOO7ruRfxOkolFrwtn/R7qFYuhJqvM1xdwdGRHn078P8SkQMwa4J8YXvyQInpnpSU9K1Tg0tte8n3ADoscacC2JCFhJ82W7q4H3NwohKDqKX1LBIFN2W0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612093889; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dDZADzgKI5lXuqqUK6CV2RYB4kAOXUW22/2lumwj8o4=; b=FzqEFImTDX15W+P6iWx2jc51BSqLUEwymCygJWRfDDsCfaCYYxceMwzbXssrcqkAI/7mh66RKNT95TsMxjIw/4wY3KQ0LUslQ23PRfxPfC+UGpn2XvIlm88tUjurHwD/p6708UbSWbRmlWH+d6j5oWv/oRFQxCCW+/XX0molkAU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1612093889021364.7620361586937; Sun, 31 Jan 2021 03:51:29 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id e15so10756131wme.0 for ; Sun, 31 Jan 2021 03:51:27 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id n19sm17298998wmq.25.2021.01.31.03.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dDZADzgKI5lXuqqUK6CV2RYB4kAOXUW22/2lumwj8o4=; b=GPA3cPX5JqpAFpzVcjZKg1cO1/9FihznwxhN41y6BZVikFsYSNE6B0F3b9X4VO71cp GyaFWx06W4d8AT7wOOpbEv7rWLR6Qtiz0j5zPdW4jmA03AE7iBWAl+qefDWnlBg1V4z9 2hzf0FUOYthAF2ms02+vvuipScW5aEoQfhM5Srd93RmxYebfiQUiVZHh2JesAfrjbQB0 cMFWV7UC3rXS0EBZiWNOOLMzmTv768bnbQkOi/XMIRHsBx16z36CUzwuUgCR8NuoQrgW IawFdKNFLz9n71Y6SFOU0j45CXgLpwvg9ZqphDDITLGf2fxUdnKHiy3pt17p/Z2oEROU U1cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dDZADzgKI5lXuqqUK6CV2RYB4kAOXUW22/2lumwj8o4=; b=C63rXAW3Oug9fyujneKdDt0DKUUi92ZfW3xP6VR53nNHoiLIii8Hzl//dA9XNpbl1J fQTGqTReq1cynqmav7Hxc2x22ccpwpYDaqOg7aAwFim8pCJOSKMsslcR1lg0qpFRvJyi Ytv/p0RPhqX24xXroCscK1K2pJKwEvtI+1Crmi+peYYtwkx7fn7RQe+8FWzs3ai/iu1+ VLJ04BsubcL0qX5dkBBtIq0urXZUtEvU9rIxpo0wrSd+JmZPswUNj+6r+jJZ8/QUg618 grmJnzM+z14seIHNtgpiPVbU5v06CD53odmvN4vO5yflDa+lzSpD4O2SCiqwGl6wpCZI f6PA== X-Gm-Message-State: AOAM531fcENUKoM0zBlAEQTlzHR7fmwNK5MWlkhz69h/4EoHDSRHtjGV RdH2gdhUOk6UZUONkcescHE= X-Google-Smtp-Source: ABdhPJw2bZG4ateZlH907WN0fRnTRmRpW0onowzIJAbKbCMmlTsxOnsYabaEy2SQ4dqJh8Bjumsguw== X-Received: by 2002:a1c:6289:: with SMTP id w131mr2722637wmb.0.1612093886306; Sun, 31 Jan 2021 03:51:26 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fam Zheng , Claudio Fontana , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, Laurent Vivier , qemu-arm@nongnu.org, Richard Henderson , John Snow , Peter Maydell Subject: [PATCH v6 11/11] .travis.yml: Add a KVM-only Aarch64 job Date: Sun, 31 Jan 2021 12:50:22 +0100 Message-Id: <20210131115022.242570-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131115022.242570-1-f4bug@amsat.org> References: <20210131115022.242570-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 --- Job ran for 7 min 30 sec https://travis-ci.org/github/philmd/qemu/jobs/731428859 --- .travis.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5f1dea873ec..4f1d662b5fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -264,6 +264,38 @@ jobs: - CONFIG=3D"--disable-containers --target-list=3D${MAIN_SOFTMMU_TA= RGETS}" - UNRELIABLE=3Dtrue =20 + - name: "[aarch64] GCC (disable-tcg)" + arch: arm64 + dist: focal + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libgtk-3-dev + - libiscsi-dev + - liblttng-ust-dev + - libncurses5-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libsdl2-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + - ninja-build + env: + - CONFIG=3D"--disable-containers --disable-tcg --enable-kvm --disa= ble-xen --disable-tools --disable-docs" + - TEST_CMD=3D"make check-unit" + - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-aarch64" + - name: "[ppc64] GCC check-tcg" arch: ppc64le dist: focal --=20 2.26.2