Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a380507 authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

PCI: Use pci_find_ht_capability() in drivers/pci/quirks.c 



Use pci_find_ht_capability() in drivers/pci/quirks.c.

I'm pretty sure the logic is unchanged here, but someone please eye-ball it
for me. I've changed the message to be a little shorter, it's now:

PCI: Found (enabled|disabled) HT MSI mapping on xxxx:xx:xx.x

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d010b51c

drivers/pci/quirks.c

+16 −12
Original line number Diff line number Diff line
@@ -1644,19 +1644,23 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_ 
 * return 1 if a HT MSI capability is found and enabled */

static int __devinit msi_ht_cap_enabled(struct pci_dev *dev)

{

	u8 pos;

	int ttl;

	for (pos = pci_find_capability(dev, PCI_CAP_ID_HT), ttl = 48;

	     pos && ttl;

	     pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_HT), ttl--) {

		u32 cap_hdr;

		/* MSI mapping section according to Hypertransport spec */

		if (pci_read_config_dword(dev, pos, &cap_hdr) == 0

		    && (cap_hdr & 0xf8000000) == 0xa8000000 /* MSI mapping */) {

			printk(KERN_INFO "PCI: Found HT MSI mapping on %s with capability %s\n",

			       pci_name(dev), cap_hdr & 0x10000 ? "enabled" : "disabled");

			return (cap_hdr & 0x10000) != 0; /* MSI mapping cap enabled */

	int pos, ttl = 48;



	pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);

	while (pos && ttl--) {

		u8 flags;



		if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,

					 &flags) == 0)

		{

			printk(KERN_INFO "PCI: Found %s HT MSI Mapping on %s\n",

				flags & HT_MSI_FLAGS_ENABLE ?

				"enabled" : "disabled", pci_name(dev));

			return (flags & HT_MSI_FLAGS_ENABLE) != 0;

		}



		pos = pci_find_next_ht_capability(dev, pos,

						  HT_CAPTYPE_MSI_MAPPING);

	}

	return 0;

}