From patchwork Mon Mar 10 04:58:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009291 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 CD557C35FF8 for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905951.1313408 (Exim 4.92) (envelope-from ) id 1trWqp-00014G-JC; Mon, 10 Mar 2025 06:42:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905951.1313408; Mon, 10 Mar 2025 06:42:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqp-000148-E3; Mon, 10 Mar 2025 06:42:59 +0000 Received: by outflank-mailman (input) for mailman id 905951; Mon, 10 Mar 2025 04:58:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVE7-00070S-Eq for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:58:55 +0000 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [2607:f8b0:4864:20::62d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5c24e916-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:58:52 +0100 (CET) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2232aead377so1096105ad.0 for ; Sun, 09 Mar 2025 21:58:52 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:50 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5c24e916-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582731; x=1742187531; darn=lists.xenproject.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=1JZyw573LWlQgbC9bGnVcpJUmDARxtxiYGI4BMcj5vE=; b=f8A9xZQlQU9RBP+FJb9Jr9zPxlerCWiByInKxltateVQL7tJ02kSkGbHRn2YrveZun VS9MefhHxwbiDqPsSBMhoFmecoI/HBwSNtDQPsjvzMt960Tf4Z9DozX8UoWgyVhkWHJj 1dQFVeCPc5eURe5gsANGiAQ9GTmzFjIsoaIe2CNASjc4tJJbPu4zYLh5m3Z87BoXok+5 jWocmSWJaQfZ1OC5iWv967cSmfSQ6GwAhyCmQx9bzdqyNLOj9hioewY2FN37N8mf/aTt PrHvf+yMRhQtb94DTisBhkSNgPnFgCBoujTh8JvE152xfZKK/BKV+AkY+w07V+uUqBAJ 9bXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582731; x=1742187531; 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=1JZyw573LWlQgbC9bGnVcpJUmDARxtxiYGI4BMcj5vE=; b=nwolCvLPpGAmCueH8wpsemu4d/u8wOVKb1Q6Py3wua17x+xFF9mND/2H3oE8X04aAi rB5/cAHg48DOA+6W/dJJwNrk+9phMecR+WZtYuAeaizGEU8GHe4pp6uo/GBI564gfRCW 0D8T7AvgCLqFAewStENWfu8ltA+6qGffSboFVYyk45zdTJaB5H1N0zEWroEL8t7vTO2u hNIV3EU/ms5Ml+xW0wEz19r5d1EkAJi6xSrgSyvzjgldhqxf+oi1VuWpwN4cU3dSwtH9 8YKsrXVQXraiVDHFIWLWRsLAruFkiaDgb8FWn/u8cJhBSUTN2GVdAha9LQxUziiLFnVn K2YA== X-Forwarded-Encrypted: i=1; AJvYcCX5zOB5qJyTKPqFPIREvYH4VOSYvKDVCyqGgptmTUYLQ8PQL652vJgmwvG7ZiOLQXPCSABM7gtW4l8=@lists.xenproject.org X-Gm-Message-State: AOJu0YwV2xCzi1Sr2MuTmv0qFlrrFUls/cw7OitDdqFWMAdj093TfuhF GNy4rGrb2ca0cxlz6Ma0P9tWxGa/xKuALk2MDdedPJHPACcTTOqC/aovSlStoDI= X-Gm-Gg: ASbGncuUPS9yvlg2XlsWVWxeMcSe2wbLpn8C6M05xCyG6mMJGd+I9t/E6FhoknPxQuq SEo+2WxRsFet0crFW81GsijNqZIXXyE/VtTSdZLAtdzFiunxtpkDaaU3xXzDMU8xM3kDszcw6wt iO02u+P5I69S4g1esKA8r6ADdPVT/DXnoeaOus6j4JC6shqKzvtnEwYYANmFs+VwnidS+BMVfOC 7Y4MMdAoixML8mmWMdG1NVY5b/Y8uXmIezYfzVW05pIT8bOoBRJbiEaibnk1MQR7lBmmd+3v1XE eyRZh8PFVOD+AbzYv2dBpQMTQqt2iwys2L2RrFYEfYGp X-Google-Smtp-Source: AGHT+IHsrTctZA7T98GoAjZcAG6E707cPIOSM6QcsZhsVvq9UPUg2kUQ9eJxgIpK7zPxh80fLwzPDw== X-Received: by 2002:a17:902:f644:b0:224:76f:9e45 with SMTP id d9443c01a7336-22428a8c6femr219904905ad.21.1741582731096; Sun, 09 Mar 2025 21:58:51 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 01/16] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Sun, 9 Mar 2025 21:58:27 -0700 Message-Id: <20250310045842.2650784-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 13 +++++-------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..17ea82518a0 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -69,18 +69,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..74519a88de0 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,8 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS +uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -28,15 +29,15 @@ uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); +void glue(address_space_stb, SUFFIX)(ARG1_DECL, + hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stw, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else -uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, - hwaddr addr, MemTxAttrs attrs, MemTxResult *result); + uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, @@ -49,8 +50,6 @@ uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -void glue(address_space_stb, SUFFIX)(ARG1_DECL, - hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stw_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stw_be, SUFFIX)(ARG1_DECL, @@ -63,9 +62,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Mon Mar 10 04:58:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009289 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 8F7CFC35FF7 for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905952.1313411 (Exim 4.92) (envelope-from ) id 1trWqp-00016X-RL; Mon, 10 Mar 2025 06:42:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905952.1313411; Mon, 10 Mar 2025 06:42:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqp-00015R-MO; Mon, 10 Mar 2025 06:42:59 +0000 Received: by outflank-mailman (input) for mailman id 905952; Mon, 10 Mar 2025 04:58:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVE7-00070S-Nq for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:58:55 +0000 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [2607:f8b0:4864:20::62a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5cdc72d1-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:58:53 +0100 (CET) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-219f8263ae0so68330215ad.0 for ; Sun, 09 Mar 2025 21:58:53 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:51 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5cdc72d1-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582732; x=1742187532; darn=lists.xenproject.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=2OIqebmv6TCVHIjcnbRR2ASx6yOnmt3f1dkycngreo0=; b=PP9Bbu0X9Ufi0FV6MFFY5KAFGCsSYwKZzoypWbzHTAAw/ZTpJkQ18V2BzZZeb2ZhN+ NsHfVE95eQWbHPIVMThuOFki7WJH8FvzN4IvGx3zHcLDbSMetRqrSN2nDl7sm4+Fg73h IrbHgyWOmyQbHVm/LqqsID7NkQrlJWVlnyhG9/AgdRxzqb4asUsm0xUR3Hz8jSQq+zEg 7i5veS7pN0bPS+/Cudb7rHrhG7PpM0N2I6Qya/soXIQw13nhMXdX3aFU8STToXuoeq6w aOhdt9h6MBdz+GWXZ/v2nj3ZnhF3bwCT8TkIiiG00pyuiXidbVFMDj3mqhf/SOi3gJ3t ganw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582732; x=1742187532; 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=2OIqebmv6TCVHIjcnbRR2ASx6yOnmt3f1dkycngreo0=; b=vqhUVkA81OU4VXFf7Sqm5E0MZdVQH6iJKy068escnaesqrC3bvT0WzJlI1KUX10Bk6 h+2NlwZz8oplOdULZPhLhbuFa3s5nKrMWhYN30cw1w/X9Opdgjr092v7bViPIzKu/d6M MEZ7xyqMHGOAd1zkn+Lm0/KWAAfvAAyNyPYRmtyYDDO0MjFthfgGBhonBRs8cSt07j4L J4MNByakfWzs7t2/gT4HI/5Y6mdk2oLOpDCTd51t7DzuCiLiiDNT+G/e+8EF07S9OGRS tKnLB1iiBeg0seKQHbhDwXiTaiALbFxiMqm/NfwobwFEyCvMKJmMxXycjjcqeJMiavXU Wmqg== X-Forwarded-Encrypted: i=1; AJvYcCU2aHRcAekSE7L7gP5rv+I4gAwJTxTpZP3FWB6pybFvNnDOwnjMYt/hdvTDQgZLfbtCzqjhiE+iM6A=@lists.xenproject.org X-Gm-Message-State: AOJu0YwpAPnbpD640dJuBz/2WvY4pOJTQgQX5yk2y8sdKNdDJYxysfbl tkUZ5AfD4DDhL0T7uMRinowmgxKCd1AB+o5ZmLiDilRSu8kO/rhXTuU+ZNh7Nc8= X-Gm-Gg: ASbGnculWWAgu8SB7K888L1Dw0+H9ian7SB0LRzkkLXDzEes5zXllNEYLsEn0IAPrvH 9jqKxiOW2VrSWRxjthH1oYXus2wwAZstXbhp011bv1fod+tOXkXvuBWzI9K0IFC7eZt/QD8vvE5 bP6+/PhPnlagMm6m+lGAmCzrWDnaxxyj3/6cG/U+vHO/NeXmNLxaZsW7dqhiWMS1x8VBJH53Dl+ Xbe8QZb1J0ocS7X3+VE5ySQ9iKmaIgseY8lnTVPlkVlgyDtTY9qXFOIIz0TwUA53TsoqRXbMEYA t7xbIKms4BwymFj9vlAh9ks1c4ZhF4l4ML1b8QWsuP4i X-Google-Smtp-Source: AGHT+IFiauNE3phtYbHOElNurEea3KFBOmPJM6YIEsLLcuetadtqaCJcJRoQf8PU7u5dj3ax/cwksA== X-Received: by 2002:a05:6a00:17a7:b0:736:47a5:e268 with SMTP id d2e1a72fcca58-736aa9bc787mr17756988b3a.1.1741582732211; Sun, 09 Mar 2025 21:58:52 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 02/16] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Sun, 9 Mar 2025 21:58:28 -0700 Message-Id: <20250310045842.2650784-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. To allow this, we need to implement address_space_st{*}_cached, simply forwarding the calls to _cached_slow variants. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 15 ------------ include/exec/memory.h | 36 +++++++++++++++++++++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +--- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 17ea82518a0..1c2e18f492b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -75,21 +75,6 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val MEMTXATTRS_UNSPECIFIED, NULL); } -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" - -/* Inline fast path for direct RAM access. */ -#define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" - -#define SUFFIX _cached -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" #endif /* page related stuff */ diff --git a/include/exec/memory.h b/include/exec/memory.h index 78c4e0aec8d..7c20f36a312 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2798,6 +2798,42 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +static inline uint16_t address_space_lduw_cached(MemoryRegionCache *cache, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +{ + return address_space_lduw_cached_slow(cache, addr, attrs, result); +} + +static inline void address_space_stw_cached(MemoryRegionCache *cache, + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) +{ + address_space_stw_cached_slow(cache, addr, val, attrs, result); +} + +static inline uint32_t address_space_ldl_cached(MemoryRegionCache *cache, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +{ + return address_space_ldl_cached_slow(cache, addr, attrs, result); +} + +static inline void address_space_stl_cached(MemoryRegionCache *cache, + hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) +{ + address_space_stl_cached_slow(cache, addr, val, attrs, result); +} + +static inline uint64_t address_space_ldq_cached(MemoryRegionCache *cache, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +{ + return address_space_ldq_cached_slow(cache, addr, attrs, result); +} + +static inline void address_space_stq_cached(MemoryRegionCache *cache, + hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result) +{ + address_space_stq_cached_slow(cache, addr, val, attrs, result); +} + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Mon Mar 10 04:58:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009298 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 8AD67C35FF5 for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905953.1313419 (Exim 4.92) (envelope-from ) id 1trWqq-0001Bl-61; Mon, 10 Mar 2025 06:43:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905953.1313419; Mon, 10 Mar 2025 06:43:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqp-000195-W4; Mon, 10 Mar 2025 06:42:59 +0000 Received: by outflank-mailman (input) for mailman id 905953; Mon, 10 Mar 2025 04:58:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVE8-00070S-Mx for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:58:56 +0000 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [2607:f8b0:4864:20::634]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5d8e6c01-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:58:54 +0100 (CET) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-22337bc9ac3so70486625ad.1 for ; Sun, 09 Mar 2025 21:58:54 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:52 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5d8e6c01-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582733; x=1742187533; darn=lists.xenproject.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=OGwlDw5fL6/8/4sqaw9ZjtskhrLsqkJfziSvtmiyf9E=; b=dYKGUC4ns833MidhHbCiU1Ik8x3AXHorarfhFD9472lELlVv6/UXB9tcZ4jUUobFP/ rIwqwB/WHu8FqWJnHd4ooWFghp9Cv3HySkwffAE7ucOjh/lSnUSHqJUHIQwGbPz7IR8s pb1R62vOqbmyS4BH6oXyncFY/bK7EdnMl6O2WqX3NlP8LG6vQis5HhO3Gpung4HP4cYf C+w0Cu0Gu79ut4wjMC3YAYvRs9c2j2+Dt2qqzFhytXbl0QG4cMThpIoGujnnDmS7UHL3 G4aKCP8vwPBQurLqT5c7hgTk2wPzRe+3Q9f5dZPRKJDwrElpdOx05L7Gh25jyhIUJkNV VUYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582733; x=1742187533; 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=OGwlDw5fL6/8/4sqaw9ZjtskhrLsqkJfziSvtmiyf9E=; b=JZ1FSyyFUiCgAriv8Ic2LiUu40XV73xRmgLwban+K2W4Ht0Fe1tForQVhqoS4EvQpY WzXFEkI+idPiU2Q9hA++SqfvdqfhBNYqWPF4sRUkDHY4wplfs1UgF4YCfPwi8i+K78Pe m61YjtpZXVR7K/IITYQyW0vpOMcwCM9qjuCmcbPvXnntUi1Xy8jlmQmAkr3357TU9AI5 oGwbutnMhp/uhP4kf/atweuDmh13rAbwbgQ0htvAA1a+TCSsjGkWuoCRMRYz/B9g/6Am qyWjswQ5uvUgxS/c0Z04OM4I9dF1TKAs0cKM2uJOPpsTJuYxIzfbtnC3VNuRzJIj3C62 1OBw== X-Forwarded-Encrypted: i=1; AJvYcCVbZj/OqMWCoxf3L41Z2p6MVgk5Z0lpu+Jw3jb3Np117sTR92aEZiwHzkDMtBerieNzJtoobWDwlo8=@lists.xenproject.org X-Gm-Message-State: AOJu0YzI5ocD0FITfRSVT0F8M6GvrGr2XFJ3/MP0DEeM06fh99Spf0qy WJ/NAhIsyKBE9/X0SwMhuWwWDlAgzAhvhvmqnBmNI9PEVHuk2m86/L/DB9HBJqg= X-Gm-Gg: ASbGncuwJ8N9xpK35diFlkEsm+r/oEaSaLtMk9vsNMKIRzg5DLXkHxuV/BaKNK6buGl ysSf78UT/GyhoDDDzxgPjTufWGyOGmz8vwCzURNwhltsy7IpNw0bPCRtl14kw4YB343/bfkoOKp 2skVXSqeqd/rZQ76ZLpJbTJmDQtdTLT7G5UaqWmh3YBOrPZOIJdh1KcJZQVldOQBJ8L5vjiFVLh vr6Ewn8C1E+7zWj3FQn5TRIvfluUa05vrTJmqX7/MVT4hC1EoLkSmE0dMkRlq4eQx2Q6jOzmiO4 SshwKpfZvMvF4kz2CPLrgv3QhjYTyFAUCzV07dX6FdYL X-Google-Smtp-Source: AGHT+IF9OJp4stFJ9k/lsvOwoQRvqqkA/ZzdxglsajfWtO3On0dbMxz5MT0xvVfYC1mLC7gyZMGdug== X-Received: by 2002:a05:6a00:13a9:b0:736:3be3:3d77 with SMTP id d2e1a72fcca58-736aaac69ddmr15637676b3a.16.1741582733352; Sun, 09 Mar 2025 21:58:53 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 03/16] include: move target_words_bigendian() from tswap to bswap Date: Sun, 9 Mar 2025 21:58:29 -0700 Message-Id: <20250310045842.2650784-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 This is needed for next commits (especially when implementing st/ld primitives which will use this function). As well, remove reference to TARGET_BIG_ENDIAN, as we are about to remove this dependency. Signed-off-by: Pierrick Bouvier --- include/exec/tswap.h | 11 ----------- include/qemu/bswap.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index ecd4faef015..cc662cd8b54 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -10,17 +10,6 @@ #include "qemu/bswap.h" -/** - * target_words_bigendian: - * Returns true if the (default) endianness of the target is big endian, - * false otherwise. Note that in target-specific code, you can use - * TARGET_BIG_ENDIAN directly instead. On the other hand, common - * code should normally never need to know about the endianness of the - * target, so please do *not* use this function unless you know very well - * what you are doing! - */ -bool target_words_bigendian(void); - /* * If we're in target-specific code, we can hard-code the swapping * condition, otherwise we have to do (slower) run-time checks. diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index b915835bead..ebf6f9e5f5c 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -1,6 +1,8 @@ #ifndef BSWAP_H #define BSWAP_H +#include + #undef bswap16 #define bswap16(_x) __builtin_bswap16(_x) #undef bswap32 @@ -8,6 +10,16 @@ #undef bswap64 #define bswap64(_x) __builtin_bswap64(_x) +/** + * target_words_bigendian: + * Returns true if the (default) endianness of the target is big endian, + * false otherwise. + * Common code should normally never need to know about the endianness of the + * target, so please do *not* use this function unless you know very well + * what you are doing! + */ +bool target_words_bigendian(void); + static inline uint32_t bswap24(uint32_t x) { return (((x & 0x000000ffU) << 16) | From patchwork Mon Mar 10 04:58:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009287 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 5C03EC35FF4 for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905956.1313423 (Exim 4.92) (envelope-from ) id 1trWqq-0001Ie-Cs; Mon, 10 Mar 2025 06:43:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905956.1313423; Mon, 10 Mar 2025 06:43:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqq-0001Gj-8W; Mon, 10 Mar 2025 06:43:00 +0000 Received: by outflank-mailman (input) for mailman id 905956; Mon, 10 Mar 2025 04:58:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVE9-00070S-Oq for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:58:57 +0000 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [2607:f8b0:4864:20::62a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5e46147a-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:58:56 +0100 (CET) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22401f4d35aso65267385ad.2 for ; Sun, 09 Mar 2025 21:58:56 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:54 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5e46147a-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582734; x=1742187534; darn=lists.xenproject.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=S8ktbxqhQcYI9crAlIF4CNR4KDCM1LZDZwDTggcCVc4=; b=hMY5kfr9jB94ogwzcxcNPnzCgH70IP+FH9lpeDPMHnV2swPOMdIZPcWovnG7AB+6IP VEc+INhCm+LAPX+CXI8fiZsHdKZlOGtzR8Iz3QabtBEo7BFa9QBaIngOc1CGxGkEbQ7S h6g4xnMlPw+cFccOa5X/nUnOmgGU5uy4yX9u5UoV52Ybrx/Nc2zVN7LncqHqVHTrpQvY SHsabZQMWPW3iZE83xeGE5+TCGcn6Ymb+00v4+Ki/3CkjsgshNoRXEwak5reZtooMtRV sU+jNMVpIDzyMiqh9stNqJW8BiMzQgyVv7wTIWX/LxMaKNCloHz1NX33eUsIITt5h/9N 4QGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582734; x=1742187534; 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=S8ktbxqhQcYI9crAlIF4CNR4KDCM1LZDZwDTggcCVc4=; b=MmbFM+DoX0URVNs7gMGPqLKWW/Z+RgJKjtvWsYc8B7n69JfX6vPCDHv4GuYiT08y5m 54sJ7rU3DgB5rMdlmBHyEMqcZpJH1winA9h9BFt98BrV5B0iMA8WOo4d6V9f+KVAAsBX 3qrWQLbDQbJucEmo2i2qL8P7m8bCaLDDLjuGQph7AeJFLKbLqF/2SVjLouDxK59vq44o jq1l08ilip20CKYy/BN7+QEaxDcajlkT+TMfZEqvHIjqqmRoTfxnZpMaJAW7wxi7xDGC 14I6PDVv5kNRYBlWHf9WvgwqcibrRbh73dclFg3ELGfl5Ct5p7V2JHw06zywUer8FYCB kDLQ== X-Forwarded-Encrypted: i=1; AJvYcCV79mvAewapvNaPcsR7j9aawhx0PeAsaixAM9kmmkk+FKf1jiBK+Ygte1GYhOcGmMi6F4YHKQ6Idf0=@lists.xenproject.org X-Gm-Message-State: AOJu0YxTuIYW2Bep+Dz9Kxh8wZiVmhav0k0JozsRZBDR+fvUuJhw89rh xxmHxacV+MDrirLAkHJ25lqhRDCvlWekHrnA/XOe6ExqacJtmFPcfcIR5vi2qcg= X-Gm-Gg: ASbGncvv6LMQG57HLQWXXAdrbsZyfTT/gCuD4vbWEFs+U+RKcSeU7iyHEM0/joYbKmp S4Il3O5ejKirUUCSLdZq8Qce566BwHc6q5pvESdQby0SxunlqkbOOYao9leh9ZQtSoI6DNFukz1 KU6cyEqxJrFGdewxL+sH9hOLVxJF2ROSd5f0p5LoWozXXC+XctZZhd72DKlk8yDXUzrFOjCw9f7 Ew0/vZ4fPny6LlbvCV6i4qPLFWB4EvwDYglL/ItheTjaJzdfGTsdZq/qP3BiYsv+NrvaJ8wqQJB QXuiBtwPuHYPQE380IevQq/2KjHm0ETokzyYVQsV7o2G X-Google-Smtp-Source: AGHT+IHkXXNzkEnz2BccPlbhHJNUY3LGOIbmL0i4gzfHTIIx3yoWhp8OGUsmgyQKBXK356JOEhoSQw== X-Received: by 2002:a05:6a00:2493:b0:736:ab48:5b0 with SMTP id d2e1a72fcca58-736ab48061fmr14740098b3a.2.1741582734610; Sun, 09 Mar 2025 21:58:54 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 04/16] exec/memory.h: make devend_memop target agnostic Date: Sun, 9 Mar 2025 21:58:30 -0700 Message-Id: <20250310045842.2650784-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Will allow to make system/memory.c common later. Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 7c20f36a312..698179b26d2 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3164,25 +3164,23 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else + if (HOST_BIG_ENDIAN != target_words_bigendian()) { + /* Swap if non-host endianness or native (target) endianness */ + return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; + } + const int non_host_endianness = DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; /* In this case, native (target) endianness needs no swap. */ return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Mon Mar 10 04:58:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009285 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 5BFD3C35FF3 for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905958.1313431 (Exim 4.92) (envelope-from ) id 1trWqq-0001RG-OD; Mon, 10 Mar 2025 06:43:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905958.1313431; Mon, 10 Mar 2025 06:43:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqq-0001Q4-JC; Mon, 10 Mar 2025 06:43:00 +0000 Received: by outflank-mailman (input) for mailman id 905958; Mon, 10 Mar 2025 04:58:58 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEA-00070S-TF for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:58:58 +0000 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [2607:f8b0:4864:20::630]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5f03c64d-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:58:57 +0100 (CET) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-22435603572so30007585ad.1 for ; Sun, 09 Mar 2025 21:58:57 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:55 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5f03c64d-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582736; x=1742187536; darn=lists.xenproject.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=gKLFWb+An2Ks9U+R2rK1VtO2Tw0/JUbGbAmdQc7IQwE=; b=d8E/aEnpuRQkUpOaZn5NmjBDE5tx1OV+ELlwxUK8LwHAFdwbjFA7aaKbNtPsVXFMSn aYYEEc30wAIYa9xxROFlqZBI09sXwj4/P56iFtXYUsl+CktnpcgEmtReAeVtKN7ru0By v/5HuVQ4bT9883O7Y8DVwpTryW95ThE5fMjGjnUMELOAFPY62I29WhXcbSny1+NNVIoJ RSWYstgoK7mRa9cYBjndF7SSyAuIfT8sbGyERqXj2h3Kj0UqwCB5ovmxME30svMaIkb5 ccJOVfNPV/qe98BDxFrTpaNL2RbFeVAMMZNRkt1Aqeljp1IFypPOMfiuqxuZbIB6mAxF kiZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582736; x=1742187536; 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=gKLFWb+An2Ks9U+R2rK1VtO2Tw0/JUbGbAmdQc7IQwE=; b=W1IwdS8TXx4J18CemnzO5n90Dm2/QlaOy74CUPE0dZDPBqt4nHZC6SF4zO0+TEA9/s GcJN3VPUdP9MzNzFHI/1UCXiB9iLYmuo2njpLlA2oo1qZEJ946wtCFuKmjvXBfG8VBLb ntpANZYKPSXp7e7ELQbl5PQfJm++o4JArE0reg1OIQueNdE4Vx73m4OeWJAcaEwyZ00s cFbmXh8/D0J6XxA6/a0qP2iZDlHIA0XTPjhux8SqsBpmlxlEmUhrTVnNgHAkKnMgD1eL 1t/7yGB/Dt/0KU6SO9v6Zj8ZIEYtXbaCxu2C0zCEjKf7pDEZeexVG6KtFdY9dMJ1SqiC yMTg== X-Forwarded-Encrypted: i=1; AJvYcCXyP0BGBGg4uB+gkCWD5NCR3GDInLXatlkhIv0h0mJij76ledFZkSJDD2DbIDAlRZBKnyNy2RrBU5s=@lists.xenproject.org X-Gm-Message-State: AOJu0Yys5liU36GIX+yXciIajej7g+PAsfiqZM3psrafYkzlq1DEIJqy ScbRN6hEZnchwLdOONld1qDf7Dtn0nb6HWO6mDkVwGnSyc6q1GEo9/XsfEaTGaA= X-Gm-Gg: ASbGncsbRTf69cXWTmUUaeC48Y7758ZaLJT5dQRfndawnq4zuzpeYjyJL87Z7mnYYKf 9iEhmKyWdJcsyzEjVZI8tm0dAIVB7zMVro3ySkTYRfxAl7mSisvHVXlVtmJf5hA6XB3H6Be8rGT DCw+HnvoBGyAPd02PF5llkYziuBwb4MXGmp5rP9Q9wlAz6htQHKTj6/4vdNMZati8C7O+4rO/Ii zTsPjhUl9mtNC2tPdH5qj6eK319IzqkAs11iydJnXDz3fSrHgEFv9bWuSD80LOfFpQERmh20EHx L1t7lKpSm8/ea3AzT7yWgcOBKgFTyxUNLxDaS9KXckXD X-Google-Smtp-Source: AGHT+IEAovvlOy2ME9s2bcowigrmpQEpYOhHLOJWN1HotCTdKvUP3vKFXajlsE4wLKble7VBohAKKQ== X-Received: by 2002:a05:6a00:4fc6:b0:736:32d2:aa82 with SMTP id d2e1a72fcca58-736aab17045mr17832470b3a.23.1741582735793; Sun, 09 Mar 2025 21:58:55 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 05/16] qemu/bswap: implement {ld,st}.*_p as functions Date: Sun, 9 Mar 2025 21:58:31 -0700 Message-Id: <20250310045842.2650784-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 For now, they are duplicate of the same macros in cpu-all.h that we eliminate in next commit. Keep code readable by not defining them with macros, but simply their implementation. Signed-off-by: Pierrick Bouvier --- include/qemu/bswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index ebf6f9e5f5c..46ec62f716d 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -442,6 +442,76 @@ DO_STN_LDN_P(be) #undef DO_STN_LDN_P +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #undef le_bswap #undef be_bswap #undef le_bswaps From patchwork Mon Mar 10 04:58:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009290 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 D766FC35FF6 for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905960.1313442 (Exim 4.92) (envelope-from ) id 1trWqr-0001XD-8V; Mon, 10 Mar 2025 06:43:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905960.1313442; Mon, 10 Mar 2025 06:43:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqq-0001UE-Rk; Mon, 10 Mar 2025 06:43:00 +0000 Received: by outflank-mailman (input) for mailman id 905960; Mon, 10 Mar 2025 04:59:00 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEC-00070S-2T for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:00 +0000 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [2607:f8b0:4864:20::1030]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5fbbae20-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:58:58 +0100 (CET) Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2ff6a98c638so7132758a91.0 for ; Sun, 09 Mar 2025 21:58:58 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:56 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5fbbae20-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582737; x=1742187537; darn=lists.xenproject.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=ErKU0wbfVZdnsjs5NMSuiTB4KixyX1gD9AraKkIZNBI=; b=OQOOlWNi52Yku4QClHAMKlQuJ4CjB0VBe4FkV7VkXKHLJrJlqrnAW4GC9v6pff6ZMf esaqHclwd2xg1oHwIL/YmMYmmE5YrIjlmoA3w+pVcLrKzEKL2tNWnoYrai95tTDOvaeD uRohAWPpd8dEqaz7VbYOBjvED7SH3BTJ1E+YqQxOKBVeC3HtAJhATE5u+KjnUTrPwEwg bN8m+CxS6T4OU0FkIbQ5WlA1bmIzloZBdIM/yusTsdskAR/QC9ty5HCraahwi5YBvOT1 uXvK0qXmgHp2GT4c+YkgGzlkIYaseh7kVfLq/UnyTIEZmwC7Xq8xnaguqRpOB39CJ6tC G2wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582737; x=1742187537; 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=ErKU0wbfVZdnsjs5NMSuiTB4KixyX1gD9AraKkIZNBI=; b=MQ3LyaQQmXKfg3kIINQJEVhVu/KaApGfavVOYG4OKLAbMTBLlhoUSgFX7yEZ1KIUj5 qdZdNHk9c+o434VcqZMgcFrxBcdeGH+RLj4U0BCZYH2Eqga/0nTNx8YQ2UlqDmFkkC7R ZZJ+lDRj8O1T3JjOKzhJWHejPfWOVVArxG0JHepNFOVDFpPk97e+wbTaq7/ThVEwwhu7 4Hgyv9gKUgNFO/ronc0WinAOEQKpvlZbWZHYCWx0VMhadpYXnbBBe3IFX56NxV33wqLc xApqtm+tyNgwFLOFvGWd94n7lL9NnemJ6ZXut+aPTNqUkTaoQ2EqmWGdR3D7tLEBC0Ic zj0w== X-Forwarded-Encrypted: i=1; AJvYcCX1EK+ouxKtWrlWi2XGyQTP6Tot9MvMM72pB4lsWTXsGigUdFVgsz/oip07OExmmWXsc80+l7pWrgo=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy9Aat/p8HPAL8ROBwxPTZDWz9d3dsZE/Op5FYjZCfPpCYFk4Zm kcr//U9KdMqVfpoTXyLz/EAxsu0OIRChe0hRaxRZtAQPGBwgib1RnEzw6yYdHxQ= X-Gm-Gg: ASbGncvG133hepn4+PCY4ydt4zN7X2SNZOb+DyxMnlk0cCEWmea4CGG82B61AWk/z3R Z+rD9qWzsAv6JX7vGsyNz1v6kW1zrrxPG8OaHK6D8Fn8k+sFXjFwAqSkwza7y74dx3dB8Sm37d/ X93s6ZtAWNNvZHuTgxsR/aY7ZaaBhyE0AHbvwwm50b1zEFfpbQ4mieIpSByQC72Z6z3rbJjLZCZ fnCMXQboMK9WGzto8eoP5VrSaROTakUmg0v6GfdgIWdLpaW11DycNOqS18mXmKjgya6W6+/Vu0b bcRSHkqEX1m7I/eBr+/ZyhX92oPsl7aRtt+l+lc+hJQp X-Google-Smtp-Source: AGHT+IHO0adHTKDFbdiZLdbwVjzffyYfi7nVPL6wN+0ieHxoGwNOezFQMlR0NxHpJZQhWhI8f44U4w== X-Received: by 2002:a05:6a21:9786:b0:1f5:8506:5039 with SMTP id adf61e73a8af0-1f585065599mr1040552637.28.1741582737079; Sun, 09 Mar 2025 21:58:57 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 06/16] exec/cpu-all.h: we can now remove ld/st macros Date: Sun, 9 Mar 2025 21:58:32 -0700 Message-Id: <20250310045842.2650784-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Functions declared in bswap.h will be used instead. At this point, we finished to extract memory API from cpu-all.h, and it can be called from any common or target dependent code. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 1c2e18f492b..625b4c51f3c 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) From patchwork Mon Mar 10 04:58:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009292 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 D76AAC35FFA for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905963.1313447 (Exim 4.92) (envelope-from ) id 1trWqr-0001ib-K3; Mon, 10 Mar 2025 06:43:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905963.1313447; Mon, 10 Mar 2025 06:43:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqr-0001iB-Cp; Mon, 10 Mar 2025 06:43:01 +0000 Received: by outflank-mailman (input) for mailman id 905963; Mon, 10 Mar 2025 04:59:02 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEE-000735-U7 for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:02 +0000 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [2607:f8b0:4864:20::636]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 60758afa-fd6c-11ef-9ab8-95dc52dad729; Mon, 10 Mar 2025 05:59:01 +0100 (CET) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22398e09e39so65589935ad.3 for ; Sun, 09 Mar 2025 21:58:59 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:57 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 60758afa-fd6c-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582738; x=1742187538; darn=lists.xenproject.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=8s25jeAGTcBk8xCVR99anv09nY4TtNOY1pAkSQYXuE0=; b=MAuFZdP1snK4RBJauQKk9IyBArEt30/odJpEL6c0pv50e/d05kLEHtfCesSDPBi08O qAGC0JN6u8lXlh3uO5EYC+Op9xhfb/TQoBo1yXVrW3XRhI03r1rA4t+dv2qjgnfvIRAr soS5fjZXUOGQ/4naN9dxxBxC3kzKrZ+GK31FcL2yL+sBZCd8w63iDdvrwAlA21fAhW4E 846D1OOsoM4I5xX53JzaCVVtg6atWB4Lk2hbHAattBX6qzQjPvq7ku4/ttywBlb8FH/y 6WfpDdeNjfLbGqrumNPoCirmjdSpB2f0ai7yb+GZjqo+ABE8+gD1Zdn0CYdc7S/zyJ9w OZpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582738; x=1742187538; 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=8s25jeAGTcBk8xCVR99anv09nY4TtNOY1pAkSQYXuE0=; b=AcAW2pXFnNy31DBxKnZjtfR4+93G5+NPCWrgMMn5GndEHsCTN+l5Lsgnh+KmeMalei tpnIcIN3SXVwYoYl1B574dSisruLseqX5Bb58S5s3qleYC1FNSixFl5VqCAZnt4vBVEF z5lpJmLR2FOcPywuKWVNJ+mNn4EGCa21xXq5tJSLnspT2eSWo3rxwnkkCpHjQJssrBYQ O0EK7mbXBA9Vp6ryTXpEuOc/x9CIBMezRItsMeMVSyARBa4d2max3S6Mtgejk5xipxD7 FQWRf6hmhN83LsBFFtbHvC7V4HzMJ9jBnAuBiZTf6hPW3TarVw6R8/aNLcrFS/Ud94Xm MLpw== X-Forwarded-Encrypted: i=1; AJvYcCXT6GUbSTPcHn9rMmo2VPaR6OybmW3nGRU68CZqzeinUDfFqClJeiiXlmr80YciCzGCk6Nbu+rqqqk=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz0PYbIa0ZxIK7KwESaf0r3P4S95oqKFlvb7zGMV30KFlres+/g 2klTWlfLqGNK4XoKcIA8XcZ05GzmNqkwwEOwrA/igU/hWSlYniFmNYnAjRw8Kro= X-Gm-Gg: ASbGncvXluj052xIQcddWBgQADCTL6/PJlKlbwwT8kTujXc4NUXRVtvVhM+/WKCde1H wraN9AmAJxxoUdjSb5E6XTcBJ35aZYhbwmwt0OfNclsYv7xrdzcleNMwUyB/CQtg1e52mKS8itp CjLkkBi2bfKdXv82NMgs4hnBL9j4iE0pvggoJcaUrw0aH2En/QO/gX6CePQKjiZ+uaGi0z1KHUz owmYJ6dqqcahmcwCGydrqKVbr2Q4bXHSgmkw0iL5rEt9vKzvAEtEGhOfrc1kKqixaOjrY9351WY Mh0/vPN1h+F7ftLNIybM6qHNQMZxseRMrq7bTleivc859nsVO9UXEw4= X-Google-Smtp-Source: AGHT+IGRoGZ7coEeYo9o9fE7YTKv7YM5Vcb8VYcCl0LtzUFuhPuPAIbAabhl/TEnMhgrans4FlUiUA== X-Received: by 2002:a17:902:f648:b0:220:d601:a704 with SMTP id d9443c01a7336-22428a967a4mr181654565ad.18.1741582738292; Sun, 09 Mar 2025 21:58:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 07/16] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Sun, 9 Mar 2025 21:58:33 -0700 Message-Id: <20250310045842.2650784-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- include/tcg/tcg-op.h | 1 + target/ppc/helper_regs.h | 2 ++ hw/ppc/spapr_nested.c | 1 + hw/sh4/sh7750.c | 1 + page-vary-target.c | 3 ++- target/riscv/bitmanip_helper.c | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 23958c6383a..18bbb1403c6 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..12fda410bb0 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -20,8 +20,9 @@ #define IN_PAGE_VARY 1 #include "qemu/osdep.h" -#include "exec/page-vary.h" #include "exec/exec-all.h" +#include "exec/page-vary.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..d93312a811c 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Mon Mar 10 04:58:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009284 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 1D0DFC2BA1B for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905967.1313477 (Exim 4.92) (envelope-from ) id 1trWqt-0002GR-9A; Mon, 10 Mar 2025 06:43:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905967.1313477; Mon, 10 Mar 2025 06:43:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqs-0002DO-PD; Mon, 10 Mar 2025 06:43:02 +0000 Received: by outflank-mailman (input) for mailman id 905967; Mon, 10 Mar 2025 04:59:05 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEH-00070S-LG for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:05 +0000 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [2607:f8b0:4864:20::62c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 61434633-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:59:01 +0100 (CET) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-223959039f4so72659275ad.3 for ; Sun, 09 Mar 2025 21:59:01 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:59 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 61434633-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582739; x=1742187539; darn=lists.xenproject.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=nnRQREfY8a8hSo7O5I1BTgAG3l8eG/Rc3wUh1Oiddgs=; b=kvGAjamNHVP3zUFlVlqc4eqZJDNVC3pOlJCk0JpwNKfCRHL3+fFf+PQn5ihjFjqdq4 kNH9NLKxw+C9yxcdrdOdDVGcXN5vNjIMjC8UW2atRBjuEkCV1U1/OwwtBB0BY0bkb6m7 mameGeisaz9s/enb0CZbYhQ8X79LARZUf587f7XgaKQFzUOho7AGzuQitOavWaVLvkVJ wwxP/7YGGPbYKXnpU+T4UptMmV6niX50llnoEcOFeAb5U+arUBW0pUW6n9ct2asDPkat TtI2kgrzzXoylLR4kbkuaKSAJZBNCyaxbO+8xELOgs2DekRYFYRUPuQQZkKWdqiBNftx Fakg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582739; x=1742187539; 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=nnRQREfY8a8hSo7O5I1BTgAG3l8eG/Rc3wUh1Oiddgs=; b=U12OpdKFMEYM3/satlsKfy6ZAmUX+48f7trtdf68B91QuBXikXHUkJnqbG7VLGzAnF Mt82AsxvsCQ9nfRuyed3aJmNFRC1uam6J1Qtnj7++qQ1+9zIApoOnTNYEKdTJMquVNeg qgZyEkQG/3MXNnsTjTajgTTy0ZBIzo0m/yVwAWnCjfztmUBfxyH03FhZ7qH/tBcUIDh1 dzp6AE1MPfc35/G5syVC9ICjD76uoGHrIj8I6lhpQcsZWpnt+EmAdx3j1ddgEp7Q/FRD S+VWEVe6mZipBU/G12sK8+nXsDFJma+Qw7EuVwcyqbN3bGPrKMuiBKs9sU3N5AkE9oDq YCqQ== X-Forwarded-Encrypted: i=1; AJvYcCW+TA8VNcmlaL9xYC0ng8A5S0B8KjN5AVhZdZXRG121iy1YI6b3VNeTn4BrwArmxEUp3gm2EuIZYcQ=@lists.xenproject.org X-Gm-Message-State: AOJu0YycgCKHhoUi6BCNtihUe1P0QzCKk6qxBWRcjIhxFFwlhn0rDrqx tBF+oJGOdXO/pAeZY7+zuHdx2lbvnimiXRod3/tJy/9Ox4rKktVR4VcFeDrkHQA= X-Gm-Gg: ASbGncsOookgIQgVIQqLZqMxlz1fWMADKKW0ZTiwLo2fo32rv7S8YilZq+V6WvWhUoD U1sIxVJb6IyUFkrNieqPx0ZTh+xqfVCEy/8WNZ+25OlFki3ZLgUZwrhoWt/Kqo+d57rnOvNCDYV MMkM7eVQRT0i9suXK/va96dDV5jZHhiKyuI268T9Vu/+9GZPb/OvoG4dRLUVE+rexilt3yPuHi7 Or9BN+hrJBMxih49crJrXz+v6I943A+0Rfptqs5TG3mnUZl+8VnvFZPthzX/7tArih2+6PmIOXg wPPtseoi1NfgWbG2Kyw2QsO78zqgnTV5yqnt7UiRxYGD X-Google-Smtp-Source: AGHT+IHAsq4Y63EYcwwuW/i7zg2X2liiOFC3cUgAGGWfi3nL4Ogmzyt5TH8VxxgwmAwHkd5TSMj4Zg== X-Received: by 2002:a05:6a00:3e29:b0:736:5ee3:64d5 with SMTP id d2e1a72fcca58-736aaaed79amr16963023b3a.23.1741582739550; Sun, 09 Mar 2025 21:58:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 08/16] exec/exec-all: remove dependency on cpu.h Date: Sun, 9 Mar 2025 21:58:34 -0700 Message-Id: <20250310045842.2650784-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Mon Mar 10 04:58:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009297 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 9C838C282DE for ; Mon, 10 Mar 2025 06:43:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905969.1313482 (Exim 4.92) (envelope-from ) id 1trWqt-0002NU-NK; Mon, 10 Mar 2025 06:43:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905969.1313482; Mon, 10 Mar 2025 06:43:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqt-0002K1-4P; Mon, 10 Mar 2025 06:43:03 +0000 Received: by outflank-mailman (input) for mailman id 905969; Mon, 10 Mar 2025 04:59:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEI-00070S-Lb for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:06 +0000 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [2607:f8b0:4864:20::636]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 61f4d223-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:59:02 +0100 (CET) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22409077c06so47319435ad.1 for ; Sun, 09 Mar 2025 21:59:02 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:00 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 61f4d223-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582741; x=1742187541; darn=lists.xenproject.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=IPEDYJNluDpPES/gm3SGsU7HvgYj8dBtSrlHoVBQ0cc=; b=OjiXXz1DPqdeSG/s2a39ISkjWnRfIMRl0XXkUAwV3g2k++CsT7A+keEfpP3GxNfwdN u/DPIfbve7P8koO1sH+muVDRmGWcQShNJ1ZTUHRbTT/xVzoej9216a2xiBS2oSagn2X0 KwEUoX/qhbrC8UAYiCYufoF4CGl6xT92YeFzmEXggz89sl2hfio/BNHpEKxIySJcJdyF uAfsiITLFrqbo06uHIE10e+l7NsG6mvBQM6wAGjkPrLotJNi4yPZq0tf9+AyCbdi4RB1 r2zKUVukU15jmDQAYgA9a4VFLsQ8dpQk0clEzpnDzHziISQrlGzU0/qFpD5Ct5WHwDjk U+IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582741; x=1742187541; 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=IPEDYJNluDpPES/gm3SGsU7HvgYj8dBtSrlHoVBQ0cc=; b=VOr759h2yEpeU8IInp1WSwdAzgBjrCDoYjRPmamCdQHejwlP3T0ZSJXvXwzdSGRn6t MT3oEvA+cIB0wn2UFU4Pr6w9ptKpTk/SHtG3SRVnAZLeRGfQabvcNX74a80dV1thHXTV TMpU/GvwW4KcHwZGc9/SMFqUJh3rXHHqXP2cU6/4qIIijkiqkEnEc49vJMgOz/wFGU4y KKE/gW6lY7sjAKwYV5KBRQPA0qSYWkIN1pReE8e74K4zwTUI7BjJ4wxpPKdvpUKtQiox fKfUQQaxAMgTX0Ln4A0bHN4eK4yarlzPSlbsa2NbYqJR3LLMv30y0+1Vkoj1Z8sGsp+w OjHw== X-Forwarded-Encrypted: i=1; AJvYcCW+hX9qTDMohwH5sQkaRmHzYZRoIfsxyqu7guN2SLWWAVpzF1FPwDacZKTM1jsPGA1wvcqUEm3zRu0=@lists.xenproject.org X-Gm-Message-State: AOJu0YzdJ4M60qGAulz8DUk6RisJJQpCQt9JUQKxvRXcbRWXhpMHVBIJ HBvSod3wZpmGaT+MtHX7+y9JQvbd00OalfwhCWIGjfJhHTldFKry9FvyjmEzqQM= X-Gm-Gg: ASbGncuaJAfUJChXS/4jrOAAGoCEbyfelkmB8UsSRHsI7IOsJTCPYMxbjWZ7IuanuhT X/9HJ5umXw80ji8bjZJZA+lXc3BGFvRQtuAB64/AL/9hrEn+kQ5L65XN4rRhl5eM8diaAO8C9iX Eaful6UJcDBWanZirmYQ0MuBahFNXhAhvS7fo6vJ1rpU3UUXDjZ33tNFeFUehTNOTZrtdS847lP +mnYuE+PdZNHKIfESxLZbmddius9qKGQUBjEzIPAhqt88bA6T2uFTmcs2UGPcCt7N8tpVpzuAKH KrT3fz++VGXJduigIudCSCIanxSiZGkxu7dbD/78XEib X-Google-Smtp-Source: AGHT+IGnRL2uatBuqKhV40BV7IK05QSeZki08kFFlneJ+DA+/in0OuYiAmS5NbuJabl8/7CaVrRM1Q== X-Received: by 2002:a05:6a00:cc2:b0:736:4704:d5da with SMTP id d2e1a72fcca58-736aab14d5amr19552625b3a.22.1741582740826; Sun, 09 Mar 2025 21:59:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 09/16] exec/memory-internal: remove dependency on cpu.h Date: Sun, 9 Mar 2025 21:58:35 -0700 Message-Id: <20250310045842.2650784-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Mon Mar 10 04:58:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009294 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 04CB0C35FFB for ; Mon, 10 Mar 2025 06:43:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905964.1313457 (Exim 4.92) (envelope-from ) id 1trWqs-0001wr-46; Mon, 10 Mar 2025 06:43:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905964.1313457; Mon, 10 Mar 2025 06:43:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqr-0001tU-SQ; Mon, 10 Mar 2025 06:43:01 +0000 Received: by outflank-mailman (input) for mailman id 905964; Mon, 10 Mar 2025 04:59:04 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEF-000735-V1 for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:03 +0000 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [2607:f8b0:4864:20::102f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 62a8b858-fd6c-11ef-9ab8-95dc52dad729; Mon, 10 Mar 2025 05:59:03 +0100 (CET) Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2fa8ada6662so7948105a91.1 for ; Sun, 09 Mar 2025 21:59:03 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:01 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 62a8b858-fd6c-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582742; x=1742187542; darn=lists.xenproject.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=pcOq/B0qkF7oBYEuLqTVXYwaTmG9K1DoxB38gebkidU=; b=Ug909t6oOZ+qhEAFZgkXv5IR5GPQFhiPmsozn2mvH9BJ3EJx93H1FZXulK/LtANPZc VP8ANg5DZCFDs+gpBPpey/1XRCSo9IYTCdpax5is2jwmFzlP/FaQ1dHd1k7nPYwQtH5U inwzkK/s7sk2CWOCTQoa9raCJ2+JBaEZhhiesCpWD3i+1Uj7X/R6i8Fi/quAstkOM/5g MdsjZL5E1syTW1AXv4JoyfJ7iXHi+kP4n/sP9YoP/50oU1Ft92kZdaMOl6Z1eNSPDGpm q9s1Nl6Rx71JYzyuoAkxXkM3rchC7ARJ+tlJ+e/KdzLlGnNyYkpLDwkhPCNQRGMD/IXB udlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582742; x=1742187542; 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=pcOq/B0qkF7oBYEuLqTVXYwaTmG9K1DoxB38gebkidU=; b=pfUAP6ZQXAZOKIOEYt7JnA3yDzk9mmTddq25PrbMTLxG5sgbFj8Mz/iLxeECNzASYg CJs4LvUoYxQ9AeV4A4PF1TvjXcqWiIebw7bqRrXRRyx+eGshpmo9mlUV6vqZnzPaiDGD aDXZ5NsaW8aRmYBasFjc6xgZO3IxqDoncxBXggWLVgsUz/cYJwf+TOXqthrWHLrtpTYV tOD2TU08Fuv0kUl5+emSb42XathRVPzFg0f73/04C0MRLqd8J6S2KNAVfPAXnOXnZ2b6 6FVI03nzdYBSE/7qLZ7KviELZ5AEWXyK/42NyaFx4yao76+7FZMpl4xUo2ll4Jg6HipC BiPQ== X-Forwarded-Encrypted: i=1; AJvYcCV9iCVS4MKwf7s70LjlbpdzXHt5TLvIP8TG24ZJU1Zn+6jieCqNuJbSLpsYRNmodghzfq2+fcrdFT4=@lists.xenproject.org X-Gm-Message-State: AOJu0YxLhgMrofULsnJmDijswB6P1IieQj6U8u4wOLpXDwgV35UfMid1 GMQ9Zd1WDLQlUYmJb+W9qHOv5UoWccKOOSzyfplkTVTOsPJZf+cd3ukswaDCA/w= X-Gm-Gg: ASbGnctwOA16IJMBLNhJE9JHBr8jemzBgApiucumPE6Z8vfSSZfGq194YdZqWdQS2wP fa/OYk+MphkybXYDQ5/AeuNx7eAQZYPdKU7ijcro6VVlqq797GsvGZ0OtaaUH0JPkpO8km1IC0T QS159u/GuFjZeifTNf0XYCG3OdtYyxpjyjw039YUx2vgf03nD9DeXyc+InzK9oT0rxMX+Mry9N9 WYEKJ+c773FgewyucPimhfzOPMpox7vVQDSbe3YSKCminkxrWW496ogE67n1rXUGzAwkOBJPhFX /dlRSn1zIECl929nJsMA3ZwaHtAWo5npVa2SglhIusLB X-Google-Smtp-Source: AGHT+IEEpEpujiC2fwj7VGkMO+uHTookE/oxRvy3WzoSDUTK3dbiUUraMl3feFU8Mr38LhiryglRJw== X-Received: by 2002:a05:6a21:8dc2:b0:1ee:c1b2:76d4 with SMTP id adf61e73a8af0-1f544f67b54mr22292031637.40.1741582742058; Sun, 09 Mar 2025 21:59:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 10/16] exec/ram_addr: remove dependency on cpu.h Date: Sun, 9 Mar 2025 21:58:36 -0700 Message-Id: <20250310045842.2650784-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3d8df4edf15..7c011fadd11 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Mon Mar 10 04:58:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009295 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 138E6C35FFF for ; Mon, 10 Mar 2025 06:43:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905966.1313469 (Exim 4.92) (envelope-from ) id 1trWqs-00027W-NW; Mon, 10 Mar 2025 06:43:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905966.1313469; Mon, 10 Mar 2025 06:43:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqs-00024e-AO; Mon, 10 Mar 2025 06:43:02 +0000 Received: by outflank-mailman (input) for mailman id 905966; Mon, 10 Mar 2025 04:59:05 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEH-000735-2o for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:05 +0000 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [2607:f8b0:4864:20::62e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6361bf9c-fd6c-11ef-9ab8-95dc52dad729; Mon, 10 Mar 2025 05:59:04 +0100 (CET) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-225477548e1so20296055ad.0 for ; Sun, 09 Mar 2025 21:59:04 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:02 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6361bf9c-fd6c-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582743; x=1742187543; darn=lists.xenproject.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=bTI1e75Far6tkvgIJWf413Q47HXvE/J/3XXxjgsh6yQ=; b=UwdO3/DlArvPrTbp7cCirMYVd/il1H7IPdcFWlxtSXqc2kgHQa9CW5UivbcyQagELN Y5Hm/s7op8lqFSym1LmYVnZUiotjLgHSC4rfTmzu+yYa/gDVFd1NMSU44lOX64Npg8e3 ziOjlQ+Y6hyD6xAp5OvC1ptab3Ep+Vx0NclWK7ReGVGpmKEwxr8Sx0RY+lOtkUSbMzja gF7n5wHWCZisHu298rs8eBL7fezC1HyMnezZlH/0o3xwm+kk8V2/P8qix8EwbcOIqYki IZwYi+qQezBNT71Qj9AEAmTnWvlsfdNCPUFSp+xVPCiZR+6N70DO2lE8BS1dRDehLjj2 N70A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582743; x=1742187543; 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=bTI1e75Far6tkvgIJWf413Q47HXvE/J/3XXxjgsh6yQ=; b=vBpbyJr2AybVZHtSTSCj6b1r/qw3oOV6YYkhh863mN0vDCb54MFyLxO+gj+O2KumMm t5TF0UYG5xG6Cv7uU4LFI0V4heerANKqF48s9KSKgT2GHyZf306I7NIm+7mZDT7+JtKD l1gBNsCD0hCiqAz/aaknpfi3H1WWGRQ+1U47OolQFfUaigqOKIiJjEPcNVjhz6zDYd9f lsZGGTH7YTfB3Tyrr13S7Gjsmk6HTWKmG/4rJdYIt51b9n8IRYWncnnjrB/EgZ4khK9u 4B/JvZczgeLwo9vUX3F+p/3h64BkM/65OyRjFJGrv8hCZZk+AvamsN74pJwpt0UE4O3q aajQ== X-Forwarded-Encrypted: i=1; AJvYcCVPHgsZ/RYNMcvulqpEE5U1aHuacpU8Ky/hKXPP3WZxvn79tMOpNYYlQRRaZ7WN82qHjPY5MsAImNY=@lists.xenproject.org X-Gm-Message-State: AOJu0YzrYy7ntWdrn/K+ZZlUx/Oal2m7CLd0MBUx6lmcMdEOf+yWDlrp b9YZmN/Yxxqdnly2VHr/NPOOUoUb/4r1JoO0OnL2aCzH9ih2zFj4+aQ15aS251c= X-Gm-Gg: ASbGncsUw2WOOGW5etwiOOeLyAId5oQFMD22gFRKCjZ+2oJVqGsYCAlvSdbWt9+ZvQf aLO4WyD//CtqcYm+89MS+56GjeuBZ9w3ZzDkTIjXcOI8ZhRPTtF6DApRUDiHmHIOEApiKDhWbTR YIDU7yDEa8gWQTVSV1fRpm9l0nIqcIJuD/7n9BdjYShGKvxHV7EnvxUreaEkN2nKJal2mNMN0Bw ybor2pdUsUmazFr5EOU+t9nDoWCKoy7tienikeMBmH3N9InjzsjAelAVeLigxM2vIbkLJ52Yyol i8FCZ9jPc0UeTMP5Dl5K67RabCkrKpyMtQEzx6R1eMx5 X-Google-Smtp-Source: AGHT+IEJmFw/36nK1SG72X+BhxhrmIBbQ3tB+znRJTwS+V3kz822OtyZYcKaYIi+o8+TLN45WlwkAA== X-Received: by 2002:a17:903:32c5:b0:224:3c9:19ae with SMTP id d9443c01a7336-22428c07361mr200227865ad.34.1741582743213; Sun, 09 Mar 2025 21:59:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 11/16] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Sun, 9 Mar 2025 21:58:37 -0700 Message-Id: <20250310045842.2650784-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 This function is used by system/physmem.c will be turn into common code in next commit. Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..21da3b8b052 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -210,11 +210,11 @@ bool kvm_arm_supports_user_irq(void); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#ifdef COMPILING_PER_TARGET -#include "cpu.h" - void kvm_flush_coalesced_mmio_buffer(void); +#ifdef COMPILING_PER_TARGET +#include "cpu.h" + /** * kvm_update_guest_debug(): ensure KVM debug structures updated * @cs: the CPUState for this cpu From patchwork Mon Mar 10 04:58:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009283 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 D9B02C282DE for ; Mon, 10 Mar 2025 06:43:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905973.1313502 (Exim 4.92) (envelope-from ) id 1trWqu-0002nr-Vi; Mon, 10 Mar 2025 06:43:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905973.1313502; Mon, 10 Mar 2025 06:43:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqu-0002h8-C4; Mon, 10 Mar 2025 06:43:04 +0000 Received: by outflank-mailman (input) for mailman id 905973; Mon, 10 Mar 2025 04:59:08 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEK-00070S-Ls for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:08 +0000 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [2607:f8b0:4864:20::62a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6414b0be-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:59:05 +0100 (CET) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2240b4de12bso56093115ad.2 for ; Sun, 09 Mar 2025 21:59:05 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:03 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6414b0be-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582744; x=1742187544; darn=lists.xenproject.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=0+faf/Iypy1sVhFNFInOCPAbXVKj8STEbMMwCdFMyRw=; b=b4uYIVhQNuu/Rev+NnYln+CiLyYUH+JzVeZNWyrO32z/tJ+0iSe2YsX4PFjOi+KibN p+gv7/i7EGtzuXbsy881Gp9hl/1WCEcosyPcyBgpAbLyjFbIbiIuwGDoLkSwtooT32F2 8R3HKsNy+FRCotzGsvJDLV1RYpICrvjz1cTk5bswkPf2W/dfgO04uaAueJaIcBq9ZwCM D1eISl1r+Nkcq1SaJ4SgEpVhNFruWJfSqFu5qZBGvRxXuzfjVad6JPAMNaX3diPf8q4J eV87u27iIBtw5D8nrNQKviep68zGejf83NJOQGcMO6pV1Cdp5hz3epsUrbl2u9SAE6Yr 8VcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582744; x=1742187544; 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=0+faf/Iypy1sVhFNFInOCPAbXVKj8STEbMMwCdFMyRw=; b=t1JpkJjJiDtFOFPW0wYkr/Ayg4PU7s34DfX1i7qYn/6Ozqep4Abt91IbvNMVp7DTT5 4T27lQxjoqrImAltI0ygfW/J15ynH0a9gvXXjT7Y01wFriUc8jnQ3oTBca9F2mFKUkgZ 3e8hsaRf14ZjJO1PQOHEEi4/uZmV8Ld0uJ4m8lv+Kh4BLzupwDE0nS9OaKrtfvFvnWPb ii874e81nwnL4Ott6tNrrKIG7pcSTv/w/fWZW0fGVChLJZl5GM99LGma4jqU72qrVhL3 xWrLMLfHvfVrPPFuqhuAmqH2USKAjeI7OhwTG5V4IJuZ2mdtQ5TpQhkTtH+9dUt9gyy0 vdLw== X-Forwarded-Encrypted: i=1; AJvYcCU5wsDALsCt/r53/OuzGluzr4SHUAHmmhXNJ7haXu38/J+5L4j+Ttw3OiCqmpFQR4/kfXBGiBwlk5A=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz3xlHjlZ1COEbP7rUPa8lRQogF9BhmQtaPVGKRIanWbExU+9M5 U43Jjj1vb4dVmx6adrN0UkOV22Tjr6UC3jfHoLGJZxZbdfVW2wIOh/WriTAYSow= X-Gm-Gg: ASbGncv2wYW1iDDXzu2hmCKBdYw2bOJCzG3iTJfmSjY1izX5+LUbmoPO/8cTyicrsH2 WV4oZPk6UOCorWvndocTO3DjDoRV4MgfjBdo2VTg9GSeJkWpLLZFANbVA4ldMgjYmz6mI7qavMo Dze+NHt7UN6oI712pgpO1HTyshtR0Rr2CCxMSBV8Yqcwb/mDpD8PyI1jlZgWq8NNB7TPzOfgXDt WsIFGh5ZEhzGYdWCgI5q9b6NQdHM0VBiqERxJVEYYQVyfqAQv+cxikOItGrjxFodZkurmbAZmY8 TpPPzdcIxFWc1I8TlTHMN+zj7p4sdr4sRt66EFLJqB1Aoes3F3uKgJk= X-Google-Smtp-Source: AGHT+IHvC7npbpjr3DTdxoZwzYb1dM7G7lfM3pxuLeNMzVZpdYuqkJ12UM6z/Bptz/oCAInuSIhPSQ== X-Received: by 2002:a05:6a20:a11f:b0:1f3:2d62:3151 with SMTP id adf61e73a8af0-1f544acc6camr22843444637.7.1741582744338; Sun, 09 Mar 2025 21:59:04 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 12/16] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Sun, 9 Mar 2025 21:58:38 -0700 Message-Id: <20250310045842.2650784-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 7c011fadd11..098fccb5835 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -342,7 +342,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -418,7 +420,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Mon Mar 10 04:58:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009282 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 DBBECC282EC for ; Mon, 10 Mar 2025 06:43:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905983.1313538 (Exim 4.92) (envelope-from ) id 1trWqy-0003lk-AP; Mon, 10 Mar 2025 06:43:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905983.1313538; Mon, 10 Mar 2025 06:43:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqx-0003fX-KG; Mon, 10 Mar 2025 06:43:07 +0000 Received: by outflank-mailman (input) for mailman id 905983; Mon, 10 Mar 2025 05:00:32 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEL-00070S-MB for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:09 +0000 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [2607:f8b0:4864:20::633]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 64d1eb34-fd6c-11ef-9898-31a8f345e629; Mon, 10 Mar 2025 05:59:07 +0100 (CET) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-225477548e1so20296375ad.0 for ; Sun, 09 Mar 2025 21:59:07 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:05 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 64d1eb34-fd6c-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582745; x=1742187545; darn=lists.xenproject.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=Mz3bAPQKR6fBbshrwXBmzVU3oJFomZ1j01ZC38m+4VY=; b=Hfi1g9ZZ1P0TQ2wYMpVKU0npiziFjyAV4mkW8XnSf2gZEG+jNqS1zX8PIBuY4LeAyC fW+WRqRtALk/KxmIH+sqQu5usjuhPGeNRh1y6Bl4SdyZ3qZ3O2jcb6M6Jn+vEZUP2COM rk4G9kZQ/C93UdMvbXmX8TfQlkNmlXfLvO01xgyQmfLT9cAJjS4r8OVHOiAYICNZkwS/ GTvK3pQqt0lfZN6tBGCtYLjt7FXb9drCJRNq8ifLRQ0cPErGPT/jQmBUYNhLXQSqhO0X yOR0t4UMLtn7X5Y4bIVnGRYoz82M/J1oyWMcQaHB3IjIZReJGOm8OtNHm4gxXpN3+xl7 k6bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582745; x=1742187545; 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=Mz3bAPQKR6fBbshrwXBmzVU3oJFomZ1j01ZC38m+4VY=; b=EBvMdawMkEAtSfKQWRgMlZTHDOyCYZV3awvR5HGiOoLORgmcXLBsOkWO/Hf2gUPqh0 A+kFmPGWBE6a+mBx5eJM4CiGDXWwTzEreXVDIH/MwNMmv9fwme5sm6hsZERyYovJTMqD aE0ZpNHjL6bdh9nAMfishiUnDbL1uJpz48NU+lNMRZs3hJEjwCO2uLcbJB45gb8bPIHq zZMq64h/CqTxPyD+wEICmixO3g3R19ejonDV2CzfQAFb7VT1Fk6sraylNn6W+A37bYrR PeALNNi1+t3fRm54wNUzwB1xHge7n/QRxkyxiPlWApMh5uSSbfgJUKlX/1e/SlBHWa7C YuWg== X-Forwarded-Encrypted: i=1; AJvYcCXxvuF918QNLhqWXzq2/AVb4enSt5b8RiihOE9eSjgBwqZA+BndrbGFUK6ezQW3tcswuchpbPi9Pew=@lists.xenproject.org X-Gm-Message-State: AOJu0YxS/zDGSUDCyK64ET/2mFyn8rB/vdkEn28O2jShnJN7ESVpP+9q kEnE2ExLB6dkGxxIzmPWWAKBeFAqLcpJ0hxWxnaGivc6wboi4xZOgn3EIL0fdI0= X-Gm-Gg: ASbGncuJgse1vBP//9tnvMc81HrNmDTSWoF4k2erON0gwekLQ0ViItVRUYk0jSpkOhG RCjUQmoWk/1Pf8WdfysbuFny16kmK/vcUo5O3JHGyqTnFtiq33xVWAIdzRg0QaEjdE+Qrzxu/0c 5zlTqXsCY6PRsxZbtiEBLDNQuYF59CkpB6G1KSmnOaT3c9xgKYtWE65oUgRUViz33kPsS08x3DX DZ+8KImzrCu/QccVPrHcbA6+evkGfgclZ7GySoDCnnH5vhUpxZDH/dM3ofnjR9KBL1j7116scBc RqvpADuDtlHOsEPYD6Wm4qkkLNT+dgu/HqZH3V04Y34eV5QFVeueGyY= X-Google-Smtp-Source: AGHT+IF05iTMc8yin7+8YVYQSgdEUPUj/50hW5+Z0DK0JGoSuS9iEibUeyOyOMAIIkH5mDIAK7kv9A== X-Received: by 2002:a05:6a00:2e17:b0:736:3954:d78c with SMTP id d2e1a72fcca58-736aaa1ce42mr17690072b3a.6.1741582745578; Sun, 09 Mar 2025 21:59:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 13/16] hw/xen: add stubs for various functions Date: Sun, 9 Mar 2025 21:58:39 -0700 Message-Id: <20250310045842.2650784-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Those functions are used by system/physmem.c, and are called only if xen is enabled (which happens only if CONFIG_XEN is not set). So we can crash in case those are called. Signed-off-by: Pierrick Bouvier Acked-by: Richard Henderson --- hw/xen/xen_stubs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..19cee84bbb4 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,56 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache(void) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Mon Mar 10 04:58:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009296 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 0AFEEC282EC for ; Mon, 10 Mar 2025 06:43:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905974.1313511 (Exim 4.92) (envelope-from ) id 1trWqv-00032q-O8; Mon, 10 Mar 2025 06:43:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905974.1313511; Mon, 10 Mar 2025 06:43:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqu-0002wT-Uv; Mon, 10 Mar 2025 06:43:04 +0000 Received: by outflank-mailman (input) for mailman id 905974; Mon, 10 Mar 2025 04:59:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEK-000735-M2 for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:08 +0000 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [2607:f8b0:4864:20::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 658460b3-fd6c-11ef-9ab8-95dc52dad729; Mon, 10 Mar 2025 05:59:08 +0100 (CET) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2255003f4c6so17804685ad.0 for ; Sun, 09 Mar 2025 21:59:08 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:06 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 658460b3-fd6c-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582747; x=1742187547; darn=lists.xenproject.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=GMZho2jTEznhsPIS6UESQksv+KrJv0rJOAa8ZMe9/mc=; b=IsKsnidGxtIvsNR63CCYeXYz/4d/I8bWkAP4tpQsS5liiaMMKJ4YbdhhIvQaLnb7Yf 6RGWuUFeNXxZrwbmNO+m9q+flgOFm+syKNoakOMx/i/FFNpQL7tLZjK3Na6oau8Pr7pl 95gEP+cw64oYbFq0lUsPKkn0TvbseIFqr9nlfVi6BD5s3fwDNPGHXs2NqcY70zHaz+30 zfBPTNYQKnY+ZspFyVVahHx4jO+JQsynX4QqEER7T5FALNuE/xCmg/uh6atTbkhvl/l8 aZUPUHu/s4fNJvQbjYsThiCfSUv0P6UmT/i1yBNIdztUrGIlF96yoEHvsyZjHx693j6D u7cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582747; x=1742187547; 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=GMZho2jTEznhsPIS6UESQksv+KrJv0rJOAa8ZMe9/mc=; b=rtEXPvvBv1S2AJK1XZqrm1uNTE3lexnnIeTPSihj9BvHoqmVNJY9yGfFAe2iRS+fIj wa7im4SLCmD8yRHzLL2I5mSzlsNSnDcOUFP4zWSZfQqRNHZirMJKQU1BpZ7cijJlVnKU Mjg0KEwbmN3saXxeiQFMs+OqRE2fyUjGwPjs5aYiDjt7fx58POKrDm9VAgMuTR85aKTZ ahveLoZNSRwmG1qYX4HJWnT1pq/TrKwa7W+ZDnNHvCKN6FBLHjfDXc8Blc/bwgWNaAyO CukvxzJs0JSrE35P3ovx5ZZs/OcC2NMzqN4f7XaxfspNloJqFgbcXxLTDWYVVkeU+OTQ xk3g== X-Forwarded-Encrypted: i=1; AJvYcCUN4a7ECd8TqVPgG3UG+tTf0IsFMzznCzZSHR5I0c0RcZ0iZQbb7o2yaKroLqDgTLay+XYdjWT4f2M=@lists.xenproject.org X-Gm-Message-State: AOJu0YzOUyctZKEV4XEdV2f7U950R7swpNj4GGECV+faab5aoWBWTwVe GeidEVJK1NyYqwg8F/5XHT6MAA+YxCDD7knQ1tzCzGFwPMVvQQcJlaoqbondrAA= X-Gm-Gg: ASbGncsVJykq9S96g6qoVhuTWDX7Pwmd0NEPP7CykVdE31pdVxU601tiGRC1rqqBjSV VQSJB1OhaOICD5zJeMyTkGjbmHsC4NwTuin7KgMoFCcLjzbrP1CNFgEr5aFX7bIp91q2YtJVKo1 F1hyvCr06h9Rrtub+djwh9j9yeGfjxJosibZl6fefOZmfUUw10RQE0Hq++0aI95HqO7Kau4QIpj rJ62731pt1FhmvgiHfjfRAefyYqreI6JG+8tsNvqgkwOhSTantZAfRlzS62cIDJLyiWiJ3VFIvD h5Pier9VFWU1dvgjqRuVsl30gAmkg60oj3fvN+XON6oR X-Google-Smtp-Source: AGHT+IHbQ1zJTyihYPTNnOdjfB7Sf4JwjgD8pBM833NXOATM0his3HUH4Ux5tSFbwWsuCfmQbH8fWg== X-Received: by 2002:a17:902:d488:b0:215:4a4e:9262 with SMTP id d9443c01a7336-2242887fd5cmr174335945ad.8.1741582746784; Sun, 09 Mar 2025 21:59:06 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 14/16] system/physmem: compilation unit is now common to all targets Date: Sun, 9 Mar 2025 21:58:40 -0700 Message-Id: <20250310045842.2650784-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/meson.build b/system/meson.build index c83d80fa248..9d0b0122e54 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Mon Mar 10 04:58:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009293 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 03275C35FF9 for ; Mon, 10 Mar 2025 06:43:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905976.1313520 (Exim 4.92) (envelope-from ) id 1trWqw-0003Cr-Ac; Mon, 10 Mar 2025 06:43:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905976.1313520; Mon, 10 Mar 2025 06:43:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqv-00038R-KG; Mon, 10 Mar 2025 06:43:05 +0000 Received: by outflank-mailman (input) for mailman id 905976; Mon, 10 Mar 2025 04:59:09 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEL-000735-TF for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:09 +0000 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [2607:f8b0:4864:20::62e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 663d603f-fd6c-11ef-9ab8-95dc52dad729; Mon, 10 Mar 2025 05:59:09 +0100 (CET) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-224341bbc1dso35375245ad.3 for ; Sun, 09 Mar 2025 21:59:09 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:07 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 663d603f-fd6c-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582748; x=1742187548; darn=lists.xenproject.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=ca5XHIZHBD7tCKLnU5sMNG3rMchaOW2xdNGbrtAeUuA=; b=ShIznCKlcc13AfUB+Fz+JnpwLHMXWsyLkK4YQyQcAypnnQ8zySP/fgd9MXbtm8uqBj /sH4bgtBdmesuKImOPQxM8zX38eA4QRrJFJ8RWEqeeH5FZ/K0liPsIy1Wqcg04t/SYnn 0YdFLoRWnGJ0+xHJcK/wjzdSePTdniYhmAxyv4VR5dkJi7O4BCotlw68ARRZBYy1YZfj /SOH4plbmK3iUWEQhNigEBKjLXqyBY+JiWoUbGHhQvkSG5mi/o5U4pl0HhoSXAkO22Py bUEIj4QOViFhpel8aB86CZKS+zIVpjCDRHa6th5fvU+LZp27bVKBUnNsbjKiMUQIS/Et pZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582748; x=1742187548; 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=ca5XHIZHBD7tCKLnU5sMNG3rMchaOW2xdNGbrtAeUuA=; b=m9H4/hPdEvh8mlyE82q77gB8urFzvHTPro7ZY2lxOcc2zN1IKj5PvyrFZuy5J7AFpa VwXkAbhZ81N266krHY9Tdj+utL1nNpvQq6j66a9V1zshd4eygQL/ah4dDVh0Y84YbkQ7 L9EkFQBEJauzHWpeVVwNGCW55LFxDr9KBgOzKadkBIZBmV63qzIVWg4JR1h0mLkolH3Z jYOgWghf9zMgPILaaiMBGnJ7xGoVyA09guD1TyjWwBiK6PoCvW1G7x2DMhassTB/2p62 leEpHOqvRzgCb/KQTRYXdspG/R4v7Wo1K4KXxpoEqQkzoaQ6st6QTFHFxToKGbwU0r9I 045g== X-Forwarded-Encrypted: i=1; AJvYcCX9A7e8NrVtnN1Ook/6E3li1YkowH7ViYFRhRyUY/OrZjOoIBchdwolDTx8LUhh2kgDZj1i7bvptUI=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx84FSA+ouzyZ50fm9/bPHs8UXRa2XZy4O8O1cDJEqTeNc0fldh mh1+hjl0dWaM11lvqd2uMZJuPVNW04/R0bETJX2nVb2Au2rsI/RmftbU8RjoOHU= X-Gm-Gg: ASbGncsmrDZzrZdqMPIk9ibCZvFSLfxfzifFQIaUeggn+W+mW1cQnB/SJ848p2J8BTy lbbVc/Gkn2W9Kq6+Mgei3TNjzU1TwpW+IjCab6YwZW+TJ2CZQlgfmtdkjBUFw/lZQXDnT0vl3fW SVfOeD2nz/XG0F6M0QblIx64u58jOE2x+5ClCNBSGqzrieZNjISLHb3kVRmx9y9KN0LiakPxi4Y AVoNEpDAuOljMeHeh2c8Ufg/m0HnY9UvR1nLQxJK8MSS1TRjgvbAecw6BAPSPmlPGVt2g6B4rSi cE6oBh5GC5sMVrsM1Qv9IVvO1mlZHONSAfaI4N6wqUSo X-Google-Smtp-Source: AGHT+IHOxR50kjFp3DQk9gSBOkNND2h3Drx9YEHpcRm5j+6hJ+poi1niGnSE9oReFoFKVWczKyJ1NQ== X-Received: by 2002:a05:6a00:2315:b0:730:7600:aeab with SMTP id d2e1a72fcca58-736aa9fea71mr18336179b3a.13.1741582748003; Sun, 09 Mar 2025 21:59:08 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 15/16] system/memory: make compilation unit common Date: Sun, 9 Mar 2025 21:58:41 -0700 Message-Id: <20250310045842.2650784-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/memory.c | 22 +++++++++++++++------- system/meson.build | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..b401be8b5f1 100644 --- a/system/memory.c +++ b/system/memory.c @@ -355,11 +355,11 @@ static void flatview_simplify(FlatView *view) static bool memory_region_big_endian(MemoryRegion *mr) { -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif + if (target_words_bigendian()) { + return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; + } else { + return mr->ops->endianness == DEVICE_BIG_ENDIAN; + } } static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) @@ -2584,7 +2584,11 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + if (target_words_bigendian()) { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_BE); + } else { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_LE); + } } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2623,11 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + if (target_words_bigendian()) { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_BE); + } else { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_LE); + } } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index 9d0b0122e54..881cb2736fe 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', - 'memory.c', )]) system_ss.add(files( @@ -14,6 +13,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Mon Mar 10 04:58:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009286 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 DD9A8C35FF1 for ; Mon, 10 Mar 2025 06:43:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.905980.1313526 (Exim 4.92) (envelope-from ) id 1trWqx-0003Ry-0C; Mon, 10 Mar 2025 06:43:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 905980.1313526; Mon, 10 Mar 2025 06:43:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trWqw-0003KR-CM; Mon, 10 Mar 2025 06:43:06 +0000 Received: by outflank-mailman (input) for mailman id 905980; Mon, 10 Mar 2025 04:59:11 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trVEN-000735-7K for xen-devel@lists.xenproject.org; Mon, 10 Mar 2025 04:59:11 +0000 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [2607:f8b0:4864:20::1029]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 66f23026-fd6c-11ef-9ab8-95dc52dad729; Mon, 10 Mar 2025 05:59:10 +0100 (CET) Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-2f44353649aso5724934a91.0 for ; Sun, 09 Mar 2025 21:59:10 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:08 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 66f23026-fd6c-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582749; x=1742187549; darn=lists.xenproject.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=yo5TAW5cQeh1DHP1d5HtuffIuVKJac+rUoQhULbtd80=; b=S2adxy8Nd/4OmJZD51feUMSKWHs/gsUxnwaWATXLKof9d6pL4LXlCHEQ2nXqMR0HQL 1lOjaCqZA+toQZy/r0w2aPKinmNkMWogDFTRJaA57w2WxewXVuoFiXDbFJrtYM1kh+9Z 0bVDbuaGtuEUzKqt04ngkRu33xWnkTSTbKaWhfsDoGpHScULSByHClbS2vpL3XHB/r8V 6yG7g1bPYomWnsZh68k+oBvX9kqNCSA/b2vtUUX2x0QfYpQatgRJBPeeocyc53g6GCKS xkvjqTjnN5aL4X8Rc7Y0/bdNSRejl5Fc6kC+cTADxayRhF8wipLGkuTzGN6RZIIAV4jN T4rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582749; x=1742187549; 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=yo5TAW5cQeh1DHP1d5HtuffIuVKJac+rUoQhULbtd80=; b=pRHaEXHSgrPfkcaGeFZQaTzM40yaXogJ1y65+YbHJKShBPvpOc5BL+i2Y7Q3vQpns+ AsF6JWn9exge8oQe9Fadcogayfld+HQpfR3CWPYx1YIOrq6eAXzVEWJCGN2ieI28cDhO CCIUbeXWC04dYmIuubD7qqvuBMm7z9sG41RRRQd70JZsMtt2O9kJx5rMHiP2uMrgi0nM K3jWIWTVLS4JUkDPJ7l5K7SeqTTQou/2zSAy0DgPcY9aml9Uo89mKy9SWQW8upHBWCj3 NTa4RygWiZtPuqO5hIMy7sy+CaBkX/AZDk75jWVelEaxVm8/Qtf8Zps1a4w0tqFK+6ac W8Cw== X-Forwarded-Encrypted: i=1; AJvYcCXCoMhldYcVdGa4Qy2KoZnekX7J5yHVThKELxVusn/D+u/sIywlX/HMEedy6wxAC7Y+nnWeapJ1rNw=@lists.xenproject.org X-Gm-Message-State: AOJu0YwtuXWa6Sfju/6E0h2JYUew4MzzqVkF+RPl6pApJRDEqY2XcpRC 9QYP0AI3AA9b0SYWttxyi1hg5mRzOrNVOoYGgOj6/CMHVNxSZ0cnR805DhfUnSw= X-Gm-Gg: ASbGncvcSA6M7MQwxDri1eug5pTL6nOLnuXYdM7InYyTxe/zKalh66VsmoP/WNSWEHy ShACHimFp+ZAs7En5TiBvnBzkz9So3b0arlJ6OB2K6nGwxkPkeDaEETYMIGDDccsyF5u7SD+Dxi A2f54hjlR35mT8kdQBesvGvYaNXFeFTN2hN2gXNU62/HoTpzf1w2vdgwRQhBpyie6xvaONREVn8 hCV/D0wyGvxcZcnUeMub0+CmUK0ALVVPpoXHHSq33HwW9bk/7iZaEfhhFgUNtN4Rz6JVaw8dvRM l2zbBk6MYSbyq047z/vX/KOyEsRSV933XhWObFoJDC3n X-Google-Smtp-Source: AGHT+IE5gWrqVh7MPBsCW9xpH4WbBfOw86WZFsUWQXQSa3FRghy/XQpC1OkuRKA1xd7a02NCd2RqPg== X-Received: by 2002:a05:6a21:6e93:b0:1f5:6e00:14da with SMTP id adf61e73a8af0-1f56e0016d7mr7868375637.40.1741582749217; Sun, 09 Mar 2025 21:59:09 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 16/16] system/ioport: make compilation unit common Date: Sun, 9 Mar 2025 21:58:42 -0700 Message-Id: <20250310045842.2650784-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/ioport.c | 1 - system/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system/ioport.c b/system/ioport.c index 55c2a752396..89daae9d602 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "cpu.h" #include "exec/ioport.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/system/meson.build b/system/meson.build index 881cb2736fe..3faec7e4dfb 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', )]) system_ss.add(files( @@ -12,6 +11,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',