From: Cezary Rojewski <cezary.rojewski@intel.com>
To: broonie@kernel.org
Cc: tiwai@suse.com, perex@perex.cz, amade@asmblr.net,
linux-sound@vger.kernel.org, andriy.shevchenko@linux.intel.com,
Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH 5/8] ASoC: Intel: catpt: Rename firmware loading functions
Date: Wed, 29 Jul 2026 13:00:54 +0200 [thread overview]
Message-ID: <20260729110057.342447-6-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20260729110057.342447-1-cezary.rojewski@intel.com>
To make the firmware loading proceduce easier to understand, especially
around restoring DRAM context, rename the following:
catpt_load_images -> catpt_request_dma_load_firmware
catpt_load_image -> catpt_request_load_firmware
catpt_restore_fwimage -> catpt_restore_dram_rodata
catpt_restore_memdumps -> catpt_restore_dram_data
catpt_store_memdumps -> catpt_store_dram_data
For the exact same reason, update a number of comments related to the
subject.
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
sound/soc/intel/catpt/loader.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/soc/intel/catpt/loader.c b/sound/soc/intel/catpt/loader.c
index 06c8b043e292..274af8fb8828 100644
--- a/sound/soc/intel/catpt/loader.c
+++ b/sound/soc/intel/catpt/loader.c
@@ -138,7 +138,7 @@ static int catpt_store_module_states(struct catpt_dev *cdev, struct dma_chan *ch
return 0;
}
-static int catpt_store_memdumps(struct catpt_dev *cdev, struct dma_chan *chan)
+static int catpt_store_dram_data(struct catpt_dev *cdev, struct dma_chan *chan)
{
int i;
@@ -184,7 +184,7 @@ int catpt_store_firmware_context(struct catpt_dev *cdev)
if (ret)
goto exit;
- ret = catpt_store_memdumps(cdev, chan);
+ ret = catpt_store_dram_data(cdev, chan);
if (ret) {
dev_err(cdev->dev, "store memdumps failed: %d\n", ret);
goto exit;
@@ -232,7 +232,7 @@ catpt_restore_streams_context(struct catpt_dev *cdev, struct dma_chan *chan)
return 0;
}
-static int catpt_restore_memdumps(struct catpt_dev *cdev, struct dma_chan *chan)
+static int catpt_restore_dram_data(struct catpt_dev *cdev, struct dma_chan *chan)
{
int i;
@@ -267,9 +267,9 @@ static int catpt_restore_memdumps(struct catpt_dev *cdev, struct dma_chan *chan)
return 0;
}
-static int catpt_restore_fwimage(struct catpt_dev *cdev,
- struct dma_chan *chan, dma_addr_t paddr,
- struct catpt_fw_block_hdr *blk)
+static int catpt_restore_dram_rodata(struct catpt_dev *cdev,
+ struct dma_chan *chan, dma_addr_t paddr,
+ struct catpt_fw_block_hdr *blk)
{
struct resource r1 = {};
int i;
@@ -365,7 +365,7 @@ static int catpt_restore_basefw(struct catpt_dev *cdev,
print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4,
basefw, sizeof(*basefw), false);
- /* restore basefw image */
+ /* Restore IRAM and .rodata for DRAM based on the firmware image. */
for (i = 0; i < basefw->blocks; i++) {
struct catpt_fw_block_hdr *blk;
@@ -377,8 +377,8 @@ static int catpt_restore_basefw(struct catpt_dev *cdev,
blk, false);
break;
default:
- ret = catpt_restore_fwimage(cdev, chan, paddr + offset,
- blk);
+ ret = catpt_restore_dram_rodata(cdev, chan, paddr + offset,
+ blk);
break;
}
@@ -390,8 +390,8 @@ static int catpt_restore_basefw(struct catpt_dev *cdev,
offset += sizeof(*blk) + blk->size;
}
- /* then proceed with memory dumps */
- ret = catpt_restore_memdumps(cdev, chan);
+ /* Then proceed with DRAM .data saved before D3. */
+ ret = catpt_restore_dram_data(cdev, chan);
if (ret)
dev_err(cdev->dev, "restore memdumps failed: %d\n", ret);
@@ -568,8 +568,8 @@ static int catpt_load_firmware(struct catpt_dev *cdev,
return 0;
}
-static int catpt_load_image(struct catpt_dev *cdev, struct dma_chan *chan,
- const char *name, bool restore)
+static int catpt_request_load_firmware(struct catpt_dev *cdev, struct dma_chan *chan,
+ const char *name, bool restore)
{
struct catpt_fw_hdr *fw;
struct firmware *img;
@@ -607,7 +607,7 @@ static int catpt_load_image(struct catpt_dev *cdev, struct dma_chan *chan,
return ret;
}
-static int catpt_load_images(struct catpt_dev *cdev, bool restore)
+static int catpt_request_dma_load_firmware(struct catpt_dev *cdev, bool restore)
{
struct dma_chan *chan;
int ret;
@@ -616,7 +616,7 @@ static int catpt_load_images(struct catpt_dev *cdev, bool restore)
if (IS_ERR(chan))
return PTR_ERR(chan);
- ret = catpt_load_image(cdev, chan, cdev->spec->fw_name, restore);
+ ret = catpt_request_load_firmware(cdev, chan, cdev->spec->fw_name, restore);
if (ret)
goto release_dma_chan;
@@ -636,7 +636,7 @@ int catpt_boot_firmware(struct catpt_dev *cdev, bool restore)
catpt_dsp_stall(cdev, true);
- ret = catpt_load_images(cdev, restore);
+ ret = catpt_request_dma_load_firmware(cdev, restore);
if (ret) {
dev_err(cdev->dev, "load binaries failed: %d\n", ret);
return ret;
--
2.34.1
next prev parent reply other threads:[~2026-07-29 10:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-29 11:00 [PATCH 0/8] ASoC: Intel: catpt: Code cleanup and renames Cezary Rojewski
2026-07-29 11:00 ` [PATCH 1/8] ASoC: Intel: catpt: Wrap the store firmware-context procedure Cezary Rojewski
2026-07-29 11:00 ` [PATCH 2/8] ASoC: Intel: catpt: Drop redundant else-if Cezary Rojewski
2026-07-29 11:00 ` [PATCH 3/8] ASoC: Intel: catpt: Drop redundant signature argument Cezary Rojewski
2026-07-29 11:00 ` [PATCH 4/8] ASoC: Intel: catpt: Rename module header struct Cezary Rojewski
2026-07-29 11:00 ` Cezary Rojewski [this message]
2026-07-29 11:00 ` [PATCH 6/8] ASoC: Intel: catpt: Streamline wording of offset variables Cezary Rojewski
2026-07-29 11:00 ` [PATCH 7/8] ASoC: Intel: catpt: Streamline runtime-variables naming Cezary Rojewski
2026-07-29 11:00 ` [PATCH 8/8] ASoC: Intel: catpt: Streamline control-variables naming Cezary Rojewski
2026-07-30 21:31 ` [PATCH 0/8] ASoC: Intel: catpt: Code cleanup and renames Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260729110057.342447-6-cezary.rojewski@intel.com \
--to=cezary.rojewski@intel.com \
--cc=amade@asmblr.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox