From: Dave Ertman <david.m.ertman@intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org, linux-rdma@vger.kernel.org,
jgg@nvidia.com, dledford@redhat.com, netdev@vger.kernel.org,
davem@davemloft.net, kuba@kernel.org, gregkh@linuxfoundation.org,
ranjani.sridharan@linux.intel.com,
pierre-louis.bossart@linux.intel.com, fred.oh@linux.intel.com,
parav@mellanox.com, shiraz.saleem@intel.com,
dan.j.williams@intel.com, kiran.patil@intel.com,
linux-kernel@vger.kernel.org, leonro@nvidia.com
Subject: [PATCH v3 04/10] ASoC: SOF: ops: Add ops for client registration
Date: Thu, 22 Oct 2020 17:33:32 -0700
Message-ID: <20201023003338.1285642-5-david.m.ertman@intel.com> (raw)
In-Reply-To: <20201023003338.1285642-1-david.m.ertman@intel.com>
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Add new ops for registering/unregistering clients based
on DSP capabilities and/or DT information.
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
---
sound/soc/sof/core.c | 10 ++++++++++
sound/soc/sof/ops.h | 14 ++++++++++++++
sound/soc/sof/sof-priv.h | 4 ++++
3 files changed, 28 insertions(+)
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 72a97219395f..ddb9a12d5aac 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -246,8 +246,17 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
if (plat_data->sof_probe_complete)
plat_data->sof_probe_complete(sdev->dev);
+ /* If registering certain clients fails, unregister the previously registered clients. */
+ ret = snd_sof_register_clients(sdev);
+ if (ret < 0) {
+ dev_err(sdev->dev, "error: failed to register clients %d\n", ret);
+ goto client_reg_err;
+ }
+
return 0;
+client_reg_err:
+ snd_sof_unregister_clients(sdev);
fw_trace_err:
snd_sof_free_trace(sdev);
fw_run_err:
@@ -356,6 +365,7 @@ int snd_sof_device_remove(struct device *dev)
dev_warn(dev, "error: %d failed to prepare DSP for device removal",
ret);
+ snd_sof_unregister_clients(sdev);
snd_sof_fw_unload(sdev);
snd_sof_ipc_free(sdev);
snd_sof_free_debug(sdev);
diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
index b21632f5511a..00370f8bcd75 100644
--- a/sound/soc/sof/ops.h
+++ b/sound/soc/sof/ops.h
@@ -470,6 +470,20 @@ snd_sof_set_mach_params(const struct snd_soc_acpi_mach *mach,
sof_ops(sdev)->set_mach_params(mach, dev);
}
+static inline int snd_sof_register_clients(struct snd_sof_dev *sdev)
+{
+ if (sof_ops(sdev) && sof_ops(sdev)->register_clients)
+ return sof_ops(sdev)->register_clients(sdev);
+
+ return 0;
+}
+
+static inline void snd_sof_unregister_clients(struct snd_sof_dev *sdev)
+{
+ if (sof_ops(sdev) && sof_ops(sdev)->unregister_clients)
+ sof_ops(sdev)->unregister_clients(sdev);
+}
+
static inline const struct snd_sof_dsp_ops
*sof_get_ops(const struct sof_dev_desc *d,
const struct sof_ops_table mach_ops[], int asize)
diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index dceac73b858f..cca239c09d0e 100644
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -252,6 +252,10 @@ struct snd_sof_dsp_ops {
void (*set_mach_params)(const struct snd_soc_acpi_mach *mach,
struct device *dev); /* optional */
+ /* client ops */
+ int (*register_clients)(struct snd_sof_dev *sdev); /* optional */
+ void (*unregister_clients)(struct snd_sof_dev *sdev); /* optional */
+
/* DAI ops */
struct snd_soc_dai_driver *drv;
int num_drv;
--
2.26.2
next prev parent reply index
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 0:33 [PATCH v3 00/10] Auxiliary bus implementation and SOF multi-client support Dave Ertman
2020-10-23 0:33 ` [PATCH v3 01/10] Add auxiliary bus support Dave Ertman
2020-11-05 9:19 ` Dan Williams
2020-11-05 9:47 ` Leon Romanovsky
2020-11-05 17:12 ` Dan Williams
2020-11-05 19:30 ` Leon Romanovsky
2020-11-05 20:27 ` Dan Williams
2020-11-05 20:22 ` Greg KH
2020-11-05 20:24 ` Dan Williams
2020-11-05 19:27 ` Ertman, David M
2020-11-05 19:32 ` Pierre-Louis Bossart
2020-11-05 19:37 ` Leon Romanovsky
2020-11-05 19:35 ` Leon Romanovsky
2020-11-05 20:52 ` Ertman, David M
2020-11-05 19:40 ` Parav Pandit
2020-11-05 20:26 ` Dan Williams
2020-11-05 20:37 ` Parav Pandit
2020-11-06 19:35 ` Mark Brown
2020-11-10 7:23 ` Oded Gabbay
2020-11-05 22:00 ` Dan Williams
2020-11-05 23:48 ` Ertman, David M
2020-11-13 15:50 ` Greg KH
2020-11-13 16:07 ` Ertman, David M
2020-11-13 23:21 ` Greg KH
2020-11-15 6:48 ` Leon Romanovsky
2020-10-23 0:33 ` [PATCH v3 02/10] ASoC: SOF: Introduce descriptors for SOF client Dave Ertman
2020-10-23 0:33 ` [PATCH v3 03/10] ASoC: SOF: Create client driver for IPC test Dave Ertman
2020-10-23 0:33 ` Dave Ertman [this message]
2020-10-23 0:33 ` [PATCH v3 05/10] ASoC: SOF: Intel: Define ops for client registration Dave Ertman
2020-10-23 0:33 ` [PATCH v3 06/10] ASoC: SOF: Intel: Remove IPC flood test support in SOF core Dave Ertman
2020-10-23 0:33 ` [PATCH v3 07/10] ASoC: SOF: sof-client: Add client APIs to access probes ops Dave Ertman
2020-10-23 0:33 ` [PATCH v3 08/10] ASoC: SOF: compress: move and export sof_probe_compr_ops Dave Ertman
2020-10-23 0:33 ` [PATCH v3 09/10] ASoC: SOF: Add new client driver for probes support Dave Ertman
2020-10-23 0:33 ` [PATCH v3 10/10] ASoC: SOF: Intel: CNL: register probes client Dave Ertman
2020-10-23 6:49 ` [PATCH v3 00/10] Auxiliary bus implementation and SOF multi-client support Leon Romanovsky
2020-10-23 6:56 ` Greg KH
2020-10-23 15:48 ` Leon Romanovsky
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=20201023003338.1285642-5-david.m.ertman@intel.com \
--to=david.m.ertman@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=fred.oh@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jgg@nvidia.com \
--cc=kiran.patil@intel.com \
--cc=kuba@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=parav@mellanox.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=shiraz.saleem@intel.com \
--cc=tiwai@suse.de \
/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
Linux-RDMA Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/linux-rdma/0 linux-rdma/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 linux-rdma linux-rdma/ https://lore.kernel.org/linux-rdma \
linux-rdma@vger.kernel.org
public-inbox-index linux-rdma
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.linux-rdma
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git