Skip to content

FROMLIST: misc: fastrpc: create duplicate sessions after all CB probing #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quic-vkatoch wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+18 −13
Open

FROMLIST: misc: fastrpc: create duplicate sessions after all CB probing #718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions drivers/misc/fastrpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#define CDSP_DOMAIN_ID (3)
#define GDSP_DOMAIN_ID (4)
#define FASTRPC_MAX_SESSIONS 14
#define FASTRPC_DUP_SESSIONS 4
#define FASTRPC_MAX_VMIDS 16
#define FASTRPC_ALIGN 128
#define FASTRPC_MAX_FDLIST 16
Expand Down Expand Up @@ -2399,16 +2400,13 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
struct fastrpc_channel_ctx *cctx;
struct fastrpc_session_ctx *sess;
struct device *dev = &pdev->dev;
int i, sessions = 0;
unsigned long flags;
int rc;

cctx = dev_get_drvdata(dev->parent);
if (!cctx)
return -EINVAL;

of_property_read_u32(dev->of_node, "qcom,nsessions", &sessions);

spin_lock_irqsave(&cctx->lock, flags);
if (cctx->sesscount >= FASTRPC_MAX_SESSIONS) {
dev_err(&pdev->dev, "too many sessions\n");
Expand All @@ -2425,16 +2423,6 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
if (of_property_read_u32(dev->of_node, "reg", &sess->sid))
dev_info(dev, "FastRPC Session ID not specified in DT\n");

if (sessions > 0) {
struct fastrpc_session_ctx *dup_sess;

for (i = 1; i < sessions; i++) {
if (cctx->sesscount >= FASTRPC_MAX_SESSIONS)
break;
dup_sess = &cctx->session[cctx->sesscount++];
memcpy(dup_sess, sess, sizeof(*dup_sess));
}
}
spin_unlock_irqrestore(&cctx->lock, flags);
rc = dma_set_mask(dev, DMA_BIT_MASK(32));
if (rc) {
Expand Down Expand Up @@ -2654,6 +2642,23 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
if (err)
goto err_deregister_fdev;

if (data->domain_id == ADSP_DOMAIN_ID && data->sesscount > 0) {
struct fastrpc_session_ctx *last_sess;
struct fastrpc_session_ctx *dup_sess;
unsigned long flags;
int i;

spin_lock_irqsave(&data->lock, flags);
last_sess = &data->session[data->sesscount - 1];
for (i = 0; i < FASTRPC_DUP_SESSIONS; i++) {
if (data->sesscount >= FASTRPC_MAX_SESSIONS)
break;
dup_sess = &data->session[data->sesscount++];
memcpy(dup_sess, last_sess, sizeof(*dup_sess));
}
spin_unlock_irqrestore(&data->lock, flags);
}

return 0;

err_deregister_fdev:
Expand Down