ICCMAX implementation for FW boot in TGL #2290
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,11 +17,13 @@ | |
|
|
||
| #include <linux/firmware.h> | ||
| #include <sound/hdaudio_ext.h> | ||
| #include <sound/hda_register.h> | ||
| #include <sound/sof.h> | ||
| #include "../ops.h" | ||
| #include "hda.h" | ||
|
|
||
| #define HDA_FW_BOOT_ATTEMPTS 3 | ||
| #define HDA_CL_STREAM_FORMAT 0x40 | ||
|
|
||
| static int cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format, | ||
| unsigned int size, struct snd_dma_buffer *dmab, | ||
|
|
@@ -32,11 +34,6 @@ static int cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format, | |
| struct pci_dev *pci = to_pci_dev(sdev->dev); | ||
| int ret; | ||
|
|
||
| dsp_stream = hda_dsp_stream_get(sdev, direction); | ||
|
|
||
| if (!dsp_stream) { | ||
|
|
@@ -57,14 +54,21 @@ static int cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format, | |
| hstream->format_val = format; | ||
| hstream->bufsize = size; | ||
|
|
||
| if (direction == SNDRV_PCM_STREAM_CAPTURE) { | ||
| ret = hda_dsp_iccmax_stream_hw_params(sdev, dsp_stream, dmab, NULL); | ||
| if (ret < 0) { | ||
| dev_err(sdev->dev, "error: iccmax stream prepare failed: %x\n", ret); | ||
| goto error; | ||
| } | ||
| } else { | ||
| ret = hda_dsp_stream_hw_params(sdev, dsp_stream, dmab, NULL); | ||
| if (ret < 0) { | ||
| dev_err(sdev->dev, "error: hdac prepare failed: %x\n", ret); | ||
| goto error; | ||
| } | ||
| hda_dsp_stream_spib_config(sdev, dsp_stream, HDA_DSP_SPIB_ENABLE, size); | ||
| } | ||
|
|
||
| return hstream->stream_tag; | ||
|
|
||
| error: | ||
|
|
@@ -206,18 +210,15 @@ static int cl_trigger(struct snd_sof_dev *sdev, | |
| } | ||
|
|
||
| static struct hdac_ext_stream *get_stream_with_tag(struct snd_sof_dev *sdev, | ||
| int tag, int direction) | ||
|
Member
There was a problem hiding this comment. typo in commit message, should be ASoC: SOF: Intel. |
||
| { | ||
| struct hdac_bus *bus = sof_to_bus(sdev); | ||
| struct hdac_stream *s; | ||
|
|
||
| /* get stream with tag */ | ||
| list_for_each_entry(s, &bus->stream_list, list) | ||
| if (s->direction == direction && s->stream_tag == tag) | ||
| return stream_to_hdac_ext_stream(s); | ||
|
|
||
| return NULL; | ||
| } | ||
|
|
@@ -227,12 +228,15 @@ static int cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, | |
| { | ||
| struct hdac_stream *hstream = &stream->hstream; | ||
| int sd_offset = SOF_STREAM_SD_OFFSET(hstream); | ||
| int ret = 0; | ||
|
|
||
| if (hstream->direction == SNDRV_PCM_STREAM_PLAYBACK) | ||
| ret = hda_dsp_stream_spib_config(sdev, stream, HDA_DSP_SPIB_DISABLE, 0); | ||
| else | ||
| snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, sd_offset, | ||
| SOF_HDA_SD_CTL_DMA_START, 0); | ||
|
|
||
| hda_dsp_stream_put(sdev, hstream->direction, hstream->stream_tag); | ||
| hstream->running = 0; | ||
| hstream->substream = NULL; | ||
|
|
||
|
|
@@ -290,6 +294,62 @@ static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *stream) | |
| return status; | ||
| } | ||
|
|
||
| int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev) | ||
| { | ||
| struct snd_sof_pdata *plat_data = sdev->pdata; | ||
| struct hdac_ext_stream *iccmax_stream; | ||
| struct hdac_bus *bus = sof_to_bus(sdev); | ||
| struct firmware stripped_firmware; | ||
| int ret, ret1; | ||
| int iccmax_tag; | ||
| u8 original_gb; | ||
|
|
||
| /* save the original LTRP guardband value */ | ||
| original_gb = snd_hdac_chip_readb(bus, VS_LTRP) & HDA_VS_INTEL_LTRP_GB_MASK; | ||
|
|
||
| if (plat_data->fw->size <= plat_data->fw_offset) { | ||
| dev_err(sdev->dev, "error: firmware size must be greater than firmware offset\n"); | ||
| return -EINVAL; | ||
| } | ||
|
|
||
| stripped_firmware.size = plat_data->fw->size - plat_data->fw_offset; | ||
|
|
||
| /* prepare capture stream for ICCMAX */ | ||
| iccmax_tag = cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, stripped_firmware.size, | ||
| &sdev->dmab_bdl, SNDRV_PCM_STREAM_CAPTURE); | ||
| if (iccmax_tag < 0) { | ||
| dev_err(sdev->dev, "error: dma prepare for ICCMAX %x\n", iccmax_tag); | ||
| return iccmax_tag; | ||
|
||
| } | ||
|
|
||
| /* get stream with tag */ | ||
| iccmax_stream = get_stream_with_tag(sdev, iccmax_tag, SNDRV_PCM_STREAM_CAPTURE); | ||
| if (!iccmax_stream) { | ||
| dev_err(sdev->dev, "error: could not get stream with stream tag %d\n", iccmax_tag); | ||
| ret = -ENODEV; | ||
| } else { | ||
| ret = hda_dsp_cl_boot_firmware(sdev); | ||
| } | ||
ranj063 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| /* | ||
| * Perform iccmax stream cleanup. This should be done even if firmware loading fails. | ||
| * If the cleanup also fails, we return the initial error | ||
| */ | ||
| ret1 = cl_cleanup(sdev, &sdev->dmab_bdl, iccmax_stream); | ||
| if (ret1 < 0) { | ||
| dev_err(sdev->dev, "error: ICCMAX stream cleanup failed\n"); | ||
|
|
||
| /* set return value to indicate cleanup failure */ | ||
| if (!ret) | ||
| ret = ret1; | ||
| } | ||
|
|
||
| /* restore the original guardband value after FW boot */ | ||
| snd_hdac_chip_updateb(bus, VS_LTRP, HDA_VS_INTEL_LTRP_GB_MASK, original_gb); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) | ||
| { | ||
| struct snd_sof_pdata *plat_data = sdev->pdata; | ||
|
|
@@ -313,7 +373,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) | |
| init_waitqueue_head(&sdev->boot_wait); | ||
|
|
||
| /* prepare DMA for code loader stream */ | ||
| tag = cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, stripped_firmware.size, | ||
| &sdev->dmab, SNDRV_PCM_STREAM_PLAYBACK); | ||
|
|
||
| if (tag < 0) { | ||
|
|
@@ -323,7 +383,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) | |
| } | ||
|
|
||
| /* get stream with tag */ | ||
| stream = get_stream_with_tag(sdev, tag, SNDRV_PCM_STREAM_PLAYBACK); | ||
| if (!stream) { | ||
| dev_err(sdev->dev, | ||
| "error: could not get stream with stream tag %d\n", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.