Commit ebe18b15 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ASoC: SOF: Use generic names for IPC types

Use the new SOF_IPC_TYPE_3, SOF_IPC_TYPE_4 in core code.

No functional changes, just renaming.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230919104226.32239-5-peter.ujfalusi@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 82f4b383
...@@ -165,12 +165,12 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev) ...@@ -165,12 +165,12 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev)
switch (sdev->pdata->ipc_type) { switch (sdev->pdata->ipc_type) {
#if defined(CONFIG_SND_SOC_SOF_IPC3) #if defined(CONFIG_SND_SOC_SOF_IPC3)
case SOF_IPC: case SOF_IPC_TYPE_3:
ops = &ipc3_ops; ops = &ipc3_ops;
break; break;
#endif #endif
#if defined(CONFIG_SND_SOC_SOF_IPC4) #if defined(CONFIG_SND_SOC_SOF_IPC4)
case SOF_INTEL_IPC4: case SOF_IPC_TYPE_4:
ops = &ipc4_ops; ops = &ipc4_ops;
break; break;
#endif #endif
......
...@@ -494,7 +494,7 @@ static int ipc3_dtrace_init(struct snd_sof_dev *sdev) ...@@ -494,7 +494,7 @@ static int ipc3_dtrace_init(struct snd_sof_dev *sdev)
int ret; int ret;
/* dtrace is only supported with SOF_IPC */ /* dtrace is only supported with SOF_IPC */
if (sdev->pdata->ipc_type != SOF_IPC) if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (sdev->fw_trace_data) { if (sdev->fw_trace_data) {
......
...@@ -74,20 +74,18 @@ int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc ...@@ -74,20 +74,18 @@ int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc
sof_pdata->desc = desc; sof_pdata->desc = desc;
sof_pdata->dev = &pdev->dev; sof_pdata->dev = &pdev->dev;
sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC]; sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC_TYPE_3];
/* alternate fw and tplg filenames ? */ /* alternate fw and tplg filenames ? */
if (fw_path) if (fw_path)
sof_pdata->fw_filename_prefix = fw_path; sof_pdata->fw_filename_prefix = fw_path;
else else
sof_pdata->fw_filename_prefix = sof_pdata->fw_filename_prefix = desc->default_fw_path[SOF_IPC_TYPE_3];
sof_pdata->desc->default_fw_path[SOF_IPC];
if (tplg_path) if (tplg_path)
sof_pdata->tplg_filename_prefix = tplg_path; sof_pdata->tplg_filename_prefix = tplg_path;
else else
sof_pdata->tplg_filename_prefix = sof_pdata->tplg_filename_prefix = desc->default_tplg_path[SOF_IPC_TYPE_3];
sof_pdata->desc->default_tplg_path[SOF_IPC];
/* set callback to be called on successful device probe to enable runtime_pm */ /* set callback to be called on successful device probe to enable runtime_pm */
sof_pdata->sof_probe_complete = sof_acpi_probe_complete; sof_pdata->sof_probe_complete = sof_acpi_probe_complete;
......
...@@ -267,7 +267,7 @@ static int sof_msg_inject_probe(struct auxiliary_device *auxdev, ...@@ -267,7 +267,7 @@ static int sof_msg_inject_probe(struct auxiliary_device *auxdev,
priv->max_msg_size = sof_client_get_ipc_max_payload_size(cdev); priv->max_msg_size = sof_client_get_ipc_max_payload_size(cdev);
alloc_size = priv->max_msg_size; alloc_size = priv->max_msg_size;
if (priv->ipc_type == SOF_INTEL_IPC4) if (priv->ipc_type == SOF_IPC_TYPE_4)
alloc_size += sizeof(struct sof_ipc4_msg); alloc_size += sizeof(struct sof_ipc4_msg);
priv->tx_buffer = devm_kmalloc(dev, alloc_size, GFP_KERNEL); priv->tx_buffer = devm_kmalloc(dev, alloc_size, GFP_KERNEL);
...@@ -275,7 +275,7 @@ static int sof_msg_inject_probe(struct auxiliary_device *auxdev, ...@@ -275,7 +275,7 @@ static int sof_msg_inject_probe(struct auxiliary_device *auxdev,
if (!priv->tx_buffer || !priv->rx_buffer) if (!priv->tx_buffer || !priv->rx_buffer)
return -ENOMEM; return -ENOMEM;
if (priv->ipc_type == SOF_INTEL_IPC4) { if (priv->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_msg *ipc4_msg; struct sof_ipc4_msg *ipc4_msg;
ipc4_msg = priv->tx_buffer; ipc4_msg = priv->tx_buffer;
......
...@@ -424,12 +424,12 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev, ...@@ -424,12 +424,12 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
switch (sof_client_get_ipc_type(cdev)) { switch (sof_client_get_ipc_type(cdev)) {
#ifdef CONFIG_SND_SOC_SOF_IPC4 #ifdef CONFIG_SND_SOC_SOF_IPC4
case SOF_INTEL_IPC4: case SOF_IPC_TYPE_4:
priv->ipc_ops = &ipc4_probe_ops; priv->ipc_ops = &ipc4_probe_ops;
break; break;
#endif #endif
#ifdef CONFIG_SND_SOC_SOF_IPC3 #ifdef CONFIG_SND_SOC_SOF_IPC3
case SOF_IPC: case SOF_IPC_TYPE_3:
priv->ipc_ops = &ipc3_probe_ops; priv->ipc_ops = &ipc3_probe_ops;
break; break;
#endif #endif
......
...@@ -75,7 +75,7 @@ static int sof_register_ipc_flood_test(struct snd_sof_dev *sdev) ...@@ -75,7 +75,7 @@ static int sof_register_ipc_flood_test(struct snd_sof_dev *sdev)
int ret = 0; int ret = 0;
int i; int i;
if (sdev->pdata->ipc_type != SOF_IPC) if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
return 0; return 0;
for (i = 0; i < CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_NUM; i++) { for (i = 0; i < CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_NUM; i++) {
...@@ -131,7 +131,7 @@ static inline void sof_unregister_ipc_msg_injector(struct snd_sof_dev *sdev) {} ...@@ -131,7 +131,7 @@ static inline void sof_unregister_ipc_msg_injector(struct snd_sof_dev *sdev) {}
static int sof_register_ipc_kernel_injector(struct snd_sof_dev *sdev) static int sof_register_ipc_kernel_injector(struct snd_sof_dev *sdev)
{ {
/* Only IPC3 supported right now */ /* Only IPC3 supported right now */
if (sdev->pdata->ipc_type != SOF_IPC) if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
return 0; return 0;
return sof_client_dev_register(sdev, "kernel_injector", 0, NULL, 0); return sof_client_dev_register(sdev, "kernel_injector", 0, NULL, 0);
...@@ -287,12 +287,12 @@ EXPORT_SYMBOL_NS_GPL(sof_client_dev_unregister, SND_SOC_SOF_CLIENT); ...@@ -287,12 +287,12 @@ EXPORT_SYMBOL_NS_GPL(sof_client_dev_unregister, SND_SOC_SOF_CLIENT);
int sof_client_ipc_tx_message(struct sof_client_dev *cdev, void *ipc_msg, int sof_client_ipc_tx_message(struct sof_client_dev *cdev, void *ipc_msg,
void *reply_data, size_t reply_bytes) void *reply_data, size_t reply_bytes)
{ {
if (cdev->sdev->pdata->ipc_type == SOF_IPC) { if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
struct sof_ipc_cmd_hdr *hdr = ipc_msg; struct sof_ipc_cmd_hdr *hdr = ipc_msg;
return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, hdr->size, return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, hdr->size,
reply_data, reply_bytes); reply_data, reply_bytes);
} else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) { } else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_msg *msg = ipc_msg; struct sof_ipc4_msg *msg = ipc_msg;
return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, msg->data_size, return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, msg->data_size,
...@@ -305,7 +305,7 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc_tx_message, SND_SOC_SOF_CLIENT); ...@@ -305,7 +305,7 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc_tx_message, SND_SOC_SOF_CLIENT);
int sof_client_ipc_rx_message(struct sof_client_dev *cdev, void *ipc_msg, void *msg_buf) int sof_client_ipc_rx_message(struct sof_client_dev *cdev, void *ipc_msg, void *msg_buf)
{ {
if (cdev->sdev->pdata->ipc_type == SOF_IPC) { if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
struct sof_ipc_cmd_hdr *hdr = ipc_msg; struct sof_ipc_cmd_hdr *hdr = ipc_msg;
if (hdr->size < sizeof(hdr)) { if (hdr->size < sizeof(hdr)) {
...@@ -324,12 +324,12 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc_rx_message, SND_SOC_SOF_CLIENT); ...@@ -324,12 +324,12 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc_rx_message, SND_SOC_SOF_CLIENT);
int sof_client_ipc_set_get_data(struct sof_client_dev *cdev, void *ipc_msg, int sof_client_ipc_set_get_data(struct sof_client_dev *cdev, void *ipc_msg,
bool set) bool set)
{ {
if (cdev->sdev->pdata->ipc_type == SOF_IPC) { if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
struct sof_ipc_cmd_hdr *hdr = ipc_msg; struct sof_ipc_cmd_hdr *hdr = ipc_msg;
return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg, hdr->size, return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg, hdr->size,
set); set);
} else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) { } else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_msg *msg = ipc_msg; struct sof_ipc4_msg *msg = ipc_msg;
return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg, return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg,
...@@ -345,7 +345,7 @@ struct sof_ipc4_fw_module *sof_client_ipc4_find_module(struct sof_client_dev *c, ...@@ -345,7 +345,7 @@ struct sof_ipc4_fw_module *sof_client_ipc4_find_module(struct sof_client_dev *c,
{ {
struct snd_sof_dev *sdev = c->sdev; struct snd_sof_dev *sdev = c->sdev;
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4)
return sof_ipc4_find_module_by_uuid(sdev, uuid); return sof_ipc4_find_module_by_uuid(sdev, uuid);
dev_err(sdev->dev, "Only supported with IPC4\n"); dev_err(sdev->dev, "Only supported with IPC4\n");
...@@ -463,11 +463,11 @@ void sof_client_ipc_rx_dispatcher(struct snd_sof_dev *sdev, void *msg_buf) ...@@ -463,11 +463,11 @@ void sof_client_ipc_rx_dispatcher(struct snd_sof_dev *sdev, void *msg_buf)
struct sof_ipc_event_entry *event; struct sof_ipc_event_entry *event;
u32 msg_type; u32 msg_type;
if (sdev->pdata->ipc_type == SOF_IPC) { if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
struct sof_ipc_cmd_hdr *hdr = msg_buf; struct sof_ipc_cmd_hdr *hdr = msg_buf;
msg_type = hdr->cmd & SOF_GLB_TYPE_MASK; msg_type = hdr->cmd & SOF_GLB_TYPE_MASK;
} else if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) { } else if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_msg *msg = msg_buf; struct sof_ipc4_msg *msg = msg_buf;
msg_type = SOF_IPC4_NOTIFICATION_TYPE_GET(msg->primary); msg_type = SOF_IPC4_NOTIFICATION_TYPE_GET(msg->primary);
...@@ -497,10 +497,10 @@ int sof_client_register_ipc_rx_handler(struct sof_client_dev *cdev, ...@@ -497,10 +497,10 @@ int sof_client_register_ipc_rx_handler(struct sof_client_dev *cdev,
if (!callback) if (!callback)
return -EINVAL; return -EINVAL;
if (cdev->sdev->pdata->ipc_type == SOF_IPC) { if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
if (!(ipc_msg_type & SOF_GLB_TYPE_MASK)) if (!(ipc_msg_type & SOF_GLB_TYPE_MASK))
return -EINVAL; return -EINVAL;
} else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) { } else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
if (!(ipc_msg_type & SOF_IPC4_NOTIFICATION_TYPE_MASK)) if (!(ipc_msg_type & SOF_IPC4_NOTIFICATION_TYPE_MASK))
return -EINVAL; return -EINVAL;
} else { } else {
......
...@@ -64,17 +64,17 @@ int sof_of_probe(struct platform_device *pdev) ...@@ -64,17 +64,17 @@ int sof_of_probe(struct platform_device *pdev)
sof_pdata->desc = desc; sof_pdata->desc = desc;
sof_pdata->dev = &pdev->dev; sof_pdata->dev = &pdev->dev;
sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC]; sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC_TYPE_3];
if (fw_path) if (fw_path)
sof_pdata->fw_filename_prefix = fw_path; sof_pdata->fw_filename_prefix = fw_path;
else else
sof_pdata->fw_filename_prefix = sof_pdata->desc->default_fw_path[SOF_IPC]; sof_pdata->fw_filename_prefix = desc->default_fw_path[SOF_IPC_TYPE_3];
if (tplg_path) if (tplg_path)
sof_pdata->tplg_filename_prefix = tplg_path; sof_pdata->tplg_filename_prefix = tplg_path;
else else
sof_pdata->tplg_filename_prefix = sof_pdata->desc->default_tplg_path[SOF_IPC]; sof_pdata->tplg_filename_prefix = desc->default_tplg_path[SOF_IPC_TYPE_3];
/* set callback to be called on successful device probe to enable runtime_pm */ /* set callback to be called on successful device probe to enable runtime_pm */
sof_pdata->sof_probe_complete = sof_of_probe_complete; sof_pdata->sof_probe_complete = sof_of_probe_complete;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment