Patch "ALSA: hda - disable dynamic clock gating on Broxton before reset" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ALSA: hda - disable dynamic clock gating on Broxton before reset
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-hda-disable-dynamic-clock-gating-on-broxton-before-reset.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6639484ddaf6707b41082c9fa9ca9af342df6402Mon Sep 17 00:00:00 2001
From: Libin Yang <[email protected]>
Date: Fri, 29 Jan 2016 20:39:09 +0800
Subject: ALSA: hda - disable dynamic clock gating on Broxton before reset
From: Libin Yang <[email protected]>
commit 6639484ddaf6707b41082c9fa9ca9af342df6402 upstream.
On Broxton, to make sure the reset controller works properly, MISCBDCGE bit (bit 6) in CGCTL (0x48) of PCI configuration space need be cleared before reset and set back to 1 after reset. Otherwise, it may prevent the CORB/RIRB logic from being reset.
--- sound/pci/hda/hda_intel.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/pci/hda/hda_intel.c +13 -0
@@ -90,6 +90,8 @@ enum {#define NVIDIA_HDA_ENABLE_COHBIT 0x01/* Defines for Intel SCH HDA snoop control */ +#define INTEL_HDA_CGCTL 0x48 +#define INTEL_HDA_CGCTL_MISCBDCGE (0x1 << 6)#define INTEL_SCH_HDA_DEVC 0x78#define INTEL_SCH_HDA_DEVC_NOSNOOP (0x1<<11)
@@ -528,10 +530,21 @@ static void hda_intel_init_chip(struct a {struct hdac_bus *bus =azx_bus (chip);struct pci_dev *pci = chip->pci; +u32 val;if (chip->driver_caps &AZX_DCAPS_I915_POWERWELL )snd_hdac_set_codec_wakeup (bus, true); +if (IS_BROXTON (pci)) { +pci_read_config_dword (pci,INTEL_HDA_CGCTL , &val); + val = val & ~INTEL_HDA_CGCTL_MISCBDCGE ; +pci_write_config_dword (pci,INTEL_HDA_CGCTL , val); + }azx_init_chip (chip, full_reset); +if (IS_BROXTON (pci)) { +pci_read_config_dword (pci,INTEL_HDA_CGCTL , &val); + val = val |INTEL_HDA_CGCTL_MISCBDCGE ; +pci_write_config_dword (pci,INTEL_HDA_CGCTL , val); + }if (chip->driver_caps &AZX_DCAPS_I915_POWERWELL )snd_hdac_set_codec_wakeup (bus, false);
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/alsa-hda-disable-dynamic-clock-gating-on-broxton-before-reset.patch