APR: Add G-link transport layer for packet routing
APR driver was using SMD as the underlying transport layer. In order to provide a unified IPC solution, G-link is introduced as the replacement which APR adapts as the new transport layer for audio packet routing. Change-Id: I60d96e39ce665b808498d1130e371df8288e370a Signed-off-by: Helen Zeng <xiaoyunz@codeaurora.org> Signed-off-by: Deven Patel <cdevenp@codeaurora.org>
This commit is contained in:
Deven Patel
David Keitel
parent
f0283a0da8
commit
3c53e0c1bf
6 changed files with 606 additions and 38 deletions
|
|
@ -1,4 +1,6 @@
|
|||
obj-$(CONFIG_MSM_QDSP6_APRV2) += apr.o apr_v2.o apr_tal.o voice_svc.o
|
||||
obj-$(CONFIG_MSM_QDSP6_APRV3) += apr.o apr_v3.o apr_tal.o voice_svc.o
|
||||
obj-$(CONFIG_MSM_QDSP6_APRV2_GLINK) += apr.o apr_v2.o apr_tal_glink.o voice_svc.o
|
||||
obj-$(CONFIG_MSM_QDSP6_APRV3_GLINK) += apr.o apr_v3.o apr_tal_glink.o voice_svc.o
|
||||
obj-$(CONFIG_SND_SOC_MSM_QDSP6V2_INTF) += msm_audio_ion.o
|
||||
obj-$(CONFIG_MSM_ADSP_LOADER) += adsp-loader.o
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.
|
||||
/* Copyright (c) 2010-2014, 2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
|
|
@ -34,12 +34,14 @@
|
|||
#include <linux/qdsp6v2/apr.h>
|
||||
#include <linux/qdsp6v2/apr_tal.h>
|
||||
#include <linux/qdsp6v2/dsp_debug.h>
|
||||
#include <linux/ipc_logging.h>
|
||||
|
||||
#define SCM_Q6_NMI_CMD 0x1
|
||||
#define APR_PKT_IPC_LOG_PAGE_CNT 2
|
||||
|
||||
static struct apr_q6 q6;
|
||||
static struct apr_client client[APR_DEST_MAX][APR_CLIENT_MAX];
|
||||
|
||||
static void *apr_pkt_ctx;
|
||||
static wait_queue_head_t dsp_wait;
|
||||
static wait_queue_head_t modem_wait;
|
||||
static bool is_modem_up;
|
||||
|
|
@ -51,6 +53,13 @@ struct apr_reset_work {
|
|||
struct work_struct work;
|
||||
};
|
||||
|
||||
#define APR_PKT_INFO(x...) \
|
||||
do { \
|
||||
if (apr_pkt_ctx) \
|
||||
ipc_log_string(apr_pkt_ctx, "<APR>: "x); \
|
||||
} while (0)
|
||||
|
||||
|
||||
struct apr_svc_table {
|
||||
char name[64];
|
||||
int idx;
|
||||
|
|
@ -305,7 +314,12 @@ int apr_send_pkt(void *handle, uint32_t *buf)
|
|||
hdr->dest_domain = svc->dest_domain;
|
||||
hdr->dest_svc = svc->id;
|
||||
|
||||
w_len = apr_tal_write(clnt->handle, buf, hdr->pkt_size);
|
||||
APR_PKT_INFO("Tx: dest_svc[%d], opcode[0x%X], size[%d]",
|
||||
hdr->dest_svc, hdr->opcode, hdr->pkt_size);
|
||||
|
||||
w_len = apr_tal_write(clnt->handle, buf,
|
||||
(struct apr_pkt_priv *)&svc->pkt_owner,
|
||||
hdr->pkt_size);
|
||||
if (w_len != hdr->pkt_size)
|
||||
pr_err("Unable to write APR pkt successfully: %d\n", w_len);
|
||||
spin_unlock_irqrestore(&svc->w_lock, flags);
|
||||
|
|
@ -313,6 +327,32 @@ int apr_send_pkt(void *handle, uint32_t *buf)
|
|||
return w_len;
|
||||
}
|
||||
|
||||
int apr_pkt_config(void *handle, struct apr_pkt_cfg *cfg)
|
||||
{
|
||||
struct apr_svc *svc = (struct apr_svc *)handle;
|
||||
uint16_t dest_id;
|
||||
uint16_t client_id;
|
||||
struct apr_client *clnt;
|
||||
|
||||
if (!handle) {
|
||||
pr_err("%s: Invalid handle\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (svc->need_reset) {
|
||||
pr_err("%s: service need reset\n", __func__);
|
||||
return -ENETRESET;
|
||||
}
|
||||
|
||||
svc->pkt_owner = cfg->pkt_owner;
|
||||
dest_id = svc->dest_id;
|
||||
client_id = svc->client_id;
|
||||
clnt = &client[dest_id][client_id];
|
||||
|
||||
return apr_tal_rx_intents_config(clnt->handle,
|
||||
cfg->intents.num_of_intents, cfg->intents.size);
|
||||
}
|
||||
|
||||
struct apr_svc *apr_register(char *dest, char *svc_name, apr_fn svc_fn,
|
||||
uint32_t src_port, void *priv)
|
||||
{
|
||||
|
|
@ -399,6 +439,8 @@ struct apr_svc *apr_register(char *dest, char *svc_name, apr_fn svc_fn,
|
|||
svc->dest_id = dest_id;
|
||||
svc->client_id = client_id;
|
||||
svc->dest_domain = domain_id;
|
||||
svc->pkt_owner = APR_PKT_OWNER_DRIVER;
|
||||
|
||||
if (src_port != 0xFFFFFFFF) {
|
||||
temp_port = ((src_port >> 8) * 8) + (src_port & 0xFF);
|
||||
pr_debug("port = %d t_port = %d\n", src_port, temp_port);
|
||||
|
|
@ -458,6 +500,8 @@ void apr_cb_func(void *buf, int len, void *priv)
|
|||
return;
|
||||
}
|
||||
hdr = buf;
|
||||
APR_PKT_INFO("Rx: dest_svc[%d], opcode[0x%X], size[%d]",
|
||||
hdr->dest_svc, hdr->opcode, hdr->pkt_size);
|
||||
|
||||
ver = hdr->hdr_field;
|
||||
ver = (ver & 0x000F);
|
||||
|
|
@ -881,6 +925,11 @@ static int __init apr_init(void)
|
|||
return -ENOMEM;
|
||||
atomic_notifier_chain_register(&panic_notifier_list, &panic_nb);
|
||||
|
||||
apr_pkt_ctx = ipc_log_context_create(APR_PKT_IPC_LOG_PAGE_CNT,
|
||||
"apr", 0);
|
||||
if (!apr_pkt_ctx)
|
||||
pr_err("%s: Unable to create ipc log context\n", __func__);
|
||||
|
||||
return 0;
|
||||
}
|
||||
device_initcall(apr_init);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (c) 2010-2011, 2013-2014 The Linux Foundation.
|
||||
/* Copyright (c) 2010-2011, 2013-2014, 2016 The Linux Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -42,12 +42,12 @@ static char *svc_names[APR_DEST_MAX][APR_CLIENT_MAX] = {
|
|||
|
||||
struct apr_svc_ch_dev apr_svc_ch[APR_DL_MAX][APR_DEST_MAX][APR_CLIENT_MAX];
|
||||
|
||||
int __apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data, int len)
|
||||
int __apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data,
|
||||
struct apr_pkt_priv *pkt_priv, int len)
|
||||
{
|
||||
int w_len;
|
||||
unsigned long flags;
|
||||
|
||||
|
||||
spin_lock_irqsave(&apr_ch->w_lock, flags);
|
||||
if (smd_write_avail(apr_ch->ch) < len) {
|
||||
spin_unlock_irqrestore(&apr_ch->w_lock, flags);
|
||||
|
|
@ -56,6 +56,7 @@ int __apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data, int len)
|
|||
|
||||
w_len = smd_write(apr_ch->ch, data, len);
|
||||
spin_unlock_irqrestore(&apr_ch->w_lock, flags);
|
||||
|
||||
pr_debug("apr_tal:w_len = %d\n", w_len);
|
||||
|
||||
if (w_len != len) {
|
||||
|
|
@ -65,7 +66,8 @@ int __apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data, int len)
|
|||
return w_len;
|
||||
}
|
||||
|
||||
int apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data, int len)
|
||||
int apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data,
|
||||
struct apr_pkt_priv *pkt_priv, int len)
|
||||
{
|
||||
int rc = 0, retries = 0;
|
||||
|
||||
|
|
@ -76,7 +78,7 @@ int apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data, int len)
|
|||
if (rc == -EAGAIN)
|
||||
udelay(50);
|
||||
|
||||
rc = __apr_tal_write(apr_ch, data, len);
|
||||
rc = __apr_tal_write(apr_ch, data, pkt_priv, len);
|
||||
} while (rc == -EAGAIN && retries++ < 300);
|
||||
|
||||
if (rc == -EAGAIN)
|
||||
|
|
@ -144,69 +146,78 @@ check_write_avail:
|
|||
}
|
||||
}
|
||||
|
||||
struct apr_svc_ch_dev *apr_tal_open(uint32_t svc, uint32_t dest,
|
||||
int apr_tal_rx_intents_config(struct apr_svc_ch_dev *apr_ch,
|
||||
int num_of_intents, uint32_t size)
|
||||
{
|
||||
/* Rx intents configuration is required for Glink
|
||||
* but not for SMD. No-op for this function.
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct apr_svc_ch_dev *apr_tal_open(uint32_t clnt, uint32_t dest,
|
||||
uint32_t dl, apr_svc_cb_fn func, void *priv)
|
||||
{
|
||||
int rc;
|
||||
|
||||
if ((svc >= APR_CLIENT_MAX) || (dest >= APR_DEST_MAX) ||
|
||||
if ((clnt >= APR_CLIENT_MAX) || (dest >= APR_DEST_MAX) ||
|
||||
(dl >= APR_DL_MAX)) {
|
||||
pr_err("apr_tal: Invalid params\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (apr_svc_ch[dl][dest][svc].ch) {
|
||||
if (apr_svc_ch[dl][dest][clnt].ch) {
|
||||
pr_err("apr_tal: This channel alreday openend\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mutex_lock(&apr_svc_ch[dl][dest][svc].m_lock);
|
||||
if (!apr_svc_ch[dl][dest][svc].dest_state) {
|
||||
rc = wait_event_timeout(apr_svc_ch[dl][dest][svc].dest,
|
||||
apr_svc_ch[dl][dest][svc].dest_state,
|
||||
mutex_lock(&apr_svc_ch[dl][dest][clnt].m_lock);
|
||||
if (!apr_svc_ch[dl][dest][clnt].dest_state) {
|
||||
rc = wait_event_timeout(apr_svc_ch[dl][dest][clnt].dest,
|
||||
apr_svc_ch[dl][dest][clnt].dest_state,
|
||||
msecs_to_jiffies(APR_OPEN_TIMEOUT_MS));
|
||||
if (rc == 0) {
|
||||
pr_err("apr_tal:open timeout\n");
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][svc].m_lock);
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][clnt].m_lock);
|
||||
return NULL;
|
||||
}
|
||||
pr_debug("apr_tal:Wakeup done\n");
|
||||
apr_svc_ch[dl][dest][svc].dest_state = 0;
|
||||
apr_svc_ch[dl][dest][clnt].dest_state = 0;
|
||||
}
|
||||
rc = smd_named_open_on_edge(svc_names[dest][svc], dest,
|
||||
&apr_svc_ch[dl][dest][svc].ch,
|
||||
&apr_svc_ch[dl][dest][svc],
|
||||
rc = smd_named_open_on_edge(svc_names[dest][clnt], dest,
|
||||
&apr_svc_ch[dl][dest][clnt].ch,
|
||||
&apr_svc_ch[dl][dest][clnt],
|
||||
apr_tal_notify);
|
||||
if (rc < 0) {
|
||||
pr_err("apr_tal: smd_open failed %s\n",
|
||||
svc_names[dest][svc]);
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][svc].m_lock);
|
||||
svc_names[dest][clnt]);
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][clnt].m_lock);
|
||||
return NULL;
|
||||
}
|
||||
rc = wait_event_timeout(apr_svc_ch[dl][dest][svc].wait,
|
||||
(apr_svc_ch[dl][dest][svc].smd_state == 1), 5 * HZ);
|
||||
rc = wait_event_timeout(apr_svc_ch[dl][dest][clnt].wait,
|
||||
(apr_svc_ch[dl][dest][clnt].smd_state == 1), 5 * HZ);
|
||||
if (rc == 0) {
|
||||
pr_err("apr_tal:TIMEOUT for OPEN event\n");
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][svc].m_lock);
|
||||
apr_tal_close(&apr_svc_ch[dl][dest][svc]);
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][clnt].m_lock);
|
||||
apr_tal_close(&apr_svc_ch[dl][dest][clnt]);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
smd_disable_read_intr(apr_svc_ch[dl][dest][svc].ch);
|
||||
smd_disable_read_intr(apr_svc_ch[dl][dest][clnt].ch);
|
||||
|
||||
if (!apr_svc_ch[dl][dest][svc].dest_state) {
|
||||
apr_svc_ch[dl][dest][svc].dest_state = 1;
|
||||
if (!apr_svc_ch[dl][dest][clnt].dest_state) {
|
||||
apr_svc_ch[dl][dest][clnt].dest_state = 1;
|
||||
pr_debug("apr_tal:Waiting for apr svc init\n");
|
||||
msleep(200);
|
||||
pr_debug("apr_tal:apr svc init done\n");
|
||||
}
|
||||
apr_svc_ch[dl][dest][svc].smd_state = 0;
|
||||
apr_svc_ch[dl][dest][clnt].smd_state = 0;
|
||||
|
||||
apr_svc_ch[dl][dest][svc].func = func;
|
||||
apr_svc_ch[dl][dest][svc].priv = priv;
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][svc].m_lock);
|
||||
apr_svc_ch[dl][dest][clnt].func = func;
|
||||
apr_svc_ch[dl][dest][clnt].priv = priv;
|
||||
mutex_unlock(&apr_svc_ch[dl][dest][clnt].m_lock);
|
||||
|
||||
return &apr_svc_ch[dl][dest][svc];
|
||||
return &apr_svc_ch[dl][dest][clnt];
|
||||
}
|
||||
|
||||
int apr_tal_close(struct apr_svc_ch_dev *apr_ch)
|
||||
|
|
|
|||
443
drivers/soc/qcom/qdsp6v2/apr_tal_glink.c
Normal file
443
drivers/soc/qcom/qdsp6v2/apr_tal_glink.c
Normal file
|
|
@ -0,0 +1,443 @@
|
|||
/* Copyright (c) 2016 The Linux Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
* only version 2 as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/clk.h>
|
||||
#include <soc/qcom/smd.h>
|
||||
#include <soc/qcom/glink.h>
|
||||
#include <linux/qdsp6v2/apr_tal.h>
|
||||
|
||||
#define APR_MAXIMUM_NUM_OF_RETRIES 2
|
||||
|
||||
struct apr_tx_buf {
|
||||
struct list_head list;
|
||||
char buf[APR_MAX_BUF];
|
||||
};
|
||||
|
||||
struct apr_buf_list {
|
||||
struct list_head list;
|
||||
spinlock_t lock;
|
||||
};
|
||||
|
||||
struct link_state {
|
||||
uint32_t dest;
|
||||
void *handle;
|
||||
enum glink_link_state link_state;
|
||||
wait_queue_head_t wait;
|
||||
};
|
||||
|
||||
static struct link_state link_state[APR_DEST_MAX];
|
||||
static struct apr_buf_list buf_list;
|
||||
|
||||
static char *svc_names[APR_DEST_MAX][APR_CLIENT_MAX] = {
|
||||
{
|
||||
"apr_audio_svc",
|
||||
"apr_voice_svc",
|
||||
},
|
||||
{
|
||||
"apr_audio_svc",
|
||||
"apr_voice_svc",
|
||||
},
|
||||
};
|
||||
|
||||
static struct apr_svc_ch_dev
|
||||
apr_svc_ch[APR_DL_MAX][APR_DEST_MAX][APR_CLIENT_MAX];
|
||||
|
||||
static int apr_get_free_buf(int len, void **buf)
|
||||
{
|
||||
struct apr_tx_buf *tx_buf;
|
||||
unsigned long flags;
|
||||
|
||||
if (!buf || len > APR_MAX_BUF) {
|
||||
pr_err("%s: buf too large [%d]\n", __func__, len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
spin_lock_irqsave(&buf_list.lock, flags);
|
||||
if (list_empty(&buf_list.list)) {
|
||||
spin_unlock_irqrestore(&buf_list.lock, flags);
|
||||
pr_err("%s: No buf available\n", __func__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
tx_buf = list_first_entry(&buf_list.list, struct apr_tx_buf, list);
|
||||
list_del(&tx_buf->list);
|
||||
spin_unlock_irqrestore(&buf_list.lock, flags);
|
||||
|
||||
*buf = tx_buf->buf;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data,
|
||||
struct apr_pkt_priv *pkt_priv, int len)
|
||||
{
|
||||
int rc = 0;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&apr_ch->w_lock, flags);
|
||||
rc = glink_tx(apr_ch->handle, pkt_priv, data, len,
|
||||
GLINK_TX_REQ_INTENT | GLINK_TX_ATOMIC);
|
||||
spin_unlock_irqrestore(&apr_ch->w_lock, flags);
|
||||
|
||||
if (rc)
|
||||
pr_err("%s: glink_tx failed, rc[%d]\n", __func__, rc);
|
||||
else
|
||||
rc = len;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
int apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data,
|
||||
struct apr_pkt_priv *pkt_priv, int len)
|
||||
{
|
||||
int rc = 0, retries = 0;
|
||||
void *pkt_data = NULL;
|
||||
|
||||
if (!apr_ch->handle || !pkt_priv)
|
||||
return -EINVAL;
|
||||
|
||||
if (pkt_priv->pkt_owner == APR_PKT_OWNER_DRIVER) {
|
||||
rc = apr_get_free_buf(len, &pkt_data);
|
||||
if (rc)
|
||||
goto exit;
|
||||
|
||||
memcpy(pkt_data, data, len);
|
||||
} else {
|
||||
pkt_data = data;
|
||||
}
|
||||
|
||||
do {
|
||||
if (rc == -EAGAIN)
|
||||
udelay(50);
|
||||
|
||||
rc = __apr_tal_write(apr_ch, pkt_data, pkt_priv, len);
|
||||
} while (rc == -EAGAIN && retries++ < APR_MAXIMUM_NUM_OF_RETRIES);
|
||||
|
||||
if (rc == -EAGAIN)
|
||||
pr_err("%s: TIMEOUT for write\n", __func__);
|
||||
exit:
|
||||
return rc;
|
||||
}
|
||||
|
||||
void apr_tal_notify_rx(void *handle, const void *priv, const void *pkt_priv,
|
||||
const void *ptr, size_t size)
|
||||
{
|
||||
struct apr_svc_ch_dev *apr_ch = (struct apr_svc_ch_dev *)priv;
|
||||
unsigned long flags;
|
||||
|
||||
if (!apr_ch || !ptr) {
|
||||
pr_err("%s: Invalid apr_ch or ptr\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
pr_debug("%s: Rx packet received\n", __func__);
|
||||
|
||||
spin_lock_irqsave(&apr_ch->r_lock, flags);
|
||||
if (apr_ch->func)
|
||||
apr_ch->func((void *)ptr, size, (void *)pkt_priv);
|
||||
spin_unlock_irqrestore(&apr_ch->r_lock, flags);
|
||||
glink_rx_done(apr_ch->handle, ptr, true);
|
||||
}
|
||||
|
||||
void apr_tal_notify_tx_done(void *handle, const void *priv,
|
||||
const void *pkt_priv, const void *ptr)
|
||||
{
|
||||
struct apr_tx_buf *buf = NULL;
|
||||
struct apr_pkt_priv *apr_pkt_priv = (struct apr_pkt_priv *)pkt_priv;
|
||||
unsigned long flags;
|
||||
|
||||
if (!pkt_priv || !ptr) {
|
||||
pr_err("%s: Invalid pkt_priv or ptr\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
pr_debug("%s: tx_done received\n", __func__);
|
||||
|
||||
if (apr_pkt_priv->pkt_owner == APR_PKT_OWNER_DRIVER) {
|
||||
spin_lock_irqsave(&buf_list.lock, flags);
|
||||
buf = container_of(ptr, struct apr_tx_buf, list);
|
||||
list_add_tail(&buf->list, &buf_list.list);
|
||||
spin_unlock_irqrestore(&buf_list.lock, flags);
|
||||
}
|
||||
}
|
||||
|
||||
bool apr_tal_notify_rx_intent_req(void *handle, const void *priv,
|
||||
size_t req_size)
|
||||
{
|
||||
struct apr_svc_ch_dev *apr_ch = (struct apr_svc_ch_dev *)priv;
|
||||
|
||||
if (!apr_ch) {
|
||||
pr_err("%s: Invalid apr_ch\n", __func__);
|
||||
return false;
|
||||
}
|
||||
|
||||
pr_err("%s: No rx intents queued, unable to receive\n", __func__);
|
||||
return false;
|
||||
}
|
||||
|
||||
void apr_tal_notify_state(void *handle, const void *priv, unsigned event)
|
||||
{
|
||||
struct apr_svc_ch_dev *apr_ch = (struct apr_svc_ch_dev *)priv;
|
||||
|
||||
if (!apr_ch) {
|
||||
pr_err("%s: Invalid apr_ch\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
apr_ch->channel_state = event;
|
||||
pr_info("%s: Channel state[%d]\n", __func__, event);
|
||||
|
||||
if (event == GLINK_CONNECTED)
|
||||
wake_up(&apr_ch->wait);
|
||||
}
|
||||
|
||||
int apr_tal_rx_intents_config(struct apr_svc_ch_dev *apr_ch,
|
||||
int num_of_intents, uint32_t size)
|
||||
{
|
||||
int i;
|
||||
int rc;
|
||||
|
||||
if (!apr_ch || !num_of_intents || !size) {
|
||||
pr_err("%s: Invalid parameter\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
for (i = 0; i < num_of_intents; i++) {
|
||||
rc = glink_queue_rx_intent(apr_ch->handle, apr_ch, size);
|
||||
if (rc) {
|
||||
pr_err("%s: Failed to queue rx intent, iteration[%d]\n",
|
||||
__func__, i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
struct apr_svc_ch_dev *apr_tal_open(uint32_t clnt, uint32_t dest, uint32_t dl,
|
||||
apr_svc_cb_fn func, void *priv)
|
||||
{
|
||||
int rc;
|
||||
struct glink_open_config open_cfg;
|
||||
struct apr_svc_ch_dev *apr_ch;
|
||||
|
||||
if ((clnt >= APR_CLIENT_MAX) || (dest >= APR_DEST_MAX) ||
|
||||
(dl >= APR_DL_MAX)) {
|
||||
pr_err("%s: Invalid params, clnt:%d, dest:%d, dl:%d\n",
|
||||
__func__, clnt, dest, dl);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
apr_ch = &apr_svc_ch[dl][dest][clnt];
|
||||
mutex_lock(&apr_ch->m_lock);
|
||||
if (apr_ch->handle) {
|
||||
pr_err("%s: This channel is already opened\n", __func__);
|
||||
apr_ch = NULL;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
if (link_state[dest].link_state != GLINK_LINK_STATE_UP) {
|
||||
rc = wait_event_timeout(link_state[dest].wait,
|
||||
link_state[dest].link_state == GLINK_LINK_STATE_UP,
|
||||
msecs_to_jiffies(APR_OPEN_TIMEOUT_MS));
|
||||
if (rc == 0) {
|
||||
pr_err("%s: Open timeout, dest:%d\n", __func__, dest);
|
||||
rc = -ETIMEDOUT;
|
||||
goto unlock;
|
||||
}
|
||||
pr_debug("%s: Wakeup done, dest:%d\n", __func__, dest);
|
||||
}
|
||||
|
||||
memset(&open_cfg, 0, sizeof(struct glink_open_config));
|
||||
open_cfg.options = GLINK_OPT_INITIAL_XPORT;
|
||||
if (dest == APR_DEST_MODEM)
|
||||
open_cfg.edge = "mpss";
|
||||
else
|
||||
open_cfg.edge = "lpass";
|
||||
|
||||
open_cfg.name = svc_names[dest][clnt];
|
||||
open_cfg.notify_rx = apr_tal_notify_rx;
|
||||
open_cfg.notify_tx_done = apr_tal_notify_tx_done;
|
||||
open_cfg.notify_state = apr_tal_notify_state;
|
||||
open_cfg.notify_rx_intent_req = apr_tal_notify_rx_intent_req;
|
||||
open_cfg.priv = apr_ch;
|
||||
|
||||
apr_ch->channel_state = GLINK_REMOTE_DISCONNECTED;
|
||||
apr_ch->handle = glink_open(&open_cfg);
|
||||
if (IS_ERR_OR_NULL(apr_ch->handle)) {
|
||||
pr_err("%s: glink_open failed %s\n", __func__,
|
||||
svc_names[dest][clnt]);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
rc = wait_event_timeout(apr_ch->wait,
|
||||
(apr_ch->channel_state == GLINK_CONNECTED), 5 * HZ);
|
||||
if (rc == 0) {
|
||||
pr_err("%s: TIMEOUT for OPEN event\n", __func__);
|
||||
rc = -ETIMEDOUT;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
rc = apr_tal_rx_intents_config(apr_ch, APR_DEFAULT_NUM_OF_INTENTS,
|
||||
APR_MAX_BUF);
|
||||
if (rc) {
|
||||
pr_err("%s: Unable to queue intents\n", __func__);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
apr_ch->func = func;
|
||||
apr_ch->priv = priv;
|
||||
|
||||
unlock:
|
||||
if (rc && apr_ch) {
|
||||
if (apr_ch->handle) {
|
||||
glink_close(apr_ch->handle);
|
||||
apr_ch->handle = NULL;
|
||||
}
|
||||
apr_ch = NULL;
|
||||
}
|
||||
mutex_unlock(&apr_ch->m_lock);
|
||||
|
||||
return apr_ch;
|
||||
}
|
||||
|
||||
int apr_tal_close(struct apr_svc_ch_dev *apr_ch)
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (!apr_ch || !apr_ch->handle) {
|
||||
rc = -EINVAL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
mutex_lock(&apr_ch->m_lock);
|
||||
rc = glink_close(apr_ch->handle);
|
||||
apr_ch->handle = NULL;
|
||||
apr_ch->func = NULL;
|
||||
apr_ch->priv = NULL;
|
||||
mutex_unlock(&apr_ch->m_lock);
|
||||
exit:
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void apr_tal_link_state_cb(struct glink_link_state_cb_info *cb_info,
|
||||
void *priv)
|
||||
{
|
||||
uint32_t dest;
|
||||
|
||||
if (!cb_info) {
|
||||
pr_err("%s: Invalid cb_info\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!strcmp(cb_info->edge, "mpss"))
|
||||
dest = APR_DEST_MODEM;
|
||||
else if (!strcmp(cb_info->edge, "lpass"))
|
||||
dest = APR_DEST_QDSP6;
|
||||
else {
|
||||
pr_err("%s:Unknown edge[%s]\n", __func__, cb_info->edge);
|
||||
return;
|
||||
}
|
||||
|
||||
pr_info("%s: edge[%s] link state[%d]\n", __func__, cb_info->edge,
|
||||
cb_info->link_state);
|
||||
|
||||
link_state[dest].link_state = cb_info->link_state;
|
||||
if (link_state[dest].link_state == GLINK_LINK_STATE_UP)
|
||||
wake_up(&link_state[dest].wait);
|
||||
}
|
||||
|
||||
static struct glink_link_info mpss_link_info = {
|
||||
.transport = NULL,
|
||||
.edge = "mpss",
|
||||
.glink_link_state_notif_cb = apr_tal_link_state_cb,
|
||||
};
|
||||
|
||||
static struct glink_link_info lpass_link_info = {
|
||||
.transport = NULL,
|
||||
.edge = "lpass",
|
||||
.glink_link_state_notif_cb = apr_tal_link_state_cb,
|
||||
};
|
||||
|
||||
static int __init apr_tal_init(void)
|
||||
{
|
||||
int i, j, k;
|
||||
struct apr_tx_buf *buf;
|
||||
struct list_head *ptr, *next;
|
||||
|
||||
for (i = 0; i < APR_DL_MAX; i++) {
|
||||
for (j = 0; j < APR_DEST_MAX; j++) {
|
||||
for (k = 0; k < APR_CLIENT_MAX; k++) {
|
||||
init_waitqueue_head(&apr_svc_ch[i][j][k].wait);
|
||||
spin_lock_init(&apr_svc_ch[i][j][k].w_lock);
|
||||
spin_lock_init(&apr_svc_ch[i][j][k].r_lock);
|
||||
mutex_init(&apr_svc_ch[i][j][k].m_lock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < APR_DEST_MAX; i++)
|
||||
init_waitqueue_head(&link_state[i].wait);
|
||||
|
||||
spin_lock_init(&buf_list.lock);
|
||||
INIT_LIST_HEAD(&buf_list.list);
|
||||
for (i = 0; i < APR_NUM_OF_TX_BUF; i++) {
|
||||
buf = kzalloc(sizeof(struct apr_tx_buf), GFP_KERNEL);
|
||||
if (!buf) {
|
||||
pr_err("%s: Unable to allocate tx buf\n", __func__);
|
||||
goto tx_buf_alloc_fail;
|
||||
}
|
||||
|
||||
INIT_LIST_HEAD(&buf->list);
|
||||
spin_lock(&buf_list.lock);
|
||||
list_add_tail(&buf->list, &buf_list.list);
|
||||
spin_unlock(&buf_list.lock);
|
||||
}
|
||||
|
||||
link_state[APR_DEST_MODEM].link_state = GLINK_LINK_STATE_DOWN;
|
||||
link_state[APR_DEST_MODEM].handle =
|
||||
glink_register_link_state_cb(&mpss_link_info, NULL);
|
||||
if (!link_state[APR_DEST_MODEM].handle)
|
||||
pr_err("%s: Unable to register mpss link state\n", __func__);
|
||||
|
||||
link_state[APR_DEST_QDSP6].link_state = GLINK_LINK_STATE_DOWN;
|
||||
link_state[APR_DEST_QDSP6].handle =
|
||||
glink_register_link_state_cb(&lpass_link_info, NULL);
|
||||
if (!link_state[APR_DEST_QDSP6].handle)
|
||||
pr_err("%s: Unable to register lpass link state\n", __func__);
|
||||
|
||||
return 0;
|
||||
|
||||
tx_buf_alloc_fail:
|
||||
list_for_each_safe(ptr, next, &buf_list.list) {
|
||||
buf = list_entry(ptr, struct apr_tx_buf, list);
|
||||
list_del(&buf->list);
|
||||
kfree(buf);
|
||||
}
|
||||
return -ENOMEM;
|
||||
}
|
||||
device_initcall(apr_tal_init);
|
||||
|
|
@ -136,6 +136,7 @@ struct apr_svc {
|
|||
void *priv;
|
||||
struct mutex m_lock;
|
||||
spinlock_t w_lock;
|
||||
uint8_t pkt_owner;
|
||||
};
|
||||
|
||||
struct apr_client {
|
||||
|
|
@ -147,6 +148,16 @@ struct apr_client {
|
|||
struct apr_svc svc[APR_SVC_MAX];
|
||||
};
|
||||
|
||||
struct apr_rx_intents {
|
||||
int num_of_intents;
|
||||
uint32_t size;
|
||||
};
|
||||
|
||||
struct apr_pkt_cfg {
|
||||
uint8_t pkt_owner;
|
||||
struct apr_rx_intents intents;
|
||||
};
|
||||
|
||||
int apr_load_adsp_image(void);
|
||||
struct apr_client *apr_get_client(int dest_id, int client_id);
|
||||
int apr_wait_for_device_up(int dest_id);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
|
||||
/* Copyright (c) 2010-2011, 2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
/* APR Client IDs */
|
||||
#define APR_CLIENT_AUDIO 0x0
|
||||
#define APR_CLIENT_VOICE 0x1
|
||||
#define APR_CLIENT_MAX 0x2
|
||||
#define APR_CLIENT_MAX 0x2
|
||||
|
||||
#define APR_DL_SMD 0
|
||||
#define APR_DL_MAX 1
|
||||
|
|
@ -29,15 +29,66 @@
|
|||
#define APR_DEST_QDSP6 1
|
||||
#define APR_DEST_MAX 2
|
||||
|
||||
#define APR_MAX_BUF 8192
|
||||
#if defined(CONFIG_MSM_QDSP6_APRV2_GLINK) || \
|
||||
defined(CONFIG_MSM_QDSP6_APRV3_GLINK)
|
||||
#define APR_MAX_BUF 512
|
||||
#define APR_NUM_OF_TX_BUF 20
|
||||
#else
|
||||
#define APR_MAX_BUF 8092
|
||||
#endif
|
||||
|
||||
#define APR_DEFAULT_NUM_OF_INTENTS 20
|
||||
|
||||
#define APR_OPEN_TIMEOUT_MS 5000
|
||||
|
||||
enum {
|
||||
/* If client sets the pkt_owner to APR_PKT_OWNER_DRIVER, APR
|
||||
* driver will allocate a buffer, where the user packet is
|
||||
* copied into, for each and every single Tx transmission.
|
||||
* The buffer is thereafter passed to underlying link layer
|
||||
* and freed upon the notification received from the link layer
|
||||
* that the packet has been consumed.
|
||||
*/
|
||||
APR_PKT_OWNER_DRIVER,
|
||||
/* If client sets the pkt_owner to APR_PKT_OWNER_CLIENT, APR
|
||||
* will pass the user packet memory address directly to underlying
|
||||
* link layer. In this case it is the client's responsibility to
|
||||
* make sure the packet is intact until being notified that the
|
||||
* packet has been consumed.
|
||||
*/
|
||||
APR_PKT_OWNER_CLIENT,
|
||||
};
|
||||
|
||||
struct apr_pkt_priv {
|
||||
/* This property is only applicable for APR over Glink.
|
||||
* It is ignored in APR over SMD cases.
|
||||
*/
|
||||
uint8_t pkt_owner;
|
||||
};
|
||||
|
||||
typedef void (*apr_svc_cb_fn)(void *buf, int len, void *priv);
|
||||
struct apr_svc_ch_dev *apr_tal_open(uint32_t svc, uint32_t dest,
|
||||
uint32_t dl, apr_svc_cb_fn func, void *priv);
|
||||
int apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data, int len);
|
||||
int apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data,
|
||||
struct apr_pkt_priv *pkt_priv, int len);
|
||||
int apr_tal_close(struct apr_svc_ch_dev *apr_ch);
|
||||
int apr_tal_rx_intents_config(struct apr_svc_ch_dev *apr_ch,
|
||||
int num_of_intents, uint32_t size);
|
||||
|
||||
|
||||
#if defined(CONFIG_MSM_QDSP6_APRV2_GLINK) || \
|
||||
defined(CONFIG_MSM_QDSP6_APRV3_GLINK)
|
||||
struct apr_svc_ch_dev {
|
||||
void *handle;
|
||||
spinlock_t w_lock;
|
||||
spinlock_t r_lock;
|
||||
struct mutex m_lock;
|
||||
apr_svc_cb_fn func;
|
||||
wait_queue_head_t wait;
|
||||
void *priv;
|
||||
unsigned channel_state;
|
||||
};
|
||||
#else
|
||||
struct apr_svc_ch_dev {
|
||||
struct smd_channel *ch;
|
||||
spinlock_t lock;
|
||||
|
|
@ -51,5 +102,6 @@ struct apr_svc_ch_dev {
|
|||
wait_queue_head_t dest;
|
||||
uint32_t dest_state;
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue