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

Groups > linux.kernel > #1330817

[PATCH v3 0/8] dmaengine: rcar-dmac: add iommu support for slave transfers

Show all headers | View raw

Hi,

This series add iommu support to rcar-dmac. It's tested on koelsch with
CONFIG_IPMMU_VMSA and by enabling the ipmmu_ds node in r8a7791.dtsi. I
verified operation by interacting with /dev/mmcblk1  which is a device
behind the iommu.

The series depends on out of tree patch '[PATCH] dmaengine: use
phys_addr_t for slave configuration' which currently is under review.

* Changes since v2
- Drop patch to add dma_{map,unmap}_page_attrs.
- Add dma_{map,unmap}_resource to handle the mapping without involving a
  'struct page'. Thanks Laurent and Robin for pointing this out.
- Use size instead of address to keep track of if a mapping exist or not
  since addr == 0 is valid. Thanks Laurent.
- Pick up patch from Robin with Laurents ack (hope it's OK for me to
  attach the ack?) to add IOMMU_MMIO.
- Fix bug in rcar_dmac_device_config where the error check where
  inverted.
- Use DMA_BIDIRECTIONAL in rcar_dmac_device_config since we at that
  point can't be sure what direction the mapping is going to be used.

* Changes since v1
- Add and use a dma_{map,unmap}_page_attrs to be able to map the page
  using attributes DMA_ATTR_NO_KERNEL_MAPPING and
  DMA_ATTR_SKIP_CPU_SYNC. Thanks Laurent.
- Drop check if dmac is part of a iommu group or not, let the DMA
  mapping api handle it.
- Move slave configuration data around in rcar-dmac to avoid code
  duplication.
- Fix build issue reported by 'kbuild test robot' regarding phys_to_page
  not availability on some configurations.
- Add DT information for r8a7791.

* Changes since RFC
- Switch to use the dma-mapping api instead of using the iommu_map()
  directly. Turns out the dma-mapper is much smarter then me...
- Dropped the patch to expose domain->ops->pgsize_bitmap from within the
  iommu api.
- Dropped the patch showing how I tested the RFC.

Niklas Söderlund (7):
  dma-mapping: add {map,unmap}_resource to dma_map_ops
  dma-mapping: add dma_{map,unmap}_resource
  arm: dma-mapping: add {map,unmap}_resource for iommu ops
  dmaengine: rcar-dmac: group slave configuration
  dmaengine: rcar-dmac: add iommu support for slave transfers
  ARM: dts: r8a7790: add iommus to dmac0 and dmac1
  ARM: dts: r8a7791: add iommus to dmac0 and dmac1

Robin Murphy (1):
  iommu: Add MMIO mapping type

 arch/arm/boot/dts/r8a7790.dtsi | 30 +++++++++++++++
 arch/arm/boot/dts/r8a7791.dtsi | 30 +++++++++++++++
 arch/arm/mm/dma-mapping.c      | 63 +++++++++++++++++++++++++++++++
 drivers/dma/sh/rcar-dmac.c     | 86 +++++++++++++++++++++++++++++++++---------
 drivers/iommu/io-pgtable-arm.c |  4 +-
 include/linux/dma-mapping.h    | 33 ++++++++++++++++
 include/linux/iommu.h          |  1 +
 7 files changed, 229 insertions(+), 18 deletions(-)

--
2.7.1

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

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