Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c5cdb6a authored by Yu Zhao's avatar Yu Zhao Committed by Jesse Barnes
Browse files

PCI: restore saved SR-IOV state 



Restore the volatile registers in the SR-IOV capability after the
D3->D0 transition.

Reviewed-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarYu Zhao <yu.zhao@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent d1b054da

drivers/pci/iov.c

+29 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,25 @@ static void sriov_release(struct pci_dev *dev) 
	dev->sriov = NULL;

	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 = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++)

		pci_update_resource(dev, i);



	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

 * pci_iov_init - initialize the IOV capability

 * @dev: the PCI device

 * @dev: the PCI device
@@ -180,3 +199,13 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno, 
	return dev->sriov->pos + PCI_SRIOV_BAR +

	return dev->sriov->pos + PCI_SRIOV_BAR +

		4 * (resno - PCI_IOV_RESOURCES);

		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);

}

drivers/pci/pci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -775,6 +775,7 @@ pci_restore_state(struct pci_dev *dev) 
	}

	}

	pci_restore_pcix_state(dev);

	pci_restore_pcix_state(dev);

	pci_restore_msi_state(dev);

	pci_restore_msi_state(dev);

	pci_restore_iov_state(dev);





	return 0;

	return 0;

}

}

drivers/pci/pci.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -222,6 +222,7 @@ extern int pci_iov_init(struct pci_dev *dev); 
extern void pci_iov_release(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,

extern int pci_iov_resource_bar(struct pci_dev *dev, int resno,

				enum pci_bar_type *type);

				enum pci_bar_type *type);

extern void pci_restore_iov_state(struct pci_dev *dev);

#else

#else

static inline int pci_iov_init(struct pci_dev *dev)

static inline int pci_iov_init(struct pci_dev *dev)

{

{
@@ -236,6 +237,9 @@ static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno, 
{

{

	return 0;

	return 0;

}

}

static inline void pci_restore_iov_state(struct pci_dev *dev)

{

}

#endif /* CONFIG_PCI_IOV */

#endif /* CONFIG_PCI_IOV */





#endif /* DRIVERS_PCI_H */
 
#endif /* DRIVERS_PCI_H */