[PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Peter Rosin]

>From 86be84c4de4e7b21cfda9656a02a902c543210af Mon Sep 17 00:00:00 2001
From: Peter Rosin <peda@axentia.se>
Date: Wed, 22 Oct 2014 16:45:29 +0200
Subject: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full
 duplex.

The CMR divider register is shared by playback and capture. The SSC driver
therefore tries to enforce rules so that the needed register content do
not conflict during simultaneous playback/capture. However, the
implementation also prevents changing the register content in
half-duplex scenarios, which is needed when using the OSS API.

Thus, only lock the divider if there is a stream in the other direction.

Fixes the below program to not fail with the atmel ssc dai in master mode.

#include <sys/ioctl.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/soundcard.h>

int
main(void)
{
	int fd;
	int format;
	int channels;
	int speed;

	if ((fd = open("/dev/dsp", O_WRONLY, 0)) == -1) {
		perror("open");
		return 1;
	}
	format = AFMT_S16_LE;
	if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) == -1) {
		perror("SNDCTL_DSP_SETFMT");
		return 1;
	}
	channels = 2;
	if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) == -1) {
		perror("SNDCTL_DSP_CHANNELS");
		return 1;
	}
	speed = 22025;
	if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) == -1) {
		perror("SNDCTL_DSP_SPEED");
		return 1;
	}
	return 0;
}

Signed-off-by: Peter Rosin <peda@axentia.se>
---
 sound/soc/atmel/atmel_ssc_dai.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index de433cfd..9ae8475 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -310,7 +310,10 @@ static int atmel_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
 		 * transmit and receive, so if a value has already
 		 * been set, it must match this value.
 		 */
-		if (ssc_p->cmr_div == 0)
+		if (ssc_p->dir_mask !=
+			(SSC_DIR_MASK_PLAYBACK | SSC_DIR_MASK_CAPTURE))
+			ssc_p->cmr_div = div;
+		else if (ssc_p->cmr_div == 0)
 			ssc_p->cmr_div = div;
 		else
 			if (div != ssc_p->cmr_div)
-- 
1.7.10.4

Re: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Bo Shen]

Hi Peter,
   Thanks for your patch.

   Btw, do you use "git send-email" command to send the patch?

On 10/22/2014 11:13 PM, Peter Rosin wrote:
>  From 86be84c4de4e7b21cfda9656a02a902c543210af Mon Sep 17 00:00:00 2001
> From: Peter Rosin <peda@axentia.se>
> Date: Wed, 22 Oct 2014 16:45:29 +0200
> Subject: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full
>   duplex.
>
> The CMR divider register is shared by playback and capture. The SSC driver
> therefore tries to enforce rules so that the needed register content do
> not conflict during simultaneous playback/capture. However, the
> implementation also prevents changing the register content in
> half-duplex scenarios, which is needed when using the OSS API.
>
> Thus, only lock the divider if there is a stream in the other direction.
>
> Fixes the below program to not fail with the atmel ssc dai in master mode.
>
> #include <sys/ioctl.h>
> #include <unistd.h>
> #include <fcntl.h>
> #include <sys/soundcard.h>
>
> int
> main(void)
> {
> 	int fd;
> 	int format;
> 	int channels;
> 	int speed;
>
> 	if ((fd = open("/dev/dsp", O_WRONLY, 0)) == -1) {
> 		perror("open");
> 		return 1;
> 	}
> 	format = AFMT_S16_LE;
> 	if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) == -1) {
> 		perror("SNDCTL_DSP_SETFMT");
> 		return 1;
> 	}
> 	channels = 2;
> 	if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) == -1) {
> 		perror("SNDCTL_DSP_CHANNELS");
> 		return 1;
> 	}
> 	speed = 22025;
> 	if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) == -1) {
> 		perror("SNDCTL_DSP_SPEED");
> 		return 1;
> 	}
> 	return 0;
> }
>
> Signed-off-by: Peter Rosin <peda@axentia.se>

Acked-by: Bo Shen <voice.shen@atmel.com>

> ---
>   sound/soc/atmel/atmel_ssc_dai.c |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
> index de433cfd..9ae8475 100644
> --- a/sound/soc/atmel/atmel_ssc_dai.c
> +++ b/sound/soc/atmel/atmel_ssc_dai.c
> @@ -310,7 +310,10 @@ static int atmel_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
>   		 * transmit and receive, so if a value has already
>   		 * been set, it must match this value.
>   		 */
> -		if (ssc_p->cmr_div == 0)
> +		if (ssc_p->dir_mask !=
> +			(SSC_DIR_MASK_PLAYBACK | SSC_DIR_MASK_CAPTURE))
> +			ssc_p->cmr_div = div;
> +		else if (ssc_p->cmr_div == 0)
>   			ssc_p->cmr_div = div;
>   		else
>   			if (div != ssc_p->cmr_div)
>

Best Regards,
Bo Shen

RE: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Peter Rosin]

> Hi Peter,
>    Thanks for your patch.

And thanks for the Ack!

>    Btw, do you use "git send-email" command to send the patch?

No, I  didn't, "git format-patch" and paste into the mail body. Was there some
whitespace issues with the patch?

Cheers,
Peter

Re: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Bo Shen]

Hi Peter,

On 10/24/2014 03:13 PM, Peter Rosin wrote:
>> Hi Peter,
>>     Thanks for your patch.
>
> And thanks for the Ack!
>
>>     Btw, do you use "git send-email" command to send the patch?
>
> No, I  didn't, "git format-patch" and paste into the mail body. Was there some
> whitespace issues with the patch?

If you paste the patch in mail body, after apply your patch, git log 
will show information look like:
--->8---
commit bfb9419839caeca07aa3e99c141fc7c1ac4f37af
Author: Peter Rosin <peda@axentia.se>
Date:   Wed Oct 22 15:13:55 2014 +0000

     ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

     From 86be84c4de4e7b21cfda9656a02a902c543210af Mon Sep 17 00:00:00 2001
     From: Peter Rosin <peda@axentia.se>
     Date: Wed, 22 Oct 2014 16:45:29 +0200
     Subject: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only 
in full
      duplex.

     The CMR divider register is shared by playback and capture. The SSC 
driver
     therefore tries to enforce rules so that the needed register content do
     not conflict during simultaneous playback/capture. However, the
     implementation also prevents changing the register content in
     half-duplex scenarios, which is needed when using the OSS API.
---8<---

If you send patch use "git send-email", after apply your patch, git log 
will show information look like

--->8---
commit bfb9419839caeca07aa3e99c141fc7c1ac4f37af
Author: Peter Rosin <peda@axentia.se>
Date:   Wed Oct 22 15:13:55 2014 +0000

     The CMR divider register is shared by playback and capture. The SSC 
driver
     therefore tries to enforce rules so that the needed register content do
     not conflict during simultaneous playback/capture. However, the
     implementation also prevents changing the register content in
     half-duplex scenarios, which is needed when using the OSS API.

---8<---

> Cheers,
> Peter
>

Best Regards,
Bo Shen

Re: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Bo Shen]

Hi Peter,

On 10/24/2014 03:13 PM, Peter Rosin wrote:
>> Hi Peter,
>>     Thanks for your patch.
>
> And thanks for the Ack!
>
>>     Btw, do you use "git send-email" command to send the patch?
>
> No, I  didn't, "git format-patch" and paste into the mail body. Was there some
> whitespace issues with the patch?

If you paste patch into the mail body, after using "git am" to apply 
your patch, git log will show like:
--->8---
commit bfb9419839caeca07aa3e99c141fc7c1ac4f37af
Author: Peter Rosin <peda@axentia.se>
Date:   Wed Oct 22 15:13:55 2014 +0000

     ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

     From 86be84c4de4e7b21cfda9656a02a902c543210af Mon Sep 17 00:00:00 2001
     From: Peter Rosin <peda@axentia.se>
     Date: Wed, 22 Oct 2014 16:45:29 +0200
     Subject: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only 
in full
      duplex.

     The CMR divider register is shared by playback and capture. The SSC 
driver
     therefore tries to enforce rules so that the needed register content do
     not conflict during simultaneous playback/capture. However, the
     implementation also prevents changing the register content in
     half-duplex scenarios, which is needed when using the OSS API.
---8<---

If you use "git send-email", after using "git am" to apply your patch, 
git log will show like:
--->8---
commit bfb9419839caeca07aa3e99c141fc7c1ac4f37af
Author: Peter Rosin <peda@axentia.se>
Date:   Wed Oct 22 15:13:55 2014 +0000

     ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

     The CMR divider register is shared by playback and capture. The SSC 
driver
     therefore tries to enforce rules so that the needed register content do
     not conflict during simultaneous playback/capture. However, the
     implementation also prevents changing the register content in
     half-duplex scenarios, which is needed when using the OSS API.
---8<---

> Cheers,
> Peter
>

Best Regards,
Bo Shen

Re: [PATCH v2] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Peter Rosin]

Ok, I'm trying with git send-email, sorry for the inconvenience.

Cheers,
Peter

[PATCH] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Peter Rosin]

The CMR divider register is shared by playback and capture. The SSC driver
therefore tries to enforce rules so that the needed register content do
not conflict during simultaneous playback/capture. However, the
implementation also prevents changing the register content in
half-duplex scenarios, which is needed when using the OSS API.

Thus, only lock the divider if there is a stream in the other direction.

Fixes the below program to not fail with the atmel ssc dai in master mode.

#include <sys/ioctl.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/soundcard.h>

int
main(void)
{
	int fd;
	int format;
	int channels;
	int speed;

	if ((fd = open("/dev/dsp", O_WRONLY, 0)) == -1) {
		perror("open");
		return 1;
	}
	format = AFMT_S16_LE;
	if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) == -1) {
		perror("SNDCTL_DSP_SETFMT");
		return 1;
	}
	channels = 2;
	if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) == -1) {
		perror("SNDCTL_DSP_CHANNELS");
		return 1;
	}
	speed = 22025;
	if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) == -1) {
		perror("SNDCTL_DSP_SPEED");
		return 1;
	}
	return 0;
}

Signed-off-by: Peter Rosin <peda@axentia.se>
---
 sound/soc/atmel/atmel_ssc_dai.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index f403f39..b1cc2a4 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -310,7 +310,10 @@ static int atmel_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
 		 * transmit and receive, so if a value has already
 		 * been set, it must match this value.
 		 */
-		if (ssc_p->cmr_div == 0)
+		if (ssc_p->dir_mask !=
+			(SSC_DIR_MASK_PLAYBACK | SSC_DIR_MASK_CAPTURE))
+			ssc_p->cmr_div = div;
+		else if (ssc_p->cmr_div == 0)
 			ssc_p->cmr_div = div;
 		else
 			if (div != ssc_p->cmr_div)
-- 
2.1.1

Re: [PATCH] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

On Fri, Oct 24, 2014 at 09:25:59PM +0200, Peter Rosin wrote:
> The CMR divider register is shared by playback and capture. The SSC driver
> therefore tries to enforce rules so that the needed register content do
> not conflict during simultaneous playback/capture. However, the
> implementation also prevents changing the register content in
> half-duplex scenarios, which is needed when using the OSS API.

Bo, is this OK?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Bo Shen]

Hi Mark,

On 11/01/2014 02:12 AM, Mark Brown wrote:
> On Fri, Oct 24, 2014 at 09:25:59PM +0200, Peter Rosin wrote:
>> The CMR divider register is shared by playback and capture. The SSC driver
>> therefore tries to enforce rules so that the needed register content do
>> not conflict during simultaneous playback/capture. However, the
>> implementation also prevents changing the register content in
>> half-duplex scenarios, which is needed when using the OSS API.
>
> Bo, is this OK?

I have acked this patch. However Peter resend with "git send-email" 
command while not add Acked-by tag. Anyway:

Acked-by: Bo Shen <voice.shen@atmel.com>

Best Regards,
Bo Shen

Re: [PATCH] ASoC: atmel_ssc_dai: Match the CMR divider only in full duplex.

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

On Fri, Oct 24, 2014 at 09:25:59PM +0200, Peter Rosin wrote:
> The CMR divider register is shared by playback and capture. The SSC driver
> therefore tries to enforce rules so that the needed register content do
> not conflict during simultaneous playback/capture. However, the
> implementation also prevents changing the register content in
> half-duplex scenarios, which is needed when using the OSS API.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]