lkml.org 
[lkml]   [2009]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 2/7] PCI: restore saved SR-IOV state
    Date
    Signed-off-by: Yu Zhao <yu.zhao@intel.com>
    ---
    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 */
    --
    1.5.6.4


    \
     
     \ /
      Last update: 2009-02-10 10:07    [W:2.154 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site