From: "Niklas Söderlund" <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> To: vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "Niklas Söderlund" <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>, geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org, dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org Subject: [PATCH v5 3/9] dma-mapping: add dma_{map,unmap}_resource Date: Tue, 8 Mar 2016 03:42:48 +0100 [thread overview] Message-ID: <1457404974-1800-4-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw) In-Reply-To: <1457404974-1800-1-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> Map/Unmap a device resource from a physical address. If no dma_map_ops method is available the operation is a no-op. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- include/linux/dma-mapping.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index e3aba4e..cc305d1 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -216,6 +216,38 @@ static inline void dma_unmap_page(struct device *dev, dma_addr_t addr, debug_dma_unmap_page(dev, addr, size, dir, false); } +static inline dma_addr_t dma_map_resource(struct device *dev, + phys_addr_t phys_addr, + size_t size, + enum dma_data_direction dir, + struct dma_attrs *attrs) +{ + struct dma_map_ops *ops = get_dma_ops(dev); + unsigned long pfn = __phys_to_pfn(phys_addr); + + BUG_ON(!valid_dma_direction(dir)); + + /* Don't allow RAM to be mapped */ + BUG_ON(pfn_valid(pfn)); + + if (ops->map_resource) + return ops->map_resource(dev, phys_addr, size, dir, attrs); + + return phys_addr; +} + +static inline void dma_unmap_resource(struct device *dev, dma_addr_t addr, + size_t size, enum dma_data_direction dir, + struct dma_attrs *attrs) +{ + struct dma_map_ops *ops = get_dma_ops(dev); + + BUG_ON(!valid_dma_direction(dir)); + if (ops->unmap_resource) + ops->unmap_resource(dev, addr, size, dir, attrs); + +} + static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) -- 2.7.2 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se> To: vinod.koul@intel.com, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, iommu@lists.linux-foundation.org Cc: robin.murphy@arm.com, laurent.pinchart@ideasonboard.com, geert+renesas@glider.be, linus.walleij@linaro.org, dan.j.williams@intel.com, arnd@arndb.de, linux-arch@vger.kernel.org, "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se> Subject: [PATCH v5 3/9] dma-mapping: add dma_{map,unmap}_resource Date: Tue, 8 Mar 2016 03:42:48 +0100 [thread overview] Message-ID: <1457404974-1800-4-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw) Message-ID: <20160308024248.47aZLB7wqDFwR0abj-9SRd9uPzuYOUaLcguar84MihY@z> (raw) In-Reply-To: <1457404974-1800-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> Map/Unmap a device resource from a physical address. If no dma_map_ops method is available the operation is a no-op. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- include/linux/dma-mapping.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index e3aba4e..cc305d1 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -216,6 +216,38 @@ static inline void dma_unmap_page(struct device *dev, dma_addr_t addr, debug_dma_unmap_page(dev, addr, size, dir, false); } +static inline dma_addr_t dma_map_resource(struct device *dev, + phys_addr_t phys_addr, + size_t size, + enum dma_data_direction dir, + struct dma_attrs *attrs) +{ + struct dma_map_ops *ops = get_dma_ops(dev); + unsigned long pfn = __phys_to_pfn(phys_addr); + + BUG_ON(!valid_dma_direction(dir)); + + /* Don't allow RAM to be mapped */ + BUG_ON(pfn_valid(pfn)); + + if (ops->map_resource) + return ops->map_resource(dev, phys_addr, size, dir, attrs); + + return phys_addr; +} + +static inline void dma_unmap_resource(struct device *dev, dma_addr_t addr, + size_t size, enum dma_data_direction dir, + struct dma_attrs *attrs) +{ + struct dma_map_ops *ops = get_dma_ops(dev); + + BUG_ON(!valid_dma_direction(dir)); + if (ops->unmap_resource) + ops->unmap_resource(dev, addr, size, dir, attrs); + +} + static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) -- 2.7.2
next prev parent reply other threads:[~2016-03-08 2:42 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-08 2:42 [PATCH v5 0/9] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund 2016-03-08 2:42 ` Niklas Söderlund 2016-03-08 2:42 ` [PATCH v5 1/9] iommu: Add MMIO mapping type Niklas Söderlund [not found] ` <1457404974-1800-2-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2016-03-17 11:18 ` Laurent Pinchart 2016-03-17 11:18 ` Laurent Pinchart 2016-03-08 2:42 ` [PATCH v5 2/9] dma-mapping: add {map,unmap}_resource to dma_map_ops Niklas Söderlund 2016-03-08 2:42 ` Niklas Söderlund [not found] ` <1457404974-1800-1-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2016-03-08 2:42 ` Niklas Söderlund [this message] 2016-03-08 2:42 ` [PATCH v5 3/9] dma-mapping: add dma_{map,unmap}_resource Niklas Söderlund 2016-03-08 7:38 ` Christoph Hellwig 2016-03-10 16:05 ` Niklas S??derlund 2016-03-10 16:05 ` Niklas S??derlund 2016-03-11 6:19 ` Vinod Koul 2016-03-11 6:19 ` Vinod Koul 2016-03-11 6:47 ` Dan Williams 2016-03-11 6:47 ` Dan Williams 2016-03-11 11:15 ` Christoph Hellwig 2016-03-11 12:58 ` Niklas Söderlund 2016-03-11 12:58 ` Niklas Söderlund 2016-03-15 8:22 ` Christoph Hellwig [not found] ` <20160315082254.GE9136-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2016-03-17 11:33 ` Laurent Pinchart 2016-03-17 11:33 ` Laurent Pinchart 2016-03-21 15:26 ` Christoph Hellwig 2016-03-21 15:26 ` Christoph Hellwig [not found] ` <20160321152601.GA11674-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2016-04-13 13:29 ` Niklas Söderlund 2016-04-13 13:29 ` Niklas Söderlund 2016-04-21 9:48 ` Niklas Söderlund 2016-04-21 9:48 ` Niklas Söderlund 2016-04-21 13:49 ` Christoph Hellwig 2016-04-21 13:49 ` Christoph Hellwig 2016-04-25 14:26 ` Niklas Söderlund 2016-04-25 14:26 ` Niklas Söderlund 2016-04-25 19:10 ` Christoph Hellwig 2016-04-25 19:10 ` Christoph Hellwig [not found] ` <20160425191004.GA13906-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2016-04-26 13:29 ` Niklas Söderlund 2016-04-26 13:29 ` Niklas Söderlund [not found] ` <CAPcyv4gO4EZnBuVKXT8+gsMhbHJzuK7sfr0uRcjVdJP-nUUz4A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2016-03-11 13:46 ` Robin Murphy 2016-03-11 13:46 ` Robin Murphy 2016-03-11 17:51 ` Dan Williams 2016-03-08 2:42 ` [PATCH v5 4/9] arm: dma-mapping: add {map, unmap}_resource for iommu ops Niklas Söderlund 2016-03-08 2:42 ` [PATCH v5 4/9] arm: dma-mapping: add {map,unmap}_resource " Niklas Söderlund 2016-03-08 2:42 ` [PATCH v5 5/9] dmaengine: rcar-dmac: slave address are physical Niklas Söderlund 2016-03-08 2:42 ` Niklas Söderlund [not found] ` <1457404974-1800-6-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2016-03-17 11:30 ` Laurent Pinchart 2016-03-17 11:30 ` Laurent Pinchart 2016-03-08 2:42 ` [PATCH v5 6/9] dmaengine: rcar-dmac: group slave configuration Niklas Söderlund 2016-03-08 2:42 ` Niklas Söderlund [not found] ` <1457404974-1800-7-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2016-03-17 11:28 ` Laurent Pinchart 2016-03-17 11:28 ` Laurent Pinchart 2016-03-08 2:42 ` [PATCH v5 7/9] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund 2016-03-08 2:42 ` Niklas Söderlund 2016-03-08 2:42 ` [PATCH v5 8/9] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Niklas Söderlund 2016-03-08 2:42 ` Niklas Söderlund 2016-03-08 2:42 ` [PATCH v5 9/9] ARM: dts: r8a7791: " Niklas Söderlund
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1457404974-1800-4-git-send-email-niklas.soderlund+renesas@ragnatech.se \ --to=niklas.soderlund+renesas-1zkq55x86mtxsap9fp7wbw@public.gmane.org \ --cc=arnd-r2nGTMty4D4@public.gmane.org \ --cc=dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \ --cc=dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \ --cc=linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).