From patchwork Wed Aug 16 17:19:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 9904399 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 28A1C60244 for ; Wed, 16 Aug 2017 17:32:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 133D22872B for ; Wed, 16 Aug 2017 17:32:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0826F28946; Wed, 16 Aug 2017 17:32:58 +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=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9478B2872B for ; Wed, 16 Aug 2017 17:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ZYyI4XQMbaXEb5ui513YCiTPn32iN/KN6kQ0q1oSV+Q=; b=eu3OhIZ2wREud0lChL7fUlb7XN dWYcNWie1kjNaz2VAzLE6FRC2dALVTclnb3M9CLdpUhd4uHtbIk8nwSMHdmJ6IWqInXfNn2ScN3pQ ivwVMF5GA5yl9gf+qLw2V0B7D/QcCWfoL6PezDIirTmRxsYBh1g8pCS37W08/QLX7iFzb7MmPg8jN NenEd9GoSA+NXSaxjhJwYL3tZqegsJRHUYvLlhVTLnVicsLDiXLd6UmCswwEMjok/9de9RP3osaN1 8wsceX1eoZ7ZWvQNxsVhDS2hzOiwZUB1wZ74JmOqIAkxQSyClwsJB8Qm+DsLvmLWsyhO2rHSpJ3C/ hkF+eKiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1di2BX-0002df-7o; Wed, 16 Aug 2017 17:32:51 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1di2BA-00026S-WC for linux-arm-kernel@bombadil.infradead.org; Wed, 16 Aug 2017 17:32:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dFOY4OjzvF8kpaFSKr8VGlqX2UEj8f0lNIuI+5AtmNA=; b=Ft9GYKbLd/CV055Z0bRdB6H0N GKLWyRThdN26M0dtW9DIX7C/HNW1KjSLo4ien6xoDAqW6otNr+ttyQkOAIjTjcl3J9hwMu+Fr9C70 gBxJhhmcsQdqAEPESoJuzQUNxy7m2tEbbl5IQgeMkcWGbS+Wh6ounyIqQh26f29Gmn++ofLPuTp6n 5reXxEwRTUwRgrEbKhHCTu0/eGTqHNG4sfosoJQHY6TRAChmNVk1gY2JrrZ/I0kOsMF9riD8doT1h Ir8dw7XRGmL9uQTPy5OOX7iXbcUO10HLdOm3b+LK/3qX3JgvQQWiIQKJCKI6Dq6GeGmzB4RLTspHl h0/7QmRzg==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1di204-0004wd-5f for linux-arm-kernel@lists.infradead.org; Wed, 16 Aug 2017 17:21:02 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7F1056076B; Wed, 16 Aug 2017 17:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1502904028; bh=X0mNb46fyPmf098X02oxDcpmjDU1OXli7kRfVM7R+JM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ugcu8UpaijkG6LZF0YymotxJoICk0pl0V43uHPnCYhOOD1SsAr/d4mNIjKLsNYYe/ GLEW8P7I7oARNHCHCedg+FxfMGYMSZwoI7+tvAwb3K9QiQEI33I6GxATnZdNZi5tqy kMTP/3dxwofLPxbXkx0dMsDwbUsSdAFrvKQ+lmkQ= 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 046FD60711; Wed, 16 Aug 2017 17:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1502904019; bh=X0mNb46fyPmf098X02oxDcpmjDU1OXli7kRfVM7R+JM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XnHgPHR54LAV3OfjpnhZCDVxUeSeneIoNVBroGt3WwzauGpwWN655C8MPp++49FON HFdvEEdoXdVTTln0B5nw4Kxx+n8h4QBOuwg6130gH5qTa7RIG7+IdTltqr5Y82exUe KD9MDfv2XnSvjXO59F9zmsV1q1PuK4GClOp/hd00= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 046FD60711 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 Subject: [PATCH 17/18] rpmsg: glink: Request for intents when unavailable Date: Wed, 16 Aug 2017 22:49:10 +0530 Message-Id: <1502903951-5403-18-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1502903951-5403-1-git-send-email-sricharan@codeaurora.org> References: <1502903951-5403-1-git-send-email-sricharan@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170816_182100_490903_916A8ED3 X-CRM114-Status: GOOD ( 21.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sricharan@codeaurora.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP While sending data, we search for suitable sized intent to map and simply fail if a intent is not found. Instead request for a intent of required size and wait till one is alloted. Signed-off-by: Sricharan R Signed-off-by: Bjorn Andersson --- drivers/rpmsg/qcom_glink_native.c | 73 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 7b43adc..cfacf4d 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -174,6 +174,10 @@ struct glink_channel { struct completion open_ack; struct completion open_req; + + struct mutex intent_req_lock; + bool intent_req_result; + struct completion intent_req_comp; }; #define to_glink_channel(_ept) container_of(_ept, struct glink_channel, ept) @@ -335,6 +339,24 @@ static void qcom_glink_send_open_ack(struct qcom_glink *glink, qcom_glink_tx(glink, &msg, sizeof(msg), NULL, 0, true); } +static void qcom_glink_handle_intent_req_ack(struct qcom_glink *glink, + unsigned int cid, bool granted) +{ + struct glink_channel *channel; + unsigned long flags; + + 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, "unable to find channel\n"); + return; + } + + channel->intent_req_result = granted; + complete(&channel->intent_req_comp); +} + /** * qcom_glink_send_open_req() - send a RPM_CMD_OPEN request to the remote * @glink: @@ -933,6 +955,10 @@ static irqreturn_t qcom_glink_native_intr(int irq, void *data) case RPM_CMD_INTENT: qcom_glink_handle_intent(glink, param1, param2, avail); break; + case RPM_CMD_RX_INTENT_REQ_ACK: + qcom_glink_handle_intent_req_ack(glink, param1, param2); + qcom_glink_rx_advance(glink, ALIGN(sizeof(msg), 8)); + break; default: qcom_glink_rx_advance(glink, ALIGN(sizeof(msg), 8)); dev_err(glink->dev, "unhandled rx cmd: %d\n", cmd); @@ -1099,6 +1125,42 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept) qcom_glink_send_close_req(glink, channel); } +static int qcom_glink_request_intent(struct qcom_glink *glink, + struct glink_channel *channel, + size_t size) +{ + struct { + u16 id; + u16 cid; + u32 size; + } __packed cmd; + + int ret; + + mutex_lock(&channel->intent_req_lock); + + reinit_completion(&channel->intent_req_comp); + + cmd.id = RPM_CMD_RX_INTENT_REQ; + cmd.cid = channel->lcid; + cmd.size = size; + + ret = qcom_glink_tx(glink, &cmd, sizeof(cmd), NULL, 0, true); + if (ret) + return ret; + + ret = wait_for_completion_timeout(&channel->intent_req_comp, 10 * HZ); + if (!ret) { + dev_err(glink->dev, "intent request timed out\n"); + ret = -ETIMEDOUT; + } else { + ret = channel->intent_req_result ? 0 : -ECANCELED; + } + + mutex_unlock(&channel->intent_req_lock); + return ret; +} + static int __qcom_glink_send(struct glink_channel *channel, void *data, int len, bool wait) { @@ -1115,7 +1177,7 @@ static int __qcom_glink_send(struct glink_channel *channel, unsigned long flags; if (!glink->intentless) { - if (!intent) { + while (!intent) { spin_lock_irqsave(&channel->intent_lock, flags); idr_for_each_entry(&channel->riids, tmp, iid) { if (tmp->size >= len && !tmp->in_use) { @@ -1127,8 +1189,15 @@ static int __qcom_glink_send(struct glink_channel *channel, spin_unlock_irqrestore(&channel->intent_lock, flags); /* We found an available intent */ - if (!intent) + if (intent) + break; + + if (!wait) return -EBUSY; + + ret = qcom_glink_request_intent(glink, channel, len); + if (ret < 0) + return ret; } iid = intent->id;