mirror of
https://github.com/torvalds/linux.git
synced 2025-11-04 02:30:34 +02:00
5576c4f24c
Some weird devices set the codec SSID vendor ID 0, and
snd_pci_quirk_lookup_id() loop aborts at the point although it should
still try matching with the SSID device ID. This resulted in a
missing quirk for some old Macs.
Fix the loop termination condition to check both subvendor and
subdevice.
Fixes: 73355ddd87 ("ALSA: hda: Code refactoring snd_hda_pick_fixup()")
Cc: <stable@vger.kernel.org>
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=215495
Link: https://lore.kernel.org/r/20220116082838.19382-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
147 lines
3.5 KiB
C
147 lines
3.5 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Misc and compatibility things
|
|
* Copyright (c) by Jaroslav Kysela <perex@perex.cz>
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/export.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/time.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/ioport.h>
|
|
#include <sound/core.h>
|
|
|
|
#ifdef CONFIG_SND_DEBUG
|
|
|
|
#ifdef CONFIG_SND_DEBUG_VERBOSE
|
|
#define DEFAULT_DEBUG_LEVEL 2
|
|
#else
|
|
#define DEFAULT_DEBUG_LEVEL 1
|
|
#endif
|
|
|
|
static int debug = DEFAULT_DEBUG_LEVEL;
|
|
module_param(debug, int, 0644);
|
|
MODULE_PARM_DESC(debug, "Debug level (0 = disable)");
|
|
|
|
#endif /* CONFIG_SND_DEBUG */
|
|
|
|
void release_and_free_resource(struct resource *res)
|
|
{
|
|
if (res) {
|
|
release_resource(res);
|
|
kfree(res);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(release_and_free_resource);
|
|
|
|
#ifdef CONFIG_SND_VERBOSE_PRINTK
|
|
/* strip the leading path if the given path is absolute */
|
|
static const char *sanity_file_name(const char *path)
|
|
{
|
|
if (*path == '/')
|
|
return strrchr(path, '/') + 1;
|
|
else
|
|
return path;
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SND_DEBUG) || defined(CONFIG_SND_VERBOSE_PRINTK)
|
|
void __snd_printk(unsigned int level, const char *path, int line,
|
|
const char *format, ...)
|
|
{
|
|
va_list args;
|
|
#ifdef CONFIG_SND_VERBOSE_PRINTK
|
|
int kern_level;
|
|
struct va_format vaf;
|
|
char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";
|
|
bool level_found = false;
|
|
#endif
|
|
|
|
#ifdef CONFIG_SND_DEBUG
|
|
if (debug < level)
|
|
return;
|
|
#endif
|
|
|
|
va_start(args, format);
|
|
#ifdef CONFIG_SND_VERBOSE_PRINTK
|
|
vaf.fmt = format;
|
|
vaf.va = &args;
|
|
|
|
while ((kern_level = printk_get_level(vaf.fmt)) != 0) {
|
|
const char *end_of_header = printk_skip_level(vaf.fmt);
|
|
|
|
/* Ignore KERN_CONT. We print filename:line for each piece. */
|
|
if (kern_level >= '0' && kern_level <= '7') {
|
|
memcpy(verbose_fmt, vaf.fmt, end_of_header - vaf.fmt);
|
|
level_found = true;
|
|
}
|
|
|
|
vaf.fmt = end_of_header;
|
|
}
|
|
|
|
if (!level_found && level)
|
|
memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
|
|
|
|
printk(verbose_fmt, sanity_file_name(path), line, &vaf);
|
|
#else
|
|
vprintk(format, args);
|
|
#endif
|
|
va_end(args);
|
|
}
|
|
EXPORT_SYMBOL_GPL(__snd_printk);
|
|
#endif
|
|
|
|
#ifdef CONFIG_PCI
|
|
#include <linux/pci.h>
|
|
/**
|
|
* snd_pci_quirk_lookup_id - look up a PCI SSID quirk list
|
|
* @vendor: PCI SSV id
|
|
* @device: PCI SSD id
|
|
* @list: quirk list, terminated by a null entry
|
|
*
|
|
* Look through the given quirk list and finds a matching entry
|
|
* with the same PCI SSID. When subdevice is 0, all subdevice
|
|
* values may match.
|
|
*
|
|
* Returns the matched entry pointer, or NULL if nothing matched.
|
|
*/
|
|
const struct snd_pci_quirk *
|
|
snd_pci_quirk_lookup_id(u16 vendor, u16 device,
|
|
const struct snd_pci_quirk *list)
|
|
{
|
|
const struct snd_pci_quirk *q;
|
|
|
|
for (q = list; q->subvendor || q->subdevice; q++) {
|
|
if (q->subvendor != vendor)
|
|
continue;
|
|
if (!q->subdevice ||
|
|
(device & q->subdevice_mask) == q->subdevice)
|
|
return q;
|
|
}
|
|
return NULL;
|
|
}
|
|
EXPORT_SYMBOL(snd_pci_quirk_lookup_id);
|
|
|
|
/**
|
|
* snd_pci_quirk_lookup - look up a PCI SSID quirk list
|
|
* @pci: pci_dev handle
|
|
* @list: quirk list, terminated by a null entry
|
|
*
|
|
* Look through the given quirk list and finds a matching entry
|
|
* with the same PCI SSID. When subdevice is 0, all subdevice
|
|
* values may match.
|
|
*
|
|
* Returns the matched entry pointer, or NULL if nothing matched.
|
|
*/
|
|
const struct snd_pci_quirk *
|
|
snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list)
|
|
{
|
|
if (!pci)
|
|
return NULL;
|
|
return snd_pci_quirk_lookup_id(pci->subsystem_vendor,
|
|
pci->subsystem_device,
|
|
list);
|
|
}
|
|
EXPORT_SYMBOL(snd_pci_quirk_lookup);
|
|
#endif
|