From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57354 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751941AbdC1MOJ (ORCPT ); Tue, 28 Mar 2017 08:14:09 -0400 Subject: Patch "PCI: Do any VF BAR updates before enabling the BARs" has been added to the 4.4-stable tree To: sumit.semwal@linaro.org, alexander.levin@verizon.com, bhelgaas@google.com, clsoto@us.ibm.com, gregkh@linuxfoundation.org, gwshan@linux.vnet.ibm.com Cc: , From: Date: Tue, 28 Mar 2017 14:13:14 +0200 In-Reply-To: <1490458699-24484-13-git-send-email-sumit.semwal@linaro.org> Message-ID: <1490703194864@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled PCI: Do any VF BAR updates before enabling the BARs to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: pci-do-any-vf-bar-updates-before-enabling-the-bars.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Tue Mar 28 13:59:27 CEST 2017 From: Sumit Semwal Date: Sat, 25 Mar 2017 21:48:12 +0530 Subject: PCI: Do any VF BAR updates before enabling the BARs To: stable@vger.kernel.org Cc: Gavin Shan , Bjorn Helgaas , Sasha Levin , Greg Kroah-Hartman , Sumit Semwal Message-ID: <1490458699-24484-13-git-send-email-sumit.semwal@linaro.org> From: Sumit Semwal From: Gavin Shan [ Upstream commit f40ec3c748c6912f6266c56a7f7992de61b255ed ] Previously we enabled VFs and enable their memory space before calling pcibios_sriov_enable(). But pcibios_sriov_enable() may update the VF BARs: for example, on PPC PowerNV we may change them to manage the association of VFs to PEs. Because 64-bit BARs cannot be updated atomically, it's unsafe to update them while they're enabled. The half-updated state may conflict with other devices in the system. Call pcibios_sriov_enable() before enabling the VFs so any BAR updates happen while the VF BARs are disabled. [bhelgaas: changelog] Tested-by: Carol Soto Signed-off-by: Gavin Shan Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sumit Semwal Signed-off-by: Greg Kroah-Hartman --- drivers/pci/iov.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -303,13 +303,6 @@ static int sriov_enable(struct pci_dev * return rc; } - pci_iov_set_numvfs(dev, nr_virtfn); - iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE; - pci_cfg_access_lock(dev); - pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); - msleep(100); - pci_cfg_access_unlock(dev); - iov->initial_VFs = initial; if (nr_virtfn < initial) initial = nr_virtfn; @@ -320,6 +313,13 @@ static int sriov_enable(struct pci_dev * goto err_pcibios; } + pci_iov_set_numvfs(dev, nr_virtfn); + iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE; + pci_cfg_access_lock(dev); + pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); + msleep(100); + pci_cfg_access_unlock(dev); + for (i = 0; i < initial; i++) { rc = virtfn_add(dev, i, 0); if (rc) Patches currently in stable-queue which might be from sumit.semwal@linaro.org are queue-4.4/pci-add-comments-about-rom-bar-updating.patch queue-4.4/acpi-blacklist-make-dell-latitude-3350-ethernet-work.patch queue-4.4/s390-zcrypt-introduce-cex6-toleration.patch queue-4.4/block-allow-write_same-commands-with-the-sg_io-ioctl.patch queue-4.4/pci-do-any-vf-bar-updates-before-enabling-the-bars.patch queue-4.4/x86-hyperv-handle-unknown-nmis-on-one-cpu-when-unknown_nmi_panic.patch queue-4.4/serial-8250_pci-detach-low-level-driver-during-pci-error-recovery.patch queue-4.4/xen-do-not-re-use-pirq-number-cached-in-pci-device-msi-msg-data.patch queue-4.4/pci-separate-vf-bar-updates-from-standard-bar-updates.patch queue-4.4/pci-ignore-bar-updates-on-virtual-functions.patch queue-4.4/pci-update-bars-using-property-bits-appropriate-for-type.patch queue-4.4/vfio-spapr-postpone-allocation-of-userspace-version-of-tce-table.patch queue-4.4/pci-don-t-update-vf-bars-while-vf-memory-space-is-enabled.patch queue-4.4/igb-workaround-for-igb-i210-firmware-issue.patch queue-4.4/pci-remove-pci_resource_bar-and-pci_iov_resource_bar.patch queue-4.4/pci-decouple-ioresource_rom_enable-and-pci_rom_address_enable.patch queue-4.4/acpi-blacklist-add-_rev-quirks-for-dell-precision-5520-and-3520.patch queue-4.4/igb-add-i211-to-i210-phy-workaround.patch queue-4.4/uvcvideo-uvc_scan_fallback-for-webcams-with-broken-chain.patch