Commit fff905f3 authored by Wei Yang's avatar Wei Yang Committed by Bjorn Helgaas
Browse files

PCI: Move PCI_FIND_CAP_TTL to pci.h and use it in quirks 



Some quirks search for a HyperTransport capability and use a hard-coded TTL
value of 48 to avoid an infinite loop.

Move the definition of PCI_FIND_CAP_TTL to pci.h and use it instead of the
hard-coded TTL values.

[bhelgaas: changelog]
Signed-off-by: default avatarWei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ffb4d602

drivers/pci/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) 
EXPORT_SYMBOL_GPL(pci_ioremap_bar);

#endif



#define PCI_FIND_CAP_TTL	48



static int __pci_find_next_cap_ttl(struct pci_bus *bus, unsigned int devfn,

				   u8 pos, int cap, int *ttl)

drivers/pci/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#define PCI_CFG_SPACE_SIZE	256

#define PCI_CFG_SPACE_EXP_SIZE	4096



#define PCI_FIND_CAP_TTL	48



extern const unsigned char pcie_link_speed[];



bool pcie_cap_has_lnkctl(const struct pci_dev *dev);

drivers/pci/quirks.c

+4 −4
Original line number Diff line number Diff line
@@ -2247,7 +2247,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x9601, quirk_amd_780_apc_msi); 
 * return 1 if a HT MSI capability is found and enabled */

static int msi_ht_cap_enabled(struct pci_dev *dev)

{

	int pos, ttl = 48;

	int pos, ttl = PCI_FIND_CAP_TTL;



	pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);

	while (pos && ttl--) {
@@ -2306,7 +2306,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE, 
/* Force enable MSI mapping capability on HT bridges */

static void ht_enable_msi_mapping(struct pci_dev *dev)

{

	int pos, ttl = 48;

	int pos, ttl = PCI_FIND_CAP_TTL;



	pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);

	while (pos && ttl--) {
@@ -2385,7 +2385,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 


static int ht_check_msi_mapping(struct pci_dev *dev)

{

	int pos, ttl = 48;

	int pos, ttl = PCI_FIND_CAP_TTL;

	int found = 0;



	/* check if there is HT MSI cap or enabled on this device */
@@ -2510,7 +2510,7 @@ out: 


static void ht_disable_msi_mapping(struct pci_dev *dev)

{

	int pos, ttl = 48;

	int pos, ttl = PCI_FIND_CAP_TTL;



	pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);

	while (pos && ttl--) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE