Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Matt Flax <flatmax@flatmax.org>
Cc: alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>,
	linux-rpi-kernel@lists.infradead.org
Subject: Re: [PATCH] ASoC: bcm2835-i2s: substream alignment now independent in hwparams
Date: Fri, 27 Mar 2020 11:30:50 +1100
Message-ID: <1dcf128a-4ad3-0efa-81e4-b3ccc7caa8f1@flatmax.org> (raw)
In-Reply-To: <d0684926-3f7a-0b97-a298-4088925442a4@flatmax.org>


On 27/3/20 10:56 am, Matt Flax wrote:
>
> Should this patch be handled through the ALSA team the R. Pi team or 
> the BCM team ?
>

Resending again with reduced recipients.


>
> thanks
>
> Matt
>
> On 24/3/20 8:08 pm, Matt Flax wrote:
>> Substream sample alignment was being set in hwparams for both
>> substreams at the same time. This became a problem when    the Audio
>> Injector isolated sound card needed to offset sample alignment
>> for high sample    rates. The latency difference between playback
>> and capture occurs because of the digital isolation chip
>> propagation time, particularly when the codec is master and
>> the DAC return is twice delayed.
>>
>> This patch sets sample alignment registers  based on the substream
>> direction in hwparams. This gives the machine driver more control
>> over sample alignment in the bcm2835 i2s driver.
>>
>> Signed-off-by: Matt Flax <flatmax@flatmax.org>
>> ---
>>   sound/soc/bcm/bcm2835-i2s.c | 36 +++++++++++++++++++-----------------
>>   1 file changed, 19 insertions(+), 17 deletions(-)
>>
>> diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
>> index e6a12e271b07..9db542699a13 100644
>> --- a/sound/soc/bcm/bcm2835-i2s.c
>> +++ b/sound/soc/bcm/bcm2835-i2s.c
>> @@ -493,11 +493,6 @@ static int bcm2835_i2s_hw_params(struct 
>> snd_pcm_substream *substream,
>>           return -EINVAL;
>>       }
>>   -    bcm2835_i2s_calc_channel_pos(&rx_ch1_pos, &rx_ch2_pos,
>> -        rx_mask, slot_width, data_delay, odd_slot_offset);
>> -    bcm2835_i2s_calc_channel_pos(&tx_ch1_pos, &tx_ch2_pos,
>> -        tx_mask, slot_width, data_delay, odd_slot_offset);
>> -
>>       /*
>>        * Transmitting data immediately after frame start, eg
>>        * in left-justified or DSP mode A, only works stable
>> @@ -508,19 +503,26 @@ static int bcm2835_i2s_hw_params(struct 
>> snd_pcm_substream *substream,
>>               "Unstable slave config detected, L/R may be swapped");
>>         /*
>> -     * Set format for both streams.
>> -     * We cannot set another frame length
>> -     * (and therefore word length) anyway,
>> -     * so the format will be the same.
>> +     * Set format on a per stream basis.
>> +     * The alignment format can be different depending on direction.
>>        */
>> -    regmap_write(dev->i2s_regmap, BCM2835_I2S_RXC_A_REG,
>> -          format
>> -        | BCM2835_I2S_CH1_POS(rx_ch1_pos)
>> -        | BCM2835_I2S_CH2_POS(rx_ch2_pos));
>> -    regmap_write(dev->i2s_regmap, BCM2835_I2S_TXC_A_REG,
>> -          format
>> -        | BCM2835_I2S_CH1_POS(tx_ch1_pos)
>> -        | BCM2835_I2S_CH2_POS(tx_ch2_pos));
>> +    if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
>> +        bcm2835_i2s_calc_channel_pos(&rx_ch1_pos, &rx_ch2_pos,
>> +            rx_mask, slot_width, data_delay, odd_slot_offset);
>> +        regmap_write(dev->i2s_regmap, BCM2835_I2S_RXC_A_REG,
>> +              format
>> +            | BCM2835_I2S_CH1_POS(rx_ch1_pos)
>> +            | BCM2835_I2S_CH2_POS(rx_ch2_pos));
>> +    }
>> +
>> +    if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
>> +        bcm2835_i2s_calc_channel_pos(&tx_ch1_pos, &tx_ch2_pos,
>> +            tx_mask, slot_width, data_delay, odd_slot_offset);
>> +        regmap_write(dev->i2s_regmap, BCM2835_I2S_TXC_A_REG,
>> +              format
>> +            | BCM2835_I2S_CH1_POS(tx_ch1_pos)
>> +            | BCM2835_I2S_CH2_POS(tx_ch2_pos));
>> +    }
>>         /* Setup the I2S mode */

  reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-24  9:08 Matt Flax
2020-03-26 23:56 ` Matt Flax
2020-03-27  0:30   ` Matt Flax [this message]
2020-03-27 13:23     ` Matthias Reichl
2020-03-27 21:50       ` Matt Flax
2020-03-28 11:59         ` Matthias Reichl
2020-03-28 23:47           ` Matt Flax
2020-03-29 11:01             ` Matthias Reichl
2020-03-27 13:07   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1dcf128a-4ad3-0efa-81e4-b3ccc7caa8f1@flatmax.org \
    --to=flatmax@flatmax.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git