Commit e6dcc92f authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: replace ack callback to flush isoc contexts in AMDTP domain 



An isoc context for AMDTP stream is flushed to queue packet
by a call of pcm.ack. This commit extends this for AMDTP
domain.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191018061911.24909-4-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f890f9a0

sound/firewire/amdtp-stream.c

+15 −9
Original line number Diff line number Diff line
@@ -1139,23 +1139,29 @@ unsigned long amdtp_domain_stream_pcm_pointer(struct amdtp_domain *d, 
EXPORT_SYMBOL_GPL(amdtp_domain_stream_pcm_pointer);



/**

 * amdtp_stream_pcm_ack - acknowledge queued PCM frames

 * amdtp_domain_stream_pcm_ack - acknowledge queued PCM frames

 * @d: the AMDTP domain.

 * @s: the AMDTP stream that transfers the PCM frames

 *

 * Returns zero always.

 */

int amdtp_stream_pcm_ack(struct amdtp_stream *s)

int amdtp_domain_stream_pcm_ack(struct amdtp_domain *d, struct amdtp_stream *s)

{

	/*

	 * Process isochronous packets for recent isochronous cycle to handle

	 * queued PCM frames.

	 */

	if (amdtp_stream_running(s))

		fw_iso_context_flush_completions(s->context);

	struct amdtp_stream *irq_target = d->irq_target;



	// Process isochronous packets for recent isochronous cycle to handle

	// queued PCM frames.

	if (irq_target && amdtp_stream_running(irq_target)) {

		// Queued packet should be processed without any kernel

		// preemption to keep latency against bus cycle.

		preempt_disable();

		fw_iso_context_flush_completions(irq_target->context);

		preempt_enable();

	}



	return 0;

}

EXPORT_SYMBOL(amdtp_stream_pcm_ack);

EXPORT_SYMBOL_GPL(amdtp_domain_stream_pcm_ack);



/**

 * amdtp_stream_update - update the stream after a bus reset

sound/firewire/amdtp-stream.h

+2 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s, 
					struct snd_pcm_runtime *runtime);



void amdtp_stream_pcm_prepare(struct amdtp_stream *s);

int amdtp_stream_pcm_ack(struct amdtp_stream *s);

void amdtp_stream_pcm_abort(struct amdtp_stream *s);



extern const unsigned int amdtp_syt_intervals[CIP_SFC_COUNT];
@@ -303,4 +302,6 @@ static inline int amdtp_domain_set_events_per_period(struct amdtp_domain *d, 


unsigned long amdtp_domain_stream_pcm_pointer(struct amdtp_domain *d,

					      struct amdtp_stream *s);

int amdtp_domain_stream_pcm_ack(struct amdtp_domain *d, struct amdtp_stream *s);



#endif

sound/firewire/bebob/bebob_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -332,14 +332,14 @@ static int pcm_capture_ack(struct snd_pcm_substream *substream) 
{

	struct snd_bebob *bebob = substream->private_data;



	return amdtp_stream_pcm_ack(&bebob->tx_stream);

	return amdtp_domain_stream_pcm_ack(&bebob->domain, &bebob->tx_stream);

}



static int pcm_playback_ack(struct snd_pcm_substream *substream)

{

	struct snd_bebob *bebob = substream->private_data;



	return amdtp_stream_pcm_ack(&bebob->rx_stream);

	return amdtp_domain_stream_pcm_ack(&bebob->domain, &bebob->rx_stream);

}



int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)

sound/firewire/dice/dice-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int capture_ack(struct snd_pcm_substream *substream) 
	struct snd_dice *dice = substream->private_data;

	struct amdtp_stream *stream = &dice->tx_stream[substream->pcm->device];



	return amdtp_stream_pcm_ack(stream);

	return amdtp_domain_stream_pcm_ack(&dice->domain, stream);

}



static int playback_ack(struct snd_pcm_substream *substream)
@@ -402,7 +402,7 @@ static int playback_ack(struct snd_pcm_substream *substream) 
	struct snd_dice *dice = substream->private_data;

	struct amdtp_stream *stream = &dice->rx_stream[substream->pcm->device];



	return amdtp_stream_pcm_ack(stream);

	return amdtp_domain_stream_pcm_ack(&dice->domain, stream);

}



int snd_dice_create_pcm(struct snd_dice *dice)

sound/firewire/digi00x/digi00x-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -315,14 +315,14 @@ static int pcm_capture_ack(struct snd_pcm_substream *substream) 
{

	struct snd_dg00x *dg00x = substream->private_data;



	return amdtp_stream_pcm_ack(&dg00x->tx_stream);

	return amdtp_domain_stream_pcm_ack(&dg00x->domain, &dg00x->tx_stream);

}



static int pcm_playback_ack(struct snd_pcm_substream *substream)

{

	struct snd_dg00x *dg00x = substream->private_data;



	return amdtp_stream_pcm_ack(&dg00x->rx_stream);

	return amdtp_domain_stream_pcm_ack(&dg00x->domain, &dg00x->rx_stream);

}



int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x)

CRA Git | Maintained and supported by SUSTech CRA and CCSE