Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1292090

[PATCH 04/06] iommu/ipmmu-vmsa: Rework interrupt code and use bitmap for context

Show all headers | View raw

From: Magnus Damm <damm+renesas@opensource.se>

Introduce a bitmap for context handing and convert the
interrupt routine to go handle all registered contexts.

At this point the number of contexts are still limited.

The purpose of this patch is to remove the use of the
ARM specific mapping variable from ipmmu_irq(). 

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 drivers/iommu/ipmmu-vmsa.c |   37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

--- 0007/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c	2015-12-15 13:14:35.540513000 +0900
@@ -8,6 +8,7 @@
  * the Free Software Foundation; version 2 of the License.
  */
 
+#include <linux/bitmap.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
@@ -26,12 +27,16 @@
 
 #include "io-pgtable.h"
 
+#define IPMMU_CTX_MAX 1
+
 struct ipmmu_vmsa_device {
 	struct device *dev;
 	void __iomem *base;
 	struct list_head list;
 
 	unsigned int num_utlbs;
+	DECLARE_BITMAP(ctx, IPMMU_CTX_MAX);
+	struct ipmmu_vmsa_domain *domains[IPMMU_CTX_MAX];
 
 	struct dma_iommu_mapping *mapping;
 };
@@ -319,6 +324,7 @@ static struct iommu_gather_ops ipmmu_gat
 static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
 {
 	phys_addr_t ttbr;
+	int ret;
 
 	/*
 	 * Allocate the page table operations.
@@ -348,10 +354,16 @@ static int ipmmu_domain_init_context(str
 		return -EINVAL;
 
 	/*
-	 * TODO: When adding support for multiple contexts, find an unused
-	 * context.
+	 * Find an unused context.
 	 */
-	domain->context_id = 0;
+	ret = bitmap_find_free_region(domain->mmu->ctx, IPMMU_CTX_MAX, 0);
+	if (ret < 0) {
+		free_io_pgtable_ops(domain->iop);
+		return ret;
+	}
+
+	domain->context_id = ret;
+	domain->mmu->domains[ret] = domain;
 
 	/* TTBR0 */
 	ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr[0];
@@ -395,6 +407,8 @@ static int ipmmu_domain_init_context(str
 
 static void ipmmu_domain_destroy_context(struct ipmmu_vmsa_domain *domain)
 {
+	bitmap_release_region(domain->mmu->ctx, domain->context_id, 0);
+
 	/*
 	 * Disable the context. Flush the TLB as required when modifying the
 	 * context registers.
@@ -460,16 +474,16 @@ static irqreturn_t ipmmu_domain_irq(stru
 static irqreturn_t ipmmu_irq(int irq, void *dev)
 {
 	struct ipmmu_vmsa_device *mmu = dev;
-	struct iommu_domain *io_domain;
-	struct ipmmu_vmsa_domain *domain;
-
-	if (!mmu->mapping)
-		return IRQ_NONE;
+	irqreturn_t status = IRQ_NONE;
+	unsigned int k;
 
-	io_domain = mmu->mapping->domain;
-	domain = to_vmsa_domain(io_domain);
+	/* Check interrupts for all active contexts */
+	for (k = find_first_bit(mmu->ctx, IPMMU_CTX_MAX);
+	     k < IPMMU_CTX_MAX && status == IRQ_NONE;
+	     k = find_next_bit(mmu->ctx, IPMMU_CTX_MAX, k))
+		status = ipmmu_domain_irq(mmu->domains[k]);
 
-	return ipmmu_domain_irq(domain);
+	return status;
 }
 
 /* -----------------------------------------------------------------------------
@@ -788,6 +802,7 @@ static int ipmmu_probe(struct platform_d
 
 	mmu->dev = &pdev->dev;
 	mmu->num_utlbs = 32;
+	bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);
 
 	/* Map I/O memory and request IRQ. */
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/06] iommu/ipmmu-vmsa: IPMMU multi-arch update Magnus Damm <magnus.damm@gmail.com> - 2015-12-15 13:10 +0100
  [PATCH 06/06] iommu/ipmmu-vmsa: Drop LPAE Kconfig dependency Magnus Damm <magnus.damm@gmail.com> - 2015-12-15 13:10 +0100
    Re: [PATCH 06/06] iommu/ipmmu-vmsa: Drop LPAE Kconfig dependency Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2015-12-29 01:30 +0100
  [PATCH 05/06] iommu/ipmmu-vmsa: Break out 32-bit ARM mapping code Magnus Damm <magnus.damm@gmail.com> - 2015-12-15 13:10 +0100
    Re: [PATCH 05/06] iommu/ipmmu-vmsa: Break out 32-bit ARM mapping code Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2015-12-29 01:30 +0100
  [PATCH 02/06] iommu/ipmmu-vmsa: Convert to dev_data Magnus Damm <magnus.damm@gmail.com> - 2015-12-15 13:10 +0100
    Re: [PATCH 02/06] iommu/ipmmu-vmsa: Convert to dev_data Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2015-12-29 01:10 +0100
  [PATCH 04/06] iommu/ipmmu-vmsa: Rework interrupt code and use bitmap for context Magnus Damm <magnus.damm@gmail.com> - 2015-12-15 13:10 +0100
    Re: [PATCH 04/06] iommu/ipmmu-vmsa: Rework interrupt code and use bitmap for context Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2015-12-29 01:20 +0100
  [PATCH 01/06] iommu/ipmmu-vmsa: Remove platform data handling Magnus Damm <magnus.damm@gmail.com> - 2015-12-15 13:10 +0100
    Re: [PATCH 01/06] iommu/ipmmu-vmsa: Remove platform data handling Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2015-12-29 01:10 +0100
  [PATCH 03/06] iommu/ipmmu-vmsa: Break out utlb control function Magnus Damm <magnus.damm@gmail.com> - 2015-12-15 13:10 +0100
    Re: [PATCH 03/06] iommu/ipmmu-vmsa: Break out utlb control function Geert Uytterhoeven <geert@linux-m68k.org> - 2015-12-15 16:50 +0100
      Re: [PATCH 03/06] iommu/ipmmu-vmsa: Break out utlb control function Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2015-12-29 01:10 +0100

csiph-web