ALSA: hda - add more ML register definitions
PATCH v2 1/2 ALSA: hda - add more ML register definitions
From: Libin Yang <[email protected]>
This patch refines the definition of AZX_MLCTL_SPA and AZX_MLCTL_CPA and add more definitions of ML registers
--- include/sound/hda_register.h | 8 +++++--- sound/hda/ext/hdac_ext_controller.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-)
include/sound/hda_register.h +5 -3
@@ -243,9 +243,11 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };#define AZX_REG_ML_LOUTPAY 0x20#define AZX_REG_ML_LINPAY 0x30 -#define AZX_MLCTL_SPA (1<<16) -#define AZX_MLCTL_CPA 23 - +#define ML_LCTL_SCF_MASK 0xF +#define AZX_MLCTL_SPA (0x1 << 16) +#define AZX_MLCTL_CPA (0x1 << 23) +#define AZX_MLCTL_SPA_SHIFT 16 +#define AZX_MLCTL_CPA_SHIFT 23/* registers for DMA Resume Capability Structure */ #define AZX_DRSM_CAP_ID 0x5
sound/hda/ext/hdac_ext_controller.c +3 -3
@@ -171,7 +171,7 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable) {int timeout;u32 val; -int mask = (1 <<AZX_MLCTL_CPA ); +int mask = (1 <<AZX_MLCTL_CPA_SHIFT );udelay (3 ); timeout =150 ;
@@ -179,10 +179,10 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable) do { val = readl(link->ml_addr + AZX_REG_ML_LCTL); if (enable) { - if (((val & mask) >> AZX_MLCTL_CPA)) + if (((val & mask) >> AZX_MLCTL_CPA_SHIFT)) return 0; } else { - if (!((val & mask) >> AZX_MLCTL_CPA)) + if (!((val & mask) >> AZX_MLCTL_CPA_SHIFT)) return 0; } udelay(3);
Signature · 1 line
2.7.4
PATCH v2 2/2 ALSA: hda - set intel audio clock to a proper value
From: Libin Yang <[email protected]>
On some Intel platforms, the audio clock may not be set correctly with initial setting. This will cause the audio playback/capture rates wrong.
This patch checks the audio clock setting and will set it to a proper value if it is set incorrectly.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188411
--- sound/pci/hda/hda_intel.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)
sound/pci/hda/hda_intel.c +95 -0
@@ -539,6 +539,98 @@ static void bxt_reduce_dma_latency(struct azx *chip)azx_writel (chip,SKL_EM4L , val); } +/* +* ML_LCAP bits: +* bit 0: 6 MHz Supported +* bit 1: 12 MHz Supported +* bit 2: 24 MHz Supported +* bit 3: 48 MHz Supported +* bit 4: 96 MHz Supported +* bit 5: 192 MHz Supported +*/ +static int intel_get_lctl_scf (struct azx *chip) +{ +struct hdac_bus *bus =azx_bus (chip); +static int preferred_bits[] = {2 ,3 ,1 ,4 ,5 }; +u32 val, t; +int i; + + val =readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCAP ); + +for (i =0 ; i <ARRAY_SIZE (preferred_bits); i++) { + t = preferred_bits[i]; +if (val & (1 << t)) +return t; + } + +dev_warn (chip->card->dev,"set audio clock frequency to 6MHz" ); +return 0 ; +} + +static int intel_ml_lctl_set_power (struct azx *chip,int state) +{ +struct hdac_bus *bus =azx_bus (chip); +u32 val; +int timeout; + +/* +* the codecs are sharing the first link setting by default +* If other links are enabled for stream, they need similar fix +*/ + val =readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); + val &= ~AZX_MLCTL_SPA ; + val |= state <<AZX_MLCTL_SPA_SHIFT ; +writel (val, bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); +/* wait for CPA */ + timeout =50 ; +while (timeout) { +if (((readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL )) & +AZX_MLCTL_CPA ) == (state <<AZX_MLCTL_CPA_SHIFT )) +return 0 ; + timeout--; +udelay (10 ); + } + +return -1 ; +} + +static void intel_init_lctl (struct azx *chip) +{ +struct hdac_bus *bus =azx_bus (chip); +u32 val; +int ret; + +/* 0. check lctl register value is correct or not */ + val =readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); +/* if SCF is already set, let's use it */ +if ((val &ML_LCTL_SCF_MASK ) !=0 ) +return ; + +/* +* Before operating on SPA, CPA must match SPA. +* Any deviation may result in undefined behavior. +*/ +if (((val &AZX_MLCTL_SPA ) >>AZX_MLCTL_SPA_SHIFT ) != + ((val &AZX_MLCTL_CPA ) >>AZX_MLCTL_CPA_SHIFT )) +return ; + +/* 1. turn link down: set SPA to 0 and wait CPA to 0 */ + ret =intel_ml_lctl_set_power (chip,0 ); +udelay (100 ); +if (ret) + goto set_spa; + +/* 2. update SCF to select a properly audio clock*/ + val &= ~ML_LCTL_SCF_MASK ; + val |=intel_get_lctl_scf (chip); +writel (val, bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); + +set_spa: +/* 4. turn link up: set SPA to 1 and wait CPA to 1 */ +intel_ml_lctl_set_power (chip,1 ); +udelay (100 ); +} +static void hda_intel_init_chip (struct azx *chip,bool full_reset) {struct hdac_bus *bus =azx_bus (chip);
@@ -564,6 +656,9 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset)/* reduce dma latency to avoid noise */ if (IS_BXT (pci))bxt_reduce_dma_latency (chip); + +if (bus->mlcap !=NULL ) +intel_init_lctl (chip); }/* calculate runtime delay from LPIB */
Signature · 1 line
2.7.4
Takashi Iwai
AppliedQuoted 7 lines · On Thu, 06 Apr 2017 13:18:20 +0200, [email protected] wrote:
From: Libin Yang <[email protected]>
This patch refines the definition of
AZX_MLCTL_SPAandAZX_MLCTL_CPAand add more definitions of ML registersSigned-off-by Libin Yang <[email protected]>
Applied, thanks.
Takashi
Quoted 53 lines
--- include/sound/hda_register.h | 8 +++++--- sound/hda/ext/hdac_ext_controller.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-)include/sound/hda_register.h +5
-3@@ -243,9 +243,11 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };#define AZX_REG_ML_LOUTPAY 0x20#define AZX_REG_ML_LINPAY 0x30 -#define AZX_MLCTL_SPA (1<<16) -#define AZX_MLCTL_CPA 23 - +#define ML_LCTL_SCF_MASK 0xF +#define AZX_MLCTL_SPA (0x1 << 16) +#define AZX_MLCTL_CPA (0x1 << 23) +#define AZX_MLCTL_SPA_SHIFT 16 +#define AZX_MLCTL_CPA_SHIFT 23/* registers for DMA Resume Capability Structure */ #define AZX_DRSM_CAP_ID 0x5sound/hda/ext/hdac_ext_controller.c +3
-3@@ -171,7 +171,7 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable) {int timeout;u32 val; -int mask = (1 <<AZX_MLCTL_CPA ); +int mask = (1 <<AZX_MLCTL_CPA_SHIFT );udelay (3 ); timeout =150 ;@@ -179,10 +179,10 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable) do { val = readl(link->ml_addr + AZX_REG_ML_LCTL); if (enable) { - if (((val & mask) >> AZX_MLCTL_CPA)) + if (((val & mask) >> AZX_MLCTL_CPA_SHIFT)) return 0; } else { - if (!((val & mask) >> AZX_MLCTL_CPA)) + if (!((val & mask) >> AZX_MLCTL_CPA_SHIFT)) return 0; } udelay(3);Signature · 1 line
2.7.4
Takashi Iwai
AppliedRe: [PATCH 2/2 v2] ALSA: hda - set intel audio clock to a proper value
In reply to [email protected]Quoted 7 lines · On Thu, 06 Apr 2017 13:18:21 +0200, [email protected] wrote:
From: Libin Yang <[email protected]>
On some Intel platforms, the audio clock may not be set correctly with initial setting. This will cause the audio playback/capture rates wrong.
Quoted 6 lines
This patch checks the audio clock setting and will set it to a proper value if it is set incorrectly.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188411
Signed-off-by Libin Yang <[email protected]>
Applied, thanks.
Takashi
Quoted 120 lines
--- sound/pci/hda/hda_intel.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)sound/pci/hda/hda_intel.c +95
-0@@ -539,6 +539,98 @@ static void bxt_reduce_dma_latency(struct azx *chip)azx_writel (chip,SKL_EM4L , val); } +/* +* ML_LCAP bits: +* bit 0: 6 MHz Supported +* bit 1: 12 MHz Supported +* bit 2: 24 MHz Supported +* bit 3: 48 MHz Supported +* bit 4: 96 MHz Supported +* bit 5: 192 MHz Supported +*/ +static int intel_get_lctl_scf (struct azx *chip) +{ +struct hdac_bus *bus =azx_bus (chip); +static int preferred_bits[] = {2 ,3 ,1 ,4 ,5 }; +u32 val, t; +int i; + + val =readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCAP ); + +for (i =0 ; i <ARRAY_SIZE (preferred_bits); i++) { + t = preferred_bits[i]; +if (val & (1 << t)) +return t; + } + +dev_warn (chip->card->dev,"set audio clock frequency to 6MHz" ); +return 0 ; +} + +static int intel_ml_lctl_set_power (struct azx *chip,int state) +{ +struct hdac_bus *bus =azx_bus (chip); +u32 val; +int timeout; + +/* +* the codecs are sharing the first link setting by default +* If other links are enabled for stream, they need similar fix +*/ + val =readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); + val &= ~AZX_MLCTL_SPA ; + val |= state <<AZX_MLCTL_SPA_SHIFT ; +writel (val, bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); +/* wait for CPA */ + timeout =50 ; +while (timeout) { +if (((readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL )) & +AZX_MLCTL_CPA ) == (state <<AZX_MLCTL_CPA_SHIFT )) +return 0 ; + timeout--; +udelay (10 ); + } + +return -1 ; +} + +static void intel_init_lctl (struct azx *chip) +{ +struct hdac_bus *bus =azx_bus (chip); +u32 val; +int ret; + +/* 0. check lctl register value is correct or not */ + val =readl (bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); +/* if SCF is already set, let's use it */ +if ((val &ML_LCTL_SCF_MASK ) !=0 ) +return ; + +/* +* Before operating on SPA, CPA must match SPA. +* Any deviation may result in undefined behavior. +*/ +if (((val &AZX_MLCTL_SPA ) >>AZX_MLCTL_SPA_SHIFT ) != + ((val &AZX_MLCTL_CPA ) >>AZX_MLCTL_CPA_SHIFT )) +return ; + +/* 1. turn link down: set SPA to 0 and wait CPA to 0 */ + ret =intel_ml_lctl_set_power (chip,0 ); +udelay (100 ); +if (ret) + goto set_spa; + +/* 2. update SCF to select a properly audio clock*/ + val &= ~ML_LCTL_SCF_MASK ; + val |=intel_get_lctl_scf (chip); +writel (val, bus->mlcap +AZX_ML_BASE +AZX_REG_ML_LCTL ); + +set_spa: +/* 4. turn link up: set SPA to 1 and wait CPA to 1 */ +intel_ml_lctl_set_power (chip,1 ); +udelay (100 ); +} +static void hda_intel_init_chip (struct azx *chip,bool full_reset) {struct hdac_bus *bus =azx_bus (chip);@@ -564,6 +656,9 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset)/* reduce dma latency to avoid noise */ if (IS_BXT (pci))bxt_reduce_dma_latency (chip); + +if (bus->mlcap !=NULL ) +intel_init_lctl (chip); }/* calculate runtime delay from LPIB */ Signature · 1 line
2.7.4