superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soundwire: intel_ace2x: handle multi BPT sections 

Calculate required PDI buffer and pass the section number to the cdns
BPT helpers.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Tested-by: Shuming Fan <shumingf@realtek.com>
Link: https://patch.msgid.link/20251021094355.132943-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
pull/1354/merge
Bard Liao 2025-10-21 17:43:54 +08:00 committed by Vinod Koul
parent fe8a9cf75c
commit 188d194be2
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/soundwire/intel_ace2x.c
View File

@ -57,6 +57,8 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
struct sdw_port_config *pconfig; struct sdw_port_config *pconfig;
unsigned int pdi0_buf_size_pre_frame; unsigned int pdi0_buf_size_pre_frame;
unsigned int pdi1_buf_size_pre_frame; unsigned int pdi1_buf_size_pre_frame;
unsigned int pdi0_buffer_size_;
unsigned int pdi1_buffer_size_;
unsigned int pdi0_buffer_size; unsigned int pdi0_buffer_size;
unsigned int tx_dma_bandwidth; unsigned int tx_dma_bandwidth;
unsigned int pdi1_buffer_size; unsigned int pdi1_buffer_size;
@ -68,6 +70,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
struct sdw_cdns_pdi *pdi1; struct sdw_cdns_pdi *pdi1;
unsigned int rx_alignment; unsigned int rx_alignment;
unsigned int tx_alignment; unsigned int tx_alignment;
unsigned int num_frames_;
unsigned int num_frames; unsigned int num_frames;
unsigned int fake_size; unsigned int fake_size;
unsigned int tx_pad; unsigned int tx_pad;
@ -76,6 +79,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
int ret1; int ret1;
int ret; int ret;
int dir; int dir;
int len;
int i; int i;
stream = sdw_alloc_stream("BPT", SDW_STREAM_BPT); stream = sdw_alloc_stream("BPT", SDW_STREAM_BPT);
@ -155,12 +159,25 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
if (ret < 0) if (ret < 0)
goto deprepare_stream; goto deprepare_stream;
ret = sdw_cdns_bpt_find_buffer_sizes(command, cdns->bus.params.row, cdns->bus.params.col, len = 0;
msg->sec[0].len, SDW_BPT_MSG_MAX_BYTES, pdi0_buffer_size = 0;
&data_per_frame, &pdi0_buffer_size, &pdi1_buffer_size, pdi1_buffer_size = 0;
&num_frames); num_frames = 0;
if (ret < 0) /* Add up pdi buffer size and frame numbers of each BPT sections */
goto deprepare_stream; for (i = 0; i < msg->sections; i++) {
ret = sdw_cdns_bpt_find_buffer_sizes(command, cdns->bus.params.row,
cdns->bus.params.col,
msg->sec[i].len, SDW_BPT_MSG_MAX_BYTES,
&data_per_frame, &pdi0_buffer_size_,
&pdi1_buffer_size_, &num_frames_);
if (ret < 0)
goto deprepare_stream;
len += msg->sec[i].len;
pdi0_buffer_size += pdi0_buffer_size_;
pdi1_buffer_size += pdi1_buffer_size_;
num_frames += num_frames_;
}
sdw->bpt_ctx.pdi0_buffer_size = pdi0_buffer_size; sdw->bpt_ctx.pdi0_buffer_size = pdi0_buffer_size;
sdw->bpt_ctx.pdi1_buffer_size = pdi1_buffer_size; sdw->bpt_ctx.pdi1_buffer_size = pdi1_buffer_size;
@ -205,7 +222,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
} }
dev_dbg(cdns->dev, "Message len %d transferred in %d frames (%d per frame)\n", dev_dbg(cdns->dev, "Message len %d transferred in %d frames (%d per frame)\n",
msg->sec[0].len, num_frames, data_per_frame); len, num_frames, data_per_frame);
dev_dbg(cdns->dev, "sizes pdi0 %d pdi1 %d tx_bandwidth %d rx_bandwidth %d\n", dev_dbg(cdns->dev, "sizes pdi0 %d pdi1 %d tx_bandwidth %d rx_bandwidth %d\n",
pdi0_buffer_size, pdi1_buffer_size, tx_dma_bandwidth, rx_dma_bandwidth); pdi0_buffer_size, pdi1_buffer_size, tx_dma_bandwidth, rx_dma_bandwidth);
@ -220,12 +237,12 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
} }
if (!command) { if (!command) {
ret = sdw_cdns_prepare_write_dma_buffer(msg->dev_num, msg->sec, 1, ret = sdw_cdns_prepare_write_dma_buffer(msg->dev_num, msg->sec, msg->sections,
data_per_frame, data_per_frame,
sdw->bpt_ctx.dmab_tx_bdl.area, sdw->bpt_ctx.dmab_tx_bdl.area,
pdi0_buffer_size, &tx_total_bytes); pdi0_buffer_size, &tx_total_bytes);
} else { } else {
ret = sdw_cdns_prepare_read_dma_buffer(msg->dev_num, msg->sec, 1, ret = sdw_cdns_prepare_read_dma_buffer(msg->dev_num, msg->sec, msg->sections,
data_per_frame, data_per_frame,
sdw->bpt_ctx.dmab_tx_bdl.area, sdw->bpt_ctx.dmab_tx_bdl.area,
pdi0_buffer_size, &tx_total_bytes, pdi0_buffer_size, &tx_total_bytes,
@ -304,11 +321,16 @@ static int intel_ace2x_bpt_send_async(struct sdw_intel *sdw, struct sdw_slave *s
struct sdw_bpt_msg *msg) struct sdw_bpt_msg *msg)
{ {
struct sdw_cdns *cdns = &sdw->cdns; struct sdw_cdns *cdns = &sdw->cdns;
int len = 0;
int ret; int ret;
int i;
if (msg->sec[0].len < INTEL_BPT_MSG_BYTE_MIN) { for (i = 0; i < msg->sections; i++)
len += msg->sec[i].len;
if (len < INTEL_BPT_MSG_BYTE_MIN) {
dev_err(cdns->dev, "BPT message length %d is less than the minimum bytes %d\n", dev_err(cdns->dev, "BPT message length %d is less than the minimum bytes %d\n",
msg->sec[0].len, INTEL_BPT_MSG_BYTE_MIN); len, INTEL_BPT_MSG_BYTE_MIN);
return -EINVAL; return -EINVAL;
} }
@ -368,7 +390,7 @@ static int intel_ace2x_bpt_wait(struct sdw_intel *sdw, struct sdw_slave *slave,
} else { } else {
ret = sdw_cdns_check_read_response(cdns->dev, sdw->bpt_ctx.dmab_rx_bdl.area, ret = sdw_cdns_check_read_response(cdns->dev, sdw->bpt_ctx.dmab_rx_bdl.area,
sdw->bpt_ctx.pdi1_buffer_size, sdw->bpt_ctx.pdi1_buffer_size,
msg->sec, 1, sdw->bpt_ctx.num_frames, msg->sec, msg->sections, sdw->bpt_ctx.num_frames,
sdw->bpt_ctx.data_per_frame); sdw->bpt_ctx.data_per_frame);
if (ret < 0) if (ret < 0)
dev_err(cdns->dev, "%s: BPT Read failed %d\n", __func__, ret); dev_err(cdns->dev, "%s: BPT Read failed %d\n", __func__, ret);