[PATCH 16/31] ALSA: usb-audio: scarlett2: Add Gen 3 mixer support

[Takashi Iwai]

On Tue, 22 Jun 2021 10:18:39 +0200,
Geoffrey D. Bennett wrote:
> 
> On Tue, Jun 22, 2021 at 09:58:27AM +0200, Takashi Iwai wrote:
> > On Tue, 22 Jun 2021 09:44:54 +0200,
> > Geoffrey D. Bennett wrote:
> > > 
> > > On Tue, Jun 22, 2021 at 09:34:25AM +0200, Takashi Iwai wrote:
> > > > On Tue, 22 Jun 2021 09:07:20 +0200,
> > > > Vladimir Sadovnikov wrote:
> > > > > 
> > > > > Hello Takashi!
> > > > > 
> > > > > Since Focusrite devices are too advanced in settings, the overall
> > > > > amount of 256 controls is not enough for these devices (like 18i20).
> > > > > I would like also to extend this constant up to 1024 or even more
> > > > > since adding support of software configuration of the device also
> > > > > can exceed the amount of 512 control elements.
> > > > 
> > > > This define isn't for the total number of mixer elements.  Instead,
> > > > it's just a size of the bitmap table that contains the head of the
> > > > linked list for each unit id (in the sense of USB mixer spec).
> > > > So the number of mixer elements is unlimited.
> > > 
> > > Sorry I don't understand what's going on then. Am I calling
> > > snd_usb_mixer_add_control() wrong? Because when I called it more than
> > > MAX_ID_ELEMS times I got a buffer overflow in mixer->id_elems[] (from
> > > memory, I can confirm tonight).
> > > 
> > > snd_usb_create_mixer() has:
> > > 
> > >         mixer->id_elems = kcalloc(MAX_ID_ELEMS, sizeof(*mixer->id_elems),
> > >                                   GFP_KERNEL);
> > > 
> > > snd_usb_mixer_add_control() called from mixer_scarlett_gen2.c ends up
> > > at snd_usb_mixer_add_list() which does:
> > > 
> > >         list->next_id_elem = mixer->id_elems[list->id];
> > >         mixer->id_elems[list->id] = list;
> > > 
> > > And list->id was going over MAX_ID_ELEMS.
> > 
> > Here, list->id is the *USB* mixer unit id, not the ALSA control id or
> > whatever the internal index.  The former should be a byte, hence it
> > can't be over 256.
> > 
> > That said, the scarlett2 code calls the function in a wrong way.  It
> > has worked casually, so far, just because the core code doesn't use
> > the unit id number for significant roles.
> > 
> > So, as a quick workaround, simply pass 0 or any fixed number under 256
> > to list->id (i.e. elem->head.id in scarlett2_add_new_ctl()).  That's
> > all, and the elements are chained in the linked list.
> 
> Okay, I will fix that tonight.
> 
> Were patches 1-15 of this set of 31 acceptable? If so, I will send a
> new set with this fix and the remainder of the patches.

I don't see other issues through a quick glance.

And, the additional fix is below.
If this works, please include this at first.


Takashi

-- 8< --
From: Takashi Iwai <tiwai at suse.de>
Subject: [PATCH] ALSA: usb-audio: scarlett2: Fix wrong resume call

The current way of the scarlett2 mixer code managing the
usb_mixer_elem_info object is wrong in two ways: it passes its
internal index to the head.id field, and the val_type field is
uninitialized.  This ended up with the wrong execution at the resume
because a bogus unit id is passed wrongly.  Also, in the later code
extensions, we'll have more mixer elements, and passing the index will
overflow the unit id size (of 256).

This patch corrects those issues.  It introduces a new value type,
USB_MIXER_BESPOKEN, which indicates a non-standard mixer element, and
use this type for all scarlett2 mixer elements, as well as
initializing the fixed unit id 0 for avoiding the overflow.

Cc: <stable at vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/usb/mixer.h               | 1 +
 sound/usb/mixer_scarlett_gen2.c | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index e5a01f17bf3c..ea41e7a1f7bf 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -55,6 +55,7 @@ enum {
 	USB_MIXER_U16,
 	USB_MIXER_S32,
 	USB_MIXER_U32,
+	USB_MIXER_BESPOKEN,	/* non-standard type */
 };
 
 typedef void (*usb_mixer_elem_dump_func_t)(struct snd_info_buffer *buffer,
diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index 2e1937b072ee..ed2f16a5fc87 100644
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -1070,10 +1070,15 @@ static int scarlett2_add_new_ctl(struct usb_mixer_interface *mixer,
 	if (!elem)
 		return -ENOMEM;
 
+	/* We set USB_MIXER_BESPOKEN type, so that the core USB mixer code
+	 * ignores them for resume and other operations.
+	 * Also, the head.id field is set to 0, as we don't use this field.
+	 */
 	elem->head.mixer = mixer;
 	elem->control = index;
-	elem->head.id = index;
+	elem->head.id = 0;
 	elem->channels = channels;
+	elem->val_type = USB_MIXER_BESPOKEN;
 
 	kctl = snd_ctl_new1(ncontrol, elem);
 	if (!kctl) {
-- 
2.26.2