Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1330818
| From | Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 1/8] iommu: Add MMIO mapping type |
| Date | 2016-02-10 02:10 +0100 |
| Message-ID | <r0rs6-3Ax-15@gated-at.bofh.it> (permalink) |
| References | <r0rs6-3Ax-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Robin Murphy <robin.murphy@arm.com> On some platforms, MMIO regions might need slightly different treatment compared to mapping regular memory; add the notion of MMIO mappings to the IOMMU API's memory type flags, so that callers can let the IOMMU drivers know to do the right thing. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/iommu/io-pgtable-arm.c | 4 +++- include/linux/iommu.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 381ca5a..3ff4f87 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -364,7 +364,9 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data, pte |= ARM_LPAE_PTE_HAP_READ; if (prot & IOMMU_WRITE) pte |= ARM_LPAE_PTE_HAP_WRITE; - if (prot & IOMMU_CACHE) + if (prot & IOMMU_MMIO) + pte |= ARM_LPAE_PTE_MEMATTR_DEV; + else if (prot & IOMMU_CACHE) pte |= ARM_LPAE_PTE_MEMATTR_OIWB; else pte |= ARM_LPAE_PTE_MEMATTR_NC; diff --git a/include/linux/iommu.h b/include/linux/iommu.h index a5c539f..34b6432 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -30,6 +30,7 @@ #define IOMMU_WRITE (1 << 1) #define IOMMU_CACHE (1 << 2) /* DMA cache coherency */ #define IOMMU_NOEXEC (1 << 3) +#define IOMMU_MMIO (1 << 4) /* e.g. things like MSI doorbells */ struct iommu_ops; struct iommu_group; -- 2.7.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> - 2016-02-10 02:10 +0100
[PATCH v3 1/8] iommu: Add MMIO mapping type Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> - 2016-02-10 02:10 +0100
Re: [PATCH v3 1/8] iommu: Add MMIO mapping type Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2016-02-11 01:10 +0100
Re: [PATCH v3 1/8] iommu: Add MMIO mapping type Robin Murphy <robin.murphy@arm.com> - 2016-02-11 17:00 +0100
Re: [PATCH v3 1/8] iommu: Add MMIO mapping type "Niklas Söderlund" <niklas.soderlund@ragnatech.se> - 2016-02-16 13:10 +0100
Re: [PATCH v3 1/8] iommu: Add MMIO mapping type Robin Murphy <robin.murphy@arm.com> - 2016-02-16 13:50 +0100
Re: [PATCH v3 1/8] iommu: Add MMIO mapping type Niklas Söderlund <niklas.soderlund@ragnatech.se> - 2016-02-16 14:40 +0100
[PATCH v3 5/8] dmaengine: rcar-dmac: group slave configuration Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> - 2016-02-10 02:10 +0100
Re: [PATCH v3 5/8] dmaengine: rcar-dmac: group slave configuration Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2016-02-11 01:20 +0100
[PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> - 2016-02-10 02:10 +0100
Re: [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Robin Murphy <robin.murphy@arm.com> - 2016-02-10 11:50 +0100
Re: [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2016-02-11 01:40 +0100
[PATCH v3 3/8] dma-mapping: add dma_{map,unmap}_resource Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> - 2016-02-10 02:10 +0100
Re: [PATCH v3 3/8] dma-mapping: add dma_{map,unmap}_resource Robin Murphy <robin.murphy@arm.com> - 2016-02-10 11:30 +0100
[PATCH v3 7/8] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> - 2016-02-10 02:10 +0100
Re: [PATCH v3 7/8] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Simon Horman <horms@verge.net.au> - 2016-02-10 19:00 +0100
Re: [PATCH v3 7/8] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 "Niklas Söderlund" <niklas.soderlund@ragnatech.se> - 2016-02-11 02:00 +0100
Re: [PATCH v3 7/8] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2016-02-11 01:50 +0100
csiph-web