Commit 2f83766d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull IOMMU updates from Joerg Roedel:
 "Not much stuff this time.  The only change to the IOMMU core code is
  the addition of a handle to the fault handling code.  A few updates to
  the AMD IOMMU driver to work around new errata.  The other patches are
  mostly fixes and enhancements to the existing ARM IOMMU drivers and
  documentation updates.

  A new IOMMU driver for the Exynos platform was also underway but got
  merged via the Samsung tree and is not part of this tree."

* tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  Documentation: kernel-parameters.txt Add amd_iommu_dump
  iommu/core: pass a user-provided token to fault handlers
  iommu/tegra: gart: Fix register offset correctly
  iommu: OMAP: device detach on domain destroy
  iommu: tegra/gart: Add device tree support
  iommu: tegra/gart: use correct gart_device
  iommu/tegra: smmu: Print device name correctly
  iommu/amd: Add workaround for event log erratum
  iommu/amd: Check for the right TLP prefix bit
  dma-debug: release free_entries_lock before saving stack trace
parents 4523e145 28f8571e

Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
NVIDIA Tegra 20 GART



Required properties:

- compatible: "nvidia,tegra20-gart"

- reg: Two pairs of cells specifying the physical address and size of

  the memory controller registers and the GART aperture respectively.



Example:



	gart {

		compatible = "nvidia,tegra20-gart";

		reg = <0x7000f024 0x00000018	/* controller registers */

		       0x58000000 0x02000000>;	/* GART aperture */

	};

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -335,6 +335,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					  requirements as needed. This option

					  does not override iommu=pt



	amd_iommu_dump=	[HW,X86-64]

			Enable AMD IOMMU driver option to dump the ACPI table

			for AMD IOMMU. With this option enabled, AMD IOMMU

			driver will print ACPI tables for AMD IOMMU during

			IOMMU initialization.



	amijoy.map=	[HW,JOY] Amiga joystick support

			Map of devices attached to JOY0DAT and JOY1DAT

			Format: <a>,<b>

drivers/iommu/amd_iommu.c

+27 −10
Original line number Diff line number Diff line
@@ -450,12 +450,27 @@ static void dump_command(unsigned long phys_addr) 


static void iommu_print_event(struct amd_iommu *iommu, void *__evt)

{

	u32 *event = __evt;

	int type  = (event[1] >> EVENT_TYPE_SHIFT)  & EVENT_TYPE_MASK;

	int devid = (event[0] >> EVENT_DEVID_SHIFT) & EVENT_DEVID_MASK;

	int domid = (event[1] >> EVENT_DOMID_SHIFT) & EVENT_DOMID_MASK;

	int flags = (event[1] >> EVENT_FLAGS_SHIFT) & EVENT_FLAGS_MASK;

	u64 address = (u64)(((u64)event[3]) << 32) | event[2];

	int type, devid, domid, flags;

	volatile u32 *event = __evt;

	int count = 0;

	u64 address;



retry:

	type    = (event[1] >> EVENT_TYPE_SHIFT)  & EVENT_TYPE_MASK;

	devid   = (event[0] >> EVENT_DEVID_SHIFT) & EVENT_DEVID_MASK;

	domid   = (event[1] >> EVENT_DOMID_SHIFT) & EVENT_DOMID_MASK;

	flags   = (event[1] >> EVENT_FLAGS_SHIFT) & EVENT_FLAGS_MASK;

	address = (u64)(((u64)event[3]) << 32) | event[2];



	if (type == 0) {

		/* Did we hit the erratum? */

		if (++count == LOOP_TIMEOUT) {

			pr_err("AMD-Vi: No event written to event log\n");

			return;

		}

		udelay(1);

		goto retry;

	}



	printk(KERN_ERR "AMD-Vi: Event logged [");
@@ -508,6 +523,8 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) 
	default:

		printk(KERN_ERR "UNKNOWN type=0x%02x]\n", type);

	}



	memset(__evt, 0, 4 * sizeof(u32));

}



static void iommu_poll_events(struct amd_iommu *iommu)
@@ -2035,20 +2052,20 @@ out_err: 
}



/* 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;

}



/*

drivers/iommu/iommu.c

+4 −1
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ EXPORT_SYMBOL_GPL(iommu_present); 
 * iommu_set_fault_handler() - set a fault handler for an iommu domain

 * @domain: iommu domain

 * @handler: fault handler

 * @token: user data, will be passed back to the fault handler

 *

 * This function should be used by IOMMU users which want to be notified

 * whenever an IOMMU fault happens.
@@ -127,11 +128,13 @@ EXPORT_SYMBOL_GPL(iommu_present); 
 * error code otherwise.

 */

void iommu_set_fault_handler(struct iommu_domain *domain,

					iommu_fault_handler_t handler)

					iommu_fault_handler_t handler,

					void *token)

{

	BUG_ON(!domain);



	domain->handler = handler;

	domain->handler_token = token;

}

EXPORT_SYMBOL_GPL(iommu_set_fault_handler);

drivers/iommu/omap-iommu.c

+23 −9
Original line number Diff line number Diff line
@@ -41,11 +41,13 @@ 
 * @pgtable:	the page table

 * @iommu_dev:	an omap iommu device attached to this domain. only a single

 *		iommu device can be attached for now.

 * @dev:	Device using this domain.

 * @lock:	domain lock, should be taken when attaching/detaching

 */

struct omap_iommu_domain {

	u32 *pgtable;

	struct omap_iommu *iommu_dev;

	struct device *dev;

	spinlock_t lock;

};
@@ -1081,6 +1083,7 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) 
	}



	omap_domain->iommu_dev = arch_data->iommu_dev = oiommu;

	omap_domain->dev = dev;

	oiommu->domain = domain;



out:
@@ -1088,19 +1091,16 @@ out: 
	return ret;

}



static void omap_iommu_detach_dev(struct iommu_domain *domain,

static void _omap_iommu_detach_dev(struct omap_iommu_domain *omap_domain,

			struct device *dev)

{

	struct omap_iommu_domain *omap_domain = domain->priv;

	struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;

	struct omap_iommu *oiommu = dev_to_omap_iommu(dev);



	spin_lock(&omap_domain->lock);

	struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;



	/* only a single device is supported per domain for now */

	if (omap_domain->iommu_dev != oiommu) {

		dev_err(dev, "invalid iommu device\n");

		goto out;

		return;

	}



	iopgtable_clear_entry_all(oiommu);
@@ -1108,8 +1108,16 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain, 
	omap_iommu_detach(oiommu);



	omap_domain->iommu_dev = arch_data->iommu_dev = NULL;

	omap_domain->dev = NULL;

}



out:

static void omap_iommu_detach_dev(struct iommu_domain *domain,

				 struct device *dev)

{

	struct omap_iommu_domain *omap_domain = domain->priv;



	spin_lock(&omap_domain->lock);

	_omap_iommu_detach_dev(omap_domain, dev);

	spin_unlock(&omap_domain->lock);

}
@@ -1148,13 +1156,19 @@ out: 
	return -ENOMEM;

}



/* assume device was already detached */

static void omap_iommu_domain_destroy(struct iommu_domain *domain)

{

	struct omap_iommu_domain *omap_domain = domain->priv;



	domain->priv = NULL;



	/*

	 * An iommu device is still attached

	 * (currently, only one device can be attached) ?

	 */

	if (omap_domain->iommu_dev)

		_omap_iommu_detach_dev(omap_domain, omap_domain->dev);



	kfree(omap_domain->pgtable);

	kfree(omap_domain);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE