1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* 2 /*
3 */ 3 */
4 4
5 5
6 #include <linux/init.h> 6 #include <linux/init.h>
7 #include <linux/slab.h> 7 #include <linux/slab.h>
8 #include <linux/usb.h> 8 #include <linux/usb.h>
9 #include <linux/usb/audio.h> 9 #include <linux/usb/audio.h>
10 #include <linux/usb/audio-v2.h> 10 #include <linux/usb/audio-v2.h>
11 #include <linux/usb/audio-v3.h> 11 #include <linux/usb/audio-v3.h>
12 12
13 #include <sound/core.h> 13 #include <sound/core.h>
14 #include <sound/pcm.h> 14 #include <sound/pcm.h>
15 #include <sound/control.h> 15 #include <sound/control.h>
16 #include <sound/tlv.h> 16 #include <sound/tlv.h>
17 17
18 #include "usbaudio.h" 18 #include "usbaudio.h"
19 #include "card.h" 19 #include "card.h"
20 #include "proc.h" 20 #include "proc.h"
21 #include "quirks.h" 21 #include "quirks.h"
22 #include "endpoint.h" 22 #include "endpoint.h"
23 #include "pcm.h" 23 #include "pcm.h"
24 #include "helper.h" 24 #include "helper.h"
25 #include "format.h" 25 #include "format.h"
26 #include "clock.h" 26 #include "clock.h"
27 #include "stream.h" 27 #include "stream.h"
28 #include "power.h" 28 #include "power.h"
29 #include "media.h" 29 #include "media.h"
30 30
31 static void audioformat_free(struct audioforma <<
32 { <<
33 list_del(&fp->list); /* unlink for avo <<
34 kfree(fp->rate_table); <<
35 kfree(fp->chmap); <<
36 kfree(fp); <<
37 } <<
38 <<
39 /* 31 /*
40 * free a substream 32 * free a substream
41 */ 33 */
42 static void free_substream(struct snd_usb_subs 34 static void free_substream(struct snd_usb_substream *subs)
43 { 35 {
44 struct audioformat *fp, *n; 36 struct audioformat *fp, *n;
45 37
46 if (!subs->num_formats) 38 if (!subs->num_formats)
47 return; /* not initialized */ 39 return; /* not initialized */
48 list_for_each_entry_safe(fp, n, &subs- !! 40 list_for_each_entry_safe(fp, n, &subs->fmt_list, list) {
49 audioformat_free(fp); !! 41 kfree(fp->rate_table);
>> 42 kfree(fp->chmap);
>> 43 kfree(fp);
>> 44 }
>> 45 kfree(subs->rate_list.list);
50 kfree(subs->str_pd); 46 kfree(subs->str_pd);
51 snd_media_stream_delete(subs); 47 snd_media_stream_delete(subs);
52 } 48 }
53 49
54 50
55 /* 51 /*
56 * free a usb stream instance 52 * free a usb stream instance
57 */ 53 */
58 static void snd_usb_audio_stream_free(struct s 54 static void snd_usb_audio_stream_free(struct snd_usb_stream *stream)
59 { 55 {
60 free_substream(&stream->substream[0]); 56 free_substream(&stream->substream[0]);
61 free_substream(&stream->substream[1]); 57 free_substream(&stream->substream[1]);
62 list_del(&stream->list); 58 list_del(&stream->list);
63 kfree(stream); 59 kfree(stream);
64 } 60 }
65 61
66 static void snd_usb_audio_pcm_free(struct snd_ 62 static void snd_usb_audio_pcm_free(struct snd_pcm *pcm)
67 { 63 {
68 struct snd_usb_stream *stream = pcm->p 64 struct snd_usb_stream *stream = pcm->private_data;
69 if (stream) { 65 if (stream) {
70 stream->pcm = NULL; 66 stream->pcm = NULL;
71 snd_usb_audio_stream_free(stre 67 snd_usb_audio_stream_free(stream);
72 } 68 }
73 } 69 }
74 70
75 /* 71 /*
76 * initialize the substream instance. 72 * initialize the substream instance.
77 */ 73 */
78 74
79 static void snd_usb_init_substream(struct snd_ 75 static void snd_usb_init_substream(struct snd_usb_stream *as,
80 int stream, 76 int stream,
81 struct audi 77 struct audioformat *fp,
82 struct snd_ 78 struct snd_usb_power_domain *pd)
83 { 79 {
84 struct snd_usb_substream *subs = &as-> 80 struct snd_usb_substream *subs = &as->substream[stream];
85 81
86 INIT_LIST_HEAD(&subs->fmt_list); 82 INIT_LIST_HEAD(&subs->fmt_list);
87 spin_lock_init(&subs->lock); 83 spin_lock_init(&subs->lock);
88 84
89 subs->stream = as; 85 subs->stream = as;
90 subs->direction = stream; 86 subs->direction = stream;
91 subs->dev = as->chip->dev; 87 subs->dev = as->chip->dev;
92 subs->txfr_quirk = !!(as->chip->quirk_ !! 88 subs->txfr_quirk = as->chip->txfr_quirk;
93 subs->tx_length_quirk = !!(as->chip->q !! 89 subs->tx_length_quirk = as->chip->tx_length_quirk;
94 subs->speed = snd_usb_get_speed(subs-> 90 subs->speed = snd_usb_get_speed(subs->dev);
95 subs->pkt_offset_adj = 0; 91 subs->pkt_offset_adj = 0;
96 subs->stream_offset_adj = 0; <<
97 92
98 snd_usb_set_pcm_ops(as->pcm, stream); 93 snd_usb_set_pcm_ops(as->pcm, stream);
99 94
100 list_add_tail(&fp->list, &subs->fmt_li 95 list_add_tail(&fp->list, &subs->fmt_list);
101 subs->formats |= fp->formats; 96 subs->formats |= fp->formats;
102 subs->num_formats++; 97 subs->num_formats++;
103 subs->fmt_type = fp->fmt_type; 98 subs->fmt_type = fp->fmt_type;
104 subs->ep_num = fp->endpoint; 99 subs->ep_num = fp->endpoint;
105 if (fp->channels > subs->channels_max) 100 if (fp->channels > subs->channels_max)
106 subs->channels_max = fp->chann 101 subs->channels_max = fp->channels;
107 102
108 if (pd) { 103 if (pd) {
109 subs->str_pd = pd; 104 subs->str_pd = pd;
110 /* Initialize Power Domain to 105 /* Initialize Power Domain to idle status D1 */
111 snd_usb_power_domain_set(subs- 106 snd_usb_power_domain_set(subs->stream->chip, pd,
112 UAC3_ 107 UAC3_PD_STATE_D1);
113 } 108 }
114 109
115 snd_usb_preallocate_buffer(subs); 110 snd_usb_preallocate_buffer(subs);
116 } 111 }
117 112
118 /* kctl callbacks for usb-audio channel maps * 113 /* kctl callbacks for usb-audio channel maps */
119 static int usb_chmap_ctl_info(struct snd_kcont 114 static int usb_chmap_ctl_info(struct snd_kcontrol *kcontrol,
120 struct snd_ctl_e 115 struct snd_ctl_elem_info *uinfo)
121 { 116 {
122 struct snd_pcm_chmap *info = snd_kcont 117 struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
123 struct snd_usb_substream *subs = info- 118 struct snd_usb_substream *subs = info->private_data;
124 119
125 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTE 120 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
126 uinfo->count = subs->channels_max; 121 uinfo->count = subs->channels_max;
127 uinfo->value.integer.min = 0; 122 uinfo->value.integer.min = 0;
128 uinfo->value.integer.max = SNDRV_CHMAP 123 uinfo->value.integer.max = SNDRV_CHMAP_LAST;
129 return 0; 124 return 0;
130 } 125 }
131 126
132 /* check whether a duplicated entry exists in 127 /* check whether a duplicated entry exists in the audiofmt list */
133 static bool have_dup_chmap(struct snd_usb_subs 128 static bool have_dup_chmap(struct snd_usb_substream *subs,
134 struct audioformat 129 struct audioformat *fp)
135 { 130 {
136 struct audioformat *prev = fp; 131 struct audioformat *prev = fp;
137 132
138 list_for_each_entry_continue_reverse(p 133 list_for_each_entry_continue_reverse(prev, &subs->fmt_list, list) {
139 if (prev->chmap && 134 if (prev->chmap &&
140 !memcmp(prev->chmap, fp->c 135 !memcmp(prev->chmap, fp->chmap, sizeof(*fp->chmap)))
141 return true; 136 return true;
142 } 137 }
143 return false; 138 return false;
144 } 139 }
145 140
146 static int usb_chmap_ctl_tlv(struct snd_kcontr 141 static int usb_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
147 unsigned int size 142 unsigned int size, unsigned int __user *tlv)
148 { 143 {
149 struct snd_pcm_chmap *info = snd_kcont 144 struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
150 struct snd_usb_substream *subs = info- 145 struct snd_usb_substream *subs = info->private_data;
151 struct audioformat *fp; 146 struct audioformat *fp;
152 unsigned int __user *dst; 147 unsigned int __user *dst;
153 int count = 0; 148 int count = 0;
154 149
155 if (size < 8) 150 if (size < 8)
156 return -ENOMEM; 151 return -ENOMEM;
157 if (put_user(SNDRV_CTL_TLVT_CONTAINER, 152 if (put_user(SNDRV_CTL_TLVT_CONTAINER, tlv))
158 return -EFAULT; 153 return -EFAULT;
159 size -= 8; 154 size -= 8;
160 dst = tlv + 2; 155 dst = tlv + 2;
161 list_for_each_entry(fp, &subs->fmt_lis 156 list_for_each_entry(fp, &subs->fmt_list, list) {
162 int i, ch_bytes; 157 int i, ch_bytes;
163 158
164 if (!fp->chmap) 159 if (!fp->chmap)
165 continue; 160 continue;
166 if (have_dup_chmap(subs, fp)) 161 if (have_dup_chmap(subs, fp))
167 continue; 162 continue;
168 /* copy the entry */ 163 /* copy the entry */
169 ch_bytes = fp->chmap->channels 164 ch_bytes = fp->chmap->channels * 4;
170 if (size < 8 + ch_bytes) 165 if (size < 8 + ch_bytes)
171 return -ENOMEM; 166 return -ENOMEM;
172 if (put_user(SNDRV_CTL_TLVT_CH 167 if (put_user(SNDRV_CTL_TLVT_CHMAP_FIXED, dst) ||
173 put_user(ch_bytes, dst + 1 168 put_user(ch_bytes, dst + 1))
174 return -EFAULT; 169 return -EFAULT;
175 dst += 2; 170 dst += 2;
176 for (i = 0; i < fp->chmap->cha 171 for (i = 0; i < fp->chmap->channels; i++, dst++) {
177 if (put_user(fp->chmap 172 if (put_user(fp->chmap->map[i], dst))
178 return -EFAULT 173 return -EFAULT;
179 } 174 }
180 175
181 count += 8 + ch_bytes; 176 count += 8 + ch_bytes;
182 size -= 8 + ch_bytes; 177 size -= 8 + ch_bytes;
183 } 178 }
184 if (put_user(count, tlv + 1)) 179 if (put_user(count, tlv + 1))
185 return -EFAULT; 180 return -EFAULT;
186 return 0; 181 return 0;
187 } 182 }
188 183
189 static int usb_chmap_ctl_get(struct snd_kcontr 184 static int usb_chmap_ctl_get(struct snd_kcontrol *kcontrol,
190 struct snd_ctl_el 185 struct snd_ctl_elem_value *ucontrol)
191 { 186 {
192 struct snd_pcm_chmap *info = snd_kcont 187 struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
193 struct snd_usb_substream *subs = info- 188 struct snd_usb_substream *subs = info->private_data;
194 struct snd_pcm_chmap_elem *chmap = NUL 189 struct snd_pcm_chmap_elem *chmap = NULL;
195 int i = 0; !! 190 int i;
196 191
>> 192 memset(ucontrol->value.integer.value, 0,
>> 193 sizeof(ucontrol->value.integer.value));
197 if (subs->cur_audiofmt) 194 if (subs->cur_audiofmt)
198 chmap = subs->cur_audiofmt->ch 195 chmap = subs->cur_audiofmt->chmap;
199 if (chmap) { 196 if (chmap) {
200 for (i = 0; i < chmap->channel 197 for (i = 0; i < chmap->channels; i++)
201 ucontrol->value.intege 198 ucontrol->value.integer.value[i] = chmap->map[i];
202 } 199 }
203 for (; i < subs->channels_max; i++) <<
204 ucontrol->value.integer.value[ <<
205 return 0; 200 return 0;
206 } 201 }
207 202
208 /* create a chmap kctl assigned to the given U 203 /* create a chmap kctl assigned to the given USB substream */
209 static int add_chmap(struct snd_pcm *pcm, int 204 static int add_chmap(struct snd_pcm *pcm, int stream,
210 struct snd_usb_substream 205 struct snd_usb_substream *subs)
211 { 206 {
212 struct audioformat *fp; 207 struct audioformat *fp;
213 struct snd_pcm_chmap *chmap; 208 struct snd_pcm_chmap *chmap;
214 struct snd_kcontrol *kctl; 209 struct snd_kcontrol *kctl;
215 int err; 210 int err;
216 211
217 list_for_each_entry(fp, &subs->fmt_lis 212 list_for_each_entry(fp, &subs->fmt_list, list)
218 if (fp->chmap) 213 if (fp->chmap)
219 goto ok; 214 goto ok;
220 /* no chmap is found */ 215 /* no chmap is found */
221 return 0; 216 return 0;
222 217
223 ok: 218 ok:
224 err = snd_pcm_add_chmap_ctls(pcm, stre 219 err = snd_pcm_add_chmap_ctls(pcm, stream, NULL, 0, 0, &chmap);
225 if (err < 0) 220 if (err < 0)
226 return err; 221 return err;
227 222
228 /* override handlers */ 223 /* override handlers */
229 chmap->private_data = subs; 224 chmap->private_data = subs;
230 kctl = chmap->kctl; 225 kctl = chmap->kctl;
231 kctl->info = usb_chmap_ctl_info; 226 kctl->info = usb_chmap_ctl_info;
232 kctl->get = usb_chmap_ctl_get; 227 kctl->get = usb_chmap_ctl_get;
233 kctl->tlv.c = usb_chmap_ctl_tlv; 228 kctl->tlv.c = usb_chmap_ctl_tlv;
234 229
235 return 0; 230 return 0;
236 } 231 }
237 232
238 /* convert from USB ChannelConfig bits to ALSA 233 /* convert from USB ChannelConfig bits to ALSA chmap element */
239 static struct snd_pcm_chmap_elem *convert_chma 234 static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
240 235 int protocol)
241 { 236 {
242 static const unsigned int uac1_maps[] !! 237 static unsigned int uac1_maps[] = {
243 SNDRV_CHMAP_FL, /* lef 238 SNDRV_CHMAP_FL, /* left front */
244 SNDRV_CHMAP_FR, /* rig 239 SNDRV_CHMAP_FR, /* right front */
245 SNDRV_CHMAP_FC, /* cen 240 SNDRV_CHMAP_FC, /* center front */
246 SNDRV_CHMAP_LFE, /* LFE 241 SNDRV_CHMAP_LFE, /* LFE */
247 SNDRV_CHMAP_RL, /* lef !! 242 SNDRV_CHMAP_SL, /* left surround */
248 SNDRV_CHMAP_RR, /* rig !! 243 SNDRV_CHMAP_SR, /* right surround */
249 SNDRV_CHMAP_FLC, /* lef 244 SNDRV_CHMAP_FLC, /* left of center */
250 SNDRV_CHMAP_FRC, /* rig 245 SNDRV_CHMAP_FRC, /* right of center */
251 SNDRV_CHMAP_RC, /* sur 246 SNDRV_CHMAP_RC, /* surround */
252 SNDRV_CHMAP_SL, /* sid 247 SNDRV_CHMAP_SL, /* side left */
253 SNDRV_CHMAP_SR, /* sid 248 SNDRV_CHMAP_SR, /* side right */
254 SNDRV_CHMAP_TC, /* top 249 SNDRV_CHMAP_TC, /* top */
255 0 /* terminator */ 250 0 /* terminator */
256 }; 251 };
257 static const unsigned int uac2_maps[] !! 252 static unsigned int uac2_maps[] = {
258 SNDRV_CHMAP_FL, /* fro 253 SNDRV_CHMAP_FL, /* front left */
259 SNDRV_CHMAP_FR, /* fro 254 SNDRV_CHMAP_FR, /* front right */
260 SNDRV_CHMAP_FC, /* fro 255 SNDRV_CHMAP_FC, /* front center */
261 SNDRV_CHMAP_LFE, /* LFE 256 SNDRV_CHMAP_LFE, /* LFE */
262 SNDRV_CHMAP_RL, /* bac 257 SNDRV_CHMAP_RL, /* back left */
263 SNDRV_CHMAP_RR, /* bac 258 SNDRV_CHMAP_RR, /* back right */
264 SNDRV_CHMAP_FLC, /* fro 259 SNDRV_CHMAP_FLC, /* front left of center */
265 SNDRV_CHMAP_FRC, /* fro 260 SNDRV_CHMAP_FRC, /* front right of center */
266 SNDRV_CHMAP_RC, /* bac 261 SNDRV_CHMAP_RC, /* back center */
267 SNDRV_CHMAP_SL, /* sid 262 SNDRV_CHMAP_SL, /* side left */
268 SNDRV_CHMAP_SR, /* sid 263 SNDRV_CHMAP_SR, /* side right */
269 SNDRV_CHMAP_TC, /* top 264 SNDRV_CHMAP_TC, /* top center */
270 SNDRV_CHMAP_TFL, /* top 265 SNDRV_CHMAP_TFL, /* top front left */
271 SNDRV_CHMAP_TFC, /* top 266 SNDRV_CHMAP_TFC, /* top front center */
272 SNDRV_CHMAP_TFR, /* top 267 SNDRV_CHMAP_TFR, /* top front right */
273 SNDRV_CHMAP_TRL, /* top 268 SNDRV_CHMAP_TRL, /* top back left */
274 SNDRV_CHMAP_TRC, /* top 269 SNDRV_CHMAP_TRC, /* top back center */
275 SNDRV_CHMAP_TRR, /* top 270 SNDRV_CHMAP_TRR, /* top back right */
276 SNDRV_CHMAP_TFLC, /* top 271 SNDRV_CHMAP_TFLC, /* top front left of center */
277 SNDRV_CHMAP_TFRC, /* top 272 SNDRV_CHMAP_TFRC, /* top front right of center */
278 SNDRV_CHMAP_LLFE, /* lef 273 SNDRV_CHMAP_LLFE, /* left LFE */
279 SNDRV_CHMAP_RLFE, /* rig 274 SNDRV_CHMAP_RLFE, /* right LFE */
280 SNDRV_CHMAP_TSL, /* top 275 SNDRV_CHMAP_TSL, /* top side left */
281 SNDRV_CHMAP_TSR, /* top 276 SNDRV_CHMAP_TSR, /* top side right */
282 SNDRV_CHMAP_BC, /* bot 277 SNDRV_CHMAP_BC, /* bottom center */
283 SNDRV_CHMAP_RLC, /* bac 278 SNDRV_CHMAP_RLC, /* back left of center */
284 SNDRV_CHMAP_RRC, /* bac 279 SNDRV_CHMAP_RRC, /* back right of center */
285 0 /* terminator */ 280 0 /* terminator */
286 }; 281 };
287 struct snd_pcm_chmap_elem *chmap; 282 struct snd_pcm_chmap_elem *chmap;
288 const unsigned int *maps; 283 const unsigned int *maps;
289 int c; 284 int c;
290 285
291 if (channels > ARRAY_SIZE(chmap->map)) 286 if (channels > ARRAY_SIZE(chmap->map))
292 return NULL; 287 return NULL;
293 288
294 chmap = kzalloc(sizeof(*chmap), GFP_KE 289 chmap = kzalloc(sizeof(*chmap), GFP_KERNEL);
295 if (!chmap) 290 if (!chmap)
296 return NULL; 291 return NULL;
297 292
298 maps = protocol == UAC_VERSION_2 ? uac 293 maps = protocol == UAC_VERSION_2 ? uac2_maps : uac1_maps;
299 chmap->channels = channels; 294 chmap->channels = channels;
300 c = 0; 295 c = 0;
301 296
302 if (bits) { 297 if (bits) {
303 for (; bits && *maps; maps++, !! 298 for (; bits && *maps; maps++, bits >>= 1)
304 if (bits & 1) 299 if (bits & 1)
305 chmap->map[c++ 300 chmap->map[c++] = *maps;
306 if (c == chmap->channe <<
307 break; <<
308 } <<
309 } else { 301 } else {
310 /* If we're missing wChannelCo 302 /* If we're missing wChannelConfig, then guess something
311 to make sure the channel m 303 to make sure the channel map is not skipped entirely */
312 if (channels == 1) 304 if (channels == 1)
313 chmap->map[c++] = SNDR 305 chmap->map[c++] = SNDRV_CHMAP_MONO;
314 else 306 else
315 for (; c < channels && 307 for (; c < channels && *maps; maps++)
316 chmap->map[c++ 308 chmap->map[c++] = *maps;
317 } 309 }
318 310
319 for (; c < channels; c++) 311 for (; c < channels; c++)
320 chmap->map[c] = SNDRV_CHMAP_UN 312 chmap->map[c] = SNDRV_CHMAP_UNKNOWN;
321 313
322 return chmap; 314 return chmap;
323 } 315 }
324 316
325 /* UAC3 device stores channels information in 317 /* UAC3 device stores channels information in Cluster Descriptors */
326 static struct 318 static struct
327 snd_pcm_chmap_elem *convert_chmap_v3(struct ua 319 snd_pcm_chmap_elem *convert_chmap_v3(struct uac3_cluster_header_descriptor
328 320 *cluster)
329 { 321 {
330 unsigned int channels = cluster->bNrCh 322 unsigned int channels = cluster->bNrChannels;
331 struct snd_pcm_chmap_elem *chmap; 323 struct snd_pcm_chmap_elem *chmap;
332 void *p = cluster; 324 void *p = cluster;
333 int len, c; 325 int len, c;
334 326
335 if (channels > ARRAY_SIZE(chmap->map)) 327 if (channels > ARRAY_SIZE(chmap->map))
336 return NULL; 328 return NULL;
337 329
338 chmap = kzalloc(sizeof(*chmap), GFP_KE 330 chmap = kzalloc(sizeof(*chmap), GFP_KERNEL);
339 if (!chmap) 331 if (!chmap)
340 return NULL; 332 return NULL;
341 333
342 len = le16_to_cpu(cluster->wLength); 334 len = le16_to_cpu(cluster->wLength);
343 c = 0; 335 c = 0;
344 p += sizeof(struct uac3_cluster_header 336 p += sizeof(struct uac3_cluster_header_descriptor);
345 337
346 while (((p - (void *)cluster) < len) & 338 while (((p - (void *)cluster) < len) && (c < channels)) {
347 struct uac3_cluster_segment_de 339 struct uac3_cluster_segment_descriptor *cs_desc = p;
348 u16 cs_len; 340 u16 cs_len;
349 u8 cs_type; 341 u8 cs_type;
350 342
351 cs_len = le16_to_cpu(cs_desc-> 343 cs_len = le16_to_cpu(cs_desc->wLength);
352 cs_type = cs_desc->bSegmentTyp 344 cs_type = cs_desc->bSegmentType;
353 345
354 if (cs_type == UAC3_CHANNEL_IN 346 if (cs_type == UAC3_CHANNEL_INFORMATION) {
355 struct uac3_cluster_in 347 struct uac3_cluster_information_segment_descriptor *is = p;
356 unsigned char map; 348 unsigned char map;
357 349
358 /* 350 /*
359 * TODO: this conversi 351 * TODO: this conversion is not complete, update it
360 * after adding UAC3 v 352 * after adding UAC3 values to asound.h
361 */ 353 */
362 switch (is->bChRelatio 354 switch (is->bChRelationship) {
363 case UAC3_CH_MONO: 355 case UAC3_CH_MONO:
364 map = SNDRV_CH 356 map = SNDRV_CHMAP_MONO;
365 break; 357 break;
366 case UAC3_CH_LEFT: 358 case UAC3_CH_LEFT:
367 case UAC3_CH_FRONT_LEF 359 case UAC3_CH_FRONT_LEFT:
368 case UAC3_CH_HEADPHONE 360 case UAC3_CH_HEADPHONE_LEFT:
369 map = SNDRV_CH 361 map = SNDRV_CHMAP_FL;
370 break; 362 break;
371 case UAC3_CH_RIGHT: 363 case UAC3_CH_RIGHT:
372 case UAC3_CH_FRONT_RIG 364 case UAC3_CH_FRONT_RIGHT:
373 case UAC3_CH_HEADPHONE 365 case UAC3_CH_HEADPHONE_RIGHT:
374 map = SNDRV_CH 366 map = SNDRV_CHMAP_FR;
375 break; 367 break;
376 case UAC3_CH_FRONT_CEN 368 case UAC3_CH_FRONT_CENTER:
377 map = SNDRV_CH 369 map = SNDRV_CHMAP_FC;
378 break; 370 break;
379 case UAC3_CH_FRONT_LEF 371 case UAC3_CH_FRONT_LEFT_OF_CENTER:
380 map = SNDRV_CH 372 map = SNDRV_CHMAP_FLC;
381 break; 373 break;
382 case UAC3_CH_FRONT_RIG 374 case UAC3_CH_FRONT_RIGHT_OF_CENTER:
383 map = SNDRV_CH 375 map = SNDRV_CHMAP_FRC;
384 break; 376 break;
385 case UAC3_CH_SIDE_LEFT 377 case UAC3_CH_SIDE_LEFT:
386 map = SNDRV_CH 378 map = SNDRV_CHMAP_SL;
387 break; 379 break;
388 case UAC3_CH_SIDE_RIGH 380 case UAC3_CH_SIDE_RIGHT:
389 map = SNDRV_CH 381 map = SNDRV_CHMAP_SR;
390 break; 382 break;
391 case UAC3_CH_BACK_LEFT 383 case UAC3_CH_BACK_LEFT:
392 map = SNDRV_CH 384 map = SNDRV_CHMAP_RL;
393 break; 385 break;
394 case UAC3_CH_BACK_RIGH 386 case UAC3_CH_BACK_RIGHT:
395 map = SNDRV_CH 387 map = SNDRV_CHMAP_RR;
396 break; 388 break;
397 case UAC3_CH_BACK_CENT 389 case UAC3_CH_BACK_CENTER:
398 map = SNDRV_CH 390 map = SNDRV_CHMAP_RC;
399 break; 391 break;
400 case UAC3_CH_BACK_LEFT 392 case UAC3_CH_BACK_LEFT_OF_CENTER:
401 map = SNDRV_CH 393 map = SNDRV_CHMAP_RLC;
402 break; 394 break;
403 case UAC3_CH_BACK_RIGH 395 case UAC3_CH_BACK_RIGHT_OF_CENTER:
404 map = SNDRV_CH 396 map = SNDRV_CHMAP_RRC;
405 break; 397 break;
406 case UAC3_CH_TOP_CENTE 398 case UAC3_CH_TOP_CENTER:
407 map = SNDRV_CH 399 map = SNDRV_CHMAP_TC;
408 break; 400 break;
409 case UAC3_CH_TOP_FRONT 401 case UAC3_CH_TOP_FRONT_LEFT:
410 map = SNDRV_CH 402 map = SNDRV_CHMAP_TFL;
411 break; 403 break;
412 case UAC3_CH_TOP_FRONT 404 case UAC3_CH_TOP_FRONT_RIGHT:
413 map = SNDRV_CH 405 map = SNDRV_CHMAP_TFR;
414 break; 406 break;
415 case UAC3_CH_TOP_FRONT 407 case UAC3_CH_TOP_FRONT_CENTER:
416 map = SNDRV_CH 408 map = SNDRV_CHMAP_TFC;
417 break; 409 break;
418 case UAC3_CH_TOP_FRONT 410 case UAC3_CH_TOP_FRONT_LOC:
419 map = SNDRV_CH 411 map = SNDRV_CHMAP_TFLC;
420 break; 412 break;
421 case UAC3_CH_TOP_FRONT 413 case UAC3_CH_TOP_FRONT_ROC:
422 map = SNDRV_CH 414 map = SNDRV_CHMAP_TFRC;
423 break; 415 break;
424 case UAC3_CH_TOP_SIDE_ 416 case UAC3_CH_TOP_SIDE_LEFT:
425 map = SNDRV_CH 417 map = SNDRV_CHMAP_TSL;
426 break; 418 break;
427 case UAC3_CH_TOP_SIDE_ 419 case UAC3_CH_TOP_SIDE_RIGHT:
428 map = SNDRV_CH 420 map = SNDRV_CHMAP_TSR;
429 break; 421 break;
430 case UAC3_CH_TOP_BACK_ 422 case UAC3_CH_TOP_BACK_LEFT:
431 map = SNDRV_CH 423 map = SNDRV_CHMAP_TRL;
432 break; 424 break;
433 case UAC3_CH_TOP_BACK_ 425 case UAC3_CH_TOP_BACK_RIGHT:
434 map = SNDRV_CH 426 map = SNDRV_CHMAP_TRR;
435 break; 427 break;
436 case UAC3_CH_TOP_BACK_ 428 case UAC3_CH_TOP_BACK_CENTER:
437 map = SNDRV_CH 429 map = SNDRV_CHMAP_TRC;
438 break; 430 break;
439 case UAC3_CH_BOTTOM_CE 431 case UAC3_CH_BOTTOM_CENTER:
440 map = SNDRV_CH 432 map = SNDRV_CHMAP_BC;
441 break; 433 break;
442 case UAC3_CH_LOW_FREQU 434 case UAC3_CH_LOW_FREQUENCY_EFFECTS:
443 map = SNDRV_CH 435 map = SNDRV_CHMAP_LFE;
444 break; 436 break;
445 case UAC3_CH_LFE_LEFT: 437 case UAC3_CH_LFE_LEFT:
446 map = SNDRV_CH 438 map = SNDRV_CHMAP_LLFE;
447 break; 439 break;
448 case UAC3_CH_LFE_RIGHT 440 case UAC3_CH_LFE_RIGHT:
449 map = SNDRV_CH 441 map = SNDRV_CHMAP_RLFE;
450 break; 442 break;
451 case UAC3_CH_RELATIONS 443 case UAC3_CH_RELATIONSHIP_UNDEFINED:
452 default: 444 default:
453 map = SNDRV_CH 445 map = SNDRV_CHMAP_UNKNOWN;
454 break; 446 break;
455 } 447 }
456 chmap->map[c++] = map; 448 chmap->map[c++] = map;
457 } 449 }
458 p += cs_len; 450 p += cs_len;
459 } 451 }
460 452
461 if (channels < c) 453 if (channels < c)
462 pr_err("%s: channel number mis 454 pr_err("%s: channel number mismatch\n", __func__);
463 455
464 chmap->channels = channels; 456 chmap->channels = channels;
465 457
466 for (; c < channels; c++) 458 for (; c < channels; c++)
467 chmap->map[c] = SNDRV_CHMAP_UN 459 chmap->map[c] = SNDRV_CHMAP_UNKNOWN;
468 460
469 return chmap; 461 return chmap;
470 } 462 }
471 463
472 /* 464 /*
473 * add this endpoint to the chip instance. 465 * add this endpoint to the chip instance.
474 * if a stream with the same endpoint already 466 * if a stream with the same endpoint already exists, append to it.
475 * if not, create a new pcm stream. note, fp i 467 * if not, create a new pcm stream. note, fp is added to the substream
476 * fmt_list and will be freed on the chip inst 468 * fmt_list and will be freed on the chip instance release. do not free
477 * fp or do remove it from the substream fmt_l 469 * fp or do remove it from the substream fmt_list to avoid double-free.
478 */ 470 */
479 static int __snd_usb_add_audio_stream(struct s 471 static int __snd_usb_add_audio_stream(struct snd_usb_audio *chip,
480 int stre 472 int stream,
481 struct a 473 struct audioformat *fp,
482 struct s 474 struct snd_usb_power_domain *pd)
483 475
484 { 476 {
485 struct snd_usb_stream *as; 477 struct snd_usb_stream *as;
486 struct snd_usb_substream *subs; 478 struct snd_usb_substream *subs;
487 struct snd_pcm *pcm; 479 struct snd_pcm *pcm;
488 int err; 480 int err;
489 481
490 list_for_each_entry(as, &chip->pcm_lis 482 list_for_each_entry(as, &chip->pcm_list, list) {
491 if (as->fmt_type != fp->fmt_ty 483 if (as->fmt_type != fp->fmt_type)
492 continue; 484 continue;
493 subs = &as->substream[stream]; 485 subs = &as->substream[stream];
494 if (subs->ep_num == fp->endpoi 486 if (subs->ep_num == fp->endpoint) {
495 list_add_tail(&fp->lis 487 list_add_tail(&fp->list, &subs->fmt_list);
496 subs->num_formats++; 488 subs->num_formats++;
497 subs->formats |= fp->f 489 subs->formats |= fp->formats;
498 return 0; 490 return 0;
499 } 491 }
500 } 492 }
501 <<
502 if (chip->card->registered) <<
503 chip->need_delayed_register = <<
504 <<
505 /* look for an empty stream */ 493 /* look for an empty stream */
506 list_for_each_entry(as, &chip->pcm_lis 494 list_for_each_entry(as, &chip->pcm_list, list) {
507 if (as->fmt_type != fp->fmt_ty 495 if (as->fmt_type != fp->fmt_type)
508 continue; 496 continue;
509 subs = &as->substream[stream]; 497 subs = &as->substream[stream];
510 if (subs->ep_num) 498 if (subs->ep_num)
511 continue; 499 continue;
512 err = snd_pcm_new_stream(as->p 500 err = snd_pcm_new_stream(as->pcm, stream, 1);
513 if (err < 0) 501 if (err < 0)
514 return err; 502 return err;
515 snd_usb_init_substream(as, str 503 snd_usb_init_substream(as, stream, fp, pd);
516 return add_chmap(as->pcm, stre 504 return add_chmap(as->pcm, stream, subs);
517 } 505 }
518 506
519 /* create a new pcm */ 507 /* create a new pcm */
520 as = kzalloc(sizeof(*as), GFP_KERNEL); 508 as = kzalloc(sizeof(*as), GFP_KERNEL);
521 if (!as) 509 if (!as)
522 return -ENOMEM; 510 return -ENOMEM;
523 as->pcm_index = chip->pcm_devs; 511 as->pcm_index = chip->pcm_devs;
524 as->chip = chip; 512 as->chip = chip;
525 as->fmt_type = fp->fmt_type; 513 as->fmt_type = fp->fmt_type;
526 err = snd_pcm_new(chip->card, "USB Aud 514 err = snd_pcm_new(chip->card, "USB Audio", chip->pcm_devs,
527 stream == SNDRV_PCM_ 515 stream == SNDRV_PCM_STREAM_PLAYBACK ? 1 : 0,
528 stream == SNDRV_PCM_ 516 stream == SNDRV_PCM_STREAM_PLAYBACK ? 0 : 1,
529 &pcm); 517 &pcm);
530 if (err < 0) { 518 if (err < 0) {
531 kfree(as); 519 kfree(as);
532 return err; 520 return err;
533 } 521 }
534 as->pcm = pcm; 522 as->pcm = pcm;
535 pcm->private_data = as; 523 pcm->private_data = as;
536 pcm->private_free = snd_usb_audio_pcm_ 524 pcm->private_free = snd_usb_audio_pcm_free;
537 pcm->info_flags = 0; 525 pcm->info_flags = 0;
538 if (chip->pcm_devs > 0) 526 if (chip->pcm_devs > 0)
539 sprintf(pcm->name, "USB Audio 527 sprintf(pcm->name, "USB Audio #%d", chip->pcm_devs);
540 else 528 else
541 strcpy(pcm->name, "USB Audio") 529 strcpy(pcm->name, "USB Audio");
542 530
543 snd_usb_init_substream(as, stream, fp, 531 snd_usb_init_substream(as, stream, fp, pd);
544 532
545 /* 533 /*
546 * Keep using head insertion for M-Aud 534 * Keep using head insertion for M-Audio Audiophile USB (tm) which has a
547 * fix to swap capture stream order in 535 * fix to swap capture stream order in conf/cards/USB-audio.conf
548 */ 536 */
549 if (chip->usb_id == USB_ID(0x0763, 0x2 537 if (chip->usb_id == USB_ID(0x0763, 0x2003))
550 list_add(&as->list, &chip->pcm 538 list_add(&as->list, &chip->pcm_list);
551 else 539 else
552 list_add_tail(&as->list, &chip 540 list_add_tail(&as->list, &chip->pcm_list);
553 541
554 chip->pcm_devs++; 542 chip->pcm_devs++;
555 543
556 snd_usb_proc_pcm_format_add(as); 544 snd_usb_proc_pcm_format_add(as);
557 545
558 return add_chmap(pcm, stream, &as->sub 546 return add_chmap(pcm, stream, &as->substream[stream]);
559 } 547 }
560 548
561 int snd_usb_add_audio_stream(struct snd_usb_au 549 int snd_usb_add_audio_stream(struct snd_usb_audio *chip,
562 int stream, 550 int stream,
563 struct audioforma 551 struct audioformat *fp)
564 { 552 {
565 return __snd_usb_add_audio_stream(chip 553 return __snd_usb_add_audio_stream(chip, stream, fp, NULL);
566 } 554 }
567 555
568 static int snd_usb_add_audio_stream_v3(struct 556 static int snd_usb_add_audio_stream_v3(struct snd_usb_audio *chip,
569 int str 557 int stream,
570 struct 558 struct audioformat *fp,
571 struct 559 struct snd_usb_power_domain *pd)
572 { 560 {
573 return __snd_usb_add_audio_stream(chip 561 return __snd_usb_add_audio_stream(chip, stream, fp, pd);
574 } 562 }
575 563
576 static int parse_uac_endpoint_attributes(struc 564 static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip,
577 struc 565 struct usb_host_interface *alts,
578 int p 566 int protocol, int iface_no)
579 { 567 {
580 /* parsed with a v1 header here. that' 568 /* parsed with a v1 header here. that's ok as we only look at the
581 * header first which is the same for 569 * header first which is the same for both versions */
582 struct uac_iso_endpoint_descriptor *cs 570 struct uac_iso_endpoint_descriptor *csep;
583 struct usb_interface_descriptor *altsd 571 struct usb_interface_descriptor *altsd = get_iface_desc(alts);
584 int attributes = 0; 572 int attributes = 0;
585 573
586 csep = snd_usb_find_desc(alts->endpoin 574 csep = snd_usb_find_desc(alts->endpoint[0].extra, alts->endpoint[0].extralen, NULL, USB_DT_CS_ENDPOINT);
587 575
588 /* Creamware Noah has this descriptor 576 /* Creamware Noah has this descriptor after the 2nd endpoint */
589 if (!csep && altsd->bNumEndpoints >= 2 577 if (!csep && altsd->bNumEndpoints >= 2)
590 csep = snd_usb_find_desc(alts- 578 csep = snd_usb_find_desc(alts->endpoint[1].extra, alts->endpoint[1].extralen, NULL, USB_DT_CS_ENDPOINT);
591 579
592 /* 580 /*
593 * If we can't locate the USB_DT_CS_EN 581 * If we can't locate the USB_DT_CS_ENDPOINT descriptor in the extra
594 * bytes after the first endpoint, go 582 * bytes after the first endpoint, go search the entire interface.
595 * Some devices have it directly *befo 583 * Some devices have it directly *before* the standard endpoint.
596 */ 584 */
597 if (!csep) 585 if (!csep)
598 csep = snd_usb_find_desc(alts- 586 csep = snd_usb_find_desc(alts->extra, alts->extralen, NULL, USB_DT_CS_ENDPOINT);
599 587
600 if (!csep || csep->bLength < 7 || 588 if (!csep || csep->bLength < 7 ||
601 csep->bDescriptorSubtype != UAC_EP 589 csep->bDescriptorSubtype != UAC_EP_GENERAL)
602 goto error; 590 goto error;
603 591
604 if (protocol == UAC_VERSION_1) { 592 if (protocol == UAC_VERSION_1) {
605 attributes = csep->bmAttribute 593 attributes = csep->bmAttributes;
606 } else if (protocol == UAC_VERSION_2) 594 } else if (protocol == UAC_VERSION_2) {
607 struct uac2_iso_endpoint_descr 595 struct uac2_iso_endpoint_descriptor *csep2 =
608 (struct uac2_iso_endpo 596 (struct uac2_iso_endpoint_descriptor *) csep;
609 597
610 if (csep2->bLength < sizeof(*c 598 if (csep2->bLength < sizeof(*csep2))
611 goto error; 599 goto error;
612 attributes = csep->bmAttribute 600 attributes = csep->bmAttributes & UAC_EP_CS_ATTR_FILL_MAX;
613 601
614 /* emulate the endpoint attrib 602 /* emulate the endpoint attributes of a v1 device */
615 if (csep2->bmControls & UAC2_C 603 if (csep2->bmControls & UAC2_CONTROL_PITCH)
616 attributes |= UAC_EP_C 604 attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL;
617 } else { /* UAC_VERSION_3 */ 605 } else { /* UAC_VERSION_3 */
618 struct uac3_iso_endpoint_descr 606 struct uac3_iso_endpoint_descriptor *csep3 =
619 (struct uac3_iso_endpo 607 (struct uac3_iso_endpoint_descriptor *) csep;
620 608
621 if (csep3->bLength < sizeof(*c 609 if (csep3->bLength < sizeof(*csep3))
622 goto error; 610 goto error;
623 /* emulate the endpoint attrib 611 /* emulate the endpoint attributes of a v1 device */
624 if (le32_to_cpu(csep3->bmContr 612 if (le32_to_cpu(csep3->bmControls) & UAC2_CONTROL_PITCH)
625 attributes |= UAC_EP_C 613 attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL;
626 } 614 }
627 615
628 return attributes; 616 return attributes;
629 617
630 error: 618 error:
631 usb_audio_warn(chip, 619 usb_audio_warn(chip,
632 "%u:%d : no or invalid 620 "%u:%d : no or invalid class specific endpoint descriptor\n",
633 iface_no, altsd->bAlter 621 iface_no, altsd->bAlternateSetting);
634 return 0; 622 return 0;
635 } 623 }
636 624
637 /* find an input terminal descriptor (either U 625 /* find an input terminal descriptor (either UAC1 or UAC2) with the given
638 * terminal id 626 * terminal id
639 */ 627 */
640 static void * 628 static void *
641 snd_usb_find_input_terminal_descriptor(struct 629 snd_usb_find_input_terminal_descriptor(struct usb_host_interface *ctrl_iface,
642 int ter 630 int terminal_id, int protocol)
643 { 631 {
644 struct uac2_input_terminal_descriptor 632 struct uac2_input_terminal_descriptor *term = NULL;
645 633
646 while ((term = snd_usb_find_csint_desc 634 while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
647 635 ctrl_iface->extralen,
648 636 term, UAC_INPUT_TERMINAL))) {
649 if (!snd_usb_validate_audio_de 637 if (!snd_usb_validate_audio_desc(term, protocol))
650 continue; 638 continue;
651 if (term->bTerminalID == termi 639 if (term->bTerminalID == terminal_id)
652 return term; 640 return term;
653 } 641 }
654 642
655 return NULL; 643 return NULL;
656 } 644 }
657 645
658 static void * 646 static void *
659 snd_usb_find_output_terminal_descriptor(struct 647 snd_usb_find_output_terminal_descriptor(struct usb_host_interface *ctrl_iface,
660 int te 648 int terminal_id, int protocol)
661 { 649 {
662 /* OK to use with both UAC2 and UAC3 * 650 /* OK to use with both UAC2 and UAC3 */
663 struct uac2_output_terminal_descriptor 651 struct uac2_output_terminal_descriptor *term = NULL;
664 652
665 while ((term = snd_usb_find_csint_desc 653 while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
666 654 ctrl_iface->extralen,
667 655 term, UAC_OUTPUT_TERMINAL))) {
668 if (!snd_usb_validate_audio_de 656 if (!snd_usb_validate_audio_desc(term, protocol))
669 continue; 657 continue;
670 if (term->bTerminalID == termi 658 if (term->bTerminalID == terminal_id)
671 return term; 659 return term;
672 } 660 }
673 661
674 return NULL; 662 return NULL;
675 } 663 }
676 664
677 static struct audioformat * 665 static struct audioformat *
678 audio_format_alloc_init(struct snd_usb_audio * 666 audio_format_alloc_init(struct snd_usb_audio *chip,
679 struct usb_host_interfa 667 struct usb_host_interface *alts,
680 int protocol, int iface 668 int protocol, int iface_no, int altset_idx,
681 int altno, int num_chan 669 int altno, int num_channels, int clock)
682 { 670 {
683 struct audioformat *fp; 671 struct audioformat *fp;
684 672
685 fp = kzalloc(sizeof(*fp), GFP_KERNEL); 673 fp = kzalloc(sizeof(*fp), GFP_KERNEL);
686 if (!fp) 674 if (!fp)
687 return NULL; 675 return NULL;
688 676
689 fp->iface = iface_no; 677 fp->iface = iface_no;
690 fp->altsetting = altno; 678 fp->altsetting = altno;
691 fp->altset_idx = altset_idx; 679 fp->altset_idx = altset_idx;
692 fp->endpoint = get_endpoint(alts, 0)-> 680 fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
693 fp->ep_attr = get_endpoint(alts, 0)->b 681 fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
694 fp->datainterval = snd_usb_parse_datai 682 fp->datainterval = snd_usb_parse_datainterval(chip, alts);
695 fp->protocol = protocol; 683 fp->protocol = protocol;
696 fp->maxpacksize = le16_to_cpu(get_endp 684 fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
697 fp->channels = num_channels; 685 fp->channels = num_channels;
698 if (snd_usb_get_speed(chip->dev) == US 686 if (snd_usb_get_speed(chip->dev) == USB_SPEED_HIGH)
699 fp->maxpacksize = (((fp->maxpa 687 fp->maxpacksize = (((fp->maxpacksize >> 11) & 3) + 1)
700 * (fp->maxpack 688 * (fp->maxpacksize & 0x7ff);
701 fp->clock = clock; 689 fp->clock = clock;
702 INIT_LIST_HEAD(&fp->list); 690 INIT_LIST_HEAD(&fp->list);
703 691
704 return fp; 692 return fp;
705 } 693 }
706 694
707 static struct audioformat * 695 static struct audioformat *
708 snd_usb_get_audioformat_uac12(struct snd_usb_a 696 snd_usb_get_audioformat_uac12(struct snd_usb_audio *chip,
709 struct usb_host_ 697 struct usb_host_interface *alts,
710 int protocol, in 698 int protocol, int iface_no, int altset_idx,
711 int altno, int s 699 int altno, int stream, int bm_quirk)
712 { 700 {
713 struct usb_device *dev = chip->dev; 701 struct usb_device *dev = chip->dev;
714 struct uac_format_type_i_continuous_de 702 struct uac_format_type_i_continuous_descriptor *fmt;
715 unsigned int num_channels = 0, chconfi 703 unsigned int num_channels = 0, chconfig = 0;
716 struct usb_host_interface *ctrl_intf; <<
717 struct audioformat *fp; 704 struct audioformat *fp;
718 int clock = 0; 705 int clock = 0;
719 u64 format; 706 u64 format;
720 707
721 ctrl_intf = snd_usb_find_ctrl_interfac <<
722 <<
723 /* get audio formats */ 708 /* get audio formats */
724 if (protocol == UAC_VERSION_1) { 709 if (protocol == UAC_VERSION_1) {
725 struct uac1_as_header_descript 710 struct uac1_as_header_descriptor *as =
726 snd_usb_find_csint_des 711 snd_usb_find_csint_desc(alts->extra, alts->extralen,
727 712 NULL, UAC_AS_GENERAL);
728 struct uac_input_terminal_desc 713 struct uac_input_terminal_descriptor *iterm;
729 714
730 if (!as) { 715 if (!as) {
731 dev_err(&dev->dev, 716 dev_err(&dev->dev,
732 "%u:%d : UAC_A 717 "%u:%d : UAC_AS_GENERAL descriptor not found\n",
733 iface_no, altn 718 iface_no, altno);
734 return NULL; 719 return NULL;
735 } 720 }
736 721
737 if (as->bLength < sizeof(*as)) 722 if (as->bLength < sizeof(*as)) {
738 dev_err(&dev->dev, 723 dev_err(&dev->dev,
739 "%u:%d : inval 724 "%u:%d : invalid UAC_AS_GENERAL desc\n",
740 iface_no, altn 725 iface_no, altno);
741 return NULL; 726 return NULL;
742 } 727 }
743 728
744 format = le16_to_cpu(as->wForm 729 format = le16_to_cpu(as->wFormatTag); /* remember the format value */
745 730
746 iterm = snd_usb_find_input_ter !! 731 iterm = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf,
747 732 as->bTerminalLink,
748 733 protocol);
749 if (iterm) { 734 if (iterm) {
750 num_channels = iterm-> 735 num_channels = iterm->bNrChannels;
751 chconfig = le16_to_cpu 736 chconfig = le16_to_cpu(iterm->wChannelConfig);
752 } 737 }
753 } else { /* UAC_VERSION_2 */ 738 } else { /* UAC_VERSION_2 */
754 struct uac2_input_terminal_des 739 struct uac2_input_terminal_descriptor *input_term;
755 struct uac2_output_terminal_de 740 struct uac2_output_terminal_descriptor *output_term;
756 struct uac2_as_header_descript 741 struct uac2_as_header_descriptor *as =
757 snd_usb_find_csint_des 742 snd_usb_find_csint_desc(alts->extra, alts->extralen,
758 743 NULL, UAC_AS_GENERAL);
759 744
760 if (!as) { 745 if (!as) {
761 dev_err(&dev->dev, 746 dev_err(&dev->dev,
762 "%u:%d : UAC_A 747 "%u:%d : UAC_AS_GENERAL descriptor not found\n",
763 iface_no, altn 748 iface_no, altno);
764 return NULL; 749 return NULL;
765 } 750 }
766 751
767 if (as->bLength < sizeof(*as)) 752 if (as->bLength < sizeof(*as)) {
768 dev_err(&dev->dev, 753 dev_err(&dev->dev,
769 "%u:%d : inval 754 "%u:%d : invalid UAC_AS_GENERAL desc\n",
770 iface_no, altn 755 iface_no, altno);
771 return NULL; 756 return NULL;
772 } 757 }
773 758
774 num_channels = as->bNrChannels 759 num_channels = as->bNrChannels;
775 format = le32_to_cpu(as->bmFor 760 format = le32_to_cpu(as->bmFormats);
776 chconfig = le32_to_cpu(as->bmC 761 chconfig = le32_to_cpu(as->bmChannelConfig);
777 762
778 /* 763 /*
779 * lookup the terminal associa 764 * lookup the terminal associated to this interface
780 * to extract the clock 765 * to extract the clock
781 */ 766 */
782 input_term = snd_usb_find_inpu !! 767 input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf,
783 768 as->bTerminalLink,
784 769 protocol);
785 if (input_term) { 770 if (input_term) {
786 clock = input_term->bC 771 clock = input_term->bCSourceID;
787 if (!chconfig && (num_ 772 if (!chconfig && (num_channels == input_term->bNrChannels))
788 chconfig = le3 773 chconfig = le32_to_cpu(input_term->bmChannelConfig);
789 goto found_clock; 774 goto found_clock;
790 } 775 }
791 776
792 output_term = snd_usb_find_out !! 777 output_term = snd_usb_find_output_terminal_descriptor(chip->ctrl_intf,
793 778 as->bTerminalLink,
794 779 protocol);
795 if (output_term) { 780 if (output_term) {
796 clock = output_term->b 781 clock = output_term->bCSourceID;
797 goto found_clock; 782 goto found_clock;
798 } 783 }
799 784
800 dev_err(&dev->dev, 785 dev_err(&dev->dev,
801 "%u:%d : bogus bTermin 786 "%u:%d : bogus bTerminalLink %d\n",
802 iface_no, altno, as->b 787 iface_no, altno, as->bTerminalLink);
803 return NULL; 788 return NULL;
804 } 789 }
805 790
806 found_clock: 791 found_clock:
807 /* get format type */ 792 /* get format type */
808 fmt = snd_usb_find_csint_desc(alts->ex 793 fmt = snd_usb_find_csint_desc(alts->extra, alts->extralen,
809 NULL, UA 794 NULL, UAC_FORMAT_TYPE);
810 if (!fmt) { 795 if (!fmt) {
811 dev_err(&dev->dev, 796 dev_err(&dev->dev,
812 "%u:%d : no UAC_FORMAT 797 "%u:%d : no UAC_FORMAT_TYPE desc\n",
813 iface_no, altno); 798 iface_no, altno);
814 return NULL; 799 return NULL;
815 } 800 }
816 if (((protocol == UAC_VERSION_1) && (f 801 if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8))
817 || ((protocol == UAC_V 802 || ((protocol == UAC_VERSION_2) &&
818 (fmt-> 803 (fmt->bLength < 6))) {
819 dev_err(&dev->dev, 804 dev_err(&dev->dev,
820 "%u:%d : invalid UAC_F 805 "%u:%d : invalid UAC_FORMAT_TYPE desc\n",
821 iface_no, altno); 806 iface_no, altno);
822 return NULL; 807 return NULL;
823 } 808 }
824 809
825 /* 810 /*
826 * Blue Microphones workaround: The la 811 * Blue Microphones workaround: The last altsetting is
827 * identical with the previous one, ex 812 * identical with the previous one, except for a larger
828 * packet size, but is actually a misl 813 * packet size, but is actually a mislabeled two-channel
829 * setting; ignore it. 814 * setting; ignore it.
830 * 815 *
831 * Part 2: analyze quirk flag and form 816 * Part 2: analyze quirk flag and format
832 */ 817 */
833 if (bm_quirk && fmt->bNrChannels == 1 818 if (bm_quirk && fmt->bNrChannels == 1 && fmt->bSubframeSize == 2)
834 return NULL; 819 return NULL;
835 820
836 fp = audio_format_alloc_init(chip, alt 821 fp = audio_format_alloc_init(chip, alts, protocol, iface_no,
837 altset_id 822 altset_idx, altno, num_channels, clock);
838 if (!fp) 823 if (!fp)
839 return ERR_PTR(-ENOMEM); 824 return ERR_PTR(-ENOMEM);
840 825
841 fp->attributes = parse_uac_endpoint_at 826 fp->attributes = parse_uac_endpoint_attributes(chip, alts, protocol,
842 827 iface_no);
843 828
844 /* some quirks for attributes here */ 829 /* some quirks for attributes here */
845 snd_usb_audioformat_attributes_quirk(c 830 snd_usb_audioformat_attributes_quirk(chip, fp, stream);
846 831
847 /* ok, let's parse further... */ 832 /* ok, let's parse further... */
848 if (snd_usb_parse_audio_format(chip, f 833 if (snd_usb_parse_audio_format(chip, fp, format,
849 fmt, s 834 fmt, stream) < 0) {
850 audioformat_free(fp); !! 835 kfree(fp->rate_table);
>> 836 kfree(fp);
851 return NULL; 837 return NULL;
852 } 838 }
853 839
854 /* Create chmap */ 840 /* Create chmap */
855 if (fp->channels != num_channels) 841 if (fp->channels != num_channels)
856 chconfig = 0; 842 chconfig = 0;
857 843
858 fp->chmap = convert_chmap(fp->channels 844 fp->chmap = convert_chmap(fp->channels, chconfig, protocol);
859 845
860 return fp; 846 return fp;
861 } 847 }
862 848
863 static struct audioformat * 849 static struct audioformat *
864 snd_usb_get_audioformat_uac3(struct snd_usb_au 850 snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,
865 struct usb_host_i 851 struct usb_host_interface *alts,
866 struct snd_usb_po 852 struct snd_usb_power_domain **pd_out,
867 int iface_no, int 853 int iface_no, int altset_idx,
868 int altno, int st 854 int altno, int stream)
869 { 855 {
870 struct usb_device *dev = chip->dev; 856 struct usb_device *dev = chip->dev;
871 struct uac3_input_terminal_descriptor 857 struct uac3_input_terminal_descriptor *input_term;
872 struct uac3_output_terminal_descriptor 858 struct uac3_output_terminal_descriptor *output_term;
873 struct uac3_cluster_header_descriptor 859 struct uac3_cluster_header_descriptor *cluster;
874 struct uac3_as_header_descriptor *as = 860 struct uac3_as_header_descriptor *as = NULL;
875 struct uac3_hc_descriptor_header hc_he 861 struct uac3_hc_descriptor_header hc_header;
876 struct usb_host_interface *ctrl_intf; <<
877 struct snd_pcm_chmap_elem *chmap; 862 struct snd_pcm_chmap_elem *chmap;
878 struct snd_usb_power_domain *pd; 863 struct snd_usb_power_domain *pd;
879 unsigned char badd_profile; 864 unsigned char badd_profile;
880 u64 badd_formats = 0; 865 u64 badd_formats = 0;
881 unsigned int num_channels; 866 unsigned int num_channels;
882 struct audioformat *fp; 867 struct audioformat *fp;
883 u16 cluster_id, wLength; 868 u16 cluster_id, wLength;
884 int clock = 0; 869 int clock = 0;
885 int err; 870 int err;
886 871
887 badd_profile = chip->badd_profile; 872 badd_profile = chip->badd_profile;
888 ctrl_intf = snd_usb_find_ctrl_interfac <<
889 873
890 if (badd_profile >= UAC3_FUNCTION_SUBC 874 if (badd_profile >= UAC3_FUNCTION_SUBCLASS_GENERIC_IO) {
891 unsigned int maxpacksize = 875 unsigned int maxpacksize =
892 le16_to_cpu(get_endpoi 876 le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
893 877
894 switch (maxpacksize) { 878 switch (maxpacksize) {
895 default: 879 default:
896 dev_err(&dev->dev, 880 dev_err(&dev->dev,
897 "%u:%d : incor 881 "%u:%d : incorrect wMaxPacketSize for BADD profile\n",
898 iface_no, altn 882 iface_no, altno);
899 return NULL; 883 return NULL;
900 case UAC3_BADD_EP_MAXPSIZE_SYN 884 case UAC3_BADD_EP_MAXPSIZE_SYNC_MONO_16:
901 case UAC3_BADD_EP_MAXPSIZE_ASY 885 case UAC3_BADD_EP_MAXPSIZE_ASYNC_MONO_16:
902 badd_formats = SNDRV_P 886 badd_formats = SNDRV_PCM_FMTBIT_S16_LE;
903 num_channels = 1; 887 num_channels = 1;
904 break; 888 break;
905 case UAC3_BADD_EP_MAXPSIZE_SYN 889 case UAC3_BADD_EP_MAXPSIZE_SYNC_MONO_24:
906 case UAC3_BADD_EP_MAXPSIZE_ASY 890 case UAC3_BADD_EP_MAXPSIZE_ASYNC_MONO_24:
907 badd_formats = SNDRV_P 891 badd_formats = SNDRV_PCM_FMTBIT_S24_3LE;
908 num_channels = 1; 892 num_channels = 1;
909 break; 893 break;
910 case UAC3_BADD_EP_MAXPSIZE_SYN 894 case UAC3_BADD_EP_MAXPSIZE_SYNC_STEREO_16:
911 case UAC3_BADD_EP_MAXPSIZE_ASY 895 case UAC3_BADD_EP_MAXPSIZE_ASYNC_STEREO_16:
912 badd_formats = SNDRV_P 896 badd_formats = SNDRV_PCM_FMTBIT_S16_LE;
913 num_channels = 2; 897 num_channels = 2;
914 break; 898 break;
915 case UAC3_BADD_EP_MAXPSIZE_SYN 899 case UAC3_BADD_EP_MAXPSIZE_SYNC_STEREO_24:
916 case UAC3_BADD_EP_MAXPSIZE_ASY 900 case UAC3_BADD_EP_MAXPSIZE_ASYNC_STEREO_24:
917 badd_formats = SNDRV_P 901 badd_formats = SNDRV_PCM_FMTBIT_S24_3LE;
918 num_channels = 2; 902 num_channels = 2;
919 break; 903 break;
920 } 904 }
921 905
922 chmap = kzalloc(sizeof(*chmap) 906 chmap = kzalloc(sizeof(*chmap), GFP_KERNEL);
923 if (!chmap) 907 if (!chmap)
924 return ERR_PTR(-ENOMEM 908 return ERR_PTR(-ENOMEM);
925 909
926 if (num_channels == 1) { 910 if (num_channels == 1) {
927 chmap->map[0] = SNDRV_ 911 chmap->map[0] = SNDRV_CHMAP_MONO;
928 } else { 912 } else {
929 chmap->map[0] = SNDRV_ 913 chmap->map[0] = SNDRV_CHMAP_FL;
930 chmap->map[1] = SNDRV_ 914 chmap->map[1] = SNDRV_CHMAP_FR;
931 } 915 }
932 916
933 chmap->channels = num_channels 917 chmap->channels = num_channels;
934 clock = UAC3_BADD_CS_ID9; 918 clock = UAC3_BADD_CS_ID9;
935 goto found_clock; 919 goto found_clock;
936 } 920 }
937 921
938 as = snd_usb_find_csint_desc(alts->ext 922 as = snd_usb_find_csint_desc(alts->extra, alts->extralen,
939 NULL, UAC 923 NULL, UAC_AS_GENERAL);
940 if (!as) { 924 if (!as) {
941 dev_err(&dev->dev, 925 dev_err(&dev->dev,
942 "%u:%d : UAC_AS_GENERA 926 "%u:%d : UAC_AS_GENERAL descriptor not found\n",
943 iface_no, altno); 927 iface_no, altno);
944 return NULL; 928 return NULL;
945 } 929 }
946 930
947 if (as->bLength < sizeof(*as)) { 931 if (as->bLength < sizeof(*as)) {
948 dev_err(&dev->dev, 932 dev_err(&dev->dev,
949 "%u:%d : invalid UAC_A 933 "%u:%d : invalid UAC_AS_GENERAL desc\n",
950 iface_no, altno); 934 iface_no, altno);
951 return NULL; 935 return NULL;
952 } 936 }
953 937
954 cluster_id = le16_to_cpu(as->wClusterD 938 cluster_id = le16_to_cpu(as->wClusterDescrID);
955 if (!cluster_id) { 939 if (!cluster_id) {
956 dev_err(&dev->dev, 940 dev_err(&dev->dev,
957 "%u:%d : no cluster de 941 "%u:%d : no cluster descriptor\n",
958 iface_no, altno); 942 iface_no, altno);
959 return NULL; 943 return NULL;
960 } 944 }
961 945
962 /* 946 /*
963 * Get number of channels and channel 947 * Get number of channels and channel map through
964 * High Capability Cluster Descriptor 948 * High Capability Cluster Descriptor
965 * 949 *
966 * First step: get High Capability hea 950 * First step: get High Capability header and
967 * read size of Cluster Descriptor 951 * read size of Cluster Descriptor
968 */ 952 */
969 err = snd_usb_ctl_msg(chip->dev, 953 err = snd_usb_ctl_msg(chip->dev,
970 usb_rcvctrlpipe(chip-> 954 usb_rcvctrlpipe(chip->dev, 0),
971 UAC3_CS_REQ_HIGH_CAPAB 955 UAC3_CS_REQ_HIGH_CAPABILITY_DESCRIPTOR,
972 USB_RECIP_INTERFACE | 956 USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
973 cluster_id, 957 cluster_id,
974 snd_usb_ctrl_intf(ctrl !! 958 snd_usb_ctrl_intf(chip),
975 &hc_header, sizeof(hc_ 959 &hc_header, sizeof(hc_header));
976 if (err < 0) 960 if (err < 0)
977 return ERR_PTR(err); 961 return ERR_PTR(err);
978 else if (err != sizeof(hc_header)) { 962 else if (err != sizeof(hc_header)) {
979 dev_err(&dev->dev, 963 dev_err(&dev->dev,
980 "%u:%d : can't get Hig 964 "%u:%d : can't get High Capability descriptor\n",
981 iface_no, altno); 965 iface_no, altno);
982 return ERR_PTR(-EIO); 966 return ERR_PTR(-EIO);
983 } 967 }
984 968
985 /* 969 /*
986 * Second step: allocate needed amount 970 * Second step: allocate needed amount of memory
987 * and request Cluster Descriptor 971 * and request Cluster Descriptor
988 */ 972 */
989 wLength = le16_to_cpu(hc_header.wLengt 973 wLength = le16_to_cpu(hc_header.wLength);
990 cluster = kzalloc(wLength, GFP_KERNEL) 974 cluster = kzalloc(wLength, GFP_KERNEL);
991 if (!cluster) 975 if (!cluster)
992 return ERR_PTR(-ENOMEM); 976 return ERR_PTR(-ENOMEM);
993 err = snd_usb_ctl_msg(chip->dev, 977 err = snd_usb_ctl_msg(chip->dev,
994 usb_rcvctrlpipe(chip-> 978 usb_rcvctrlpipe(chip->dev, 0),
995 UAC3_CS_REQ_HIGH_CAPAB 979 UAC3_CS_REQ_HIGH_CAPABILITY_DESCRIPTOR,
996 USB_RECIP_INTERFACE | 980 USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
997 cluster_id, 981 cluster_id,
998 snd_usb_ctrl_intf(ctrl !! 982 snd_usb_ctrl_intf(chip),
999 cluster, wLength); 983 cluster, wLength);
1000 if (err < 0) { 984 if (err < 0) {
1001 kfree(cluster); 985 kfree(cluster);
1002 return ERR_PTR(err); 986 return ERR_PTR(err);
1003 } else if (err != wLength) { 987 } else if (err != wLength) {
1004 dev_err(&dev->dev, 988 dev_err(&dev->dev,
1005 "%u:%d : can't get Cl 989 "%u:%d : can't get Cluster Descriptor\n",
1006 iface_no, altno); 990 iface_no, altno);
1007 kfree(cluster); 991 kfree(cluster);
1008 return ERR_PTR(-EIO); 992 return ERR_PTR(-EIO);
1009 } 993 }
1010 994
1011 num_channels = cluster->bNrChannels; 995 num_channels = cluster->bNrChannels;
1012 chmap = convert_chmap_v3(cluster); 996 chmap = convert_chmap_v3(cluster);
1013 kfree(cluster); 997 kfree(cluster);
1014 998
1015 /* 999 /*
1016 * lookup the terminal associated to 1000 * lookup the terminal associated to this interface
1017 * to extract the clock 1001 * to extract the clock
1018 */ 1002 */
1019 input_term = snd_usb_find_input_termi !! 1003 input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf,
1020 1004 as->bTerminalLink,
1021 1005 UAC_VERSION_3);
1022 if (input_term) { 1006 if (input_term) {
1023 clock = input_term->bCSourceI 1007 clock = input_term->bCSourceID;
1024 goto found_clock; 1008 goto found_clock;
1025 } 1009 }
1026 1010
1027 output_term = snd_usb_find_output_ter !! 1011 output_term = snd_usb_find_output_terminal_descriptor(chip->ctrl_intf,
1028 1012 as->bTerminalLink,
1029 1013 UAC_VERSION_3);
1030 if (output_term) { 1014 if (output_term) {
1031 clock = output_term->bCSource 1015 clock = output_term->bCSourceID;
1032 goto found_clock; 1016 goto found_clock;
1033 } 1017 }
1034 1018
1035 dev_err(&dev->dev, "%u:%d : bogus bTe 1019 dev_err(&dev->dev, "%u:%d : bogus bTerminalLink %d\n",
1036 iface_no, altno, as-> 1020 iface_no, altno, as->bTerminalLink);
1037 kfree(chmap); 1021 kfree(chmap);
1038 return NULL; 1022 return NULL;
1039 1023
1040 found_clock: 1024 found_clock:
1041 fp = audio_format_alloc_init(chip, al 1025 fp = audio_format_alloc_init(chip, alts, UAC_VERSION_3, iface_no,
1042 altset_i 1026 altset_idx, altno, num_channels, clock);
1043 if (!fp) { 1027 if (!fp) {
1044 kfree(chmap); 1028 kfree(chmap);
1045 return ERR_PTR(-ENOMEM); 1029 return ERR_PTR(-ENOMEM);
1046 } 1030 }
1047 1031
1048 fp->chmap = chmap; 1032 fp->chmap = chmap;
1049 1033
1050 if (badd_profile >= UAC3_FUNCTION_SUB 1034 if (badd_profile >= UAC3_FUNCTION_SUBCLASS_GENERIC_IO) {
1051 fp->attributes = 0; /* No att 1035 fp->attributes = 0; /* No attributes */
1052 1036
1053 fp->fmt_type = UAC_FORMAT_TYP 1037 fp->fmt_type = UAC_FORMAT_TYPE_I;
1054 fp->formats = badd_formats; 1038 fp->formats = badd_formats;
1055 1039
1056 fp->nr_rates = 0; /* SN 1040 fp->nr_rates = 0; /* SNDRV_PCM_RATE_CONTINUOUS */
1057 fp->rate_min = UAC3_BADD_SAMP 1041 fp->rate_min = UAC3_BADD_SAMPLING_RATE;
1058 fp->rate_max = UAC3_BADD_SAMP 1042 fp->rate_max = UAC3_BADD_SAMPLING_RATE;
1059 fp->rates = SNDRV_PCM_RATE_CO 1043 fp->rates = SNDRV_PCM_RATE_CONTINUOUS;
1060 1044
1061 pd = kzalloc(sizeof(*pd), GFP 1045 pd = kzalloc(sizeof(*pd), GFP_KERNEL);
1062 if (!pd) { 1046 if (!pd) {
1063 audioformat_free(fp); !! 1047 kfree(fp->chmap);
>> 1048 kfree(fp->rate_table);
>> 1049 kfree(fp);
1064 return NULL; 1050 return NULL;
1065 } 1051 }
1066 pd->pd_id = (stream == SNDRV_ 1052 pd->pd_id = (stream == SNDRV_PCM_STREAM_PLAYBACK) ?
1067 UAC3_ 1053 UAC3_BADD_PD_ID10 : UAC3_BADD_PD_ID11;
1068 pd->pd_d1d0_rec = UAC3_BADD_P 1054 pd->pd_d1d0_rec = UAC3_BADD_PD_RECOVER_D1D0;
1069 pd->pd_d2d0_rec = UAC3_BADD_P 1055 pd->pd_d2d0_rec = UAC3_BADD_PD_RECOVER_D2D0;
1070 pd->ctrl_iface = ctrl_intf; <<
1071 1056
1072 } else { 1057 } else {
1073 fp->attributes = parse_uac_en 1058 fp->attributes = parse_uac_endpoint_attributes(chip, alts,
1074 1059 UAC_VERSION_3,
1075 1060 iface_no);
1076 1061
1077 pd = snd_usb_find_power_domai !! 1062 pd = snd_usb_find_power_domain(chip->ctrl_intf,
1078 1063 as->bTerminalLink);
1079 1064
1080 /* ok, let's parse further... 1065 /* ok, let's parse further... */
1081 if (snd_usb_parse_audio_forma 1066 if (snd_usb_parse_audio_format_v3(chip, fp, as, stream) < 0) {
1082 kfree(pd); 1067 kfree(pd);
1083 audioformat_free(fp); !! 1068 kfree(fp->chmap);
>> 1069 kfree(fp->rate_table);
>> 1070 kfree(fp);
1084 return NULL; 1071 return NULL;
1085 } 1072 }
1086 } 1073 }
1087 1074
1088 if (pd) 1075 if (pd)
1089 *pd_out = pd; 1076 *pd_out = pd;
1090 1077
1091 return fp; 1078 return fp;
1092 } 1079 }
1093 1080
1094 static int __snd_usb_parse_audio_interface(st !! 1081 int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
1095 in <<
1096 bo <<
1097 { 1082 {
1098 struct usb_device *dev; 1083 struct usb_device *dev;
1099 struct usb_interface *iface; 1084 struct usb_interface *iface;
1100 struct usb_host_interface *alts; 1085 struct usb_host_interface *alts;
1101 struct usb_interface_descriptor *alts 1086 struct usb_interface_descriptor *altsd;
1102 int i, altno, err, stream; 1087 int i, altno, err, stream;
1103 struct audioformat *fp = NULL; 1088 struct audioformat *fp = NULL;
1104 struct snd_usb_power_domain *pd = NUL 1089 struct snd_usb_power_domain *pd = NULL;
1105 bool set_iface_first; <<
1106 int num, protocol; 1090 int num, protocol;
1107 1091
1108 dev = chip->dev; 1092 dev = chip->dev;
1109 1093
1110 /* parse the interface's altsettings 1094 /* parse the interface's altsettings */
1111 iface = usb_ifnum_to_if(dev, iface_no 1095 iface = usb_ifnum_to_if(dev, iface_no);
1112 1096
1113 num = iface->num_altsetting; 1097 num = iface->num_altsetting;
1114 1098
1115 /* 1099 /*
1116 * Dallas DS4201 workaround: It prese 1100 * Dallas DS4201 workaround: It presents 5 altsettings, but the last
1117 * one misses syncpipe, and does not 1101 * one misses syncpipe, and does not produce any sound.
1118 */ 1102 */
1119 if (chip->usb_id == USB_ID(0x04fa, 0x !! 1103 if (chip->usb_id == USB_ID(0x04fa, 0x4201))
1120 num = 4; 1104 num = 4;
1121 1105
1122 for (i = 0; i < num; i++) { 1106 for (i = 0; i < num; i++) {
1123 alts = &iface->altsetting[i]; 1107 alts = &iface->altsetting[i];
1124 altsd = get_iface_desc(alts); 1108 altsd = get_iface_desc(alts);
1125 protocol = altsd->bInterfaceP 1109 protocol = altsd->bInterfaceProtocol;
1126 /* skip invalid one */ 1110 /* skip invalid one */
1127 if (((altsd->bInterfaceClass 1111 if (((altsd->bInterfaceClass != USB_CLASS_AUDIO ||
1128 (altsd->bInterfaceSubCl 1112 (altsd->bInterfaceSubClass != USB_SUBCLASS_AUDIOSTREAMING &&
1129 altsd->bInterfaceSubCl 1113 altsd->bInterfaceSubClass != USB_SUBCLASS_VENDOR_SPEC)) &&
1130 altsd->bInterfaceClass ! 1114 altsd->bInterfaceClass != USB_CLASS_VENDOR_SPEC) ||
1131 altsd->bNumEndpoints < 1 1115 altsd->bNumEndpoints < 1 ||
1132 le16_to_cpu(get_endpoint( 1116 le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) == 0)
1133 continue; 1117 continue;
1134 /* must be isochronous */ 1118 /* must be isochronous */
1135 if ((get_endpoint(alts, 0)->b 1119 if ((get_endpoint(alts, 0)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
1136 USB_ENDPOINT_XFER_ISOC) 1120 USB_ENDPOINT_XFER_ISOC)
1137 continue; 1121 continue;
1138 /* check direction */ 1122 /* check direction */
1139 stream = (get_endpoint(alts, 1123 stream = (get_endpoint(alts, 0)->bEndpointAddress & USB_DIR_IN) ?
1140 SNDRV_PCM_STREAM_CAPT 1124 SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
1141 altno = altsd->bAlternateSett 1125 altno = altsd->bAlternateSetting;
1142 1126
1143 if (snd_usb_apply_interface_q 1127 if (snd_usb_apply_interface_quirk(chip, iface_no, altno))
1144 continue; 1128 continue;
1145 1129
1146 /* 1130 /*
1147 * Roland audio streaming int 1131 * Roland audio streaming interfaces are marked with protocols
1148 * 0/1/2, but are UAC 1 compa 1132 * 0/1/2, but are UAC 1 compatible.
1149 */ 1133 */
1150 if (USB_ID_VENDOR(chip->usb_i 1134 if (USB_ID_VENDOR(chip->usb_id) == 0x0582 &&
1151 altsd->bInterfaceClass == 1135 altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC &&
1152 protocol <= 2) 1136 protocol <= 2)
1153 protocol = UAC_VERSIO 1137 protocol = UAC_VERSION_1;
1154 1138
1155 switch (protocol) { 1139 switch (protocol) {
1156 default: 1140 default:
1157 dev_dbg(&dev->dev, "% 1141 dev_dbg(&dev->dev, "%u:%d: unknown interface protocol %#02x, assuming v1\n",
1158 iface_no, alt 1142 iface_no, altno, protocol);
1159 protocol = UAC_VERSIO 1143 protocol = UAC_VERSION_1;
1160 fallthrough; !! 1144 /* fall through */
1161 case UAC_VERSION_1: 1145 case UAC_VERSION_1:
>> 1146 /* fall through */
1162 case UAC_VERSION_2: { 1147 case UAC_VERSION_2: {
1163 int bm_quirk = 0; 1148 int bm_quirk = 0;
1164 1149
1165 /* 1150 /*
1166 * Blue Microphones w 1151 * Blue Microphones workaround: The last altsetting is
1167 * identical with the 1152 * identical with the previous one, except for a larger
1168 * packet size, but i 1153 * packet size, but is actually a mislabeled two-channel
1169 * setting; ignore it 1154 * setting; ignore it.
1170 * 1155 *
1171 * Part 1: prepare qu 1156 * Part 1: prepare quirk flag
1172 */ 1157 */
1173 if (altno == 2 && num 1158 if (altno == 2 && num == 3 &&
1174 fp && fp->altsett 1159 fp && fp->altsetting == 1 && fp->channels == 1 &&
1175 fp->formats == SN 1160 fp->formats == SNDRV_PCM_FMTBIT_S16_LE &&
1176 protocol == UAC_V 1161 protocol == UAC_VERSION_1 &&
1177 le16_to_cpu(get_e 1162 le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) ==
1178 1163 fp->maxpacksize * 2)
1179 bm_quirk = 1; 1164 bm_quirk = 1;
1180 1165
1181 fp = snd_usb_get_audi 1166 fp = snd_usb_get_audioformat_uac12(chip, alts, protocol,
1182 1167 iface_no, i, altno,
1183 1168 stream, bm_quirk);
1184 break; 1169 break;
1185 } 1170 }
1186 case UAC_VERSION_3: 1171 case UAC_VERSION_3:
1187 fp = snd_usb_get_audi 1172 fp = snd_usb_get_audioformat_uac3(chip, alts, &pd,
1188 1173 iface_no, i, altno, stream);
1189 break; 1174 break;
1190 } 1175 }
1191 1176
1192 if (!fp) 1177 if (!fp)
1193 continue; 1178 continue;
1194 else if (IS_ERR(fp)) 1179 else if (IS_ERR(fp))
1195 return PTR_ERR(fp); 1180 return PTR_ERR(fp);
1196 1181
1197 if (fp->fmt_type != UAC_FORMA <<
1198 *has_non_pcm = true; <<
1199 if ((fp->fmt_type == UAC_FORM <<
1200 audioformat_free(fp); <<
1201 kfree(pd); <<
1202 fp = NULL; <<
1203 pd = NULL; <<
1204 continue; <<
1205 } <<
1206 <<
1207 snd_usb_audioformat_set_sync_ <<
1208 <<
1209 dev_dbg(&dev->dev, "%u:%d: ad 1182 dev_dbg(&dev->dev, "%u:%d: add audio endpoint %#x\n", iface_no, altno, fp->endpoint);
1210 if (protocol == UAC_VERSION_3 1183 if (protocol == UAC_VERSION_3)
1211 err = snd_usb_add_aud 1184 err = snd_usb_add_audio_stream_v3(chip, stream, fp, pd);
1212 else 1185 else
1213 err = snd_usb_add_aud 1186 err = snd_usb_add_audio_stream(chip, stream, fp);
1214 1187
1215 if (err < 0) { 1188 if (err < 0) {
1216 audioformat_free(fp); !! 1189 list_del(&fp->list); /* unlink for avoiding double-free */
1217 kfree(pd); 1190 kfree(pd);
>> 1191 kfree(fp->rate_table);
>> 1192 kfree(fp->chmap);
>> 1193 kfree(fp);
1218 return err; 1194 return err;
1219 } 1195 }
1220 <<
1221 /* add endpoints */ <<
1222 err = snd_usb_add_endpoint(ch <<
1223 SN <<
1224 if (err < 0) <<
1225 return err; <<
1226 <<
1227 if (fp->sync_ep) { <<
1228 err = snd_usb_add_end <<
1229 <<
1230 <<
1231 <<
1232 if (err < 0) <<
1233 return err; <<
1234 } <<
1235 <<
1236 set_iface_first = false; <<
1237 if (protocol == UAC_VERSION_1 <<
1238 (chip->quirk_flags & QUIR <<
1239 set_iface_first = tru <<
1240 <<
1241 /* try to set the interface.. 1196 /* try to set the interface... */
1242 usb_set_interface(chip->dev, !! 1197 usb_set_interface(chip->dev, iface_no, altno);
1243 if (set_iface_first) !! 1198 snd_usb_init_pitch(chip, iface_no, alts, fp);
1244 usb_set_interface(chi !! 1199 snd_usb_init_sample_rate(chip, iface_no, alts, fp, fp->rate_max);
1245 snd_usb_init_pitch(chip, fp); <<
1246 snd_usb_init_sample_rate(chip <<
1247 if (!set_iface_first) <<
1248 usb_set_interface(chi <<
1249 } <<
1250 return 0; <<
1251 } <<
1252 <<
1253 int snd_usb_parse_audio_interface(struct snd_ <<
1254 { <<
1255 int err; <<
1256 bool has_non_pcm = false; <<
1257 <<
1258 /* parse PCM formats */ <<
1259 err = __snd_usb_parse_audio_interface <<
1260 if (err < 0) <<
1261 return err; <<
1262 <<
1263 if (has_non_pcm) { <<
1264 /* parse non-PCM formats */ <<
1265 err = __snd_usb_parse_audio_i <<
1266 if (err < 0) <<
1267 return err; <<
1268 } 1200 }
1269 <<
1270 return 0; 1201 return 0;
1271 } 1202 }
1272 1203
1273 1204
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.