From nobody Sat Apr 11 18:38:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775851282; cv=none; d=zohomail.com; s=zohoarc; b=Hdyp1sHxs5+n0Xh1u50KvWpcg36T7CDY9Fv6Q0T6TH+Y8eYvE8w1wRfda12t4SacuXUkvfMTWTZ80ebw6eS416RnM7c58/dJQtnHsKzv+3/1Me91QAkMFqF7Fm0mUgAmK/fwiFW/8pgOiZGRE8HrqjIHATokYotj4Nn0jGb2ee4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775851282; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L/8LV952pK5R/dwzOOVcbtAx4yBXkRtXe7hKkHgXjLA=; b=i8Ixc167BNvV0e/yTMsgRLjsKnkn+uFdUW6FxporM3YxFimP0vs8+WhhAM/o5k19afHfIzp5Jc1SXaLv4ztVTS3Lw+y/iD2aITQm8ZoVmnqIqrIgPGbkRrwh44QPBLD9l6qZRgmEtYNs30h4DitRv6GBcAvg2UyUeM/ICbQuKu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775851282698203.5748512286134; Fri, 10 Apr 2026 13:01:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBI28-0007T2-Hh; Fri, 10 Apr 2026 16:00:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBI27-0007SU-Lm for qemu-devel@nongnu.org; Fri, 10 Apr 2026 16:00:51 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBI25-0006dv-NJ for qemu-devel@nongnu.org; Fri, 10 Apr 2026 16:00:51 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488b00ed86fso25920615e9.3 for ; Fri, 10 Apr 2026 13:00:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488d531f2b6sm106579495e9.2.2026.04.10.13.00.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 10 Apr 2026 13:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775851248; x=1776456048; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L/8LV952pK5R/dwzOOVcbtAx4yBXkRtXe7hKkHgXjLA=; b=DoiyVipYnVk1eOV6f9pAj8GBuz1p7BZRRDAhm8HGCjZeiyLb/wKivgP033uM6/FWGr u1f/pBpSejpV0criwBvAchw3HJzy+VLpi5qtYv+RUAw/z4AFJNy2JrpO6SMrbJBSFs0O unJmmyIjIhjRbm4yKm9NgcwVfHzp0FCSleyfkG3dfks45uWn2eJys+BCFC8iq43l7zRo H5tBCge/hA9cmIlg8dIQM2ByZv08mNWxqo3Le0t6sOBx3S8BzckCY0ZbQK7PRhfi7hd8 hhOkRuwQjkgAKtp3bK/eUDSylXavl4KIPPaFdJzPXaaZ2pAOaQMFsAg7xp5n8gvnusyp wbIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775851248; x=1776456048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=L/8LV952pK5R/dwzOOVcbtAx4yBXkRtXe7hKkHgXjLA=; b=iCpnSr/8tITcs8aiLwpnJGraiCG9XFQcPghQjIqQC0lsgS/mSjWJODScO52pbT1159 hn19KRV3dc8I9GyaSg5XI1UcH0z36lX4aGQc1LrywSQ5CUPe7o6zpfIJZV5VsfMYQ6hq pvVO5RnRcyTIarQNqq04Y9OlFtJVrCN9UhRd6G2agE9Sb45Z/OxOoEoms84mgk9Hn0vj SK4fqzW/1/SBoX9tPVY6kVe2u7bBNdyEorRKrIA6igzFRxm8OwxPVh3KrGtbK4eINkyl nGTfUszsOmUDMUca0ZalnGN9VtQ+FW6uQC6zkfY88n/Avga3OCj0VMk0JbBc+acvwDut YS7w== X-Gm-Message-State: AOJu0YzeuHG6eSWfWNO5eqX/OkQkoXMqcYJcpIyN2OxP33jskONyaxUd sxL1H+bl76CkPURcIGtxWbQ5pVpxrZm7s7wuN0D42iAhy/LXvdUIBHkd2D0hzKxhmN0FfbRCsAq pH85NjQ8= X-Gm-Gg: AeBDieu7dy1l8zXO1F8Q+AQUc9zMWrhlQIQO3Ooj8PmAVQf1uVxvQXLTvPc6AyzSiRF UXF8S9oD123ZfXgRCyqq4mi3uIvxzH8uB9Ny8Ctq4i1F/b+sbKJqNNZRv0isGuELP1hbcfnTb5B TJ/+xJyKLi2HKA/AG/2kkQsaIh/IenhK+pCojOjxNZhykgB3s2AFviNN7AX9Tppn3g/lXT+Ky1h MdWAd1SxnMVRCxgQb+zV+36od6COK5bbHIkJbxALf6pUPjtzBTYaIpuo+j7bcwvHdY+GJs8ovWz kcmr6EPrBjptD3HUIZOamJfkLBlpFEHawzBOS/wrtgmHmz5uj3m21ooxpKKDzWsZ/dpTcgfG1wB 5huKaFnwbul7xj+f8SBBXEKxGaDVVrOMBfi02pmfFQJF4M2+GiT6b9YeJzq8BP6n8eskOw1Hq57 3XzGvOtxu6Li3rQ9tdIOMWzWU6K7EnIrVz3H1Hou3iYawI7M1w8pYO3raFzjscMXkypXOkL86Y X-Received: by 2002:a05:600c:8883:b0:488:9439:880d with SMTP id 5b1f17b1804b1-488d689da95mr40570995e9.29.1775851247610; Fri, 10 Apr 2026 13:00:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nathan Chen , qemu-arm@nongnu.org, Peter Maydell , Shameer Kolothum Thodi , Eric Auger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PATCH v2 2/2] hw/arm/smmuv3: Avoid including CONFIG_DEVICES in hw/ header Date: Fri, 10 Apr 2026 22:00:31 +0200 Message-ID: <20260410200031.18572-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410200031.18572-1-philmd@linaro.org> References: <20260410200031.18572-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1775851284707158500 By turning the inline functions into stubs we can avoid the use of target-specific CONFIG_DEVICES include in a hw/ header, allowing to build the source files including it as common objects. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/arm/smmuv3-accel.h | 42 ------------------------------ hw/arm/smmuv3-accel-stubs.c | 52 +++++++++++++++++++++++++++++++++++++ hw/arm/meson.build | 5 ++-- 3 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 hw/arm/smmuv3-accel-stubs.c diff --git a/hw/arm/smmuv3-accel.h b/hw/arm/smmuv3-accel.h index 1ca2c80a933..85669d0e00e 100644 --- a/hw/arm/smmuv3-accel.h +++ b/hw/arm/smmuv3-accel.h @@ -14,7 +14,6 @@ #ifdef CONFIG_LINUX #include #endif -#include CONFIG_DEVICES =20 /* * Represents an accelerated SMMU instance backed by an iommufd vIOMMU obj= ect. @@ -41,7 +40,6 @@ typedef struct SMMUv3AccelDevice { SMMUv3AccelState *s_accel; } SMMUv3AccelDevice; =20 -#ifdef CONFIG_ARM_SMMUV3_ACCEL bool smmuv3_accel_init(SMMUv3State *s, Error **errp); bool smmuv3_accel_install_ste(SMMUv3State *s, SMMUDevice *sdev, int sid, Error **errp); @@ -53,45 +51,5 @@ bool smmuv3_accel_issue_inv_cmd(SMMUv3State *s, void *cm= d, SMMUDevice *sdev, void smmuv3_accel_idr_override(SMMUv3State *s); bool smmuv3_accel_alloc_veventq(SMMUv3State *s, Error **errp); void smmuv3_accel_reset(SMMUv3State *s); -#else -#include "qapi/error.h" -static inline bool smmuv3_accel_init(SMMUv3State *s, Error **errp) -{ - error_setg(errp, "accel=3Don support not compiled in"); - return false; -} -static inline bool -smmuv3_accel_install_ste(SMMUv3State *s, SMMUDevice *sdev, int sid, - Error **errp) -{ - return true; -} -static inline bool -smmuv3_accel_install_ste_range(SMMUv3State *s, SMMUSIDRange *range, - Error **errp) -{ - return true; -} -static inline bool smmuv3_accel_attach_gbpa_hwpt(SMMUv3State *s, Error **e= rrp) -{ - return true; -} -static inline bool -smmuv3_accel_issue_inv_cmd(SMMUv3State *s, void *cmd, SMMUDevice *sdev, - Error **errp) -{ - return true; -} -static inline void smmuv3_accel_idr_override(SMMUv3State *s) -{ -} -static inline bool smmuv3_accel_alloc_veventq(SMMUv3State *s, Error **errp) -{ - return true; -} -static inline void smmuv3_accel_reset(SMMUv3State *s) -{ -} -#endif =20 #endif /* HW_ARM_SMMUV3_ACCEL_H */ diff --git a/hw/arm/smmuv3-accel-stubs.c b/hw/arm/smmuv3-accel-stubs.c new file mode 100644 index 00000000000..70cef66966a --- /dev/null +++ b/hw/arm/smmuv3-accel-stubs.c @@ -0,0 +1,52 @@ +/* + * Stubs for accelerated SMMU instance backed by an iommufd vIOMMU object. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/arm/smmuv3.h" +#include "hw/arm/smmuv3-accel.h" + +bool smmuv3_accel_init(SMMUv3State *s, Error **errp) +{ + error_setg(errp, "accel=3Don support not compiled in"); + return false; +} + +bool smmuv3_accel_install_ste(SMMUv3State *s, SMMUDevice *sdev, int sid, + Error **errp) +{ + return true; +} + +bool smmuv3_accel_install_ste_range(SMMUv3State *s, SMMUSIDRange *range, + Error **errp) +{ + return true; +} + +bool smmuv3_accel_attach_gbpa_hwpt(SMMUv3State *s, Error **errp) +{ + return true; +} + +bool smmuv3_accel_issue_inv_cmd(SMMUv3State *s, void *cmd, SMMUDevice *sde= v, + Error **errp) +{ + return true; +} + +void smmuv3_accel_idr_override(SMMUv3State *s) +{ +} + +bool smmuv3_accel_alloc_veventq(SMMUv3State *s, Error **errp) +{ + return true; +} + +void smmuv3_accel_reset(SMMUv3State *s) +{ +} diff --git a/hw/arm/meson.build b/hw/arm/meson.build index b187b946f04..3be1252c4f1 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -84,8 +84,9 @@ arm_common_ss.add(when: 'CONFIG_ARMSSE', if_true: files('= armsse.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'm= cimx7d-sabre.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP', if_true: files('fsl-imx8mp.c'= )) arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true: files('imx8mp-ev= k.c')) -arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) -arm_ss.add(when: 'CONFIG_ARM_SMMUV3_ACCEL', if_true: files('smmuv3-accel.c= ')) +arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) +arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3_ACCEL', if_true: files('smmuv3-= accel.c')) +stub_ss.add(files('smmuv3-accel-stubs.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c'= , 'mcimx6ul-evk.c')) arm_common_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) arm_common_ss.add(when: 'CONFIG_XEN', if_true: files( --=20 2.53.0