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
Subject: [PATCH v2 4/6] ASoC: SOF: ops: Add ops for client registration
Date: Mon, 5 Oct 2020 11:24:44 -0700 [thread overview]
Message-ID: <20201005182446.977325-5-david.m.ertman@intel.com> (raw)
In-Reply-To: <20201005182446.977325-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 8603924e56e3..1c29199132c5 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
WARNING: multiple messages have this Message-ID (diff)
From: Dave Ertman <david.m.ertman@intel.com>
To: alsa-devel@alsa-project.org
Cc: parav@mellanox.com, tiwai@suse.de, netdev@vger.kernel.org,
ranjani.sridharan@linux.intel.com,
pierre-louis.bossart@linux.intel.com, fred.oh@linux.intel.com,
linux-rdma@vger.kernel.org, dledford@redhat.com,
broonie@kernel.org, jgg@nvidia.com, gregkh@linuxfoundation.org,
kuba@kernel.org, dan.j.williams@intel.com,
shiraz.saleem@intel.com, davem@davemloft.net,
kiran.patil@intel.com
Subject: [PATCH v2 4/6] ASoC: SOF: ops: Add ops for client registration
Date: Mon, 5 Oct 2020 11:24:44 -0700 [thread overview]
Message-ID: <20201005182446.977325-5-david.m.ertman@intel.com> (raw)
In-Reply-To: <20201005182446.977325-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 8603924e56e3..1c29199132c5 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-10-05 19:23 UTC|newest]
Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 18:24 [PATCH v2 0/6] Ancillary bus implementation and SOF multi-client support Dave Ertman
2020-10-05 18:24 ` Dave Ertman
2020-10-05 18:24 ` [PATCH v2 1/6] Add ancillary bus support Dave Ertman
2020-10-05 18:24 ` Dave Ertman
2020-10-06 7:18 ` Leon Romanovsky
2020-10-06 7:18 ` Leon Romanovsky
2020-10-06 15:18 ` Pierre-Louis Bossart
2020-10-06 17:02 ` Leon Romanovsky
2020-10-06 17:02 ` Leon Romanovsky
2020-10-06 17:09 ` Parav Pandit
2020-10-06 17:09 ` Parav Pandit
2020-10-06 17:26 ` Leon Romanovsky
2020-10-06 17:26 ` Leon Romanovsky
2020-10-06 17:41 ` Saleem, Shiraz
2020-10-06 17:41 ` Saleem, Shiraz
2020-10-06 19:20 ` Leon Romanovsky
2020-10-06 19:20 ` Leon Romanovsky
2020-10-07 2:49 ` Dan Williams
2020-10-07 2:49 ` Dan Williams
2020-10-07 13:09 ` Saleem, Shiraz
2020-10-07 13:09 ` Saleem, Shiraz
2020-10-07 13:36 ` Leon Romanovsky
2020-10-07 13:36 ` Leon Romanovsky
2020-10-07 18:55 ` Dan Williams
2020-10-07 18:55 ` Dan Williams
2020-10-07 20:01 ` Ertman, David M
2020-10-07 20:01 ` Ertman, David M
2020-10-06 18:35 ` Ranjani Sridharan
2020-10-06 18:35 ` Ranjani Sridharan
2020-10-06 17:50 ` Saleem, Shiraz
2020-10-06 17:50 ` Saleem, Shiraz
2020-10-07 18:06 ` Ertman, David M
2020-10-07 18:06 ` Ertman, David M
2020-10-07 19:26 ` Leon Romanovsky
2020-10-07 19:26 ` Leon Romanovsky
2020-10-07 19:53 ` Ertman, David M
2020-10-07 19:53 ` Ertman, David M
2020-10-07 19:57 ` Ertman, David M
2020-10-07 19:57 ` Ertman, David M
2020-10-07 20:17 ` Parav Pandit
2020-10-07 20:17 ` Parav Pandit
2020-10-07 20:46 ` Ertman, David M
2020-10-07 20:46 ` Ertman, David M
2020-10-07 20:59 ` Pierre-Louis Bossart
2020-10-07 20:59 ` Pierre-Louis Bossart
2020-10-07 21:22 ` Ertman, David M
2020-10-07 21:22 ` Ertman, David M
2020-10-07 21:49 ` Pierre-Louis Bossart
2020-10-07 21:49 ` Pierre-Louis Bossart
2020-10-08 4:56 ` Parav Pandit
2020-10-08 4:56 ` Parav Pandit
2020-10-08 5:26 ` Leon Romanovsky
2020-10-08 5:26 ` Leon Romanovsky
2020-10-08 7:14 ` Parav Pandit
2020-10-08 7:14 ` Parav Pandit
2020-10-08 7:45 ` Leon Romanovsky
2020-10-08 7:45 ` Leon Romanovsky
2020-10-08 9:45 ` Parav Pandit
2020-10-08 9:45 ` Parav Pandit
2020-10-08 10:17 ` Leon Romanovsky
2020-10-08 10:17 ` Leon Romanovsky
2020-10-08 13:29 ` Pierre-Louis Bossart
2020-10-08 13:29 ` Pierre-Louis Bossart
2020-10-09 11:40 ` Leon Romanovsky
2020-10-09 11:40 ` Leon Romanovsky
2020-10-08 16:54 ` Ertman, David M
2020-10-08 16:54 ` Ertman, David M
2020-10-08 17:35 ` Parav Pandit
2020-10-08 17:35 ` Parav Pandit
2020-10-08 18:13 ` Ertman, David M
2020-10-08 18:13 ` Ertman, David M
2020-10-08 5:21 ` Leon Romanovsky
2020-10-08 5:21 ` Leon Romanovsky
2020-10-08 6:32 ` Dan Williams
2020-10-08 6:32 ` Dan Williams
2020-10-08 7:00 ` Leon Romanovsky
2020-10-08 7:00 ` Leon Romanovsky
2020-10-08 7:38 ` Dan Williams
2020-10-08 7:38 ` Dan Williams
2020-10-08 7:50 ` gregkh
2020-10-08 7:50 ` gregkh
2020-10-08 11:10 ` Parav Pandit
2020-10-08 11:10 ` Parav Pandit
2020-10-08 16:39 ` Ertman, David M
2020-10-08 16:39 ` Ertman, David M
2020-10-08 8:00 ` Leon Romanovsky
2020-10-08 8:00 ` Leon Romanovsky
2020-10-08 8:09 ` Dan Williams
2020-10-08 8:09 ` Dan Williams
2020-10-08 16:42 ` Ertman, David M
2020-10-08 16:42 ` Ertman, David M
2020-10-08 17:21 ` Leon Romanovsky
2020-10-08 17:21 ` Leon Romanovsky
2020-10-08 18:25 ` Ertman, David M
2020-10-08 18:25 ` Ertman, David M
2020-10-07 20:30 ` Ertman, David M
2020-10-07 20:30 ` Ertman, David M
2020-10-07 20:18 ` Ertman, David M
2020-10-07 20:18 ` Ertman, David M
2020-10-06 17:23 ` Leon Romanovsky
2020-10-06 17:23 ` Leon Romanovsky
2020-10-06 17:45 ` Saleem, Shiraz
2020-10-06 17:45 ` Saleem, Shiraz
2020-10-08 22:04 ` Ertman, David M
2020-10-08 22:04 ` Ertman, David M
2020-10-08 22:41 ` Dan Williams
2020-10-08 22:41 ` Dan Williams
2020-10-09 14:26 ` Pierre-Louis Bossart
2020-10-09 14:26 ` Pierre-Louis Bossart
2020-10-09 19:22 ` Dan Williams
2020-10-09 19:22 ` Dan Williams
2020-10-09 19:39 ` Pierre-Louis Bossart
2020-10-09 19:39 ` Pierre-Louis Bossart
2020-10-12 18:34 ` Ertman, David M
2020-10-12 18:34 ` Ertman, David M
2020-10-08 17:20 ` Leon Romanovsky
2020-10-08 17:20 ` Leon Romanovsky
2020-10-08 17:28 ` Ertman, David M
2020-10-08 17:28 ` Ertman, David M
2020-10-05 18:24 ` [PATCH v2 2/6] ASoC: SOF: Introduce descriptors for SOF client Dave Ertman
2020-10-05 18:24 ` Dave Ertman
2020-10-13 1:05 ` Randy Dunlap
2020-10-13 1:05 ` Randy Dunlap
2020-10-13 1:31 ` Pierre-Louis Bossart
2020-10-13 1:31 ` Pierre-Louis Bossart
2020-10-13 1:55 ` Randy Dunlap
2020-10-13 1:55 ` Randy Dunlap
2020-10-13 1:56 ` Randy Dunlap
2020-10-13 1:56 ` Randy Dunlap
2020-10-13 15:08 ` Pierre-Louis Bossart
2020-10-13 19:35 ` Randy Dunlap
2020-10-13 19:57 ` Pierre-Louis Bossart
2020-10-05 18:24 ` [PATCH v2 3/6] ASoC: SOF: Create client driver for IPC test Dave Ertman
2020-10-05 18:24 ` Dave Ertman
2020-10-05 18:24 ` Dave Ertman [this message]
2020-10-05 18:24 ` [PATCH v2 4/6] ASoC: SOF: ops: Add ops for client registration Dave Ertman
2020-10-05 18:24 ` [PATCH v2 5/6] ASoC: SOF: Intel: Define " Dave Ertman
2020-10-05 18:24 ` Dave Ertman
2020-10-05 18:24 ` [PATCH v2 6/6] ASoC: SOF: debug: Remove IPC flood test support in SOF core Dave Ertman
2020-10-05 18:24 ` Dave Ertman
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=20201005182446.977325-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=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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.