From: Cryolitia PukNgae <cryolitia@xxxxxxxxxxxxx>
For apply and unapply quirk flags more flexibly though param and sysfs
Signed-off-by: Cryolitia PukNgae <cryolitia@xxxxxxxxxxxxx>
---
sound/usb/card.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++-
sound/usb/quirks.c | 51 ++++++++++++++++
sound/usb/quirks.h | 2 +
sound/usb/usbaudio.h | 13 ++++
4 files changed, 230 insertions(+), 1 deletion(-)
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 0265206a8e8cf31133e8463c98fe0497d8ace89e..e53fd868f34e93d42b1447958fc136658a6f9dd2 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -77,6 +77,7 @@ static unsigned int quirk_flags[SNDRV_CARDS];
bool snd_usb_use_vmalloc = true;
bool snd_usb_skip_validation;
+char device_quirk_flags[MAX_QUIRK_PARAM_LEN];
module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for the USB audio adapter.");
@@ -110,6 +111,149 @@ MODULE_PARM_DESC(use_vmalloc, "Use vmalloc for PCM intermediate buffers (default
module_param_named(skip_validation, snd_usb_skip_validation, bool, 0444);
MODULE_PARM_DESC(skip_validation, "Skip unit descriptor validation (default: no).");
+DEFINE_MUTEX(device_quirk_mutex); /* protects device_quirk_list */
+
+struct device_quirk_entry *device_quirk_list;
+unsigned int device_quirk_count;
+
+static int device_quirks_param_set(const char *value,
+ const struct kernel_param *kp)
+{
+ char *val, *p, *field, *flag_field;
+ u32 mask_flags, unmask_flags, bit;
+ bool is_unmask;
+ u16 vid, pid;
+ size_t i;
+ int err;
+
+ val = kstrdup(value, GFP_KERNEL);
+ if (!val)
+ return -ENOMEM;
+
+ err = param_set_copystring(val, kp);
+ if (err) {
+ kfree(val);
+ return err;
+ }
+
+ mutex_lock(&device_quirk_mutex);
+
+ if (!*val) {
+ device_quirk_count = 0;
+ kfree(device_quirk_list);
+ device_quirk_list = NULL;
+ goto unlock;
+ }
+
+ for (device_quirk_count = 1, i = 0; val[i]; i++)
+ if (val[i] == ';')
+ device_quirk_count++;
+
+ kfree(device_quirk_list);
+
+ device_quirk_list = kcalloc(device_quirk_count,
+ sizeof(struct device_quirk_entry),
+ GFP_KERNEL);
+ if (!device_quirk_list) {
+ device_quirk_count = 0;
+ mutex_unlock(&device_quirk_mutex);
+ kfree(val);
+ return -ENOMEM;
+ }
+
+ for (i = 0, p = val; p && *p;) {
+ /* Each entry consists of VID:PID:flags */
+ field = strsep(&p, ":");
+ if (!field)
+ break;
+
+ if (strcmp(field, "*") == 0)
+ vid = 0;
+ else if (kstrtou16(field, 16, &vid))
+ break;
+
+ field = strsep(&p, ":");
+ if (!field)
+ break;
+
+ if (strcmp(field, "*") == 0)
+ pid = 0;
+ else if (kstrtou16(field, 16, &pid))
+ break;
+
+ field = strsep(&p, ";");
+ if (!field || !*field)
+ break;
+
+ /* Collect the flags */
+ mask_flags = 0;
+ unmask_flags = 0;
+ while (field && *field) {
+ flag_field = strsep(&field, ",");
+
+ if (!flag_field)
+ break;
+
+ if (*flag_field == '!') {
+ is_unmask = true;
+ flag_field++;
+ } else {
+ is_unmask = false;
+ }
+
+ if (!kstrtou32(flag_field, 16, &bit)) {
+ if (is_unmask)
+ unmask_flags |= bit;
+ else
+ mask_flags |= bit;
+
+ break;
+ }
+
+ bit = snd_usb_quirk_flags_from_name(flag_field);
+
+ if (bit) {
+ if (is_unmask)
+ unmask_flags |= bit;
+ else
+ mask_flags |= bit;
+ } else {
+ pr_warn("snd_usb_audio: unknown flag %s while parsing param device_quirk_flags\n",
+ flag_field);
+ }
+ }
+ device_quirk_list[i++] = (struct device_quirk_entry){
+ .vid = vid,
+ .pid = pid,
+ .mask_flags = mask_flags,
+ .unmask_flags = unmask_flags,
+ };
+ }
+
+ if (i < device_quirk_count)
+ device_quirk_count = i;
+
+unlock:
+ mutex_unlock(&device_quirk_mutex);
+ kfree(val);
+
+ return 0;
+}
+
+static const struct kernel_param_ops device_quirks_param_ops = {
+ .set = device_quirks_param_set,
+ .get = param_get_string,
+};
+
+static struct kparam_string device_quirks_param_string = {
+ .maxlen = sizeof(device_quirk_flags),
+ .string = device_quirk_flags,
+};
+
+device_param_cb(device_quirk_flags, &device_quirks_param_ops,
+ &device_quirks_param_string, 0644);
+MODULE_PARM_DESC(device_quirk_flags, "Add/modify USB audio quirks");
+
/*
* we keep the snd_usb_audio_t instances by ourselves for merging
* the all interfaces on the same card as one sound device.
@@ -755,6 +899,8 @@ static int snd_usb_audio_create(struct usb_interface *intf,
else
snd_usb_init_quirk_flags(chip);
+ snd_usb_init_dynamic_quirks(chip);
+
card->private_free = snd_usb_audio_free;
strscpy(card->driver, "USB-Audio");
@@ -1290,4 +1436,21 @@ static struct usb_driver usb_audio_driver = {
.supports_autosuspend = 1,
};
-module_usb_driver(usb_audio_driver);
+static int __init usb_audio_init(void)
+{
+ return usb_register_driver(&usb_audio_driver, THIS_MODULE,
+ KBUILD_MODNAME);
+}
+
+static void __exit usb_audio_exit(void)
+{
+ mutex_lock(&device_quirk_mutex);
+ kfree(device_quirk_list);
+ device_quirk_list = NULL;
+ mutex_unlock(&device_quirk_mutex);
+
+ usb_deregister(&usb_audio_driver);
+}
+
+module_init(usb_audio_init);
+module_exit(usb_audio_exit);
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 022e5691d6797c0a17a1132b05856e816f822ab0..88481e34f9b85ce223c989ee4ad54908eff73e2c 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -2539,3 +2539,54 @@ void snd_usb_init_quirk_flags(struct snd_usb_audio *chip)
}
}
}
+
+void snd_usb_init_dynamic_quirks(struct snd_usb_audio *chip)
+{
+ u16 vid = USB_ID_VENDOR(chip->usb_id);
+ u16 pid = USB_ID_PRODUCT(chip->usb_id);
+ int i, flags = 0;
+
+ mutex_lock(&device_quirk_mutex);
+
+ for (i = 0; i < device_quirk_count; i++) {
+ if (device_quirk_list[i].vid == 0 ||
+ (vid == device_quirk_list[i].vid &&
+ device_quirk_list[i].pid == 0) ||
+ (vid == device_quirk_list[i].vid &&
+ pid == device_quirk_list[i].pid)) {
+ flags |= device_quirk_list[i].mask_flags;
+ flags &= ~device_quirk_list[i].unmask_flags;
+ usb_audio_dbg(chip,
+ "Set mask quirk flag 0x%x and unmask quirk flag 0x%x from param for device %04x:%04x\n",
+ device_quirk_list[i].mask_flags,
+ device_quirk_list[i].unmask_flags,
+ USB_ID_VENDOR(chip->usb_id),
+ USB_ID_PRODUCT(chip->usb_id));
+ break;
+ }
+ }
+
+ mutex_unlock(&device_quirk_mutex);
+}
+
+void snd_usb_init_dynamic_quirks(struct snd_usb_audio *chip)
+{
+ u16 vid = USB_ID_VENDOR(chip->usb_id);
+ u16 pid = USB_ID_PRODUCT(chip->usb_id);
+ int i;
+
+ mutex_lock(&device_quirk_mutex);
+
+ for (i = 0; i < device_quirk_count; i++) {
+ if (device_quirk_list[i].vid == 0 ||
+ (vid == device_quirk_list[i].vid &&
+ device_quirk_list[i].pid == 0) ||
+ (vid == device_quirk_list[i].vid &&
+ pid == device_quirk_list[i].pid)) {
+ chip->quirk_flags |= device_quirk_list[i].mask_flags;
+ chip->quirk_flags &= ~device_quirk_list[i].unmask_flags;
+ }
+ }
+
+ mutex_unlock(&device_quirk_mutex);
+}
diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h
index 749d493eb532c071ee40cf4b2840bb4902ab4681..e8e32432df69f2eb16f84b8a9c72f0a753a3589f 100644
--- a/sound/usb/quirks.h
+++ b/sound/usb/quirks.h
@@ -54,4 +54,6 @@ const char *snd_usb_quirk_flag_find_name(unsigned long flag);
u32 snd_usb_quirk_flags_from_name(char *name);
+void snd_usb_init_dynamic_quirks(struct snd_usb_audio *chip);
+
#endif /* __USBAUDIO_QUIRKS_H */
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 0a22cb4a02344b2dcf4009c560a759f2da25ca67..cb6cab37d749a258258394816e74c939cdd471fe 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -20,6 +20,7 @@ struct media_device;
struct media_intf_devnode;
#define MAX_CARD_INTERFACES 16
+#define MAX_QUIRK_PARAM_LEN 128
/*
* Structure holding assosiation between Audio Control Interface
@@ -165,6 +166,11 @@ DEFINE_CLASS(snd_usb_lock, struct __snd_usb_lock,
extern bool snd_usb_use_vmalloc;
extern bool snd_usb_skip_validation;
+extern struct mutex device_quirk_mutex;
+extern char device_quirk_flags[MAX_QUIRK_PARAM_LEN];
+extern unsigned int device_quirk_count;
+extern struct device_quirk_entry *device_quirk_list;
+
/*
* Driver behavior quirk flags, stored in chip->quirk_flags
*
@@ -254,4 +260,11 @@ extern bool snd_usb_skip_validation;
#define QUIRK_FLAG_MIXER_CAPTURE_MIN_MUTE (1U << 25)
/* Please also edit snd_usb_audio_quirk_flag_names */
+struct device_quirk_entry {
+ u16 vid;
+ u16 pid;
+ u32 mask_flags;
+ u32 unmask_flags;
+};
+
#endif /* __USBAUDIO_H */
--
2.51.0
