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

Commit 181e5059 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/intel-iommu 

Pull Intel IOMMU fix from David Woodhouse:
 "This fixes an oops when attempting to enable 1:1 passthrough mode for
  devices on which VT-d translation was disabled anyway.

  It's actually a long-standing bug but recent changes (commit
  18436afd: "iommu/vt-d: Allow RMRR on graphics devices too") have
  made it much easier to trigger with 'iommu=pt intel_iommu=igfx_off' on
  the command line"

* git://git.infradead.org/intel-iommu:
  iommu/vt-d: Fix passthrough mode with translation-disabled devices
parents 86579aa4 4ed6a540

drivers/iommu/intel-iommu.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -696,6 +696,11 @@ static inline struct context_entry *iommu_context_addr(struct intel_iommu *iommu 
	return &context[devfn];

	return &context[devfn];

}

}





static int iommu_dummy(struct device *dev)

{

	return dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;

}



static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn)

static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn)

{

{

	struct dmar_drhd_unit *drhd = NULL;

	struct dmar_drhd_unit *drhd = NULL;
@@ -705,6 +710,9 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf 
	u16 segment = 0;

	u16 segment = 0;

	int i;

	int i;





	if (iommu_dummy(dev))

		return NULL;



	if (dev_is_pci(dev)) {

	if (dev_is_pci(dev)) {

		pdev = to_pci_dev(dev);

		pdev = to_pci_dev(dev);

		segment = pci_domain_nr(pdev->bus);

		segment = pci_domain_nr(pdev->bus);
@@ -2969,11 +2977,6 @@ static inline struct dmar_domain *get_valid_domain_for_dev(struct device *dev) 
	return __get_valid_domain_for_dev(dev);

	return __get_valid_domain_for_dev(dev);

}

}





static int iommu_dummy(struct device *dev)

{

	return dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;

}



/* Check if the dev needs to go through non-identity map and unmap process.*/

/* Check if the dev needs to go through non-identity map and unmap process.*/

static int iommu_no_mapping(struct device *dev)

static int iommu_no_mapping(struct device *dev)

{

{