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

Commit eeafda70 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI: fix HT MSI mapping fix 



Impact: fix bug

This patch reworks the nv_msi_ht_cap_quirk() and will only try to avoid
to enable ht_msi on device following that root dev, and don't touch that
root dev, but only do that trick with end_device on the chain.

Reported-by: default avatarPrakash Punnoor <prakash@punnoor.de>
Tested-by: default avatarPrakash Punnoor <prakash@punnoor.de>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent de745306

drivers/pci/quirks.c

+30 −2
Original line number Diff line number Diff line
@@ -2206,6 +2206,33 @@ static int __devinit host_bridge_with_leaf(struct pci_dev *host_bridge) 
	return found;

}



#define PCI_HT_CAP_SLAVE_CTRL0     4    /* link control */

#define PCI_HT_CAP_SLAVE_CTRL1     8    /* link control to */



static int __devinit is_end_of_ht_chain(struct pci_dev *dev)

{

	int pos, ctrl_off;

	int end = 0;

	u16 flags, ctrl;



	pos = pci_find_ht_capability(dev, HT_CAPTYPE_SLAVE);



	if (!pos)

		goto out;



	pci_read_config_word(dev, pos + PCI_CAP_FLAGS, &flags);



	ctrl_off = ((flags >> 10) & 1) ?

			PCI_HT_CAP_SLAVE_CTRL0 : PCI_HT_CAP_SLAVE_CTRL1;

	pci_read_config_word(dev, pos + ctrl_off, &ctrl);



	if (ctrl & (1 << 6))

		end = 1;



out:

	return end;

}



static void __devinit nv_ht_enable_msi_mapping(struct pci_dev *dev)

{

	struct pci_dev *host_bridge;
@@ -2230,8 +2257,9 @@ static void __devinit nv_ht_enable_msi_mapping(struct pci_dev *dev) 
	if (!found)

		return;



	/* don't enable host_bridge with leaf directly here */

	if (host_bridge == dev && host_bridge_with_leaf(host_bridge))

	/* don't enable end_device/host_bridge with leaf directly here */

	if (host_bridge == dev && is_end_of_ht_chain(host_bridge) &&

	    host_bridge_with_leaf(host_bridge))

		goto out;



	/* root did that ! */