From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4276275867 for ; Fri, 8 Aug 2025 15:42:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.176.79.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754667745; cv=none; b=EsGPCHfBk/ng2cEqxgs9ZnhMTooCehWqMbwl7+5F8iuF5BUmWdtT1HrKRYzESgTN+AYMBG1gqrN09wfuSUZyn67qF+pewLCqxsPNBMAOYNN5hflmVALeo3gE2LxF248g4bBz1jtkmVgBT0yn5HJ82kXnjoSb6NgoSPIkkLjUuZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754667745; c=relaxed/simple; bh=BXuHRaagtLnEyGOxePTayPksK7HUvFCYrUYHWvVP0jw=; h=Date:From:To:CC:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o43+UIh8edR+cFiG5YAz4nf1AlpMIrikGZlGTwY1ldSbo6Lzm7zBNW3J8u8RVr1rEsmQ/2qAUPVytbx+AIYWFLUZDsp0JKVMNqVmghUrHxxSRVfbMP1sbUMrgb7ebqrxl3V4+1Lhz985ac5cJrv2ZdHsBiRGXeLxVei5jpGStRs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=185.176.79.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4bz7XD4QLFz6M4QD; Fri, 8 Aug 2025 23:40:28 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id CE2581402ED; Fri, 8 Aug 2025 23:42:18 +0800 (CST) Received: from localhost (10.203.177.66) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 8 Aug 2025 17:42:18 +0200 Date: Fri, 8 Aug 2025 16:42:16 +0100 From: Jonathan Cameron To: Davidlohr Bueso CC: , , , , , "Michael S. Tsirkin" , Marcel Apfelbaum , "Markus Armbruster" , Michael Roth Subject: Re: [PATCH 1/4] hw/pcie: Support enabling flit mode Message-ID: <20250808164216.0000196b@huawei.com> In-Reply-To: <20250806055708.196851-2-dave@stgolabs.net> References: <20250806055708.196851-1-dave@stgolabs.net> <20250806055708.196851-2-dave@stgolabs.net> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.42; x86_64-w64-mingw32) Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: lhrpeml500011.china.huawei.com (7.191.174.215) To frapeml500008.china.huawei.com (7.182.85.71) On Tue, 5 Aug 2025 22:57:05 -0700 Davidlohr Bueso wrote: > As with the link speed and width training, have ad-hoc property for > setting the flit mode and allow CXL components to make use of it. > > For the CXL root port and dsp cases, always report flit mode but > the actual value after 'training' will depend on the downstream > device configuration. > > Suggested-by: Jonathan Cameron > Signed-off-by: Davidlohr Bueso Hi Davidlohr, This looks a bit like an interface that evolved, but in the end you seem to have something that is a simple boolean property. As such you can avoid a fair bit of complexity. Look for disable-acs for an example. I don't know if it is desirable to make it an explicit type or not, but my gut says boolean is fine here. +CC A few potentially relevant people to answer that question more definitively. > --- > hw/core/qdev-properties-system.c | 11 +++++++++++ > hw/mem/cxl_type3.c | 4 +++- > hw/pci-bridge/cxl_downstream.c | 1 + > hw/pci-bridge/cxl_root_port.c | 1 + > hw/pci-bridge/cxl_upstream.c | 3 ++- > hw/pci-bridge/gen_pcie_root_port.c | 1 + > hw/pci/pcie.c | 13 +++++++++---- > include/hw/cxl/cxl_device.h | 1 + > include/hw/pci-bridge/cxl_upstream_port.h | 1 + > include/hw/pci/pcie.h | 2 +- > include/hw/pci/pcie_port.h | 1 + > include/hw/qdev-properties-system.h | 3 +++ > qapi/common.json | 14 ++++++++++++++ > 13 files changed, 49 insertions(+), 7 deletions(-) > > diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c > index 24e145d87001..94a1b754ecdc 100644 > --- a/hw/core/qdev-properties-system.c > +++ b/hw/core/qdev-properties-system.c > @@ -1172,6 +1172,17 @@ const PropertyInfo qdev_prop_pcie_link_width = { > .set_default_value = qdev_propinfo_set_default_value_enum, > }; > > +/* --- Flit mode --- */ > + > +const PropertyInfo qdev_prop_pcie_link_flit = { > + .type = "PCIELinkFlit", > + .description = "off/on", > + .enum_table = &PCIELinkFlit_lookup, > + .get = qdev_propinfo_get_enum, > + .set = qdev_propinfo_set_enum, Just adding extra indent to these two doesn't seem particularly useful. Feels like a qdev_prop_bool would work fine here given it's on / off. > + .set_default_value = qdev_propinfo_set_default_value_enum, > +}; > + > /* --- UUID --- */ > > static void get_uuid(Object *obj, Visitor *v, const char *name, void *opaque, > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index c4658e0955d5..324cf62e8141 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -1501,7 +1501,8 @@ void ct3d_reset(DeviceState *dev) > uint32_t *reg_state = ct3d->cxl_cstate.crb.cache_mem_registers; > uint32_t *write_msk = ct3d->cxl_cstate.crb.cache_mem_regs_write_mask; > > - pcie_cap_fill_link_ep_usp(PCI_DEVICE(dev), ct3d->width, ct3d->speed); > + pcie_cap_fill_link_ep_usp(PCI_DEVICE(dev), ct3d->width, ct3d->speed, > + ct3d->flitmode); > cxl_component_register_init_common(reg_state, write_msk, CXL2_TYPE3_DEVICE); > cxl_device_register_init_t3(ct3d, CXL_T3_MSIX_MBOX); > > @@ -1540,6 +1541,7 @@ static const Property ct3_props[] = { > speed, PCIE_LINK_SPEED_32), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", CXLType3Dev, > width, PCIE_LINK_WIDTH_16), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", CXLType3Dev, flitmode, 0), DEFINE_PROP_BOOL("256b-flit, CXLTYpe3Dev, flitmode, false) > DEFINE_PROP_UINT16("chmu-port", CXLType3Dev, cxl_dstate.chmu[0].port, 0), > }; > > diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c > index 6aa8586f0161..82e6618b111c 100644 > --- a/hw/pci-bridge/cxl_downstream.c > +++ b/hw/pci-bridge/cxl_downstream.c > @@ -257,6 +257,7 @@ static const Property cxl_dsp_props[] = { > speed, PCIE_LINK_SPEED_64), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot, > width, PCIE_LINK_WIDTH_16), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", PCIESlot, flitmode, 1), > }; > > static void cxl_dsp_class_init(ObjectClass *oc, const void *data) > diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c > index f035987b6f1f..721dc3981fd2 100644 > --- a/hw/pci-bridge/cxl_root_port.c > +++ b/hw/pci-bridge/cxl_root_port.c > @@ -235,6 +235,7 @@ static const Property gen_rp_props[] = { > speed, PCIE_LINK_SPEED_64), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot, > width, PCIE_LINK_WIDTH_32), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", PCIESlot, flitmode, 1), > }; > > static void cxl_rp_dvsec_write_config(PCIDevice *dev, uint32_t addr, > diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c > index c2150afff39b..5e6d559a3215 100644 > --- a/hw/pci-bridge/cxl_upstream.c > +++ b/hw/pci-bridge/cxl_upstream.c > @@ -147,7 +147,7 @@ static void cxl_usp_reset(DeviceState *qdev) > > pci_bridge_reset(qdev); > pcie_cap_deverr_reset(d); > - pcie_cap_fill_link_ep_usp(d, usp->width, usp->speed); > + pcie_cap_fill_link_ep_usp(d, usp->width, usp->speed, usp->flitmode); > latch_registers(usp); > } > > @@ -433,6 +433,7 @@ static const Property cxl_upstream_props[] = { > speed, PCIE_LINK_SPEED_32), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", CXLUpstreamPort, > width, PCIE_LINK_WIDTH_16), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", CXLUpstreamPort, flitmode, 0), > }; > > static void cxl_upstream_class_init(ObjectClass *oc, const void *data) > diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c > index d9078e783bf0..c00be8147c2a 100644 > --- a/hw/pci-bridge/gen_pcie_root_port.c > +++ b/hw/pci-bridge/gen_pcie_root_port.c > @@ -145,6 +145,7 @@ static const Property gen_rp_props[] = { > speed, PCIE_LINK_SPEED_16), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot, > width, PCIE_LINK_WIDTH_32), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", PCIESlot, flitmode, 0), > }; > > static void gen_rp_dev_class_init(ObjectClass *klass, const void *data) > diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c > index eaeb68894e6e..55e0f7110ae5 100644 > --- a/hw/pci/pcie.c > +++ b/hw/pci/pcie.c > @@ -113,7 +113,7 @@ pcie_cap_v1_fill(PCIDevice *dev, uint8_t port, uint8_t type, uint8_t version) > > /* Includes setting the target speed default */ > static void pcie_cap_fill_lnk(uint8_t *exp_cap, PCIExpLinkWidth width, > - PCIExpLinkSpeed speed) > + PCIExpLinkSpeed speed, PCIELinkFlit flitmode) > { > /* Clear and fill LNKCAP from what was configured above */ > pci_long_test_and_clear_mask(exp_cap + PCI_EXP_LNKCAP, > @@ -158,10 +158,15 @@ static void pcie_cap_fill_lnk(uint8_t *exp_cap, PCIExpLinkWidth width, > PCI_EXP_LNKCAP2_SLS_64_0GB); > } > } > + > + if (flitmode) { > + pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA2, > + PCI_EXP_LNKSTA2_FLIT); > + } > } > > void pcie_cap_fill_link_ep_usp(PCIDevice *dev, PCIExpLinkWidth width, > - PCIExpLinkSpeed speed) > + PCIExpLinkSpeed speed, PCIELinkFlit flitmode) > { > uint8_t *exp_cap = dev->config + dev->exp.exp_cap; > > @@ -175,7 +180,7 @@ void pcie_cap_fill_link_ep_usp(PCIDevice *dev, PCIExpLinkWidth width, > QEMU_PCI_EXP_LNKSTA_NLW(width) | > QEMU_PCI_EXP_LNKSTA_CLS(speed)); > > - pcie_cap_fill_lnk(exp_cap, width, speed); > + pcie_cap_fill_lnk(exp_cap, width, speed, flitmode); > } > > static void pcie_cap_fill_slot_lnk(PCIDevice *dev) > @@ -212,7 +217,7 @@ static void pcie_cap_fill_slot_lnk(PCIDevice *dev) > /* the PCI_EXP_LNKSTA_DLLLA will be set in the hotplug function */ > } > > - pcie_cap_fill_lnk(exp_cap, s->width, s->speed); > + pcie_cap_fill_lnk(exp_cap, s->width, s->speed, s->flitmode); > } > > int pcie_cap_init(PCIDevice *dev, uint8_t offset, > diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h > index 068c20d61ebc..4c9d2247cf02 100644 > --- a/include/hw/cxl/cxl_device.h > +++ b/include/hw/cxl/cxl_device.h > @@ -796,6 +796,7 @@ struct CXLType3Dev { > /* PCIe link characteristics */ > PCIExpLinkSpeed speed; > PCIExpLinkWidth width; > + PCIELinkFlit flitmode; > > /* DOE */ > DOECap doe_cdat; > diff --git a/include/hw/pci-bridge/cxl_upstream_port.h b/include/hw/pci-bridge/cxl_upstream_port.h > index db1dfb6afd98..584e43c37291 100644 > --- a/include/hw/pci-bridge/cxl_upstream_port.h > +++ b/include/hw/pci-bridge/cxl_upstream_port.h > @@ -20,6 +20,7 @@ typedef struct CXLUpstreamPort { > > PCIExpLinkSpeed speed; > PCIExpLinkWidth width; > + PCIELinkFlit flitmode; > > DOECap doe_cdat; > uint64_t sn; > diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h > index ff6ce08e135a..82fcbc9f8823 100644 > --- a/include/hw/pci/pcie.h > +++ b/include/hw/pci/pcie.h > @@ -142,7 +142,7 @@ void pcie_ari_init(PCIDevice *dev, uint16_t offset); > void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num); > void pcie_ats_init(PCIDevice *dev, uint16_t offset, bool aligned); > void pcie_cap_fill_link_ep_usp(PCIDevice *dev, PCIExpLinkWidth width, > - PCIExpLinkSpeed speed); > + PCIExpLinkSpeed speed, PCIELinkFlit flitmode); > > void pcie_cap_slot_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, > Error **errp); > diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h > index 7cd7af8cfa4b..2f96fc685729 100644 > --- a/include/hw/pci/pcie_port.h > +++ b/include/hw/pci/pcie_port.h > @@ -58,6 +58,7 @@ struct PCIESlot { > > PCIExpLinkSpeed speed; > PCIExpLinkWidth width; > + PCIELinkFlit flitmode; bool probably fine. > > /* Disable ACS (really for a pcie_root_port) */ > bool disable_acs; > diff --git a/qapi/common.json b/qapi/common.json > index 0e3a0bbbfb0b..da047fbf874f 100644 > --- a/qapi/common.json > +++ b/qapi/common.json > @@ -140,6 +140,20 @@ > { 'enum': 'PCIELinkWidth', > 'data': [ '1', '2', '4', '8', '12', '16', '32' ] } > Hmm. Not sure why these are here rather than pci.json. > +## > +# @PCIELinkFlit: > +# > +# An enumeration of PCIe link FLIT mode Bit odd having an enumeration for 'on' vs 'off' > +# > +# @off: the link is not operating in FLIT mode > +# > +# @on: each FLIT is a fixed 256 bytes in size > +# > +# Since: 10.0 That was a while back. > +## > +{ 'enum': 'PCIELinkFlit', > + 'data': [ 'off', 'on'] } > + > ## > # @HostMemPolicy: > # From mboxrd@z Thu Jan 1 00:00:00 1970 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 0CFC5C87FD3 for ; Fri, 8 Aug 2025 15:43:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ukPEn-0006eu-LK; Fri, 08 Aug 2025 11:42:34 -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 1ukPEl-0006eh-5O for qemu-devel@nongnu.org; Fri, 08 Aug 2025 11:42:31 -0400 Received: from [185.176.79.56] (helo=frasgout.his.huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ukPEh-0001GR-Ga for qemu-devel@nongnu.org; Fri, 08 Aug 2025 11:42:30 -0400 Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4bz7XD4QLFz6M4QD; Fri, 8 Aug 2025 23:40:28 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id CE2581402ED; Fri, 8 Aug 2025 23:42:18 +0800 (CST) Received: from localhost (10.203.177.66) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 8 Aug 2025 17:42:18 +0200 Date: Fri, 8 Aug 2025 16:42:16 +0100 To: Davidlohr Bueso CC: , , , , , "Michael S. Tsirkin" , Marcel Apfelbaum , "Markus Armbruster" , Michael Roth Subject: Re: [PATCH 1/4] hw/pcie: Support enabling flit mode Message-ID: <20250808164216.0000196b@huawei.com> In-Reply-To: <20250806055708.196851-2-dave@stgolabs.net> References: <20250806055708.196851-1-dave@stgolabs.net> <20250806055708.196851-2-dave@stgolabs.net> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.42; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.203.177.66] X-ClientProxiedBy: lhrpeml500011.china.huawei.com (7.191.174.215) To frapeml500008.china.huawei.com (7.182.85.71) X-Host-Lookup-Failed: Reverse DNS lookup failed for 185.176.79.56 (deferred) Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, RDNS_NONE=0.793, 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: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Tue, 5 Aug 2025 22:57:05 -0700 Davidlohr Bueso wrote: > As with the link speed and width training, have ad-hoc property for > setting the flit mode and allow CXL components to make use of it. > > For the CXL root port and dsp cases, always report flit mode but > the actual value after 'training' will depend on the downstream > device configuration. > > Suggested-by: Jonathan Cameron > Signed-off-by: Davidlohr Bueso Hi Davidlohr, This looks a bit like an interface that evolved, but in the end you seem to have something that is a simple boolean property. As such you can avoid a fair bit of complexity. Look for disable-acs for an example. I don't know if it is desirable to make it an explicit type or not, but my gut says boolean is fine here. +CC A few potentially relevant people to answer that question more definitively. > --- > hw/core/qdev-properties-system.c | 11 +++++++++++ > hw/mem/cxl_type3.c | 4 +++- > hw/pci-bridge/cxl_downstream.c | 1 + > hw/pci-bridge/cxl_root_port.c | 1 + > hw/pci-bridge/cxl_upstream.c | 3 ++- > hw/pci-bridge/gen_pcie_root_port.c | 1 + > hw/pci/pcie.c | 13 +++++++++---- > include/hw/cxl/cxl_device.h | 1 + > include/hw/pci-bridge/cxl_upstream_port.h | 1 + > include/hw/pci/pcie.h | 2 +- > include/hw/pci/pcie_port.h | 1 + > include/hw/qdev-properties-system.h | 3 +++ > qapi/common.json | 14 ++++++++++++++ > 13 files changed, 49 insertions(+), 7 deletions(-) > > diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c > index 24e145d87001..94a1b754ecdc 100644 > --- a/hw/core/qdev-properties-system.c > +++ b/hw/core/qdev-properties-system.c > @@ -1172,6 +1172,17 @@ const PropertyInfo qdev_prop_pcie_link_width = { > .set_default_value = qdev_propinfo_set_default_value_enum, > }; > > +/* --- Flit mode --- */ > + > +const PropertyInfo qdev_prop_pcie_link_flit = { > + .type = "PCIELinkFlit", > + .description = "off/on", > + .enum_table = &PCIELinkFlit_lookup, > + .get = qdev_propinfo_get_enum, > + .set = qdev_propinfo_set_enum, Just adding extra indent to these two doesn't seem particularly useful. Feels like a qdev_prop_bool would work fine here given it's on / off. > + .set_default_value = qdev_propinfo_set_default_value_enum, > +}; > + > /* --- UUID --- */ > > static void get_uuid(Object *obj, Visitor *v, const char *name, void *opaque, > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index c4658e0955d5..324cf62e8141 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -1501,7 +1501,8 @@ void ct3d_reset(DeviceState *dev) > uint32_t *reg_state = ct3d->cxl_cstate.crb.cache_mem_registers; > uint32_t *write_msk = ct3d->cxl_cstate.crb.cache_mem_regs_write_mask; > > - pcie_cap_fill_link_ep_usp(PCI_DEVICE(dev), ct3d->width, ct3d->speed); > + pcie_cap_fill_link_ep_usp(PCI_DEVICE(dev), ct3d->width, ct3d->speed, > + ct3d->flitmode); > cxl_component_register_init_common(reg_state, write_msk, CXL2_TYPE3_DEVICE); > cxl_device_register_init_t3(ct3d, CXL_T3_MSIX_MBOX); > > @@ -1540,6 +1541,7 @@ static const Property ct3_props[] = { > speed, PCIE_LINK_SPEED_32), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", CXLType3Dev, > width, PCIE_LINK_WIDTH_16), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", CXLType3Dev, flitmode, 0), DEFINE_PROP_BOOL("256b-flit, CXLTYpe3Dev, flitmode, false) > DEFINE_PROP_UINT16("chmu-port", CXLType3Dev, cxl_dstate.chmu[0].port, 0), > }; > > diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c > index 6aa8586f0161..82e6618b111c 100644 > --- a/hw/pci-bridge/cxl_downstream.c > +++ b/hw/pci-bridge/cxl_downstream.c > @@ -257,6 +257,7 @@ static const Property cxl_dsp_props[] = { > speed, PCIE_LINK_SPEED_64), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot, > width, PCIE_LINK_WIDTH_16), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", PCIESlot, flitmode, 1), > }; > > static void cxl_dsp_class_init(ObjectClass *oc, const void *data) > diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c > index f035987b6f1f..721dc3981fd2 100644 > --- a/hw/pci-bridge/cxl_root_port.c > +++ b/hw/pci-bridge/cxl_root_port.c > @@ -235,6 +235,7 @@ static const Property gen_rp_props[] = { > speed, PCIE_LINK_SPEED_64), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot, > width, PCIE_LINK_WIDTH_32), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", PCIESlot, flitmode, 1), > }; > > static void cxl_rp_dvsec_write_config(PCIDevice *dev, uint32_t addr, > diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c > index c2150afff39b..5e6d559a3215 100644 > --- a/hw/pci-bridge/cxl_upstream.c > +++ b/hw/pci-bridge/cxl_upstream.c > @@ -147,7 +147,7 @@ static void cxl_usp_reset(DeviceState *qdev) > > pci_bridge_reset(qdev); > pcie_cap_deverr_reset(d); > - pcie_cap_fill_link_ep_usp(d, usp->width, usp->speed); > + pcie_cap_fill_link_ep_usp(d, usp->width, usp->speed, usp->flitmode); > latch_registers(usp); > } > > @@ -433,6 +433,7 @@ static const Property cxl_upstream_props[] = { > speed, PCIE_LINK_SPEED_32), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", CXLUpstreamPort, > width, PCIE_LINK_WIDTH_16), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", CXLUpstreamPort, flitmode, 0), > }; > > static void cxl_upstream_class_init(ObjectClass *oc, const void *data) > diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c > index d9078e783bf0..c00be8147c2a 100644 > --- a/hw/pci-bridge/gen_pcie_root_port.c > +++ b/hw/pci-bridge/gen_pcie_root_port.c > @@ -145,6 +145,7 @@ static const Property gen_rp_props[] = { > speed, PCIE_LINK_SPEED_16), > DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot, > width, PCIE_LINK_WIDTH_32), > + DEFINE_PROP_PCIE_LINK_FLIT("256b-flit", PCIESlot, flitmode, 0), > }; > > static void gen_rp_dev_class_init(ObjectClass *klass, const void *data) > diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c > index eaeb68894e6e..55e0f7110ae5 100644 > --- a/hw/pci/pcie.c > +++ b/hw/pci/pcie.c > @@ -113,7 +113,7 @@ pcie_cap_v1_fill(PCIDevice *dev, uint8_t port, uint8_t type, uint8_t version) > > /* Includes setting the target speed default */ > static void pcie_cap_fill_lnk(uint8_t *exp_cap, PCIExpLinkWidth width, > - PCIExpLinkSpeed speed) > + PCIExpLinkSpeed speed, PCIELinkFlit flitmode) > { > /* Clear and fill LNKCAP from what was configured above */ > pci_long_test_and_clear_mask(exp_cap + PCI_EXP_LNKCAP, > @@ -158,10 +158,15 @@ static void pcie_cap_fill_lnk(uint8_t *exp_cap, PCIExpLinkWidth width, > PCI_EXP_LNKCAP2_SLS_64_0GB); > } > } > + > + if (flitmode) { > + pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA2, > + PCI_EXP_LNKSTA2_FLIT); > + } > } > > void pcie_cap_fill_link_ep_usp(PCIDevice *dev, PCIExpLinkWidth width, > - PCIExpLinkSpeed speed) > + PCIExpLinkSpeed speed, PCIELinkFlit flitmode) > { > uint8_t *exp_cap = dev->config + dev->exp.exp_cap; > > @@ -175,7 +180,7 @@ void pcie_cap_fill_link_ep_usp(PCIDevice *dev, PCIExpLinkWidth width, > QEMU_PCI_EXP_LNKSTA_NLW(width) | > QEMU_PCI_EXP_LNKSTA_CLS(speed)); > > - pcie_cap_fill_lnk(exp_cap, width, speed); > + pcie_cap_fill_lnk(exp_cap, width, speed, flitmode); > } > > static void pcie_cap_fill_slot_lnk(PCIDevice *dev) > @@ -212,7 +217,7 @@ static void pcie_cap_fill_slot_lnk(PCIDevice *dev) > /* the PCI_EXP_LNKSTA_DLLLA will be set in the hotplug function */ > } > > - pcie_cap_fill_lnk(exp_cap, s->width, s->speed); > + pcie_cap_fill_lnk(exp_cap, s->width, s->speed, s->flitmode); > } > > int pcie_cap_init(PCIDevice *dev, uint8_t offset, > diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h > index 068c20d61ebc..4c9d2247cf02 100644 > --- a/include/hw/cxl/cxl_device.h > +++ b/include/hw/cxl/cxl_device.h > @@ -796,6 +796,7 @@ struct CXLType3Dev { > /* PCIe link characteristics */ > PCIExpLinkSpeed speed; > PCIExpLinkWidth width; > + PCIELinkFlit flitmode; > > /* DOE */ > DOECap doe_cdat; > diff --git a/include/hw/pci-bridge/cxl_upstream_port.h b/include/hw/pci-bridge/cxl_upstream_port.h > index db1dfb6afd98..584e43c37291 100644 > --- a/include/hw/pci-bridge/cxl_upstream_port.h > +++ b/include/hw/pci-bridge/cxl_upstream_port.h > @@ -20,6 +20,7 @@ typedef struct CXLUpstreamPort { > > PCIExpLinkSpeed speed; > PCIExpLinkWidth width; > + PCIELinkFlit flitmode; > > DOECap doe_cdat; > uint64_t sn; > diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h > index ff6ce08e135a..82fcbc9f8823 100644 > --- a/include/hw/pci/pcie.h > +++ b/include/hw/pci/pcie.h > @@ -142,7 +142,7 @@ void pcie_ari_init(PCIDevice *dev, uint16_t offset); > void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num); > void pcie_ats_init(PCIDevice *dev, uint16_t offset, bool aligned); > void pcie_cap_fill_link_ep_usp(PCIDevice *dev, PCIExpLinkWidth width, > - PCIExpLinkSpeed speed); > + PCIExpLinkSpeed speed, PCIELinkFlit flitmode); > > void pcie_cap_slot_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, > Error **errp); > diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h > index 7cd7af8cfa4b..2f96fc685729 100644 > --- a/include/hw/pci/pcie_port.h > +++ b/include/hw/pci/pcie_port.h > @@ -58,6 +58,7 @@ struct PCIESlot { > > PCIExpLinkSpeed speed; > PCIExpLinkWidth width; > + PCIELinkFlit flitmode; bool probably fine. > > /* Disable ACS (really for a pcie_root_port) */ > bool disable_acs; > diff --git a/qapi/common.json b/qapi/common.json > index 0e3a0bbbfb0b..da047fbf874f 100644 > --- a/qapi/common.json > +++ b/qapi/common.json > @@ -140,6 +140,20 @@ > { 'enum': 'PCIELinkWidth', > 'data': [ '1', '2', '4', '8', '12', '16', '32' ] } > Hmm. Not sure why these are here rather than pci.json. > +## > +# @PCIELinkFlit: > +# > +# An enumeration of PCIe link FLIT mode Bit odd having an enumeration for 'on' vs 'off' > +# > +# @off: the link is not operating in FLIT mode > +# > +# @on: each FLIT is a fixed 256 bytes in size > +# > +# Since: 10.0 That was a while back. > +## > +{ 'enum': 'PCIELinkFlit', > + 'data': [ 'off', 'on'] } > + > ## > # @HostMemPolicy: > #