From: ddugger@redhat.com <ddugger@redhat.com> Date: Thu, 2 Apr 2009 08:46:16 -0600 Subject: [pci] restore saved SR-IOV state Message-id: 200904021446.n32EkGa8017153@sobek.n0ano.com O-Subject: [RHEL5.4 PATCH 11/17] BZ493152: Backport: PCI: restore saved SR-IOV state Bugzilla: 493152 RH-Acked-by: Rik van Riel <riel@redhat.com> RH-Acked-by: Chris Wright <chrisw@redhat.com> Upstream status: commit 8c5cdb6adc6688b9b8fd82ea4a5cf4674dabad79 Author: Yu Zhao <yu.zhao@intel.com> Date: Fri Mar 20 11:25:12 2009 +0800 PCI: restore saved SR-IOV state Restore the volatile registers in the SR-IOV capability after the D3->D0 transition. Reviewed-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Yu Zhao <yu.zhao@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Gerd Hoffman <kraxel@redhat.com> Signed-off-by: Don Dugger <donald.d.dugger@intel.com> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index eb19e8e..fc809a4 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -110,6 +110,25 @@ static void sriov_release(struct pci_dev *dev) dev->sriov = NULL; } +static void sriov_restore_state(struct pci_dev *dev) +{ + int i; + u16 ctrl; + struct pci_sriov *iov = dev->sriov; + + pci_read_config_word(dev, iov->pos + PCI_SRIOV_CTRL, &ctrl); + if (ctrl & PCI_SRIOV_CTRL_VFE) + return; + + for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) + pci_update_resource(dev, iov->res + i, i + PCI_IOV_RESOURCES); + + pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz); + pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); + if (iov->ctrl & PCI_SRIOV_CTRL_VFE) + msleep(100); +} + /** * pci_iov_init - initialize the IOV capability * @dev: the PCI device @@ -158,3 +177,13 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno, return dev->sriov->pos + PCI_SRIOV_BAR + 4 * (resno - PCI_IOV_RESOURCES); } + +/** + * pci_restore_iov_state - restore the state of the IOV capability + * @dev: the PCI device + */ +void pci_restore_iov_state(struct pci_dev *dev) +{ + if (dev->is_physfn) + sriov_restore_state(dev); +} diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 653602b..5f0cb2e 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -605,6 +605,7 @@ pci_restore_state(struct pci_dev *dev) restore_pcie_reg(dev); pci_restore_msi_state(dev); pci_restore_msix_state(dev); + pci_restore_iov_state(dev); return 0; } diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 7043b1e..57524e1 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -136,6 +136,7 @@ extern int pci_iov_init(struct pci_dev *dev); extern void pci_iov_release(struct pci_dev *dev); extern int pci_iov_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type); +extern void pci_restore_iov_state(struct pci_dev *dev); #else static inline int pci_iov_init(struct pci_dev *dev) { @@ -150,4 +151,7 @@ static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno, { return 0; } +static inline void pci_restore_iov_state(struct pci_dev *dev) +{ +} #endif /* CONFIG_PCI_IOV */