ASoC: SOF: loader: Remove the old fw_ready related code

The fw_ready is handled internally to ipc3, we can remove the old code
from the loader.c along with the functions only used by the fw_ready()
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Author: ujfalusi

sound/soc/sof/ipc.c

@@ -188,21 +188,6 @@ int snd_sof_ipc_valid(struct snd_sof_dev *sdev)
 }
 EXPORT_SYMBOL(snd_sof_ipc_valid);
 
-intsof_ipc_init_msg_memory(structsnd_sof_dev*sdev)
-{
-structsnd_sof_ipc_msg*msg;
-
-msg=&sdev->ipc->msg;
-
-msg->reply_data=devm_kzalloc(sdev->dev, SOF_IPC_MSG_MAX_SIZE, GFP_KERNEL);
-if (!msg->reply_data)
-return-ENOMEM;
-
-sdev->ipc->max_payload_size=SOF_IPC_MSG_MAX_SIZE;
-
-return0;
-}
-
 structsnd_sof_ipc*snd_sof_ipc_init(structsnd_sof_dev*sdev)
 {
 structsnd_sof_ipc*ipc;

sound/soc/sof/loader.c

@@ -86,69 +86,6 @@ static int get_cc_info(struct snd_sof_dev *sdev,
 return0;
 }
 
-/* parse the extended FW boot data structures from FW boot message */
-staticintsnd_sof_fw_parse_ext_data(structsnd_sof_dev*sdev, u32offset)
-{
-structsof_ipc_ext_data_hdr*ext_hdr;
-void*ext_data;
-intret=0;
-
-ext_data=kzalloc(PAGE_SIZE, GFP_KERNEL);
-if (!ext_data)
-return-ENOMEM;
-
-/* get first header */
-snd_sof_dsp_block_read(sdev, SOF_FW_BLK_TYPE_SRAM, offset, ext_data,
-sizeof(*ext_hdr));
-ext_hdr=ext_data;
-
-while (ext_hdr->hdr.cmd==SOF_IPC_FW_READY) {
-/* read in ext structure */
-snd_sof_dsp_block_read(sdev, SOF_FW_BLK_TYPE_SRAM,
-offset+sizeof(*ext_hdr),
- (void*)((u8*)ext_data+sizeof(*ext_hdr)),
-ext_hdr->hdr.size-sizeof(*ext_hdr));
-
-dev_dbg(sdev->dev, "found ext header type %d size 0x%x\n",
-ext_hdr->type, ext_hdr->hdr.size);
-
-/* process structure data */
-switch (ext_hdr->type) {
-caseSOF_IPC_EXT_WINDOW:
-ret=get_ext_windows(sdev, ext_hdr);
-break;
-caseSOF_IPC_EXT_CC_INFO:
-ret=get_cc_info(sdev, ext_hdr);
-break;
-caseSOF_IPC_EXT_UNUSED:
-caseSOF_IPC_EXT_PROBE_INFO:
-caseSOF_IPC_EXT_USER_ABI_INFO:
-/* They are supported but we don't do anything here */
-break;
-default:
-dev_info(sdev->dev, "unknown ext header type %d size 0x%x\n",
-ext_hdr->type, ext_hdr->hdr.size);
-ret=0;
-break;
- }
-
-if (ret<0) {
-dev_err(sdev->dev, "error: failed to parse ext data type %d\n",
-ext_hdr->type);
-break;
- }
-
-/* move to next header */
-offset+=ext_hdr->hdr.size;
-snd_sof_dsp_block_read(sdev, SOF_FW_BLK_TYPE_SRAM, offset, ext_data,
-sizeof(*ext_hdr));
-ext_hdr=ext_data;
-	}
-
-kfree(ext_data);
-returnret;
-}
-
 staticintext_man_get_fw_version(structsnd_sof_dev*sdev,
 conststructsof_ext_man_elem_header*hdr)
 {
@@ -358,170 +295,6 @@ static int snd_sof_fw_ext_man_parse(struct snd_sof_dev *sdev,
 returnext_man_size;
 }
 
-/*
- * IPC Firmware ready.
- */
-staticvoidsof_get_windows(structsnd_sof_dev*sdev)
-{
-structsof_ipc_window_elem*elem;
-u32outbox_offset=0;
-u32stream_offset=0;
-u32inbox_offset=0;
-u32outbox_size=0;
-u32stream_size=0;
-u32inbox_size=0;
-u32debug_size=0;
-u32debug_offset=0;
-intwindow_offset;
-inti;
-
-if (!sdev->info_window) {
-dev_err(sdev->dev, "error: have no window info\n");
-return;
-	}
-
-for (i=0; i<sdev->info_window->num_windows; i++) {
-elem=&sdev->info_window->window[i];
-
-window_offset=snd_sof_dsp_get_window_offset(sdev, elem->id);
-if (window_offset<0) {
-dev_warn(sdev->dev, "warn: no offset for window %d\n",
-elem->id);
-continue;
- }
-
-switch (elem->type) {
-caseSOF_IPC_REGION_UPBOX:
-inbox_offset=window_offset+elem->offset;
-inbox_size=elem->size;
-snd_sof_debugfs_add_region_item(sdev, SOF_FW_BLK_TYPE_SRAM,
-inbox_offset,
-elem->size, "inbox",
-SOF_DEBUGFS_ACCESS_D0_ONLY);
-break;
-caseSOF_IPC_REGION_DOWNBOX:
-outbox_offset=window_offset+elem->offset;
-outbox_size=elem->size;
-snd_sof_debugfs_add_region_item(sdev, SOF_FW_BLK_TYPE_SRAM,
-outbox_offset,
-elem->size, "outbox",
-SOF_DEBUGFS_ACCESS_D0_ONLY);
-break;
-caseSOF_IPC_REGION_TRACE:
-snd_sof_debugfs_add_region_item(sdev, SOF_FW_BLK_TYPE_SRAM,
-window_offset+elem->offset,
-elem->size, "etrace",
-SOF_DEBUGFS_ACCESS_D0_ONLY);
-break;
-caseSOF_IPC_REGION_DEBUG:
-debug_offset=window_offset+elem->offset;
-debug_size=elem->size;
-snd_sof_debugfs_add_region_item(sdev, SOF_FW_BLK_TYPE_SRAM,
-window_offset+elem->offset,
-elem->size, "debug",
-SOF_DEBUGFS_ACCESS_D0_ONLY);
-break;
-caseSOF_IPC_REGION_STREAM:
-stream_offset=window_offset+elem->offset;
-stream_size=elem->size;
-snd_sof_debugfs_add_region_item(sdev, SOF_FW_BLK_TYPE_SRAM,
-stream_offset,
-elem->size, "stream",
-SOF_DEBUGFS_ACCESS_D0_ONLY);
-break;
-caseSOF_IPC_REGION_REGS:
-snd_sof_debugfs_add_region_item(sdev, SOF_FW_BLK_TYPE_SRAM,
-window_offset+elem->offset,
-elem->size, "regs",
-SOF_DEBUGFS_ACCESS_D0_ONLY);
-break;
-caseSOF_IPC_REGION_EXCEPTION:
-sdev->dsp_oops_offset=window_offset+elem->offset;
-snd_sof_debugfs_add_region_item(sdev, SOF_FW_BLK_TYPE_SRAM,
-window_offset+elem->offset,
-elem->size, "exception",
-SOF_DEBUGFS_ACCESS_D0_ONLY);
-break;
-default:
-dev_err(sdev->dev, "error: get illegal window info\n");
-return;
- }
-	}
-
-if (outbox_size==0||inbox_size==0) {
-dev_err(sdev->dev, "error: get illegal mailbox window\n");
-return;
-	}
-
-sdev->dsp_box.offset=inbox_offset;
-sdev->dsp_box.size=inbox_size;
-
-sdev->host_box.offset=outbox_offset;
-sdev->host_box.size=outbox_size;
-
-sdev->stream_box.offset=stream_offset;
-sdev->stream_box.size=stream_size;
-
-sdev->debug_box.offset=debug_offset;
-sdev->debug_box.size=debug_size;
-
-dev_dbg(sdev->dev, " mailbox upstream 0x%x - size 0x%x\n",
-inbox_offset, inbox_size);
-dev_dbg(sdev->dev, " mailbox downstream 0x%x - size 0x%x\n",
-outbox_offset, outbox_size);
-dev_dbg(sdev->dev, " stream region 0x%x - size 0x%x\n",
-stream_offset, stream_size);
-dev_dbg(sdev->dev, " debug region 0x%x - size 0x%x\n",
-debug_offset, debug_size);
-}
-
-/* check for ABI compatibility and create memory windows on first boot */
-intsof_fw_ready(structsnd_sof_dev*sdev, u32msg_id)
-{
-structsof_ipc_fw_ready*fw_ready=&sdev->fw_ready;
-intoffset;
-intret;
-
-/* mailbox must be on 4k boundary */
-offset=snd_sof_dsp_get_mailbox_offset(sdev);
-if (offset<0) {
-dev_err(sdev->dev, "error: have no mailbox offset\n");
-returnoffset;
-	}
-
-dev_dbg(sdev->dev, "ipc: DSP is ready 0x%8.8x offset 0x%x\n",
-msg_id, offset);
-
-/* no need to re-check version/ABI for subsequent boots */
-if (!sdev->first_boot)
-return0;
-
-/*
- * copy data from the DSP FW ready offset
- * Subsequent error handling is not needed for BLK_TYPE_SRAM
- */
-ret=snd_sof_dsp_block_read(sdev, SOF_FW_BLK_TYPE_SRAM, offset, fw_ready,
-sizeof(*fw_ready));
-if (ret) {
-dev_err(sdev->dev,
-"error: unable to read fw_ready, read from TYPE_SRAM failed\n");
-returnret;
-	}
-
-/* make sure ABI version is compatible */
-ret=snd_sof_ipc_valid(sdev);
-if (ret<0)
-returnret;
-
-/* now check for extended data */
-snd_sof_fw_parse_ext_data(sdev, offset+sizeof(structsof_ipc_fw_ready));
-
-sof_get_windows(sdev);
-
-returnsof_ipc_init_msg_memory(sdev);
-}
-EXPORT_SYMBOL(sof_fw_ready);
-
 /* generic module parser for mmaped DSPs */
 intsnd_sof_parse_module_memcpy(structsnd_sof_dev*sdev,
 structsnd_sof_mod_hdr*module)

sound/soc/sof/sof-priv.h

@@ -182,11 +182,6 @@ struct snd_sof_dsp_ops {
 int (*load_firmware)(structsnd_sof_dev*sof_dev); /* mandatory */
 int (*load_module)(structsnd_sof_dev*sof_dev,
 structsnd_sof_mod_hdr*hdr); /* optional */
-/*
- * FW ready checks for ABI compatibility and creates
- * memory windows at first boot
- */
-int (*fw_ready)(structsnd_sof_dev*sdev, u32msg_id); /* mandatory */
 
 /* connect pcm substream to a host stream */
 int (*pcm_open)(structsnd_sof_dev*sdev,
@@ -609,7 +604,6 @@ int sof_ipc_tx_message_no_pm(struct snd_sof_ipc *ipc, void *msg_data, size_t msg
 void*reply_data, size_treply_bytes);
 intsof_ipc_send_msg(structsnd_sof_dev*sdev, void*msg_data, size_tmsg_bytes,
 size_treply_bytes);
-intsof_ipc_init_msg_memory(structsnd_sof_dev*sdev);
 
 staticinlinevoidsnd_sof_ipc_process_reply(structsnd_sof_dev*sdev, u32msg_id)
 {
@@ -681,8 +675,6 @@ int sof_block_write(struct snd_sof_dev *sdev, enum snd_sof_fw_blk_type blk_type,
 intsof_block_read(structsnd_sof_dev*sdev, enumsnd_sof_fw_blk_typeblk_type,
 u32offset, void*dest, size_tsize);
 
-intsof_fw_ready(structsnd_sof_dev*sdev, u32msg_id);
-
 intsof_ipc_msg_data(structsnd_sof_dev*sdev,
 structsnd_pcm_substream*substream,
 void*p, size_tsz);