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: 9904287 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 070DF6038C for ; Wed, 16 Aug 2017 17:21:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3AEC205FC for ; Wed, 16 Aug 2017 17:21:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7A3228A2E; Wed, 16 Aug 2017 17:21:30 +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 795E8205FC for ; Wed, 16 Aug 2017 17:21:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752298AbdHPRVD (ORCPT ); Wed, 16 Aug 2017 13:21:03 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56022 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbdHPRUk (ORCPT ); Wed, 16 Aug 2017 13:20:40 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 583CC6073A; 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=1502904039; bh=X0mNb46fyPmf098X02oxDcpmjDU1OXli7kRfVM7R+JM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OMSylMAIs3I4PMAx5GmbloIiCXZiRfr6YZf/sA3/7BfRxjS7tJ6bbyC15Y+O4hCjq rLhMWos7BB1v2KtJQQsA93X4ISEW9+7a2l2TT6ozWKOFlRuh1g5sOo6usRfFzVM06j 948Bf47VX1LEesGLqt/lFHJghZt014oeyFiOwsRc= 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 Cc: sricharan@codeaurora.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> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.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;