Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795060983; b=N2GFgRCQnIFzkf8LQbGm11I2BF25Wzaxd12VWwzvjQf3ffRNvE57lYa8aWY75UQ34WMI 8tgGFyXFtBAxla5m+tktnZsLjESWZ3IdRoqh83Mou9zJ6EOOj8mflvScDA9D9xh3OeVzT XbET3rRxzspHhCStpRsjWnVViRHIFO8oBkp4lW2rUbM6dDwa3j1oAxPAonErjMRpTmWd1 GwiettWJajfb6bht9CsMMeQyWTqFkxEivImc7DVxLoVSIg2lowk5LJSafjiAB1K28u+2+ M2DuANdYk6W31vll3P7xjcdYHjfh2XBrpQKID6ANkcgqSxmg0cOvp92Gmm/OqQsDJwA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060983; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=2FnqxXptTo8N+XyCyH7bB/59808O3rZ7UxGx5QBcz00=; b=adpVOuqAybEdzYvpINiI1EaUaajvHk3ObGlfd3UeNk4281mWY7hzCq51I2jYX13GI+DN sJ2qEQByJMoDIp/AztN5tCx/x7WpJSq2xKZrXaRxfccjwT5UUOFY7bMfzcfCk4r+IzpX1 f9470nkE/2kKN9aovkgV9q92YZ9/Q6saX5zG7D33eJVTr6TsULkhBd4UcRs192vmWVkEm St85Y8guWGbVP4opxZkWfVJnyug5pZlCHepkIwcSZVrgdzL9C5kEEaNP+TXH43lA17mZQ vHXzVnQyF9AKzCxRNs9oIJRt2LqkD81+CvAJmRyidQJgMNr7Tc9kkQ4HGMIiJ3ZjH1w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ZCT2bKQS; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D01E606A338; Thu, 19 Nov 2026 04:03:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ZCT2bKQS Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DD5A1F000C5; Thu, 19 Nov 2026 04:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795060983; bh=2FnqxXptTo8N+XyCyH7bB/59808O3rZ7UxGx5QBcz00=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZCT2bKQSdLytC1+v996/p2lwriXVHTzfsH1nCMWkM9w0cwHcVuY4r9rhLHt05IwTX zvy85yTGRhmrgiE6vAFFf651pkYTcFpQeP7CmNGwXj6AShXi89UBlxo9v5tYmoYCq+ oVg1Nj6PWzoyeT2uFOAlG/Iz8h9ICbv81uj1QjAA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Logan Odell , Bjorn Helgaas , Sasha Levin Subject: [PATCH 5.10 1394/1848] PCI/IOV: Read VF config values that need not match PF Date: Wed, 18 Nov 2026 15:57:12 +0100 Message-ID: <20261118150017.882127166@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Logan Odell [ Upstream commit ae43799529c480510dcc14bd0ed141a1d85b9259 ] Per PCIe r7.0, sec 7.5.1.1.5 and 7.5.1.2.3, VF Revision IDs and Subsystem IDs may differ from the PF's. Read these values from VF config space instead of using cached values from VF 0. Per 7.5.1.1.6 and 7.5.1.2.3, VF Class Codes and Subsystem Vendor IDs must be the same as the PF's. Use the PF's value instead of reading from VF config space. Per 7.5.1.1.9, the Header Type for a VF must be 0, so hardcode that assignment. Fixes: cf0921bea66c ("PCI/IOV: Use VF0 cached config registers for other VFs") Signed-off-by: Logan Odell [bhelgaas: commit log, move "rev" decl inside block that uses it] Signed-off-by: Bjorn Helgaas Link: https://patch.msgid.link/20260910173648.1304517-1-loganodell@google.com Signed-off-by: Sasha Levin --- drivers/pci/iov.c | 25 ------------------------- drivers/pci/pci.h | 4 ---- drivers/pci/probe.c | 15 ++++++++++----- 3 files changed, 10 insertions(+), 34 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index f939cbada3755..9a7780b30e5fb 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -110,29 +110,6 @@ resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) return dev->sriov->barsz[resno - PCI_IOV_RESOURCES]; } -static void pci_read_vf_config_common(struct pci_dev *virtfn) -{ - struct pci_dev *physfn = virtfn->physfn; - - /* - * Some config registers are the same across all associated VFs. - * Read them once from VF0 so we can skip reading them from the - * other VFs. - * - * PCIe r4.0, sec 9.3.4.1, technically doesn't require all VFs to - * have the same Revision ID and Subsystem ID, but we assume they - * do. - */ - pci_read_config_dword(virtfn, PCI_CLASS_REVISION, - &physfn->sriov->class); - pci_read_config_byte(virtfn, PCI_HEADER_TYPE, - &physfn->sriov->hdr_type); - pci_read_config_word(virtfn, PCI_SUBSYSTEM_VENDOR_ID, - &physfn->sriov->subsystem_vendor); - pci_read_config_word(virtfn, PCI_SUBSYSTEM_ID, - &physfn->sriov->subsystem_device); -} - int pci_iov_sysfs_link(struct pci_dev *dev, struct pci_dev *virtfn, int id) { @@ -182,8 +159,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) virtfn->physfn = pci_dev_get(dev); virtfn->no_command_memory = 1; - if (id == 0) - pci_read_vf_config_common(virtfn); rc = pci_setup_device(virtfn); if (rc) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 8802bf0f48b46..0b31b914adc08 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -355,10 +355,6 @@ struct pci_sriov { u16 driver_max_VFs; /* Max num VFs driver supports */ struct pci_dev *dev; /* Lowest numbered PF */ struct pci_dev *self; /* This PF */ - u32 class; /* VF device */ - u8 hdr_type; /* VF header type */ - u16 subsystem_vendor; /* VF subsystem vendor */ - u16 subsystem_device; /* VF subsystem device */ resource_size_t barsz[PCI_SRIOV_NUM_BARS]; /* VF BAR size */ bool drivers_autoprobe; /* Auto probing of VFs by driver */ }; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c8dc988df4c39..030b7d71505c6 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1724,8 +1724,13 @@ static u32 pci_class(struct pci_dev *dev) u32 class; #ifdef CONFIG_PCI_IOV - if (dev->is_virtfn) - return dev->physfn->sriov->class; + if (dev->is_virtfn) { + u8 rev; + + if (pci_read_config_byte(dev, PCI_REVISION_ID, &rev)) + rev = 0; + return (dev->physfn->class << 8) | rev; + } #endif pci_read_config_dword(dev, PCI_CLASS_REVISION, &class); return class; @@ -1735,8 +1740,8 @@ static void pci_subsystem_ids(struct pci_dev *dev, u16 *vendor, u16 *device) { #ifdef CONFIG_PCI_IOV if (dev->is_virtfn) { - *vendor = dev->physfn->sriov->subsystem_vendor; - *device = dev->physfn->sriov->subsystem_device; + *vendor = dev->physfn->subsystem_vendor; + pci_read_config_word(dev, PCI_SUBSYSTEM_ID, device); return; } #endif @@ -1750,7 +1755,7 @@ static u8 pci_hdr_type(struct pci_dev *dev) #ifdef CONFIG_PCI_IOV if (dev->is_virtfn) - return dev->physfn->sriov->hdr_type; + return 0; #endif pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type); return hdr_type; -- 2.53.0