From patchwork Tue Mar 18 04:51:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020310 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 62B24C28B2F for ; Tue, 18 Mar 2025 04:54:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOvn-0001KQ-Mt; Tue, 18 Mar 2025 00:51:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvX-0001EN-Fd for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvQ-0008S1-FL for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:38 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-223fb0f619dso85478595ad.1 for ; Mon, 17 Mar 2025 21:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273494; x=1742878294; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qcqbwr1tVieUFzv+VyvLW43sytu+qG57UDVEiNckHsM=; b=gGMR0+ebnWltOhA42UyQrGS+6d3lbdI4swqqOnbN5qPlGIY2bNJIP20MaBXOdi7/cx fVUgSvo4JS3wAzCodrdmcZlF1wyV9BczRIzgNnF8yE4zOafYdKFHkwABew/5kZPuCSGy 2Bpny+Xz2SnS0He85DsXjaqra1+ITm8bmHTd46aOA4u91LXUhKxfqpsNDuq79DB33Kzy sdrOMp7PDU1iJg558vc7QQoWeroAnOAv/jnaheSmUeOabhEdoB+4EcmEw/DFUeIC/PRH NetPUIIxOBb7qQmgZGjxGxIMVIjwOML9hDbXI0ehN9uTC8TNa5ApD2Do3yGa+AF4nd2i CiDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273494; x=1742878294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qcqbwr1tVieUFzv+VyvLW43sytu+qG57UDVEiNckHsM=; b=opnxorsD3+ofwx3VU/TebytGV3LV9J8ybuePP2oFAtyw5W7+K4DHZS39khaqHEx8y0 sVFJQzu4CgJ3CkXDxqnCiZcxueA4S/wyonVbRvwo5LutVhhsiIloCyNGEah4UaIBmTuQ yFdSyRmCEUkquNBYH/Vw+9D7HjKZRXzG4ayI8o3aW/sMM9yyzHPyWMQ7QhhH4YhwcdZV QDXjVqm6o+iZ09EvpG2slrdBqsr72wkS1I/MWK/EHb3IHsWth+e8oVN19ibN3ooCPS4o ddpv9RtYNtZ/3zgSLLufc4U7QfjonHb5x7aySCRhP2C7GrbQnDtPRDXtFNnKpp14DsaZ c+BQ== X-Gm-Message-State: AOJu0Yynfhs1r+5Y8VldBFyYcmuMNa9DA5zqzkkCkNGJn503ODMKqjjM U9dOrAfB6db7HagptMmkmyT3aJXYMsRncyrulY+9EMUINIw/GTMwMk12LmB4TYwZ2mY9s5lzhrB R X-Gm-Gg: ASbGncvsMkSeq+BxThZ4Qj4i/BdJm6Qo3jNOwapFLVG0byZtwSwS9m7wNccevyQim90 S6RoHR1knXcpCTU69B+90JmDHVrWsFRmuYvbUSb0GsxztK2Fq2+AfdlvkXrgXgYWYO0slMjZzf0 x9BmtVmzbjYs/mpUsYFgDYKdWDAHlDYjLtNetToX05/w+mad6BenP3J337F+i7cSg4IWfNbP0l0 1cqdSLbe6ilemBEYXYtjpsEbyDXwwL6PTFgKj5D8F97DrB5ZILryz2wonIIQflEVOv40rPidIpc QlIec+UfQ+9w/6wVJqu+JKBk2PMP/G2cafG7ga8osqqu X-Google-Smtp-Source: AGHT+IFfMoeTTqls6zY+hsXszh3yHhLtBiG+rzEGqdr9nPsWVicrdsS6kI4KP9BQloEuNsUFe9nCuw== X-Received: by 2002:a05:6a20:d81b:b0:1f5:6c94:2cce with SMTP id adf61e73a8af0-1f5c12cd664mr22674037637.30.1742273494052; Mon, 17 Mar 2025 21:51:34 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:33 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 01/13] exec/cpu-all: restrict BSWAP_NEEDED to target specific code Date: Mon, 17 Mar 2025 21:51:13 -0700 Message-Id: <20250318045125.759259-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This identifier is already poisoned, so it can't be used from common code anyway. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/cpu-all.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 902ca1f3c7b..6dd71eb0de9 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -34,8 +34,10 @@ * TARGET_BIG_ENDIAN : same for the target cpu */ -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN -#define BSWAP_NEEDED +#ifdef COMPILING_PER_TARGET +# if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN +# define BSWAP_NEEDED +# endif #endif /* page related stuff */ From patchwork Tue Mar 18 04:51:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020311 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 18C5EC28B2F for ; Tue, 18 Mar 2025 04:54:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOvn-0001KM-09; Tue, 18 Mar 2025 00:51:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvX-0001EI-F0 for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvQ-0008SE-Kb for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:38 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2260c915749so26439885ad.3 for ; Mon, 17 Mar 2025 21:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273495; x=1742878295; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OAWROUlIn7auIWdaE5em6TVb2NvztQjiLgpJIDrbZCE=; b=tC7kvACuBzOb6zdQLhUeb3hNmPw7OzjgLXV8kkqp7imQj1DFAOcIqQwGFWRV7f5+/4 s0UA2RAbQAXPwBcU99sfd0+Sr67/k0NIfG7QbAHmBAL6HPxE6M7amwppbvP7+ehONxwp Q7c4TQ71UIfZU32nnXildIOoCoyCuvQw1pUKC4AYY6xJsFPmhNrP/zON/DR36aoAQK9A PZbW3LJjS4VRPfDER+DqD1KXGr5ej6Twe6d33thPqYuVRZiR+mmNo6c7j3KD+pCAWrvE GCc8feTPb4v5BYozzb5e0ToATbFYX5rUXtDtp/+g4yxfSXJ2+2kG0DH7H91EcG6UnjHU pxPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273495; x=1742878295; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OAWROUlIn7auIWdaE5em6TVb2NvztQjiLgpJIDrbZCE=; b=ZFwNkHHvJQWK0QZMrAKMnuUCF+MhssGI3y9Dwh/+XIGJg2th0MTiKKbS0bfoLtjiYm 4g2GeAJ8lcClU8RJ5o3VYDB9uj5cMU2FWw5iGrMwj3pGffeE7RaExxYMK5NYedoX+6PF PEk6dCQorjP50DgN3/AAQ1v13ixDh3j5wnwsbO1nvYDvdyz1aIIzUWIHF2Jm0xFTbilr 1E3FndDmM7Kk4pj0ou3QYpYRychnF++erP/M/cOBZqPOFD0CPFD4MgId3Wbge8ezJZHf 5mRi3KuJeMqj5M57mBPEXi2cfeiDeIz8rCTR9ObtVjYEGOE0Fdw3NWgMNuUHVMwkcG4x qolA== X-Gm-Message-State: AOJu0YwS+IPO3Rbkd/hUX+UYnUS5dank9a+lUDZ7RZarlHDTAD58uSAS diXqo7y1I7bps61ksN3f35whwFRtrjoJAlWKHvvW15XZqnTV93hp4bZbBJolx5GTzu3ro7UkxNR 2 X-Gm-Gg: ASbGncvf+tmR21Jf742fSP5VwIFNHRZRizYFFL1YBykGX7Afhnfs8zMCM3xiQ5y0Gnw 7CIES/Ftad+1ycKm5bHbCjcbYSgzUJQfjG/b6Wb8MtWSElOQtty7Gq0KsV7H0ros1rilxY39zJ9 OMVN0zJmluTlCtAONABpxs4//5RrZt6XZFZDgcNecjpEzd9YcVg0Actw2PLY8jxU/2nSH8bIMv0 yqH+1yMKn2YEP8PkJLDkMX++6tbNoeO1t4XuJ5/u1ItgKA2uTihGS1okWLPnT/fFjgMC0ufpcxi 2/J2k3gHje4qUQoX+3y5kmxQK9EH4zAiwsWZaC2Alch2 X-Google-Smtp-Source: AGHT+IEt46y/1QHMt9sgoOzblTQOO/Vh992GC9mrguK0N9zijMCVTkkxREI+0zrgLP1cwHkaSo90Bw== X-Received: by 2002:a05:6a00:b95:b0:736:3d7c:2368 with SMTP id d2e1a72fcca58-73722353269mr17764448b3a.7.1742273495053; Mon, 17 Mar 2025 21:51:35 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:34 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 02/13] exec/cpu-all: restrict compile time assert to target specific code Date: Mon, 17 Mar 2025 21:51:14 -0700 Message-Id: <20250318045125.759259-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org TLB_FLAGS defines are based on TARGET_PAGE_BITS_MIN, which is defined for every target. In the next commit, we'll introduce a non-static define for TARGET_PAGE_BITS_MIN in common code, thus, we can't check this at compile time, except in target specific code. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 6dd71eb0de9..7c6c47c43ed 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -112,8 +112,10 @@ static inline int cpu_mmu_index(CPUState *cs, bool ifetch) #define TLB_SLOW_FLAGS_MASK (TLB_BSWAP | TLB_WATCHPOINT | TLB_CHECK_ALIGNED) +#ifdef COMPILING_PER_TARGET /* The two sets of flags must not overlap. */ QEMU_BUILD_BUG_ON(TLB_FLAGS_MASK & TLB_SLOW_FLAGS_MASK); +#endif #endif /* !CONFIG_USER_ONLY */ From patchwork Tue Mar 18 04:51:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020316 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 0D1E1C28B2F for ; Tue, 18 Mar 2025 04:56:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOw8-0001OG-CQ; Tue, 18 Mar 2025 00:52:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvX-0001EL-F2 for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:49 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvR-0008SO-BH for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:38 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-225df540edcso68625445ad.0 for ; Mon, 17 Mar 2025 21:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273496; x=1742878296; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7b7Pa/XivG7M4hjK9jqso2S4d+dz1DGry6GtvIR3C8c=; b=KWZbl+v7Bs/kss0BYGp6DXqxgf2RJV2wxi9kkOrpEQ4/t+mB7aB3Fd82FqUYy/0aOt X+ZkuQvkFLZnUma6qXQ3vTBqYIwO5b7DX83s5GYkvJRGKQtZlzzEvOULbRslc65KID0h PXKUTlFL1UEzo3fpx86FC2E2FgWCZuJCjVdNKK0b9YbZXx/wHq9tcTkQ52VflqoYVnt5 O2RMXhHTxlTSKqa6QCvmEEzCQOlqSCDM7GpBnPMzcQqbpl3megIZ7rBEt1tr3Q4TBCO1 w3vMG3TnRLbyIkACaWl+PjUmxaxbC2Up7VAyLOyHErN7AWrKOHVUMEq52P2pRp9xsgoh L1TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273496; x=1742878296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7b7Pa/XivG7M4hjK9jqso2S4d+dz1DGry6GtvIR3C8c=; b=itPb2+9GxXQdmHousakXWIjthjifi5U7pFipvC+NexocbNZGOqImcJdkPrnAJIRqes iTCR5ezpmmgJxTp9B8D6h7ZTq73g8IVkea7M8WuwGdJTZiw3haCFZO+vhCcrSnW5CPT+ 1Ua3IYsvLhLtbzr88k5IIc9j7+W6k9zcHzvxvkw/Pm2V2p8FhC++BEveTt4OlDkemV8d nw9LPoSScpMFUy2LuN3xAU0J6K4J9Gp6lGGqoEXKCIX6Krk7KXDoblCnmX4wK4VkqFj1 lKQsQ3NYI3mb6nOePNQCVg/2WV0FTxc+w7cvHg8bJH2/h4S9epMpmAZO6NkZbd1riJ+o uDzQ== X-Gm-Message-State: AOJu0YyC8SOLRdZifuGXzxa79YGduBY2uy8ObU2wFibSRyUdEaF51FjH Hl6kSYchJ/yLj8x2qu6ON+wsZIUv5/GCp+9pcHSegkV3njjA0lVZXCYc/rZvLP2UcQcoVyhAa4D m X-Gm-Gg: ASbGncsenhJXuYxdL24zlAbMMq4Wz5c/bmRIbB77xmeCledN0CHfzuH2ISd64IkMojD CM0Rr2iUspL8Rw6AAyTiRnauPfj4dkuQFpmCEfAMBJKGzA9lY8BPSANGUrcczns6MofVawGqEr+ +9QyvlBAJ1oSc700c8ZVuXhQCSx35totQejpMzOOMl0l4kbH7JRfUbhE2l7bFmoY6XpgIPZHbRG Qpdf1EoJIT91ls0G2kCXF6oGYXYSUnn40CVuVLx8S3xBiCttNjXB0OJJHmY8BZ/QB56Y0qQMnee lBN0zOsfkMyxh1EFP3cs5JCol0vJ1kP6TwaViJq/qDLU X-Google-Smtp-Source: AGHT+IGfy+Qdd4zIdkaKpSIgsiwDKH+mdyBXjzWe2NY8Kt3gZWsIWhQbMwLpqie8RWdAjPyywqbjZw== X-Received: by 2002:a05:6a21:1f8d:b0:1ee:b5f4:b1d7 with SMTP id adf61e73a8af0-1fa4f9540cbmr3123721637.7.1742273495989; Mon, 17 Mar 2025 21:51:35 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:35 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 03/13] exec/target_page: runtime defintion for TARGET_PAGE_BITS_MIN Date: Mon, 17 Mar 2025 21:51:15 -0700 Message-Id: <20250318045125.759259-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org We introduce later a mechanism to skip cpu definitions inclusion, so we can detect it here, and call the correct runtime function instead. Signed-off-by: Pierrick Bouvier --- include/exec/target_page.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/exec/target_page.h b/include/exec/target_page.h index 8e89e5cbe6f..aeddb25c743 100644 --- a/include/exec/target_page.h +++ b/include/exec/target_page.h @@ -40,6 +40,9 @@ extern const TargetPageBits target_page; # define TARGET_PAGE_MASK ((TARGET_PAGE_TYPE)target_page.mask) # endif # define TARGET_PAGE_SIZE (-(int)TARGET_PAGE_MASK) +# ifndef TARGET_PAGE_BITS_MIN +# define TARGET_PAGE_BITS_MIN qemu_target_page_bits_min() +# endif #else # define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS # define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS) From patchwork Tue Mar 18 04:51:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020305 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1D238C3DA4A for ; Tue, 18 Mar 2025 04:52:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOvw-0001LZ-DY; Tue, 18 Mar 2025 00:52:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvX-0001EM-Fb for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvS-0008Sj-EC for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:41 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-22423adf751so86808835ad.2 for ; Mon, 17 Mar 2025 21:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273497; x=1742878297; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vWIezDEnsVaTp50avzaVFN+/54kZx3DW446tGxF6xYk=; b=bURNFUCFanUVdGsPAdZtuPijDBHLWkSZIaA/GDC04doZz+tfv+QLBKMXPpMNn6ELij kBvDEa42DyXc1fAY2zsIH5zYS8tCcbqseeQm8rch0Gb1XIYUciLiaSKPeoCc/i76uqIW wCNIZobD5j9dc30kvsL92662NGolcYRykOB1pdq3PLj2+YK99zhuv7uwUrSDvDJ2nS7w VPw9yiu9TVKRQfjiw6PN7xOb529dudC+G1ExbOZ4nM7Mjoo+fgBHHpO9h6ukocYh2nMI OT63y9sDQKyhpbouKRyqDYSfesejsyOIQYgwirnmegUdt3le6LZk55HKKXakXm44hxcX WfHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273497; x=1742878297; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vWIezDEnsVaTp50avzaVFN+/54kZx3DW446tGxF6xYk=; b=ZPFVoD/G0y7UM4FIFAdxysqplsIYmd2gmbygY00yHSa4GplSvBKUuHjcwJqBoa7pWX GH8f9yR5r2pf6sDT9BsMaDkaYDtjh1FwencYZWKU7Kw1fK32fZ10nWuAOjzDWbArEV/7 9nc3RjdSM1AiCklD6Qd/aoyPPo7RkltX0iG9tR4Ck5UFPEg7Uc31g40PtkNQgm4fwon5 ysEWsrqbvmyXH/qQEm4AQ3rZyPuthIKkgy5X3H43Z1XzxqmsT8gjbhxDQpAqCg7kDU7d RhYjrZCp9Oh8Lo7IKb1Q3QRv+aCX7dIcC9ur9kdotfktzW8CbRhVQVA9fRIVQ8UEJHAu x9vA== X-Gm-Message-State: AOJu0Yy5Sib0Xzcim6o1YPmdT+IR1ldUvNfNp8wjnsMGH3KbZCtHWtX/ JZFGZC5d1iE+rwwooAI3CetE1i6TEC026TU3yA9X/qtSvWMcWtUAObjQuznyU7smYPWM2ZpkwPk / X-Gm-Gg: ASbGncv+UVKeXBj3PwxCmgja5nOC6IMRbf4ANSkEtYOONzwwSaH/MWmpQ9aONaLggFh yxzf84WWroFOcxtBrUYTS03TCYsLdM2a0wWzGqZO1LU5EGf/dEZ3Xg5ruB/DvDoZaE6+91GSHO1 XKuSxRolneas6vAAto4V6hAQXYQxW3LrJy96nEgihriaBgTbrGZiBsBLh84deIKch/ldEOSFWID uZ0CBuBMl6+NguH/68KC5JoUQSOG4hNkmdEtsmk/ezYlHcOxAkUy/Ycn0moNiSMLdnG0q+c32vj IvNGrEGriW0xoKNdRSJVjM8BJaSV86QRYTCer4vw8bYj X-Google-Smtp-Source: AGHT+IGfVS9r67mKi+C/QhYaIcplE7qOFrPBNlW784RCUzNr+6ZfRfHv2pwT7sOIOfbETdELQgrdAg== X-Received: by 2002:a05:6a00:3cc1:b0:736:ab1d:83c4 with SMTP id d2e1a72fcca58-737222535c1mr17970185b3a.0.1742273496888; Mon, 17 Mar 2025 21:51:36 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:36 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 04/13] exec/cpu-all: allow to include specific cpu Date: Mon, 17 Mar 2025 21:51:16 -0700 Message-Id: <20250318045125.759259-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Including "cpu.h" from code that is not compiled per target is ambiguous by definition. Thus we introduce a conditional include, to allow every architecture to set this, to point to the correct definition. hw/X or target/X will now include directly "target/X/cpu.h", and "target/X/cpu.h" will define CPU_INCLUDE to itself. We already do this change for arm cpu as part of this commit. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 4 ++++ target/arm/cpu.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 7c6c47c43ed..1a756c0cfb3 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -46,7 +46,11 @@ CPUArchState *cpu_copy(CPUArchState *env); +#ifdef CPU_INCLUDE +#include CPU_INCLUDE +#else #include "cpu.h" +#endif #ifdef CONFIG_USER_ONLY diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a8177c6c2e8..7aeb012428c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -31,6 +31,8 @@ #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" +#define CPU_INCLUDE "target/arm/cpu.h" + #ifdef TARGET_AARCH64 #define KVM_HAVE_MCE_INJECTION 1 #endif From patchwork Tue Mar 18 04:51:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020307 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9CB8BC282EC for ; Tue, 18 Mar 2025 04:53:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOwS-0001XO-QL; Tue, 18 Mar 2025 00:52:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvY-0001EX-Qt for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvV-0008T9-8y for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:44 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22359001f1aso50939575ad.3 for ; Mon, 17 Mar 2025 21:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273498; x=1742878298; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OcGAZaWPVIysHTdBCRYBHO7NUCxy0k+KHYN46Zgiu4k=; b=svl+vludRYMhf6J+uegtqj6L20Ass6bCQXR0fCmRQS6PU+lZnx3CKXEiYoaK4WC9i9 vxeaUPMZjkMSArQb3+QAidL1D6NRvGJXOSHN7goKYMUmnkfh8ULP1RB/n0kGUwh2Oljo bToRhLwqc59ajv5CtMDQApN12Azhb7eM4woSygzrIR0eehHeumKxJGffKW4RmSlDQpIE yH5iUt5EBy3lfLUO0q48Lb/CdMrDfAc4Q6f3UJPGvsl2WOHsUaDTZlE390871686qVUV ByXVNdceScwa6kn/9gIJWk1BEPuL7hYdFqYfAK7r68z1em3qezQuQT3vcpKJoIk9X09O IMsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273498; x=1742878298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OcGAZaWPVIysHTdBCRYBHO7NUCxy0k+KHYN46Zgiu4k=; b=YnuHAWQuYl1Dp5RSX4swMvFiDeVvwqdJdxi2+NlMLFN2dTzBy4FiXdKCwXygRkOXDr 5diy1CFWn4Nxm1F5yavXftIWfL5nC9H1pfEGv6P7QU2zctc819fq4Sokeo1OAS3rmQhC oO4T/Pdp4cawWL/eSrArt8HBO4FznEXO2L/EGCHGB08Glz1eeGIJu1Q7Dmw82BAhKrtN qi1t/qupm7xSffjqykTDG5sYzZqU399DjNrnboqTo+S0Zge6E8mTR+4FAI7ACeCK4/oM cKPWlW6G5E2xMkUgWPFaTuiFsIbdfGLG755H2BHhzq4z3Amwsaw2CIcjBh02/MJvuoAj JDOQ== X-Gm-Message-State: AOJu0YyY6tScicFMEVrgsIZ22E1b1GEqsYbp6wxAlOcaRI+laz5JQP5p i254ZdBnRFbpcVQ1/qk+RNdFl2oTRzkWgCRRXoHnnSGbEpGibf7o8hnThVRdhwhPDgltwVyLER/ e X-Gm-Gg: ASbGncsixLXxz1Q+9j4+J8e+fDJh3dDKGcEnwUEm1RJABfvHMtkh0LHR6hwUIlvgswc xRV2GMG/eoHJIFWh/FAasuQflVKlZHtLIUOxqtToR8piNc5b0LqcZc92y8n9gYJkyadufufTmNE DHtVr18oWaPrUfhJBL1gybT2thpoLXrWm40iJb/ZjycqOlSx3RQRGM8BswqZJMfvE/vMbrqPwds 4qTHawv5AzDynQ5csWhJvYMlycHAfwvTST/vspRi6hvPAOxJ6r/7jZVPlpFUG+0FX0NJBACaUNG 4EVDOWx67sLdES5mvRSSRB4Y95O8h3bUyuB13ihgrp2j X-Google-Smtp-Source: AGHT+IGd5D4o5uKL9Q2v7Y3e6Bm9G+stqVZhHdXsULQqp3gKY9DtvnzsLjdYrwnF2yMZJulAsCZvKw== X-Received: by 2002:a05:6a00:1954:b0:736:fff2:99b with SMTP id d2e1a72fcca58-737572df1b9mr2862896b3a.23.1742273497827; Mon, 17 Mar 2025 21:51:37 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:37 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 05/13] target/arm/cpu: move KVM_HAVE_MCE_INJECTION to kvm-all.c file directly Date: Mon, 17 Mar 2025 21:51:17 -0700 Message-Id: <20250318045125.759259-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This define is used only in accel/kvm/kvm-all.c, so we push directly the definition there. Add more visibility to kvm_arch_on_sigbus_vcpu() to allow removing this define from any header. The only other architecture defining KVM_HAVE_MCE_INJECTION is i386, which we can cleanup later. Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 2 -- target/arm/cpu.h | 4 ---- accel/kvm/kvm-all.c | 4 ++++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index 716c7dcdf6b..b690dda1370 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -392,9 +392,7 @@ bool kvm_vcpu_id_is_valid(int vcpu_id); /* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ unsigned long kvm_arch_vcpu_id(CPUState *cpu); -#ifdef KVM_HAVE_MCE_INJECTION void kvm_arch_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); -#endif void kvm_arch_init_irq_routing(KVMState *s); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 7aeb012428c..23c2293f7d1 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -33,10 +33,6 @@ #define CPU_INCLUDE "target/arm/cpu.h" -#ifdef TARGET_AARCH64 -#define KVM_HAVE_MCE_INJECTION 1 -#endif - #define EXCP_UDEF 1 /* undefined instruction */ #define EXCP_SWI 2 /* software interrupt */ #define EXCP_PREFETCH_ABORT 3 diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f89568bfa39..28de3990699 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -13,6 +13,10 @@ * */ +#ifdef TARGET_AARCH64 +#define KVM_HAVE_MCE_INJECTION 1 +#endif + #include "qemu/osdep.h" #include #include From patchwork Tue Mar 18 04:51:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020314 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E4D61C282EC for ; Tue, 18 Mar 2025 04:56:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOx3-0001xo-TN; Tue, 18 Mar 2025 00:53:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvb-0001Es-9t for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvX-0008TT-6A for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:46 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-225477548e1so89195245ad.0 for ; Mon, 17 Mar 2025 21:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273499; x=1742878299; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FSHS1XcppE5ZPP6nkhpeNl/9mIWtetza6WviZOkY9i8=; b=X9VkslHAv5ETXYPuKPXk/N2vU7upsoRkNAoC9EykVv44DanNuOHy8NwG9ukf+JMC3f dVxlSoVrlelk/s2AUrP0ATbz9FspP+WPdSaAOSu/B393myIuYZS8/r57/UoDSaSnBSGg QIAmR7tUpUpvIu2rOFwiT9y7bLZiloPTIc2FhnVwWvyhDJq++SBiRj8vthmUI4TTQDXI GwZH40wkxT0V5+w/oZx9MgBNIXMwiywvYZbBs4Q0AAFRivLgo1ubxaffMk0geKVefVWR hzzETPrEzDr7607lPnyHFh2lFGOCzQiUnofjN3COtPhR3InIOqCRdocKo+nII/FM4MHJ J9JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273499; x=1742878299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FSHS1XcppE5ZPP6nkhpeNl/9mIWtetza6WviZOkY9i8=; b=nWBvMGMaOcJn4hnEzHgi9F+vlvFWNBfCRr1P7jKBZEGcnRQgHoWbHyjcsRbkbJr5aM 6uKt9w5OrT4L/S7btTHFS0Gd/PcxQeMvHzzIMeFo9wgIMIqJfM92vK+AYTutGN79tKiY EWWnZYSuRlS1fd6cfC+NkJuB7fAm0KdjwMCT8Zt4SJoV1jh+BfaASrSfsguH96fgJ296 Ge1brwPX1K0kW8SVZOM07NiFXKv4LMRKzlzYBbXKGtB6IMPNGKMOf1gP86FMylb3rr8I L+gGVFpHB8figecWEEn/JfJw+0z1ihidrYpgZzqoDc+dmWb+22MbyPltFld2mUVSqQ5v lViA== X-Gm-Message-State: AOJu0Yy3OD+wQZIYf9pk94MKmm3kh7bArz8Lz/ssOORZEFPj6TYGJabe 6nbpCrAAy8yaKOUyaFvjMay/K7HdzA7SLXEagaD02wDegIYcFkrdpnHL6xreVLpDeUr9eu3qKa3 r X-Gm-Gg: ASbGncunEg2STYc6brwSx3lGGMzgcEWXv+f640hmoKGw4dWjxFXnWX0K/Pwb4ffEuJj wnL6mHsqxa86w7UoOin/IvtpRkAwygj1fJEEqRErhx4tCaxkRQF4DIn/Kxi6ypwGouw2Bgphttt 92un5SURyMKdQ8xG6VA7wCdoGiAnyZZfsj3QKQjXP2Yxihox/KwFgkXGEPvZPAP6hIeyTUGFVxp ZVlstp0e095ryp8jWzTYD3VGc1c2L49EH4GYfbsVg7Rqn8o20BghdhdXJrwiqDrpeQBvodNWC3I LBRWyAA4IxeqnCsMAfzTrOKZ15KpEsbBiPATH2spB1+k X-Google-Smtp-Source: AGHT+IGLHGqHmqYs4ezZCOm2c2SvTDjQRRs33WUEidalhqMBp81xlxxvFOnPgr1sAs0uuf26mtAqeA== X-Received: by 2002:a05:6a00:4649:b0:728:e2cc:bfd6 with SMTP id d2e1a72fcca58-7372240beeemr19161977b3a.18.1742273498760; Mon, 17 Mar 2025 21:51:38 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:38 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 06/13] exec/poison: KVM_HAVE_MCE_INJECTION can now be poisoned Date: Mon, 17 Mar 2025 21:51:18 -0700 Message-Id: <20250318045125.759259-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org We prevent common code to use this define by mistake. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/poison.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/exec/poison.h b/include/exec/poison.h index 8ed04b31083..816f6f99d16 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -67,4 +67,6 @@ #pragma GCC poison CONFIG_WHPX #pragma GCC poison CONFIG_XEN +#pragma GCC poison KVM_HAVE_MCE_INJECTION + #endif From patchwork Tue Mar 18 04:51:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020308 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8939EC282EC for ; Tue, 18 Mar 2025 04:54:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOwC-0001Qk-8n; Tue, 18 Mar 2025 00:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOva-0001Eg-4V for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvX-0008Th-6X for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:45 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-225d66a4839so63038515ad.1 for ; Mon, 17 Mar 2025 21:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273499; x=1742878299; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e9rzsv10o1w5kRlHax2UvpGLKsY+tUQFsRxZLLJXZ6E=; b=T9LDWFP0m+waAvOvPnfYP7tda+Xc+aaB2kQol4e1g72X/wyZftJGxZKXhVc0cx7015 w8p9J39E/M/Z3eF5CUG39Hc9+PWMdC4vbkuNQe/YlxkwVaaef9kzjyxTZ/KrHnTwoHXR tucZVKdFervPRHxd+63129XXWnvNWW3VgIQ2zKsSXs17iapNWizxxL2KGKUOcEyYZxF8 Xo1GBtSlxIaOezwIT+NMP2nmA8lKNdlzPqNGodSfFhTQTfVOIaLyZDywUcdLm1VU7Ngv rMiBwzmGxz2qBM5Xf4DUplywv9yixQdWbljNvdN3GRE00QOTVwV2ESjIJFPtRRSe15A7 0iIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273499; x=1742878299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e9rzsv10o1w5kRlHax2UvpGLKsY+tUQFsRxZLLJXZ6E=; b=Hz13L5mK8kxPyhpa+YFfPZ1YqIfpOsLngHJmxWbV4fwdYwiGVYNfLZzHy7Q/BwcaCi rrrQmih5C1277X3p0C4Runlb/UDjb9W9Gb+Gj9jsahAAUG3FyXhrpHBwl3bwb2PYI/xG it3zD37+cssK8n/v7IdzvFkeO26p5p4iJ9fk6aNLV2vBskO3v2tr3EoN2fpfQcrSPIcY H9HoGYyUIteSWz1NO/RC6rXD9yWfmuQJcrPfrZ/4+43WwazrGjkLSLYfR6dS1/hEc0jY gSiMizo2X7py/UYXla86SpNYJWZKzrC73DuIVuwbysN5P9W1Uwz95DJiEW3ZBIINqNJS xyrQ== X-Gm-Message-State: AOJu0YxnJO8RrPZU9CUNmVBcEhEpIX3GkyPzCX4P79Qcx2pKfhjXFClL oDgosv7iJ6nQbJ8SvddA5fHQh7YGa589BBZ3QAlf0S8skzn/7VveZYGI20tv12XH7R7i1/q+1dV r X-Gm-Gg: ASbGncvDa/uhK4H2wCahvjpNAkm/nyEwe1B3K17+HZTorescrHOwWzQJtYBXK9ruGeg YI6coxxNUMhv8csSO6hO3oKsjazoX0mI6x4GstGugXuh3eNcFX3r9yY3heNol3KnpSAhVNjPnyj ija0Hfzx7fLZvz7jDs14a4DeCsUhz9K0pMxXL3+hxomVp5WQTbLSMb2js5ArhVTrkxg666X6QKX v8oejQg7RRhBTtfJ6j95s46ZFzv783nyyRyAdTupUrHBhJOCve5KuhhJxHxCE2360XYUvms882s w467IFtFeO7ao9o7JbWylXDNJCrpyKuW4s+4xcLYR+tt X-Google-Smtp-Source: AGHT+IE8qR7rvWy16B29zqVKeH+5Xs9FEHJRohxtlVk1ha0v5ACDqhpK4pBzwowgaOfPj90X8hPjJA== X-Received: by 2002:a05:6a21:27aa:b0:1f3:1ba1:266a with SMTP id adf61e73a8af0-1fa4c6a1afemr2173708637.0.1742273499683; Mon, 17 Mar 2025 21:51:39 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:39 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 07/13] target/arm/cpu: always define kvm related registers Date: Mon, 17 Mar 2025 21:51:19 -0700 Message-Id: <20250318045125.759259-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This does not hurt, even if they are not used. Signed-off-by: Pierrick Bouvier --- target/arm/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 23c2293f7d1..96f7801a239 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -971,7 +971,6 @@ struct ArchCPU { */ uint32_t kvm_target; -#ifdef CONFIG_KVM /* KVM init features for this CPU */ uint32_t kvm_init_features[7]; @@ -984,7 +983,6 @@ struct ArchCPU { /* KVM steal time */ OnOffAuto kvm_steal_time; -#endif /* CONFIG_KVM */ /* Uniprocessor system with MP extensions */ bool mp_is_up; From patchwork Tue Mar 18 04:51:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020304 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 19CD5C28B2F for ; Tue, 18 Mar 2025 04:52:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOw1-0001Mp-EP; Tue, 18 Mar 2025 00:52:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvb-0001Em-8c for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvX-0008Tt-5b for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:46 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22401f4d35aso96536465ad.2 for ; Mon, 17 Mar 2025 21:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273501; x=1742878301; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zREl7MPAGqYRU9KvXrtENxfPFFrO3Nb7yWvR8XbX8nk=; b=NL3seNT7V5hvyXNUkYaEFq3M6ka3mxsrUcXevHdEVC9g6D8Sw4XikeOVhP3vd9jBuE oyx3A+sMI63sUktcxyeUvry8SpRYXGvcwjl78tnBIls4ONnYV0G42+0eR7eElArPfCFe sFZ95OQNVz/W2n7xQeK3fRlnsNMgfiwYVDHGVXCoyVgy+FrC/tH1rOB/+T9mhp5Zl+fA t1/X/JwuQbMof8WcJYEFshi8xScHbHYCUey04DfTvWQ5kZKIr6CluXZ02+fmJ109muBa kbP5fCLGYD/VPMtPjB85tHOCp9rzapiJEX24eiRMKF0qm9YlgdmEJ8RDn8QLtdgGrH8r sioQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273501; x=1742878301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zREl7MPAGqYRU9KvXrtENxfPFFrO3Nb7yWvR8XbX8nk=; b=A+BMxnSmTz+DVfggizdCBf3CC9VRc2uupA/TLoTFIf1QpKy3wMvROfOmO3jrIsHFVC fx7EN63bohrMrH1AyviBmjspVkwpRBDpFLpG488jbTlbjvvrkrya2imhKy1Xy35U7tKE 5ufdnSCsqyoZLacsWdEgEhrHkzLN1gegBGSIezjlfNxRkIboJM6RHLRgd6JdBosE5Vr1 WVgQtaskmEpx2u4BWP8ZdpidLVaqtXMc/YaqVkRz69CTCwPJkSU1w8HTICGSk3U3VhX5 PJz93nOCbkNh1D+H3zIt80svYXy2hBQiXpXMWqPZiBa+5OEI1BURkdK5gqXpqXkQpwZl 1bSw== X-Gm-Message-State: AOJu0YyowWnxpieRZqCkC1tGV7BJAyJbu+bnYZ89w8NFcyczDMAqK1X1 pyjPrJGRcsp10jLe4CZQHuYA5erqO+DIZ17Y3DZrtvyc8adBmNjfPIpVthAaLR339MIekD82+J4 w X-Gm-Gg: ASbGncsNaazo0la9uVFTgwuTVoIbB81xdZchvADaAIyKllTaWQjJ7rAgf9n+IeGEhrR Dko0y+H+otWheAEYOzNYu6SVS0zrB3Vhf23AsQl/7/7LAxuZ91+rts7mnL9vM/lFADaxdTPQ1vh I/yuXCYONEYlSMv6E3a7HX1cjHqo7DcJfKHn4nTkXQawVnFMOjvijc2yKLsevBMGxjzpkWU8MbY GSSafwOLiQznaZlV6rd3eV2yLwjZCMcM1Cr9mx3qmEqnIch/Jz32Av/RETfT7NibbpXqGshFi+I 8/fpFnAcuk9OA7L2Vx+7y9ssxWaFJRLrTBL9Y0AWwlvMvP1GVgMrSfU= X-Google-Smtp-Source: AGHT+IFqAyZQRbRYtYEmeMsrs7MIVpz3F5a0071joCl+4E1pyIG8nDoF4tustrp2jVDZXF29mgQhWA== X-Received: by 2002:a05:6a00:1829:b0:736:a540:c9ad with SMTP id d2e1a72fcca58-737572d542bmr3107911b3a.20.1742273500665; Mon, 17 Mar 2025 21:51:40 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:40 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 08/13] target/arm/cpu: flags2 is always uint64_t Date: Mon, 17 Mar 2025 21:51:20 -0700 Message-Id: <20250318045125.759259-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Do not rely on target dependent type, but use a fixed type instead. Since the original type is unsigned, it should be safe to extend its size without any side effect. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/cpu.h | 2 +- target/arm/tcg/hflags.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 96f7801a239..27a0d4550f2 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -194,7 +194,7 @@ typedef struct ARMPACKey { /* See the commentary above the TBFLAG field definitions. */ typedef struct CPUARMTBFlags { uint32_t flags; - target_ulong flags2; + uint64_t flags2; } CPUARMTBFlags; typedef struct ARMMMUFaultInfo ARMMMUFaultInfo; diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 8d79b8b7ae1..e51d9f7b159 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -506,8 +506,8 @@ void assert_hflags_rebuild_correctly(CPUARMState *env) if (unlikely(c.flags != r.flags || c.flags2 != r.flags2)) { fprintf(stderr, "TCG hflags mismatch " - "(current:(0x%08x,0x" TARGET_FMT_lx ")" - " rebuilt:(0x%08x,0x" TARGET_FMT_lx ")\n", + "(current:(0x%08x,0x%016" PRIx64 ")" + " rebuilt:(0x%08x,0x%016" PRIx64 ")\n", c.flags, c.flags2, r.flags, r.flags2); abort(); } From patchwork Tue Mar 18 04:51:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8BF7EC35FF8 for ; Tue, 18 Mar 2025 04:56:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOw8-0001Q9-FS; Tue, 18 Mar 2025 00:52:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvc-0001F7-98 for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvY-0008UK-H1 for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:48 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ff80290debso4298039a91.3 for ; Mon, 17 Mar 2025 21:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273501; x=1742878301; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ovyvu8DCxOT3MJqFMX/qU9iZeR9dz9+LihTzZn+g4uA=; b=Yq8uBL1ERJ/7pLAmla1mjnM3RA3M9xCBXKDRAG54M6W85t3R79Jh2vjeKSoATK9DWT /YwMmSR/jraAkkkWMlmmCvXipqgiAjkCnjcW1EBjSlt/Ymue3yHsCW7xjqIkaICnUE1F WFbahzb4HpIznavmUy7ewpmBZwxTImlNbey6jI5emHajmhM6YRHo2Lxl2DFIM9k5ek5S Zk/knVt1UHZD/unprhKLb8uxb1nBXj5ZKXkm5+uEvS5QtFEJuBQRDrXKgPPPPS51DsZ5 As25X74r+zYhD9p+5Ngs3z3GGiKncPr9ww2QYmE0zeqXFBoXQ216FKzlPqDvKr7pE53x FfMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273501; x=1742878301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ovyvu8DCxOT3MJqFMX/qU9iZeR9dz9+LihTzZn+g4uA=; b=UYiYnOW1Yo4EYqXD65AJ9gLHWV4fo0/PoUFPr4095v5RGbdkFxuighO6XEpQ0dq9mW 4CxKi4XwzEhgktoHX28Zad0ZGhxk0nVD0cp3BN+OY/lVmAL7T2RCtjYUYPqD2KbbExb/ kJ/xdK87JgGkTJLc74M9W04JYqmBpBNpfXZuqUjf1cZmABf9LIqcpzrNdYRtkr9LJjdU KReZOAWlzMxW3XKvxC6sTQSNXTVgvpVz3FNmg9+QrbIK4h/FchPtxhTWpgwj/UAnrOO2 6kdXB9rtmahHCkn5y6Rgf0owvCI3aQv7rlOoIEZbE5lPjhLTgkSH5oH8jjOvBYZiH42N uIUQ== X-Gm-Message-State: AOJu0YyaDs1e98nZQgToEb1NewiPN9WdBAJSdet7A/0WGGQUbltimWZX L7hx3l2PKOQWCsw5hGoFRHZ4tKUUsil48/mrvL7kkDsWz27f3y2FKO9nrXyREEM9uWp4BOTAeAd H X-Gm-Gg: ASbGnctp0l3CuR5FzWbZJU9puf4OX9KEaJI7JFO5TcZ8QCuoqod9rX78A7pFXNjKhq+ IeeRm3yDDucDSTDuZmZb5Pah9dkeDNUG/A/0Rg9GW8DBam3cmjXz/NtSaLtZr61fPVgxF6Zj85t PghKvxD6eESDEocoBoqRLH5eI8tT15QhsATDWOzgJDwCC6pfzYlL1VlXh9A3SOUIdrbP2cyH05E f0eMagDSF3qtK4Tft/qs8Kutlvq4l1vVmSgiK9oMb3zz3OOlqejq39l9pR8L2zHLYXSMek4QMJW NbnzTm/1qI1ik2OlA2Rr02dKBxR7e1h19MK7FfGNFh3o X-Google-Smtp-Source: AGHT+IGpoy0HiXaK4W5rGsoIV6EB7nMCBdVrRX+IRN9Qga4zDbHRqASR/8vpI124f9RU9cNmPTSLpw== X-Received: by 2002:a05:6a21:164a:b0:1f5:72eb:8b62 with SMTP id adf61e73a8af0-1f5c118eb0bmr21535312637.20.1742273501600; Mon, 17 Mar 2025 21:51:41 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:41 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 09/13] target/arm/cpu: define ARM_MAX_VQ once for aarch32 and aarch64 Date: Mon, 17 Mar 2025 21:51:21 -0700 Message-Id: <20250318045125.759259-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This will affect zregs field for aarch32. This field is used for MVE and SVE implementations. MVE implementation is clipping index value to 0 or 1 for zregs[*].d[], so we should not touch the rest of data in this case anyway. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/cpu.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 27a0d4550f2..00f78d64bd8 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -169,11 +169,7 @@ typedef struct ARMGenericTimer { * Align the data for use with TCG host vector operations. */ -#ifdef TARGET_AARCH64 -# define ARM_MAX_VQ 16 -#else -# define ARM_MAX_VQ 1 -#endif +#define ARM_MAX_VQ 16 typedef struct ARMVectorReg { uint64_t d[2 * ARM_MAX_VQ] QEMU_ALIGNED(16); From patchwork Tue Mar 18 04:51:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020312 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7C131C28B2F for ; Tue, 18 Mar 2025 04:54:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOx4-00025j-2i; Tue, 18 Mar 2025 00:53:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvb-0001F0-QL for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvY-0008Ub-GS for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:47 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22359001f1aso50940675ad.3 for ; Mon, 17 Mar 2025 21:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273502; x=1742878302; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wWxuqDn4s8YGDZbkaUM66zf0LxM3gMsyBA+i/Ql3r9I=; b=AHwWMggX6uoudT6S9mSuOirqQ990MnsvlxNyZ1ZljMmsEjPAYPB/5aRyYJlCWhZv7B koEJTLj9+hqsjuUJtu0+WJwLtZTDG37BxhxIzQZjYN6QKe4rTZ7mB6hNDTC/zY/AZrBF t6+4XXKIydJVOUwZT8y0caveWBsLsX1+eZrzO6PgJUOEZTU7nZTKRY4vk1Kcsq2nCLRR Pep/6P4NAOWz+rlwn5/elrtto/jzmUwE6FbH0B93G4Zr6xW8RxWQsgAIMXXvxP1TzAYD Xzedb09L5AP6vX3TkvzJfc7dU81m7tGNgmu7P4n/d9LF/pIZD/6X9P7qPZENvcgVzXGX v+0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273502; x=1742878302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wWxuqDn4s8YGDZbkaUM66zf0LxM3gMsyBA+i/Ql3r9I=; b=Kqdyt2X3Nu3J9GBr19Nx0grWbzZHLbhSGZlFF12kII2YpfUcQM5mQQ4jsmi4079Ls6 ePBkoWk4Knw+eJWnPVYfwQsirMRQklr4T2PkmjATU8ZLuRi+bxsZPPuV2O/2XHCJKFL1 +r0Hk23nEAopDBqTWXBdRUu3i4Mcbo8yGa7m4g6rvTo3SMLotVJ0/O1Nqd2Ze7S36bAO RHICCL3jjqhpTWZZSrBIHRonodzkOsPZbAcsZI7AwkYsf1TEJnW1rCVfl8nPvguTnU0h x8PtzXI5VtT20t6ZCgzjRIXYv7LBWzXsDYu08KwzSgBa4t48trf+I2FYoBw3+SWKUn0Q KGsw== X-Gm-Message-State: AOJu0YyhBMhtR4oO2tlQ4M5DOGrKVTEHn4LNt1eBjborNaVfMr8wnK7p a5IA6l4n4HDeKQMA1Z6gta0ApbKDoQwiAOTp+QMZLRrR29NFebOZ0T7ztHpG6gzxZ6boKPscX2w / X-Gm-Gg: ASbGncsfuINsTBSnxf+THEacqb/XUy/F0K7HFc+gO8+b6NVj5kKTQsRGz3RaRlP1Yyu Kcv2hXijalyiCCN2MkTr+i/OvQvdXYeeiL8zfvb3F+d8T+LQIE7ZQVEcv3kNelic+n4ETfcC7lj g89dOTfCKI3e3QpNCLgvOHHctAdd/6PbWmkxAm4x0FEJmyrZOGPYmK++XoT9UHcqxxc8RzoAgce IFtJSEADe0DOKb7Trzly2SRy+xIqIhAIRqabH/gdoWtYV/b3l38irW4rqwXlovA+fp/2TbsFYlq qvmMC8FPeKhOHo7Mk9iqWVoX+aRbIuJcd4Hp/wUb1ZCu X-Google-Smtp-Source: AGHT+IFe64voSZsfhB6tCQvZ6JsS5YIy++Gra9YOoX3NHYIjPdoV//u+oQg4+pI0ZxYcfpZboB2sWw== X-Received: by 2002:a05:6a20:9c92:b0:1f5:6680:82b6 with SMTP id adf61e73a8af0-1fa461552c5mr3160029637.38.1742273502551; Mon, 17 Mar 2025 21:51:42 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:42 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 10/13] target/arm/cpu: define same set of registers for aarch32 and aarch64 Date: Mon, 17 Mar 2025 21:51:22 -0700 Message-Id: <20250318045125.759259-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To eliminate TARGET_AARCH64, we need to make various definitions common between 32 and 64 bit Arm targets. Added registers are used only by aarch64 code, and the only impact is on the size of CPUARMState, and added zarray (ARMVectorReg zarray[ARM_MAX_VQ * 16]) member (+64KB) It could be eventually possible to allocate this array only for aarch64 emulation, but I'm not sure it's worth the hassle to save a few KB per vcpu. Running qemu-system takes already several hundreds of MB of (resident) memory, and qemu-user takes dozens of MB of (resident) memory anyway. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/cpu.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 00f78d64bd8..51b6428cfec 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -175,7 +175,6 @@ typedef struct ARMVectorReg { uint64_t d[2 * ARM_MAX_VQ] QEMU_ALIGNED(16); } ARMVectorReg; -#ifdef TARGET_AARCH64 /* In AArch32 mode, predicate registers do not exist at all. */ typedef struct ARMPredicateReg { uint64_t p[DIV_ROUND_UP(2 * ARM_MAX_VQ, 8)] QEMU_ALIGNED(16); @@ -185,7 +184,6 @@ typedef struct ARMPredicateReg { typedef struct ARMPACKey { uint64_t lo, hi; } ARMPACKey; -#endif /* See the commentary above the TBFLAG field definitions. */ typedef struct CPUARMTBFlags { @@ -656,13 +654,11 @@ typedef struct CPUArchState { struct { ARMVectorReg zregs[32]; -#ifdef TARGET_AARCH64 /* Store FFR as pregs[16] to make it easier to treat as any other. */ #define FFR_PRED_NUM 16 ARMPredicateReg pregs[17]; /* Scratch space for aa64 sve predicate temporary. */ ARMPredicateReg preg_tmp; -#endif /* We store these fpcsr fields separately for convenience. */ uint32_t qc[4] QEMU_ALIGNED(16); @@ -707,7 +703,6 @@ typedef struct CPUArchState { uint32_t cregs[16]; } iwmmxt; -#ifdef TARGET_AARCH64 struct { ARMPACKey apia; ARMPACKey apib; @@ -739,7 +734,6 @@ typedef struct CPUArchState { * to keep the offsets into the rest of the structure smaller. */ ARMVectorReg zarray[ARM_MAX_VQ * 16]; -#endif struct CPUBreakpoint *cpu_breakpoint[16]; struct CPUWatchpoint *cpu_watchpoint[16]; From patchwork Tue Mar 18 04:51:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020309 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 53B18C282EC for ; Tue, 18 Mar 2025 04:54:23 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOwJ-0001Wr-Py; Tue, 18 Mar 2025 00:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvc-0001F9-RH for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvZ-0008VE-8M for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:48 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-225b5448519so96013125ad.0 for ; Mon, 17 Mar 2025 21:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273503; x=1742878303; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ff4if22Q9C7/aUOyimjBXuhprbDC9BPiONo3GzzeMnI=; b=CVCKwOWxOI+GKAhnaaDemskZWXf2KqZKrul6fqx8rnlJqSfmXnpLNxbc2IS2PohOLO b0AhXPU46foVqwedCYkitzvLD/grGmnqFOtKxQn3Krw4w6FPGAfmyVYtLUCuHdioPU3U 8aNPowLdCO6hi81Wcj2MfbuHOQNEJWxG7vG8QnzE2sIPCajlPXK5gPKDmE/MOILUzGAy Af8NLN6bFwdMiQqIhDhZpZfFb30M9fjwVUydc55CWXvH9bSvzlERVpdvkWoMQis+FSJq Q53oiOWE3O6wE1YqddNM1zp2hd5JOtjNAp5/+6W+Am4N8Mhf2vEhpIZtxZCKfcNhGz5c HztA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273503; x=1742878303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ff4if22Q9C7/aUOyimjBXuhprbDC9BPiONo3GzzeMnI=; b=a4S3w4WrZWOG1KXbGpcM27SRxr/oh1ItUmu2zLYHvxqoY02MkZO9u8a6EtJjm9M111 MjcsWi5bvpGYLZvI8323vD6Q0+mAPSvqQOn2zORoKvlN2+Rw6+bc6uh8u/cDIPF0KlqK Nlq2gnA3tnR0cyxLpfUJ79X/NXooida8l/2PNthK9AuTlopWhhazoEd3Xs+q3OYIkQ8x sq3/fN+NIT7UeIlld6YAQoNIBfepdJ4Cl6+l+IXxjB6UyiFVdzbdGYRvqDPZlYkdcZQF 0VSnCiXIk1sm4J424gnoTgvULXGmAivHIF51FBfGnrK6YVvp40MW9SNhTMwjdjsmKS8E 6NwA== X-Gm-Message-State: AOJu0YzdVp780dzxSLgtB7nKfPRhkJjfmLJINsCxrmav2bMkH9t5nNRt JS6yAQoQhMX91M4rzzSPfkY7aNZQNbqMprWh6q+dnU0mVqDM5aiRNsCDOLzg2L7TXDrS6gNnkCz h X-Gm-Gg: ASbGncvid34Lpxn9J7tHbttQi4aJaO3MGAusJAX7kwprXcZbWROb6jJa8c73oUKSAWi nTPN6cHzn7LZc2CWx0+fv2M/QLyTTqaRnE+0hGh1DaEAloXdamJySE3+6nZBA2aDaFS4M1BtpMM P9JUEcvBO9djPGiKlJCQ2hwp7XW07fpqQNp2bGZ8VtfW+WsLIUV94rG56DTAszA86o2I5FMldWo dZ/c+F6c+w4FntWsLF2IFfzDfRerAXurH1IfCXQQEc10lr9nmSklK/tTjli/DU4Hj3mX2Z+bxUZ OWsIaRktYu+ZbnoRtAvazqLqSYpMv4wHNiAAih7hdGuh X-Google-Smtp-Source: AGHT+IGwUIS/3wXKGJBQGhbVlXqqVjdKfsJ7yt0C5ebmRfs4P5+hmmLEk6TOEURFfJtw+igxyOPO3Q== X-Received: by 2002:a05:6a20:244a:b0:1f3:2e85:c052 with SMTP id adf61e73a8af0-1f5c1327783mr23658501637.35.1742273503447; Mon, 17 Mar 2025 21:51:43 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:43 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 11/13] target/arm/cpu: remove inline stubs for aarch32 emulation Date: Mon, 17 Mar 2025 21:51:23 -0700 Message-Id: <20250318045125.759259-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Directly condition associated calls in target/arm/helper.c for now. Signed-off-by: Pierrick Bouvier --- target/arm/cpu.h | 8 -------- target/arm/helper.c | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 51b6428cfec..9205cbdec43 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1222,7 +1222,6 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, */ void arm_emulate_firmware_reset(CPUState *cpustate, int target_el); -#ifdef TARGET_AARCH64 int aarch64_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq); @@ -1254,13 +1253,6 @@ static inline uint64_t *sve_bswap64(uint64_t *dst, uint64_t *src, int nr) #endif } -#else -static inline void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq) { } -static inline void aarch64_sve_change_el(CPUARMState *env, int o, - int n, bool a) -{ } -#endif - void aarch64_sync_32_to_64(CPUARMState *env); void aarch64_sync_64_to_32(CPUARMState *env); diff --git a/target/arm/helper.c b/target/arm/helper.c index b46b2bffcf3..774e1ee0245 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6562,7 +6562,9 @@ static void zcr_write(CPUARMState *env, const ARMCPRegInfo *ri, */ new_len = sve_vqm1_for_el(env, cur_el); if (new_len < old_len) { +#ifdef TARGET_AARCH64 aarch64_sve_narrow_vq(env, new_len + 1); +#endif } } @@ -10646,7 +10648,9 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) * Note that new_el can never be 0. If cur_el is 0, then * el0_a64 is is_a64(), else el0_a64 is ignored. */ +#ifdef TARGET_AARCH64 aarch64_sve_change_el(env, cur_el, new_el, is_a64(env)); +#endif } if (cur_el < new_el) { @@ -11663,7 +11667,9 @@ void aarch64_sve_change_el(CPUARMState *env, int old_el, /* When changing vector length, clear inaccessible state. */ if (new_len < old_len) { +#ifdef TARGET_AARCH64 aarch64_sve_narrow_vq(env, new_len + 1); +#endif } } #endif From patchwork Tue Mar 18 04:51:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EB712C282EC for ; Tue, 18 Mar 2025 04:55:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOx6-000284-Nh; Tue, 18 Mar 2025 00:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOvd-0001FC-0A for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvZ-0008Vo-Sz for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:48 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22423adf751so86810155ad.2 for ; Mon, 17 Mar 2025 21:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273504; x=1742878304; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ek8XPpj4hrtyNGDcqo+uXNBksQzSJC0Hy5Yo4DqMKUU=; b=TkMeUbTbWVSTVfGDQStjx7cusWg7+O7d4xjQH6x4Sq/6Lj3Ap9SWyUXOlshSXGOpTB Szs2Ld1Eb2nfh5YnYBcFQ6agheZyX7MtPM7cdSpx4VmXWcpsaUqQvPXQz+CC1AnmxHEN SSlUnS0RTcfQWIMdTfKaFzYm6GLxoLYNzOpFKdqgS+NA4rtsPSF80q4IXQn8CVSTh5eH 6EA1z00ggWuZtG2PC/2OCW0ZpPYneMu8/LOIfLN7gTUp8mhwUuZqtk/Z7qJzQEUebV9V RI8gK2HGBDLWm409+AjHYQYNXZcixJV1Z1ePd125Gn9xqWHtC3KaxdJc5+Uegp5jlWyE J7UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273504; x=1742878304; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ek8XPpj4hrtyNGDcqo+uXNBksQzSJC0Hy5Yo4DqMKUU=; b=dUCd+n36sMloXXruuhE2ZzbYJ4D5Y6BqP1Rolo8MV3W/VH7iih2kFh9DwwEA4eE7Tm NDC/2ApXyFh7R8sWeqRkd6Y1vwjdJdbyRJfAI8xkLG5QxKdvuwIYlNLxaz/t3VZvxwJY HdT/0KAJnIR3yBYLmxg6FYx2d6dA0ioX0zlfYWJjUm7lceCztYZ1yzQyWP7yG258q4L9 zELK/evb5VYbKEIQbHZE1GsBN2N7GIQuzi07MDNaNl99LKqRKLP3mAgJ80bg2MoAZRxp iQwIbAVdXVdrX3dB+NUUeoQyHi9HKick0JLyXouULQuOVJZ9x7PmuWE+b6ejk+Tk6dij 9Evg== X-Gm-Message-State: AOJu0YxEQph7TwNFBlhodaoWt/UC+MB8n6d7to+fZn0N86MLsD4LUUcZ 9F9yx3+gECK9oHlNtzbE7k6QzIB1PBW/ioexNHFtnQD/kBh1NQE+msgRMG45KATRBsehUwWs/vv w X-Gm-Gg: ASbGncuX2rN05Ad7qwspxs0Ly7xl/6R8e+FJTryUi3YVxB4KwEAWzCLZC4c+r/Q94c2 3XSEsHkZ0nLCjgQvtfXvKjIWpQxXtUHHJfU5YZ8tT/97cXja1ePdglaT5LHmqCvOnxtMUG3ixa2 xw/3ylBbTIV6w5ySrX8BTUXRVEfZvyTPlum21PTxWtXlNimOGoaWu4oHPbm9gdnfpAxB9AKahP4 2YSvK8NOr3Qv1B9koGu+Yy9DT2TXxrC+IAjC4uwLXj6G7ebhZIF05zVOVZ0G5vS/sGdNFnc79Z+ CIGxGG0zep3LGuXmK46t3hot3Nup9AhvRWcuK9/3G6F1 X-Google-Smtp-Source: AGHT+IGT3hRB7cgRAOTfF6ymEpowIUFgQzMXE5GAC2ISpsBZy5NX8Js4RVALQRBZLAuQQLxc3QHe/w== X-Received: by 2002:a05:6a21:68e:b0:1f5:82ae:69d1 with SMTP id adf61e73a8af0-1f5c12098fcmr21810295637.20.1742273504481; Mon, 17 Mar 2025 21:51:44 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:44 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 12/13] meson: add common hw files Date: Mon, 17 Mar 2025 21:51:24 -0700 Message-Id: <20250318045125.759259-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Those files will be compiled once per base architecture ("arm" in this case), instead of being compiled for every variant/bitness of architecture. We make sure to not include target cpu definitions (exec/cpu-defs.h) by defining header guard directly. This way, a given compilation unit can access a specific cpu definition, but not access to compile time defines associated. Previous commits took care to clean up some headers to not rely on cpu-defs.h content. Signed-off-by: Pierrick Bouvier --- meson.build | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 672a0f79d11..0dec7d9750e 100644 --- a/meson.build +++ b/meson.build @@ -3689,6 +3689,7 @@ hw_arch = {} target_arch = {} target_system_arch = {} target_user_arch = {} +hw_common_arch = {} # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. @@ -4065,6 +4066,33 @@ common_all = static_library('common', implicit_include_directories: false, dependencies: common_ss.all_dependencies()) +# construct common libraries per base architecture +hw_common_arch_libs = {} +foreach target : target_dirs + config_target = config_target_mak[target] + target_base_arch = config_target['TARGET_BASE_ARCH'] + + # check if already generated + if target_base_arch in hw_common_arch_libs + continue + endif + + if target_base_arch in hw_common_arch + src = hw_common_arch[target_base_arch] + lib = static_library( + 'hw_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: common_user_inc, + implicit_include_directories: false, + # prevent common code to access cpu compile time + # definition, but still allow access to cpu.h + c_args: ['-DCPU_DEFS_H', '-DCONFIG_SOFTMMU'], + dependencies: src.all_dependencies()) + hw_common_arch_libs += {target_base_arch: lib} + endif +endforeach + if have_rust # We would like to use --generate-cstr, but it is only available # starting with bindgen 0.66.0. The oldest supported versions @@ -4230,8 +4258,14 @@ foreach target : target_dirs arch_deps += t.dependencies() target_common = common_ss.apply(config_target, strict: false) - objects = common_all.extract_objects(target_common.sources()) + objects = [common_all.extract_objects(target_common.sources())] arch_deps += target_common.dependencies() + if target_type == 'system' and target_base_arch in hw_common_arch_libs + src = hw_common_arch[target_base_arch].apply(config_target, strict: false) + lib = hw_common_arch_libs[target_base_arch] + objects += lib.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif target_specific = specific_ss.apply(config_target, strict: false) arch_srcs += target_specific.sources() From patchwork Tue Mar 18 04:51:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14020306 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 94335C282EC for ; Tue, 18 Mar 2025 04:53:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuOw1-0001MS-DR; Tue, 18 Mar 2025 00:52:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuOve-0001FI-2m for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:50 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuOvb-0008W5-IT for qemu-devel@nongnu.org; Tue, 18 Mar 2025 00:51:49 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-2ff615a114bso3824872a91.0 for ; Mon, 17 Mar 2025 21:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742273505; x=1742878305; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TJs8jpuU5VHY7crNqDB8k9WdWD2PL+VSpwoAKAzM9C8=; b=ZNiH/HBFwJqkyPHZh4epSoAHEC2nRCCp/F2xdUwthnIh2NmK/a7vxwoVwy3KAOvPjA s9MBHmwuTYobOKzeFY/142oZbVnN35QQmuJ9u3CPBHj2w9JnEM7XpXdpj8kUZNyCzXYS U8YkinifZfC8siaUWnw2/Q2yGpxhiE63S+IPSqzOXPuoPiqUJAJQstJHpDuhKS3BDlZa Xlg9n8xaA4MU5Qoa1wLfAVpyGsiZEog6dX/WOj6ZXymT1xpJdXbEHkRTD4DwgaqrAorP IOQdjzw1IQiumzEoLT2Moh3GXesJ05BA/0gg+nKFYNMsg+1qoJ6LVQyQ0pWyJ+1XJlin xkeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742273505; x=1742878305; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TJs8jpuU5VHY7crNqDB8k9WdWD2PL+VSpwoAKAzM9C8=; b=dRZEEkTeU3BhEgRjnRj+B/XfxRW9OAmjXkxn/rmn9uK0/jmmofHU1d3H9pbS+Msdv6 odiFApbzg13tvRzQy+pmUC7Glw2Yn/zj/6EKU40KnOqaMhUDb77xU57g8YJJtEzdcUCx Wb3v9D0BBcR/nDAMzRDQEwNScYzSvjqjszopXbZEARHyaL+jfSr5lLJHaG0c5RJXL1Ni 3ZfgsqzmbJRNjSfiog/8aVTvJxn+n0UdMZK5QzkAFMcLSwlBMNLvmbyJLonuH4nscvna aBu08bmb9urddQv9Jxgt8jbzT0KOEdPQrNnfZpWw3sl/s4nM/FHzfV3wH82/Xyvmq/Hp 0BTQ== X-Gm-Message-State: AOJu0YwERrK+C6LDchIStZur4zcU3m0u6uAjJDdv8fduZy2E+DN2n9Bk u/AG0cIs7hPrTt/Ww9AuRlrPeonGiv1vdo3ficBW2Nv80EfP1NOlktCqoNYwkTwP3EzuceqCpJv w X-Gm-Gg: ASbGncsv9DbHyy3vM6QQIreAh2rkZ3cVAXWNrRKYx4znf07KJQOnvRbPavhhf+SdVt+ Nzo4zQEXdpjt6NPmN3yluQSsU8Rtvw7nNdZXL5V2/3nLJ7dt9/Sc/NnJj3iIipR12bQaI9EPgDf j3KgTpQtMoDbiprIPE0ps30sHw+g868hfummFj4UVbKeinJ8iM5LVNArRi+fqvoA3AC/uKXzVvK kKsO12ulbWX//PrpRu2MF6q0uhL8Q7HwgD78S8CqEw0MtfyW1+b4dj2cWGDGjSxH55aOLKKeGWU C/gX23gBA7HwfF9GZDH1VQ7t/uNn4FdejXa9eqHosSanWF7hdANDet0= X-Google-Smtp-Source: AGHT+IHEmBiDYdH8DpN4X2712XG3vEXoAh58XN6VBOwchF+ihZ4rs3b8Wb2Qrcz+iN/AtHC1fq47cw== X-Received: by 2002:a05:6a21:1fc1:b0:1ee:a410:4aa5 with SMTP id adf61e73a8af0-1fa50bd891emr2581469637.17.1742273505380; Mon, 17 Mar 2025 21:51:45 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711694b2csm8519195b3a.129.2025.03.17.21.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 21:51:44 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, alex.bennee@linaro.org, Peter Maydell , kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH 13/13] hw/arm/boot: make compilation unit hw common Date: Mon, 17 Mar 2025 21:51:25 -0700 Message-Id: <20250318045125.759259-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250318045125.759259-1-pierrick.bouvier@linaro.org> References: <20250318045125.759259-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Now we eliminated poisoned identifiers from headers, this file can now be compiled once for all arm targets. Signed-off-by: Pierrick Bouvier --- hw/arm/boot.c | 1 + hw/arm/meson.build | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e296b62fa12..639f737aefe 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -23,6 +23,7 @@ #include "hw/loader.h" #include "elf.h" #include "system/device_tree.h" +#include "target/arm/cpu.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/units.h" diff --git a/hw/arm/meson.build b/hw/arm/meson.build index ac473ce7cda..9e8c96059eb 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,5 +1,5 @@ arm_ss = ss.source_set() -arm_ss.add(files('boot.c')) +arm_common_ss = ss.source_set() arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) @@ -75,4 +75,7 @@ system_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) system_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) system_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) +arm_common_ss.add(fdt, files('boot.c')) + hw_arch += {'arm': arm_ss} +hw_common_arch += {'arm': arm_common_ss}