Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5e45a6fa authored by Jiada Wang's avatar Jiada Wang Committed by Mark Brown
Browse files

ASoc: rsnd: dma: Calculate dma address with consider of BUSIF 



DMA address calculated by rsnd_dma_addr() only considers BUSIF0 so far.
But BUSIF1 ~ BUSIF7 also maybe used, in the future.

This patch updates DMA address calculations, to also consider
BUSIF number used by SSI.

One note is that we can't support SSI9-4/5/6/7 so far,
because its address is out of calculation rule.

Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
Signed-off-by: default avatarTimo Wischer <twischer@de.adit-jv.com>
[kuninori: adjust to upstreaming]
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 599da084

sound/soc/sh/rcar/dma.c

+27 −16
Original line number Diff line number Diff line
@@ -487,11 +487,11 @@ static struct rsnd_mod_ops rsnd_dmapp_ops = { 
#define RDMA_SSI_I_N(addr, i)	(addr ##_reg - 0x00300000 + (0x40 * i) + 0x8)

#define RDMA_SSI_O_N(addr, i)	(addr ##_reg - 0x00300000 + (0x40 * i) + 0xc)



#define RDMA_SSIU_I_N(addr, i)	(addr ##_reg - 0x00441000 + (0x1000 * i))

#define RDMA_SSIU_O_N(addr, i)	(addr ##_reg - 0x00441000 + (0x1000 * i))

#define RDMA_SSIU_I_N(addr, i, j) (addr ##_reg - 0x00441000 + (0x1000 * (i)) + (((j) / 4) * 0xA000) + (((j) % 4) * 0x400))

#define RDMA_SSIU_O_N(addr, i, j) RDMA_SSIU_I_N(addr, i, j)



#define RDMA_SSIU_I_P(addr, i)	(addr ##_reg - 0x00141000 + (0x1000 * i))

#define RDMA_SSIU_O_P(addr, i)	(addr ##_reg - 0x00141000 + (0x1000 * i))

#define RDMA_SSIU_I_P(addr, i, j) (addr ##_reg - 0x00141000 + (0x1000 * (i)) + (((j) / 4) * 0xA000) + (((j) % 4) * 0x400))

#define RDMA_SSIU_O_P(addr, i, j) RDMA_SSIU_I_P(addr, i, j)



#define RDMA_SRC_I_N(addr, i)	(addr ##_reg - 0x00500000 + (0x400 * i))

#define RDMA_SRC_O_N(addr, i)	(addr ##_reg - 0x004fc000 + (0x400 * i))
@@ -517,6 +517,7 @@ rsnd_gen2_dma_addr(struct rsnd_dai_stream *io, 
		      !!rsnd_io_to_mod_mix(io) ||

		      !!rsnd_io_to_mod_ctu(io);

	int id = rsnd_mod_id(mod);

	int busif = rsnd_ssi_get_busif(io);

	struct dma_addr {

		dma_addr_t out_addr;

		dma_addr_t in_addr;
@@ -534,24 +535,34 @@ rsnd_gen2_dma_addr(struct rsnd_dai_stream *io, 
		/* SSI */

		/* Capture */

		{{{ RDMA_SSI_O_N(ssi, id),		0 },

		  { RDMA_SSIU_O_P(ssi, id),	0 },

		  { RDMA_SSIU_O_P(ssi, id),	0 } },

		  { RDMA_SSIU_O_P(ssi, id, busif),	0 },

		  { RDMA_SSIU_O_P(ssi, id, busif),	0 } },

		 /* Playback */

		 {{ 0,			RDMA_SSI_I_N(ssi, id) },

		  { 0,				RDMA_SSIU_I_P(ssi, id) },

		  { 0,				RDMA_SSIU_I_P(ssi, id) } }

		  { 0,			RDMA_SSIU_I_P(ssi, id, busif) },

		  { 0,			RDMA_SSIU_I_P(ssi, id, busif) } }

		},

		/* SSIU */

		/* Capture */

		{{{ RDMA_SSIU_O_N(ssi, id),	0 },

		  { RDMA_SSIU_O_P(ssi, id),	0 },

		  { RDMA_SSIU_O_P(ssi, id),	0 } },

		{{{ RDMA_SSIU_O_N(ssi, id, busif),	0 },

		  { RDMA_SSIU_O_P(ssi, id, busif),	0 },

		  { RDMA_SSIU_O_P(ssi, id, busif),	0 } },

		 /* Playback */

		 {{ 0,				RDMA_SSIU_I_N(ssi, id) },

		  { 0,				RDMA_SSIU_I_P(ssi, id) },

		  { 0,				RDMA_SSIU_I_P(ssi, id) } } },

		 {{ 0,			RDMA_SSIU_I_N(ssi, id, busif) },

		  { 0,			RDMA_SSIU_I_P(ssi, id, busif) },

		  { 0,			RDMA_SSIU_I_P(ssi, id, busif) } } },

	};



	/*

	 * FIXME

	 *

	 * We can't support SSI9-4/5/6/7, because its address is

	 * out of calculation rule

	 */

	if ((id == 9) && (busif >= 4))

		dev_err(dev, "This driver doesn't support SSI%d-%d, so far",

			id, busif);



	/* it shouldn't happen */

	if (use_cmd && !use_src)

		dev_err(dev, "DVC is selected without SRC\n");

sound/soc/sh/rcar/rsnd.h

+1 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ void rsnd_ssi_remove(struct rsnd_priv *priv); 
struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);

int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);

int rsnd_ssi_use_busif(struct rsnd_dai_stream *io);

int rsnd_ssi_get_busif(struct rsnd_dai_stream *io);

u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io);



#define RSND_SSI_HDMI_PORT0	0xf0

sound/soc/sh/rcar/ssi.c

+5 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) 
	return use_busif;

}



int rsnd_ssi_get_busif(struct rsnd_dai_stream *io)

{

	return 0; /* BUSIF0 only for now */

}



static void rsnd_ssi_status_clear(struct rsnd_mod *mod)

{

	rsnd_mod_write(mod, SSISR, 0);