From patchwork Thu Aug 24 07:21:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 9919187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00BDB60353 for ; Thu, 24 Aug 2017 07:23:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E724E28434 for ; Thu, 24 Aug 2017 07:23:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBD6B2886B; Thu, 24 Aug 2017 07:23:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B37F28434 for ; Thu, 24 Aug 2017 07:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888AbdHXHW5 (ORCPT ); Thu, 24 Aug 2017 03:22:57 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:35812 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751708AbdHXHW4 (ORCPT ); Thu, 24 Aug 2017 03:22:56 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0EFBB6071B; Thu, 24 Aug 2017 07:22:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1503559375; bh=JHWB4XEGGEFVjF4kpr6sbTHIfL/9FFPYvPBEoWdH8r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G1191p7/ixmxkwyoWNSpQ1xb5xUz2aDRflW8pxyEJ/fuU34vRfeotFIq+O42h/G/G MdPFkHsbJCi+PkhVZTvOAqxr8uWYd7hrRn/J0YWTGPcgyJM8AAndnt04LvjT1sovpQ wn4RK1vew+Lqes1GPSolmoBfFy05rma9LTfaoHJA= Received: from srichara-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sricharan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4368960732; Thu, 24 Aug 2017 07:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1503559367; bh=JHWB4XEGGEFVjF4kpr6sbTHIfL/9FFPYvPBEoWdH8r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RX5ukWltWxKHQjYEAMOSUam4y9LkDkZeAJ00NouMqi1yKxurHWLV8bV3u8wwv7h8q iUkFvqwMCKZNCeOGXzvRCKf3vgQD+BXp7Kvbm/vCM+nuqkuCDsNPIQZ7HQn/j0JLao +XtT0GJD2315tDgEPXsITEULhGoeBQVHi25MnJ1Y= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4368960732 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sricharan@codeaurora.org From: Sricharan R To: ohad@wizery.com, bjorn.andersson@linaro.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: sricharan@codeaurora.org Subject: [PATCH v2 17/20] rpmsg: glink: Receive and store the remote intent buffers Date: Thu, 24 Aug 2017 12:51:39 +0530 Message-Id: <1503559302-3744-18-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1503559302-3744-1-git-send-email-sricharan@codeaurora.org> References: <1503559302-3744-1-git-send-email-sricharan@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Just like we allocating and sending intent ids to remote, remote side allocates and sends us the intents as well. So save the intent ids and use it later while sending data targeting the appropriate intents based on the size. Signed-off-by: Sricharan R Signed-off-by: Bjorn Andersson Acked-by: Arun Kumar Neelakantam --- drivers/rpmsg/qcom_glink_native.c | 71 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 76ee86e..d93d651 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -139,8 +139,9 @@ enum { * @name: unique channel name/identifier * @lcid: channel id, in local space * @rcid: channel id, in remote space - * @intent_lock: lock for protection of @liids + * @intent_lock: lock for protection of @liids, @riids * @liids: idr of all local intents + * @riids: idr of all remote intents * @intent_work: worker responsible for transmitting rx_done packets * @done_intents: list of intents that needs to be announced rx_done * @buf: receive buffer, for gathering fragments @@ -165,6 +166,7 @@ struct glink_channel { spinlock_t intent_lock; struct idr liids; + struct idr riids; struct work_struct intent_work; struct list_head done_intents; @@ -222,6 +224,7 @@ static struct glink_channel *qcom_glink_alloc_channel(struct qcom_glink *glink, INIT_WORK(&channel->intent_work, qcom_glink_rx_done_work); idr_init(&channel->liids); + idr_init(&channel->riids); kref_init(&channel->refcount); return channel; @@ -235,6 +238,7 @@ static void qcom_glink_channel_release(struct kref *ref) spin_lock_irqsave(&channel->intent_lock, flags); idr_destroy(&channel->liids); + idr_destroy(&channel->riids); spin_unlock_irqrestore(&channel->intent_lock, flags); kfree(channel->name); @@ -806,6 +810,68 @@ static int qcom_glink_rx_data(struct qcom_glink *glink, size_t avail) return ret; } +static void qcom_glink_handle_intent(struct qcom_glink *glink, + unsigned int cid, + unsigned int count, + size_t avail) +{ + struct glink_core_rx_intent *intent; + struct glink_channel *channel; + struct intent_pair { + __le32 size; + __le32 iid; + }; + + struct { + struct glink_msg msg; + struct intent_pair intents[]; + } __packed * msg; + + const size_t msglen = sizeof(*msg) + sizeof(struct intent_pair) * count; + int ret; + int i; + unsigned long flags; + + if (avail < msglen) { + dev_dbg(glink->dev, "Not enough data in fifo\n"); + return; + } + + spin_lock_irqsave(&glink->idr_lock, flags); + channel = idr_find(&glink->rcids, cid); + spin_unlock_irqrestore(&glink->idr_lock, flags); + if (!channel) { + dev_err(glink->dev, "intents for non-existing channel\n"); + return; + } + + msg = kmalloc(msglen, GFP_ATOMIC); + if (!msg) + return; + + qcom_glink_rx_peak(glink, msg, 0, msglen); + + for (i = 0; i < count; ++i) { + intent = kzalloc(sizeof(*intent), GFP_ATOMIC); + if (!intent) + break; + + intent->id = le32_to_cpu(msg->intents[i].iid); + intent->size = le32_to_cpu(msg->intents[i].size); + + spin_lock_irqsave(&channel->intent_lock, flags); + ret = idr_alloc(&channel->riids, intent, + intent->id, intent->id + 1, GFP_ATOMIC); + spin_unlock_irqrestore(&channel->intent_lock, flags); + + if (ret < 0) + dev_err(glink->dev, "failed to store remote intent\n"); + } + + kfree(msg); + qcom_glink_rx_advance(glink, ALIGN(msglen, 8)); +} + static int qcom_glink_rx_open_ack(struct qcom_glink *glink, unsigned int lcid) { struct glink_channel *channel; @@ -871,6 +937,9 @@ static irqreturn_t qcom_glink_native_intr(int irq, void *data) ret = 0; break; + case RPM_CMD_INTENT: + qcom_glink_handle_intent(glink, param1, param2, avail); + break; default: qcom_glink_rx_advance(glink, ALIGN(sizeof(msg), 8)); dev_err(glink->dev, "unhandled rx cmd: %d\n", cmd);