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: 858933 Delivered-To: patch@linaro.org Received: by 2002:adf:fb47:0:b0:385:e875:8a9e with SMTP id c7csp74564wrs; Mon, 20 Jan 2025 23:45:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCULmd7nYjWQOJEV9qCDMoQJFOaqbyRTCg0x58Dl0+xWeEkE4u6ly2nDoKy1YpdZBPOwV7vwtg==@linaro.org X-Google-Smtp-Source: AGHT+IH6P2L9+nTmnYhBtzE66xnpAxJyS7DDXiScdaqkotohedo+9Ttdfy6Kym8hWFPAzTmyIyFb X-Received: by 2002:a05:622a:1922:b0:467:6a8d:e01d with SMTP id d75a77b69052e-46e12e8ea52mr254875441cf.18.1737445511901; Mon, 20 Jan 2025 23:45:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737445511; cv=none; d=google.com; s=arc-20240605; b=N7p7Bl8Fy4pFgUuOSnqC1/0K0ryV5Fk2HVAP1cYzucKVqU4cFqBMXh1toqyBXd3A1J eowPOVzrNPAvA5bxmuDlr1yYi//6ScrPN8ZtPv6rewwT1PYA3Ib78RIpRFuBR5KE1z8g hUlm89SUH5VnffBtJnmIltzVkTFdXa6D5V/RpsPo6Ed4NHRVUS7dDOh3rzGaoWpVLy/b nhTgNJ2IGEPbpT9Yv8MtcjxtE1zrFzRUpi+GFP3zTWQByRJN02MqWdK8iwZOFJBMZtV7 enWSb8wnif5oij/VgJIGpqTrT3MLAHAoKFLssI0OX6yloG9xIwElnpvX2rW02VZgN1Gy CztA== 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=xQw8hecSqNH6i5kzCWTZhqTCpjqpw+LPVTLqVJJZAzs=; fh=TS+tssQ64yvODexuVKC1r6h5l8gJEXbVg2z1F5KYRTo=; b=jKebBYy42QBC4RsMKS8nyWrAOf4L7zdvjNwORhPTloWt6svMg8mUzVI6N48VyZ1OcA Ng+GqC8rqnaIHR91uUrGK32ZYf4iDayyyiHlIsd778EwFnUMfsnABRIUjh4Mxh0L2Lhl FN6g/BbO5/L2YmpX11BujyVHmJr/OEWWju9Jlvc2ofR43a2706qDh/fLdH5VKptDZJMB JBA6M9RWKml5ae8NKEB34Ezdb+p2mbHh0a/+ri6+KJDlYNBbudclrFXxsd1dGOKdBSs9 NCa6MaCPfA7ePqU1D5IiFxyb5F3w4Dvlvl9FuCluUwH5Z0wxlYiPYZaEimf0T4rUCUDS 1vJQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kI7+HMMs; 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=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-46e102f1413si115703071cf.45.2025.01.20.23.45.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Jan 2025 23:45:11 -0800 (PST) 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=@linaro.org header.s=google header.b=kI7+HMMs; 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=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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'))