From patchwork Wed Mar 13 03:24:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 2261011 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5F61FDF215 for ; Wed, 13 Mar 2013 03:32:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933029Ab3CMDbv (ORCPT ); Tue, 12 Mar 2013 23:31:51 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:33057 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932780Ab3CMD3d (ORCPT ); Tue, 12 Mar 2013 23:29:33 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2D3TEO3012542; Tue, 12 Mar 2013 22:29:14 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2D3TEi2007037; Tue, 12 Mar 2013 22:29:14 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Tue, 12 Mar 2013 22:29:14 -0500 Received: from localhost (irmo.am.dhcp.ti.com [128.247.74.241]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2D3TE0h011152; Tue, 12 Mar 2013 22:29:14 -0500 From: Suman Anna To: Greg Kroah-Hartman CC: Linus Walleij , Russell King , Arnd Bergmann , Tony Lindgren , Ohad Ben-Cohen , , , , Omar Ramirez Luna , Loic Pallardy , Suman Anna Subject: [PATCHv3 10/14] mailbox: add no_irq send message Date: Tue, 12 Mar 2013 22:24:26 -0500 Message-ID: <1363145066-14681-1-git-send-email-s-anna@ti.com> X-Mailer: git-send-email 1.8.1.2 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Loic Pallardy For debug purpose, mailbox must be available when interrupts are disabled to collect dump information. Signed-off-by: Loic Pallardy Signed-off-by: Linus Walleij --- drivers/mailbox/mailbox.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/mailbox.h | 3 +++ 2 files changed, 69 insertions(+) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 35813f5..eaaf87e 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -110,6 +110,72 @@ out: } EXPORT_SYMBOL(mailbox_msg_send); +#define TRANSFER_TIMEOUT 30000 /* Becomes ~3s timeout */ + +static struct mailbox_msg no_irq_msg_res; + +struct mailbox_msg *mailbox_msg_send_receive_no_irq(struct mailbox *mbox, + struct mailbox_msg *msg) +{ + int ret = 0; + int count = 0; + + BUG_ON(!irqs_disabled()); + + if (likely(mbox->ops->write && mbox->ops->read)) { + if (__mbox_poll_for_space(mbox)) { + ret = -EBUSY; + goto out; + } + mbox->ops->write(mbox, msg); + while (!is_mbox_irq(mbox, IRQ_RX)) { + udelay(100); + cpu_relax(); + count++; + if (count > TRANSFER_TIMEOUT) { + pr_err("%s: Error: transfer timed out\n", + __func__); + ret = -EINVAL; + goto out; + } + } + mbox->ops->read(mbox, &no_irq_msg_res); + ack_mbox_irq(mbox, IRQ_RX); + } else { + ret = -EINVAL; + } + +out: + BUG_ON(ret < 0); + + return &no_irq_msg_res; +} +EXPORT_SYMBOL(mailbox_msg_send_receive_no_irq); + +int mailbox_msg_send_no_irq(struct mailbox *mbox, + struct mailbox_msg *msg) +{ + int ret = 0; + + BUG_ON(!irqs_disabled()); + + if (likely(mbox->ops->write)) { + if (__mbox_poll_for_space(mbox)) { + ret = -EBUSY; + goto out; + } + mbox->ops->write(mbox, msg); + } else { + ret = -EINVAL; + } + +out: + WARN_ON(ret < 0); + + return ret; +} +EXPORT_SYMBOL(mailbox_msg_send_no_irq); + void mailbox_save_ctx(struct mailbox *mbox) { if (!mbox->ops->save_ctx) { diff --git a/include/linux/mailbox.h b/include/linux/mailbox.h index f8730b4..a41b67d 100644 --- a/include/linux/mailbox.h +++ b/include/linux/mailbox.h @@ -28,6 +28,9 @@ struct mailbox_msg { } int mailbox_msg_send(struct mailbox *, struct mailbox_msg *msg); +struct mailbox_msg *mailbox_msg_send_receive_no_irq(struct mailbox *, + struct mailbox_msg *msg); +int mailbox_msg_send_no_irq(struct mailbox *, struct mailbox_msg *msg); struct mailbox *mailbox_get(const char *, struct notifier_block *nb); void mailbox_put(struct mailbox *mbox, struct notifier_block *nb);