From patchwork Thu Jun 12 16:48:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashwin Chaugule X-Patchwork-Id: 4343661 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CEF4EBEEAA for ; Thu, 12 Jun 2014 16:48:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C8C0920328 for ; Thu, 12 Jun 2014 16:48:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AEC820351 for ; Thu, 12 Jun 2014 16:48:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753017AbaFLQsZ (ORCPT ); Thu, 12 Jun 2014 12:48:25 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:57167 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756173AbaFLQsX (ORCPT ); Thu, 12 Jun 2014 12:48:23 -0400 Received: by mail-pa0-f54.google.com with SMTP id et14so1184515pad.27 for ; Thu, 12 Jun 2014 09:48:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Nyf4bAIxdU5mLDQqz+CfNf4cRLchUmlQEoiXYBRwzC8=; b=W7IjKHoolDsPUT03yHdBj3KA+vAsovfsnMmHC0S7bTdDsgAqXIa8y4H9df0Ku97Sxd xEk78+vKOC7yx1rrswoXM8TFCW29viqAnzPhfZSCSR9MXY8a7d7Zd7fPBGRwN+pA4zPP a1Q36D4zNecsWTDkiVF3RU0D/zY7cSUy9oXtYJLcbvdS854tWN/W82FPKjdZGv2DCSOL GH0IwE+TrKqBdieE2EAzZGcYY/lviuS39in6/eMHLeDidpTrbQdbDsq7HkuNhJK9ZIQa F9wFwYx3jlVtwHvYdNG7Sb4q68KfYT8X/8YR4/LKPJGASj0WYs53sIewKmCFuuxYV4Xd O5cQ== X-Gm-Message-State: ALoCoQkDkfGmQdQvo0mY0SnWqEw3KY1aq5PgiMENYb148cg8pK+zkdhngnuyelh6wLzhOuSpBd/h X-Received: by 10.69.17.230 with SMTP id gh6mr14120953pbd.0.1402591703144; Thu, 12 Jun 2014 09:48:23 -0700 (PDT) Received: from linaro5.qualcomm.com (rrcs-67-52-130-30.west.biz.rr.com. [67.52.130.30]) by mx.google.com with ESMTPSA id xz7sm7701153pac.3.2014.06.12.09.48.20 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Jun 2014 09:48:22 -0700 (PDT) From: Ashwin Chaugule To: linux-acpi@vger.kernel.org Cc: linaro-acpi@lists.linaro.org, broonie@kernel.org, jassisinghbrar@gmail.com, linux-arm-kernel@lists.infradead.org, rjw@rjwysocki.net, patches@linaro.org, Ashwin Chaugule Subject: [RFC v2 1/3] Mailbox: Add support for ACPI Date: Thu, 12 Jun 2014 12:48:10 -0400 Message-Id: <1402591692-7736-2-git-send-email-ashwin.chaugule@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402591692-7736-1-git-send-email-ashwin.chaugule@linaro.org> References: <1402591692-7736-1-git-send-email-ashwin.chaugule@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current mailbox framework only supports DT based bindings. Add another mechanism for mailbox clients to register with mailbox controllers and request for specific mailbox channels. This enables usage of the mailbox framework on kernels with ACPI support. Signed-off-by: Ashwin Chaugule --- drivers/mailbox/mailbox.c | 155 ++++++++++++++++++++++++------------- include/linux/mailbox_client.h | 3 + include/linux/mailbox_controller.h | 6 ++ 3 files changed, 112 insertions(+), 52 deletions(-) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index d83d12c..c7d17f8 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -273,100 +273,143 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg) } EXPORT_SYMBOL_GPL(mbox_send_message); -/** - * mbox_request_channel - Request a mailbox channel. - * @cl: Identity of the client requesting the channel. - * - * The Client specifies its requirements and capabilities while asking for - * a mailbox channel by name. It can't be called from atomic context. - * The channel is exclusively allocated and can't be used by another - * client before the owner calls mbox_free_channel. - * After assignment, any packet received on this channel will be - * handed over to the client via the 'rx_callback'. - * - * Return: Pointer to the channel assigned to the client if successful. - * ERR_PTR for request failure. - */ -struct mbox_chan *mbox_request_channel(struct mbox_client *cl) +static int init_channel(struct mbox_chan *chan, + struct mbox_client *cl) +{ + unsigned long flags; + int ret; + + spin_lock_irqsave(&chan->lock, flags); + chan->msg_free = 0; + chan->msg_count = 0; + chan->active_req = NULL; + chan->cl = cl; + + if (!cl->tx_tout) /* wait for ever */ + cl->tx_tout = msecs_to_jiffies(3600000); + else + cl->tx_tout = msecs_to_jiffies(cl->tx_tout); + if (chan->txdone_method == TXDONE_BY_POLL + && cl->knows_txdone) + chan->txdone_method |= TXDONE_BY_ACK; + spin_unlock_irqrestore(&chan->lock, flags); + + ret = chan->mbox->ops->startup(chan); + if (ret) { + pr_err("Unable to startup the chan\n"); + mbox_free_channel(chan); + chan = ERR_PTR(ret); + } + + return ret; +} + +#ifdef CONFIG_ACPI +static int get_acpi_mbox_chan(struct mbox_client *cl, + struct mbox_chan **chan) +{ + struct mbox_controller *mbox; + int i; + + list_for_each_entry(mbox, &mbox_cons, node) { + if (!strcmp(cl->ctrl_name, mbox->name)) { + for (i = 0; i < mbox->num_chans; i++) { + *chan = &mbox->chans[i]; + if (!strcmp(cl->chan_name, (*chan)->name)) + return init_channel(*chan, cl); + } + } + } + + return -ENODEV; +} +#endif + +static int get_of_mbox_chan(struct mbox_client *cl, + struct mbox_chan **chan) { struct device *dev = cl->dev; struct mbox_controller *mbox; struct of_phandle_args spec; - struct mbox_chan *chan; - unsigned long flags; int count, i, ret; if (!dev || !dev->of_node) { pr_err("%s: No owner device node\n", __func__); - return ERR_PTR(-ENODEV); + return -ENODEV; } count = of_property_count_strings(dev->of_node, "mbox-names"); if (count < 0) { pr_err("%s: mbox-names property of node '%s' missing\n", __func__, dev->of_node->full_name); - return ERR_PTR(-ENODEV); + return -ENODEV; } - - mutex_lock(&con_mutex); - - ret = -ENODEV; for (i = 0; i < count; i++) { const char *s; if (of_property_read_string_index(dev->of_node, - "mbox-names", i, &s)) + "mbox-names", i, &s)) continue; if (strcmp(cl->chan_name, s)) continue; if (of_parse_phandle_with_args(dev->of_node, - "mbox", "#mbox-cells", i, &spec)) + "mbox", "#mbox-cells", i, &spec)) continue; - chan = NULL; list_for_each_entry(mbox, &mbox_cons, node) if (mbox->dev->of_node == spec.np) { - chan = mbox->of_xlate(mbox, &spec); + *chan = mbox->of_xlate(mbox, &spec); break; } of_node_put(spec.np); - if (!chan) + if (!(*chan)) continue; ret = -EBUSY; - if (!chan->cl && try_module_get(mbox->dev->driver->owner)) + if (!(*chan)->cl && try_module_get(mbox->dev->driver->owner)) break; } if (i == count) { mutex_unlock(&con_mutex); - return ERR_PTR(ret); + return ret; } - spin_lock_irqsave(&chan->lock, flags); - chan->msg_free = 0; - chan->msg_count = 0; - chan->active_req = NULL; - chan->cl = cl; - if (!cl->tx_tout) /* wait for ever */ - cl->tx_tout = msecs_to_jiffies(3600000); - else - cl->tx_tout = msecs_to_jiffies(cl->tx_tout); - if (chan->txdone_method == TXDONE_BY_POLL - && cl->knows_txdone) - chan->txdone_method |= TXDONE_BY_ACK; - spin_unlock_irqrestore(&chan->lock, flags); + return init_channel(*chan, cl); +} - ret = chan->mbox->ops->startup(chan); - if (ret) { - pr_err("Unable to startup the chan\n"); - mbox_free_channel(chan); - chan = ERR_PTR(ret); - } +/** + * mbox_request_channel - Request a mailbox channel. + * @cl: Identity of the client requesting the channel. + * + * The Client specifies its requirements and capabilities while asking for + * a mailbox channel by name. It can't be called from atomic context. + * The channel is exclusively allocated and can't be used by another + * client before the owner calls mbox_free_channel. + * After assignment, any packet received on this channel will be + * handed over to the client via the 'rx_callback'. + * + * Return: Pointer to the channel assigned to the client if successful. + * ERR_PTR for request failure. + */ +struct mbox_chan *mbox_request_channel(struct mbox_client *cl) +{ + struct mbox_chan *chan = NULL; + int ret; + + mutex_lock(&con_mutex); + + ret = get_of_mbox_chan(cl, &chan); + +#ifdef CONFIG_ACPI + ret = get_acpi_mbox_chan(cl, &chan); +#endif + if (ret) + pr_err("No mailbox channels found\n"); mutex_unlock(&con_mutex); return chan; @@ -394,11 +437,14 @@ void mbox_free_channel(struct mbox_chan *chan) if (chan->txdone_method == (TXDONE_BY_POLL | TXDONE_BY_ACK)) chan->txdone_method = TXDONE_BY_POLL; +#ifndef CONFIG_ACPI module_put(chan->mbox->dev->driver->owner); +#endif spin_unlock_irqrestore(&chan->lock, flags); } EXPORT_SYMBOL_GPL(mbox_free_channel); +#ifndef CONFIG_ACPI static struct mbox_chan * of_mbox_index_xlate(struct mbox_controller *mbox, const struct of_phandle_args *sp) @@ -410,7 +456,7 @@ of_mbox_index_xlate(struct mbox_controller *mbox, return &mbox->chans[ind]; } - +#endif /** * mbox_controller_register - Register the mailbox controller * @mbox: Pointer to the mailbox controller. @@ -422,9 +468,13 @@ int mbox_controller_register(struct mbox_controller *mbox) int i, txdone; /* Sanity check */ - if (!mbox || !mbox->dev || !mbox->ops || !mbox->num_chans) + if (!mbox || !mbox->ops || !mbox->num_chans) return -EINVAL; +#ifndef CONFIG_ACPI + if (!mbox->dev) + return -EINVAL; +#endif if (mbox->txdone_irq) txdone = TXDONE_BY_IRQ; else if (mbox->txdone_poll) @@ -446,9 +496,10 @@ int mbox_controller_register(struct mbox_controller *mbox) spin_lock_init(&chan->lock); } +#ifndef CONFIG_ACPI if (!mbox->of_xlate) mbox->of_xlate = of_mbox_index_xlate; - +#endif mutex_lock(&con_mutex); list_add_tail(&mbox->node, &mbox_cons); mutex_unlock(&con_mutex); diff --git a/include/linux/mailbox_client.h b/include/linux/mailbox_client.h index bbac2d2..21568a1 100644 --- a/include/linux/mailbox_client.h +++ b/include/linux/mailbox_client.h @@ -35,6 +35,9 @@ struct mbox_client { bool tx_block; unsigned long tx_tout; bool knows_txdone; +#ifdef CONFIG_ACPI + const char *ctrl_name; +#endif }; struct mbox_chan *mbox_request_channel(struct mbox_client *cl); diff --git a/include/linux/mailbox_controller.h b/include/linux/mailbox_controller.h index cf81e80..dc9d290 100644 --- a/include/linux/mailbox_controller.h +++ b/include/linux/mailbox_controller.h @@ -78,6 +78,9 @@ struct mbox_controller { unsigned period; /* Hook to add to the global controller list */ struct list_head node; +#ifdef CONFIG_ACPI + char *name; +#endif } __aligned(32); /* @@ -111,6 +114,9 @@ struct mbox_chan { /* Private data for controller */ void *con_priv; +#ifdef CONFIG_ACPI + char *name; +#endif } __aligned(32); int mbox_controller_register(struct mbox_controller *mbox);