From nobody Tue May 14 05:47:01 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 ARC-Seal: i=1; a=rsa-sha256; t=1688299416; cv=none; d=zohomail.com; s=zohoarc; b=hWyszSMJw2/IUDV+ZwwLBJMVDGi69PYP/k1gOji58GVtafJk6vMRiGD3BtHtH9RZqlgSlywYXurWtAatBUTF3PA+NBB8A1Orxhlo8Eqs+fwABA+WVp0RIRjJ42Fa+sAsCtbjnMJSjkF+DpcOES3Z0ptdluRrT1OBXhi+voTR9cE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688299416; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=s02o4ecEeuNUThWPP1l7HSPv9qpDPaUhEuBGwN7hbWw=; b=GrFEYirnlfHIZiy9KAfF3aInuNDGvSRvsQ+nYo3yOGXPI+4HJJTMGZVXVfohesvrD5U8AOTVVYkMLRLm0UB7nTHXC5KHyAkxtlNWKQxmcM0KCTycCT6XE9Q0z/Utd1ukf9s4A5FP9HypY39mNTq4XStv4cWWXeT8EjfqSCdA/LE= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1688299416210113.62793063827701; Sun, 2 Jul 2023 05:03:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFvmv-0001xa-MS; Sun, 02 Jul 2023 08:02:45 -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 1qFvmu-0001wk-8F for qemu-devel@nongnu.org; Sun, 02 Jul 2023 08:02:44 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFvms-0003j0-Hl for qemu-devel@nongnu.org; Sun, 02 Jul 2023 08:02:43 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1b7ef3e74edso17586755ad.0 for ; Sun, 02 Jul 2023 05:02:42 -0700 (PDT) Received: from alarm.. ([157.82.204.253]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b001b008b3dee2sm7215563plc.287.2023.07.02.05.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 05:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1688299361; x=1690891361; 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=s02o4ecEeuNUThWPP1l7HSPv9qpDPaUhEuBGwN7hbWw=; b=Xydx3BhK3bKkodN4AFmQhU3wkb0q2Va/1ThDsc942+zaEja+CdbYAQShV92+RcFTdt qQ8q3VjgRBgC6DgLLHSjMYlrkCD+4xX7f/9QM+OMmqrgEOPAPoHPsx2k9kYQ2Q1HVl/I eRQsLvd8MurKvqXQyZOn501BgZo/QN1HYiXX4sadYyxf//J9md4J5SATjJc6xDCSVUKW zN/j95GMh/X4S1Xdf3/ouJF3oSe4y5pqKtyW9PDJD3ngiNMt0kbThfxZyhrjIeG6d5Cf CYPjqXpdu45pYnpJccX4xa0n5PtQiSjNfNHzxd1PRFI87NRL6TghUD+6+Pof7JDouVl/ 1HXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688299361; x=1690891361; 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=s02o4ecEeuNUThWPP1l7HSPv9qpDPaUhEuBGwN7hbWw=; b=GYXGFuHEylzKVYJkI2lb6phEDaQOqwrQB5X0rVPNCHLtSHgeMUo6a+NKh4Hrz1qejI sKBHtSIZjNjSuHXlDPpTtE11Qr/GQDyYuDtZVQw3bjFeWk1WPyub6M/TaVyjREaiGmCq X+HGy1ry+bPmAdPLwnZacT2vlEK1kebCxm4WpylVmnfbInj3rl5iFxXIOQr78xqvlVyS AYJHwmdhESW4fhVH9j96JquktdGeSUEeoB9pM9UrQ9U661ya1XfoPJnmYhn1RWealC4Z UoImN1vsOUGNc8+8LxooSIL2jHQbEDEjYcRpp0bxe3jdiSkCaZPsNm9+rAc8v+xwLVQp sT2A== X-Gm-Message-State: ABy/qLYmQQQRVQfzY5dwOvINNfq/jMdaBFvnwyaFBMgdbiVyqnQAnkrH sGCHSg7GqEwAJdYuNLzTRPZN2GeiAhXfOaLv1So= X-Google-Smtp-Source: APBJJlGfn4po9jFMbhSMh+7DKOAw7L47cViYv9fqpgKdd7/Kc8Ymsk9fZwFaezei8oaE4XMG9o3+vw== X-Received: by 2002:a17:902:eec6:b0:1b3:c7c1:8ded with SMTP id h6-20020a170902eec600b001b3c7c18dedmr5640507plb.27.1688299361001; Sun, 02 Jul 2023 05:02:41 -0700 (PDT) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Ani Sinha , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen , Akihiko Odaki Subject: [PATCH v3 1/2] pcie: Use common ARI next function number Date: Sun, 2 Jul 2023 21:02:26 +0900 Message-ID: <20230702120229.66978-2-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230702120229.66978-1-akihiko.odaki@daynix.com> References: <20230702120229.66978-1-akihiko.odaki@daynix.com> 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: none client-ip=2607:f8b0:4864:20::62d; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1688299417759100002 Content-Type: text/plain; charset="utf-8" Currently the only implementers of ARI is SR-IOV devices, and they behave similar. Share the ARI next function number. Signed-off-by: Akihiko Odaki --- docs/pcie_sriov.txt | 4 ++-- include/hw/pci/pcie.h | 2 +- hw/net/igb.c | 2 +- hw/net/igbvf.c | 2 +- hw/nvme/ctrl.c | 2 +- hw/pci/pcie.c | 4 +++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/pcie_sriov.txt b/docs/pcie_sriov.txt index 7eff7f2703..a47aad0bfa 100644 --- a/docs/pcie_sriov.txt +++ b/docs/pcie_sriov.txt @@ -48,7 +48,7 @@ setting up a BAR for a VF. ... int ret =3D pcie_endpoint_cap_init(d, 0x70); ... - pcie_ari_init(d, 0x100, 1); + pcie_ari_init(d, 0x100); ... =20 /* Add and initialize the SR/IOV capability */ @@ -78,7 +78,7 @@ setting up a BAR for a VF. ... int ret =3D pcie_endpoint_cap_init(d, 0x60); ... - pcie_ari_init(d, 0x100, 1); + pcie_ari_init(d, 0x100); ... memory_region_init(mr, ... ) pcie_sriov_vf_register_bar(d, bar_nr, mr); diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index 3cc2b15957..bf7dc5d685 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -134,7 +134,7 @@ void pcie_sync_bridge_lnk(PCIDevice *dev); void pcie_acs_init(PCIDevice *dev, uint16_t offset); void pcie_acs_reset(PCIDevice *dev); =20 -void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn); +void pcie_ari_init(PCIDevice *dev, uint16_t offset); void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_n= um); void pcie_ats_init(PCIDevice *dev, uint16_t offset, bool aligned); =20 diff --git a/hw/net/igb.c b/hw/net/igb.c index 1c989d7677..8ff832acfc 100644 --- a/hw/net/igb.c +++ b/hw/net/igb.c @@ -431,7 +431,7 @@ static void igb_pci_realize(PCIDevice *pci_dev, Error *= *errp) hw_error("Failed to initialize AER capability"); } =20 - pcie_ari_init(pci_dev, 0x150, 1); + pcie_ari_init(pci_dev, 0x150); =20 pcie_sriov_pf_init(pci_dev, IGB_CAP_SRIOV_OFFSET, TYPE_IGBVF, IGB_82576_VF_DEV_ID, IGB_MAX_VF_FUNCTIONS, IGB_MAX_VF_FUNCTIONS, diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c index 284ea61184..d55e1e8a6a 100644 --- a/hw/net/igbvf.c +++ b/hw/net/igbvf.c @@ -270,7 +270,7 @@ static void igbvf_pci_realize(PCIDevice *dev, Error **e= rrp) hw_error("Failed to initialize AER capability"); } =20 - pcie_ari_init(dev, 0x150, 1); + pcie_ari_init(dev, 0x150); } =20 static void igbvf_pci_uninit(PCIDevice *dev) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index fd917fcda1..8b7168a266 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -8088,7 +8088,7 @@ static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pci= _dev, Error **errp) pcie_endpoint_cap_init(pci_dev, 0x80); pcie_cap_flr_init(pci_dev); if (n->params.sriov_max_vfs) { - pcie_ari_init(pci_dev, 0x100, 1); + pcie_ari_init(pci_dev, 0x100); } =20 /* add one to max_ioqpairs to account for the admin queue pair */ diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index b8c24cf45f..9a3f6430e8 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -1028,8 +1028,10 @@ void pcie_sync_bridge_lnk(PCIDevice *bridge_dev) */ =20 /* ARI */ -void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn) +void pcie_ari_init(PCIDevice *dev, uint16_t offset) { + uint16_t nextfn =3D 1; + pcie_add_capability(dev, PCI_EXT_CAP_ID_ARI, PCI_ARI_VER, offset, PCI_ARI_SIZEOF); pci_set_long(dev->config + offset + PCI_ARI_CAP, (nextfn & 0xff) << 8); --=20 2.41.0 From nobody Tue May 14 05:47:01 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 ARC-Seal: i=1; a=rsa-sha256; t=1688299413; cv=none; d=zohomail.com; s=zohoarc; b=gn8a0wE0+TiKXD1Oj4eCpTf9JghBXcVhPiomyHNee6PKu9b0bvHbfZoQDxXVos9kXgUp1/U57s9F4//Z4XEosWu9Kec2ooeqkDb1W0EEaj+XqlkmXgP9Io0ryS6m3gpSARHa9PNxFXsfn47FCCDefI+B6fcOL12P275H2Kl6hw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688299413; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=G/84/MAMhwguVGfvnfXmyKgEA4/oRTMjkgnlllQVYaQ=; b=luTBC2pgM6iZLLx308I0CdMQtT8z3A9JifhWYSe1AnkjHeyvs8oJ7l+DYIwjgRrIInNYJfeJbrcBkDTYntTYd0sQfEIjDUlB8WDTlNWPydIxvxIQftc1Mj8zZFoDvA1sdVD1ZJ3hnG9xJgKsmJ8sU9CJx8sevrdqk8yVWxV76pE= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1688299413089966.2661776187937; Sun, 2 Jul 2023 05:03:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFvmy-0001zP-7Q; Sun, 02 Jul 2023 08:02:48 -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 1qFvmw-0001xd-O4 for qemu-devel@nongnu.org; Sun, 02 Jul 2023 08:02:46 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFvmv-0003jr-8P for qemu-devel@nongnu.org; Sun, 02 Jul 2023 08:02:46 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1b80f2e6c17so28610845ad.0 for ; Sun, 02 Jul 2023 05:02:44 -0700 (PDT) Received: from alarm.. ([157.82.204.253]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b001b008b3dee2sm7215563plc.287.2023.07.02.05.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 05:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1688299363; x=1690891363; 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=G/84/MAMhwguVGfvnfXmyKgEA4/oRTMjkgnlllQVYaQ=; b=ajDeLqoeE4dxxvu+sZ8t0pjPGEJ0XbQJVu3o/EXmW2hbYXgh9N0+MPsMEkMGd0R/cb cL3JNMwMnqOpRk2773iSNj3ekehyMJohN2D58sjF0fzoN74bXoA26GYb4StMqSH8BsSz 5rpY7ckX14xiRlBInwnjnhcwywdaYml4tneJhNTlBdxnMkqrgayAr2etbclcNAXZaEv3 M4X/NqjdXPirlNxiLfCWrkszIh29KRWZmyDLHgqxx4eWYEJ5iSxkbb2Js5FtM++TXZ7y JaMKr/GnFJ1uhLkAnBFNsT7o/jMRMvZss/P8BtAUftBASlfaeYB5ScLC8SzF3e8D7xHp RfAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688299363; x=1690891363; 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=G/84/MAMhwguVGfvnfXmyKgEA4/oRTMjkgnlllQVYaQ=; b=QkMWmz1bVjsbHepbmXSlph4XdF/v45cRCKnPwFUpHDKgwXOjZgPljr7l2HosJ1SaJZ QHmTG94mwHPOj0YueB5aeA/GTxaubwCLBDvEUSgCUYWwTeHBMLgCYiz+jdPp7aBThyDq oHKPrhC4qrN6kKW+ppXcNhrCA7LWCZawPt/znfdZRTgLD3zyjrBng35RqDdkQtRsUYMP IId1EeqK40Bxf3fPlmiw7rZ4M/7RSJMhi7SaSllynuq8rV2YPsm0wfA0aMVp8Mb7YK0U AKKP9nuNACFAqGiDt+kqBvOtB+6+xmiVXOkM//uvJ0WQM2ku8UVhw/GQb4k4Iw2Wq8fw E43A== X-Gm-Message-State: ABy/qLYL0CJDBvOLu6hof0S9c6HowIIPcgkKcQh9MznC3fbreJyNXvFq xV/jis3EHKEfdNqaNkK6ott9piotcCeRb3CKP3k= X-Google-Smtp-Source: APBJJlGG4c/pW+6wiI2D7b7K52qhTzJxbLl95ypRkCvN4emvMfmlB1gSoU8FS7/lpAP7nk/dEFcZBg== X-Received: by 2002:a17:902:f683:b0:1b6:9954:2037 with SMTP id l3-20020a170902f68300b001b699542037mr8793879plg.4.1688299363717; Sun, 02 Jul 2023 05:02:43 -0700 (PDT) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Ani Sinha , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen , Akihiko Odaki Subject: [PATCH v3 2/2] pcie: Specify 0 for ARI next function numbers Date: Sun, 2 Jul 2023 21:02:27 +0900 Message-ID: <20230702120229.66978-3-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230702120229.66978-1-akihiko.odaki@daynix.com> References: <20230702120229.66978-1-akihiko.odaki@daynix.com> 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: none client-ip=2607:f8b0:4864:20::62e; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1688299414036100002 Content-Type: text/plain; charset="utf-8" The current implementers of ARI are all SR-IOV devices. The ARI next function number field is undefined for VF. The PF should end the linked list formed with the field by specifying 0. Fixes: 2503461691 ("pcie: Add some SR/IOV API documentation in docs/pcie_sr= iov.txt") Fixes: 44c2c09488 ("hw/nvme: Add support for SR-IOV") Fixes: 3a977deebe ("Intrdocue igb device emulation") Signed-off-by: Akihiko Odaki --- include/hw/pci/pci.h | 2 ++ hw/core/machine.c | 1 + hw/pci/pci.c | 2 ++ hw/pci/pcie.c | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index e6d0574a29..9c5b5eb206 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -209,6 +209,8 @@ enum { QEMU_PCIE_CAP_CXL =3D (1 << QEMU_PCIE_CXL_BITNR), #define QEMU_PCIE_ERR_UNC_MASK_BITNR 11 QEMU_PCIE_ERR_UNC_MASK =3D (1 << QEMU_PCIE_ERR_UNC_MASK_BITNR), +#define QEMU_PCIE_ARI_NEXTFN_1_BITNR 12 + QEMU_PCIE_ARI_NEXTFN_1 =3D (1 << QEMU_PCIE_ARI_NEXTFN_1_BITNR), }; =20 typedef struct PCIINTxRoute { diff --git a/hw/core/machine.c b/hw/core/machine.c index 46f8f9a2b0..f0d35c6401 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -41,6 +41,7 @@ =20 GlobalProperty hw_compat_8_0[] =3D { { "migration", "multifd-flush-after-each-section", "on"}, + { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" }, }; const size_t hw_compat_8_0_len =3D G_N_ELEMENTS(hw_compat_8_0); =20 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index e2eb4c3b4a..f2ce1dbfd0 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -82,6 +82,8 @@ static Property pci_props[] =3D { DEFINE_PROP_UINT32("acpi-index", PCIDevice, acpi_index, 0), DEFINE_PROP_BIT("x-pcie-err-unc-mask", PCIDevice, cap_present, QEMU_PCIE_ERR_UNC_MASK_BITNR, true), + DEFINE_PROP_BIT("x-pcie-ari-nextfn-1", PCIDevice, cap_present, + QEMU_PCIE_ARI_NEXTFN_1_BITNR, true), DEFINE_PROP_END_OF_LIST() }; =20 diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 9a3f6430e8..cf09e03a10 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -1030,7 +1030,7 @@ void pcie_sync_bridge_lnk(PCIDevice *bridge_dev) /* ARI */ void pcie_ari_init(PCIDevice *dev, uint16_t offset) { - uint16_t nextfn =3D 1; + uint16_t nextfn =3D dev->cap_present & QEMU_PCIE_ARI_NEXTFN_1 ? 1 : 0; =20 pcie_add_capability(dev, PCI_EXT_CAP_ID_ARI, PCI_ARI_VER, offset, PCI_ARI_SIZEOF); --=20 2.41.0