asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-31 21:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

topology: plugins: nhlt: fix ssp debug

Browse source 
Nhlt ssp plugin debug feature was broken due to recent change in ssp
indexing, thus fix it.

Signed-off-by: Jaska Uimonen <jaska.uimonen@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaska Uimonen 2022-12-07 15:32:10 +02:00 committed by Jaroslav Kysela
parent 4f7e1af85a
commit 8871d51aa1
2 changed files with 57 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
topology/nhlt/intel/ssp/ssp-debug.c
View file

@ -12,47 +12,46 @@
void ssp_print_calculated(struct intel_ssp_params *ssp) void ssp_print_calculated(struct intel_ssp_params *ssp)
{ {
int i, j; struct ssp_intel_config_data *blob;
int ssp_index = ssp->ssp_count;
int i;
fprintf(stdout, "printing ssp nhlt calculated data:\n"); fprintf(stdout, "printing ssp nhlt calculated data:\n");
/* top level struct */ /* top level struct */
fprintf(stdout, "ssp count %d\n", ssp->ssp_count); fprintf(stdout, "ssp index %d\n", ssp_index);
for (i = 0; i < ssp->ssp_count; i++) fprintf(stdout, "ssp %d dai_index: %u\n", ssp_index, ssp->ssp_dai_index[ssp_index]);
fprintf(stdout, "ssp %d dai_index: %u\n", i, ssp->ssp_dai_index[i]);
for (i = 0; i < ssp->ssp_count; i++) fprintf(stdout, "ssp %d hw_config_count: %u\n", ssp_index,
fprintf(stdout, "ssp %d hw_config_count: %u\n", i, ssp->ssp_hw_config_count[i]); ssp->ssp_hw_config_count[ssp_index]);
fprintf(stdout, "\n"); fprintf(stdout, "\n");
for (i = 0; i < ssp->ssp_count; i++) { for (i = 0; i < ssp->ssp_hw_config_count[ssp_index]; i++) {
for (j = 0; j < ssp->ssp_hw_config_count[i]; j++) { blob = &ssp->ssp_blob[ssp->ssp_count][i];
fprintf(stdout, "ssp blob %d hw_config %d\n", i, j); fprintf(stdout, "ssp blob %d hw_config %d\n", ssp->ssp_count, i);
fprintf(stdout, "gateway_attributes %u\n", fprintf(stdout, "gateway_attributes %u\n", blob->gateway_attributes);
ssp->ssp_blob[i][j].gateway_attributes); fprintf(stdout, "ts_group[0] 0x%08x\n", blob->ts_group[0]);
fprintf(stdout, "ts_group[0] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[0]); fprintf(stdout, "ts_group[1] 0x%08x\n", blob->ts_group[1]);
fprintf(stdout, "ts_group[1] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[1]); fprintf(stdout, "ts_group[2] 0x%08x\n", blob->ts_group[2]);
fprintf(stdout, "ts_group[2] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[2]); fprintf(stdout, "ts_group[3] 0x%08x\n", blob->ts_group[3]);
fprintf(stdout, "ts_group[3] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[3]); fprintf(stdout, "ts_group[4] 0x%08x\n", blob->ts_group[4]);
fprintf(stdout, "ts_group[4] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[4]); fprintf(stdout, "ts_group[5] 0x%08x\n", blob->ts_group[5]);
fprintf(stdout, "ts_group[5] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[5]); fprintf(stdout, "ts_group[6] 0x%08x\n", blob->ts_group[6]);
fprintf(stdout, "ts_group[6] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[6]); fprintf(stdout, "ts_group[7] 0x%08x\n", blob->ts_group[7]);
fprintf(stdout, "ts_group[7] 0x%08x\n", ssp->ssp_blob[i][j].ts_group[7]); fprintf(stdout, "ssc0 0x%08x\n", blob->ssc0);
fprintf(stdout, "ssc0 0x%08x\n", ssp->ssp_blob[i][j].ssc0); fprintf(stdout, "ssc1 0x%08x\n", blob->ssc1);
fprintf(stdout, "ssc1 0x%08x\n", ssp->ssp_blob[i][j].ssc1); fprintf(stdout, "sscto 0x%08x\n", blob->sscto);
fprintf(stdout, "sscto 0x%08x\n", ssp->ssp_blob[i][j].sscto); fprintf(stdout, "sspsp 0x%08x\n", blob->sspsp);
fprintf(stdout, "sspsp 0x%08x\n", ssp->ssp_blob[i][j].sspsp); fprintf(stdout, "sstsa 0x%08x\n", blob->sstsa);
fprintf(stdout, "sstsa 0x%08x\n", ssp->ssp_blob[i][j].sstsa); fprintf(stdout, "ssrsa 0x%08x\n", blob->ssrsa);
fprintf(stdout, "ssrsa 0x%08x\n", ssp->ssp_blob[i][j].ssrsa); fprintf(stdout, "ssc2 0x%08x\n", blob->ssc2);
fprintf(stdout, "ssc2 0x%08x\n", ssp->ssp_blob[i][j].ssc2); fprintf(stdout, "sspsp2 0x%08x\n", blob->sspsp2);
fprintf(stdout, "sspsp2 0x%08x\n", ssp->ssp_blob[i][j].sspsp2); fprintf(stdout, "ssc3 0x%08x\n", blob->ssc3);
fprintf(stdout, "ssc3 0x%08x\n", ssp->ssp_blob[i][j].ssc3); fprintf(stdout, "ssioc 0x%08x\n", blob->ssioc);
fprintf(stdout, "ssioc 0x%08x\n", ssp->ssp_blob[i][j].ssioc); fprintf(stdout, "mdivc 0x%08x\n", blob->mdivc);
fprintf(stdout, "mdivc 0x%08x\n", ssp->ssp_blob[i][j].mdivc); fprintf(stdout, "mdivr 0x%08x\n", blob->mdivr);
fprintf(stdout, "mdivr 0x%08x\n", ssp->ssp_blob[i][j].mdivr);
}
} }
fprintf(stdout, "\n"); fprintf(stdout, "\n");
@ -60,34 +59,39 @@ void ssp_print_calculated(struct intel_ssp_params *ssp)
void ssp_print_internal(struct intel_ssp_params *ssp) void ssp_print_internal(struct intel_ssp_params *ssp)
{ {
struct ssp_config_hw *hw_conf;
struct ssp_config_dai *dai;
int i; int i;
dai = &ssp->ssp_prm[ssp->ssp_count];
fprintf(stdout, "printing ssp nhlt internal data:\n"); fprintf(stdout, "printing ssp nhlt internal data:\n");
fprintf(stdout, "io_clk %u\n", ssp->ssp_prm.io_clk); fprintf(stdout, "io_clk %u\n", dai->io_clk);
fprintf(stdout, "dai_index %u\n", ssp->ssp_prm.dai_index); fprintf(stdout, "dai_index %u\n", dai->dai_index);
fprintf(stdout, "mclk_id %u\n", ssp->ssp_prm.mclk_id); fprintf(stdout, "mclk_id %u\n", dai->mclk_id);
fprintf(stdout, "sample_valid_bits %u\n", ssp->ssp_prm.sample_valid_bits); fprintf(stdout, "sample_valid_bits %u\n", dai->sample_valid_bits);
fprintf(stdout, "mclk_direction %u\n", ssp->ssp_prm.mclk_direction); fprintf(stdout, "mclk_direction %u\n", dai->mclk_direction);
fprintf(stdout, "frame_pulse_width %u\n", ssp->ssp_prm.frame_pulse_width); fprintf(stdout, "frame_pulse_width %u\n", dai->frame_pulse_width);
fprintf(stdout, "tdm_per_slot_padding_flag %u\n", ssp->ssp_prm.tdm_per_slot_padding_flag); fprintf(stdout, "tdm_per_slot_padding_flag %u\n", dai->tdm_per_slot_padding_flag);
fprintf(stdout, "clks_control %u\n", ssp->ssp_prm.clks_control); fprintf(stdout, "clks_control %u\n", dai->clks_control);
fprintf(stdout, "quirks %u\n", ssp->ssp_prm.quirks); fprintf(stdout, "quirks %u\n", dai->quirks);
fprintf(stdout, "bclk_delay %u\n", ssp->ssp_prm.bclk_delay); fprintf(stdout, "bclk_delay %u\n", dai->bclk_delay);
fprintf(stdout, "\n"); fprintf(stdout, "\n");
fprintf(stdout, "hw_config_count %u\n", ssp->ssp_hw_config_count[ssp->ssp_count]); fprintf(stdout, "hw_config_count %u\n", ssp->ssp_hw_config_count[ssp->ssp_count]);
for (i = 0; i < ssp->ssp_hw_config_count[ssp->ssp_count]; i++) { for (i = 0; i < ssp->ssp_hw_config_count[ssp->ssp_count]; i++) {
fprintf(stdout, "mclk_rate %u\n", ssp->ssp_prm.hw_cfg[i].mclk_rate); hw_conf = &dai->hw_cfg[i];
fprintf(stdout, "bclk_rate %u\n", ssp->ssp_prm.hw_cfg[i].bclk_rate); fprintf(stdout, "mclk_rate %u\n", hw_conf->mclk_rate);
fprintf(stdout, "fsync_rate %u\n", ssp->ssp_prm.hw_cfg[i].fsync_rate); fprintf(stdout, "bclk_rate %u\n", hw_conf->bclk_rate);
fprintf(stdout, "tdm_slots %u\n", ssp->ssp_prm.hw_cfg[i].tdm_slots); fprintf(stdout, "fsync_rate %u\n", hw_conf->fsync_rate);
fprintf(stdout, "tdm_slot_width %u\n", ssp->ssp_prm.hw_cfg[i].tdm_slot_width); fprintf(stdout, "tdm_slots %u\n", hw_conf->tdm_slots);
fprintf(stdout, "tx_slots %u\n", ssp->ssp_prm.hw_cfg[i].tx_slots); fprintf(stdout, "tdm_slot_width %u\n", hw_conf->tdm_slot_width);
fprintf(stdout, "rx_slots %u\n", ssp->ssp_prm.hw_cfg[i].rx_slots); fprintf(stdout, "tx_slots %u\n", hw_conf->tx_slots);
fprintf(stdout, "format %u\n", ssp->ssp_prm.hw_cfg[i].format); fprintf(stdout, "rx_slots %u\n", hw_conf->rx_slots);
fprintf(stdout, "format %u\n", hw_conf->format);
} }
fprintf(stdout, "\n"); fprintf(stdout, "\n");

7
topology/nhlt/intel/ssp/ssp-process.c
View file

@ -519,16 +519,15 @@ int ssp_calculate(struct intel_nhlt_params *nhlt)
if (!ssp) if (!ssp)
return -EINVAL; return -EINVAL;
ssp_print_internal(ssp);
/* calculate blob for every hw config */ /* calculate blob for every hw config */
for (i = 0; i < ssp->ssp_hw_config_count[ssp->ssp_count]; i++) for (i = 0; i < ssp->ssp_hw_config_count[ssp->ssp_count]; i++)
ssp_calculate_intern(nhlt, i); ssp_calculate_intern(nhlt, i);
ssp->ssp_count++; ssp_print_internal(ssp);
ssp_print_calculated(ssp); ssp_print_calculated(ssp);
ssp->ssp_count++;
return 0; return 0;
} }