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

Commit a3b93121 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Check for the right TLP prefix bit 



Unfortunatly the PRI spec changed and moved the
TLP-prefix-required bit to a different location. This patch
makes the necessary change in the AMD IOMMU driver.
Regressions are not expected because all hardware
implementing the PRI capability sets this bit to zero
anyway.

Cc: stable@vger.kernel.org # v3.3
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 00341028

drivers/iommu/amd_iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -2035,20 +2035,20 @@ static int pdev_iommuv2_enable(struct pci_dev *pdev) 
}



/* FIXME: Move this to PCI code */

#define PCI_PRI_TLP_OFF		(1 << 2)

#define PCI_PRI_TLP_OFF		(1 << 15)



bool pci_pri_tlp_required(struct pci_dev *pdev)

{

	u16 control;

	u16 status;

	int pos;



	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);

	if (!pos)

		return false;



	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &control);

	pci_read_config_word(pdev, pos + PCI_PRI_STATUS, &status);



	return (control & PCI_PRI_TLP_OFF) ? true : false;

	return (status & PCI_PRI_TLP_OFF) ? true : false;

}



/*