Skip to content

Commit 9468bc0

Browse files
bardliaovinodkoul
authored andcommitted
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 <yung-chuan.liao@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://patch.msgid.link/20251014031450.3781789-7-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 167efc6 commit 9468bc0

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
@@ -2393,7 +2393,7 @@ EXPORT_SYMBOL(sdw_cdns_prepare_write_dma_buffer);
23932393

23942394
int sdw_cdns_prepare_read_dma_buffer(u8 dev_num, u32 start_register, int data_size,
23952395
int data_per_frame, u8 *dma_buffer, int dma_buffer_size,
2396-
int *dma_buffer_total_bytes)
2396+
int *dma_buffer_total_bytes, unsigned int fake_size)
23972397
{
23982398
int total_dma_data_written = 0;
23992399
u8 *p_dma_buffer = dma_buffer;
@@ -2445,6 +2445,43 @@ int sdw_cdns_prepare_read_dma_buffer(u8 dev_num, u32 start_register, int data_si
24452445
if (ret < 0)
24462446
return ret;
24472447

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

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)