From patchwork Tue Dec 12 23:58:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10108459 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 350056029B for ; Tue, 12 Dec 2017 23:59:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2761328EAD for ; Tue, 12 Dec 2017 23:59:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C36D28EB4; Tue, 12 Dec 2017 23:59:28 +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=ham 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 C908828EAD for ; Tue, 12 Dec 2017 23:59:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752934AbdLLX7N (ORCPT ); Tue, 12 Dec 2017 18:59:13 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:42479 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752885AbdLLX7G (ORCPT ); Tue, 12 Dec 2017 18:59:06 -0500 Received: by mail-pf0-f196.google.com with SMTP id d23so484213pfe.9 for ; Tue, 12 Dec 2017 15:59:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r7hVHeASRwnG15giTIwXO7iaztMlse8qsnfaY/wNG6E=; b=V63R61/Xc1zqKg8u67vbDijEQHtEJ7r7ZdncaG3G0y+eHQ0nXlis0CODkxfFN9fS5J sFNZPMk6yT5Pv8vKwCqRe4i4ARVNE7IYDU1Ii/nvdVqEHRbmWrz20p6mdrndWLCZPjH9 049tth1PLmDfPNZOcsc/qzogJhqvKV45eg4r8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r7hVHeASRwnG15giTIwXO7iaztMlse8qsnfaY/wNG6E=; b=Fqw8G3WfpBQ1p6vbc0rkFnuZWmjuF9Zeh/QCMW7oLqZQq1duo6UzEqip5whW5cldPm F1dQ53va0CbHaMvmq7YugE1vh1d0GUY5y1y2IvjCzhsPIhogAqjGybHtUk2L8AYLm/Zl E2I6IP+x9nOBkaRj/25tumyLXvSRs6Lc91TZn5F+UxkJ4sGTQeXS4bF/gEqpu2UGDTFU MVf5wXO7MAR0a6/qG3yrWhMhcnY5oN1seaC61wXQfNLdQMqX3GJuVBVxOtjsrwySffQ1 EXIkQutztyeki6g/PGZq48IVRCme5FjoIbbPTwlxgTIAJX6XQuMmIHzkADbEG2aaoYrd ELEw== X-Gm-Message-State: AKGB3mJIQigfFREk8n3Iu7lv4fdjVal0jFdp7QFvACkdEFj0s6qg38Ad zXXyloVE5D98vzSSxtheT4tYOw== X-Google-Smtp-Source: ACJfBovbN24Q7NU3BkGNHtTWtO8brh5AnrE6XZDvwKt7gHEcKJ+UZEs/PYppwHE5kGugPxWCtl6MIA== X-Received: by 10.84.168.37 with SMTP id e34mr4027730plb.10.1513123145653; Tue, 12 Dec 2017 15:59:05 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id t202sm270317pgb.75.2017.12.12.15.59.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 15:59:04 -0800 (PST) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Chris Lew , Jeremy McNicoll , Will Newton Subject: [PATCH 4/5] rpmsg: smd: Fail send on a closed channel Date: Tue, 12 Dec 2017 15:58:56 -0800 Message-Id: <20171212235857.10432-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171212235857.10432-1-bjorn.andersson@linaro.org> References: <20171212235857.10432-1-bjorn.andersson@linaro.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 Move the check for a closed channel out from the tx-full loop to fail any send request on a non-open channel. Signed-off-by: Bjorn Andersson --- drivers/rpmsg/qcom_smd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 0993e95bf0f5..ed167ab52a68 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -743,17 +743,13 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data, if (ret) return ret; - while (qcom_smd_get_tx_avail(channel) < tlen) { + while (qcom_smd_get_tx_avail(channel) < tlen && + channel->state == SMD_CHANNEL_OPENED) { if (!wait) { ret = -EAGAIN; goto out; } - if (channel->state != SMD_CHANNEL_OPENED) { - ret = -EPIPE; - goto out; - } - SET_TX_CHANNEL_FLAG(channel, fBLOCKREADINTR, 0); ret = wait_event_interruptible(channel->fblockread_event, @@ -765,6 +761,12 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data, SET_TX_CHANNEL_FLAG(channel, fBLOCKREADINTR, 1); } + /* Fail if the channel was closed */ + if (channel->state != SMD_CHANNEL_OPENED) { + ret = -EPIPE; + goto out; + } + SET_TX_CHANNEL_FLAG(channel, fTAIL, 0); qcom_smd_write_fifo(channel, hdr, sizeof(hdr));