github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-13 16:59:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: Intel: avs: Allow to specify custom configurations with i2s_test

Browse Source 
Change 'i2s_test' module option from enable-flag to string allowing to
specify which SSP port and in what TDM configuration should be enabled.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250404090337.3564117-6-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Amadeusz Sławiński 2025-04-04 11:03:34 +02:00 committed by Mark Brown
parent d360b71372
commit 7d859189de
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
sound/soc/intel/avs/board_selection.c
View File

@ -17,10 +17,11 @@
#include <sound/soc-acpi.h>
#include <sound/soc-component.h>
#include "avs.h"
#include "utils.h"
static bool i2s_test;
module_param(i2s_test, bool, 0444);
MODULE_PARM_DESC(i2s_test, "Probe I2S test-board and skip all other I2S boards");
static char *i2s_test;
module_param(i2s_test, charp, 0444);
MODULE_PARM_DESC(i2s_test, "Use I2S test-board instead of ACPI, i2s_test=ssp0tdm,ssp1tdm,... 0 to ignore port");
static const struct dmi_system_id kbl_dmi_table[] = {
{
@ -324,52 +325,6 @@ static struct snd_soc_acpi_mach avs_mbl_i2s_machines[] = {
{}
};
static struct snd_soc_acpi_mach avs_test_i2s_machines[] = {
{
.drv_name = "avs_i2s_test",
.mach_params = {
.i2s_link_mask = AVS_SSP(0),
},
.tplg_filename = "i2s-test-tplg.bin",
},
{
.drv_name = "avs_i2s_test",
.mach_params = {
.i2s_link_mask = AVS_SSP(1),
},
.tplg_filename = "i2s-test-tplg.bin",
},
{
.drv_name = "avs_i2s_test",
.mach_params = {
.i2s_link_mask = AVS_SSP(2),
},
.tplg_filename = "i2s-test-tplg.bin",
},
{
.drv_name = "avs_i2s_test",
.mach_params = {
.i2s_link_mask = AVS_SSP(3),
},
.tplg_filename = "i2s-test-tplg.bin",
},
{
.drv_name = "avs_i2s_test",
.mach_params = {
.i2s_link_mask = AVS_SSP(4),
},
.tplg_filename = "i2s-test-tplg.bin",
},
{
.drv_name = "avs_i2s_test",
.mach_params = {
.i2s_link_mask = AVS_SSP(5),
},
.tplg_filename = "i2s-test-tplg.bin",
},
/* no NULL terminator, as we depend on ARRAY SIZE due to .id == NULL */
};
struct avs_acpi_boards {
int id;
struct snd_soc_acpi_mach *machs;
@ -529,6 +484,68 @@ static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach
return 0;
}
static int avs_register_i2s_test_board(struct avs_dev *adev, int ssp_port, int tdm_slot)
{
struct snd_soc_acpi_mach *mach;
int tdm_mask = BIT(tdm_slot);
unsigned long *tdm_cfg;
char *tplg_name;
int ret;
mach = devm_kzalloc(adev->dev, sizeof(*mach), GFP_KERNEL);
tdm_cfg = devm_kcalloc(adev->dev, ssp_port + 1, sizeof(unsigned long), GFP_KERNEL);
tplg_name = devm_kasprintf(adev->dev, GFP_KERNEL, AVS_STRING_FMT("i2s", "-test-tplg.bin",
ssp_port, tdm_slot));
if (!mach || !tdm_cfg || !tplg_name)
return -ENOMEM;
mach->drv_name = "avs_i2s_test";
mach->mach_params.i2s_link_mask = AVS_SSP(ssp_port);
tdm_cfg[ssp_port] = tdm_mask;
mach->pdata = tdm_cfg;
mach->tplg_filename = tplg_name;
ret = avs_register_i2s_board(adev, mach);
if (ret < 0) {
dev_warn(adev->dev, "register i2s %s failed: %d\n", mach->drv_name, ret);
return ret;
}
return 0;
}
static int avs_register_i2s_test_boards(struct avs_dev *adev)
{
int max_ssps = adev->hw_cfg.i2s_caps.ctrl_count;
int ssp_port, tdm_slot, ret;
unsigned long tdm_slots;
u32 *array, num_elems;
ret = parse_int_array(i2s_test, strlen(i2s_test), (int **)&array);
if (ret < 0) {
dev_err(adev->dev, "failed to parse i2s_test parameter\n");
return ret;
}
num_elems = *array;
if (num_elems > max_ssps) {
dev_err(adev->dev, "board supports only %d SSP, %d specified\n",
max_ssps, num_elems);
return -EINVAL;
}
for (ssp_port = 0; ssp_port < num_elems; ssp_port++) {
tdm_slots = array[1 + ssp_port];
for_each_set_bit(tdm_slot, &tdm_slots, 16) {
ret = avs_register_i2s_test_board(adev, ssp_port, tdm_slot);
if (ret)
return ret;
}
}
return 0;
}
static int avs_register_i2s_boards(struct avs_dev *adev)
{
const struct avs_acpi_boards *boards;
@ -540,23 +557,8 @@ static int avs_register_i2s_boards(struct avs_dev *adev)
return 0;
}
if (i2s_test) {
int i, num_ssps;
num_ssps = adev->hw_cfg.i2s_caps.ctrl_count;
/* constrain just in case FW says there can be more SSPs than possible */
num_ssps = min_t(int, ARRAY_SIZE(avs_test_i2s_machines), num_ssps);
mach = avs_test_i2s_machines;
for (i = 0; i < num_ssps; i++) {
ret = avs_register_i2s_board(adev, &mach[i]);
if (ret < 0)
dev_warn(adev->dev, "register i2s %s failed: %d\n", mach->drv_name,
ret);
}
return 0;
}
if (i2s_test)
return avs_register_i2s_test_boards(adev);
boards = avs_get_i2s_boards(adev);
if (!boards) {