From: Dave Ertman <david.m.ertman@intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, gregkh@linuxfoundation.org,
ranjani.sridharan@intel.com,
pierre-louis.bossart@linux.intel.com,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
broonie@kernel.org, parav@nvidia.com, jgg@nvidia.com
Subject: [PATCH 4/6] ASoC: SOF: ops: Add ops for client registration
Date: Wed, 30 Sep 2020 15:50:49 -0700 [thread overview]
Message-ID: <20200930225051.889607-5-david.m.ertman@intel.com> (raw)
In-Reply-To: <20200930225051.889607-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..0e5660d7a2fd 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)
+ return 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 043fcec5a288..151614224f47 100644
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -249,6 +249,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 other threads:[~2020-09-30 22:53 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 22:50 [PATCH 0/6] Ancillary bus implementation and SOF multi-client support Dave Ertman
2020-09-30 22:50 ` [PATCH 1/6] Add ancillary bus support Dave Ertman
2020-09-30 23:05 ` Jason Gunthorpe
2020-10-01 11:01 ` Greg KH
2020-10-01 11:46 ` Jason Gunthorpe
2020-10-01 11:54 ` Greg KH
2020-10-01 12:02 ` Jason Gunthorpe
2020-10-01 12:15 ` Greg KH
2020-10-01 18:26 ` Ertman, David M
2020-10-01 11:02 ` Greg KH
2020-10-01 16:30 ` Ertman, David M
2020-10-01 11:05 ` Greg KH
2020-10-01 11:58 ` Jason Gunthorpe
2020-10-01 12:14 ` Greg KH
2020-10-01 14:33 ` Jason Gunthorpe
2020-10-01 14:38 ` Greg KH
2020-10-01 16:06 ` Pierre-Louis Bossart
2020-10-01 17:42 ` Jason Gunthorpe
2020-10-01 14:39 ` Parav Pandit
2020-10-01 14:43 ` Greg KH
2020-10-01 13:27 ` Mark Brown
2020-09-30 22:50 ` [PATCH 2/6] ASoC: SOF: Introduce descriptors for SOF client Dave Ertman
2020-10-01 13:02 ` Greg KH
2020-10-01 15:59 ` Sridharan, Ranjani
2020-10-01 22:16 ` Sridharan, Ranjani
2020-10-02 4:53 ` gregkh
2020-10-02 17:07 ` Sridharan, Ranjani
2020-10-03 9:02 ` gregkh
2020-10-05 2:35 ` Sridharan, Ranjani
2020-10-05 11:27 ` gregkh
2020-10-05 15:18 ` Pierre-Louis Bossart
2020-10-05 15:32 ` gregkh
2020-10-01 13:38 ` Mark Brown
2020-10-01 16:48 ` Sridharan, Ranjani
2020-09-30 22:50 ` [PATCH 3/6] ASoC: SOF: Create client driver for IPC test Dave Ertman
2020-10-01 13:04 ` Greg KH
2020-10-01 16:46 ` Sridharan, Ranjani
2020-10-01 13:09 ` Greg KH
2020-10-01 13:55 ` Pierre-Louis Bossart
2020-10-01 16:48 ` Ertman, David M
2020-10-01 13:59 ` Mark Brown
2020-09-30 22:50 ` Dave Ertman [this message]
2020-09-30 22:50 ` [PATCH 5/6] ASoC: SOF: Intel: Define ops for client registration Dave Ertman
2020-09-30 22:50 ` [PATCH 6/6] ASoC: SOF: debug: Remove IPC flood test support in SOF core Dave Ertman
2020-10-01 5:58 ` [PATCH 0/6] Ancillary bus implementation and SOF multi-client support Greg KH
2020-10-01 15:54 ` Ertman, David M
2020-10-01 7:14 ` Greg KH
2020-10-01 15:55 ` Ertman, David M
2020-10-01 16:10 ` Greg KH
2020-10-01 17:13 ` Ertman, David M
2020-10-02 20:23 ` Ertman, David M
2020-10-03 9:08 ` Greg KH
2020-10-03 9:09 ` Greg KH
2020-10-04 2:26 ` Parav Pandit
2020-10-04 23:45 ` Williams, Dan J
2020-10-05 1:18 ` Ertman, David M
2020-10-05 2:39 ` Parav Pandit
2020-10-05 11:25 ` gregkh
2020-10-06 22:40 ` Dan Williams
2020-10-07 9:14 ` gregkh
2020-10-07 16:19 ` Dan Williams
2020-10-07 16:22 ` Mark Brown
2020-10-07 16:41 ` Dan Williams
2020-10-07 16:42 ` Pierre-Louis Bossart
2020-10-07 16:56 ` Parav Pandit
2020-10-01 10:05 ` Rojewski, Cezary
2020-10-01 10:59 ` gregkh
2020-10-01 12:49 ` Jason Gunthorpe
2020-10-01 12:55 ` gregkh
2020-10-01 13:26 ` Jason Gunthorpe
2020-10-01 14:17 ` gregkh
2020-10-01 15:08 ` Parav Pandit
2020-10-01 12:50 ` Mark Brown
2020-10-01 13:12 ` Greg KH
2020-10-01 13:42 ` Jason Gunthorpe
2020-10-01 14:40 ` Mark Brown
2020-10-01 15:32 ` Greg KH
2020-10-01 16:03 ` Mark Brown
2020-10-01 18:16 ` Greg KH
2020-10-01 18:29 ` Ertman, David M
2020-10-01 19:38 ` Mark Brown
2020-10-01 19:54 ` Ertman, David M
2020-10-01 20:17 ` Mark Brown
2020-10-02 0:47 ` Jason Gunthorpe
2020-10-02 11:19 ` Mark Brown
2020-10-02 17:23 ` Ertman, David M
2020-10-02 17:25 ` Jason Gunthorpe
2020-10-02 17:44 ` Mark Brown
2020-10-01 14:07 ` Pierre-Louis Bossart
2020-10-01 15:24 ` Mark Brown
2020-10-01 16:20 ` Pierre-Louis Bossart
2020-10-01 16:51 ` Mark Brown
2020-10-01 18:04 ` Jason Gunthorpe
2020-10-01 18:13 ` Greg KH
2020-10-01 19:23 ` Mark Brown
2020-10-01 16:50 ` Ertman, David M
2020-10-01 17:10 ` Mark Brown
2020-10-01 17:16 ` Ertman, David M
2020-10-01 17:52 ` Ertman, David M
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=20200930225051.889607-5-david.m.ertman@intel.com \
--to=david.m.ertman@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jgg@nvidia.com \
--cc=parav@nvidia.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@intel.com \
--cc=ranjani.sridharan@linux.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
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;
as well as URLs for NNTP newsgroup(s).