Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1288055/?format=api
{ "id": 1288055, "url": "http://patchwork.ozlabs.org/api/patches/1288055/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200511204146.19176-4-ranjani.sridharan@linux.intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200511204146.19176-4-ranjani.sridharan@linux.intel.com>", "list_archive_url": null, "date": "2020-05-11T20:41:46", "name": "[3/3] ASoC: SOF: ops: Add new op for client registration", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "ce38915fde4f969c4e4f4e351f963d1f6bc1db20", "submitter": { "id": 78604, "url": "http://patchwork.ozlabs.org/api/people/78604/?format=api", "name": "Ranjani Sridharan", "email": "ranjani.sridharan@linux.intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200511204146.19176-4-ranjani.sridharan@linux.intel.com/mbox/", "series": [ { "id": 176214, "url": "http://patchwork.ozlabs.org/api/series/176214/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=176214", "date": "2020-05-11T20:41:43", "name": "Virtual bus usage in the audio driver", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/176214/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1288055/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1288055/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=none (p=none dis=none) header.from=linux.intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49LXsx6bVnz9sPF\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 12 May 2020 06:41:57 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A6CCD86B57;\n\tMon, 11 May 2020 20:41:55 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id QJl7bwjGVGhQ; Mon, 11 May 2020 20:41:53 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 912DD8698F;\n\tMon, 11 May 2020 20:41:53 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n by ash.osuosl.org (Postfix) with ESMTP id 44FF11BF396\n for <intel-wired-lan@osuosl.org>; Mon, 11 May 2020 20:41:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by hemlock.osuosl.org (Postfix) with ESMTP id 419388833D\n for <intel-wired-lan@osuosl.org>; Mon, 11 May 2020 20:41:50 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id JYpGVr4V79rl for <intel-wired-lan@osuosl.org>;\n Mon, 11 May 2020 20:41:47 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n by hemlock.osuosl.org (Postfix) with ESMTPS id 67780882F7\n for <intel-wired-lan@osuosl.org>; Mon, 11 May 2020 20:41:47 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 11 May 2020 13:41:46 -0700", "from ajgalle-mobl.amr.corp.intel.com (HELO localhost.localdomain)\n ([10.254.179.28])\n by FMSMGA003.fm.intel.com with ESMTP; 11 May 2020 13:41:46 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n 7ur92Qx+0TOns68+YZ7Ri1OnA6mvYiwseeTn1iacv0AzvCUurIVo9Yhroj8JqQOD3cVara3O+M\n IQLRpBx6bzHQ==", "\n nGxTdO1P4ZJG1lmIFvyhiSMWI4hp0+kWcmN7LqkLHiUDcydn6VntLdADFc4plvpTudjzQrieJC\n 9n8xrPln4a0g==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,381,1583222400\"; d=\"scan'208\";a=\"306281704\"", "From": "Ranjani Sridharan <ranjani.sridharan@linux.intel.com>", "To": "intel-wired-lan@osuosl.org", "Date": "Mon, 11 May 2020 13:41:46 -0700", "Message-Id": "<20200511204146.19176-4-ranjani.sridharan@linux.intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200511204146.19176-1-ranjani.sridharan@linux.intel.com>", "References": "<20200511204146.19176-1-ranjani.sridharan@linux.intel.com>", "Subject": "[Intel-wired-lan] [PATCH 3/3] ASoC: SOF: ops: Add new op for client\n registration", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Fred Oh <fred.oh@linux.intel.com>, pierre-louis.bossart@linux.intel.com", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Add a new op for registering clients. The clients to be\nregistered depend on the DSP capabilities and the ACPI/DT\ninformation. For now, we only add 2 IPC test clients that\nwill be used for run tandem IPC flood tests for all Intel\nplatforms.\n\nFor ACPI platforms, change the Kconfig to select\nSND_SOC_SOF_PROBE_WORK_QUEUE to allow the virtbus driver\nto probe when the client is registered.\n\nSigned-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>\nSigned-off-by: Fred Oh <fred.oh@linux.intel.com>\nReviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>\n---\n sound/soc/sof/core.c | 8 ++++++++\n sound/soc/sof/intel/Kconfig | 1 +\n sound/soc/sof/intel/apl.c | 25 +++++++++++++++++++++++++\n sound/soc/sof/intel/bdw.c | 25 +++++++++++++++++++++++++\n sound/soc/sof/intel/byt.c | 28 ++++++++++++++++++++++++++++\n sound/soc/sof/intel/cnl.c | 25 +++++++++++++++++++++++++\n sound/soc/sof/ops.h | 34 ++++++++++++++++++++++++++++++++++\n sound/soc/sof/sof-priv.h | 3 +++\n 8 files changed, 149 insertions(+)", "diff": "diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c\nindex e2880b9264a6..db57b97e8536 100644\n--- a/sound/soc/sof/core.c\n+++ b/sound/soc/sof/core.c\n@@ -245,6 +245,12 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)\n \tif (plat_data->sof_probe_complete)\n \t\tplat_data->sof_probe_complete(sdev->dev);\n \n+\t/*\n+\t * Register client devices. This can fail but errors cannot be\n+\t * propagated.\n+\t */\n+\tsnd_sof_register_clients(sdev);\n+\n \treturn 0;\n \n fw_trace_err:\n@@ -349,6 +355,7 @@ int snd_sof_device_remove(struct device *dev)\n \t\tcancel_work_sync(&sdev->probe_work);\n \n \tif (sdev->fw_state > SOF_FW_BOOT_NOT_STARTED) {\n+\t\tsnd_sof_unregister_clients(sdev);\n \t\tsnd_sof_fw_unload(sdev);\n \t\tsnd_sof_ipc_free(sdev);\n \t\tsnd_sof_free_debug(sdev);\n@@ -382,4 +389,5 @@ EXPORT_SYMBOL(snd_sof_device_remove);\n MODULE_AUTHOR(\"Liam Girdwood\");\n MODULE_DESCRIPTION(\"Sound Open Firmware (SOF) Core\");\n MODULE_LICENSE(\"Dual BSD/GPL\");\n+MODULE_IMPORT_NS(SND_SOC_SOF_CLIENT);\n MODULE_ALIAS(\"platform:sof-audio\");\ndiff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig\nindex 9b3c01072dd8..46e3a17b9bc6 100644\n--- a/sound/soc/sof/intel/Kconfig\n+++ b/sound/soc/sof/intel/Kconfig\n@@ -13,6 +13,7 @@ config SND_SOC_SOF_INTEL_ACPI\n \tdef_tristate SND_SOC_SOF_ACPI\n \tselect SND_SOC_SOF_BAYTRAIL if SND_SOC_SOF_BAYTRAIL_SUPPORT\n \tselect SND_SOC_SOF_BROADWELL if SND_SOC_SOF_BROADWELL_SUPPORT\n+\tselect SND_SOC_SOF_PROBE_WORK_QUEUE if SND_SOC_SOF_CLIENT\n \thelp\n \t This option is not user-selectable but automagically handled by\n \t 'select' statements at a higher level\ndiff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c\nindex 9e29d4fd393a..1f9c25b9ed3d 100644\n--- a/sound/soc/sof/intel/apl.c\n+++ b/sound/soc/sof/intel/apl.c\n@@ -18,6 +18,9 @@\n #include \"../sof-priv.h\"\n #include \"hda.h\"\n #include \"../sof-audio.h\"\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+#include \"../sof-client.h\"\n+#endif\n \n static const struct snd_sof_debugfs_map apl_dsp_debugfs[] = {\n \t{\"hda\", HDA_DSP_HDA_BAR, 0, 0x4000, SOF_DEBUGFS_ACCESS_ALWAYS},\n@@ -25,6 +28,24 @@ static const struct snd_sof_debugfs_map apl_dsp_debugfs[] = {\n \t{\"dsp\", HDA_DSP_BAR, 0, 0x10000, SOF_DEBUGFS_ACCESS_ALWAYS},\n };\n \n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+static void apl_register_clients(struct snd_sof_dev *sdev)\n+{\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_CLIENT)\n+\t/*\n+\t * Register 2 IPC clients to facilitate tandem flood test.\n+\t * The device name below is appended with the device ID assigned\n+\t * automatically when the virtbus device is registered making\n+\t * them unique.\n+\t */\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+#endif\n+}\n+#else\n+static void apl_register_clients(struct snd_sof_dev *sdev) {}\n+#endif\n+\n /* apollolake ops */\n const struct snd_sof_dsp_ops sof_apl_ops = {\n \t/* probe and remove */\n@@ -101,6 +122,9 @@ const struct snd_sof_dsp_ops sof_apl_ops = {\n \t.trace_release = hda_dsp_trace_release,\n \t.trace_trigger = hda_dsp_trace_trigger,\n \n+\t/* client register */\n+\t.register_clients = apl_register_clients,\n+\n \t/* DAI drivers */\n \t.drv\t\t= skl_dai,\n \t.num_drv\t= SOF_SKL_NUM_DAIS,\n@@ -140,3 +164,4 @@ const struct sof_intel_dsp_desc apl_chip_info = {\n \t.ssp_base_offset = APL_SSP_BASE_OFFSET,\n };\n EXPORT_SYMBOL_NS(apl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);\n+MODULE_IMPORT_NS(SND_SOC_SOF_CLIENT);\ndiff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c\nindex 99fd0bd7276e..96cb88ca9a7c 100644\n--- a/sound/soc/sof/intel/bdw.c\n+++ b/sound/soc/sof/intel/bdw.c\n@@ -18,6 +18,9 @@\n #include \"../ops.h\"\n #include \"shim.h\"\n #include \"../sof-audio.h\"\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+#include \"../sof-client.h\"\n+#endif\n \n /* BARs */\n #define BDW_DSP_BAR 0\n@@ -563,6 +566,24 @@ static void bdw_set_mach_params(const struct snd_soc_acpi_mach *mach,\n \tmach_params->platform = dev_name(dev);\n }\n \n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+static void bdw_register_clients(struct snd_sof_dev *sdev)\n+{\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_CLIENT)\n+\t/*\n+\t * Register 2 IPC clients to facilitate tandem flood test.\n+\t * The device name below is appended with the device ID assigned\n+\t * automatically when the virtbus device is registered making\n+\t * them unique.\n+\t */\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+#endif\n+}\n+#else\n+static void bdw_register_clients(struct snd_sof_dev *sdev) {}\n+#endif\n+\n /* Broadwell DAIs */\n static struct snd_soc_dai_driver bdw_dai[] = {\n {\n@@ -638,6 +659,9 @@ const struct snd_sof_dsp_ops sof_bdw_ops = {\n \t/*Firmware loading */\n \t.load_firmware\t= snd_sof_load_firmware_memcpy,\n \n+\t/* client register */\n+\t.register_clients = bdw_register_clients,\n+\n \t/* DAI drivers */\n \t.drv = bdw_dai,\n \t.num_drv = ARRAY_SIZE(bdw_dai),\n@@ -662,3 +686,4 @@ EXPORT_SYMBOL_NS(bdw_chip_info, SND_SOC_SOF_BROADWELL);\n MODULE_LICENSE(\"Dual BSD/GPL\");\n MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HIFI_EP_IPC);\n MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);\n+MODULE_IMPORT_NS(SND_SOC_SOF_CLIENT);\ndiff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c\nindex f872bb1f2682..37ec979612d1 100644\n--- a/sound/soc/sof/intel/byt.c\n+++ b/sound/soc/sof/intel/byt.c\n@@ -19,6 +19,9 @@\n #include \"shim.h\"\n #include \"../sof-audio.h\"\n #include \"../../intel/common/soc-intel-quirks.h\"\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+#include \"../sof-client.h\"\n+#endif\n \n /* DSP memories */\n #define IRAM_OFFSET\t\t0x0C0000\n@@ -779,6 +782,24 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev)\n \treturn ret;\n }\n \n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+static void byt_register_clients(struct snd_sof_dev *sdev)\n+{\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_CLIENT)\n+\t/*\n+\t * Register 2 IPC clients to facilitate tandem flood test.\n+\t * The device name below is appended with the device ID assigned\n+\t * automatically when the virtbus device is registered making\n+\t * them unique.\n+\t */\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+#endif\n+}\n+#else\n+static void byt_register_clients(struct snd_sof_dev *sdev) {}\n+#endif\n+\n /* baytrail ops */\n const struct snd_sof_dsp_ops sof_byt_ops = {\n \t/* device init */\n@@ -832,6 +853,9 @@ const struct snd_sof_dsp_ops sof_byt_ops = {\n \t/*Firmware loading */\n \t.load_firmware\t= snd_sof_load_firmware_memcpy,\n \n+\t/* client register */\n+\t.register_clients = byt_register_clients,\n+\n \t/* DAI drivers */\n \t.drv = byt_dai,\n \t.num_drv = 3, /* we have only 3 SSPs on byt*/\n@@ -906,6 +930,9 @@ const struct snd_sof_dsp_ops sof_cht_ops = {\n \t/*Firmware loading */\n \t.load_firmware\t= snd_sof_load_firmware_memcpy,\n \n+\t/* client register */\n+\t.register_clients = byt_register_clients,\n+\n \t/* DAI drivers */\n \t.drv = byt_dai,\n \t/* all 6 SSPs may be available for cherrytrail */\n@@ -933,3 +960,4 @@ EXPORT_SYMBOL_NS(cht_chip_info, SND_SOC_SOF_BAYTRAIL);\n MODULE_LICENSE(\"Dual BSD/GPL\");\n MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HIFI_EP_IPC);\n MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);\n+MODULE_IMPORT_NS(SND_SOC_SOF_CLIENT);\ndiff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c\nindex 16db0f50d139..82ee4e5f485b 100644\n--- a/sound/soc/sof/intel/cnl.c\n+++ b/sound/soc/sof/intel/cnl.c\n@@ -19,6 +19,9 @@\n #include \"hda.h\"\n #include \"hda-ipc.h\"\n #include \"../sof-audio.h\"\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+#include \"../sof-client.h\"\n+#endif\n \n static const struct snd_sof_debugfs_map cnl_dsp_debugfs[] = {\n \t{\"hda\", HDA_DSP_HDA_BAR, 0, 0x4000, SOF_DEBUGFS_ACCESS_ALWAYS},\n@@ -231,6 +234,24 @@ static void cnl_ipc_dump(struct snd_sof_dev *sdev)\n \t\thipcida, hipctdr, hipcctl);\n }\n \n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+static void cnl_register_clients(struct snd_sof_dev *sdev)\n+{\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_CLIENT)\n+\t/*\n+\t * Register 2 IPC clients to facilitate tandem flood test.\n+\t * The device name below is appended with the device ID assigned\n+\t * automatically when the virtbus device is registered making\n+\t * them unique.\n+\t */\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+\tsof_client_dev_register(sdev, \"sof-ipc-test\");\n+#endif\n+}\n+#else\n+static void cnl_register_clients(struct snd_sof_dev *sdev) {}\n+#endif\n+\n /* cannonlake ops */\n const struct snd_sof_dsp_ops sof_cnl_ops = {\n \t/* probe and remove */\n@@ -307,6 +328,9 @@ const struct snd_sof_dsp_ops sof_cnl_ops = {\n \t.trace_release = hda_dsp_trace_release,\n \t.trace_trigger = hda_dsp_trace_trigger,\n \n+\t/* client register */\n+\t.register_clients = cnl_register_clients,\n+\n \t/* DAI drivers */\n \t.drv\t\t= skl_dai,\n \t.num_drv\t= SOF_SKL_NUM_DAIS,\n@@ -417,3 +441,4 @@ const struct sof_intel_dsp_desc jsl_chip_info = {\n \t.ssp_base_offset = CNL_SSP_BASE_OFFSET,\n };\n EXPORT_SYMBOL_NS(jsl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);\n+MODULE_IMPORT_NS(SND_SOC_SOF_CLIENT);\ndiff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h\nindex b21632f5511a..97066247a22c 100644\n--- a/sound/soc/sof/ops.h\n+++ b/sound/soc/sof/ops.h\n@@ -14,9 +14,14 @@\n #include <linux/device.h>\n #include <linux/interrupt.h>\n #include <linux/kernel.h>\n+#include <linux/list.h>\n+#include <linux/mutex.h>\n #include <linux/types.h>\n #include <sound/pcm.h>\n #include \"sof-priv.h\"\n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+#include \"sof-client.h\"\n+#endif\n \n #define sof_ops(sdev) \\\n \t((sdev)->pdata->desc->ops)\n@@ -470,6 +475,35 @@ snd_sof_set_mach_params(const struct snd_soc_acpi_mach *mach,\n \t\tsof_ops(sdev)->set_mach_params(mach, dev);\n }\n \n+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)\n+static inline void\n+snd_sof_register_clients(struct snd_sof_dev *sdev)\n+{\n+\tif (sof_ops(sdev) && sof_ops(sdev)->register_clients)\n+\t\tsof_ops(sdev)->register_clients(sdev);\n+}\n+\n+static inline void\n+snd_sof_unregister_clients(struct snd_sof_dev *sdev)\n+{\n+\tstruct sof_client_dev *cdev, *_cdev;\n+\n+\t/* unregister client devices */\n+\tmutex_lock(&sdev->client_mutex);\n+\tlist_for_each_entry_safe(cdev, _cdev, &sdev->client_list, list) {\n+\t\tsof_client_dev_unregister(cdev);\n+\t\tlist_del(&cdev->list);\n+\t}\n+\tmutex_unlock(&sdev->client_mutex);\n+}\n+#else\n+static inline void\n+snd_sof_register_clients(struct snd_sof_dev *sdev) {}\n+\n+static inline void\n+snd_sof_unregister_clients(struct snd_sof_dev *sdev) {}\n+#endif\n+\n static inline const struct snd_sof_dsp_ops\n *sof_get_ops(const struct sof_dev_desc *d,\n \t const struct sof_ops_table mach_ops[], int asize)\ndiff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h\nindex bf16809539a8..210ac0a7df95 100644\n--- a/sound/soc/sof/sof-priv.h\n+++ b/sound/soc/sof/sof-priv.h\n@@ -252,6 +252,9 @@ struct snd_sof_dsp_ops {\n \tvoid (*set_mach_params)(const struct snd_soc_acpi_mach *mach,\n \t\t\t\tstruct device *dev); /* optional */\n \n+\t/* client ops */\n+\tvoid (*register_clients)(struct snd_sof_dev *sdev); /* optional */\n+\n \t/* DAI ops */\n \tstruct snd_soc_dai_driver *drv;\n \tint num_drv;\n", "prefixes": [ "3/3" ] }