ASoC: SOF: move ops to sof_dev_desc

bardliao · plbossart · commit 5931a304f36c · 2019-01-03T12:02:49.000-06:00
snd_sof_dsp_ops and sof_arch_ops are hardware specific stuff, so move
them from snd_sof_dev to sof_dev_desc.

Signed-off-by: Bard liao &lt;yung-chuan.liao@linux.intel.com&gt;
diff --git a/include/sound/sof.h b/include/sound/sof.h
@@ -70,6 +70,9 @@ struct sof_dev_desc {
 	/* defaults for no codec mode */
 	const char *nocodec_fw_filename;
 	const char *nocodec_tplg_filename;
+
+	const struct snd_sof_dsp_ops *ops;
+	const struct sof_arch_ops *arch_ops;
 };
 
 int sof_nocodec_setup(struct device *dev,
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
@@ -245,7 +245,6 @@ static int sof_probe(struct platform_device *pdev)
 	sdev->parent = plat_data->dev;
 	if dev_is_pci(plat_data->dev)
 		sdev->pci = to_pci_dev(plat_data->dev);
-	sdev->ops = plat_data->machine->pdata;
 
 	sdev->pdata = plat_data;
 	sdev->first_boot = true;
@@ -326,9 +325,9 @@ static int sof_probe(struct platform_device *pdev)
 	sdev->first_boot = false;
 
 	/* now register audio DSP platform driver and dai */
-	ret = snd_soc_register_component(&pdev->dev,  &sdev->plat_drv,
-					 sdev->ops->drv,
-					 sdev->ops->num_drv);
+	ret = snd_soc_register_component(&pdev->dev, &sdev->plat_drv,
+					 sof_ops(sdev)->drv,
+					 sof_ops(sdev)->num_drv);
 	if (ret < 0) {
 		dev_err(sdev->dev,
 			"error: failed to register DSP DAI driver %d\n", ret);
diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
@@ -15,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
 #include "sof-priv.h"
+#include "ops.h"
 
 static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
 				 size_t count, loff_t *ppos)
@@ -139,7 +140,7 @@ EXPORT_SYMBOL(snd_sof_debugfs_buf_create_item);
 
 int snd_sof_dbg_init(struct snd_sof_dev *sdev)
 {
-	const struct snd_sof_dsp_ops *ops = sdev->ops;
+	const struct snd_sof_dsp_ops *ops = sof_ops(sdev);
 	const struct snd_sof_debugfs_map *map;
 	int err = 0, i;
 
diff --git a/sound/soc/sof/hw-spi.c b/sound/soc/sof/hw-spi.c
@@ -320,7 +320,6 @@ EXPORT_SYMBOL(snd_sof_spi_ops);
 const struct sof_intel_dsp_desc spi_chip_info = {
 	.cores_num = 2,
 	.cores_mask = 0x3,
-	.ops = &snd_sof_spi_ops,
 };
 EXPORT_SYMBOL(spi_chip_info);
 
diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
@@ -107,6 +107,5 @@ const struct sof_intel_dsp_desc apl_chip_info = {
 	.ipc_ack = HDA_DSP_REG_HIPCIE,
 	.ipc_ack_mask = HDA_DSP_REG_HIPCIE_DONE,
 	.ipc_ctl = HDA_DSP_REG_HIPCCTL,
-	.ops = &sof_apl_ops,
 };
 EXPORT_SYMBOL(apl_chip_info);
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
@@ -537,9 +537,6 @@ static int bdw_probe(struct snd_sof_dev *sdev)
 	u32 base, size;
 	int ret = 0;
 
-	/* set DSP arch ops */
-	sdev->arch_ops = &sof_xtensa_arch_ops;
-
 	/* LPE base */
 	mmio = platform_get_resource(pdev, IORESOURCE_MEM,
 				     desc->resindex_lpe_base);
@@ -700,7 +697,6 @@ EXPORT_SYMBOL(sof_bdw_ops);
 const struct sof_intel_dsp_desc bdw_chip_info = {
 	.cores_num = 1,
 	.cores_mask = 1,
-	.ops = &sof_bdw_ops,
 };
 EXPORT_SYMBOL(bdw_chip_info);
 
diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
@@ -639,7 +639,6 @@ EXPORT_SYMBOL(sof_tng_ops);
 const struct sof_intel_dsp_desc tng_chip_info = {
 	.cores_num = 1,
 	.cores_mask = 1,
-	.ops = &sof_tng_ops,
 };
 EXPORT_SYMBOL(tng_chip_info);
 
@@ -657,9 +656,6 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev)
 	u32 base, size;
 	int ret = 0;
 
-	/* set DSP arch ops */
-	sdev->arch_ops = &sof_xtensa_arch_ops;
-
 	/* DSP DMA can only access low 31 bits of host memory */
 	ret = dma_coerce_mask_and_coherent(sdev->dev, DMA_BIT_MASK(31));
 	if (ret < 0) {
@@ -808,7 +804,6 @@ EXPORT_SYMBOL(sof_byt_ops);
 const struct sof_intel_dsp_desc byt_chip_info = {
 	.cores_num = 1,
 	.cores_mask = 1,
-	.ops = &sof_byt_ops,
 };
 EXPORT_SYMBOL(byt_chip_info);
 
@@ -867,7 +862,6 @@ EXPORT_SYMBOL(sof_cht_ops);
 const struct sof_intel_dsp_desc cht_chip_info = {
 	.cores_num = 1,
 	.cores_mask = 1,
-	.ops = &sof_cht_ops,
 };
 EXPORT_SYMBOL(cht_chip_info);
 
diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
@@ -259,6 +259,5 @@ const struct sof_intel_dsp_desc cnl_chip_info = {
 	.ipc_ack = CNL_DSP_REG_HIPCIDA,
 	.ipc_ack_mask = CNL_DSP_REG_HIPCIDA_DONE,
 	.ipc_ctl = CNL_DSP_REG_HIPCCTL,
-	.ops = &sof_cnl_ops,
 };
 EXPORT_SYMBOL(cnl_chip_info);
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
@@ -332,9 +332,6 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
 	}
 	dev_info(sdev->dev, "DSP detected with PCI class/subclass/prog-if 0x%06x\n", pci->class);
 
-	/* set DSP arch ops */
-	sdev->arch_ops = &sof_xtensa_arch_ops;
-
 	chip = get_chip_info(sdev->pdata);
 	if (!chip) {
 		dev_err(sdev->dev, "error: no such device supported, chip id:%x\n",
@@ -364,7 +361,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_FORCE_IPC_POSITION)
 	hdev->no_ipc_position = 0;
 #else
-	hdev->no_ipc_position = sdev->ops->pcm_pointer ? 1 : 0;
+	hdev->no_ipc_position = sof_ops(sdev)->pcm_pointer ? 1 : 0;
 #endif
 
 	/* set up HDA base */
@@ -442,7 +439,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
 
 	dev_dbg(sdev->dev, "using IPC IRQ %d\n", sdev->ipc_irq);
 	ret = request_threaded_irq(sdev->ipc_irq, hda_dsp_ipc_irq_handler,
-				   chip->ops->irq_thread, IRQF_SHARED,
+				   sof_ops(sdev)->irq_thread, IRQF_SHARED,
 				   "AudioDSP", sdev);
 	if (ret < 0) {
 		dev_err(sdev->dev, "error: failed to register IPC IRQ %d\n",
diff --git a/sound/soc/sof/intel/hsw.c b/sound/soc/sof/intel/hsw.c
@@ -537,9 +537,6 @@ static int hsw_probe(struct snd_sof_dev *sdev)
 	u32 base, size;
 	int ret = 0;
 
-	/* set DSP arch ops */
-	sdev->arch_ops = &sof_xtensa_arch_ops;
-
 	/* LPE base */
 	mmio = platform_get_resource(pdev, IORESOURCE_MEM,
 				     desc->resindex_lpe_base);
@@ -701,7 +698,6 @@ EXPORT_SYMBOL(sof_hsw_ops);
 const struct sof_intel_dsp_desc hsw_chip_info = {
 	.cores_num = 1,
 	.cores_mask = 1,
-	.ops = &sof_hsw_ops,
 };
 EXPORT_SYMBOL(hsw_chip_info);
 
diff --git a/sound/soc/sof/intel/shim.h b/sound/soc/sof/intel/shim.h
@@ -160,7 +160,6 @@ struct sof_intel_dsp_desc {
 	int ipc_ack;
 	int ipc_ack_mask;
 	int ipc_ctl;
-	const struct snd_sof_dsp_ops *ops;
 };
 
 extern const struct snd_sof_dsp_ops sof_tng_ops;
diff --git a/sound/soc/sof/intel/skl.c b/sound/soc/sof/intel/skl.c
@@ -100,6 +100,5 @@ const struct sof_intel_dsp_desc skl_chip_info = {
 	.ipc_ack = HDA_DSP_REG_HIPCIE,
 	.ipc_ack_mask = HDA_DSP_REG_HIPCIE_DONE,
 	.ipc_ctl = HDA_DSP_REG_HIPCCTL,
-	.ops = &sof_skl_ops,
 };
 EXPORT_SYMBOL(skl_chip_info);
diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
@@ -397,8 +397,8 @@ static void ipc_msgs_rx(struct work_struct *work)
 	case SOF_IPC_FW_READY:
 		/* check for FW boot completion */
 		if (!sdev->boot_complete) {
-			if (sdev->ops->fw_ready)
-				err = sdev->ops->fw_ready(sdev, cmd);
+			if (sof_ops(sdev)->fw_ready)
+				err = sof_ops(sdev)->fw_ready(sdev, cmd);
 			if (err < 0) {
 				dev_err(sdev->dev, "error: DSP firmware boot timeout %d\n",
 					err);
diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
@@ -197,7 +197,7 @@ static int load_modules(struct snd_sof_dev *sdev, const struct firmware *fw)
 	size_t remaining;
 
 	header = (struct snd_sof_fw_header *)fw->data;
-	load_module = sdev->ops->load_module;
+	load_module = sof_ops(sdev)->load_module;
 	if (!load_module)
 		return -EINVAL;
 
@@ -277,8 +277,8 @@ int snd_sof_load_firmware(struct snd_sof_dev *sdev)
 {
 	dev_dbg(sdev->dev, "loading firmware\n");
 
-	if (sdev->ops->load_firmware)
-		return sdev->ops->load_firmware(sdev);
+	if (sof_ops(sdev)->load_firmware)
+		return sof_ops(sdev)->load_firmware(sdev);
 	return 0;
 }
 EXPORT_SYMBOL(snd_sof_load_firmware);
diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
diff --git a/sound/soc/sof/sof-spi-dev.c b/sound/soc/sof/sof-spi-dev.c
