From 63ba5243ab7a33b77be5b65c0a8a2a0d5e26983f Mon Sep 17 00:00:00 2001

From: Vanitha Channaiah <vanitha.channaiah@in.bosch.com>

Date: Wed, 15 May 2019 11:56:32 +0530

Subject: [PATCH 01/25] pcm: direct: Add generic hw_ptr_alignment function for

 dmix, dshare and dsnoop

Move the code snd_pcm_direct_reset_slave_ptr() from pcm_dmix.c

to pcm_direct.c and its header so that the helper function can be

re-used by other direct-pcm plugins.

There is no change in the behavior or the functionality.

Signed-off-by: Vanitha Channaiah <vanitha.channaiah@in.bosch.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_direct.c | 19 +++++++++++++++++++

 src/pcm/pcm_direct.h |  8 ++++++++

 src/pcm/pcm_dmix.c   | 25 ++-----------------------

 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c

index 666a8ce5..411a035b 100644

--- a/src/pcm/pcm_direct.c

+++ b/src/pcm/pcm_direct.c

@@ -2040,3 +2040,22 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf,

 	return 0;

 }

+

+void snd_pcm_direct_reset_slave_ptr(snd_pcm_t *pcm, snd_pcm_direct_t *dmix)

+{

+	dmix->slave_appl_ptr = dmix->slave_hw_ptr = *dmix->spcm->hw.ptr;

+

+	if (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_ROUNDUP ||

+		(dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_AUTO &&

+		pcm->buffer_size <= pcm->period_size * 2))

+		dmix->slave_appl_ptr =

+			((dmix->slave_appl_ptr + dmix->slave_period_size - 1) /

+			dmix->slave_period_size) * dmix->slave_period_size;

+	else if (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_ROUNDDOWN ||

+		(dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_AUTO &&

+		(dmix->slave_period_size * SEC_TO_MS) /

+		pcm->rate < LOW_LATENCY_PERIOD_TIME))

+		dmix->slave_appl_ptr = dmix->slave_hw_ptr =

+			((dmix->slave_hw_ptr / dmix->slave_period_size) *

+			dmix->slave_period_size);

+}

diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h

index da5e280e..a71aab13 100644

--- a/src/pcm/pcm_direct.h

+++ b/src/pcm/pcm_direct.h

@@ -24,6 +24,11 @@

 #define DIRECT_IPC_SEMS         1

 #define DIRECT_IPC_SEM_CLIENT   0

+/* Seconds representing in Milli seconds */

+#define SEC_TO_MS               1000

+/* slave_period time for low latency requirements in ms */

+#define LOW_LATENCY_PERIOD_TIME 10

+

 typedef void (mix_areas_t)(unsigned int size,

 			   volatile void *dst, void *src,

@@ -257,6 +262,8 @@ struct snd_pcm_direct {

 	snd1_pcm_direct_get_chmap

 #define snd_pcm_direct_set_chmap \

 	snd1_pcm_direct_set_chmap

+#define snd_pcm_direct_reset_slave_ptr \

+	snd1_pcm_direct_reset_slave_ptr

 int snd_pcm_direct_semaphore_create_or_connect(snd_pcm_direct_t *dmix);

@@ -341,6 +348,7 @@ int snd_pcm_direct_slave_recover(snd_pcm_direct_t *direct);

 int snd_pcm_direct_client_chk_xrun(snd_pcm_direct_t *direct, snd_pcm_t *pcm);

 int snd_timer_async(snd_timer_t *timer, int sig, pid_t pid);

 struct timespec snd_pcm_hw_fast_tstamp(snd_pcm_t *pcm);

+void snd_pcm_direct_reset_slave_ptr(snd_pcm_t *pcm, snd_pcm_direct_t *dmix);

 struct snd_pcm_direct_open_conf {

 	key_t ipc_key;

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c

index c5592cdb..dcde40d9 100644

--- a/src/pcm/pcm_dmix.c

+++ b/src/pcm/pcm_dmix.c

@@ -55,9 +55,6 @@ const char *_snd_module_pcm_dmix = "";

 #define STATE_RUN_PENDING	1024

 #endif

-#define SEC_TO_MS	1000			/* Seconds representing in Milli seconds */

-#define LOW_LATENCY_PERIOD_TIME	10	/* slave_period time for low latency requirements in ms */

-

 /*

  *

  */

@@ -560,30 +557,12 @@ static int snd_pcm_dmix_hwsync(snd_pcm_t *pcm)

 	}

 }

-static void reset_slave_ptr(snd_pcm_t *pcm, snd_pcm_direct_t *dmix)

-{

-	dmix->slave_appl_ptr = dmix->slave_hw_ptr = *dmix->spcm->hw.ptr;

-

-	if (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_ROUNDUP ||

-	    (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_AUTO &&

-	     pcm->buffer_size <= pcm->period_size * 2))

-		dmix->slave_appl_ptr =

-			((dmix->slave_appl_ptr + dmix->slave_period_size - 1)

-			 / dmix->slave_period_size) * dmix->slave_period_size;

-	else if (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_ROUNDDOWN ||

-		 (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_AUTO &&

-		  (dmix->slave_period_size * SEC_TO_MS) / pcm->rate < LOW_LATENCY_PERIOD_TIME))

-		dmix->slave_appl_ptr = dmix->slave_hw_ptr =

-			((dmix->slave_hw_ptr / dmix->slave_period_size) *

-			 dmix->slave_period_size);

-}

-

 static int snd_pcm_dmix_reset(snd_pcm_t *pcm)

 {

 	snd_pcm_direct_t *dmix = pcm->private_data;

 	dmix->hw_ptr %= pcm->period_size;

 	dmix->appl_ptr = dmix->last_appl_ptr = dmix->hw_ptr;

-	reset_slave_ptr(pcm, dmix);

+	snd_pcm_direct_reset_slave_ptr(pcm, dmix);

 	return 0;

 }

@@ -592,7 +571,7 @@ static int snd_pcm_dmix_start_timer(snd_pcm_t *pcm, snd_pcm_direct_t *dmix)

 	int err;

 	snd_pcm_hwsync(dmix->spcm);

-	reset_slave_ptr(pcm, dmix);

+	snd_pcm_direct_reset_slave_ptr(pcm, dmix);

 	err = snd_timer_start(dmix->timer);

 	if (err < 0)

 		return err;

-- 

2.20.1

From 7265e603bf880a9ec2cd01c3cf2afbd7709e5af4 Mon Sep 17 00:00:00 2001

From: Vanitha Channaiah <vanitha.channaiah@in.bosch.com>

Date: Wed, 15 May 2019 11:56:33 +0530

Subject: [PATCH 02/25] pcm: dshare: Added "hw_ptr_alignment" option in

 configuration for alignment of slave pointers

This change adapt the fix commit 6b058fda9dce

("pcm: dmix: Add option to allow alignment of slave pointers")

for dshare plugin

Issue is that snd_pcm_wait() goes back to waiting because the hw_ptr

is not period aligned. Therefore snd_pcm_wait() will block for a longer

time as required.

With these rcar driver changes the exact position of the dma is returned.

During snd_pcm_start they read hw_ptr as reference, and this hw_ptr

is now not period aligned, and is a little ahead over the period while it

is read. Therefore when the avail is calculated during snd_pcm_wait(),

it is missing the avail_min by a few frames.

An additional option hw_ptr_alignment is provided to dshare configuration,

to allow the user to configure the slave application and hw pointer

alignment at startup

Signed-off-by: Vanitha Channaiah <vanitha.channaiah@in.bosch.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_dshare.c | 40 +++++++++++++++++++++++++++++++++++-----

 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c

index f135b5df..cf8a8631 100644

--- a/src/pcm/pcm_dshare.c

+++ b/src/pcm/pcm_dshare.c

@@ -333,16 +333,16 @@ static int snd_pcm_dshare_reset(snd_pcm_t *pcm)

 	snd_pcm_direct_t *dshare = pcm->private_data;

 	dshare->hw_ptr %= pcm->period_size;

 	dshare->appl_ptr = dshare->last_appl_ptr = dshare->hw_ptr;

-	dshare->slave_appl_ptr = dshare->slave_hw_ptr = *dshare->spcm->hw.ptr;

+	snd_pcm_direct_reset_slave_ptr(pcm, dshare);

 	return 0;

 }

-static int snd_pcm_dshare_start_timer(snd_pcm_direct_t *dshare)

+static int snd_pcm_dshare_start_timer(snd_pcm_t *pcm, snd_pcm_direct_t *dshare)

 {

 	int err;

 	snd_pcm_hwsync(dshare->spcm);

-	dshare->slave_appl_ptr = dshare->slave_hw_ptr = *dshare->spcm->hw.ptr;

+	snd_pcm_direct_reset_slave_ptr(pcm, dshare);

 	err = snd_timer_start(dshare->timer);

 	if (err < 0)

 		return err;

@@ -364,7 +364,8 @@ static int snd_pcm_dshare_start(snd_pcm_t *pcm)

 	else if (avail < 0)

 		return 0;

 	else {

-		if ((err = snd_pcm_dshare_start_timer(dshare)) < 0)

+		err = snd_pcm_dshare_start_timer(pcm, dshare);

+		if (err < 0)

 			return err;

 		snd_pcm_dshare_sync_area(pcm);

 	}

@@ -547,7 +548,8 @@ static snd_pcm_sframes_t snd_pcm_dshare_mmap_commit(snd_pcm_t *pcm,

 		return 0;

 	snd_pcm_mmap_appl_forward(pcm, size);

 	if (dshare->state == STATE_RUN_PENDING) {

-		if ((err = snd_pcm_dshare_start_timer(dshare)) < 0)

+		err = snd_pcm_dshare_start_timer(pcm, dshare);

+		if (err < 0)

 			return err;

 	} else if (dshare->state == SND_PCM_STATE_RUNNING ||

 		   dshare->state == SND_PCM_STATE_DRAINING) {

@@ -755,6 +757,7 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,

 	dshare->slowptr = opts->slowptr;

 	dshare->max_periods = opts->max_periods;

 	dshare->var_periodsize = opts->var_periodsize;

+	dshare->hw_ptr_alignment = opts->hw_ptr_alignment;

 	dshare->sync_ptr = snd_pcm_dshare_sync_ptr;

  retry:

@@ -912,6 +915,12 @@ pcm.name {

 	ipc_key INT		# unique IPC key

 	ipc_key_add_uid BOOL	# add current uid to unique IPC key

 	ipc_perm INT		# IPC permissions (octal, default 0600)

+	hw_ptr_alignment STR	# Slave application and hw pointer alignment type

+		# STR can be one of the below strings :

+		# no

+		# roundup

+		# rounddown

+		# auto (default)

 	slave STR

 	# or

 	slave {			# Slave definition

@@ -936,6 +945,27 @@ pcm.name {

 }

 \endcode

+hw_ptr_alignment specifies slave application and hw

+pointer alignment type. By default hw_ptr_alignment is auto. Below are

+the possible configurations:

+- no: minimal latency with minimal frames dropped at startup. But

+  wakeup of application (return from snd_pcm_wait() or poll()) can

+  take up to 2 * period.

+- roundup: It is guaranteed that all frames will be played at

+  startup. But the latency will increase upto period-1 frames.

+- rounddown: It is guaranteed that a wakeup will happen for each

+  period and frames can be written from application. But on startup

+  upto period-1 frames will be dropped.

+- auto: Selects the best approach depending on the used period and

+  buffer size.

+  If the application buffer size is < 2 * application period,

+  "roundup" will be selected to avoid under runs. If the slave_period

+  is < 10ms we could expect that there are low latency

+  requirements. Therefore "rounddown" will be chosen to avoid long

+  wakeup times. Such wakeup delay could otherwise end up with Xruns in

+  case of a dependency to another sound device (e.g. forwarding of

+  microphone to speaker). Else "no" will be chosen.

+

 \subsection pcm_plugins_dshare_funcref Function reference

-- 

2.20.1

From 3ab798004733ce65bd5c7a48d650de3465825210 Mon Sep 17 00:00:00 2001

From: Vanitha Channaiah <vanitha.channaiah@in.bosch.com>

Date: Wed, 15 May 2019 11:56:34 +0530

Subject: [PATCH 03/25] pcm: dsnoop: Added "hw_ptr_alignment" option in

 configuration for slave pointer alignment

This change adapt the fix commit 6b058fda9dce

("pcm: dmix: Add option to allow alignment of slave pointers")

for dsnoop plugin

Issue is that snd_pcm_wait() goes back to waiting because the hw_ptr

is not period aligned. Therefore snd_pcm_wait() will block for a longer

time as required.

With these rcar driver changes the exact position of the dma is returned.

During snd_pcm_start they read hw_ptr as reference, and this hw_ptr

is now not period aligned, and is a little ahead over the period while it

is read. Therefore when the avail is calculated during snd_pcm_wait(),

it is missing the avail_min by a few frames.

An additional option hw_ptr_alignment is provided to dsnoop configuration,

to allow the user to configure the slave application and hw pointer

alignment at startup

Signed-off-by: Vanitha Channaiah <vanitha.channaiah@in.bosch.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_direct.c |  1 -

 src/pcm/pcm_dmix.c   |  2 ++

 src/pcm/pcm_dshare.c |  2 ++

 src/pcm/pcm_dsnoop.c | 30 +++++++++++++++++++++++++++++-

 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c

index 411a035b..54d99005 100644

--- a/src/pcm/pcm_direct.c

+++ b/src/pcm/pcm_direct.c

@@ -2043,7 +2043,6 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf,

 void snd_pcm_direct_reset_slave_ptr(snd_pcm_t *pcm, snd_pcm_direct_t *dmix)

 {

-	dmix->slave_appl_ptr = dmix->slave_hw_ptr = *dmix->spcm->hw.ptr;

 	if (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_ROUNDUP ||

 		(dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_AUTO &&

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c

index dcde40d9..274726e4 100644

--- a/src/pcm/pcm_dmix.c

+++ b/src/pcm/pcm_dmix.c

@@ -562,6 +562,7 @@ static int snd_pcm_dmix_reset(snd_pcm_t *pcm)

 	snd_pcm_direct_t *dmix = pcm->private_data;

 	dmix->hw_ptr %= pcm->period_size;

 	dmix->appl_ptr = dmix->last_appl_ptr = dmix->hw_ptr;

+	dmix->slave_appl_ptr = dmix->slave_hw_ptr = *dmix->spcm->hw.ptr;

 	snd_pcm_direct_reset_slave_ptr(pcm, dmix);

 	return 0;

 }

@@ -571,6 +572,7 @@ static int snd_pcm_dmix_start_timer(snd_pcm_t *pcm, snd_pcm_direct_t *dmix)

 	int err;

 	snd_pcm_hwsync(dmix->spcm);

+	dmix->slave_appl_ptr = dmix->slave_hw_ptr = *dmix->spcm->hw.ptr;

 	snd_pcm_direct_reset_slave_ptr(pcm, dmix);

 	err = snd_timer_start(dmix->timer);

 	if (err < 0)

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c

index cf8a8631..b75809c8 100644

--- a/src/pcm/pcm_dshare.c

+++ b/src/pcm/pcm_dshare.c

@@ -333,6 +333,7 @@ static int snd_pcm_dshare_reset(snd_pcm_t *pcm)

 	snd_pcm_direct_t *dshare = pcm->private_data;

 	dshare->hw_ptr %= pcm->period_size;

 	dshare->appl_ptr = dshare->last_appl_ptr = dshare->hw_ptr;

+	dshare->slave_appl_ptr = dshare->slave_hw_ptr = *dshare->spcm->hw.ptr;

 	snd_pcm_direct_reset_slave_ptr(pcm, dshare);

 	return 0;

 }

@@ -342,6 +343,7 @@ static int snd_pcm_dshare_start_timer(snd_pcm_t *pcm, snd_pcm_direct_t *dshare)

 	int err;

 	snd_pcm_hwsync(dshare->spcm);

+	dshare->slave_appl_ptr = dshare->slave_hw_ptr = *dshare->spcm->hw.ptr;

 	snd_pcm_direct_reset_slave_ptr(pcm, dshare);

 	err = snd_timer_start(dshare->timer);

 	if (err < 0)

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c

index d08b6241..58b1e534 100644

--- a/src/pcm/pcm_dsnoop.c

+++ b/src/pcm/pcm_dsnoop.c

@@ -278,6 +278,7 @@ static int snd_pcm_dsnoop_reset(snd_pcm_t *pcm)

 	dsnoop->hw_ptr %= pcm->period_size;

 	dsnoop->appl_ptr = dsnoop->hw_ptr;

 	dsnoop->slave_appl_ptr = dsnoop->slave_hw_ptr;

+	snd_pcm_direct_reset_slave_ptr(pcm, dsnoop);

 	return 0;

 }

@@ -285,12 +286,13 @@ static int snd_pcm_dsnoop_start(snd_pcm_t *pcm)

 {

 	snd_pcm_direct_t *dsnoop = pcm->private_data;

 	int err;

-	

+

 	if (dsnoop->state != SND_PCM_STATE_PREPARED)

 		return -EBADFD;

 	snd_pcm_hwsync(dsnoop->spcm);

 	snoop_timestamp(pcm);

 	dsnoop->slave_appl_ptr = dsnoop->slave_hw_ptr;

+	snd_pcm_direct_reset_slave_ptr(pcm, dsnoop);

 	err = snd_timer_start(dsnoop->timer);

 	if (err < 0)

 		return err;

@@ -627,6 +629,7 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,

 	dsnoop->max_periods = opts->max_periods;

 	dsnoop->var_periodsize = opts->var_periodsize;

 	dsnoop->sync_ptr = snd_pcm_dsnoop_sync_ptr;

+	dsnoop->hw_ptr_alignment = opts->hw_ptr_alignment;

  retry:

 	if (first_instance) {

@@ -771,6 +774,12 @@ pcm.name {

 	ipc_key INT		# unique IPC key

 	ipc_key_add_uid BOOL	# add current uid to unique IPC key

 	ipc_perm INT		# IPC permissions (octal, default 0600)

+	hw_ptr_alignment STR	# Slave application and hw pointer alignment type

+		# STR can be one of the below strings :

+		# no

+		# roundup

+		# rounddown

+		# auto (default)

 	slave STR

 	# or

 	slave {			# Slave definition

@@ -795,6 +804,25 @@ pcm.name {

 }

 \endcode

+hw_ptr_alignment specifies slave application and hw

+pointer alignment type. By default hw_ptr_alignment is auto. Below are

+the possible configurations:

+- no: minimal latency with minimal frames dropped at startup. But

+  wakeup of application (return from snd_pcm_wait() or poll()) can

+  take up to 2 * period.

+- roundup: It is guaranteed that all frames will be played at

+  startup. But the latency will increase upto period-1 frames.

+- rounddown: It is guaranteed that a wakeup will happen for each

+  period and frames can be written from application. But on startup

+  upto period-1 frames will be dropped.

+- auto: Selects the best approach depending on the used period and

+  buffer size.

+  If the application buffer size is < 2 * application period,

+  "roundup" will be selected to avoid over runs. If the slave_period

+  is < 10ms we could expect that there are low latency

+  requirements. Therefore "rounddown" will be chosen to avoid long

+  wakeup times. Else "no" will be chosen.

+

 \subsection pcm_plugins_dsnoop_funcref Function reference

-- 

2.20.1

From 5f2e5af61b0b8cfbf310e8b1e08a034d993e432f Mon Sep 17 00:00:00 2001

From: Adam Miartus <amiartus@de.adit-jv.com>

Date: Tue, 21 May 2019 15:32:47 +0200

Subject: [PATCH 04/25] pcm: file: add support for infile reading in non

 interleaved mode

add helper function to copy input file data to buffer mapped by areas,

in case of an error, do not fill the areas, allowing device read buffer

to be provided to api caller

previously unused rbuf variable is reused for this purpose

Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>

Reviewed-by: Timo Wischer <twischer@de.adit-jv.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_file.c | 67 ++++++++++++++++++++++++++++++++++++++--------

 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c

index 3a19cef9..3c682659 100644

--- a/src/pcm/pcm_file.c

+++ b/src/pcm/pcm_file.c

@@ -77,6 +77,7 @@ typedef struct {

 	snd_pcm_uframes_t appl_ptr;

 	snd_pcm_uframes_t file_ptr_bytes;

 	snd_pcm_uframes_t wbuf_size;

+	snd_pcm_uframes_t rbuf_size;

 	size_t wbuf_size_bytes;

 	size_t wbuf_used_bytes;

 	char *wbuf;

@@ -266,6 +267,39 @@ static int snd_pcm_file_open_output_file(snd_pcm_file_t *file)

 	return 0;

 }

+/* fill areas with data from input file, return bytes red */

+static int snd_pcm_file_areas_read_infile(snd_pcm_t *pcm,

+					  const snd_pcm_channel_area_t *areas,

+					  snd_pcm_uframes_t offset,

+					  snd_pcm_uframes_t frames)

+{

+	snd_pcm_file_t *file = pcm->private_data;

+	snd_pcm_channel_area_t areas_if[pcm->channels];

+	ssize_t bytes;

+

+	if (file->ifd < 0)

+		return -EBADF;

+

+	if (file->rbuf == NULL)

+		return -ENOMEM;

+

+	if (file->rbuf_size < frames) {

+		SYSERR("requested more frames than pcm buffer");

+		return -ENOMEM;

+	}

+

+	bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames));

+	if (bytes < 0) {

+		SYSERR("read from file failed, error: %d", bytes);

+		return bytes;

+	}

+

+	snd_pcm_areas_from_buf(pcm, areas_if, file->rbuf);

+	snd_pcm_areas_copy(areas, offset, areas_if, 0, pcm->channels, snd_pcm_bytes_to_frames(pcm, bytes), pcm->format);

+

+	return bytes;

+}

+

 static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt)

 {

 	fmt->fmt = TO_LE16(0x01);

@@ -568,19 +602,19 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm

 {

 	snd_pcm_file_t *file = pcm->private_data;

 	snd_pcm_channel_area_t areas[pcm->channels];

-	snd_pcm_sframes_t n;

+	snd_pcm_sframes_t frames;

-	if (file->ifd >= 0) {

-		SNDERR("DEBUG: Noninterleaved read not yet implemented.\n");

-		return 0;	/* TODO: Noninterleaved read */

-	}

+	__snd_pcm_lock(pcm);

+	frames = _snd_pcm_readn(file->gen.slave, bufs, size);

+	if (frames <= 0)

+		return frames;

-	n = _snd_pcm_readn(file->gen.slave, bufs, size);

-	if (n > 0) {

-		snd_pcm_areas_from_bufs(pcm, areas, bufs);

-		snd_pcm_file_add_frames(pcm, areas, 0, n);

-	}

-	return n;

+	snd_pcm_areas_from_bufs(pcm, areas, bufs);

+	snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);

+	snd_pcm_file_add_frames(pcm, areas, 0, frames);

+

+	__snd_pcm_unlock(pcm);

+	return frames;

 }

 static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm,

@@ -609,9 +643,11 @@ static int snd_pcm_file_hw_free(snd_pcm_t *pcm)

 	free(file->wbuf);

 	free(file->wbuf_areas);

 	free(file->final_fname);

+	free(file->rbuf);

 	file->wbuf = NULL;

 	file->wbuf_areas = NULL;

 	file->final_fname = NULL;

+	file->rbuf = NULL;

 	return snd_pcm_hw_free(file->gen.slave);

 }

@@ -638,6 +674,15 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)

 		snd_pcm_file_hw_free(pcm);

 		return -ENOMEM;

 	}

+	assert(!file->rbuf);

+	file->rbuf_size = slave->buffer_size;

+	file->rbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->rbuf_size);

+	file->rbuf_used_bytes = 0;

+	file->rbuf = malloc(file->rbuf_size_bytes);

+	if (file->rbuf == NULL) {

+		snd_pcm_file_hw_free(pcm);

+		return -ENOMEM;

+	}

 	file->appl_ptr = file->file_ptr_bytes = 0;

 	for (channel = 0; channel < slave->channels; ++channel) {

 		snd_pcm_channel_area_t *a = &file->wbuf_areas[channel];

-- 

2.20.1

From 349b42f5477c904fa3e10bac2fa2429fad2cbc65 Mon Sep 17 00:00:00 2001

From: Adam Miartus <amiartus@de.adit-jv.com>

Date: Tue, 21 May 2019 15:33:08 +0200

Subject: [PATCH 05/25] pcm: file: use snd_pcm_file_areas_read_infile for readi

use previously introduced helper function, this commit unifies behavior

of readi and readn

corner case behavior of readi is changed by this commit, previously,

in case 0 bytes were red from file (EOF), frames = 0 was returned,

signaling api user as if no data was red from slave, after the patch,

amount of frames red from slave with data red from slave stored in buffer

is returned when EOF is reached

Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>

Reviewed-by: Timo Wischer <twischer@de.adit-jv.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_file.c | 27 +++++++++++++--------------

 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c

index 3c682659..dcaa41d1 100644

--- a/src/pcm/pcm_file.c

+++ b/src/pcm/pcm_file.c

@@ -579,22 +579,21 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc

 {

 	snd_pcm_file_t *file = pcm->private_data;

 	snd_pcm_channel_area_t areas[pcm->channels];

-	snd_pcm_sframes_t n;

+	snd_pcm_sframes_t frames;

+

+	__snd_pcm_lock(pcm);

+

+	frames = _snd_pcm_readi(file->gen.slave, buffer, size);

+	if (frames <= 0)

+		return frames;

-	n = _snd_pcm_readi(file->gen.slave, buffer, size);

-	if (n <= 0)

-		return n;

-	if (file->ifd >= 0) {

-		__snd_pcm_lock(pcm);

-		n = read(file->ifd, buffer, n * pcm->frame_bits / 8);

-		__snd_pcm_unlock(pcm);

-		if (n < 0)

-			return n;

-		n = n * 8 / pcm->frame_bits;

-	}

 	snd_pcm_areas_from_buf(pcm, areas, buffer);

-	snd_pcm_file_add_frames(pcm, areas, 0, n);

-	return n;

+	snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);

+	snd_pcm_file_add_frames(pcm, areas, 0, frames);

+

+	__snd_pcm_unlock(pcm);

+

+	return frames;

 }

 /* locking */

-- 

2.20.1

From 33c7ea0865b7f87cef1c3d3e767734c0edd02e84 Mon Sep 17 00:00:00 2001

From: Adam Miartus <amiartus@de.adit-jv.com>

Date: Thu, 23 May 2019 11:44:30 +0200

Subject: [PATCH 06/25] pcm: file: add missing unlock on early return

Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_file.c | 8 ++++++--

 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c

index dcaa41d1..8e2c70b1 100644

--- a/src/pcm/pcm_file.c

+++ b/src/pcm/pcm_file.c

@@ -584,8 +584,10 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc

 	__snd_pcm_lock(pcm);

 	frames = _snd_pcm_readi(file->gen.slave, buffer, size);

-	if (frames <= 0)

+	if (frames <= 0) {

+		__snd_pcm_unlock(pcm);

 		return frames;

+	}

 	snd_pcm_areas_from_buf(pcm, areas, buffer);

 	snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);

@@ -605,8 +607,10 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm

 	__snd_pcm_lock(pcm);

 	frames = _snd_pcm_readn(file->gen.slave, bufs, size);

-	if (frames <= 0)

+	if (frames <= 0) {

+		__snd_pcm_unlock(pcm);

 		return frames;

+	}

 	snd_pcm_areas_from_bufs(pcm, areas, bufs);

 	snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);

-- 

2.20.1

From 108a2f43791fe769fd58726881b12ad908ebd2e0 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Thu, 18 Apr 2019 20:40:18 +0200

Subject: [PATCH 07/25] ucm: Add UCM profile for CX2072X codec on

 Baytrail/Cherrytrail profiles

Adding a new Conexant CX2072X codec profile and reusing the existing

BYT/CHT platform snippets.

Currently tested only on ASUS E200HA laptop.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 configure.ac                                  |  2 ++

 src/conf/ucm/Makefile.am                      |  1 +

 src/conf/ucm/bytcht-cx2072x/HiFi.conf         | 24 ++++++++++++++++++

 src/conf/ucm/bytcht-cx2072x/Makefile.am       |  4 +++

 .../ucm/bytcht-cx2072x/bytcht-cx2072x.conf    |  8 ++++++

 src/conf/ucm/codecs/Makefile.am               |  1 +

 src/conf/ucm/codecs/cx2072x/DisableSeq.conf   |  7 ++++++

 src/conf/ucm/codecs/cx2072x/EnableSeq.conf    | 13 ++++++++++

 src/conf/ucm/codecs/cx2072x/HeadPhones.conf   | 24 ++++++++++++++++++

 src/conf/ucm/codecs/cx2072x/HeadsetMic.conf   | 25 +++++++++++++++++++

 src/conf/ucm/codecs/cx2072x/InternalMic.conf  | 24 ++++++++++++++++++

 src/conf/ucm/codecs/cx2072x/Makefile.am       |  6 +++++

 src/conf/ucm/codecs/cx2072x/Speaker.conf      | 23 +++++++++++++++++

 13 files changed, 162 insertions(+)

 create mode 100644 src/conf/ucm/bytcht-cx2072x/HiFi.conf

 create mode 100644 src/conf/ucm/bytcht-cx2072x/Makefile.am

 create mode 100644 src/conf/ucm/bytcht-cx2072x/bytcht-cx2072x.conf

 create mode 100644 src/conf/ucm/codecs/cx2072x/DisableSeq.conf

 create mode 100644 src/conf/ucm/codecs/cx2072x/EnableSeq.conf

 create mode 100644 src/conf/ucm/codecs/cx2072x/HeadPhones.conf

 create mode 100644 src/conf/ucm/codecs/cx2072x/HeadsetMic.conf

 create mode 100644 src/conf/ucm/codecs/cx2072x/InternalMic.conf

 create mode 100644 src/conf/ucm/codecs/cx2072x/Makefile.am

 create mode 100644 src/conf/ucm/codecs/cx2072x/Speaker.conf

diff --git a/configure.ac b/configure.ac

index 0fb34de4..2e955760 100644

--- a/configure.ac

+++ b/configure.ac

@@ -720,6 +720,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \

 	  src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/Makefile \

 	  src/conf/ucm/broadwell-rt286/Makefile \

 	  src/conf/ucm/broxton-rt298/Makefile \

+	  src/conf/ucm/bytcht-cx2072x/Makefile \

 	  src/conf/ucm/bytcht-es8316/Makefile \

 	  src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/Makefile \