From patchwork Tue Jul 25 20:45:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 108707 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp29120qge; Tue, 25 Jul 2017 13:46:12 -0700 (PDT) X-Received: by 10.98.215.74 with SMTP id v10mr20201577pfl.314.1501015572282; Tue, 25 Jul 2017 13:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501015572; cv=none; d=google.com; s=arc-20160816; b=uExHo9aEdKoNpQDVlbntX47dECt1QczBkeT7simh3x6O/iL7sPh+lNHThXxzSWwbQZ DI0SbAc5puTgXCU6V1TfUXh6FTlv15tCC5KTPVFXnGN1zrBA4PBijipr4J4clRXcHERV 9EdqZfXIhOzijQ2/BRSiC2wbXgAdvEdbMeajEtndNajGAjwqKOztg4sIXoWV1Wld8Ik2 wlJspX01P9PmuDwo17acHitGAw5iGmN36QhGlV2N26p8i2XU67B8o8nMUnBpJ6860FCS KRSeF8Fkh2a7QxViV9KSOYDTdGfYtsBM9CqMvBC8VgjY5Fvdh9+SABpgAv4g+3tZwrQ5 tDKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=dNJ3OPMCtu1k4G5xsrSA8LPIbw1atijMuPcOsjhBiZw=; b=Y2saOREq+5nkajxr4WNtMq1ffKfLHyGySfae5LM2JI4xSLy6EsEG8hGYkHkKceeT9d R7VBM8Z0nVW4795Q89jtcBbe0OYpLRjqLxFVKsYLCm7gPSeglwHvxHWhn45KOBAy6nWw WI5IulYlzCnqE4nCRXcPazHBXD7GzfO6WD4HV05qBtt7P2kOWtYgyutUu5pAKGQC5Ug3 nq0RZOQuGzoglfgLQd56lu669ZEKXL00fMsghqeWCKBZ2IjnZwIZSGLSISD8mcHUGzPS aVS40mZXbGduiN3uUWs5AKHUJ/jF4z+o89fHgrg9epZyLK3JhHYIq4UX5FViMSnnOlZP /6vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=N4mZgbol; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k3si387020pgk.256.2017.07.25.13.46.11; Tue, 25 Jul 2017 13:46:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=N4mZgbol; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752765AbdGYUqK (ORCPT + 6 others); Tue, 25 Jul 2017 16:46:10 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:35213 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752433AbdGYUqH (ORCPT ); Tue, 25 Jul 2017 16:46:07 -0400 Received: by mail-pf0-f176.google.com with SMTP id h29so27552724pfd.2 for ; Tue, 25 Jul 2017 13:46:07 -0700 (PDT) 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=dNJ3OPMCtu1k4G5xsrSA8LPIbw1atijMuPcOsjhBiZw=; b=N4mZgbolHd/v0d9nH9qS/XedO5bS2XVms7A/O8VjYgLfDb3Uqz7RD96h2+VDhwvc92 ADckZ8Lpb4HOYXnSEFe322mMpgcIW2bDw76h4X3SGH6ZaevCSqHe6pZyJnqhz9Rz7Yu/ 0AW6dYMpAyqA4p0dJtp0FvXI8KD/MLH+iIOgU= 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=dNJ3OPMCtu1k4G5xsrSA8LPIbw1atijMuPcOsjhBiZw=; b=PUILGEpweLx0znxuzsPKcdpZDdcXlesPF3m6KYUO//7CS0/zFPhuyWzyQRXnU0dbrh WNXsET8lwazr1WAq4p+O/jhJ1UaTm0Bf/uwrqnbHMzBFClCCkmh677CS+OhCBpHIWt75 3sljJwzrr0PxoHsO3VtojKderoWRTjX0SEO++9ahQ/AJH1XUe2fZd2TIJc3stehMsjT7 EQk9CvGfqwr4JnyLfWPpMqIKPq7WfUNlKbxiIhupq1HAYO3kYq/qemR4Naz+oGbEDenv 7L2Mw8rHSoTsS9/O3XGLbGPj33lMyriYu+2OITwNOyR/fOjfXOAoXAqepSldsHO9ZiBy VGUw== X-Gm-Message-State: AIVw110vFpjS5MxNZc6VUkL+bmkjMCbCxAmMjgA221MpLDuImqItFXg7 QHxxBixdyw5g4VBn X-Received: by 10.98.99.131 with SMTP id x125mr14625722pfb.231.1501015567386; Tue, 25 Jul 2017 13:46:07 -0700 (PDT) Received: from localhost.localdomain ([106.51.135.235]) by smtp.gmail.com with ESMTPSA id d4sm532125pfj.59.2017.07.25.13.46.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 13:46:06 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , Sudeep Holla , Jassi Brar Subject: [PATCH for-3.18 12/15] mailbox: always wait in mbox_send_message for blocking Tx mode Date: Wed, 26 Jul 2017 02:15:23 +0530 Message-Id: <1501015526-32178-13-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501015526-32178-1-git-send-email-amit.pundir@linaro.org> References: <1501015526-32178-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sudeep Holla commit c61b781ee084e69855477d23dd33e7e6caad652c upstream. There exists a race when msg_submit return immediately as there was an active request being processed which may have completed just before it's checked again in mbox_send_message. This will result in return to the caller without waiting in mbox_send_message even when it's blocking Tx. This patch fixes the issue by waiting for the completion always if Tx is in blocking mode. Fixes: 2b6d83e2b8b7 ("mailbox: Introduce framework for mailbox") Reported-by: Alexey Klimov Signed-off-by: Sudeep Holla Reviewed-by: Alexey Klimov Signed-off-by: Jassi Brar [AmitP: fixed a minor cherry-pick conflict on 3.18.y] Signed-off-by: Amit Pundir --- drivers/mailbox/mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index afcb430508ec..2691cb75b2e8 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -255,7 +255,7 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg) if (chan->txdone_method == TXDONE_BY_POLL) poll_txdone((unsigned long)chan->mbox); - if (chan->cl->tx_block && chan->active_req) { + if (chan->cl->tx_block) { unsigned long wait; int ret;