History

dma-mapping: implement dmam_alloc_coherent using dmam_alloc_attrs

dmam_alloc_coherent is just the default no-flags case of dmam_alloc_attrs, so take advantage of this similar to the non-managed version.

Christoph Hellwig committed 7 years ago

Commit d7076f01 parent 2e05ea52 files · +13 −46Browse files

Unified · Split

2 files
  1. include/linux/dma-mapping.h +13 −7
  2. kernel/dma/mapping.c +0 −39
include/linux/dma-mapping.h+13−7
@@ -677,21 +677,20 @@ dma_mark_declared_memory_occupied(struct device *dev, · 676 unmodified lines
677 * Managed DMA API677 * Managed DMA API
678 */678 */
679#ifdef CONFIG_HAS_DMA679#ifdef CONFIG_HAS_DMA
680extern void *dmam_alloc_coherent(struct device *dev, size_t size,680extern void *dmam_alloc_attrs(struct device *dev, size_t size,
681 dma_addr_t *dma_handle, gfp_t gfp);681 dma_addr_t *dma_handle, gfp_t gfp,
682 unsigned long attrs);
682extern void dmam_free_coherent(struct device *dev, size_t size, void *vaddr,683extern void dmam_free_coherent(struct device *dev, size_t size, void *vaddr,
683 dma_addr_t dma_handle);684 dma_addr_t dma_handle);
684#else /* !CONFIG_HAS_DMA */685#else /* !CONFIG_HAS_DMA */
685static inline void *dmam_alloc_coherent(struct device *dev, size_t size,686static inline void *dmam_alloc_attrs(struct device *dev, size_t size,
686 dma_addr_t *dma_handle, gfp_t gfp)687 dma_addr_t *dma_handle, gfp_t gfp,
688 unsigned long attrs)
687{ return NULL; }689{ return NULL; }
688static inline void dmam_free_coherent(struct device *dev, size_t size,690static inline void dmam_free_coherent(struct device *dev, size_t size,
689 void *vaddr, dma_addr_t dma_handle) { }691 void *vaddr, dma_addr_t dma_handle) { }
690#endif /* !CONFIG_HAS_DMA */692#endif /* !CONFIG_HAS_DMA */
691 693
692extern void *dmam_alloc_attrs(struct device *dev, size_t size,
693 dma_addr_t *dma_handle, gfp_t gfp,
694 unsigned long attrs);
695#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT694#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
696extern int dmam_declare_coherent_memory(struct device *dev,695extern int dmam_declare_coherent_memory(struct device *dev,
697 phys_addr_t phys_addr,696 phys_addr_t phys_addr,
@@ -711,6 +710,13 @@ static inline void dmam_release_declared_memory(struct device *dev) · 13 unmodified lines
711}710}
712#endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */711#endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */
713 712
713static inline void *dmam_alloc_coherent(struct device *dev, size_t size,
714 dma_addr_t *dma_handle, gfp_t gfp)
715{
716 return dmam_alloc_attrs(dev, size, dma_handle, gfp,
717 (gfp & __GFP_NOWARN) ? DMA_ATTR_NO_WARN : 0);
718}
719
714static inline void *dma_alloc_wc(struct device *dev, size_t size,720static inline void *dma_alloc_wc(struct device *dev, size_t size,
715 dma_addr_t *dma_addr, gfp_t gfp)721 dma_addr_t *dma_addr, gfp_t gfp)
716{722{
kernel/dma/mapping.c+0−39
@@ -45,45 +45,6 @@ static int dmam_match(struct device *dev, void *res, void *match_data) · 44 unmodified lines
45 return 0;45 return 0;
46}46}
47 47
48/**
49 * dmam_alloc_coherent - Managed dma_alloc_coherent()
50 * @dev: Device to allocate coherent memory for
51 * @size: Size of allocation
52 * @dma_handle: Out argument for allocated DMA handle
53 * @gfp: Allocation flags
54 *
55 * Managed dma_alloc_coherent(). Memory allocated using this function
56 * will be automatically released on driver detach.
57 *
58 * RETURNS:
59 * Pointer to allocated memory on success, NULL on failure.
60 */
61void *dmam_alloc_coherent(struct device *dev, size_t size,
62 dma_addr_t *dma_handle, gfp_t gfp)
63{
64 struct dma_devres *dr;
65 void *vaddr;
66
67 dr = devres_alloc(dmam_release, sizeof(*dr), gfp);
68 if (!dr)
69 return NULL;
70
71 vaddr = dma_alloc_coherent(dev, size, dma_handle, gfp);
72 if (!vaddr) {
73 devres_free(dr);
74 return NULL;
75 }
76
77 dr->vaddr = vaddr;
78 dr->dma_handle = *dma_handle;
79 dr->size = size;
80
81 devres_add(dev, dr);
82
83 return vaddr;
84}
85EXPORT_SYMBOL(dmam_alloc_coherent);
86
87/**48/**
88 * dmam_free_coherent - Managed dma_free_coherent()49 * dmam_free_coherent - Managed dma_free_coherent()
89 * @dev: Device to free coherent memory for50 * @dev: Device to free coherent memory for