Unverified Commit 3eede0fc authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: Adjust DSP status register names 



Both status and error are "codes". Update the wording to make code
cohesive.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250109122216.3667847-12-cezary.rojewski@intel.com


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

sound/soc/intel/avs/loader.c

+6 −6
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int avs_cldma_load_basefw(struct avs_dev *adev, struct firmware *fw) 
				       AVS_ROM_INIT_POLLING_US, SKL_ROM_INIT_TIMEOUT_US);

	if (ret < 0) {

		dev_err(adev->dev, "rom init failed: %d, status: 0x%08x, lec: 0x%08x\n",

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR_CODE(adev)));

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR(adev)));

		avs_dsp_core_disable(adev, AVS_MAIN_CORE_MASK);

		return ret;

	}
@@ -182,7 +182,7 @@ int avs_cldma_load_basefw(struct avs_dev *adev, struct firmware *fw) 
	hda_cldma_stop(cl);

	if (ret < 0) {

		dev_err(adev->dev, "transfer fw failed: %d, status: 0x%08x, lec: 0x%08x\n",

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR_CODE(adev)));

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR(adev)));

		avs_dsp_core_disable(adev, AVS_MAIN_CORE_MASK);

		return ret;

	}
@@ -316,7 +316,7 @@ avs_hda_init_rom(struct avs_dev *adev, unsigned int dma_id, bool purge) 
				       AVS_ROM_INIT_POLLING_US, APL_ROM_INIT_TIMEOUT_US);

	if (ret < 0) {

		dev_err(adev->dev, "rom init failed: %d, status: 0x%08x, lec: 0x%08x\n",

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR_CODE(adev)));

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR(adev)));

		goto err;

	}
@@ -348,7 +348,7 @@ static int avs_imr_load_basefw(struct avs_dev *adev) 
	if (!ret) {

		dev_err(adev->dev, "firmware ready timeout, status: 0x%08x, lec: 0x%08x\n",

			snd_hdac_adsp_readl(adev, AVS_FW_REG_STATUS(adev)),

			snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR_CODE(adev)));

			snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR(adev)));

		avs_dsp_core_disable(adev, AVS_MAIN_CORE_MASK);

		return -ETIMEDOUT;

	}
@@ -408,7 +408,7 @@ int avs_hda_load_basefw(struct avs_dev *adev, struct firmware *fw) 
	snd_hdac_dsp_trigger(hstream, false);

	if (ret < 0) {

		dev_err(adev->dev, "transfer fw failed: %d, status: 0x%08x, lec: 0x%08x\n",

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR_CODE(adev)));

			ret, reg, snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR(adev)));

		avs_dsp_core_disable(adev, AVS_MAIN_CORE_MASK);

	}
@@ -590,7 +590,7 @@ static int avs_dsp_load_basefw(struct avs_dev *adev) 
	if (!ret) {

		dev_err(adev->dev, "firmware ready timeout, status: 0x%08x, lec: 0x%08x\n",

			snd_hdac_adsp_readl(adev, AVS_FW_REG_STATUS(adev)),

			snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR_CODE(adev)));

			snd_hdac_adsp_readl(adev, AVS_FW_REG_ERROR(adev)));

		avs_dsp_core_disable(adev, AVS_MAIN_CORE_MASK);

		ret = -ETIMEDOUT;

		goto release_fw;

sound/soc/intel/avs/registers.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
/* Constants used when accessing SRAM, space shared with firmware */

#define AVS_FW_REG_BASE(adev)		((adev)->spec->sram->base_offset)

#define AVS_FW_REG_STATUS(adev)		(AVS_FW_REG_BASE(adev) + 0x0)

#define AVS_FW_REG_ERROR_CODE(adev)	(AVS_FW_REG_BASE(adev) + 0x4)

#define AVS_FW_REG_ERROR(adev)		(AVS_FW_REG_BASE(adev) + 0x4)



#define AVS_WINDOW_CHUNK_SIZE		SZ_4K

#define AVS_FW_REGS_SIZE		AVS_WINDOW_CHUNK_SIZE