Skip to content

Commit cfbb0d0

Browse files
committed
soundwire: cadence_master: add fake_size parameter to sdw_cdns_prepare_read_dma_buffer
We may need to add few fake frames to fit the aligned read dma buffer size. Add a fake_size parameter to allow the caller to set the fake data size. Signed-off-by: Bard Liao <[email protected]>
1 parent 9b5365a commit cfbb0d0

3 files changed

Lines changed: 40 additions & 3 deletions

File tree

drivers/soundwire/cadence_master.c

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2397,7 +2397,7 @@ EXPORT_SYMBOL(sdw_cdns_prepare_write_dma_buffer);
23972397

23982398
int sdw_cdns_prepare_read_dma_buffer(u8 dev_num, u32 start_register, int data_size,
23992399
int data_per_frame, u8 *dma_buffer, int dma_buffer_size,
2400-
int *dma_buffer_total_bytes)
2400+
int *dma_buffer_total_bytes, unsigned int fake_size)
24012401
{
24022402
int total_dma_data_written = 0;
24032403
u8 *p_dma_buffer = dma_buffer;
@@ -2449,6 +2449,43 @@ int sdw_cdns_prepare_read_dma_buffer(u8 dev_num, u32 start_register, int data_si
24492449
if (ret < 0)
24502450
return ret;
24512451

2452+
counter++;
2453+
2454+
p_dma_buffer += dma_data_written;
2455+
dma_buffer_size -= dma_data_written;
2456+
total_dma_data_written += dma_data_written;
2457+
}
2458+
2459+
/* Add fake frame */
2460+
header[0] &= ~GENMASK(7, 6); /* Set inactive flag in BPT/BRA frame heade */
2461+
while (fake_size >= data_per_frame) {
2462+
header[1] = data_per_frame;
2463+
ret = sdw_cdns_prepare_read_pd0_buffer(header, SDW_CDNS_BRA_HDR, p_dma_buffer,
2464+
dma_buffer_size, &dma_data_written,
2465+
counter);
2466+
if (ret < 0)
2467+
return ret;
2468+
2469+
counter++;
2470+
2471+
fake_size -= data_per_frame;
2472+
p_dma_buffer += dma_data_written;
2473+
dma_buffer_size -= dma_data_written;
2474+
total_dma_data_written += dma_data_written;
2475+
}
2476+
2477+
if (fake_size) {
2478+
header[1] = fake_size;
2479+
ret = sdw_cdns_prepare_read_pd0_buffer(header, SDW_CDNS_BRA_HDR, p_dma_buffer,
2480+
dma_buffer_size, &dma_data_written,
2481+
counter);
2482+
if (ret < 0)
2483+
return ret;
2484+
2485+
counter++;
2486+
2487+
p_dma_buffer += dma_data_written;
2488+
dma_buffer_size -= dma_data_written;
24522489
total_dma_data_written += dma_data_written;
24532490
}
24542491

drivers/soundwire/cadence_master.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ int sdw_cdns_prepare_write_dma_buffer(u8 dev_num, u32 start_register, u8 *data,
226226

227227
int sdw_cdns_prepare_read_dma_buffer(u8 dev_num, u32 start_register, int data_size,
228228
int data_per_frame, u8 *dma_buffer, int dma_buffer_size,
229-
int *dma_buffer_total_bytes);
229+
int *dma_buffer_total_bytes, unsigned int fake_size);
230230

231231
int sdw_cdns_check_write_response(struct device *dev, u8 *dma_buffer,
232232
int dma_buffer_size, int num_frames);

drivers/soundwire/intel_ace2x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
177177
ret = sdw_cdns_prepare_read_dma_buffer(msg->dev_num, msg->addr, msg->len,
178178
data_per_frame,
179179
sdw->bpt_ctx.dmab_tx_bdl.area,
180-
pdi0_buffer_size, &tx_total_bytes);
180+
pdi0_buffer_size, &tx_total_bytes, 0);
181181
}
182182

183183
if (!ret)

0 commit comments

Comments
 (0)