Changeset 772 for GPL/trunk/alsa-kernel/include/sound/memalloc.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/memalloc.h (modified) (7 diffs)

GPL/trunk/alsa-kernel/include/sound/memalloc.h

@@ -10 +10 @@
 #define __SOUND_MEMALLOC_H
 
+#include <linux/dma-direction.h>
 #include <asm/page.h>
 
 struct device;
 struct vm_area_struct;
+struct sg_table;
 
 /*
@@ -20 +22 @@
 struct snd_dma_device {
         int type;                       /* SNDRV_DMA_TYPE_XXX */
+        enum dma_data_direction dir;    /* DMA direction */
+        bool need_sync;                 /* explicit sync needed? */
         struct device *dev;             /* generic device */
 };
-
-#define snd_dma_continuous_data(x)      ((struct device *)(__force unsigned long)(x))
-
 
 /*
@@ -33 +34 @@
 #define SNDRV_DMA_TYPE_DEV              2       /* generic device continuous */
 #define SNDRV_DMA_TYPE_DEV_WC           5       /* continuous write-combined */
-#ifdef CONFIG_SND_DMA_SGBUF
-#define SNDRV_DMA_TYPE_DEV_SG           3       /* generic device SG-buffer */
-#define SNDRV_DMA_TYPE_DEV_WC_SG        6       /* SG write-combined */
-#else
-#define SNDRV_DMA_TYPE_DEV_SG   SNDRV_DMA_TYPE_DEV /* no SG-buf support */
-#define SNDRV_DMA_TYPE_DEV_WC_SG        SNDRV_DMA_TYPE_DEV_WC
-#endif
 #ifdef CONFIG_GENERIC_ALLOCATOR
 #define SNDRV_DMA_TYPE_DEV_IRAM         4       /* generic device iram-buffer */
@@ -46 +40 @@
 #endif
 #define SNDRV_DMA_TYPE_VMALLOC          7       /* vmalloc'ed buffer */
+#define SNDRV_DMA_TYPE_NONCONTIG        8       /* non-coherent SG buffer */
+#define SNDRV_DMA_TYPE_NONCOHERENT      9       /* non-coherent buffer */
+#ifdef CONFIG_SND_DMA_SGBUF
+#define SNDRV_DMA_TYPE_DEV_SG           SNDRV_DMA_TYPE_NONCONTIG
+#define SNDRV_DMA_TYPE_DEV_WC_SG        6       /* SG write-combined */
+#else
+#define SNDRV_DMA_TYPE_DEV_SG   SNDRV_DMA_TYPE_DEV /* no SG-buf support */
+#define SNDRV_DMA_TYPE_DEV_WC_SG        SNDRV_DMA_TYPE_DEV_WC
+#endif
+/* fallback types, don't use those directly */
+#ifdef CONFIG_SND_DMA_SGBUF
+#define SNDRV_DMA_TYPE_DEV_SG_FALLBACK          10
+#define SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK       11
+#endif
 
 /*
@@ -67 +75 @@
 
 /* allocate/release a buffer */
-int snd_dma_alloc_pages(int type, struct device *dev, size_t size,
-                        struct snd_dma_buffer *dmab);
+int snd_dma_alloc_dir_pages(int type, struct device *dev,
+                            enum dma_data_direction dir, size_t size,
+                            struct snd_dma_buffer *dmab);
+
+static inline int snd_dma_alloc_pages(int type, struct device *dev,
+                                      size_t size, struct snd_dma_buffer *dmab)
+{
+        return snd_dma_alloc_dir_pages(type, dev, DMA_BIDIRECTIONAL, size, dmab);
+}
+
 int snd_dma_alloc_pages_fallback(int type, struct device *dev, size_t size,
                                  struct snd_dma_buffer *dmab);
@@ -74 +90 @@
 int snd_dma_buffer_mmap(struct snd_dma_buffer *dmab,
                         struct vm_area_struct *area);
+
+enum snd_dma_sync_mode { SNDRV_DMA_SYNC_CPU, SNDRV_DMA_SYNC_DEVICE };
+#ifdef CONFIG_HAS_DMA
+void snd_dma_buffer_sync(struct snd_dma_buffer *dmab,
+                         enum snd_dma_sync_mode mode);
+#else
+static inline void snd_dma_buffer_sync(struct snd_dma_buffer *dmab,
+                                       enum snd_dma_sync_mode mode) {}
+#endif
 
 dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab, size_t offset);
@@ -81 +106 @@
 
 /* device-managed memory allocator */
-struct snd_dma_buffer *snd_devm_alloc_pages(struct device *dev, int type,
-                                            size_t size);
+struct snd_dma_buffer *snd_devm_alloc_dir_pages(struct device *dev, int type,
+                                                enum dma_data_direction dir,
+                                                size_t size);
+
+static inline struct snd_dma_buffer *
+snd_devm_alloc_pages(struct device *dev, int type, size_t size)
+{
+        return snd_devm_alloc_dir_pages(dev, type, DMA_BIDIRECTIONAL, size);
+}
+
+static inline struct sg_table *
+snd_dma_noncontig_sg_table(struct snd_dma_buffer *dmab)
+{
+        return dmab->private_data;
+}
+
 #ifdef TARGET_OS2
 int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab);