Skip to content

Commit 2b620f4

Browse files
lyakhlgirdwood
lyakh
authored and
lgirdwood
committed
coherent: remove now redundant _irq version of functions
Now coherent_acquire_irq() has become equivalent to coherent_acquire(), similar for coherent_release() and coherent_shared(). Remove the _irq version and its only user - the buffer locking API. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 52b33a2 commit 2b620f4

File tree

22 files changed

+136
-240
lines changed

22 files changed

+136
-240
lines changed

‎src/audio/asrc/asrc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -987,14 +987,14 @@ static int asrc_copy(struct comp_dev *dev)
987987
sink = list_first_item(&dev->bsink_list, struct comp_buffer,
988988
source_list);
989989

990-
source = buffer_acquire_irq(source);
991-
sink = buffer_acquire_irq(sink);
990+
source = buffer_acquire(source);
991+
sink = buffer_acquire(sink);
992992

993993
frames_src = audio_stream_get_avail_frames(&source->stream);
994994
frames_snk = audio_stream_get_free_frames(&sink->stream);
995995

996-
buffer_release_irq(sink);
997-
buffer_release_irq(source);
996+
buffer_release(sink);
997+
buffer_release(source);
998998

999999
if (cd->mode == ASRC_OM_PULL) {
10001000
/* Let ASRC access max number of source frames in pull mode.

‎src/audio/buffer.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ void comp_update_buffer_produce(struct comp_buffer *buffer, uint32_t bytes)
190190
return;
191191
}
192192

193-
buffer = buffer_acquire_irq(buffer);
193+
buffer = buffer_acquire(buffer);
194194

195195
audio_stream_produce(&buffer->stream, bytes);
196196

@@ -205,7 +205,7 @@ void comp_update_buffer_produce(struct comp_buffer *buffer, uint32_t bytes)
205205
((char *)buffer->stream.r_ptr - (char *)buffer->stream.addr) << 16 |
206206
((char *)buffer->stream.w_ptr - (char *)buffer->stream.addr));
207207

208-
buffer = buffer_release_irq(buffer);
208+
buffer = buffer_release(buffer);
209209
}
210210

211211
void comp_update_buffer_consume(struct comp_buffer *buffer, uint32_t bytes)
@@ -226,7 +226,7 @@ void comp_update_buffer_consume(struct comp_buffer *buffer, uint32_t bytes)
226226
return;
227227
}
228228

229-
buffer = buffer_acquire_irq(buffer);
229+
buffer = buffer_acquire(buffer);
230230

231231
audio_stream_consume(&buffer->stream, bytes);
232232

@@ -240,5 +240,5 @@ void comp_update_buffer_consume(struct comp_buffer *buffer, uint32_t bytes)
240240
((char *)buffer->stream.r_ptr - (char *)buffer->stream.addr) << 16 |
241241
((char *)buffer->stream.w_ptr - (char *)buffer->stream.addr));
242242

243-
buffer = buffer_release_irq(buffer);
243+
buffer = buffer_release(buffer);
244244
}

‎src/audio/crossover/crossover.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,26 +671,26 @@ static int crossover_copy(struct comp_dev *dev)
671671
else
672672
num_sinks = num_assigned_sinks;
673673

674-
source = buffer_acquire_irq(source);
674+
source = buffer_acquire(source);
675675

676676
/* Check if source is active */
677677
if (source->source->state != dev->state) {
678-
source = buffer_release_irq(source);
678+
source = buffer_release(source);
679679
return -EINVAL;
680680
}
681681

682682
/* Find the number of frames to copy over */
683683
for (i = 0; i < num_sinks; i++) {
684684
if (!sinks[i])
685685
continue;
686-
sinks[i] = buffer_acquire_irq(sinks[i]);
686+
sinks[i] = buffer_acquire(sinks[i]);
687687
avail = audio_stream_avail_frames(&source->stream,
688688
&sinks[i]->stream);
689689
frames = MIN(frames, avail);
690-
buffer_release_irq(sinks[i]);
690+
buffer_release(sinks[i]);
691691
}
692692

693-
source = buffer_release_irq(source);
693+
source = buffer_release(source);
694694

695695
source_bytes = frames * audio_stream_frame_bytes(&source->stream);
696696

‎src/audio/dai.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ static int dai_copy(struct comp_dev *dev)
910910
return ret;
911911
}
912912

913-
buf = buffer_acquire_irq(buf);
913+
buf = buffer_acquire(buf);
914914

915915
/* calculate minimum size to copy */
916916
if (dev->direction == SOF_IPC_STREAM_PLAYBACK) {
@@ -930,7 +930,7 @@ static int dai_copy(struct comp_dev *dev)
930930

931931
copy_bytes = samples * sampling;
932932

933-
buffer_release_irq(buf);
933+
buffer_release(buf);
934934

935935
comp_dbg(dev, "dai_copy(), dir: %d copy_bytes= 0x%x, frames= %d",
936936
dev->direction, copy_bytes,

‎src/audio/google_hotword_detect.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,9 @@ static int ghd_copy(struct comp_dev *dev)
396396
struct comp_buffer, sink_list);
397397
stream = &source->stream;
398398

399-
source = buffer_acquire_irq(source);
399+
source = buffer_acquire(source);
400400
bytes = audio_stream_get_avail_bytes(&source->stream);
401-
source = buffer_release_irq(source);
401+
source = buffer_release(source);
402402

403403
comp_dbg(dev, "ghd_copy() avail_bytes %u", bytes);
404404
comp_dbg(dev, "buffer begin/r_ptr/end [0x%x 0x%x 0x%x]",

‎src/audio/google_rtc_audio_processing.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,12 @@ static int google_rtc_audio_processing_prepare(struct comp_dev *dev)
248248
list_for_item(source_buffer_list_item, &dev->bsource_list) {
249249
source_buffer = container_of(source_buffer_list_item, struct comp_buffer,
250250
sink_list);
251-
source_buffer = buffer_acquire_irq(source_buffer);
251+
source_buffer = buffer_acquire(source_buffer);
252252
if (source_buffer->source->ipc_config.type == SOF_COMP_DEMUX)
253253
cd->aec_reference = source_buffer;
254254
else if (source_buffer->source->ipc_config.type == SOF_COMP_DAI)
255255
cd->raw_microphone = source_buffer;
256-
source_buffer = buffer_release_irq(source_buffer);
256+
source_buffer = buffer_release(source_buffer);
257257
}
258258

259259
cd->output = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
@@ -297,10 +297,10 @@ static int google_rtc_audio_processing_copy(struct comp_dev *dev)
297297
uint32_t num_aec_reference_frames;
298298
uint32_t num_aec_reference_bytes;
299299

300-
cd->aec_reference = buffer_acquire_irq(cd->aec_reference);
300+
cd->aec_reference = buffer_acquire(cd->aec_reference);
301301
num_aec_reference_frames = audio_stream_get_avail_frames(&cd->aec_reference->stream);
302302
num_aec_reference_bytes = audio_stream_get_avail_bytes(&cd->aec_reference->stream);
303-
cd->aec_reference = buffer_release_irq(cd->aec_reference);
303+
cd->aec_reference = buffer_release(cd->aec_reference);
304304

305305
buffer_stream_invalidate(cd->aec_reference, num_aec_reference_bytes);
306306

‎src/audio/host.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,15 @@ static uint32_t host_get_copy_bytes_one_shot(struct comp_dev *dev)
170170
struct comp_buffer *buffer = hd->local_buffer;
171171
uint32_t copy_bytes = 0;
172172

173-
buffer = buffer_acquire_irq(buffer);
173+
buffer = buffer_acquire(buffer);
174174

175175
/* calculate minimum size to copy */
176176
if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
177177
copy_bytes = audio_stream_get_free_bytes(&buffer->stream);
178178
else
179179
copy_bytes = audio_stream_get_avail_bytes(&buffer->stream);
180180

181-
buffer_release_irq(buffer);
181+
buffer_release(buffer);
182182

183183
/* copy_bytes should be aligned to minimum possible chunk of
184184
* data to be copied by dma.
@@ -240,15 +240,15 @@ static uint32_t host_get_copy_bytes_one_shot(struct comp_dev *dev)
240240
uint32_t copy_bytes = 0;
241241
uint32_t split_value;
242242

243-
buffer = buffer_acquire_irq(buffer);
243+
buffer = buffer_acquire(buffer);
244244

245245
/* calculate minimum size to copy */
246246
if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
247247
copy_bytes = audio_stream_get_free_bytes(&buffer->stream);
248248
else
249249
copy_bytes = audio_stream_get_avail_bytes(&buffer->stream);
250250

251-
buffer_release_irq(buffer);
251+
buffer_release(buffer);
252252

253253
/* copy_bytes should be aligned to minimum possible chunk of
254254
* data to be copied by dma.
@@ -450,7 +450,7 @@ static uint32_t host_get_copy_bytes_normal(struct comp_dev *dev)
450450
return 0;
451451
}
452452

453-
buffer = buffer_acquire_irq(buffer);
453+
buffer = buffer_acquire(buffer);
454454

455455
/* calculate minimum size to copy */
456456
if (dev->direction == SOF_IPC_STREAM_PLAYBACK) {
@@ -470,7 +470,7 @@ static uint32_t host_get_copy_bytes_normal(struct comp_dev *dev)
470470
avail_bytes, free_bytes);
471471
}
472472

473-
buffer = buffer_release_irq(buffer);
473+
buffer = buffer_release(buffer);
474474

475475
/* copy_bytes should be aligned to minimum possible chunk of
476476
* data to be copied by dma.

‎src/audio/kpb.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -640,17 +640,17 @@ static int kpb_copy(struct comp_dev *dev)
640640
goto out;
641641
}
642642

643-
source = buffer_acquire_irq(source);
643+
source = buffer_acquire(source);
644644

645645
/* Validate source */
646646
if (!source->stream.r_ptr) {
647647
comp_err(dev, "kpb_copy(): invalid source pointers.");
648648
ret = -EINVAL;
649-
source = buffer_release_irq(source);
649+
source = buffer_release(source);
650650
goto out;
651651
}
652652

653-
source = buffer_release_irq(source);
653+
source = buffer_release(source);
654654

655655
switch (kpb->state) {
656656
case KPB_STATE_RUN:
@@ -664,17 +664,17 @@ static int kpb_copy(struct comp_dev *dev)
664664
goto out;
665665
}
666666

667-
sink = buffer_acquire_irq(sink);
667+
sink = buffer_acquire(sink);
668668

669669
/* Validate sink */
670670
if (!sink->stream.w_ptr) {
671671
comp_err(dev, "kpb_copy(): invalid selector sink pointers.");
672672
ret = -EINVAL;
673-
sink = buffer_release_irq(sink);
673+
sink = buffer_release(sink);
674674
goto out;
675675
}
676676

677-
sink = buffer_release_irq(sink);
677+
sink = buffer_release(sink);
678678

679679
copy_bytes = audio_stream_get_copy_bytes(&source->stream, &sink->stream);
680680
if (!copy_bytes) {
@@ -723,17 +723,17 @@ static int kpb_copy(struct comp_dev *dev)
723723
goto out;
724724
}
725725

726-
sink = buffer_acquire_irq(sink);
726+
sink = buffer_acquire(sink);
727727

728728
/* Validate sink */
729729
if (!sink->stream.w_ptr) {
730730
comp_err(dev, "kpb_copy(): invalid host sink pointers.");
731731
ret = -EINVAL;
732-
sink = buffer_release_irq(sink);
732+
sink = buffer_release(sink);
733733
goto out;
734734
}
735735

736-
sink = buffer_release_irq(sink);
736+
sink = buffer_release(sink);
737737

738738
copy_bytes = audio_stream_get_copy_bytes(&source->stream, &sink->stream);
739739
if (!copy_bytes) {

‎src/audio/mixer.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,11 @@ static int mixer_copy(struct comp_dev *dev)
351351
/* write zeros if all sources are inactive */
352352
if (num_mix_sources == 0) {
353353
uint32_t free_frames;
354-
sink = buffer_acquire_irq(sink);
354+
sink = buffer_acquire(sink);
355355
free_frames = audio_stream_get_free_frames(&sink->stream);
356356
frames = MIN(frames, free_frames);
357357
sink_bytes = frames * audio_stream_frame_bytes(&sink->stream);
358-
sink = buffer_release_irq(sink);
358+
sink = buffer_release(sink);
359359

360360
if (!audio_stream_set_zero(&sink->stream, sink_bytes)) {
361361
buffer_stream_writeback(sink, sink_bytes);
@@ -365,19 +365,19 @@ static int mixer_copy(struct comp_dev *dev)
365365
return 0;
366366
}
367367

368-
sink = buffer_acquire_irq(sink);
368+
sink = buffer_acquire(sink);
369369

370370
/* check for underruns */
371371
for (i = 0; i < num_mix_sources; i++) {
372372
uint32_t avail_frames;
373-
sources[i] = buffer_acquire_irq(sources[i]);
373+
sources[i] = buffer_acquire(sources[i]);
374374
avail_frames = audio_stream_avail_frames(sources_stream[i],
375375
&sink->stream);
376376
frames = MIN(frames, avail_frames);
377-
sources[i] = buffer_release_irq(sources[i]);
377+
sources[i] = buffer_release(sources[i]);
378378
}
379379

380-
sink = buffer_release_irq(sink);
380+
sink = buffer_release(sink);
381381

382382
/* Every source has the same format, so calculate bytes based
383383
* on the first one.

‎src/audio/mux/mux.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ static int demux_copy(struct comp_dev *dev)
438438
// align sink streams with their respective configurations
439439
list_for_item(clist, &dev->bsink_list) {
440440
sink = container_of(clist, struct comp_buffer, source_list);
441-
sink = buffer_acquire_irq(sink);
441+
sink = buffer_acquire(sink);
442442
if (sink->sink->state == dev->state) {
443443
num_sinks++;
444444
i = get_stream_index(cd, sink->pipeline_id);
@@ -449,7 +449,7 @@ static int demux_copy(struct comp_dev *dev)
449449
sinks[i] = sink;
450450
look_ups[i] = look_up;
451451
}
452-
sink = buffer_release_irq(sink);
452+
sink = buffer_release(sink);
453453
}
454454

455455
/* if there are no sinks active */
@@ -459,25 +459,25 @@ static int demux_copy(struct comp_dev *dev)
459459
source = list_first_item(&dev->bsource_list, struct comp_buffer,
460460
sink_list);
461461

462-
source = buffer_acquire_irq(source);
462+
source = buffer_acquire(source);
463463

464464
/* check if source is active */
465465
if (source->source->state != dev->state) {
466-
source = buffer_release_irq(source);
466+
source = buffer_release(source);
467467
return 0;
468468
}
469469

470470
for (i = 0; i < MUX_MAX_STREAMS; i++) {
471471
if (!sinks[i])
472472
continue;
473-
sinks[i] = buffer_acquire_irq(sinks[i]);
473+
sinks[i] = buffer_acquire(sinks[i]);
474474
avail = audio_stream_avail_frames(&source->stream,
475475
&sinks[i]->stream);
476476
frames = MIN(frames, avail);
477-
buffer_release_irq(sinks[i]);
477+
buffer_release(sinks[i]);
478478
}
479479

480-
source = buffer_release_irq(source);
480+
source = buffer_release(source);
481481

482482
source_bytes = frames * audio_stream_frame_bytes(&source->stream);
483483
for (i = 0; i < MUX_MAX_STREAMS; i++) {
@@ -537,7 +537,7 @@ static int mux_copy(struct comp_dev *dev)
537537
/* align source streams with their respective configurations */
538538
list_for_item(clist, &dev->bsource_list) {
539539
source = container_of(clist, struct comp_buffer, sink_list);
540-
source = buffer_acquire_irq(source);
540+
source = buffer_acquire(source);
541541
if (source->source->state == dev->state) {
542542
num_sources++;
543543
i = get_stream_index(cd, source->pipeline_id);
@@ -547,7 +547,7 @@ static int mux_copy(struct comp_dev *dev)
547547
sources[i] = source;
548548
sources_stream[i] = &source->stream;
549549
} else {
550-
source = buffer_release_irq(source);
550+
source = buffer_release(source);
551551
}
552552
}
553553

@@ -558,17 +558,17 @@ static int mux_copy(struct comp_dev *dev)
558558
sink = list_first_item(&dev->bsink_list, struct comp_buffer,
559559
source_list);
560560

561-
sink = buffer_acquire_irq(sink);
561+
sink = buffer_acquire(sink);
562562

563563
/* check if sink is active */
564564
if (sink->sink->state != dev->state) {
565565
for (i = 0; i < MUX_MAX_STREAMS; i++) {
566566
if (!sources[i])
567567
continue;
568-
buffer_release_irq(sources[i]);
568+
buffer_release(sources[i]);
569569
}
570570

571-
sink = buffer_release_irq(sink);
571+
sink = buffer_release(sink);
572572
return 0;
573573
}
574574

@@ -579,10 +579,10 @@ static int mux_copy(struct comp_dev *dev)
579579
avail_frames = audio_stream_avail_frames(sources_stream[i],
580580
&sink->stream);
581581
frames = MIN(frames, avail_frames);
582-
sources[i] = buffer_release_irq(sources[i]);
582+
sources[i] = buffer_release(sources[i]);
583583
}
584584

585-
sink = buffer_release_irq(sink);
585+
sink = buffer_release(sink);
586586

587587
for (i = 0; i < MUX_MAX_STREAMS; i++) {
588588
if (!sources[i])

0 commit comments

Comments
 (0)