Unverified Commit 71778f79 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: Define rom_status_reg in sof_intel_dsp_desc 



Add the rom_status_reg field to struct sof_intel_dsp_desc and define
it for HDA platforms. This will be used to check the ROM status during
FW boot.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220414184817.362215-14-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3dee239e

sound/soc/sof/intel/apl.c

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ const struct sof_intel_dsp_desc apl_chip_info = { 
	.ipc_ack = HDA_DSP_REG_HIPCIE,

	.ipc_ack_mask = HDA_DSP_REG_HIPCIE_DONE,

	.ipc_ctl = HDA_DSP_REG_HIPCCTL,

	.rom_status_reg = HDA_DSP_SRAM_REG_ROM_STATUS,

	.rom_init_timeout	= 150,

	.ssp_count = APL_SSP_COUNT,

	.ssp_base_offset = APL_SSP_BASE_OFFSET,

sound/soc/sof/intel/cnl.c

+2 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	.ipc_ack = CNL_DSP_REG_HIPCIDA,

	.ipc_ack_mask = CNL_DSP_REG_HIPCIDA_DONE,

	.ipc_ctl = CNL_DSP_REG_HIPCCTL,

	.rom_status_reg = HDA_DSP_SRAM_REG_ROM_STATUS,

	.rom_init_timeout	= 300,

	.ssp_count = CNL_SSP_COUNT,

	.ssp_base_offset = CNL_SSP_BASE_OFFSET,
@@ -316,6 +317,7 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	.ipc_ack = CNL_DSP_REG_HIPCIDA,

	.ipc_ack_mask = CNL_DSP_REG_HIPCIDA_DONE,

	.ipc_ctl = CNL_DSP_REG_HIPCCTL,

	.rom_status_reg = HDA_DSP_SRAM_REG_ROM_STATUS,

	.rom_init_timeout	= 300,

	.ssp_count = ICL_SSP_COUNT,

	.ssp_base_offset = CNL_SSP_BASE_OFFSET,

sound/soc/sof/intel/hda-loader.c

+8 −6
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) 


	/* step 7: wait for ROM init */

	ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR,

					HDA_DSP_SRAM_REG_ROM_STATUS, status,

					chip->rom_status_reg, status,

					((status & HDA_DSP_ROM_STS_MASK)

						== HDA_DSP_ROM_INIT),

					HDA_DSP_REG_POLL_INTERVAL_US,
@@ -188,8 +188,8 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) 


	if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)

		dev_err(sdev->dev,

			"error: %s: timeout HDA_DSP_SRAM_REG_ROM_STATUS read\n",

			__func__);

			"%s: timeout with rom_status_reg (%#x) read\n",

			__func__, chip->rom_status_reg);



err:

	flags = SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX | SOF_DBG_DUMP_OPTIONAL;
@@ -268,6 +268,8 @@ static int cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, 


static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_stream)

{

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

	const struct sof_intel_dsp_desc *chip = hda->desc;

	unsigned int reg;

	int ret, status;
@@ -278,7 +280,7 @@ static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_str 
	}



	status = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR,

					HDA_DSP_SRAM_REG_ROM_STATUS, reg,

					chip->rom_status_reg, reg,

					((reg & HDA_DSP_ROM_STS_MASK)

						== HDA_DSP_ROM_FW_ENTERED),

					HDA_DSP_REG_POLL_INTERVAL_US,
@@ -291,8 +293,8 @@ static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_str 


	if (status < 0) {

		dev_err(sdev->dev,

			"error: %s: timeout HDA_DSP_SRAM_REG_ROM_STATUS read\n",

			__func__);

			"%s: timeout with rom_status_reg (%#x) read\n",

			__func__, chip->rom_status_reg);

	}



	ret = cl_trigger(sdev, hext_stream, SNDRV_PCM_TRIGGER_STOP);

sound/soc/sof/intel/hda.c

+6 −2
Original line number Diff line number Diff line
@@ -406,11 +406,13 @@ static const struct hda_dsp_msg_code hda_dsp_rom_msg[] = { 


static void hda_dsp_get_status(struct snd_sof_dev *sdev, const char *level)

{

	const struct sof_intel_dsp_desc *chip;

	u32 status;

	int i;



	chip = get_chip_info(sdev->pdata);

	status = snd_sof_dsp_read(sdev, HDA_DSP_BAR,

				  HDA_DSP_SRAM_REG_ROM_STATUS);

				  chip->rom_status_reg);



	for (i = 0; i < ARRAY_SIZE(hda_dsp_rom_msg); i++) {

		if (status == hda_dsp_rom_msg[i].code) {
@@ -456,13 +458,15 @@ static void hda_dsp_get_registers(struct snd_sof_dev *sdev, 
static void hda_dsp_dump_ext_rom_status(struct snd_sof_dev *sdev, const char *level,

					u32 flags)

{

	const struct sof_intel_dsp_desc *chip;

	char msg[128];

	int len = 0;

	u32 value;

	int i;



	chip = get_chip_info(sdev->pdata);

	for (i = 0; i < HDA_EXT_ROM_STATUS_SIZE; i++) {

		value = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_ROM_STATUS + i * 0x4);

		value = snd_sof_dsp_read(sdev, HDA_DSP_BAR, chip->rom_status_reg + i * 0x4);

		len += snprintf(msg + len, sizeof(msg) - len, " 0x%x", value);

	}

sound/soc/sof/intel/icl.c

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ const struct sof_intel_dsp_desc icl_chip_info = { 
	.ipc_ack = CNL_DSP_REG_HIPCIDA,

	.ipc_ack_mask = CNL_DSP_REG_HIPCIDA_DONE,

	.ipc_ctl = CNL_DSP_REG_HIPCCTL,

	.rom_status_reg = HDA_DSP_SRAM_REG_ROM_STATUS,

	.rom_init_timeout	= 300,

	.ssp_count = ICL_SSP_COUNT,

	.ssp_base_offset = CNL_SSP_BASE_OFFSET,