From patchwork Thu Sep 28 10:18:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 114402 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp555326qgf; Thu, 28 Sep 2017 03:19:06 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA/bmdGqDvR8q52flsitakfa2xBf1cMUDaSw+UW7aRVbLVuIl4zinBDNQ8h7FhC/wD89nfJ X-Received: by 10.98.34.149 with SMTP id p21mr3939961pfj.322.1506593946392; Thu, 28 Sep 2017 03:19:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506593946; cv=none; d=google.com; s=arc-20160816; b=P/pDoZR02Wt/k7TYuP1MmnNrud8GunWRB8Zy0MZXprtNIIg9c/4z/bkw5A1tGwQaHB FNeE/M7mf991/LopuIK/7ahrGyeTZ0ZzPXEIQyEigNpsNsa+b0GxV2RCpEiI76A22jhk DUbM7Lc+ntfLZpJQ46ah+yMc2QhmEmFZS+rLmmI0L2M6MpyC/RvwOJ9zA97bfzN62tdr PBAopi3aBn4KisgeT9o9d8j/lTlFO054QPyltjZwJVv7A5z+LfJ4RMpYLVY56oW6Hbmn zv9XmosVozeNJH2662R/gEjIK2Nc6PW+MmkzLgFU37H+br4JQSH1X1aBJ+lkbel/daBf ReuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=BUm8VLeczkYZ66oiz+nLAa6sZ0Vu2HEnYZCHZTzdvBA=; b=stBDrbKENrI5S7cIeHg8VlXOWkxNqcyz/3l2FBQhBGxLRnCv2rhM6uh1qi87vetebz PoQfkbo2DySBFjT7AW5OGVPTt+23pSOghGIYM+uKPXNyZ8N2z2jqq2xYukCXjWt3IOQV 6i6MJNXqfALqyVf//Qylg9F0yag6M9w8cl3mQ3rj8to0meU7VRU0kcVbRcb5s4HsHG+a O8VnUTA2giubE2B0w7AENVGjBeVTUlkM9fZZ8du2ZUFIBOAWHkYEIY6hqwIFPUUWna8g po34sCBHFOLX2rfJpj/AVz4v7WwHOWHE4GhmUvmVpEBgu3M+dHZkIKtI0QFIkQ999zaL chFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c23si1122002pfc.443.2017.09.28.03.19.06; Thu, 28 Sep 2017 03:19:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752681AbdI1KTD (ORCPT + 26 others); Thu, 28 Sep 2017 06:19:03 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54640 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129AbdI1KTC (ORCPT ); Thu, 28 Sep 2017 06:19:02 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2A19C1529; Thu, 28 Sep 2017 03:19:02 -0700 (PDT) Received: from e107155-lin.cambridge.arm.com (unknown [10.1.210.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1AA803F3E1; Thu, 28 Sep 2017 03:19:00 -0700 (PDT) From: Sudeep Holla To: linux-kernel@vger.kernel.org, Jassi Brar Cc: Sudeep Holla , Alexey Klimov , Jassi Brar Subject: [RESEND][PATCH 1/2] mailbox: reset txdone_method TXDONE_BY_POLL if client knows_txdone Date: Thu, 28 Sep 2017 11:18:52 +0100 Message-Id: <1506593933-5857-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently the mailbox framework sets txdone_method to TXDONE_BY_POLL if the controller sets txdone_by_poll. However some clients can have a mechanism to do TXDONE_BY_ACK which they can specify by knows_txdone. However, we endup setting both TXDONE_BY_POLL and TXDONE_BY_ACK in that case. In such scenario, we may end up with below warnings as the tx ticker is run both by mailbox framework and the client. WARNING: CPU: 1 PID: 0 at kernel/time/hrtimer.c:805 hrtimer_forward+0x88/0xd8 CPU: 1 PID: 0 Comm: swapper/1 Not tainted 4.12.0-rc5 #242 Hardware name: ARM LTD ARM Juno Development Platform task: ffff8009768ca700 task.stack: ffff8009768f8000 PC is at hrtimer_forward+0x88/0xd8 LR is at txdone_hrtimer+0xd4/0xf8 Call trace: hrtimer_forward+0x88/0xd8 __hrtimer_run_queues+0xe4/0x158 hrtimer_interrupt+0xa4/0x220 arch_timer_handler_phys+0x30/0x40 handle_percpu_devid_irq+0x78/0x130 generic_handle_irq+0x24/0x38 __handle_domain_irq+0x5c/0xb8 gic_handle_irq+0x54/0xa8 This patch fixes the issue by resetting TXDONE_BY_POLL if client has set knows_txdone. Cc: Alexey Klimov Cc: Jassi Brar Signed-off-by: Sudeep Holla --- drivers/mailbox/mailbox.c | 4 ++-- drivers/mailbox/pcc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 537f4f6d009b..674b35f402f5 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -351,7 +351,7 @@ struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index) init_completion(&chan->tx_complete); if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone) - chan->txdone_method |= TXDONE_BY_ACK; + chan->txdone_method = TXDONE_BY_ACK; spin_unlock_irqrestore(&chan->lock, flags); @@ -418,7 +418,7 @@ void mbox_free_channel(struct mbox_chan *chan) spin_lock_irqsave(&chan->lock, flags); chan->cl = NULL; chan->active_req = NULL; - if (chan->txdone_method == (TXDONE_BY_POLL | TXDONE_BY_ACK)) + if (chan->txdone_method == TXDONE_BY_ACK) chan->txdone_method = TXDONE_BY_POLL; module_put(chan->mbox->dev->driver->owner); diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 9b7005e1345e..27c2294be51a 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -266,7 +266,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, init_completion(&chan->tx_complete); if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone) - chan->txdone_method |= TXDONE_BY_ACK; + chan->txdone_method = TXDONE_BY_ACK; spin_unlock_irqrestore(&chan->lock, flags); @@ -312,7 +312,7 @@ void pcc_mbox_free_channel(struct mbox_chan *chan) spin_lock_irqsave(&chan->lock, flags); chan->cl = NULL; chan->active_req = NULL; - if (chan->txdone_method == (TXDONE_BY_POLL | TXDONE_BY_ACK)) + if (chan->txdone_method == TXDONE_BY_ACK) chan->txdone_method = TXDONE_BY_POLL; spin_unlock_irqrestore(&chan->lock, flags);