ALSA/ASoC: Conditionally skip i915 init and cleanups
v2 cover ALSA/ASoC: Conditionally skip i915 init and cleanups
A small set of changes to improve initialization of the audio stack on HDAudio devices and pair of cleanups.
As the first change is the most important one here, following is the technical background for it:
Commit 78f613ba1efb ("drm/i915: finish removal of CNL") and its friends removed support for i915 for all CNL-based platforms. HDAudio library, however, still treats such platforms as valid candidates for i915 binding. Update query mechanism to reflect changes made in drm tree.
At the same time, i915 support for LKF-based platforms has not been provided so remove them from valid binding candidates.
The snd_soc_hda change is a follow up for the above and the cleanup patches do not bring any functional changes.
Changes in v2:
- list of problematic VGA devices is now declared locally, no more touching drm stuff
Cezary Rojewski (4):
ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms
ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
ASoC: codecs: hda: Cleanup error messages
ALSA: hda: Reuse for_each_pcm_streams()
sound/hda/hdac_i915.c | 32 +++++++++++++++++++++++++++++--- sound/pci/hda/hda_codec.c | 2 +- sound/soc/codecs/hda.c | 15 ++++++++++----- 3 files changed, 40 insertions(+), 9 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/4 ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms
Commit 78f613ba1efb ("drm/i915: finish removal of CNL") and its friends removed support for i915 for all CNL-based platforms. HDAudio library, however, still treats such platforms as valid candidates for i915 binding. Update query mechanism to reflect changes made in drm tree.
At the same time, i915 support for LKF-based platforms has not been provided so remove them from valid binding candidates.
--- sound/hda/hdac_i915.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)
sound/hda/hdac_i915.c +29 -3
@@ -127,15 +127,41 @@ static int i915_component_master_match(struct device *dev, int subcomponent,/* check whether Intel graphics is present and reachable */ static int i915_gfx_present (struct pci_dev *hdac_pci) { +/* List of known platforms with no i915 support. */ +static struct pci_device_id denylist[] = { +/* CNL */ + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a40 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a41 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a42 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a44 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a49 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a4a ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a4c ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a50 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a51 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a52 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a54 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a59 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a5a ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a5c ),0x030000 ,0xff0000 }, +/* LKF */ + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x9840 ),0x030000 ,0xff0000 }, + {0 } + };struct pci_dev *display_dev =NULL ;if (!gpu_bind || (gpu_bind <0 &&video_firmware_drivers_only ()))return false;for_each_pci_dev (display_dev) { -if (display_dev->vendor ==PCI_VENDOR_ID_INTEL && - (display_dev->class >>16 ) ==PCI_BASE_CLASS_DISPLAY && -connectivity_check (display_dev, hdac_pci)) { +if (display_dev->vendor !=PCI_VENDOR_ID_INTEL || + (display_dev->class >>16 ) !=PCI_BASE_CLASS_DISPLAY ) +continue ; + +if (pci_match_id (denylist, display_dev)) +continue ; + +if (connectivity_check (display_dev, hdac_pci)) {pci_dev_put (display_dev);return true; }
Signature · 1 line
2.25.1
Re: [PATCH v2 1/4] ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms
Quoted 10 lines · Cezary Rojewski
Commit
78f613ba1efb("drm/i915: finish removal of CNL") and its friends removed support for i915 for all CNL-based platforms. HDAudio library, however, still treats such platforms as valid candidates for i915 binding. Update query mechanism to reflect changes made in drm tree.At the same time, i915 support for LKF-based platforms has not been provided so remove them from valid binding candidates.
Quoted 56 lines
--- sound/hda/hdac_i915.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)sound/hda/hdac_i915.c +29
-3@@ -127,15 +127,41 @@ static int i915_component_master_match(struct device *dev, int subcomponent,/* check whether Intel graphics is present and reachable */ static int i915_gfx_present (struct pci_dev *hdac_pci) { +/* List of known platforms with no i915 support. */ +static struct pci_device_id denylist[] = { +/* CNL */ + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a40 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a41 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a42 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a44 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a49 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a4a ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a4c ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a50 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a51 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a52 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a54 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a59 ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a5a ),0x030000 ,0xff0000 }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x5a5c ),0x030000 ,0xff0000 }, +/* LKF */ + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x9840 ),0x030000 ,0xff0000 }, + {0 } + };struct pci_dev *display_dev =NULL ;if (!gpu_bind || (gpu_bind <0 &&video_firmware_drivers_only ()))return false;for_each_pci_dev (display_dev) { -if (display_dev->vendor ==PCI_VENDOR_ID_INTEL && - (display_dev->class >>16 ) ==PCI_BASE_CLASS_DISPLAY && -connectivity_check (display_dev, hdac_pci)) { +if (display_dev->vendor !=PCI_VENDOR_ID_INTEL || + (display_dev->class >>16 ) !=PCI_BASE_CLASS_DISPLAY ) +continue ; + +if (pci_match_id (denylist, display_dev)) +continue ; + +if (connectivity_check (display_dev, hdac_pci)) {pci_dev_put (display_dev);return true; }Signature · 1 line
2.25.1
Re: [PATCH v2 1/4] ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms
In reply to Cezary RojewskiQuoted 19 lines · Cezary Rojewski
Commit
78f613ba1efb("drm/i915: finish removal of CNL") and its friends removed support for i915 for all CNL-based platforms. HDAudio library, however, still treats such platforms as valid candidates for i915 binding. Update query mechanism to reflect changes made in drm tree.At the same time, i915 support for LKF-based platforms has not been provided so remove them from valid binding candidates.
Signed-off-by Cezary Rojewski <[email protected]>--- sound/hda/hdac_i915.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)sound/hda/hdac_i915.c +0
-0
sound/hda/hdac_i915.c static int i915_component_master_match(struct device *dev, int subcomponent, · line 131
Quoted 5 lines
sound/hda/hdac_i915.c +2
-0@@ -127,15 +127,41 @@ static int i915_component_master_match(struct device *dev, int subcomponent,/* check whether Intel graphics is present and reachable */ static int i915_gfx_present (struct pci_dev *hdac_pci) { +/* List of known platforms with no i915 support. */ +static struct pci_device_id denylist[] = {
This should be const to place it in rodata, it doesn't need to be mutable.
Quoted 8 lines
sound/hda/hdac_i915.c +8
-0+/* CNL */ + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a40), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a41), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a42), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a44), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a49), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4a), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4c), 0x030000, 0xff0000 },
sound/hda/hdac_i915.c static int i915_component_master_match(struct device *dev, int subcomponent, · line 149
Quoted 10 lines
sound/hda/hdac_i915.c +10
-0+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a50), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a51), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a52), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a54), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a59), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5a), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5c), 0x030000, 0xff0000 }, +/* LKF */ + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9840), 0x030000, 0xff0000 }, + { 0 }
Nitpick, prefer {} over { 0 }.
BR,
Jani.
Quoted 21 lines
sound/hda/hdac_i915.c +9
-3+ };struct pci_dev *display_dev =NULL ;if (!gpu_bind || (gpu_bind <0 &&video_firmware_drivers_only ()))return false;for_each_pci_dev (display_dev) { -if (display_dev->vendor ==PCI_VENDOR_ID_INTEL && - (display_dev->class >>16 ) ==PCI_BASE_CLASS_DISPLAY && -connectivity_check (display_dev, hdac_pci)) { +if (display_dev->vendor !=PCI_VENDOR_ID_INTEL || + (display_dev->class >>16 ) !=PCI_BASE_CLASS_DISPLAY ) +continue ; + +if (pci_match_id (denylist, display_dev)) +continue ; + +if (connectivity_check (display_dev, hdac_pci)) {pci_dev_put (display_dev);return true; }
Signature · 1 line
Jani Nikula, Intel
Re: [PATCH v2 1/4] ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms
Quoted 41 lines · Jani Nikula
Quoted 19 lines · Cezary Rojewski
Commit
78f613ba1efb("drm/i915: finish removal of CNL") and its friends removed support for i915 for all CNL-based platforms. HDAudio library, however, still treats such platforms as valid candidates for i915 binding. Update query mechanism to reflect changes made in drm tree.At the same time, i915 support for LKF-based platforms has not been provided so remove them from valid binding candidates.
Signed-off-by Cezary Rojewski <[email protected]>--- sound/hda/hdac_i915.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)sound/hda/hdac_i915.c +0
-0sound/hda/hdac_i915.c static int i915_component_master_match(struct device *dev, int subcomponent, · line 131
Quoted 5 lines
sound/hda/hdac_i915.c +2
-0@@ -127,15 +127,41 @@ static int i915_component_master_match(struct device *dev, int subcomponent,/* check whether Intel graphics is present and reachable */ static int i915_gfx_present (struct pci_dev *hdac_pci) { +/* List of known platforms with no i915 support. */ +static struct pci_device_id denylist[] = {This should be const to place it in rodata, it doesn't need to be mutable.
Quoted 12 lines
sound/hda/hdac_i915.c +12
-0+/* CNL */ + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a40), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a41), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a42), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a44), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a49), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4a), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4c), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a50), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a51), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a52), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a54), 0x030000, 0xff0000 },
Quoted 8 lines
sound/hda/hdac_i915.c static int i915_component_master_match(struct device *dev, int subcomponent, · line 149
Quoted 6 lines
sound/hda/hdac_i915.c +6
-0+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a59), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5a), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5c), 0x030000, 0xff0000 }, +/* LKF */ + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9840), 0x030000, 0xff0000 }, + { 0 }Nitpick, prefer {} over { 0 }.
Ack for both suggestions. Thank you.
Kind regards,
Czarek
PATCH v2 2/4 ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
In reply to Cezary RojewskiIf i915 does not support given platform but the hardware i.e.: HDAudio codec is still there, the codec-probing procedure will succeed for such device but the follow up initialization will always end up with -ENODEV.
While bus could filter out address '2' which Intel's HDMI/DP codecs always enumerate on, more robust approach is to check for i915 presence before registering display codecs.
--- sound/soc/codecs/hda.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/hda.c +5 -0
@@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev)struct hda_codec *codec =dev_to_hda_codec (&hdev->dev);struct snd_soc_component_driver *comp_drv; +if (hda_codec_is_display (codec) && !hdev->bus->audio_component) { +dev_dbg (&hdev->dev,"no i915, skip registration for 0x%08x\n" , hdev->vendor_id); +return 0 ; + } + comp_drv =devm_kzalloc (&hdev->dev,sizeof (*comp_drv),GFP_KERNEL );if (!comp_drv)return -ENOMEM ;
Signature · 1 line
2.25.1
Re: [PATCH v2 2/4] ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
Quoted 19 lines · Cezary Rojewski
If i915 does not support given platform but the hardware i.e.: HDAudio codec is still there, the codec-probing procedure will succeed for such device but the follow up initialization will always end up with
-ENODEV.While bus could filter out address '2' which Intel's HDMI/DP codecs always enumerate on, more robust approach is to check for i915 presence before registering display codecs.
Signed-off-by Cezary Rojewski <[email protected]>--- sound/soc/codecs/hda.c | 5 +++++ 1 file changed, 5 insertions(+)sound/soc/codecs/hda.c +0
-0
sound/soc/codecs/hda.c static int hda_hdev_attach(struct hdac_device *hdev) · line 355
Quoted 6 lines
sound/soc/codecs/hda.c +3
-0@@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev)struct hda_codec *codec =dev_to_hda_codec (&hdev->dev);struct snd_soc_component_driver *comp_drv; +if (hda_codec_is_display (codec) && !hdev->bus->audio_component) { +dev_dbg (&hdev->dev,"no i915, skip registration for 0x%08x\n" , hdev->vendor_id); +return 0 ;
Should we return success here, or would it better with -ENODEV? IIUC, the code path is from the early hda_codec_driver_probe() hook, so returning an error can work.
Takashi
Re: [PATCH v2 2/4] ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
Quoted 24 lines · Takashi Iwai
Quoted 22 lines · Cezary Rojewski
If i915 does not support given platform but the hardware i.e.: HDAudio codec is still there, the codec-probing procedure will succeed for such device but the follow up initialization will always end up with
-ENODEV.While bus could filter out address '2' which Intel's HDMI/DP codecs always enumerate on, more robust approach is to check for i915 presence before registering display codecs.
Signed-off-by Cezary Rojewski <[email protected]>--- sound/soc/codecs/hda.c | 5 +++++ 1 file changed, 5 insertions(+)sound/soc/codecs/hda.c +0
-0@@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev)struct hda_codec *codec =dev_to_hda_codec (&hdev->dev);struct snd_soc_component_driver *comp_drv;
Quoted 7 lines
sound/soc/codecs/hda.c static int hda_hdev_attach(struct hdac_device *hdev) · line 355
Quoted 3 lines
sound/soc/codecs/hda.c +3
-0+if (hda_codec_is_display (codec) && !hdev->bus->audio_component) { +dev_dbg (&hdev->dev,"no i915, skip registration for 0x%08x\n" , hdev->vendor_id); +return 0 ;Should we return success here, or would it better with
-ENODEV? IIUC, the code path is from the earlyhda_codec_driver_probe()hook, so returning an error can work.
Good suggestion. Indeed attach() is called by probe() which treats -ENODEV just fine.
There is a consequence to that though. Logs from LKF show:
snd_soc_hda_codec:hda_hdev_attach: snd_hda_codec_hdmi hdaudioB0D2: no i915, skip registration for 0x80862811 snd_soc_hda_codec:hda_hdev_attach: snd_hda_codec_generic hdaudioB0D2: no i915, skip registration for 0x80862811 snd_soc_hda_codec:hda_hdev_attach: snd_hda_codec_generic hdaudioB0D2: no i915, skip registration for 0x80862811 snd_hda_codec:snd_hda_codec_configure: hdaudio hdaudioB0D2: Unable to bind the codec snd_soc_avs 0000:00:1f.3: failed to config codec -19snd_soc_avs 0000:00:1f.3: Codec #2 probe error; disabling it...
i.e.: three attempts. One for HDMI via codec_bind_module() and two from codec_bind_generic(). Situation on CNL-based is different - two logs, no error. The reason for this is lack of codec->preset in LKF case.
Should I add stub entries for ICL-HP/LKF to patch_hdmi.c to address this?
HDA_CODEC_ENTRY(0x80862810, "Icelake-P HDMI", NULL), HDA_CODEC_ENTRY(0x80862811, "Lakefield HDMI", NULL),
Czarek
Re: [PATCH v2 2/4] ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
Quoted 39 lines · Cezary Rojewski
Quoted 16 lines · Takashi Iwai
Quoted 14 lines · Cezary Rojewski
If i915 does not support given platform but the hardware i.e.: HDAudio codec is still there, the codec-probing procedure will succeed for such device but the follow up initialization will always end up with
-ENODEV.While bus could filter out address '2' which Intel's HDMI/DP codecs always enumerate on, more robust approach is to check for i915 presence before registering display codecs.
Signed-off-by Cezary Rojewski <[email protected]>--- sound/soc/codecs/hda.c | 5 +++++ 1 file changed, 5 insertions(+)Quoted 15 lines
sound/soc/codecs/hda.c static int hda_hdev_attach(struct hdac_device *hdev) · line 355
Quoted 11 lines
sound/soc/codecs/hda.c +2
-0@@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev)struct hda_codec *codec =dev_to_hda_codec (&hdev->dev);struct snd_soc_component_driver *comp_drv; + if (hda_codec_is_display(codec) && !hdev->bus->audio_component) { +dev_dbg (&hdev->dev,"no i915, skip registration for 0x%08x\n" , hdev->vendor_id); +return 0 ;Should we return success here, or would it better with
-ENODEV? IIUC, the code path is from the earlyhda_codec_driver_probe()hook, so returning an error can work.Good suggestion. Indeed
attach()is called byprobe()which treats-ENODEVjust fine.There is a consequence to that though. Logs from LKF show:
Quoted 10 lines
snd_soc_hda_codec:hda_hdev_attach:
snd_hda_codec_hdmihdaudioB0D2: no i915, skip registration for0x80862811snd_soc_hda_codec:hda_hdev_attach:snd_hda_codec_generichdaudioB0D2:
no i915, skip registration for0x80862811snd_soc_hda_codec:hda_hdev_attach:snd_hda_codec_generichdaudioB0D2:
no i915, skip registration for0x80862811snd_hda_codec:snd_hda_codec_configure: hdaudio hdaudioB0D2: Unable to bind the codecsnd_soc_avs0000:00:1f.3: failed to config codec -19snd_soc_avs0000:00:1f.3: Codec #2 probe error; disabling it...
Yeah the latter two are basically fallbacks, and I guess we can disable them for ASoC case? An additional patch like below.
thanks,
Takashi
sound/pci/hda/hda_bind.c +4 -0
@@ -279,6 +279,10 @@ static int codec_bind_generic(struct hda_codec *codec)if (codec->probe_id)return -ENODEV ; +/* no generic fallback for ASoC binding */ +if (codec->bus->core.ext_ops) +return -ENODEV ; +if (is_likely_hdmi_codec (codec)) { codec->probe_id =HDA_CODEC_ID_GENERIC_HDMI ;request_codec_module (codec);
Re: [PATCH v2 2/4] ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
Quoted 52 lines · Takashi Iwai
Quoted 39 lines · Cezary Rojewski
Quoted 16 lines · Takashi Iwai
Quoted 14 lines · Cezary Rojewski
If i915 does not support given platform but the hardware i.e.: HDAudio codec is still there, the codec-probing procedure will succeed for such device but the follow up initialization will always end up with
-ENODEV.While bus could filter out address '2' which Intel's HDMI/DP codecs always enumerate on, more robust approach is to check for i915 presence before registering display codecs.
Signed-off-by Cezary Rojewski <[email protected]>--- sound/soc/codecs/hda.c | 5 +++++ 1 file changed, 5 insertions(+)Quoted 15 lines
sound/soc/codecs/hda.c static int hda_hdev_attach(struct hdac_device *hdev) · line 355
Quoted 11 lines
sound/soc/codecs/hda.c +2
-0@@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev)struct hda_codec *codec =dev_to_hda_codec (&hdev->dev);struct snd_soc_component_driver *comp_drv; + if (hda_codec_is_display(codec) && !hdev->bus->audio_component) { +dev_dbg (&hdev->dev,"no i915, skip registration for 0x%08x\n" , hdev->vendor_id); +return 0 ;Should we return success here, or would it better with
-ENODEV? IIUC, the code path is from the earlyhda_codec_driver_probe()hook, so returning an error can work.Good suggestion. Indeed
attach()is called byprobe()which treats-ENODEVjust fine.There is a consequence to that though. Logs from LKF show:
Quoted 10 lines
snd_soc_hda_codec:hda_hdev_attach:
snd_hda_codec_hdmihdaudioB0D2: no i915, skip registration for0x80862811snd_soc_hda_codec:hda_hdev_attach:snd_hda_codec_generichdaudioB0D2:
no i915, skip registration for0x80862811snd_soc_hda_codec:hda_hdev_attach:snd_hda_codec_generichdaudioB0D2:
no i915, skip registration for0x80862811snd_hda_codec:snd_hda_codec_configure: hdaudio hdaudioB0D2: Unable to bind the codecsnd_soc_avs0000:00:1f.3: failed to config codec -19snd_soc_avs0000:00:1f.3: Codec #2 probe error; disabling it...
Quoted 2 lines
Yeah the latter two are basically fallbacks, and I guess we can disable them for ASoC case? An additional patch like below.
Thanks for feedback, Takashi. One of the design philosophies for the avs-driver is to avoid any 'if (bus->ext_ops)' statements if possible. This is to keep runtime flow of snd_hda_intel and its DSP equivalent as close as possible.
What I propose is: address the problem directly in the avs-driver by ignoring codecs for which probe_codec() returns -ENODEV. The TLDR of my previous message is: we do not want to do any kind of recovery e.g.: HDAudio controller reset if there is no supporting driver for given codec. Will sent a separate patch as part of v3.
Quoted 13 lines
sound/pci/hda/hda_bind.c +4
-0@@ -279,6 +279,10 @@ static int codec_bind_generic(struct hda_codec *codec)if (codec->probe_id)return -ENODEV ; +/* no generic fallback for ASoC binding */ +if (codec->bus->core.ext_ops) +return -ENODEV ; +if (is_likely_hdmi_codec (codec)) { codec->probe_id =HDA_CODEC_ID_GENERIC_HDMI ;request_codec_module (codec);
PATCH v2 3/4 ASoC: codecs: hda: Cleanup error messages
In reply to Cezary RojewskiBe cohesive and use same pattern in each error message.
--- sound/soc/codecs/hda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/hda.c +5 -5
@@ -198,19 +198,19 @@ static int hda_codec_probe(struct snd_soc_component *component) ret =snd_hda_codec_device_new (codec->bus, component->card->snd_card, hdev->addr, codec, false);if (ret <0 ) { -dev_err (&hdev->dev,"create hda codec failed: %d\n" , ret); +dev_err (&hdev->dev,"codec create failed: %d\n" , ret); goto device_new_err; } ret =snd_hda_codec_set_name (codec, codec->preset->name);if (ret <0 ) { -dev_err (&hdev->dev,"name failed %s\n" , codec->preset->name); +dev_err (&hdev->dev,"set name: %s failed: %d\n" , codec->preset->name, ret); goto err; } ret =snd_hdac_regmap_init (&codec->core);if (ret <0 ) { -dev_err (&hdev->dev,"regmap init failed\n" ); +dev_err (&hdev->dev,"regmap init failed: %d\n" , ret); goto err; }
@@ -223,13 +223,13 @@ static int hda_codec_probe(struct snd_soc_component *component) ret =patch (codec);if (ret <0 ) { -dev_err (&hdev->dev,"patch failed %d\n" , ret); +dev_err (&hdev->dev,"codec init failed: %d\n" , ret); goto err; } ret =snd_hda_codec_parse_pcms (codec);if (ret <0 ) { -dev_err (&hdev->dev,"unable to map pcms to dai %d\n" , ret); +dev_err (&hdev->dev,"unable to map pcms to dai: %d\n" , ret); goto parse_pcms_err; }
Signature · 1 line
2.25.1
PATCH v2 4/4 ALSA: hda: Reuse for_each_pcm_streams()
In reply to Cezary RojewskiUse the macro to improve readability.
--- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_codec.c +1 -1
@@ -3313,7 +3313,7 @@ int snd_hda_codec_parse_pcms(struct hda_codec *codec)list_for_each_entry (cpcm, &codec->pcm_list_head, list) {int stream; -for (stream =0 ; stream <2 ; stream++) { +for_each_pcm_streams (stream) {struct hda_pcm_stream *info = &cpcm->stream[stream];if (!info->substreams)
Signature · 1 line
2.25.1
Patchwork
CI✗ Fi.CI.BAT: failure for ALSA/ASoC: Conditionally skip i915 init and cleanups (rev2)
In reply to Cezary Rojewski== Series Details ==
== Series Details ==
Series: ALSA/ASoC: Conditionally skip i915 init and cleanups (rev2)
URL : https://patchwork.freedesktop.org/series/130271/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_14325 -> Patchwork_130271v2
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_130271v2 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_130271v2, please notify your bug team ([email protected]) to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130271v2/index.html
Participating hosts (36 -> 35)
------------------------------
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_130271v2:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_fence@basic-busy@vcs1:
- bat-arls-1: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14325/bat-arls-1/igt@gem_exec_fence@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130271v2/bat-arls-1/igt@gem_exec_fence@[email protected]
Known issues
------------
Here are the changes found in Patchwork_130271v2 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_exec_create@basic@smem:
- bat-arls-1: [DMESG-WARN][3] ([i915#10194]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14325/bat-arls-1/igt@gem_exec_create@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130271v2/bat-arls-1/igt@gem_exec_create@[email protected]
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [ABORT][5] ([i915#7911]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14325/fi-bsw-nick/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130271v2/fi-bsw-nick/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#10194]: https://gitlab.freedesktop.org/drm/intel/issues/10194
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
Build changes
-------------
* Linux: CI_DRM_14325 -> Patchwork_130271v2
CI-20190529: 20190529
CI_DRM_14325: 115d0ed85f58e87d2d7a057426350fec5b217cc9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7728: 7728
Patchwork_130271v2: 115d0ed85f58e87d2d7a057426350fec5b217cc9 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
0b83f358f4bf ALSA: hda: Reuse for_each_pcm_streams() aa841f78b78e ASoC: codecs: hda: Cleanup error messages 8c5caf70cad5 ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing 710017466247 ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130271v2/index.html
Quoted 22 lines · Cezary Rojewski
A small set of changes to improve initialization of the audio stack on HDAudio devices and pair of cleanups.
As the first change is the most important one here, following is the technical background for it:
Commit
78f613ba1efb("drm/i915: finish removal of CNL") and its friends removed support for i915 for all CNL-based platforms. HDAudio library, however, still treats such platforms as valid candidates for i915 binding. Update query mechanism to reflect changes made in drm tree.At the same time, i915 support for LKF-based platforms has not been provided so remove them from valid binding candidates.
The
snd_soc_hdachange is a follow up for the above and the cleanup patches do not bring any functional changes.Changes in v2:
- list of problematic VGA devices is now declared locally, no more touching drm stuff
Quoted 5 lines
Cezary Rojewski (4):
ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms
ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
ASoC: codecs: hda: Cleanup error messages
ALSA: hda: Reusefor_each_pcm_streams()
As far as I see, all those 4 patches are rather individually applicable, right?
The essential change is the first patch, and the patch 2 is rather an improvement (the driver gives -ENODEV as of now).
And the rest two are merely cleanups.
Takashi