Unverified Commit 1ea8ab55 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7413 Backport Intel VT-d critical fix to olk-5.10 

Merge Pull Request from: @etzhao 
 
Hi,
This backport patch set includes Intel vt-d/PCIe critical bug fix for 5.10.

Kernel issue:
 https://gitee.com/openeuler/intel-kernel/issues/I9PD4M

Test:
 No change from upstream. no specific test is needed.

Help to review and merge
Thanks,
Ethan 
 
Link:https://gitee.com/openeuler/kernel/pulls/7413

 

Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3520325f 20b2d721

drivers/iommu/intel/pasid.c

+3 −0
Original line number Diff line number Diff line
@@ -489,6 +489,9 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu, 
	if (!info || !info->ats_enabled)

		return;



	if (pci_dev_is_disconnected(to_pci_dev(dev)))

		return;



	sid = info->bus << 8 | info->devfn;

	qdep = info->ats_qdep;

	pfsid = info->pfsid;

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,