change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/include/sound/memalloc.h
..
..
@@ -1,24 +1,9 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
3
4
  *                   Takashi Iwai <tiwai@suse.de>
4
5
  * 
5
6
  *  Generic memory allocators
6
- *
7
- *
8
- *   This program is free software; you can redistribute it and/or modify
9
- *   it under the terms of the GNU General Public License as published by
10
- *   the Free Software Foundation; either version 2 of the License, or
11
- *   (at your option) any later version.
12
- *
13
- *   This program is distributed in the hope that it will be useful,
14
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- *   GNU General Public License for more details.
17
- *
18
- *   You should have received a copy of the GNU General Public License
19
- *   along with this program; if not, write to the Free Software
20
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21
- *
22
7
  */
23
8
 
24
9
 #ifndef __SOUND_MEMALLOC_H
..
..
@@ -36,8 +21,6 @@
36
21
 	struct device *dev;		/* generic device */
37
22
 };
38
23
 
39
-#define snd_dma_pci_data(pci)	(&(pci)->dev)
40
-#define snd_dma_isa_data()	NULL
41
24
 #define snd_dma_continuous_data(x)	((struct device *)(__force unsigned long)(x))
42
25
 
43
26
 
..
..
@@ -47,16 +30,20 @@
47
30
 #define SNDRV_DMA_TYPE_UNKNOWN		0	/* not defined */
48
31
 #define SNDRV_DMA_TYPE_CONTINUOUS	1	/* continuous no-DMA memory */
49
32
 #define SNDRV_DMA_TYPE_DEV		2	/* generic device continuous */
33
+#define SNDRV_DMA_TYPE_DEV_UC		5	/* continuous non-cahced */
50
34
 #ifdef CONFIG_SND_DMA_SGBUF
51
35
 #define SNDRV_DMA_TYPE_DEV_SG		3	/* generic device SG-buffer */
36
+#define SNDRV_DMA_TYPE_DEV_UC_SG	6	/* SG non-cached */
52
37
 #else
53
38
 #define SNDRV_DMA_TYPE_DEV_SG	SNDRV_DMA_TYPE_DEV /* no SG-buf support */
39
+#define SNDRV_DMA_TYPE_DEV_UC_SG	SNDRV_DMA_TYPE_DEV_UC
54
40
 #endif
55
41
 #ifdef CONFIG_GENERIC_ALLOCATOR
56
42
 #define SNDRV_DMA_TYPE_DEV_IRAM		4	/* generic device iram-buffer */
57
43
 #else
58
44
 #define SNDRV_DMA_TYPE_DEV_IRAM	SNDRV_DMA_TYPE_DEV
59
45
 #endif
46
+#define SNDRV_DMA_TYPE_VMALLOC		7	/* vmalloc'ed buffer */
60
47
 
61
48
 /*
62
49
  * info for buffer allocation
..
..
@@ -107,7 +94,11 @@
107
94
 					   size_t offset)
108
95
 {
109
96
 	struct snd_sg_buf *sgbuf = dmab->private_data;
110
-	dma_addr_t addr = sgbuf->table[offset >> PAGE_SHIFT].addr;
97
+	dma_addr_t addr;
98
+
99
+	if (!sgbuf)
100
+		return dmab->addr + offset;
101
+	addr = sgbuf->table[offset >> PAGE_SHIFT].addr;
111
102
 	addr &= ~((dma_addr_t)PAGE_SIZE - 1);
112
103
 	return addr + offset % PAGE_SIZE;
113
104
 }
..
..
@@ -119,6 +110,9 @@
119
110
 				     size_t offset)
120
111
 {
121
112
 	struct snd_sg_buf *sgbuf = dmab->private_data;
113
+
114
+	if (!sgbuf)
115
+		return dmab->area + offset;
122
116
 	return sgbuf->table[offset >> PAGE_SHIFT].buf + offset % PAGE_SIZE;
123
117
 }
124
118
 
..
..
@@ -148,10 +142,6 @@
148
142
 int snd_dma_alloc_pages_fallback(int type, struct device *dev, size_t size,
149
143
                                  struct snd_dma_buffer *dmab);
150
144
 void snd_dma_free_pages(struct snd_dma_buffer *dmab);
151
-
152
-/* basic memory allocation functions */
153
-void *snd_malloc_pages(size_t size, gfp_t gfp_flags);
154
-void snd_free_pages(void *ptr, size_t size);
155
145
 
156
146
 #endif /* __SOUND_MEMALLOC_H */
157
147