Skip to content

Commit 834bce6

Browse files
pundiramitvinodkoul
authored andcommitted
soundwire: Revert "soundwire: qcom: Add set_channel_map api support"
This reverts commit 7796c97. This patch broke Dragonboard 845c (sdm845). I see: Unexpected kernel BRK exception at EL1 Internal error: BRK handler: 00000000f20003e8 [#1] SMP pc : qcom_swrm_set_channel_map+0x7c/0x80 [soundwire_qcom] lr : snd_soc_dai_set_channel_map+0x34/0x78 Call trace: qcom_swrm_set_channel_map+0x7c/0x80 [soundwire_qcom] (P) sdm845_dai_init+0x18c/0x2e0 [snd_soc_sdm845] snd_soc_link_init+0x28/0x6c snd_soc_bind_card+0x5f4/0xb0c snd_soc_register_card+0x148/0x1a4 devm_snd_soc_register_card+0x50/0xb0 sdm845_snd_platform_probe+0x124/0x148 [snd_soc_sdm845] platform_probe+0x6c/0xd0 really_probe+0xc0/0x2a4 __driver_probe_device+0x7c/0x130 driver_probe_device+0x40/0x118 __device_attach_driver+0xc4/0x108 bus_for_each_drv+0x8c/0xf0 __device_attach+0xa4/0x198 device_initial_probe+0x18/0x28 bus_probe_device+0xb8/0xbc deferred_probe_work_func+0xac/0xfc process_one_work+0x244/0x658 worker_thread+0x1b4/0x360 kthread+0x148/0x228 ret_from_fork+0x10/0x20 Kernel panic - not syncing: BRK handler: Fatal exception Dan has also reported following issues with the original patch https://lore.kernel.org/all/[email protected]/ Bug #1: The zeroeth element of ctrl->pconfig[] is supposed to be unused. We start counting at 1. However this code sets ctrl->pconfig[0].ch_mask = 128. Bug #2: There are SLIM_MAX_TX_PORTS (16) elements in tx_ch[] array but only QCOM_SDW_MAX_PORTS + 1 (15) in the ctrl->pconfig[] array so it corrupts memory like Yongqin Liu pointed out. Bug 3: Like Jie Gan pointed out, it erases all the tx information with the rx information. Cc: [email protected] # v6.15+ Signed-off-by: Amit Pundir <[email protected]> Acked-by: Srinivas Kandagatla <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent a628e69 commit 834bce6

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

drivers/soundwire/qcom.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ struct qcom_swrm_port_config {
156156
u8 word_length;
157157
u8 blk_group_count;
158158
u8 lane_control;
159-
u8 ch_mask;
160159
};
161160

162161
/*
@@ -1049,13 +1048,9 @@ static int qcom_swrm_port_enable(struct sdw_bus *bus,
10491048
{
10501049
u32 reg = SWRM_DP_PORT_CTRL_BANK(enable_ch->port_num, bank);
10511050
struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus);
1052-
struct qcom_swrm_port_config *pcfg;
10531051
u32 val;
10541052

1055-
pcfg = &ctrl->pconfig[enable_ch->port_num];
10561053
ctrl->reg_read(ctrl, reg, &val);
1057-
if (pcfg->ch_mask != SWR_INVALID_PARAM && pcfg->ch_mask != 0)
1058-
enable_ch->ch_mask = pcfg->ch_mask;
10591054

10601055
if (enable_ch->enable)
10611056
val |= (enable_ch->ch_mask << SWRM_DP_PORT_CTRL_EN_CHAN_SHFT);
@@ -1275,26 +1270,6 @@ static void *qcom_swrm_get_sdw_stream(struct snd_soc_dai *dai, int direction)
12751270
return ctrl->sruntime[dai->id];
12761271
}
12771272

1278-
static int qcom_swrm_set_channel_map(struct snd_soc_dai *dai,
1279-
unsigned int tx_num, const unsigned int *tx_slot,
1280-
unsigned int rx_num, const unsigned int *rx_slot)
1281-
{
1282-
struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev);
1283-
int i;
1284-
1285-
if (tx_slot) {
1286-
for (i = 0; i < tx_num; i++)
1287-
ctrl->pconfig[i].ch_mask = tx_slot[i];
1288-
}
1289-
1290-
if (rx_slot) {
1291-
for (i = 0; i < rx_num; i++)
1292-
ctrl->pconfig[i].ch_mask = rx_slot[i];
1293-
}
1294-
1295-
return 0;
1296-
}
1297-
12981273
static int qcom_swrm_startup(struct snd_pcm_substream *substream,
12991274
struct snd_soc_dai *dai)
13001275
{
@@ -1331,7 +1306,6 @@ static const struct snd_soc_dai_ops qcom_swrm_pdm_dai_ops = {
13311306
.shutdown = qcom_swrm_shutdown,
13321307
.set_stream = qcom_swrm_set_sdw_stream,
13331308
.get_stream = qcom_swrm_get_sdw_stream,
1334-
.set_channel_map = qcom_swrm_set_channel_map,
13351309
};
13361310

13371311
static const struct snd_soc_component_driver qcom_swrm_dai_component = {

0 commit comments

Comments
 (0)