linux-kernel - Re: intel hda regression: 2.6.33-rc{1,2}: hd-audio0 eats 25% CPU (according to top)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 25 Dec 2009 20:01:46 +0100
From:	Maciej Rutecki <maciej.rutecki@...il.com>
To:	Takashi Iwai <tiwai@...e.de>
Cc:	Sergei Trofimovich <slyich@...il.com>,
	linux-kernel@...r.kernel.org,
	Éric Piel <eric.piel@...mplin-utc.net>
Subject: Re: intel hda regression: 2.6.33-rc{1,2}: hd-audio0 eats 25% CPU 
	(according to top)

2009/12/25 Takashi Iwai <tiwai@...e.de>:

> diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
> index 950ee5c..f98b47c 100644
> --- a/sound/pci/hda/hda_codec.c
> +++ b/sound/pci/hda/hda_codec.c
> @@ -1327,11 +1327,13 @@ EXPORT_SYMBOL_HDA(snd_hda_query_pin_caps);
>  */
>  u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
>  {
> -       u32 pincap = snd_hda_query_pin_caps(codec, nid);
> -
> -       if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */
> -               snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);
> +       u32 pincap;
>
> +       if (!codec->no_trigger_sense) {
> +               pincap = snd_hda_query_pin_caps(codec, nid);
> +               if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */
> +                       snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);
> +       }
>        return snd_hda_codec_read(codec, nid, 0,
>                                  AC_VERB_GET_PIN_SENSE, 0);
>  }
> diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
> index 1d541b7..0a770a2 100644
> --- a/sound/pci/hda/hda_codec.h
> +++ b/sound/pci/hda/hda_codec.h
> @@ -817,6 +817,7 @@ struct hda_codec {
>        unsigned int pin_amp_workaround:1; /* pin out-amp takes index
>                                            * (e.g. Conexant codecs)
>                                            */
> +       unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */
>  #ifdef CONFIG_SND_HDA_POWER_SAVE
>        unsigned int power_on :1;       /* current (global) power-state */
>        unsigned int power_transition :1; /* power-state in transition */
> diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
> index 1a36137..69a941c 100644
> --- a/sound/pci/hda/patch_analog.c
> +++ b/sound/pci/hda/patch_analog.c
> @@ -1186,6 +1186,8 @@ static int patch_ad1986a(struct hda_codec *codec)
>         */
>        spec->multiout.no_share_stream = 1;
>
> +       codec->no_trigger_sense = 1;
> +
>        return 0;
>  }
>
> @@ -1371,6 +1373,8 @@ static int patch_ad1983(struct hda_codec *codec)
>
>        codec->patch_ops = ad198x_patch_ops;
>
> +       codec->no_trigger_sense = 1;
> +
>        return 0;
>  }
>
> @@ -1813,6 +1817,9 @@ static int patch_ad1981(struct hda_codec *codec)
>                codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
>                break;
>        }
> +
> +       codec->no_trigger_sense = 1;
> +
>        return 0;
>  }
>
> @@ -3118,6 +3125,8 @@ static int patch_ad1988(struct hda_codec *codec)
>  #endif
>        spec->vmaster_nid = 0x04;
>
> +       codec->no_trigger_sense = 1;
> +
>        return 0;
>  }
>
> @@ -3330,6 +3339,8 @@ static int patch_ad1884(struct hda_codec *codec)
>
>        codec->patch_ops = ad198x_patch_ops;
>
> +       codec->no_trigger_sense = 1;
> +
>        return 0;
>  }
>
> @@ -4287,6 +4298,8 @@ static int patch_ad1884a(struct hda_codec *codec)
>                break;
>        }
>
> +       codec->no_trigger_sense = 1;
> +
>        return 0;
>  }
>
> @@ -4623,6 +4636,9 @@ static int patch_ad1882(struct hda_codec *codec)
>                spec->mixers[2] = ad1882_6stack_mixers;
>                break;
>        }
> +
> +       codec->no_trigger_sense = 1;
> +
>        return 0;
>  }
>
>
Patch solves the problem.

Tested-by Maciej Rutecki <maciej.rutecki@...il.com>

Thanks!
-- 
Maciej Rutecki
http://www.maciek.unixy.pl
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/