Commit fadccafd authored by Ethan Zhao's avatar Ethan Zhao
Browse files

PCI: Make pci_dev_is_disconnected() helper public for other drivers 

mainline inclusion
from mainline-v6.9-rc1
commit 39714fd73c6b60a8d27bcc5b431afb0828bf4434
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9PD4M
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=39714fd73c6b60a8d27bcc5b431afb0828bf4434



-------------------------------------

Intel-SIG: commit 39714fd73c6b PCI: Make pci_dev_is_disconnected() helper public for other drivers
Backport Intel VT-d PCIe related upstream bugfixes to kernel 5.10.

Make pci_dev_is_disconnected() public so that it can be called from
Intel VT-d driver to quickly fix/workaround the surprise removal
unplug hang issue for those ATS capable devices on PCIe switch downstream
hotplug capable ports.

Beside pci_device_is_present() function, this one has no config space
space access, so is light enough to optimize the normal pure surprise
removal and safe removal flow.

Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Tested-by: default avatarHaorong Ye <yehaorong@bytedance.com>
Signed-off-by: default avatarEthan Zhao <haifeng.zhao@linux.intel.com>
Link: https://lore.kernel.org/r/20240301080727.3529832-2-haifeng.zhao@linux.intel.com


Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
(cherry picked from commit 39714fd73c6b60a8d27bcc5b431afb0828bf4434)
Signed-off-by: default avatarEthan Zhao <haifeng.zhao@linux.intel.com>
parent 719747ca

drivers/pci/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -408,11 +408,6 @@ static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused) 
	return 0;

}



static inline bool pci_dev_is_disconnected(const struct pci_dev *dev)

{

	return dev->error_state == pci_channel_io_perm_failure;

}



/* pci_dev priv_flags */

#define PCI_DEV_ADDED 0

#define PCI_DPC_RECOVERED 1

include/linux/pci.h

+5 −0
Original line number Diff line number Diff line
@@ -2258,6 +2258,11 @@ static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev) 
	return NULL;

}



static inline bool pci_dev_is_disconnected(const struct pci_dev *dev)

{

	return dev->error_state == pci_channel_io_perm_failure;

}



void pci_request_acs(void);

bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags);

bool pci_acs_path_enabled(struct pci_dev *start,