mailbox: tegra-hsp: Add support for shared mailboxes (91b1b1c3) · Commits · 戴 / test

drivers/mailbox/tegra-hsp.c

+443 −61

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* 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		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,
	@@ -11,6 +11,7 @@
	* more details.		* more details.
	*/		*/

			#include <linux/delay.h>
	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/mailbox_controller.h>		#include <linux/mailbox_controller.h>
	@@ -21,6 +22,17 @@

	#include <dt-bindings/mailbox/tegra186-hsp.h>		#include <dt-bindings/mailbox/tegra186-hsp.h>

			#include "mailbox.h"

			#define HSP_INT_IE(x) (0x100 + ((x) * 4))
			#define HSP_INT_IV 0x300
			#define HSP_INT_IR 0x304

			#define HSP_INT_EMPTY_SHIFT 0
			#define HSP_INT_EMPTY_MASK 0xff
			#define HSP_INT_FULL_SHIFT 8
			#define HSP_INT_FULL_MASK 0xff

	#define HSP_INT_DIMENSIONING 0x380		#define HSP_INT_DIMENSIONING 0x380
	#define HSP_nSM_SHIFT 0		#define HSP_nSM_SHIFT 0
	#define HSP_nSS_SHIFT 4		#define HSP_nSS_SHIFT 4
	@@ -34,6 +46,11 @@
	#define HSP_DB_RAW 0x8		#define HSP_DB_RAW 0x8
	#define HSP_DB_PENDING 0xc		#define HSP_DB_PENDING 0xc

			#define HSP_SM_SHRD_MBOX 0x0
			#define HSP_SM_SHRD_MBOX_FULL BIT(31)
			#define HSP_SM_SHRD_MBOX_FULL_INT_IE 0x04
			#define HSP_SM_SHRD_MBOX_EMPTY_INT_IE 0x08

	#define HSP_DB_CCPLEX 1		#define HSP_DB_CCPLEX 1
	#define HSP_DB_BPMP 3		#define HSP_DB_BPMP 3
	#define HSP_DB_MAX 7		#define HSP_DB_MAX 7
	@@ -55,6 +72,12 @@ struct tegra_hsp_doorbell {
	unsigned int index;		unsigned int index;
	};		};

			struct tegra_hsp_mailbox {
			struct tegra_hsp_channel channel;
			unsigned int index;
			bool producer;
			};

	struct tegra_hsp_db_map {		struct tegra_hsp_db_map {
	const char *name;		const char *name;
	unsigned int master;		unsigned int master;
	@@ -63,13 +86,18 @@ struct tegra_hsp_db_map {

	struct tegra_hsp_soc {		struct tegra_hsp_soc {
	const struct tegra_hsp_db_map *map;		const struct tegra_hsp_db_map *map;
			bool has_per_mb_ie;
	};		};

	struct tegra_hsp {		struct tegra_hsp {
			struct device *dev;
	const struct tegra_hsp_soc *soc;		const struct tegra_hsp_soc *soc;
	struct mbox_controller mbox;		struct mbox_controller mbox_db;
			struct mbox_controller mbox_sm;
	void __iomem *regs;		void __iomem *regs;
	unsigned int irq;		unsigned int doorbell_irq;
			unsigned int *shared_irqs;
			unsigned int shared_irq;
	unsigned int num_sm;		unsigned int num_sm;
	unsigned int num_as;		unsigned int num_as;
	unsigned int num_ss;		unsigned int num_ss;
	@@ -78,13 +106,10 @@ struct tegra_hsp {
	spinlock_t lock;		spinlock_t lock;

	struct list_head doorbells;		struct list_head doorbells;
	};		struct tegra_hsp_mailbox *mailboxes;

	static inline struct tegra_hsp *		unsigned long mask;
	to_tegra_hsp(struct mbox_controller *mbox)		};
	{
	return container_of(mbox, struct tegra_hsp, mbox);
	}

	static inline u32 tegra_hsp_readl(struct tegra_hsp *hsp, unsigned int offset)		static inline u32 tegra_hsp_readl(struct tegra_hsp *hsp, unsigned int offset)
	{		{
	@@ -158,7 +183,7 @@ static irqreturn_t tegra_hsp_doorbell_irq(int irq, void *data)

	spin_lock(&hsp->lock);		spin_lock(&hsp->lock);

	for_each_set_bit(master, &value, hsp->mbox.num_chans) {		for_each_set_bit(master, &value, hsp->mbox_db.num_chans) {
	struct tegra_hsp_doorbell *db;		struct tegra_hsp_doorbell *db;

	db = __tegra_hsp_doorbell_get(hsp, master);		db = __tegra_hsp_doorbell_get(hsp, master);
	@@ -182,6 +207,71 @@ static irqreturn_t tegra_hsp_doorbell_irq(int irq, void *data)
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

			static irqreturn_t tegra_hsp_shared_irq(int irq, void *data)
			{
			struct tegra_hsp *hsp = data;
			unsigned long bit, mask;
			u32 status, value;
			void *msg;

			status = tegra_hsp_readl(hsp, HSP_INT_IR) & hsp->mask;

			/* process EMPTY interrupts first */
			mask = (status >> HSP_INT_EMPTY_SHIFT) & HSP_INT_EMPTY_MASK;

			for_each_set_bit(bit, &mask, hsp->num_sm) {
			struct tegra_hsp_mailbox *mb = &hsp->mailboxes[bit];

			if (mb->producer) {
			/*
			* Disable EMPTY interrupts until data is sent with
			* the next message. These interrupts are level-
			* triggered, so if we kept them enabled they would
			* constantly trigger until we next write data into
			* the message.
			*/
			spin_lock(&hsp->lock);

			hsp->mask &= ~BIT(HSP_INT_EMPTY_SHIFT + mb->index);
			tegra_hsp_writel(hsp, hsp->mask,
			HSP_INT_IE(hsp->shared_irq));

			spin_unlock(&hsp->lock);

			mbox_chan_txdone(mb->channel.chan, 0);
			}
			}

			/* process FULL interrupts */
			mask = (status >> HSP_INT_FULL_SHIFT) & HSP_INT_FULL_MASK;

			for_each_set_bit(bit, &mask, hsp->num_sm) {
			struct tegra_hsp_mailbox *mb = &hsp->mailboxes[bit];

			if (!mb->producer) {
			value = tegra_hsp_channel_readl(&mb->channel,
			HSP_SM_SHRD_MBOX);
			value &= ~HSP_SM_SHRD_MBOX_FULL;
			msg = (void *)(unsigned long)value;
			mbox_chan_received_data(mb->channel.chan, msg);

			/*
			* Need to clear all bits here since some producers,
			* such as TCU, depend on fields in the register
			* getting cleared by the consumer.
			*
			* The mailbox API doesn't give the consumers a way
			* of doing that explicitly, so we have to make sure
			* we cover all possible cases.
			*/
			tegra_hsp_channel_writel(&mb->channel, 0x0,
			HSP_SM_SHRD_MBOX);
			}
			}

			return IRQ_HANDLED;
			}

	static struct tegra_hsp_channel *		static struct tegra_hsp_channel *
	tegra_hsp_doorbell_create(struct tegra_hsp hsp, const char name,		tegra_hsp_doorbell_create(struct tegra_hsp hsp, const char name,
	unsigned int master, unsigned int index)		unsigned int master, unsigned int index)
	@@ -194,7 +284,7 @@ tegra_hsp_doorbell_create(struct tegra_hsp hsp, const char name,
	if (!db)		if (!db)
	return ERR_PTR(-ENOMEM);		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;		offset += index * 0x100;

	db->channel.regs = hsp->regs + offset;		db->channel.regs = hsp->regs + offset;
	@@ -235,8 +325,8 @@ static int tegra_hsp_doorbell_startup(struct mbox_chan *chan)
	unsigned long flags;		unsigned long flags;
	u32 value;		u32 value;

	if (db->master >= hsp->mbox.num_chans) {		if (db->master >= chan->mbox->num_chans) {
	dev_err(hsp->mbox.dev,		dev_err(chan->mbox->dev,
	"invalid master ID %u for HSP channel\n",		"invalid master ID %u for HSP channel\n",
	db->master);		db->master);
	return -EINVAL;		return -EINVAL;
	@@ -281,46 +371,167 @@ static void tegra_hsp_doorbell_shutdown(struct mbox_chan *chan)
	spin_unlock_irqrestore(&hsp->lock, flags);		spin_unlock_irqrestore(&hsp->lock, flags);
	}		}

	static const struct mbox_chan_ops tegra_hsp_doorbell_ops = {		static const struct mbox_chan_ops tegra_hsp_db_ops = {
	.send_data = tegra_hsp_doorbell_send_data,		.send_data = tegra_hsp_doorbell_send_data,
	.startup = tegra_hsp_doorbell_startup,		.startup = tegra_hsp_doorbell_startup,
	.shutdown = tegra_hsp_doorbell_shutdown,		.shutdown = tegra_hsp_doorbell_shutdown,
	};		};

	static struct mbox_chan of_tegra_hsp_xlate(struct mbox_controller mbox,		static int tegra_hsp_mailbox_send_data(struct mbox_chan chan, void data)
			{
			struct tegra_hsp_mailbox *mb = chan->con_priv;
			struct tegra_hsp *hsp = mb->channel.hsp;
			unsigned long flags;
			u32 value;

			if (WARN_ON(!mb->producer))
			return -EPERM;

			/* copy data and mark mailbox full */
			value = (u32)(unsigned long)data;
			value \|= HSP_SM_SHRD_MBOX_FULL;

			tegra_hsp_channel_writel(&mb->channel, value, HSP_SM_SHRD_MBOX);

			/* enable EMPTY interrupt for the shared mailbox */
			spin_lock_irqsave(&hsp->lock, flags);

			hsp->mask \|= BIT(HSP_INT_EMPTY_SHIFT + mb->index);
			tegra_hsp_writel(hsp, hsp->mask, HSP_INT_IE(hsp->shared_irq));

			spin_unlock_irqrestore(&hsp->lock, flags);

			return 0;
			}

			static int tegra_hsp_mailbox_flush(struct mbox_chan *chan,
			unsigned long timeout)
			{
			struct tegra_hsp_mailbox *mb = chan->con_priv;
			struct tegra_hsp_channel *ch = &mb->channel;
			u32 value;

			timeout = jiffies + msecs_to_jiffies(timeout);

			while (time_before(jiffies, timeout)) {
			value = tegra_hsp_channel_readl(ch, HSP_SM_SHRD_MBOX);
			if ((value & HSP_SM_SHRD_MBOX_FULL) == 0) {
			mbox_chan_txdone(chan, 0);
			return 0;
			}

			udelay(1);
			}

			return -ETIME;
			}

			static int tegra_hsp_mailbox_startup(struct mbox_chan *chan)
			{
			struct tegra_hsp_mailbox *mb = chan->con_priv;
			struct tegra_hsp_channel *ch = &mb->channel;
			struct tegra_hsp *hsp = mb->channel.hsp;
			unsigned long flags;

			chan->txdone_method = TXDONE_BY_IRQ;

			/*
			* Shared mailboxes start out as consumers by default. FULL and EMPTY
			* interrupts are coalesced at the same shared interrupt.
			*
			* Keep EMPTY interrupts disabled at startup and only enable them when
			* the mailbox is actually full. This is required because the FULL and
			* EMPTY interrupts are level-triggered, so keeping EMPTY interrupts
			* enabled all the time would cause an interrupt storm while mailboxes
			* are idle.
			*/

			spin_lock_irqsave(&hsp->lock, flags);

			if (mb->producer)
			hsp->mask &= ~BIT(HSP_INT_EMPTY_SHIFT + mb->index);
			else
			hsp->mask \|= BIT(HSP_INT_FULL_SHIFT + mb->index);

			tegra_hsp_writel(hsp, hsp->mask, HSP_INT_IE(hsp->shared_irq));

			spin_unlock_irqrestore(&hsp->lock, flags);

			if (hsp->soc->has_per_mb_ie) {
			if (mb->producer)
			tegra_hsp_channel_writel(ch, 0x0,
			HSP_SM_SHRD_MBOX_EMPTY_INT_IE);
			else
			tegra_hsp_channel_writel(ch, 0x1,
			HSP_SM_SHRD_MBOX_FULL_INT_IE);
			}

			return 0;
			}

			static void tegra_hsp_mailbox_shutdown(struct mbox_chan *chan)
			{
			struct tegra_hsp_mailbox *mb = chan->con_priv;
			struct tegra_hsp_channel *ch = &mb->channel;
			struct tegra_hsp *hsp = mb->channel.hsp;
			unsigned long flags;

			if (hsp->soc->has_per_mb_ie) {
			if (mb->producer)
			tegra_hsp_channel_writel(ch, 0x0,
			HSP_SM_SHRD_MBOX_EMPTY_INT_IE);
			else
			tegra_hsp_channel_writel(ch, 0x0,
			HSP_SM_SHRD_MBOX_FULL_INT_IE);
			}

			spin_lock_irqsave(&hsp->lock, flags);

			if (mb->producer)
			hsp->mask &= ~BIT(HSP_INT_EMPTY_SHIFT + mb->index);
			else
			hsp->mask &= ~BIT(HSP_INT_FULL_SHIFT + mb->index);

			tegra_hsp_writel(hsp, hsp->mask, HSP_INT_IE(hsp->shared_irq));

			spin_unlock_irqrestore(&hsp->lock, flags);
			}

			static const struct mbox_chan_ops tegra_hsp_sm_ops = {
			.send_data = tegra_hsp_mailbox_send_data,
			.flush = tegra_hsp_mailbox_flush,
			.startup = tegra_hsp_mailbox_startup,
			.shutdown = tegra_hsp_mailbox_shutdown,
			};

			static struct mbox_chan tegra_hsp_db_xlate(struct mbox_controller mbox,
	const struct of_phandle_args *args)		const struct of_phandle_args *args)
	{		{
			struct tegra_hsp *hsp = container_of(mbox, struct tegra_hsp, mbox_db);
			unsigned int type = args->args[0], master = args->args[1];
	struct tegra_hsp_channel *channel = ERR_PTR(-ENODEV);		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 tegra_hsp_doorbell *db;
	struct mbox_chan *chan;		struct mbox_chan *chan;
	unsigned long flags;		unsigned long flags;
	unsigned int i;		unsigned int i;

	switch (type) {		if (type != TEGRA_HSP_MBOX_TYPE_DB \|\| !hsp->doorbell_irq)
	case TEGRA_HSP_MBOX_TYPE_DB:		return ERR_PTR(-ENODEV);

	db = tegra_hsp_doorbell_get(hsp, master);		db = tegra_hsp_doorbell_get(hsp, master);
	if (db)		if (db)
	channel = &db->channel;		channel = &db->channel;

	break;

	default:
	break;
	}

	if (IS_ERR(channel))		if (IS_ERR(channel))
	return ERR_CAST(channel);		return ERR_CAST(channel);

	spin_lock_irqsave(&hsp->lock, flags);		spin_lock_irqsave(&hsp->lock, flags);

	for (i = 0; i < hsp->mbox.num_chans; i++) {		for (i = 0; i < mbox->num_chans; i++) {
	chan = &hsp->mbox.chans[i];		chan = &mbox->chans[i];
	if (!chan->con_priv) {		if (!chan->con_priv) {
	chan->con_priv = channel;
	channel->chan = chan;		channel->chan = chan;
			chan->con_priv = db;
	break;		break;
	}		}

	@@ -332,6 +543,29 @@ static struct mbox_chan of_tegra_hsp_xlate(struct mbox_controller mbox,
	return chan ?: ERR_PTR(-EBUSY);		return chan ?: ERR_PTR(-EBUSY);
	}		}

			static struct mbox_chan tegra_hsp_sm_xlate(struct mbox_controller mbox,
			const struct of_phandle_args *args)
			{
			struct tegra_hsp *hsp = container_of(mbox, struct tegra_hsp, mbox_sm);
			unsigned int type = args->args[0], index;
			struct tegra_hsp_mailbox *mb;

			index = args->args[1] & TEGRA_HSP_SM_MASK;

			if (type != TEGRA_HSP_MBOX_TYPE_SM \|\| !hsp->shared_irqs \|\|
			index >= hsp->num_sm)
			return ERR_PTR(-ENODEV);

			mb = &hsp->mailboxes[index];

			if ((args->args[1] & TEGRA_HSP_SM_FLAG_TX) == 0)
			mb->producer = false;
			else
			mb->producer = true;

			return mb->channel.chan;
			}

	static void tegra_hsp_remove_doorbells(struct tegra_hsp *hsp)		static void tegra_hsp_remove_doorbells(struct tegra_hsp *hsp)
	{		{
	struct tegra_hsp_doorbell db, tmp;		struct tegra_hsp_doorbell db, tmp;
	@@ -364,10 +598,70 @@ static int tegra_hsp_add_doorbells(struct tegra_hsp *hsp)
	return 0;		return 0;
	}		}

			static int tegra_hsp_add_mailboxes(struct tegra_hsp hsp, struct device dev)
			{
			int i;

			hsp->mailboxes = devm_kcalloc(dev, hsp->num_sm, sizeof(*hsp->mailboxes),
			GFP_KERNEL);
			if (!hsp->mailboxes)
			return -ENOMEM;

			for (i = 0; i < hsp->num_sm; i++) {
			struct tegra_hsp_mailbox *mb = &hsp->mailboxes[i];

			mb->index = i;

			mb->channel.hsp = hsp;
			mb->channel.regs = hsp->regs + SZ_64K + i * SZ_32K;
			mb->channel.chan = &hsp->mbox_sm.chans[i];
			mb->channel.chan->con_priv = mb;
			}

			return 0;
			}

			static int tegra_hsp_request_shared_irq(struct tegra_hsp *hsp)
			{
			unsigned int i, irq = 0;
			int err;

			for (i = 0; i < hsp->num_si; i++) {
			irq = hsp->shared_irqs[i];
			if (irq <= 0)
			continue;

			err = devm_request_irq(hsp->dev, irq, tegra_hsp_shared_irq, 0,
			dev_name(hsp->dev), hsp);
			if (err < 0) {
			dev_err(hsp->dev, "failed to request interrupt: %d\n",
			err);
			continue;
			}

			hsp->shared_irq = i;

			/* disable all interrupts */
			tegra_hsp_writel(hsp, 0, HSP_INT_IE(hsp->shared_irq));

			dev_dbg(hsp->dev, "interrupt requested: %u\n", irq);

			break;
			}

			if (i == hsp->num_si) {
			dev_err(hsp->dev, "failed to find available interrupt\n");
			return -ENOENT;
			}

			return 0;
			}

	static int tegra_hsp_probe(struct platform_device *pdev)		static int tegra_hsp_probe(struct platform_device *pdev)
	{		{
	struct tegra_hsp *hsp;		struct tegra_hsp *hsp;
	struct resource *res;		struct resource *res;
			unsigned int i;
	u32 value;		u32 value;
	int err;		int err;

	@@ -375,6 +669,7 @@ static int tegra_hsp_probe(struct platform_device *pdev)
	if (!hsp)		if (!hsp)
	return -ENOMEM;		return -ENOMEM;

			hsp->dev = &pdev->dev;
	hsp->soc = of_device_get_match_data(&pdev->dev);		hsp->soc = of_device_get_match_data(&pdev->dev);
	INIT_LIST_HEAD(&hsp->doorbells);		INIT_LIST_HEAD(&hsp->doorbells);
	spin_lock_init(&hsp->lock);		spin_lock_init(&hsp->lock);
	@@ -392,57 +687,137 @@ static int tegra_hsp_probe(struct platform_device *pdev)
	hsp->num_si = (value >> HSP_nSI_SHIFT) & HSP_nINT_MASK;		hsp->num_si = (value >> HSP_nSI_SHIFT) & HSP_nINT_MASK;

	err = platform_get_irq_byname(pdev, "doorbell");		err = platform_get_irq_byname(pdev, "doorbell");
	if (err < 0) {		if (err >= 0)
	dev_err(&pdev->dev, "failed to get doorbell IRQ: %d\n", err);		hsp->doorbell_irq = err;
	return err;
			if (hsp->num_si > 0) {
			unsigned int count = 0;

			hsp->shared_irqs = devm_kcalloc(&pdev->dev, hsp->num_si,
			sizeof(*hsp->shared_irqs),
			GFP_KERNEL);
			if (!hsp->shared_irqs)
			return -ENOMEM;

			for (i = 0; i < hsp->num_si; i++) {
			char *name;

			name = kasprintf(GFP_KERNEL, "shared%u", i);
			if (!name)
			return -ENOMEM;

			err = platform_get_irq_byname(pdev, name);
			if (err >= 0) {
			hsp->shared_irqs[i] = err;
			count++;
			}

			kfree(name);
	}		}

	hsp->irq = err;		if (count == 0) {
			devm_kfree(&pdev->dev, hsp->shared_irqs);
			hsp->shared_irqs = NULL;
			}
			}

	hsp->mbox.of_xlate = of_tegra_hsp_xlate;		/* setup the doorbell controller */
	hsp->mbox.num_chans = 32;		hsp->mbox_db.of_xlate = tegra_hsp_db_xlate;
	hsp->mbox.dev = &pdev->dev;		hsp->mbox_db.num_chans = 32;
	hsp->mbox.txdone_irq = false;		hsp->mbox_db.dev = &pdev->dev;
	hsp->mbox.txdone_poll = false;		hsp->mbox_db.ops = &tegra_hsp_db_ops;
	hsp->mbox.ops = &tegra_hsp_doorbell_ops;

	hsp->mbox.chans = devm_kcalloc(&pdev->dev, hsp->mbox.num_chans,		hsp->mbox_db.chans = devm_kcalloc(&pdev->dev, hsp->mbox_db.num_chans,
	sizeof(*hsp->mbox.chans),		sizeof(*hsp->mbox_db.chans),
	GFP_KERNEL);		GFP_KERNEL);
	if (!hsp->mbox.chans)		if (!hsp->mbox_db.chans)
	return -ENOMEM;		return -ENOMEM;

			if (hsp->doorbell_irq) {
	err = tegra_hsp_add_doorbells(hsp);		err = tegra_hsp_add_doorbells(hsp);
	if (err < 0) {		if (err < 0) {
	dev_err(&pdev->dev, "failed to add doorbells: %d\n", err);		dev_err(&pdev->dev, "failed to add doorbells: %d\n",
			err);
	return err;		return err;
	}		}
			}

	platform_set_drvdata(pdev, hsp);		err = mbox_controller_register(&hsp->mbox_db);
			if (err < 0) {
			dev_err(&pdev->dev, "failed to register doorbell mailbox: %d\n",
			err);
			goto remove_doorbells;
			}

	err = mbox_controller_register(&hsp->mbox);		/* setup the shared mailbox controller */
	if (err) {		hsp->mbox_sm.of_xlate = tegra_hsp_sm_xlate;
	dev_err(&pdev->dev, "failed to register mailbox: %d\n", err);		hsp->mbox_sm.num_chans = hsp->num_sm;
	tegra_hsp_remove_doorbells(hsp);		hsp->mbox_sm.dev = &pdev->dev;
	return err;		hsp->mbox_sm.ops = &tegra_hsp_sm_ops;

			hsp->mbox_sm.chans = devm_kcalloc(&pdev->dev, hsp->mbox_sm.num_chans,
			sizeof(*hsp->mbox_sm.chans),
			GFP_KERNEL);
			if (!hsp->mbox_sm.chans)
			return -ENOMEM;

			if (hsp->shared_irqs) {
			err = tegra_hsp_add_mailboxes(hsp, &pdev->dev);
			if (err < 0) {
			dev_err(&pdev->dev, "failed to add mailboxes: %d\n",
			err);
			goto unregister_mbox_db;
			}
	}		}

	err = devm_request_irq(&pdev->dev, hsp->irq, tegra_hsp_doorbell_irq,		err = mbox_controller_register(&hsp->mbox_sm);
	IRQF_NO_SUSPEND, dev_name(&pdev->dev), hsp);
	if (err < 0) {		if (err < 0) {
	dev_err(&pdev->dev, "failed to request IRQ#%u: %d\n",		dev_err(&pdev->dev, "failed to register shared mailbox: %d\n",
	hsp->irq, err);		err);
	return err;		goto unregister_mbox_db;
			}

			platform_set_drvdata(pdev, hsp);

			if (hsp->doorbell_irq) {
			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 doorbell IRQ#%u: %d\n",
			hsp->doorbell_irq, err);
			goto unregister_mbox_sm;
			}
			}

			if (hsp->shared_irqs) {
			err = tegra_hsp_request_shared_irq(hsp);
			if (err < 0)
			goto unregister_mbox_sm;
	}		}

	return 0;		return 0;

			unregister_mbox_sm:
			mbox_controller_unregister(&hsp->mbox_sm);
			unregister_mbox_db:
			mbox_controller_unregister(&hsp->mbox_db);
			remove_doorbells:
			if (hsp->doorbell_irq)
			tegra_hsp_remove_doorbells(hsp);

			return err;
	}		}

	static int tegra_hsp_remove(struct platform_device *pdev)		static int tegra_hsp_remove(struct platform_device *pdev)
	{		{
	struct tegra_hsp *hsp = platform_get_drvdata(pdev);		struct tegra_hsp *hsp = platform_get_drvdata(pdev);

	mbox_controller_unregister(&hsp->mbox);		mbox_controller_unregister(&hsp->mbox_sm);
			mbox_controller_unregister(&hsp->mbox_db);

			if (hsp->doorbell_irq)
	tegra_hsp_remove_doorbells(hsp);		tegra_hsp_remove_doorbells(hsp);

	return 0;		return 0;
	@@ -456,10 +831,17 @@ static const struct tegra_hsp_db_map tegra186_hsp_db_map[] = {

	static const struct tegra_hsp_soc tegra186_hsp_soc = {		static const struct tegra_hsp_soc tegra186_hsp_soc = {
	.map = tegra186_hsp_db_map,		.map = tegra186_hsp_db_map,
			.has_per_mb_ie = false,
			};

			static const struct tegra_hsp_soc tegra194_hsp_soc = {
			.map = tegra186_hsp_db_map,
			.has_per_mb_ie = true,
	};		};

	static const struct of_device_id tegra_hsp_match[] = {		static const struct of_device_id tegra_hsp_match[] = {
	{ .compatible = "nvidia,tegra186-hsp", .data = &tegra186_hsp_soc },		{ .compatible = "nvidia,tegra186-hsp", .data = &tegra186_hsp_soc },
			{ .compatible = "nvidia,tegra194-hsp", .data = &tegra194_hsp_soc },
	{ }		{ }
	};		};

Admin message