Commit 1900ca13 authored by Hao, Xudong's avatar Hao, Xudong Committed by Jesse Barnes
Browse files

PCI: Enable ATS at the device state restore 



During S3 or S4 resume or PCI reset, ATS regs aren't restored correctly.
This patch enables ATS at the device state restore if PCI device has ATS
capability.

Signed-off-by: default avatarXudong Hao <xudong.hao@intel.com>
Signed-off-by: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 424eb391

drivers/pci/ats.c

+17 −0
Original line number Diff line number Diff line
@@ -128,6 +128,23 @@ void pci_disable_ats(struct pci_dev *dev) 
}

EXPORT_SYMBOL_GPL(pci_disable_ats);



void pci_restore_ats_state(struct pci_dev *dev)

{

	u16 ctrl;



	if (!pci_ats_enabled(dev))

		return;

	if (!pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ATS))

		BUG();



	ctrl = PCI_ATS_CTRL_ENABLE;

	if (!dev->is_virtfn)

		ctrl |= PCI_ATS_CTRL_STU(dev->ats->stu - PCI_ATS_MIN_STU);



	pci_write_config_word(dev, dev->ats->pos + PCI_ATS_CTRL, ctrl);

}

EXPORT_SYMBOL_GPL(pci_restore_ats_state);



/**

 * pci_ats_queue_depth - query the ATS Invalidate Queue Depth

 * @dev: the PCI device

drivers/pci/pci.c

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


	/* PCI Express register must be restored first */

	pci_restore_pcie_state(dev);

	pci_restore_ats_state(dev);



	/*

	 * The Base Address register should be programmed before the command

drivers/pci/pci.h

+8 −0
Original line number Diff line number Diff line
@@ -251,6 +251,14 @@ struct pci_sriov { 
	u8 __iomem *mstate;	/* VF Migration State Array */

};



#ifdef CONFIG_PCI_ATS

extern void pci_restore_ats_state(struct pci_dev *dev);

#else

static inline void pci_restore_ats_state(struct pci_dev *dev)

{

}

#endif /* CONFIG_PCI_ATS */



#ifdef CONFIG_PCI_IOV

extern int pci_iov_init(struct pci_dev *dev);

extern void pci_iov_release(struct pci_dev *dev);