Alsa-devel January 2019

alsa-devel@alsa-project.org

132 participants
350 discussions

Re: [alsa-devel] [PATCH] line6: add a check for snd_card_register
by Takashi Iwai 01 Jan '19

01 Jan '19

On Wed, 26 Dec 2018 04:39:31 +0100, Kangjie Lu wrote: > > The fix checks if snd_card_register() fails, and if so, issues a > warning. > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> Hmm, you submitted multiple patches doing the similar things but the error messages are handled completely differently in both cases. Please make them consistent. ... and above all: > - snd_card_register(line6->card); > + if (snd_card_register(line6->card)) > + pr_warn("Failed to register ALSA card.\n"); This error message is almost useless. Better to use dev_*() variant. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH] sound: sb: fix a missing check of snd_ctl_add
by Takashi Iwai 01 Jan '19

01 Jan '19

On Wed, 26 Dec 2018 02:45:32 +0100, Kangjie Lu wrote: > > snd_ctl_add() could fail, so let's check its return value and return its > error code upstream upon failure. > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> > --- > sound/isa/sb/sb16_main.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c > index 37e6ce7b0b13..c9b25dc1f78e 100644 > --- a/sound/isa/sb/sb16_main.c > +++ b/sound/isa/sb/sb16_main.c > @@ -879,8 +879,14 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device) > snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops); > snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops); > > - if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) > - snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip)); > + if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) { > + err = > + snd_ctl_add(card, > + snd_ctl_new1(&snd_sb16_dma_control, > + chip)); > + if (err < 0) > + return err; > + } > else > pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; The code change looks OK, but could you fix the indentation and avoid unneeded line breaks, as well as the missing braces for else-block? Also, we keep "ALSA:" prefix for the subject line (except for ASoC ones). Please align with it. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH] gus: add a check of the status of snd_ctl_add
by Takashi Iwai 01 Jan '19

01 Jan '19

On Wed, 26 Dec 2018 02:40:51 +0100, Kangjie Lu wrote: > > snd_ctl_add() could fail, so let's check its status and issue an error > message if it indeed fails. > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> The function itself prints the error in most of useful cases, so the extra error here would be superfluous. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH] sound:emu10k1:Use kmemdup instead of duplicating its function
by Takashi Iwai 01 Jan '19

01 Jan '19

On Mon, 24 Dec 2018 09:42:48 +0100, huang.zijiang wrote: > > From: "huang.zijiang" <huang.zijiang(a)zte.com.cn> > > kmemdup has implemented the function that kmalloc() and memcpy(). > > Signed-off-by: huang.zijiang <huang.zijiang(a)zte.com.cn> > --- > sound/pci/emu10k1/emufx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c > index 6ebe817..b4fe4c5 100644 > --- a/sound/pci/emu10k1/emufx.c > +++ b/sound/pci/emu10k1/emufx.c > @@ -671,10 +671,9 @@ static unsigned int *copy_tlv(const unsigned int __user *_tlv, bool in_kernel) > return NULL; > if (data[1] >= MAX_TLV_SIZE) > return NULL; > - tlv = kmalloc(data[1] + sizeof(data), GFP_KERNEL); > + tlv = kmemdup(data, data[1] + sizeof(data), GFP_KERNEL); > if (!tlv) > return NULL; > - memcpy(tlv, data, sizeof(data)); These changes are not equivalent, and rather dangerous, unfortunately. The memcpy() performs only for sizeof(data), and in this case, it's not the same size as the allocation above. thanks, Takashi

1 0

[alsa-devel] [alsa-lib][PATCH] conf/ucm: kblrt5660: Add ucm setting for Dell Edge IoT platform
by Hui Wang 01 Jan '19

01 Jan '19

The new generation of Dell Edge IoT platform is based on Intel Kabylake platform, and the audio codec is ALC3277 which is 100% compatible with RT5660 in I2S mode. The audio design on this IoT platform is as below: - Intel kabylake platform - connect the codec ALC3277 via SSP0 - line-out and line-in with Micbias jacks - line-out mute control and jack detection of line-out and line-in - two HDMI ports with audio capability Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- configure.ac | 1 + src/conf/ucm/Makefile.am | 1 + src/conf/ucm/kblrt5660/Hdmi1 | 20 +++++++ src/conf/ucm/kblrt5660/Hdmi2 | 20 +++++++ src/conf/ucm/kblrt5660/HiFi | 85 +++++++++++++++++++++++++++ src/conf/ucm/kblrt5660/Makefile.am | 4 ++ src/conf/ucm/kblrt5660/kblrt5660.conf | 18 ++++++ 7 files changed, 149 insertions(+) create mode 100755 src/conf/ucm/kblrt5660/Hdmi1 create mode 100755 src/conf/ucm/kblrt5660/Hdmi2 create mode 100755 src/conf/ucm/kblrt5660/HiFi create mode 100755 src/conf/ucm/kblrt5660/Makefile.am create mode 100755 src/conf/ucm/kblrt5660/kblrt5660.conf diff --git a/configure.ac b/configure.ac index d0cab2d6..6185a7eb 100644 --- a/configure.ac +++ b/configure.ac @@ -745,6 +745,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/gpd-win-pocket-rt5645/Makefile \ src/conf/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/Makefile \ src/conf/ucm/HDAudio-Lenovo-DualCodecs/Makefile \ + src/conf/ucm/kblrt5660/Makefile \ src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/Makefile \ src/conf/ucm/PandaBoard/Makefile \ src/conf/ucm/PandaBoardES/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 85c15090..993d02bb 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -29,6 +29,7 @@ GoogleNyan \ gpd-win-pocket-rt5645 \ HDAudio-Gigabyte-ALC1220DualCodecs \ HDAudio-Lenovo-DualCodecs \ +kblrt5660 \ LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216 \ PandaBoard \ PandaBoardES \ diff --git a/src/conf/ucm/kblrt5660/Hdmi1 b/src/conf/ucm/kblrt5660/Hdmi1 new file mode 100755 index 00000000..95e6187a --- /dev/null +++ b/src/conf/ucm/kblrt5660/Hdmi1 @@ -0,0 +1,20 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi1" { + Comment "HDMI/Display Port 1 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:kblrt5660,2" + PlaybackChannels "2" + PlaybackPriority "2" + JackControl "HDMI/DP, pcm=4 Jack" + } +} + diff --git a/src/conf/ucm/kblrt5660/Hdmi2 b/src/conf/ucm/kblrt5660/Hdmi2 new file mode 100755 index 00000000..f6d2feee --- /dev/null +++ b/src/conf/ucm/kblrt5660/Hdmi2 @@ -0,0 +1,20 @@ +# Usecase for device HDMI2/Display Port stereo playback on Intel KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi2" { + Comment "HDMI/Display Port 2 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:kblrt5660,3" + PlaybackChannels "2" + PlaybackPriority "3" + JackControl "HDMI/DP, pcm=5 Jack" + } +} + diff --git a/src/conf/ucm/kblrt5660/HiFi b/src/conf/ucm/kblrt5660/HiFi new file mode 100755 index 00000000..dbdb9006 --- /dev/null +++ b/src/conf/ucm/kblrt5660/HiFi @@ -0,0 +1,85 @@ +# UCM for Intel Kabylake platforms with RT5660 +# For Audio in I2S mode + +SectionVerb { + + EnableSequence [ + ] + + DisableSequence [ + ] + + # ALSA PCM + Value { + # ALSA PCM device for HiFi + PlaybackPCM "hw:kblrt5660,0" + CapturePCM "hw:kblrt5660,1" + } +} + +SectionDevice."LineOut" { + Comment "LineOut playback" + + EnableSequence [ + cdev "hw:kblrt5660" + cset "name='DAC1 Playback Volume' 30" + cset "name='OUT Playback Volume' 19" + cset "name='OUT Playback Switch' on" + cset "name='codec0_out mo media0_in mi Switch' on" + cset "name='DAC1 MIXL DAC1 Switch' on" + cset "name='DAC1 MIXR DAC1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC L1 Switch' off" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXL DAC R1 Switch' off" + cset "name='LOUT MIX DAC Switch' on" + cset "name='Line Out Switch' on" + ] + + DisableSequence [ + cdev "hw:kblrt5660" + cset "name='Line Out Switch' off" + cset "name='DAC1 MIXL DAC1' off" + cset "name='DAC1 MIXR DAC1' off" + ] + + Value { + PlaybackChannels "2" + JackDev "rt5660-jack" + JackControl "Line Out Jack" + } +} + +SectionDevice."LineIn" { + Comment "LineIn capture" + + EnableSequence [ + cdev "hw:kblrt5660" + + cset "name='ADC Capture Volume' 30" + cset "name='IN1 Boost Volume' 30" + cset "name='IN2 Boost Volume' 30" + cset "name='STO1 ADC Boost Gain Volume' 1" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' on" + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' off" + cset "name='Line In Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='media0_out mo codec0_in mi Switch' on" + ] + + DisableSequence [ + cdev "hw:kblrt5660" + cset "name='Line In Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + ] + + Value { + CaptureChannels "2" + JackDev "rt5660-jack" + JackControl "Line In Jack" + } +} diff --git a/src/conf/ucm/kblrt5660/Makefile.am b/src/conf/ucm/kblrt5660/Makefile.am new file mode 100755 index 00000000..83c3743a --- /dev/null +++ b/src/conf/ucm/kblrt5660/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/kblrt5660 +ucm_DATA = kblrt5660.conf HiFi Hdmi1 Hdmi2 +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/kblrt5660/kblrt5660.conf b/src/conf/ucm/kblrt5660/kblrt5660.conf new file mode 100755 index 00000000..c5e9420e --- /dev/null +++ b/src/conf/ucm/kblrt5660/kblrt5660.conf @@ -0,0 +1,18 @@ +SectionUseCase."HiFi" { + File "HiFi" + Comment "Play HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "Hdmi1" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "Hdmi2" + Comment "Play on Hdmi/DP 2" +} + +SectionDefaults [ + cdev "hw:kblrt5660" +] -- 2.17.1

2 1

Re: [alsa-devel] [PATCH] sound: atom: fix a missing check of snd_pcm_lib_malloc_pages
by Pierre-Louis Bossart 01 Jan '19

01 Jan '19

On 12/25/18 8:29 PM, Kangjie Lu wrote: > snd_pcm_lib_malloc_pages() may fail, so let's check its status and > return its error code upstream. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> > --- > sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c > index afc559866095..91a2436ce952 100644 > --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c > +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c > @@ -399,7 +399,13 @@ static int sst_media_hw_params(struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params, > struct snd_soc_dai *dai) > { > - snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); > + int ret; > + > + ret = > + snd_pcm_lib_malloc_pages(substream, > + params_buffer_bytes(params)); > + if (ret) > + return ret; > memset(substream->runtime->dma_area, 0, params_buffer_bytes(params)); > return 0; > }

2 1

[alsa-devel] [PATCH] ALSA: hda/tegra: clear pending irq handlers
by Sameer Pujar 01 Jan '19

01 Jan '19

Even after disabling interrupts on the module, it could be possible that irq handlers are still running. System hang is seen during suspend path. It was found that, there were pending writes on the HDA bus and clock was disabled by that time. Above mentioned issue is fixed by clearing any pending irq handlers before disabling clocks and returning from hda suspend. Suggested-by: Mohan Kumar <mkumard(a)nvidia.com> Suggested-by: Dara Ramesh <dramesh(a)nvidia.com> Signed-off-by: Sameer Pujar <spujar(a)nvidia.com> --- sound/pci/hda/hda_tegra.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index 83befd8..97a176d 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -234,10 +234,12 @@ static int hda_tegra_suspend(struct device *dev) struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip); + struct hdac_bus *bus = azx_bus(chip); snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); azx_stop_chip(chip); + synchronize_irq(bus->irq); azx_enter_link_reset(chip); hda_tegra_disable_clocks(hda); -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: hda/realtek: Enable the headset mic auto detection for ASUS laptops
by Jian-Hong Pan 01 Jan '19

01 Jan '19

The headset mic of ASUS laptops like UX533FD, UX433FN and UX333FA, whose CODEC is Realtek ALC294 has jack auto detection feature. This patch enables the feature. Signed-off-by: Daniel Drake <drake(a)endlessm.com> Signed-off-by: Jian-Hong Pan <jian-hong(a)endlessm.com> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a4f4a9dd488d..aee4cbd29d53 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6501,7 +6501,7 @@ static const struct hda_fixup alc269_fixups[] = { [ALC294_FIXUP_ASUS_HEADSET_MIC] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { - { 0x19, 0x01a1113c }, /* use as headset mic, without its own jack detect */ + { 0x19, 0x01a1103c }, /* use as headset mic */ { } }, .chained = true, -- 2.11.0

2 1

[alsa-devel] [PATCH v2] ALSA: hda - Revert DSP detection on legacy HD-audio driver
by Takashi Iwai 01 Jan '19

01 Jan '19

This essentially reverts the commits c337104b1a16 ("ALSA: HD-Audio: SKL+: abort probe if DSP is present and Skylake driver selected") and d82b51c855a2 ("ALSA: HD-Audio: SKL+: force HDaudio legacy or SKL+ driver selection") for the path of legacy HD-audio controller (snd-hda-intel). The automatic DSP detection and skip of binding with the legacy driver caused regressions on several machines like Dell XPS13. They give the PCI class 0x40380 indicating the availability of DSP while they don't work with ASoC SKL driver (yet). As the support of ASoC driver for such devices isn't available, it's better to revert the whole DSP-detection-and-skip behavior of the legacy driver, so that we can get the old good driver working on such devices. The pci_binding option for ASoC SKL driver is still kept so that it can work without blacklisting. Fixes: c337104b1a16 ("ALSA: HD-Audio: SKL+: abort probe if DSP is present and Skylake driver selected") Reported-by: Linus Torvalds <torvalds(a)linux-foundation.org> Reported-by: Hans de Goede <hdegoede(a)redhat.com> Reported-by: Azat Khuzhin <dohardgopro(a)gmail.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- v1->v2: Fix build error in sound/soc/intel/skylake/ sound/pci/hda/Kconfig | 62 ---------------------------------- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 54 ++++------------------------- sound/soc/intel/Kconfig | 6 ---- 4 files changed, 8 insertions(+), 116 deletions(-) diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 0d38c006e182..4235907b7858 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -226,68 +226,6 @@ config SND_HDA_POWER_SAVE_DEFAULT The default time-out value in seconds for HD-audio automatic power-save mode. 0 means to disable the power-save mode. -if SND_HDA_INTEL - -# The options below should not be enabled by distributions or -# users. They are selected by Intel/Skylake or SOF drivers when they -# register for a PCI ID which is also handled by the HDAudio legacy -# driver. When this option is selected and the DSP is detected based on -# the PCI class/subclass/prog-if, the probe of the HDAudio legacy -# aborts. This mechanism removes the need for distributions to use -# blacklists. It can be bypassed with module parameters should the -# Intel/Skylake or SOF drivers fail to handle a specific platform. - -config SND_HDA_INTEL_DSP_DETECTION_SKL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - Skylake machines. - -config SND_HDA_INTEL_DSP_DETECTION_APL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - Broxton/ApolloLake machines - -config SND_HDA_INTEL_DSP_DETECTION_KBL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - KabyLake machines - -config SND_HDA_INTEL_DSP_DETECTION_GLK - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - GeminiLake machines - -config SND_HDA_INTEL_DSP_DETECTION_CNL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - CannonLake machines - -config SND_HDA_INTEL_DSP_DETECTION_CFL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - CoffeeLake machines - -config SND_HDA_INTEL_DSP_DETECTION_ICL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - IceLake machines - -endif ## SND_HDA_INTEL - endif endmenu diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index e0c3fcbaa028..7185ed574b41 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -37,7 +37,7 @@ #else #define AZX_DCAPS_I915_COMPONENT 0 /* NOP */ #endif -#define AZX_DCAPS_INTEL_SHARED (1 << 14) /* shared with ASoC */ +/* 14 unused */ #define AZX_DCAPS_CTX_WORKAROUND (1 << 15) /* X-Fi workaround */ #define AZX_DCAPS_POSFIX_LPIB (1 << 16) /* Use LPIB as default */ /* 17 unused */ diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e42cc2230977..e784130ea4e0 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -172,9 +172,6 @@ module_param_array(beep_mode, bool, NULL, 0444); MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode " "(0=off, 1=on) (default=1)."); #endif -static int skl_pci_binding; -module_param_named(pci_binding, skl_pci_binding, int, 0444); -MODULE_PARM_DESC(pci_binding, "PCI binding (0=auto, 1=only legacy, 2=only asoc"); #ifdef CONFIG_PM static int param_set_xint(const char *val, const struct kernel_param *kp); @@ -360,7 +357,6 @@ enum { AZX_DCAPS_NO_64BIT |\ AZX_DCAPS_4K_BDLE_BOUNDARY | AZX_DCAPS_SNOOP_OFF) -#define AZX_DCAPS_INTEL_DSP_DETECTION(conf) (IS_ENABLED(CONFIG_SND_HDA_INTEL_DSP_DETECTION_##conf) ? AZX_DCAPS_INTEL_SHARED : 0) /* * vga_switcheroo support */ @@ -2052,28 +2048,6 @@ static int azx_probe(struct pci_dev *pci, bool schedule_probe; int err; - /* check if this driver can be used on SKL+ Intel platforms */ - if (pci_id->driver_data & AZX_DCAPS_INTEL_SHARED) { - switch (skl_pci_binding) { - case SND_SKL_PCI_BIND_AUTO: - if (pci->class != 0x040300) { - dev_info(&pci->dev, "The DSP is enabled on this platform, aborting probe\n"); - return -ENODEV; - } - dev_info(&pci->dev, "No DSP detected, continuing HDaudio legacy probe\n"); - break; - case SND_SKL_PCI_BIND_LEGACY: - dev_info(&pci->dev, "Module parameter forced binding with HDaudio legacy, bypassed detection logic\n"); - break; - case SND_SKL_PCI_BIND_ASOC: - dev_info(&pci->dev, "Module parameter forced binding with SKL+ ASoC driver, aborting probe\n"); - return -ENODEV; - default: - dev_err(&pci->dev, "invalid value for skl_pci_binding module parameter, ignored\n"); - break; - } - } - if (dev >= SNDRV_CARDS) return -ENODEV; if (!enable[dev]) { @@ -2380,48 +2354,34 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Sunrise Point-LP */ { PCI_DEVICE(0x8086, 0x9d70), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(SKL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Kabylake */ { PCI_DEVICE(0x8086, 0xa171), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Kabylake-LP */ { PCI_DEVICE(0x8086, 0x9d71), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(KBL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Kabylake-H */ { PCI_DEVICE(0x8086, 0xa2f0), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Coffelake */ { PCI_DEVICE(0x8086, 0xa348), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(CFL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Cannonlake */ { PCI_DEVICE(0x8086, 0x9dc8), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(CNL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Icelake */ { PCI_DEVICE(0x8086, 0x34c8), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(ICL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Broxton-P(Apollolake) */ { PCI_DEVICE(0x8086, 0x5a98), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON | - AZX_DCAPS_INTEL_DSP_DETECTION(APL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, /* Broxton-T */ { PCI_DEVICE(0x8086, 0x1a98), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, /* Gemini-Lake */ { PCI_DEVICE(0x8086, 0x3198), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON | - AZX_DCAPS_INTEL_DSP_DETECTION(GLK) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, /* Haswell */ { PCI_DEVICE(0x8086, 0x0a0c), .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL }, diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 2fd1b61e8331..99a62ba409df 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -188,12 +188,6 @@ config SND_SOC_INTEL_SKYLAKE_COMMON select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST select SND_SOC_HDAC_HDA if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC - select SND_HDA_INTEL_DSP_DETECTION_SKL if SND_SOC_INTEL_SKL - select SND_HDA_INTEL_DSP_DETECTION_APL if SND_SOC_INTEL_APL - select SND_HDA_INTEL_DSP_DETECTION_KBL if SND_SOC_INTEL_KBL - select SND_HDA_INTEL_DSP_DETECTION_GLK if SND_SOC_INTEL_GLK - select SND_HDA_INTEL_DSP_DETECTION_CNL if SND_SOC_INTEL_CNL - select SND_HDA_INTEL_DSP_DETECTION_CFL if SND_SOC_INTEL_CFL select SND_SOC_ACPI_INTEL_MATCH help If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/ -- 2.19.2

1 0

[alsa-devel] [PATCH] ALSA: hda - Revert DSP detection on legacy HD-audio driver
by Takashi Iwai 01 Jan '19

01 Jan '19

This essentially reverts the commits c337104b1a16 ("ALSA: HD-Audio: SKL+: abort probe if DSP is present and Skylake driver selected") and d82b51c855a2 ("ALSA: HD-Audio: SKL+: force HDaudio legacy or SKL+ driver selection") for the path of legacy HD-audio controller (snd-hda-intel). The automatic DSP detection and skip of binding with the legacy driver caused regressions on several machines like Dell XPS13. They give the PCI class 0x40380 indicating the availability of DSP while they don't work with ASoC SKL driver (yet). As the support of ASoC driver for such devices isn't available, it's better to revert the whole DSP-detection-and-skip behavior of the legacy driver, so that we can get the old good driver working on such devices. The pci_binding option for ASoC SKL driver is still kept so that it can work without blacklisting. Fixes: c337104b1a16 ("ALSA: HD-Audio: SKL+: abort probe if DSP is present and Skylake driver selected") Reported-by: Linus Torvalds <torvalds(a)linux-foundation.org> Reported-by: Hans de Goede <hdegoede(a)redhat.com> Reported-by: Azat Khuzhin <dohardgopro(a)gmail.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hdaudio.h | 6 ---- sound/pci/hda/Kconfig | 62 ---------------------------------- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 54 ++++------------------------- sound/soc/intel/Kconfig | 6 ---- 5 files changed, 8 insertions(+), 122 deletions(-) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index b4fa1c775251..f9b2b6330d27 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -98,12 +98,6 @@ enum { HDA_DEV_ASOC, }; -enum { - SND_SKL_PCI_BIND_AUTO, /* automatic selection based on pci class */ - SND_SKL_PCI_BIND_LEGACY,/* bind only with legacy driver */ - SND_SKL_PCI_BIND_ASOC /* bind only with ASoC driver */ -}; - /* direction */ enum { HDA_INPUT, HDA_OUTPUT diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 0d38c006e182..4235907b7858 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -226,68 +226,6 @@ config SND_HDA_POWER_SAVE_DEFAULT The default time-out value in seconds for HD-audio automatic power-save mode. 0 means to disable the power-save mode. -if SND_HDA_INTEL - -# The options below should not be enabled by distributions or -# users. They are selected by Intel/Skylake or SOF drivers when they -# register for a PCI ID which is also handled by the HDAudio legacy -# driver. When this option is selected and the DSP is detected based on -# the PCI class/subclass/prog-if, the probe of the HDAudio legacy -# aborts. This mechanism removes the need for distributions to use -# blacklists. It can be bypassed with module parameters should the -# Intel/Skylake or SOF drivers fail to handle a specific platform. - -config SND_HDA_INTEL_DSP_DETECTION_SKL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - Skylake machines. - -config SND_HDA_INTEL_DSP_DETECTION_APL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - Broxton/ApolloLake machines - -config SND_HDA_INTEL_DSP_DETECTION_KBL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - KabyLake machines - -config SND_HDA_INTEL_DSP_DETECTION_GLK - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - GeminiLake machines - -config SND_HDA_INTEL_DSP_DETECTION_CNL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - CannonLake machines - -config SND_HDA_INTEL_DSP_DETECTION_CFL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - CoffeeLake machines - -config SND_HDA_INTEL_DSP_DETECTION_ICL - bool - help - This option is selected by SOF or SST drivers, not users or distros. - It enables DSP detection based on PCI class information for - IceLake machines - -endif ## SND_HDA_INTEL - endif endmenu diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index e0c3fcbaa028..7185ed574b41 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -37,7 +37,7 @@ #else #define AZX_DCAPS_I915_COMPONENT 0 /* NOP */ #endif -#define AZX_DCAPS_INTEL_SHARED (1 << 14) /* shared with ASoC */ +/* 14 unused */ #define AZX_DCAPS_CTX_WORKAROUND (1 << 15) /* X-Fi workaround */ #define AZX_DCAPS_POSFIX_LPIB (1 << 16) /* Use LPIB as default */ /* 17 unused */ diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e42cc2230977..e784130ea4e0 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -172,9 +172,6 @@ module_param_array(beep_mode, bool, NULL, 0444); MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode " "(0=off, 1=on) (default=1)."); #endif -static int skl_pci_binding; -module_param_named(pci_binding, skl_pci_binding, int, 0444); -MODULE_PARM_DESC(pci_binding, "PCI binding (0=auto, 1=only legacy, 2=only asoc"); #ifdef CONFIG_PM static int param_set_xint(const char *val, const struct kernel_param *kp); @@ -360,7 +357,6 @@ enum { AZX_DCAPS_NO_64BIT |\ AZX_DCAPS_4K_BDLE_BOUNDARY | AZX_DCAPS_SNOOP_OFF) -#define AZX_DCAPS_INTEL_DSP_DETECTION(conf) (IS_ENABLED(CONFIG_SND_HDA_INTEL_DSP_DETECTION_##conf) ? AZX_DCAPS_INTEL_SHARED : 0) /* * vga_switcheroo support */ @@ -2052,28 +2048,6 @@ static int azx_probe(struct pci_dev *pci, bool schedule_probe; int err; - /* check if this driver can be used on SKL+ Intel platforms */ - if (pci_id->driver_data & AZX_DCAPS_INTEL_SHARED) { - switch (skl_pci_binding) { - case SND_SKL_PCI_BIND_AUTO: - if (pci->class != 0x040300) { - dev_info(&pci->dev, "The DSP is enabled on this platform, aborting probe\n"); - return -ENODEV; - } - dev_info(&pci->dev, "No DSP detected, continuing HDaudio legacy probe\n"); - break; - case SND_SKL_PCI_BIND_LEGACY: - dev_info(&pci->dev, "Module parameter forced binding with HDaudio legacy, bypassed detection logic\n"); - break; - case SND_SKL_PCI_BIND_ASOC: - dev_info(&pci->dev, "Module parameter forced binding with SKL+ ASoC driver, aborting probe\n"); - return -ENODEV; - default: - dev_err(&pci->dev, "invalid value for skl_pci_binding module parameter, ignored\n"); - break; - } - } - if (dev >= SNDRV_CARDS) return -ENODEV; if (!enable[dev]) { @@ -2380,48 +2354,34 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Sunrise Point-LP */ { PCI_DEVICE(0x8086, 0x9d70), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(SKL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Kabylake */ { PCI_DEVICE(0x8086, 0xa171), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Kabylake-LP */ { PCI_DEVICE(0x8086, 0x9d71), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(KBL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Kabylake-H */ { PCI_DEVICE(0x8086, 0xa2f0), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE }, /* Coffelake */ { PCI_DEVICE(0x8086, 0xa348), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(CFL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Cannonlake */ { PCI_DEVICE(0x8086, 0x9dc8), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(CNL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Icelake */ { PCI_DEVICE(0x8086, 0x34c8), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE | - AZX_DCAPS_INTEL_DSP_DETECTION(ICL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Broxton-P(Apollolake) */ { PCI_DEVICE(0x8086, 0x5a98), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON | - AZX_DCAPS_INTEL_DSP_DETECTION(APL) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, /* Broxton-T */ { PCI_DEVICE(0x8086, 0x1a98), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, /* Gemini-Lake */ { PCI_DEVICE(0x8086, 0x3198), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON | - AZX_DCAPS_INTEL_DSP_DETECTION(GLK) - }, + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, /* Haswell */ { PCI_DEVICE(0x8086, 0x0a0c), .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL }, diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 2fd1b61e8331..99a62ba409df 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -188,12 +188,6 @@ config SND_SOC_INTEL_SKYLAKE_COMMON select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST select SND_SOC_HDAC_HDA if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC - select SND_HDA_INTEL_DSP_DETECTION_SKL if SND_SOC_INTEL_SKL - select SND_HDA_INTEL_DSP_DETECTION_APL if SND_SOC_INTEL_APL - select SND_HDA_INTEL_DSP_DETECTION_KBL if SND_SOC_INTEL_KBL - select SND_HDA_INTEL_DSP_DETECTION_GLK if SND_SOC_INTEL_GLK - select SND_HDA_INTEL_DSP_DETECTION_CNL if SND_SOC_INTEL_CNL - select SND_HDA_INTEL_DSP_DETECTION_CFL if SND_SOC_INTEL_CFL select SND_SOC_ACPI_INTEL_MATCH help If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/ -- 2.19.2

3 5

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Alsa-devel January 2019