samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: bolero: Add core_vote before gfmux access

Browse Source 
GFMUX access happen during WSA macro usecase.
Update wsa macro to do core_vote before clock
request.

Change-Id: I8f7eb67b87845016b54c9873a6fc230d207262f7
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
This commit is contained in:
Vatsal Bucha
2021-03-08 15:53:34 +05:30
committed by Gerrit - the friendly Code Review server
parent fbfd93a2dc
commit a5ca4621d9
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
asoc/codecs/lpass-cdc/lpass-cdc-va-macro.c
View File

@@ -61,6 +61,7 @@ static int va_tx_unmute_delay = LPASS_CDC_VA_TX_DMIC_UNMUTE_DELAY_MS;
module_param(va_tx_unmute_delay, int, 0664); module_param(va_tx_unmute_delay, int, 0664);
MODULE_PARM_DESC(va_tx_unmute_delay, "delay to unmute the tx path"); MODULE_PARM_DESC(va_tx_unmute_delay, "delay to unmute the tx path");
static int lpass_cdc_va_macro_core_vote(void *handle, bool enable);
enum { enum {
LPASS_CDC_VA_MACRO_AIF_INVALID = 0, LPASS_CDC_VA_MACRO_AIF_INVALID = 0,
LPASS_CDC_VA_MACRO_AIF1_CAP, LPASS_CDC_VA_MACRO_AIF1_CAP,
@@ -299,6 +300,7 @@ static int lpass_cdc_va_macro_event_handler(struct snd_soc_component *component,
break; break;
case LPASS_CDC_MACRO_EVT_PRE_SSR_UP: case LPASS_CDC_MACRO_EVT_PRE_SSR_UP:
/* enable&disable VA_CORE_CLK to reset GFMUX reg */ /* enable&disable VA_CORE_CLK to reset GFMUX reg */
lpass_cdc_va_macro_core_vote(va_priv, true);
ret = lpass_cdc_clk_rsc_request_clock(va_priv->dev, ret = lpass_cdc_clk_rsc_request_clock(va_priv->dev,
va_priv->default_clk_id, va_priv->default_clk_id,
VA_CORE_CLK, true); VA_CORE_CLK, true);
@@ -310,6 +312,7 @@ static int lpass_cdc_va_macro_event_handler(struct snd_soc_component *component,
lpass_cdc_clk_rsc_request_clock(va_priv->dev, lpass_cdc_clk_rsc_request_clock(va_priv->dev,
va_priv->default_clk_id, va_priv->default_clk_id,
VA_CORE_CLK, false); VA_CORE_CLK, false);
lpass_cdc_va_macro_core_vote(va_priv, false);
break; break;
case LPASS_CDC_MACRO_EVT_SSR_UP: case LPASS_CDC_MACRO_EVT_SSR_UP:
trace_printk("%s, enter SSR up\n", __func__); trace_printk("%s, enter SSR up\n", __func__);

3
asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c
View File

@@ -177,6 +177,7 @@ static struct interp_sample_rate int_mix_sample_rate_val[] = {
#define LPASS_CDC_WSA_MACRO_SWR_STRING_LEN 80 #define LPASS_CDC_WSA_MACRO_SWR_STRING_LEN 80
static int lpass_cdc_wsa_macro_core_vote(void *handle, bool enable);
static int lpass_cdc_wsa_macro_hw_params(struct snd_pcm_substream *substream, static int lpass_cdc_wsa_macro_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
@@ -960,6 +961,7 @@ static int lpass_cdc_wsa_macro_event_handler(struct snd_soc_component *component
break; break;
case LPASS_CDC_MACRO_EVT_PRE_SSR_UP: case LPASS_CDC_MACRO_EVT_PRE_SSR_UP:
/* enable&disable WSA_CORE_CLK to reset GFMUX reg */ /* enable&disable WSA_CORE_CLK to reset GFMUX reg */
lpass_cdc_wsa_macro_core_vote(wsa_priv, true);
ret = lpass_cdc_clk_rsc_request_clock(wsa_priv->dev, ret = lpass_cdc_clk_rsc_request_clock(wsa_priv->dev,
wsa_priv->default_clk_id, wsa_priv->default_clk_id,
WSA_CORE_CLK, true); WSA_CORE_CLK, true);
@@ -971,6 +973,7 @@ static int lpass_cdc_wsa_macro_event_handler(struct snd_soc_component *component
lpass_cdc_clk_rsc_request_clock(wsa_priv->dev, lpass_cdc_clk_rsc_request_clock(wsa_priv->dev,
wsa_priv->default_clk_id, wsa_priv->default_clk_id,
WSA_CORE_CLK, false); WSA_CORE_CLK, false);
lpass_cdc_wsa_macro_core_vote(wsa_priv, false);
break; break;
case LPASS_CDC_MACRO_EVT_SSR_UP: case LPASS_CDC_MACRO_EVT_SSR_UP:
trace_printk("%s, enter SSR up\n", __func__); trace_printk("%s, enter SSR up\n", __func__);

15
asoc/codecs/lpass-cdc/lpass-cdc-wsa2-macro.c
View File

@@ -177,6 +177,7 @@ static struct interp_sample_rate int_mix_sample_rate_val[] = {
#define LPASS_CDC_WSA2_MACRO_SWR_STRING_LEN 80 #define LPASS_CDC_WSA2_MACRO_SWR_STRING_LEN 80
static int lpass_cdc_wsa2_macro_core_vote(void *handle, bool enable);
static int lpass_cdc_wsa2_macro_hw_params(struct snd_pcm_substream *substream, static int lpass_cdc_wsa2_macro_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
@@ -957,6 +958,7 @@ static int lpass_cdc_wsa2_macro_event_handler(struct snd_soc_component *componen
break; break;
case LPASS_CDC_MACRO_EVT_PRE_SSR_UP: case LPASS_CDC_MACRO_EVT_PRE_SSR_UP:
/* enable&disable WSA_CORE_CLK to reset GFMUX reg */ /* enable&disable WSA_CORE_CLK to reset GFMUX reg */
lpass_cdc_wsa2_macro_core_vote(wsa2_priv, true);
ret = lpass_cdc_clk_rsc_request_clock(wsa2_priv->dev, ret = lpass_cdc_clk_rsc_request_clock(wsa2_priv->dev,
wsa2_priv->default_clk_id, wsa2_priv->default_clk_id,
WSA_CORE_CLK, true); WSA_CORE_CLK, true);
@@ -968,6 +970,7 @@ static int lpass_cdc_wsa2_macro_event_handler(struct snd_soc_component *componen
lpass_cdc_clk_rsc_request_clock(wsa2_priv->dev, lpass_cdc_clk_rsc_request_clock(wsa2_priv->dev,
wsa2_priv->default_clk_id, wsa2_priv->default_clk_id,
WSA_CORE_CLK, false); WSA_CORE_CLK, false);
lpass_cdc_wsa2_macro_core_vote(wsa2_priv, true);
break; break;
case LPASS_CDC_MACRO_EVT_SSR_UP: case LPASS_CDC_MACRO_EVT_SSR_UP:
trace_printk("%s, enter SSR up\n", __func__); trace_printk("%s, enter SSR up\n", __func__);
@@ -2601,6 +2604,7 @@ static void lpass_cdc_wsa2_macro_init_reg(struct snd_soc_component *component)
static int lpass_cdc_wsa2_macro_core_vote(void *handle, bool enable) static int lpass_cdc_wsa2_macro_core_vote(void *handle, bool enable)
{ {
int rc = 0;
struct lpass_cdc_wsa2_macro_priv *wsa2_priv = (struct lpass_cdc_wsa2_macro_priv *) handle; struct lpass_cdc_wsa2_macro_priv *wsa2_priv = (struct lpass_cdc_wsa2_macro_priv *) handle;
if (wsa2_priv == NULL) { if (wsa2_priv == NULL) {
@@ -2609,14 +2613,15 @@ static int lpass_cdc_wsa2_macro_core_vote(void *handle, bool enable)
} }
if (enable) { if (enable) {
pm_runtime_get_sync(wsa2_priv->dev); pm_runtime_get_sync(wsa2_priv->dev);
if (lpass_cdc_check_core_votes(wsa2_priv->dev))
rc = 0;
else
rc = -ENOTSYNC;
} else {
pm_runtime_put_autosuspend(wsa2_priv->dev); pm_runtime_put_autosuspend(wsa2_priv->dev);
pm_runtime_mark_last_busy(wsa2_priv->dev); pm_runtime_mark_last_busy(wsa2_priv->dev);
} }
return rc;
if (lpass_cdc_check_core_votes(wsa2_priv->dev))
return 0;
else
return -EINVAL;
} }
static int wsa2_swrm_clock(void *handle, bool enable) static int wsa2_swrm_clock(void *handle, bool enable)