From nobody Wed May 15 04:20:00 2024 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=genesiscloud.com ARC-Seal: i=1; a=rsa-sha256; t=1707969564; cv=none; d=zohomail.com; s=zohoarc; b=L7pQu6c0xWxi17Pif0M71gFnMjFQjkaKIKvjBPQHM0iE1VAEvWbdikNXxjNVO1RBwlhkFFw2yl/Dps0h4KEjMcFpiNAVqkwnh3BXnnLSjC4BnJLV2Y9vH+4Eflp6+wx/koOQs/ijPzZgHKhtHRaABInfrOjJ5AIPVfg+q6QcgIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707969564; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vLN1S5fCgtbK/2TYTBccFlszjQjGRK+vg+aNvIu+AmU=; b=N1RI3kAj6q3maGubJJlBzoPFCqAJsJWU0C5FiQ8BbRAZFA2VxXLkDZdyu3IOseSE1juD0Vgp9Qvhu+WF72LzN79PtMB4Joc1+hyT8F1mjt5KQ/g0bCpQa7DH7A/Bm+EfOi3hr0j8Ae4g3BIbJ7i6hkdPSXJhphqLZcSc9UsrlIU= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707969564091953.5920673181436; Wed, 14 Feb 2024 19:59:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raStV-0001sP-Gv; Wed, 14 Feb 2024 22:58:42 -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 1raQTs-0003mx-Fh for qemu-devel@nongnu.org; Wed, 14 Feb 2024 20:24:04 -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 1raQTq-0001tw-Ls for qemu-devel@nongnu.org; Wed, 14 Feb 2024 20:24:04 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33adec41b55so136219f8f.0 for ; Wed, 14 Feb 2024 17:24:01 -0800 (PST) Received: from localhost.localdomain (p5087a006.dip0.t-ipconnect.de. [80.135.160.6]) by smtp.gmail.com with ESMTPSA id m13-20020a5d6a0d000000b0033cf637eea2sm157689wru.29.2024.02.14.17.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 17:23:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=genesiscloud.com; s=genesiscloud.com; t=1707960239; x=1708565039; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vLN1S5fCgtbK/2TYTBccFlszjQjGRK+vg+aNvIu+AmU=; b=hqGYlxGjS+Xmz+znDOxjq57hXLfmEyPZ1HGHPALXYulq8whwWpTMQndZzUhlTvurYQ MjrSfzd10GNf/RJUiipCWil6S++wUEsioTKNYHcCS30WuSGgEggHB0HI/6tAL4TzxDBD 2CTrGQti0N1sGe+cgA+xcZC9HQT/+xswyT63L+3a5lzPtLZluYWJH/uaIUojLJiOeQM1 xkpx6YhM1pnxGFOa3X6Klqo8j08ySu7my8pui8yqkaFKs7b53dOxq+tk1PuLDRAUq8XP jqvp2Kevif0epg7adAoVI7DKQy5ioixyMXoT14Qs1qwnTcePKmDPmQoBNbRdF6Bm5m2m 3vFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707960239; x=1708565039; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vLN1S5fCgtbK/2TYTBccFlszjQjGRK+vg+aNvIu+AmU=; b=U9CStfZPBpLaVq/n5aKbzCh7mhZHX0dLWsrZd9i21cpAJ62a/ykgHRnX6xSsyUcoHY LtOesLInAtD1CgTaes4uvuDWPLtDwfp82HFVTIq+h4VYIlM+gpfWwwhKRwCgISWqxz4n +RvsF2A52pJZ13YV5cargyKxlcSJU7A1uBox6F493tt0PZHW1CuFtSmtnawSVVIQSyA0 FyH3wtI7jryLypfkIxh5xJhMHjYWHKI9s+YQYBmN33wFBTHhxeCNmuqWnp82Y13duDpJ UCAt/j0bF/AP2kgAQ58i0A4CU3OEdYZkYPO2+Fpl0tRAymLLAY8b+R3DmwR8jBXVjoeS jQhQ== X-Gm-Message-State: AOJu0Ywj4L8VSehFQ+GcsgMaJiI0QKads0fn9GGH3sKWSHcNRfvoM063 btYyl99LoZGtxh1SPjtd1wAjGIKXS2MWGjg8Hwl9ozP8kXV2tz1cVJgVEmCo2y0Qcluto1LPrYJ iC8f0CDpanYs7FyC/WPObKnu2VWWl6KLTmIklJrCwLhZnwQPpLWTB4c3BwQYk3djcf3ctpkzq7E lEeVl5m0alwv9oodBv5S1qFgIQAEf5GkuQjeGfeiBAKdHp X-Google-Smtp-Source: AGHT+IFPLUmC5VsmK4t7kGUUiEcbunk1VqF5L/Yy+7jgHvTykQZSMLbl2vOD2ZcFt9hjtBxmJ6fd+w== X-Received: by 2002:adf:f5c2:0:b0:33b:7b5a:49c with SMTP id k2-20020adff5c2000000b0033b7b5a049cmr171293wrp.40.1707960238562; Wed, 14 Feb 2024 17:23:58 -0800 (PST) From: Lukas Stockner To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum , Lukas Stockner Subject: [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds Date: Thu, 15 Feb 2024 02:23:26 +0100 Message-ID: <20240215012326.3272366-1-lstockner@genesiscloud.com> X-Mailer: git-send-email 2.43.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=lstockner@genesiscloud.com; 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 14 Feb 2024 22:58:39 -0500 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @genesiscloud.com) X-ZM-MESSAGEID: 1707969565534100001 Content-Type: text/plain; charset="utf-8" This patch extends the PCIe link speed option so that slots can be configured as supporting 32GT/s (Gen5) or 64GT/s (Gen5) speeds. This is as simple as setting the appropriate bit in LnkCap2 and the appropriate value in LnkCap and LnkCtl2. Signed-off-by: Lukas Stockner Reviewed-by: Manos Pitsidianakis --- hw/core/qdev-properties-system.c | 16 ++++++++++++++-- hw/pci/pcie.c | 8 ++++++++ include/hw/pci/pcie_regs.h | 2 ++ qapi/common.json | 6 +++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 1a396521d5..106a31c233 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -941,7 +941,7 @@ const PropertyInfo qdev_prop_off_auto_pcibar =3D { .set_default_value =3D qdev_propinfo_set_default_value_enum, }; =20 -/* --- PCIELinkSpeed 2_5/5/8/16 -- */ +/* --- PCIELinkSpeed 2_5/5/8/16/32/64 -- */ =20 static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *na= me, void *opaque, Error **errp) @@ -963,6 +963,12 @@ static void get_prop_pcielinkspeed(Object *obj, Visito= r *v, const char *name, case QEMU_PCI_EXP_LNK_16GT: speed =3D PCIE_LINK_SPEED_16; break; + case QEMU_PCI_EXP_LNK_32GT: + speed =3D PCIE_LINK_SPEED_32; + break; + case QEMU_PCI_EXP_LNK_64GT: + speed =3D PCIE_LINK_SPEED_64; + break; default: /* Unreachable */ abort(); @@ -996,6 +1002,12 @@ static void set_prop_pcielinkspeed(Object *obj, Visit= or *v, const char *name, case PCIE_LINK_SPEED_16: *p =3D QEMU_PCI_EXP_LNK_16GT; break; + case PCIE_LINK_SPEED_32: + *p =3D QEMU_PCI_EXP_LNK_32GT; + break; + case PCIE_LINK_SPEED_64: + *p =3D QEMU_PCI_EXP_LNK_64GT; + break; default: /* Unreachable */ abort(); @@ -1004,7 +1016,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visit= or *v, const char *name, =20 const PropertyInfo qdev_prop_pcie_link_speed =3D { .name =3D "PCIELinkSpeed", - .description =3D "2_5/5/8/16", + .description =3D "2_5/5/8/16/32/64", .enum_table =3D &PCIELinkSpeed_lookup, .get =3D get_prop_pcielinkspeed, .set =3D set_prop_pcielinkspeed, diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 6db0cf69cd..0b4817e144 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -153,6 +153,14 @@ static void pcie_cap_fill_slot_lnk(PCIDevice *dev) pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2, PCI_EXP_LNKCAP2_SLS_16_0GB); } + if (s->speed > QEMU_PCI_EXP_LNK_16GT) { + pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2, + PCI_EXP_LNKCAP2_SLS_32_0GB); + } + if (s->speed > QEMU_PCI_EXP_LNK_32GT) { + pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2, + PCI_EXP_LNKCAP2_SLS_64_0GB); + } } } =20 diff --git a/include/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h index 4972106c42..9d3b6868dc 100644 --- a/include/hw/pci/pcie_regs.h +++ b/include/hw/pci/pcie_regs.h @@ -39,6 +39,8 @@ typedef enum PCIExpLinkSpeed { QEMU_PCI_EXP_LNK_5GT, QEMU_PCI_EXP_LNK_8GT, QEMU_PCI_EXP_LNK_16GT, + QEMU_PCI_EXP_LNK_32GT, + QEMU_PCI_EXP_LNK_64GT, } PCIExpLinkSpeed; =20 #define QEMU_PCI_EXP_LNKCAP_MLS(speed) (speed) diff --git a/qapi/common.json b/qapi/common.json index f1bb841951..867a9ad9b0 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -107,10 +107,14 @@ # # @16: 16.0GT/s # +# @32: 32.0GT/s +# +# @64: 64.0GT/s +# # Since: 4.0 ## { 'enum': 'PCIELinkSpeed', - 'data': [ '2_5', '5', '8', '16' ] } + 'data': [ '2_5', '5', '8', '16', '32', '64' ] } =20 ## # @PCIELinkWidth: --=20 2.43.1