| Message ID | 1435627004-6029-2-git-send-email-weiyang@linux.vnet.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Jun 30, 2015 at 09:16:41AM +0800, Wei Yang wrote: > In some quirks, it tries to search a pci cap and use a ttl value to avoid > infinite loop. While the value is hard coded to 48, which is the same as > macro PCI_FIND_CAP_TTL. > > This patch moves the definition of PCI_FIND_CAP_TTL to pci.h and replace > the hard coded value with it. > > Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> Applied to pci/misc for v4.3 with changelog as follows. Original patch touched some code that was removed in v4.2, so I adjusted for that, too. commit 875803b6ef5becdcc2d43b014531279dfaa978af Author: Wei Yang <weiyang@linux.vnet.ibm.com> Date: Tue Jun 30 09:16:41 2015 +0800 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: Wei Yang <weiyang@linux.vnet.ibm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index acc4b6e..24ebb1b 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -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) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 9bd762c2..1b0d20e 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -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); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c6dc1df..ad3b62c 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2250,7 +2250,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--) { @@ -2309,7 +2309,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--) { @@ -2388,7 +2388,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 */ @@ -2513,7 +2513,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--) {
In some quirks, it tries to search a pci cap and use a ttl value to avoid infinite loop. While the value is hard coded to 48, which is the same as macro PCI_FIND_CAP_TTL. This patch moves the definition of PCI_FIND_CAP_TTL to pci.h and replace the hard coded value with it. Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> --- v1 -> v2: define PCI_FIND_CAP_TTL in drivers/pci/pci.h instead of include/linux/pci.h --- drivers/pci/pci.c | 1 - drivers/pci/pci.h | 2 ++ drivers/pci/quirks.c | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-)