From patchwork Tue May 8 11:43:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 910145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40gHqr3Vxdz9rxs for ; Tue, 8 May 2018 21:50:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754834AbeEHLth (ORCPT ); Tue, 8 May 2018 07:49:37 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:11252 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752014AbeEHLte (ORCPT ); Tue, 8 May 2018 07:49:34 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com id ; Tue, 08 May 2018 04:49:33 -0700 Received: from HQMAIL104.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Tue, 08 May 2018 04:49:33 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Tue, 08 May 2018 04:49:33 -0700 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL104.nvidia.com (172.18.146.11) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 8 May 2018 11:49:33 +0000 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 8 May 2018 11:49:33 +0000 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1347.2 via Frontend Transport; Tue, 8 May 2018 11:49:32 +0000 Received: from mperttunen-lnx.Nvidia.com (Not Verified[10.21.26.144]) by hqnvemgw01.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Tue, 08 May 2018 04:49:32 -0700 From: Mikko Perttunen To: , , , , , CC: , , , , , , "Mikko Perttunen" Subject: [PATCH 4/8] mailbox: tegra-hsp: Refactor in preparation of mailboxes Date: Tue, 8 May 2018 14:43:59 +0300 Message-ID: <20180508114403.14499-5-mperttunen@nvidia.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180508114403.14499-1-mperttunen@nvidia.com> References: <20180508114403.14499-1-mperttunen@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org The HSP driver is currently in many places written with the assumption of only supporting doorbells. Prepare for the addition of shared mailbox support by removing these assumptions and cleaning up the code. Signed-off-by: Mikko Perttunen --- drivers/mailbox/tegra-hsp.c | 124 +++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 42 deletions(-) diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c index 0cde356c11ab..16eb970f2c9f 100644 --- a/drivers/mailbox/tegra-hsp.c +++ b/drivers/mailbox/tegra-hsp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -42,6 +42,7 @@ struct tegra_hsp_channel; struct tegra_hsp; struct tegra_hsp_channel { + unsigned int type; struct tegra_hsp *hsp; struct mbox_chan *chan; void __iomem *regs; @@ -55,6 +56,12 @@ struct tegra_hsp_doorbell { unsigned int index; }; +static inline struct tegra_hsp_doorbell * +channel_to_doorbell(struct tegra_hsp_channel *channel) +{ + return container_of(channel, struct tegra_hsp_doorbell, channel); +} + struct tegra_hsp_db_map { const char *name; unsigned int master; @@ -69,7 +76,7 @@ struct tegra_hsp { const struct tegra_hsp_soc *soc; struct mbox_controller mbox; void __iomem *regs; - unsigned int irq; + unsigned int doorbell_irq; unsigned int num_sm; unsigned int num_as; unsigned int num_ss; @@ -194,7 +201,7 @@ tegra_hsp_doorbell_create(struct tegra_hsp *hsp, const char *name, if (!db) return ERR_PTR(-ENOMEM); - offset = (1 + (hsp->num_sm / 2) + hsp->num_ss + hsp->num_as) << 16; + offset = (1 + (hsp->num_sm / 2) + hsp->num_ss + hsp->num_as) * SZ_64K; offset += index * 0x100; db->channel.regs = hsp->regs + offset; @@ -218,18 +225,8 @@ static void __tegra_hsp_doorbell_destroy(struct tegra_hsp_doorbell *db) kfree(db); } -static int tegra_hsp_doorbell_send_data(struct mbox_chan *chan, void *data) -{ - struct tegra_hsp_doorbell *db = chan->con_priv; - - tegra_hsp_channel_writel(&db->channel, 1, HSP_DB_TRIGGER); - - return 0; -} - -static int tegra_hsp_doorbell_startup(struct mbox_chan *chan) +static int tegra_hsp_doorbell_startup(struct tegra_hsp_doorbell *db) { - struct tegra_hsp_doorbell *db = chan->con_priv; struct tegra_hsp *hsp = db->channel.hsp; struct tegra_hsp_doorbell *ccplex; unsigned long flags; @@ -260,9 +257,8 @@ static int tegra_hsp_doorbell_startup(struct mbox_chan *chan) return 0; } -static void tegra_hsp_doorbell_shutdown(struct mbox_chan *chan) +static void tegra_hsp_doorbell_shutdown(struct tegra_hsp_doorbell *db) { - struct tegra_hsp_doorbell *db = chan->con_priv; struct tegra_hsp *hsp = db->channel.hsp; struct tegra_hsp_doorbell *ccplex; unsigned long flags; @@ -281,35 +277,61 @@ static void tegra_hsp_doorbell_shutdown(struct mbox_chan *chan) spin_unlock_irqrestore(&hsp->lock, flags); } -static const struct mbox_chan_ops tegra_hsp_doorbell_ops = { - .send_data = tegra_hsp_doorbell_send_data, - .startup = tegra_hsp_doorbell_startup, - .shutdown = tegra_hsp_doorbell_shutdown, +static int tegra_hsp_send_data(struct mbox_chan *chan, void *data) +{ + struct tegra_hsp_channel *channel = chan->con_priv; + struct tegra_hsp_doorbell *db; + + switch (channel->type) { + case TEGRA_HSP_MBOX_TYPE_DB: + db = channel_to_doorbell(channel); + tegra_hsp_channel_writel(&db->channel, 1, HSP_DB_TRIGGER); + } + + return -EINVAL; +} + +static int tegra_hsp_startup(struct mbox_chan *chan) +{ + struct tegra_hsp_channel *channel = chan->con_priv; + + switch (channel->type) { + case TEGRA_HSP_MBOX_TYPE_DB: + return tegra_hsp_doorbell_startup(channel_to_doorbell(channel)); + } + + return -EINVAL; +} + +static void tegra_hsp_shutdown(struct mbox_chan *chan) +{ + struct tegra_hsp_channel *channel = chan->con_priv; + + switch (channel->type) { + case TEGRA_HSP_MBOX_TYPE_DB: + tegra_hsp_doorbell_shutdown(channel_to_doorbell(channel)); + break; + } +} + +static const struct mbox_chan_ops tegra_hsp_ops = { + .send_data = tegra_hsp_send_data, + .startup = tegra_hsp_startup, + .shutdown = tegra_hsp_shutdown, }; -static struct mbox_chan *of_tegra_hsp_xlate(struct mbox_controller *mbox, - const struct of_phandle_args *args) +static struct mbox_chan *tegra_hsp_doorbell_xlate(struct tegra_hsp *hsp, + unsigned int master) { struct tegra_hsp_channel *channel = ERR_PTR(-ENODEV); - struct tegra_hsp *hsp = to_tegra_hsp(mbox); - unsigned int type = args->args[0]; - unsigned int master = args->args[1]; struct tegra_hsp_doorbell *db; struct mbox_chan *chan; unsigned long flags; unsigned int i; - switch (type) { - case TEGRA_HSP_MBOX_TYPE_DB: - db = tegra_hsp_doorbell_get(hsp, master); - if (db) - channel = &db->channel; - - break; - - default: - break; - } + db = tegra_hsp_doorbell_get(hsp, master); + if (db) + channel = &db->channel; if (IS_ERR(channel)) return ERR_CAST(channel); @@ -321,6 +343,7 @@ static struct mbox_chan *of_tegra_hsp_xlate(struct mbox_controller *mbox, if (!chan->con_priv) { chan->con_priv = channel; channel->chan = chan; + channel->type = TEGRA_HSP_MBOX_TYPE_DB; break; } @@ -332,6 +355,22 @@ static struct mbox_chan *of_tegra_hsp_xlate(struct mbox_controller *mbox, return chan ?: ERR_PTR(-EBUSY); } +static struct mbox_chan *of_tegra_hsp_xlate(struct mbox_controller *mbox, + const struct of_phandle_args *args) +{ + struct tegra_hsp *hsp = to_tegra_hsp(mbox); + unsigned int type = args->args[0]; + unsigned int param = args->args[1]; + + switch (type) { + case TEGRA_HSP_MBOX_TYPE_DB: + return tegra_hsp_doorbell_xlate(hsp, param); + + default: + return ERR_PTR(-EINVAL); + } +} + static void tegra_hsp_remove_doorbells(struct tegra_hsp *hsp) { struct tegra_hsp_doorbell *db, *tmp; @@ -397,14 +436,14 @@ static int tegra_hsp_probe(struct platform_device *pdev) return err; } - hsp->irq = err; + hsp->doorbell_irq = err; hsp->mbox.of_xlate = of_tegra_hsp_xlate; hsp->mbox.num_chans = 32; hsp->mbox.dev = &pdev->dev; hsp->mbox.txdone_irq = false; hsp->mbox.txdone_poll = false; - hsp->mbox.ops = &tegra_hsp_doorbell_ops; + hsp->mbox.ops = &tegra_hsp_ops; hsp->mbox.chans = devm_kcalloc(&pdev->dev, hsp->mbox.num_chans, sizeof(*hsp->mbox.chans), @@ -427,11 +466,12 @@ static int tegra_hsp_probe(struct platform_device *pdev) return err; } - err = devm_request_irq(&pdev->dev, hsp->irq, tegra_hsp_doorbell_irq, - IRQF_NO_SUSPEND, dev_name(&pdev->dev), hsp); + err = devm_request_irq(&pdev->dev, hsp->doorbell_irq, + tegra_hsp_doorbell_irq, IRQF_NO_SUSPEND, + dev_name(&pdev->dev), hsp); if (err < 0) { - dev_err(&pdev->dev, "failed to request IRQ#%u: %d\n", - hsp->irq, err); + dev_err(&pdev->dev, "failed to request doorbell IRQ#%u: %d\n", + hsp->doorbell_irq, err); return err; }