| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20171214173402.19074-10-srinivas.kandagatla@linaro.org>
Date: Thu, 14 Dec 2017 17:33:56 +0000
From: srinivas.kandagatla@...aro.org
To: Andy Gross <andy.gross@...aro.org>,
Mark Brown <broonie@...nel.org>, linux-arm-msm@...r.kernel.org,
alsa-devel@...a-project.org
Cc: David Brown <david.brown@...aro.org>,
Rob Herring <robh+dt@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Liam Girdwood <lgirdwood@...il.com>,
Patrick Lai <plai@...eaurora.org>,
Banajit Goswami <bgoswami@...eaurora.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>, linux-soc@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, sboyd@...eaurora.org,
Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Subject: [RESEND PATCH v2 09/15] ASoC: qcom: qdsp6: Add support to Q6CORE
From: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
This patch adds support to core apr service, which is used to query
status of other static and dynamic services on the dsp.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
---
sound/soc/qcom/Kconfig | 5 +
sound/soc/qcom/qdsp6/Makefile | 1 +
sound/soc/qcom/qdsp6/q6core.c | 227 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 233 insertions(+)
create mode 100644 sound/soc/qcom/qdsp6/q6core.c
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
index 7ebdb879a8a3..121b9c957024 100644
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -56,11 +56,16 @@ config SND_SOC_QDSP6_ASM
tristate
default n
+config SND_SOC_QDSP6_CORE
+ tristate
+ default n
+
config SND_SOC_QDSP6
tristate "SoC ALSA audio driver for QDSP6"
select SND_SOC_QDSP6_AFE
select SND_SOC_QDSP6_ADM
select SND_SOC_QDSP6_ASM
+ select SND_SOC_QDSP6_CORE
help
To add support for MSM QDSP6 Soc Audio.
This will enable sound soc platform specific
diff --git a/sound/soc/qcom/qdsp6/Makefile b/sound/soc/qcom/qdsp6/Makefile
index 49dd3ccab27b..ad7f10691e54 100644
--- a/sound/soc/qcom/qdsp6/Makefile
+++ b/sound/soc/qcom/qdsp6/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_SND_SOC_QDSP6_AFE) += q6afe.o
obj-$(CONFIG_SND_SOC_QDSP6_ADM) += q6adm.o
obj-$(CONFIG_SND_SOC_QDSP6_ASM) += q6asm.o
+obj-$(CONFIG_SND_SOC_QDSP6_CORE) += q6core.o
diff --git a/sound/soc/qcom/qdsp6/q6core.c b/sound/soc/qcom/qdsp6/q6core.c
new file mode 100644
index 000000000000..d4e2dbc62489
--- /dev/null
+++ b/sound/soc/qcom/qdsp6/q6core.c
@@ -0,0 +1,227 @@
+/* SPDX-License-Identifier: GPL-2.0
+* Copyright (c) 2017, Linaro Limited
+*/
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/jiffies.h>
+#include <linux/wait.h>
+#include <linux/soc/qcom/apr.h>
+#include <linux/platform_device.h>
+#include <sound/asound.h>
+#include "common.h"
+
+#define ADSP_STATE_READY_TIMEOUT_MS 3000
+#define Q6_READY_TIMEOUT_MS 100
+#define AVCS_CMD_ADSP_EVENT_GET_STATE 0x0001290C
+#define AVCS_CMDRSP_ADSP_EVENT_GET_STATE 0x0001290D
+#define AVCS_GET_VERSIONS 0x00012905
+#define AVCS_GET_VERSIONS_RSP 0x00012906
+
+struct avcs_svc_info {
+ uint32_t service_id;
+ uint32_t version;
+} __packed;
+
+struct q6core {
+ struct apr_device *adev;
+ wait_queue_head_t wait;
+ uint32_t avcs_state;
+ int resp_received;
+ uint32_t num_services;
+ struct avcs_svc_info *svcs_info;
+};
+
+static struct apr_device_id static_services[] = {
+ ADSP_AUDIO_APR_DEV("AFE", APR_SVC_AFE),
+ ADSP_AUDIO_APR_DEV("ASM", APR_SVC_ASM),
+ ADSP_AUDIO_APR_DEV("ADM", APR_SVC_ADM),
+ ADSP_AUDIO_APR_DEV("TEST", APR_SVC_TEST_CLIENT),
+ ADSP_AUDIO_APR_DEV("MVM", APR_SVC_ADSP_MVM),
+ ADSP_AUDIO_APR_DEV("CVS", APR_SVC_ADSP_CVS),
+ ADSP_AUDIO_APR_DEV("CVP", APR_SVC_ADSP_CVP),
+ ADSP_AUDIO_APR_DEV("USM", APR_SVC_USM),
+ ADSP_AUDIO_APR_DEV("VIDC", APR_SVC_VIDC),
+ ADSP_AUDIO_APR_DEV("LSM", APR_SVC_LSM),
+};
+
+static int core_callback(struct apr_device *adev, struct apr_client_data *data)
+{
+ struct q6core *core = dev_get_drvdata(&adev->dev);
+ uint32_t *payload;
+
+ switch (data->opcode) {
+ case AVCS_GET_VERSIONS_RSP:
+ payload = data->payload;
+ core->num_services = payload[1];
+
+ if (!core->svcs_info)
+ core->svcs_info = kcalloc(core->num_services,
+ sizeof(*core->svcs_info),
+ GFP_ATOMIC);
+ if (!core->svcs_info)
+ return -ENOMEM;
+
+ /* svc info is after 8 bytes */
+ memcpy(core->svcs_info, payload + 2,
+ core->num_services * sizeof(*core->svcs_info));
+
+ core->resp_received = 1;
+ wake_up(&core->wait);
+
+ break;
+ case AVCS_CMDRSP_ADSP_EVENT_GET_STATE:
+ payload = data->payload;
+ core->avcs_state = payload[0];
+
+ core->resp_received = 1;
+ wake_up(&core->wait);
+ break;
+ default:
+ dev_err(&adev->dev, "Message id from adsp core svc: 0x%x\n",
+ data->opcode);
+ break;
+ }
+
+ return 0;
+}
+
+void q6core_add_service(struct device *dev, uint32_t svc_id, uint32_t version)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(static_services); i++) {
+ if (static_services[i].svc_id == svc_id) {
+ static_services[i].svc_version = version;
+ apr_add_device(dev->parent, &static_services[i]);
+ dev_info(dev,
+ "Adding SVC: %s: id 0x%x API Ver 0x%x:0x%x\n",
+ static_services[i].name, svc_id,
+ APR_SVC_MAJOR_VERSION(version),
+ APR_SVC_MINOR_VERSION(version));
+ }
+ }
+}
+
+static void q6core_add_static_services(struct q6core *core)
+{
+ int i;
+ struct apr_device *adev = core->adev;
+ struct avcs_svc_info *svcs_info = core->svcs_info;
+
+ for (i = 0; i < core->num_services; i++)
+ q6core_add_service(&adev->dev, svcs_info[i].service_id,
+ svcs_info[i].version);
+}
+
+static int q6core_get_svc_versions(struct q6core *core)
+{
+ struct apr_device *adev = core->adev;
+ struct apr_hdr hdr = {0};
+ int rc;
+
+ hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,
+ APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER);
+ hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, 0);
+ hdr.opcode = AVCS_GET_VERSIONS;
+
+ rc = apr_send_pkt(adev, (uint32_t *)&hdr);
+ if (rc < 0)
+ return rc;
+
+ rc = wait_event_timeout(core->wait, (core->resp_received == 1),
+ msecs_to_jiffies(Q6_READY_TIMEOUT_MS));
+ if (rc > 0 && core->resp_received) {
+ core->resp_received = 0;
+ return 0;
+ }
+
+ return rc;
+}
+
+static bool q6core_is_adsp_ready(struct q6core *core)
+{
+ struct apr_device *adev = core->adev;
+ struct apr_hdr hdr = {0};
+ int rc;
+
+ hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,
+ APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER);
+ hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, 0);
+ hdr.opcode = AVCS_CMD_ADSP_EVENT_GET_STATE;
+
+ rc = apr_send_pkt(adev, (uint32_t *)&hdr);
+ if (rc < 0)
+ return false;
+
+ rc = wait_event_timeout(core->wait, (core->resp_received == 1),
+ msecs_to_jiffies(Q6_READY_TIMEOUT_MS));
+ if (rc > 0 && core->resp_received) {
+ core->resp_received = 0;
+ if (core->avcs_state == 0x1)
+ return true;
+ }
+
+ return false;
+}
+
+static int q6core_probe(struct apr_device *adev)
+{
+ struct q6core *core;
+ unsigned long timeout = jiffies +
+ msecs_to_jiffies(ADSP_STATE_READY_TIMEOUT_MS);
+ int ret = 0;
+
+ core = devm_kzalloc(&adev->dev, sizeof(*core), GFP_KERNEL);
+ if (!core)
+ return -ENOMEM;
+
+ dev_set_drvdata(&adev->dev, core);
+
+ core->adev = adev;
+ init_waitqueue_head(&core->wait);
+
+ do {
+ if (!q6core_is_adsp_ready(core)) {
+ dev_info(&adev->dev, "ADSP Audio isn't ready\n");
+ } else {
+ dev_info(&adev->dev, "ADSP Audio is ready\n");
+
+ ret = q6core_get_svc_versions(core);
+ if (!ret)
+ q6core_add_static_services(core);
+
+ break;
+ }
+ } while (time_after(timeout, jiffies));
+
+ return ret;
+}
+
+static int q6core_exit(struct apr_device *adev)
+{
+ return 0;
+}
+
+static const struct apr_device_id core_id[] = {
+ {"Q6CORE", APR_DOMAIN_ADSP, APR_SVC_ADSP_CORE, APR_CLIENT_AUDIO},
+ { },
+};
+
+static struct apr_driver qcom_q6core_driver = {
+ .probe = q6core_probe,
+ .remove = q6core_exit,
+ .callback = core_callback,
+ .id_table = core_id,
+ .driver = {
+ .name = "qcom-q6core",
+ },
+};
+
+module_apr_driver(qcom_q6core_driver);
+
+MODULE_AUTHOR("Srinivas Kandagatla <srinivas.kandagatla@...aro.org");
+MODULE_DESCRIPTION("q6 core");
+MODULE_LICENSE("GPL v2");
--
2.15.0
Powered by blists - more mailing lists