diff options
author | Yu Zhao <yu.zhao@intel.com> | 2009-03-19 23:25:12 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-20 13:48:24 -0400 |
commit | 8c5cdb6adc6688b9b8fd82ea4a5cf4674dabad79 (patch) | |
tree | 79fbfde0cedf983b87cf6f782c108000d5c5752d /drivers/pci/iov.c | |
parent | d1b054da8f599905f3c18a218961dcf17f9d5f13 (diff) |
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>
Diffstat (limited to 'drivers/pci/iov.c')
-rw-r--r-- | drivers/pci/iov.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 66cc414ed15f..b121e47402fa 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c | |||
@@ -129,6 +129,25 @@ static void sriov_release(struct pci_dev *dev) | |||
129 | dev->sriov = NULL; | 129 | dev->sriov = NULL; |
130 | } | 130 | } |
131 | 131 | ||
132 | static void sriov_restore_state(struct pci_dev *dev) | ||
133 | { | ||
134 | int i; | ||
135 | u16 ctrl; | ||
136 | struct pci_sriov *iov = dev->sriov; | ||
137 | |||
138 | pci_read_config_word(dev, iov->pos + PCI_SRIOV_CTRL, &ctrl); | ||
139 | if (ctrl & PCI_SRIOV_CTRL_VFE) | ||
140 | return; | ||
141 | |||
142 | for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++) | ||
143 | pci_update_resource(dev, i); | ||
144 | |||
145 | pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz); | ||
146 | pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); | ||
147 | if (iov->ctrl & PCI_SRIOV_CTRL_VFE) | ||
148 | msleep(100); | ||
149 | } | ||
150 | |||
132 | /** | 151 | /** |
133 | * pci_iov_init - initialize the IOV capability | 152 | * pci_iov_init - initialize the IOV capability |
134 | * @dev: the PCI device | 153 | * @dev: the PCI device |
@@ -180,3 +199,13 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno, | |||
180 | return dev->sriov->pos + PCI_SRIOV_BAR + | 199 | return dev->sriov->pos + PCI_SRIOV_BAR + |
181 | 4 * (resno - PCI_IOV_RESOURCES); | 200 | 4 * (resno - PCI_IOV_RESOURCES); |
182 | } | 201 | } |
202 | |||
203 | /** | ||
204 | * pci_restore_iov_state - restore the state of the IOV capability | ||
205 | * @dev: the PCI device | ||
206 | */ | ||
207 | void pci_restore_iov_state(struct pci_dev *dev) | ||
208 | { | ||
209 | if (dev->is_physfn) | ||
210 | sriov_restore_state(dev); | ||
211 | } | ||