From patchwork Tue Jan 21 07:44:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13945908 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 36D5CC02182 for ; Tue, 21 Jan 2025 07:45:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ta8vw-0001bI-VX; Tue, 21 Jan 2025 02:44:24 -0500 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 1ta8vv-0001b5-Nu for qemu-devel@nongnu.org; Tue, 21 Jan 2025 02:44:23 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ta8vt-0005ag-Up for qemu-devel@nongnu.org; Tue, 21 Jan 2025 02:44:23 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-385e0e224cbso2750844f8f.2 for ; Mon, 20 Jan 2025 23:44:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737445459; x=1738050259; 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=xQw8hecSqNH6i5kzCWTZhqTCpjqpw+LPVTLqVJJZAzs=; b=kI7+HMMsQWb29lXEHYr0fFzQBF9XubjstRObr1vz+E9eIkmstjB+sGmQasZVkWlMki W3ilZ19oRR1jOrGyvteBUHDqvz6bbyGGXlJ3hHLEUzcYkOIOBOtEXld87cl/K0ej/yeL HxzUh9d3ql6zPv6aJp22mTJ28fs0SnsdH6sZerkuzj0n4+1ZZv4s/RffTjJkP5svvMji qsyXP1zhjVlv7fHfqT7fmR+vmStyKrcsk2PT3HX5dFvcZjdGM+H4NwwiaGkAnjUIrRdt KX/bxQ2YxBb9L5Ihz50Kv+3fWvp6p0X3q59Kb51ProIEMhD3OiWeAfMFlo88WVW/H0rs /63A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737445459; x=1738050259; 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=xQw8hecSqNH6i5kzCWTZhqTCpjqpw+LPVTLqVJJZAzs=; b=wgH5Gf0I51SOeSkyyTsfXJglZ365eQs7K4p8w9yITpZBOHnT8Mclr89O7AH4ib1hIR 0eyZwcrIutd/CyeabaJHqCSOa033xaSNUFHFdF4hqTgtEzq88YGKrMfhF5vQwda1re/z T8x1nKmR0aux6heT/YUqIdTra4T9JqN9XWxSGgHTFkqlFZOI6voUP7HgC8SIvkpmRxU3 O0Ovty3G6Hm699bQwIbKngCdQhIQhDh3hhaMqR9aUM00kCQ2mNb0ohIHBuXOesYcZzb9 uOXhUgfpTInHiVrMw0gyhmkmqNy3hP/2R7jwsas3YWMRnKO2GABVmIL9xdGAtgIyv1qz vd4g== X-Gm-Message-State: AOJu0YzygO7K3XXIkdbLCAluqV+AVTBhJaOMjIaCQR609nscfcw01QFz FXH+cY+552XYVtlNLlCXQhv2okrktajx8+8QCrsd7s/o+HUZh0lQGHwkQbopVSmbzqZdAVxyNVl ew4U= X-Gm-Gg: ASbGncs9O/yGdrDzY4zHF12HtEilvVDtyZVj9XLGX5kVCP1Tw/Lzro4ZESXizuhNfme F4knfr/AOTiaWGh3D6pH/9WY544zBuuaLEml+VusY9tjtILPokUS6o6K6LuDNxyUBFQVBn7VAF4 3jCvCeFN5igXPlPEK/iIv7v1V+gMrkRLe12sHQEkW7lltlWTOQeERGta37uQCoeAmt8xi7sa93N V9eyHN4maUTRw406lssPEzYh01iZdYmMJRUIljyPPp2nL90F33Mcao0F6Voiad9v0WGPiu5tO+b ogXFcWn4U2HW/dJ8Nu5rXfQXsIIv2GgNa2Gc9jjC7+ZS X-Google-Smtp-Source: AGHT+IGktnIxC3Ky2Xx7llK0ohWcbsRK12qVu+srw5o4wShWmC1EpB+Ry5g/kYjBQq8fBvx2xFuaXw== X-Received: by 2002:a05:6000:2c2:b0:385:e8ff:b9c9 with SMTP id ffacd0b85a97d-38bf57a9599mr10907346f8f.42.1737445459202; Mon, 20 Jan 2025 23:44:19 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74abb27sm224650515e9.9.2025.01.20.23.44.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Jan 2025 23:44:18 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Alberto Garcia , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Bernhard Beschow , Laurent Vivier , Fabiano Rosas , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] hw/ipack: Clarify KConfig symbols Date: Tue, 21 Jan 2025 08:44:11 +0100 Message-ID: <20250121074412.70292-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250121074412.70292-1-philmd@linaro.org> References: <20250121074412.70292-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Split IPACK Kconfig key as {IPACK, TPCI200, IP_OCTAL_232} - IPack is a bus - TPCI200 is a PCI device providing an IPack bus - IP-Octal232 is an IPack device plugged on an IPack bus Signed-off-by: Philippe Mathieu-Daudé Acked-by: Fabiano Rosas --- hw/char/Kconfig | 5 +++++ hw/char/meson.build | 2 +- hw/ipack/Kconfig | 4 ++++ hw/ipack/meson.build | 3 ++- tests/qtest/libqos/meson.build | 4 +++- tests/qtest/meson.build | 4 +++- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 4b73a803bf3..1dc20ee4c2c 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -78,3 +78,8 @@ config GOLDFISH_TTY config SHAKTI_UART bool + +config IP_OCTAL_232 + bool + default y + depends on IPACK diff --git a/hw/char/meson.build b/hw/char/meson.build index 1750834385a..ed3529cbbb7 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -4,7 +4,7 @@ system_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c')) system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c')) system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c')) system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c')) -system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c')) +system_ss.add(when: 'CONFIG_IP_OCTAL_232', if_true: files('ipoctal232.c')) system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c')) system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c')) system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c')) diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig index f8da24a62be..28d668727c8 100644 --- a/hw/ipack/Kconfig +++ b/hw/ipack/Kconfig @@ -1,4 +1,8 @@ config IPACK bool + +config TPCI200 + bool + select IPACK default y if PCI_DEVICES depends on PCI diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build index 26567f1068e..e4805228926 100644 --- a/hw/ipack/meson.build +++ b/hw/ipack/meson.build @@ -1 +1,2 @@ -system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c')) +system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c')) +system_ss.add(when: 'CONFIG_TPCI200', if_true: files('tpci200.c')) diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build index 46f130ccfdb..1ddaf7b095b 100644 --- a/tests/qtest/libqos/meson.build +++ b/tests/qtest/libqos/meson.build @@ -32,7 +32,6 @@ libqos_srcs = files( 'i2c-omap.c', 'igb.c', 'sdhci.c', - 'tpci200.c', 'virtio.c', 'virtio-balloon.c', 'virtio-blk.c', @@ -70,6 +69,9 @@ endif if config_all_devices.has_key('CONFIG_RISCV_IOMMU') libqos_srcs += files('riscv-iommu.c') endif +if config_all_devices.has_key('CONFIG_TPCI200') + libqos_srcs += files('tpci200.c') +endif libqos = static_library('qos', libqos_srcs + genh, build_by_default: false) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 94b28e5a534..e60e92fe9de 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -286,7 +286,6 @@ qos_test_ss.add( 'e1000-test.c', 'eepro100-test.c', 'es1370-test.c', - 'ipoctal232-test.c', 'lsm303dlhc-mag-test.c', 'isl_pmbus_vr-test.c', 'max34451-test.c', @@ -317,6 +316,9 @@ qos_test_ss.add( if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL') qos_test_ss.add(files('virtio-serial-test.c')) endif +if config_all_devices.has_key('CONFIG_IP_OCTAL_232') + qos_test_ss.add(files('ipoctal232-test.c')) +endif if host_os != 'windows' qos_test_ss.add(files('e1000e-test.c')) From patchwork Tue Jan 21 07:44:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13945907 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 39995C02185 for ; Tue, 21 Jan 2025 07:45:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ta8w1-0001bq-34; Tue, 21 Jan 2025 02:44:29 -0500 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 1ta8w0-0001bg-34 for qemu-devel@nongnu.org; Tue, 21 Jan 2025 02:44:28 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ta8vy-0005av-H0 for qemu-devel@nongnu.org; Tue, 21 Jan 2025 02:44:27 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3863703258fso4162377f8f.1 for ; Mon, 20 Jan 2025 23:44:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737445464; x=1738050264; 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=gCByY4xFxKSas0mj1fQXD4ORekE5ijPVfSFdvDNgJM0=; b=kZ3VCByrCGzc+z0+NgqfOvs0h5VEe+Byw3fIcPu3X2cYnZuT58qEFCyuVJ1Cffkxw8 CvcOHFrgVEOLZ+uXvkQtDo4HkVsY8P8iq03aEy9eeNZEBQswH0bG65JyWnnSZTY4F21I uFrswMPtNq/AfqJdd7i6E7CK8Uf7PqrPthr/lxToX4+oPUjQnsbdQSdVUBUajCd2gHOx e3UA+UJJTSNuJWKplR98A7Cy2B4Dms//Aqct2+eLRFgbXZOtZtlEOeyJ+VCnMU84hnma XaFfvPEATbACMdiejCUiv+tGdf6ZGRyYCEn3XE002hyx+mUyXZSbhCsuqDtnJjR1aS1p iZuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737445464; x=1738050264; 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=gCByY4xFxKSas0mj1fQXD4ORekE5ijPVfSFdvDNgJM0=; b=IQeXDrImqDBnMgsTVlZbmfeLLieKjqy51DJZ3eprfwyvzEd5nBMi1d2JwMmAFjO1Cg dfb/BJ9lXgPu8n5igO5Z1D371Q2CEZoLYq4vzF/ypmCzZ+nJQrgF4GmXd/XHisGb3YKX mPjLS9E37C9cEcXYqIAivP53KXBx7T+yDB0JkHBL+E1hHH5vG2kgO2VqQpX4pmXlq8YV sfa2RMVERIdIUBXDAq//hZDlclV4+q+7zWEZ1FhVcEuK57tuV9uZigQdgNsvZWD4nKjA fKocKp/CQkCxhcRp5TBIBBMwo8KQHLB/WkZZDeT/Kcdeed4DeeLsrdcHM7gvQ+6mNa3J YVyg== X-Gm-Message-State: AOJu0YxMrVOXKHlx46wmw51VtGq0B2JjxO25ffbV0pxH2KSzg3DMSy2I KQ6GJuBebwccrA+NB8YkIE6p5klF0m5eUXnLnTs9C6RgvsPJhtkIrmwLibl0Up45WvP/aN8KoV3 9BZE= X-Gm-Gg: ASbGncsKkcA1fJ7bu1BdDocG05Kgt3w9+h6C4AMozi3V2xcrB6ngXiSAHt1zd8Gy4DI TPWBztpLIqYGYGk6elguLRCztzGPPHh0TJPb3j0JkuQMULQiKI53H9ljmx3wcfiGHRYrMopDTfC 6GFPctY+Oo07z0qbhpfuVZtKeWrLOCu+KAIfMZ2srWmgvtafPWFOCi4+GeVcVdocvi2dATwc/2M KmpoF4qVoDZD9T2rUds8qkZU8jDXiigrdxwR6Uk9082peRD9tdw0nSwWWWT+VcFcd7diNwTE9uB eU0yvHP0cSA0QJqFoApAUjO7ST6n5HYVmQyRgDNWFJZT X-Google-Smtp-Source: AGHT+IHBGfF2lw1s7z0jLTy9HMMsQBFwcIT+bzXwRduHKmursZYlmsPQrZzuMK/g9Hz8DJi0rvuIrQ== X-Received: by 2002:a05:6000:1786:b0:38a:8d32:2707 with SMTP id ffacd0b85a97d-38bec548925mr21229320f8f.26.1737445464531; Mon, 20 Jan 2025 23:44:24 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c0f026c0sm120518235e9.0.2025.01.20.23.44.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Jan 2025 23:44:23 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Alberto Garcia , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Bernhard Beschow , Laurent Vivier , Fabiano Rosas , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/ipack: Remove legacy qemu_allocate_irqs() use Date: Tue, 21 Jan 2025 08:44:12 +0100 Message-ID: <20250121074412.70292-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250121074412.70292-1-philmd@linaro.org> References: <20250121074412.70292-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org No need to dynamically allocate IRQ when we know before hands how many we'll use. Declare the 2 of them in IPackDevice state and initialize them in the DeviceRealize handler. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/ipack/ipack.h | 7 ++----- hw/ipack/ipack.c | 7 +++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h index cbcdda509d3..14540281496 100644 --- a/include/hw/ipack/ipack.h +++ b/include/hw/ipack/ipack.h @@ -12,6 +12,7 @@ #define QEMU_IPACK_H #include "hw/qdev-core.h" +#include "hw/irq.h" #include "qom/object.h" @@ -19,10 +20,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(IPackBus, IPACK_BUS) struct IPackBus { - /*< private >*/ BusState parent_obj; - /* All fields are private */ uint8_t n_slots; uint8_t free_slot; qemu_irq_handler set_irq; @@ -58,13 +57,11 @@ struct IPackDeviceClass { }; struct IPackDevice { - /*< private >*/ DeviceState parent_obj; - /*< public >*/ int32_t slot; /* IRQ objects for the IndustryPack INT0# and INT1# */ - qemu_irq *irq; + qemu_irq irq[2]; }; extern const VMStateDescription vmstate_ipack_device; diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index ed75f791832..ef59f5dcd62 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -55,22 +55,21 @@ static void ipack_device_realize(DeviceState *dev, Error **errp) } bus->free_slot = idev->slot + 1; - idev->irq = qemu_allocate_irqs(bus->set_irq, idev, 2); + for (int i = 0; i < ARRAY_SIZE(idev->irq); i++) { + qemu_init_irq(idev->irq[i], bus->set_irq, idev, i); + } k->realize(dev, errp); } static void ipack_device_unrealize(DeviceState *dev) { - IPackDevice *idev = IPACK_DEVICE(dev); IPackDeviceClass *k = IPACK_DEVICE_GET_CLASS(dev); if (k->unrealize) { k->unrealize(dev); return; } - - qemu_free_irqs(idev->irq, 2); } static const Property ipack_device_props[] = {