From patchwork Tue Feb 10 08:59:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 6355 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1A93mSR026893 for ; Tue, 10 Feb 2009 09:03:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753254AbZBJJDl (ORCPT ); Tue, 10 Feb 2009 04:03:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752970AbZBJJDj (ORCPT ); Tue, 10 Feb 2009 04:03:39 -0500 Received: from mga09.intel.com ([134.134.136.24]:4656 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752301AbZBJJDX (ORCPT ); Tue, 10 Feb 2009 04:03:23 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 10 Feb 2009 00:56:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,185,1233561600"; d="scan'208";a="488749266" Received: from yzhao-otc.sh.intel.com ([10.239.48.153]) by orsmga001.jf.intel.com with ESMTP; 10 Feb 2009 01:03:08 -0800 From: Yu Zhao To: jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yu Zhao Subject: [PATCH v8 2/7] PCI: restore saved SR-IOV state Date: Tue, 10 Feb 2009 16:59:10 +0800 Message-Id: <1234256355-23153-3-git-send-email-yu.zhao@intel.com> X-Mailer: git-send-email 1.6.1 In-Reply-To: <1234256355-23153-1-git-send-email-yu.zhao@intel.com> References: <1234256355-23153-1-git-send-email-yu.zhao@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Yu Zhao --- drivers/pci/iov.c | 25 +++++++++++++++++++++++++ drivers/pci/pci.c | 1 + drivers/pci/pci.h | 4 ++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 9a1fabd..bd389b4 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -125,6 +125,21 @@ static void sriov_release(struct pci_dev *dev) dev->sriov = NULL; } +static void sriov_restore_state(struct pci_dev *dev) +{ + 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; + + 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 @@ -176,3 +191,13 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno, return dev->sriov->pos + PCI_SRIOV_BAR + 4 * (resno - PCI_SRIOV_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->sriov) + sriov_restore_state(dev); +} diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index c4f14f3..f791dcf 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -773,6 +773,7 @@ pci_restore_state(struct pci_dev *dev) } pci_restore_pcix_state(dev); pci_restore_msi_state(dev); + pci_restore_iov_state(dev); return 0; } diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index d2dc6b7..9d76737 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -216,6 +216,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) { @@ -230,6 +231,9 @@ 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 */ #endif /* DRIVERS_PCI_H */