From nobody Sat Sep 26 22:15:47 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789457193; cv=none; d=zohomail.com; s=zohoarc; b=OHRkjloTRvzN8cjb5DVtbBhjPalg533x2eVJFVAdjlo2p5SUsARvDfdY7VdIlUCygbTBSh0EXrmidCBorVW6fMjNyPjJIsghAAfHvihHRProDLR83m7JpLO8CWbUaQW/TqEWGmvWoyGEp137YLlx0X50PuKsIP+OlJ6tG+k4UTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789457193; 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=KkJz1cYDdFso2M4EC6WyUDTgDDtbZALxBDNguIzm3gQ=; b=bc4n86yqNQOqAXIqXDTXILn5tK2S76kaI1g2zDxRvmSWNVLuLp1d/BZn8bqQjklc95dgQbkDwB7wzoGTI3vlsXwdXvs8k3AQVyqLwE6YnUwbPHfvZr3oy9H5obEF6Yk+mwGPmBgUvRoPu6PEys2B0xdg6vrMxaBcz8jFvlLTKUY= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178945719330248.78873486315376; Tue, 15 Sep 2026 00:26:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6NYK-0007A2-6p; Tue, 15 Sep 2026 03:26:04 -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 1x6NXo-00072a-Ex for qemu-devel@nongnu.org; Tue, 15 Sep 2026 03:25:41 -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 1x6NXl-0003oa-JL for qemu-devel@nongnu.org; Tue, 15 Sep 2026 03:25:30 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-k-uySmeyP_CApmYZ9vT9Xw-1; Tue, 15 Sep 2026 03:25:24 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9965019541B0; Tue, 15 Sep 2026 07:25:23 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.48.23]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 45C13418; Tue, 15 Sep 2026 07:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789457128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KkJz1cYDdFso2M4EC6WyUDTgDDtbZALxBDNguIzm3gQ=; b=JXrhWtktR5wzTNxyE0cz5MWSdigDW2CwSiPuaINjW0jGaC6OpXWmQxdYI+t6S3TyMEZZsb u9q92nHyyRJdwitqeZ6oYuzS1SPpzgIg56URmrIP2Wb3WDApp7A7SB9Vmq5sbCpCKN1Z3j Lr6ZunlLE6X1Yc7TEq1z42OKg+MP7Cw= X-MC-Unique: k-uySmeyP_CApmYZ9vT9Xw-1 X-Mimecast-MFC-AGG-ID: k-uySmeyP_CApmYZ9vT9Xw_1789457123 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH 1/2] hw/pci-bridge: Add x-speed and x-width properties to xio3130-downstream Date: Tue, 15 Sep 2026 09:25:06 +0200 Message-ID: <20260915072507.1230187-2-clg@redhat.com> In-Reply-To: <20260915072507.1230187-1-clg@redhat.com> References: <20260915072507.1230187-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @redhat.com) X-ZM-MESSAGEID: 1789457195561158500 Default to 16GT/s x32 for new machine types and add compat entries for <=3D 11.1 to preserve the old 2.5GT/s x1 behavior. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/4409 Signed-off-by: C=C3=A9dric Le Goater Reported-by: Boaz Ben Shabat --- hw/core/machine.c | 2 ++ hw/pci-bridge/xio3130_downstream.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index 8939ae16666c2d9454d93eccc5ca44e231b1ef6d..b702a61f7335a30841164279e73= 432bc238ee5e5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -43,6 +43,8 @@ GlobalProperty hw_compat_11_1[] =3D { { "sysbus-ehci-usb", "x-migrate-fetch-addr-64bit", "off" }, { "pci-ehci-usb", "x-migrate-fetch-addr-64bit", "off" }, + { "xio3130-downstream", "x-speed", "2_5" }, + { "xio3130-downstream", "x-width", "1" }, }; const size_t hw_compat_11_1_len =3D G_N_ELEMENTS(hw_compat_11_1); =20 diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_dow= nstream.c index 0c3fed3053b0e2b2ee2cf703c5f9e1f33ec1ff5b..0669223159a43f334d7ed46bec3= 47de1bb8420ca 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -25,6 +25,7 @@ #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" #include "hw/core/qdev-properties.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" @@ -137,6 +138,10 @@ static void xio3130_downstream_exitfn(PCIDevice *d) static const Property xio3130_downstream_props[] =3D { DEFINE_PROP_BIT(COMPAT_PROP_PCP, PCIDevice, cap_present, QEMU_PCIE_SLTCAP_PCP_BITNR, true), + DEFINE_PROP_PCIE_LINK_SPEED("x-speed", PCIESlot, + speed, PCIE_LINK_SPEED_16), + DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot, + width, PCIE_LINK_WIDTH_32), }; =20 static const VMStateDescription vmstate_xio3130_downstream =3D { --=20 2.55.0 From nobody Sat Sep 26 22:15:47 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789457177; cv=none; d=zohomail.com; s=zohoarc; b=klVVtvun/NSETU2s9KAfvyqrtku5VC+LrZdtKai981tdQcZCDBGxL4T1Lyiy66stunrsEX6ztlkJwS9SvlcYsM43ZnFpDhc/X+0ofeHvfop/1MejWduOpvJMmMnxEcXuDgeVswSaSfU78+VeVgBCHGkMvNDh80vTPDKWDuDMhGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789457177; 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=5G2cOVilHEU94V7VWrEhEc/7CPmcmkHOm88kjHxf7ZQ=; b=jMQuDXkibVNz2fZaJBY8dpS4VFkBdXThQAjJ15taiAqEwMOYV8ocUUcC/hDlIV7ZUJDLUPdPjT9A+uPdIUBWAQmby9c5nucbU8CzcA0C1elSKLvjWjjBm1Alm5W9ATfusJJ/s/l+pf1pPYYnHcWshYLNueMeEWksoakKSJBry00= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789457177120141.54296124408245; Tue, 15 Sep 2026 00:26:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6NYL-0007AR-6e; Tue, 15 Sep 2026 03:26:05 -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 1x6NXt-00072o-2o for qemu-devel@nongnu.org; Tue, 15 Sep 2026 03:25:45 -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 1x6NXq-0003px-4R for qemu-devel@nongnu.org; Tue, 15 Sep 2026 03:25:36 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-226-OrWUy97vNE-F4lCzma8n_Q-1; Tue, 15 Sep 2026 03:25:27 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4C8191802163; Tue, 15 Sep 2026 07:25:26 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.48.23]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 33960426; Tue, 15 Sep 2026 07:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789457131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5G2cOVilHEU94V7VWrEhEc/7CPmcmkHOm88kjHxf7ZQ=; b=OQOCQLgffQg+q/vhnnBvMF2ps02GkZwARx7hBvcGq30jbFHI8Y54ir3wUsypgp/psjdvnc npp7/pRHynme/A//TJjynHHLbnTbBXM3OMMR1rBJ/ip69ngh40Vxf8NzVulPyC4WiXGr3x WHnlZhGR02mnd5IHOO76z8F8gloIgXg= X-MC-Unique: OrWUy97vNE-F4lCzma8n_Q-1 X-Mimecast-MFC-AGG-ID: OrWUy97vNE-F4lCzma8n_Q_1789457126 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH 2/2] hw/pci-bridge: Add x-speed and x-width properties to x3130-upstream Date: Tue, 15 Sep 2026 09:25:07 +0200 Message-ID: <20260915072507.1230187-3-clg@redhat.com> In-Reply-To: <20260915072507.1230187-1-clg@redhat.com> References: <20260915072507.1230187-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: 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 @redhat.com) X-ZM-MESSAGEID: 1789457179476158500 The x3130 upstream port is stuck at the 2.5GT/s x1 default. Following the CXL upstream port pattern, introduce an XIO3130Upstream struct wrapping PCIEPort with speed and width fields to be able to set them. Default to 16GT/s x32 for new machine types and add compat entries for <=3D 11.1 to preserve the old 2.5GT/s x1 behavior. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/4409 Signed-off-by: C=C3=A9dric Le Goater Reported-by: Boaz Ben Shabat --- hw/core/machine.c | 2 ++ hw/pci-bridge/xio3130_upstream.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index b702a61f7335a30841164279e73432bc238ee5e5..3c98d62860d5ce058c4fbfdb86d= 2661f20e22b8f 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -45,6 +45,8 @@ GlobalProperty hw_compat_11_1[] =3D { { "pci-ehci-usb", "x-migrate-fetch-addr-64bit", "off" }, { "xio3130-downstream", "x-speed", "2_5" }, { "xio3130-downstream", "x-width", "1" }, + { "x3130-upstream", "x-speed", "2_5" }, + { "x3130-upstream", "x-width", "1" }, }; const size_t hw_compat_11_1_len =3D G_N_ELEMENTS(hw_compat_11_1); =20 diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstr= eam.c index 40057b749bfd01bbd548b025607ef041b9feccc5..247994772c30373b7f3c6f9e722= 37dbed529ed98 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -24,9 +24,24 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" +#include "hw/core/qdev-properties.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/module.h" =20 +#define TYPE_XIO3130_UPSTREAM "x3130-upstream" + +OBJECT_DECLARE_SIMPLE_TYPE(XIO3130Upstream, XIO3130_UPSTREAM) + +struct XIO3130Upstream { + /*< private >*/ + PCIEPort parent_obj; + + /*< public >*/ + PCIExpLinkSpeed speed; + PCIExpLinkWidth width; +}; + #define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */ #define XIO3130_REVISION 0x2 #define XIO3130_MSI_OFFSET 0x70 @@ -49,9 +64,11 @@ static void xio3130_upstream_write_config(PCIDevice *d, = uint32_t address, static void xio3130_upstream_reset(DeviceState *qdev) { PCIDevice *d =3D PCI_DEVICE(qdev); + XIO3130Upstream *u =3D XIO3130_UPSTREAM(qdev); =20 pci_bridge_reset(qdev); pcie_cap_deverr_reset(d); + pcie_cap_fill_link_ep_usp(d, u->width, u->speed, false); } =20 static void xio3130_upstream_realize(PCIDevice *d, Error **errp) @@ -110,6 +127,13 @@ static void xio3130_upstream_exitfn(PCIDevice *d) pci_bridge_exitfn(d); } =20 +static const Property xio3130_upstream_props[] =3D { + DEFINE_PROP_PCIE_LINK_SPEED("x-speed", XIO3130Upstream, + speed, PCIE_LINK_SPEED_16), + DEFINE_PROP_PCIE_LINK_WIDTH("x-width", XIO3130Upstream, + width, PCIE_LINK_WIDTH_32), +}; + static const VMStateDescription vmstate_xio3130_upstream =3D { .name =3D "xio3130-express-upstream-port", .priority =3D MIG_PRI_PCI_BUS, @@ -138,11 +162,13 @@ static void xio3130_upstream_class_init(ObjectClass *= klass, const void *data) dc->desc =3D "TI X3130 Upstream Port of PCI Express Switch"; device_class_set_legacy_reset(dc, xio3130_upstream_reset); dc->vmsd =3D &vmstate_xio3130_upstream; + device_class_set_props(dc, xio3130_upstream_props); } =20 static const TypeInfo xio3130_upstream_info =3D { - .name =3D "x3130-upstream", + .name =3D TYPE_XIO3130_UPSTREAM, .parent =3D TYPE_PCIE_PORT, + .instance_size =3D sizeof(XIO3130Upstream), .class_init =3D xio3130_upstream_class_init, .interfaces =3D (const InterfaceInfo[]) { { INTERFACE_PCIE_DEVICE }, --=20 2.55.0