From patchwork Fri Mar 21 18:35:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 875260 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp1023401wrb; Fri, 21 Mar 2025 11:37:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzLgVActmJF2ROCtDPoOlgWYPWl64hwrA22btVZoRClonEpfchELml+1+pJ6m/U4JfwZqlwQ==@linaro.org X-Google-Smtp-Source: AGHT+IGCgtfuWldqCYgRDzKee5DxayQySCjpgJqGDj9AQQaJSFNoRRL7U/TpwnRK/c8rJO3OqjrF X-Received: by 2002:a05:622a:4ccb:b0:471:f482:bba7 with SMTP id d75a77b69052e-47710cd3221mr138825471cf.22.1742582277604; Fri, 21 Mar 2025 11:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742582277; cv=none; d=google.com; s=arc-20240605; b=iinOxsEYwGLSbj4fqcv7qlV8SH9bKlPFAb8jCy5T+TQ9qGekhY7kx76eFihsgRgFag TnnjJSAjkNBP85DTBCmXHZJsvVfIAOz9S0USx6z/0k99j0+ZWwaPO4ji2a8WMqWl0gdJ XCptOLZElCwiXYLSOTcIix7fSXvqEzQt5MYXffdbhr0N9WvRsM3LcS0ghu5AhiA60Nfn qVc5fdMcP/fATrddQcVQPXQai9wvVq0pnLBWcaWnYExmcukyTcladGfwH+QOa6p5OnFJ MSRJ01kmfxdnTODEYjKDLIqrExCI8eVguTGieR4WkcSoAKI4lwYNjno6j6bwToznqi5+ yZQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DVg1tbjHDlf8QclYlE4W/Yr+fT0nQXJyVq0t9o0sx40=; fh=tOREyZHlK9Diwyw/7bj5IUyLT4I5EVkj5DE8XDtMiTs=; b=jDEnI71cR+9LMoAL0PrNv9f+glZERaRsLImdpJOybF5WZvrUhN8fnnI1bDih8Kn5PM 8wy64n9DiRgnz/U0KH8H058vtSHzLHHoy98+9gmeL3z51+aNF0Ef549hjORx53RfRHjw 8lLA8oEe7N01XQGI66ITZgN3MT5hmGj/uiiqv5y2f211JQxk3eTdcg7QiHf+oEMqKwg7 cSLCSI88O9Qll9SYluOzP3aMdI5hI1vm9gtfdbfaT1ayCcMAoaGpwQX1AaND3AY97CF2 8vyt4HsuHKL4LgV/JXT0gtQwyG08dJsIi706qddLGNYj1Da6HqTL7jVR8l4hFo2eR9HL 9yUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JpLh63YU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d527806si22359161cf.418.2025.03.21.11.37.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Mar 2025 11:37:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JpLh63YU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvhED-0001Xd-QW; Fri, 21 Mar 2025 14:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvhEA-0001KN-3a for qemu-devel@nongnu.org; Fri, 21 Mar 2025 14:36:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvhE8-00070u-30 for qemu-devel@nongnu.org; Fri, 21 Mar 2025 14:36:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742582175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DVg1tbjHDlf8QclYlE4W/Yr+fT0nQXJyVq0t9o0sx40=; b=JpLh63YUQark/EQG+b+GfP6cOhYxNtJngeWdgHL0zrupG/v/ARfyhqISkH/dk2Njy4JRY4 CCle8Jj29H9y0Zo1su+FRcH9wW6e5sEq4lIba6DpGeOY71L+VxNdOcS2Pd3Vu+593K15qO MNAqgKGmZ7Btz9vXPCjeQRRiNA0+gfM= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-274-RJ-JoDZPMLKniy4de0iqKQ-1; Fri, 21 Mar 2025 14:36:13 -0400 X-MC-Unique: RJ-JoDZPMLKniy4de0iqKQ-1 X-Mimecast-MFC-AGG-ID: RJ-JoDZPMLKniy4de0iqKQ_1742582172 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-39131851046so1011397f8f.0 for ; Fri, 21 Mar 2025 11:36:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742582171; x=1743186971; 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=DVg1tbjHDlf8QclYlE4W/Yr+fT0nQXJyVq0t9o0sx40=; b=PnqNAUsWdcG/S7hlcYybY3haEMQjRZ0DGtgtduK+O6zVIfSjC0TvqlVPaRRkF97C3H T5wrkvfg0ClcsSjbX7aPTtUdKtdW4i0JYtR9RLUtoOtDzj5aLoN0Vi5I3CNIPiUsgOwB LvG99ZjydNKmlromGnnhEVhS5qfwCmPyleGoTJTGSg9HlpTLR8KklbdqkeTfrujoEqkA duz1rgiw8J1OmU+Fju+13jeRe3Ug8XcWu5Lqr5GG4ZE+5ZjwNyKGjqwomNh7YtKLZLqX 60o4YprvgKokmyOXhfk6p6+RbOaO4jg4YtXBFhPeyvvgDhnWglLaCuV4tGpeDV+oQouv ntCQ== X-Gm-Message-State: AOJu0YwmGswNx5bjeTCDxG0P9o8ECMR22fDJARFyejdyUdyyPOgig2V9 NNauD8Kv7OrC9uFWSRDb54UIyg+ap+oVTB8d3RmB5nfuDe1PZCptXvBxnxo5bWcqyURjpPiOtJ0 j9df0mxF0T9OGGE6AOq8FWJ+7DS2JfQGyNwQs/20wG+/m6Onl8bFKhbmAdI9CNpivKa2A5loODk Webc8t2KsrbYol4Jn7H+BgdQh/xbsMFG3q+d0r X-Gm-Gg: ASbGncslBDpj25K6l62Fyn3h/BpxfSGQNiZddtTcbwX0tX4rXP29ylB6gDJX1xARo2Y ctBXtcdLpT5jkMGTFQaGwpef7q/RS+Rod8bg6m7laMnimFYSNzlUubB5XVmCzZFlbQwxPwzS87U hTJTvfzGj6sOCvL+NPCfy9s0OdTxP62isMdCJR+JHe4ZkQlrsixDVJ9WHmq+QfL+UrbwFDZ6VzB jU+wIQ240TUhOr9J8tA29EY7uWWPl2nfRMrhm3H69wDem63L/BP4NlleWD0YS+eCzp7TwVW699R JkzN447Z5Bk5WcFiVdoB X-Received: by 2002:a05:6000:184d:b0:391:2391:2f79 with SMTP id ffacd0b85a97d-3997f932e9dmr4775099f8f.43.1742582170821; Fri, 21 Mar 2025 11:36:10 -0700 (PDT) X-Received: by 2002:a05:6000:184d:b0:391:2391:2f79 with SMTP id ffacd0b85a97d-3997f932e9dmr4775074f8f.43.1742582170253; Fri, 21 Mar 2025 11:36:10 -0700 (PDT) Received: from [192.168.122.1] ([151.49.194.153]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3997f9a345fsm3021188f8f.24.2025.03.21.11.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 11:36:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 02/24] rust: Kconfig: Factor out whether HPET is Rust or C Date: Fri, 21 Mar 2025 19:35:34 +0100 Message-ID: <20250321183556.155097-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250321183556.155097-1-pbonzini@redhat.com> References: <20250321183556.155097-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Currently we require everywhere that wants to know if there is an HPET device to check for "CONFIG_HPET || CONFIG_X_HPET_RUST". Factor out whether the HPET device is Rust or C into a separate Kconfig stanza, so that CONFIG_HPET means "there is an HPET", and whether this has pulled in CONFIG_X_HPET_RUST or CONFIG_HPET_C is something the rest of QEMU can ignore. Signed-off-by: Peter Maydell Link: https://lore.kernel.org/r/20250319193110.1565578-3-peter.maydell@linaro.org Signed-off-by: Paolo Bonzini --- configs/devices/i386-softmmu/default.mak | 1 - hw/i386/fw_cfg.c | 2 +- hw/i386/pc.c | 2 +- hw/timer/Kconfig | 8 +++++++- hw/timer/meson.build | 2 +- rust/hw/timer/Kconfig | 1 - tests/qtest/meson.build | 3 +-- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/configs/devices/i386-softmmu/default.mak b/configs/devices/i386-softmmu/default.mak index 9ef343cace0..4faf2f0315e 100644 --- a/configs/devices/i386-softmmu/default.mak +++ b/configs/devices/i386-softmmu/default.mak @@ -6,7 +6,6 @@ #CONFIG_APPLESMC=n #CONFIG_FDC=n #CONFIG_HPET=n -#CONFIG_X_HPET_RUST=n #CONFIG_HYPERV=n #CONFIG_ISA_DEBUG=n #CONFIG_ISA_IPMI_BT=n diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index a7f1b60b98c..5c0bcd5f8a9 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -26,7 +26,7 @@ #include CONFIG_DEVICES #include "target/i386/cpu.h" -#if !defined(CONFIG_HPET) && !defined(CONFIG_X_HPET_RUST) +#if !defined(CONFIG_HPET) struct hpet_fw_config hpet_fw_cfg = {.count = UINT8_MAX}; #endif diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 63a96cd23f8..01d0581f62a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1704,7 +1704,7 @@ static void pc_machine_initfn(Object *obj) pcms->sata_enabled = true; pcms->i8042_enabled = true; pcms->max_fw_size = 8 * MiB; -#if defined(CONFIG_HPET) || defined(CONFIG_X_HPET_RUST) +#if defined(CONFIG_HPET) pcms->hpet_enabled = true; #endif pcms->fd_bootchk = true; diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 9ac00845340..b3d823ce2c3 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -11,7 +11,13 @@ config A9_GTIMER config HPET bool - default y if PC && !HAVE_RUST + default y if PC + # The HPET has both a Rust and a C implementation + select HPET_C if !HAVE_RUST + select X_HPET_RUST if HAVE_RUST + +config HPET_C + bool config I8254 bool diff --git a/hw/timer/meson.build b/hw/timer/meson.build index f5f9eed2d0a..178321c029c 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -13,7 +13,7 @@ system_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c')) system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c')) system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c')) system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c')) -system_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c')) +system_ss.add(when: 'CONFIG_HPET_C', if_true: files('hpet.c')) system_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c')) system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c')) system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c')) diff --git a/rust/hw/timer/Kconfig b/rust/hw/timer/Kconfig index 42e421317a5..afd98033503 100644 --- a/rust/hw/timer/Kconfig +++ b/rust/hw/timer/Kconfig @@ -1,3 +1,2 @@ config X_HPET_RUST bool - default y if PC && HAVE_RUST diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 5a8c1f102c2..3136d15e0f8 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -103,8 +103,7 @@ qtests_i386 = \ config_all_devices.has_key('CONFIG_VIRTIO_PCI') and \ slirp.found() ? ['virtio-net-failover'] : []) + \ (unpack_edk2_blobs and \ - (config_all_devices.has_key('CONFIG_HPET') or \ - config_all_devices.has_key('CONFIG_X_HPET_RUST')) and \ + config_all_devices.has_key('CONFIG_HPET') and \ config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \ qtests_pci + \ qtests_cxl + \