[4/6] ASoC: wm5110: Add support for audio trace firmware

Commit Message

Charles Keepax Jan. 21, 2016, 5:53 p.m. UTC

Mainly this adds DAI links for the audio trace, however, it is also
necessary to update the data IRQ handler to check more cores. We have
the handler check every core so it should not be necessary to update
this function if more compressed firmwares are added in the future.

Signed-off-by: Charles Keepax <[e-mail]>
---
 sound/soc/codecs/arizona.h |  2 +-
 sound/soc/codecs/wm5110.c  | 43 +++++++++++++++++++++++++++++++++++++++----
 sound/soc/codecs/wm_adsp.c |  1 -
 3 files changed, 40 insertions(+), 6 deletions(-)

Comments

Mark Brown Jan. 28, 2016, 11:34 p.m. UTC | #1

On Thu, Jan 21, 2016 at 05:53:00PM +0000, Charles Keepax wrote:

> @@ -2163,6 +2187,8 @@ static int wm5110_open(struct snd_compr_stream *stream)
>  
>  	if (strcmp(rtd->codec_dai->name, "wm5110-dsp-voicectrl") == 0) {
>  		n_adsp = 2;
> +	} else if (strcmp(rtd->codec_dai->name, "wm5110-dsp-trace") == 0) {
> +		n_adsp = 0;
>  	} else {
>  		dev_err(arizona->dev,
>  			"No suitable compressed stream for DAI '%s'\n",

I'm a bit unclear on how exactly we're ensuring that the relevant
firmware is loaded?

Charles Keepax Jan. 29, 2016, 10:14 a.m. UTC | #2

On Fri, Jan 29, 2016 at 12:34:22AM +0100, Mark Brown wrote:
> On Thu, Jan 21, 2016 at 05:53:00PM +0000, Charles Keepax wrote:
> 
> > @@ -2163,6 +2187,8 @@ static int wm5110_open(struct snd_compr_stream *stream)
> >  
> >  	if (strcmp(rtd->codec_dai->name, "wm5110-dsp-voicectrl") == 0) {
> >  		n_adsp = 2;
> > +	} else if (strcmp(rtd->codec_dai->name, "wm5110-dsp-trace") == 0) {
> > +		n_adsp = 0;
> >  	} else {
> >  		dev_err(arizona->dev,
> >  			"No suitable compressed stream for DAI '%s'\n",
> 
> I'm a bit unclear on how exactly we're ensuring that the relevant
> firmware is loaded?

So this code is basically just working out which DSP core we
should be opening (at the moment this is fixed a DAI coresponds
to a particular DSP core). At the bottom of the function we call
wm_adsp_compr_open which will check that the firmware supports
compressed operation in the correct direction and will lock out
changes of firmware until compr_free is called.

Thanks,
Charles

Patch

diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 8b6adb5..0c64a57 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -57,7 +57,7 @@ 
 #define ARIZONA_CLK_98MHZ  5
 #define ARIZONA_CLK_147MHZ 6
 
-#define ARIZONA_MAX_DAI  8
+#define ARIZONA_MAX_DAI  10
 #define ARIZONA_MAX_ADSP 4
 
 #define ARIZONA_DVFS_SR1_RQ	0x001
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 83760b7..31e48b6 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -1809,6 +1809,9 @@  static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
 	{ "Voice Control DSP", NULL, "DSP3" },
 	{ "Voice Control DSP", NULL, "SYSCLK" },
 
+	{ "Audio Trace DSP", NULL, "DSP1" },
+	{ "Audio Trace DSP", NULL, "SYSCLK" },
+
 	{ "IN1L PGA", NULL, "IN1L" },
 	{ "IN1R PGA", NULL, "IN1R" },
 
@@ -2152,6 +2155,27 @@  static struct snd_soc_dai_driver wm5110_dai[] = {
 			.formats = WM5110_FORMATS,
 		},
 	},
+	{
+		.name = "wm5110-cpu-trace",
+		.capture = {
+			.stream_name = "Audio Trace CPU",
+			.channels_min = 1,
+			.channels_max = 6,
+			.rates = WM5110_RATES,
+			.formats = WM5110_FORMATS,
+		},
+		.compress_new = snd_soc_new_compress,
+	},
+	{
+		.name = "wm5110-dsp-trace",
+		.capture = {
+			.stream_name = "Audio Trace DSP",
+			.channels_min = 1,
+			.channels_max = 6,
+			.rates = WM5110_RATES,
+			.formats = WM5110_FORMATS,
+		},
+	},
 };
 
 static int wm5110_open(struct snd_compr_stream *stream)
@@ -2163,6 +2187,8 @@  static int wm5110_open(struct snd_compr_stream *stream)
 
 	if (strcmp(rtd->codec_dai->name, "wm5110-dsp-voicectrl") == 0) {
 		n_adsp = 2;
+	} else if (strcmp(rtd->codec_dai->name, "wm5110-dsp-trace") == 0) {
+		n_adsp = 0;
 	} else {
 		dev_err(arizona->dev,
 			"No suitable compressed stream for DAI '%s'\n",
@@ -2175,12 +2201,21 @@  static int wm5110_open(struct snd_compr_stream *stream)
 
 static irqreturn_t wm5110_adsp2_irq(int irq, void *data)
 {
-	struct wm5110_priv *florida = data;
-	int ret;
+	struct wm5110_priv *priv = data;
+	struct arizona *arizona = priv->core.arizona;
+	int serviced = 0;
+	int i, ret;
+
+	for (i = 0; i < WM5110_NUM_ADSP; ++i) {
+		ret = wm_adsp_compr_handle_irq(&priv->core.adsp[i]);
+		if (ret != -ENODEV)
+			serviced++;
+	}
 
-	ret = wm_adsp_compr_handle_irq(&florida->core.adsp[2]);
-	if (ret == -ENODEV)
+	if (!serviced) {
+		dev_err(arizona->dev, "Spurious compressed data IRQ\n");
 		return IRQ_NONE;
+	}
 
 	return IRQ_HANDLED;
 }
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index a81f568..369e8f5 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2833,7 +2833,6 @@  int wm_adsp_compr_handle_irq(struct wm_adsp *dsp)
 	mutex_lock(&dsp->pwr_lock);
 
 	if (!buf) {
-		adsp_err(dsp, "Spurious buffer IRQ\n");
 		ret = -ENODEV;
 		goto out;
 	}