From nobody Fri Nov 1 07:28:18 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=1708232342; cv=none; d=zohomail.com; s=zohoarc; b=MBbFMIGwV7Jx1TxVHwOVFWzxaHRjQKj7YFj6bwldQTVFXJUFklTrv/adSv9oCa/U5BMnLIE/XL398BVDGlPqT49MKrGI7c2kPB9n0GpdQfRbjEfPTUMZ1sPKhFMFycbGbChjGf1KKZtqUJPN+CQfQNwXDPDN2RoEOnwtbk/kXTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708232342; 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=oEGv7dA87enISvNwWKVp+KmYZzRr7ttxpncFC9B4Uog=; b=PjV4vJD2Nq4L8d1sn7/OoQ7D3kwLr1Yv8LLSbg6Cu/Xi/sWrdy3WGitU0WnWSm7QG72U14eD7O/IVx+8jbJGDEkQvxk/IQ3y14Ztm47bcBhCBzxzg+wD6HkFr6V6G7rTHwwyLC1SxACpOdgnlEAR2YbA1QqbKf0pyk+m0tDbvLs= 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 1708232342240905.2487969777757; Sat, 17 Feb 2024 20:59:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbZF1-0001iu-Bm; Sat, 17 Feb 2024 23:57:27 -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 1rbZF0-0001cv-7X for qemu-devel@nongnu.org; Sat, 17 Feb 2024 23:57:26 -0500 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbZEy-0004BC-Qc for qemu-devel@nongnu.org; Sat, 17 Feb 2024 23:57:25 -0500 Received: by mail-oi1-x230.google.com with SMTP id 5614622812f47-3bbb4806f67so2346400b6e.3 for ; Sat, 17 Feb 2024 20:57:23 -0800 (PST) Received: from localhost ([157.82.200.138]) by smtp.gmail.com with UTF8SMTPSA id ga15-20020a17090b038f00b002989901759bsm2600374pjb.42.2024.02.17.20.57.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 17 Feb 2024 20:57:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1708232243; x=1708837043; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oEGv7dA87enISvNwWKVp+KmYZzRr7ttxpncFC9B4Uog=; b=urtf71ryZpdY4W6qhavqAuR0mb2G65IV87ZdtqdU50ZBCwuC6a3h/r1tElXaIXn+ig bWJp55ZZK/2rfTlWUsbYssO3fVJhrsTIF+OuoEeOx72F0w95d44jTTuv2pbpf6i7A2vk c6noIa+UtRtKAeEnhi8V6r23YFUHHAffjykow33IRU5jvDc0lf/lS2tn8u0mcHA/URZ1 0LPYssQBpVxHHJRthWHjpVyrF8jtzxIa7rltyHJX+i1rbf8whlx1u0h6eJPqfMmi5Uul lfRCI38dEdyZsUOuXfNvir3Nt7CyMUzGafstzkST9SDvsCiVtlUYE5kOQ78tzXn8OEGs lsjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708232243; x=1708837043; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oEGv7dA87enISvNwWKVp+KmYZzRr7ttxpncFC9B4Uog=; b=hf116I5Uus3zXll7p/65lzrugb3p1MSsi5+JXeqL1KmSOTzFERBW6S/ZUvucRe5V+D E/Xqp0knYkpaY4zp4n/EXVhN+GLCIdO+IJQJUW8918zy6cDgyIz3qxPMf7MgdP7dlg0R 1DPWfTZ12km16+vq/yME3BXMF/Y+riEuJGLiVSSWQOFsbubEkCRbvWoInanntkRDne+B PyPAfYMBZ3LQCJH6HuIKxBGDHjJy8VA8l3XUZOyne4FawEvFk7FEMS6/tBamJJ0JNcvy QrVmTm2jYYpxNrLck5Q7qw0Rxxiye5lS2WgDYgNLIE4Q4yhB2AWf7P1w6SCZaZApvVo9 HsHw== X-Gm-Message-State: AOJu0YxJD/gqrUAoZCWrIzZGBMXs3c1eG8/b6lt+HEq38FkYKTJTBebd BBlShrz+Lpt6p06D/LAAxPiUJ6NJ7rgovXgAcu9LGkkuVLo9QnZ80GP+QI/we8I= X-Google-Smtp-Source: AGHT+IFQIeAhqZEkL7McA06QAQGBJNuf+42mOMT5SbvhOHBo6TyBdr4TqUfgc3c8g4f1ROuuUeF1Ww== X-Received: by 2002:a05:6808:2129:b0:3c1:547d:cfc8 with SMTP id r41-20020a056808212900b003c1547dcfc8mr1202231oiw.45.1708232242804; Sat, 17 Feb 2024 20:57:22 -0800 (PST) From: Akihiko Odaki Date: Sun, 18 Feb 2024 13:56:13 +0900 Subject: [PATCH v5 08/11] pcie_sriov: Do not reset NumVFs after disabling VFs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240218-reuse-v5-8-e4fc1c19b5a9@daynix.com> References: <20240218-reuse-v5-0-e4fc1c19b5a9@daynix.com> In-Reply-To: <20240218-reuse-v5-0-e4fc1c19b5a9@daynix.com> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Akihiko Odaki X-Mailer: b4 0.12.3 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::230; envelope-from=akihiko.odaki@daynix.com; helo=mail-oi1-x230.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.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1708232343788100003 The spec does not NumVFs is reset after disabling VFs except when resetting the PF. Clearing it is guest visible and out of spec, even though Linux doesn't rely on this value being preserved, so we never noticed. Fixes: 7c0fa8dff811 ("pcie: Add support for Single Root I/O Virtualization = (SR/IOV)") Signed-off-by: Akihiko Odaki --- hw/pci/pcie_sriov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/pci/pcie_sriov.c b/hw/pci/pcie_sriov.c index 51b66d1bb342..e9b23221d713 100644 --- a/hw/pci/pcie_sriov.c +++ b/hw/pci/pcie_sriov.c @@ -215,7 +215,6 @@ static void unregister_vfs(PCIDevice *dev) g_free(dev->exp.sriov_pf.vf); dev->exp.sriov_pf.vf =3D NULL; dev->exp.sriov_pf.num_vfs =3D 0; - pci_set_word(dev->config + dev->exp.sriov_cap + PCI_SRIOV_NUM_VF, 0); } =20 void pcie_sriov_config_write(PCIDevice *dev, uint32_t address, @@ -260,6 +259,8 @@ void pcie_sriov_pf_reset(PCIDevice *dev) pci_set_word(dev->config + sriov_cap + PCI_SRIOV_CTRL, 0); unregister_vfs(dev); =20 + pci_set_word(dev->config + sriov_cap + PCI_SRIOV_NUM_VF, 0); + /* * Default is to use 4K pages, software can modify it * to any of the supported bits --=20 2.43.1