Add 128-bit support mailbox for Tegra234 chips
Subsystems (3)
cover Add 128-bit support mailbox for Tegra234 chips
This series of patches adds support for 128-bit shared mailbox found on Tegra234 chips. It also introduce tegra_hsp_sm_ops to abstract send & receive APIs for 32-bit and 128-bit shared mailboxes.
Kartik (3):
mailbox: tegra-hsp: Add tegra_hsp_sm_ops
dt-bindings: tegra186-hsp: add type for shared mailboxes
mailbox: tegra-hsp: Add 128-bit shared mailbox support
.../bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 ++ drivers/mailbox/tegra-hsp.c | 149 ++++++++++++++---- include/dt-bindings/mailbox/tegra186-hsp.h | 5 + 3 files changed, 134 insertions(+), 29 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 mailbox: tegra-hsp: Add tegra_hsp_sm_ops
This patch introduces tegra_hsp_sm_ops to abstract send & receive API's for shared mailboxes.
--- drivers/mailbox/tegra-hsp.c | 74 +++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 27 deletions(-)
drivers/mailbox/tegra-hsp.c +47 -27
@@ -67,8 +67,14 @@ struct tegra_hsp_doorbell {unsigned int index; }; +struct tegra_hsp_sm_ops { +void (*send)(struct tegra_hsp_channel *channel,void *data); +void (*recv)(struct tegra_hsp_channel *channel); +}; +struct tegra_hsp_mailbox {struct tegra_hsp_channel channel; +const struct tegra_hsp_sm_ops *ops;unsigned int index;bool producer; };
@@ -208,8 +214,7 @@ 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; +u32 status; status =tegra_hsp_readl (hsp,HSP_INT_IR ) & hsp->mask;
@@ -245,25 +250,8 @@ static irqreturn_t tegra_hsp_shared_irq(int irq, void *data)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 ); - } +if (!mb->producer) + mb->ops->recv (&mb->channel); }return IRQ_HANDLED ;
@@ -372,21 +360,52 @@ static const struct mbox_chan_ops tegra_hsp_db_ops = { .shutdown = tegra_hsp_doorbell_shutdown, }; +static void tegra_hsp_sm_send32 (struct tegra_hsp_channel *channel,void *data) +{ +u32 value; + +/* copy data and mark mailbox full */ + value = (u32 )(unsigned long )data; + value |=HSP_SM_SHRD_MBOX_FULL ; + +tegra_hsp_channel_writel (channel, value,HSP_SM_SHRD_MBOX ); +} + +static void tegra_hsp_sm_recv32 (struct tegra_hsp_channel *channel) +{ +u32 value; +void *msg; + + value =tegra_hsp_channel_readl (channel,HSP_SM_SHRD_MBOX ); + value &= ~HSP_SM_SHRD_MBOX_FULL ; + msg = (void *)(unsigned long )value; +mbox_chan_received_data (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 (channel,0x0 ,HSP_SM_SHRD_MBOX ); +} + +static const struct tegra_hsp_sm_ops tegra_hsp_sm_32bit_ops = { + .send = tegra_hsp_sm_send32, + .recv = tegra_hsp_sm_recv32, +}; +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 ); + mb->ops->send (&mb->channel, data);/* enable EMPTY interrupt for the shared mailbox */ spin_lock_irqsave (&hsp->lock, flags);
@@ -557,6 +576,7 @@ static struct mbox_chan *tegra_hsp_sm_xlate(struct mbox_controller *mbox,return ERR_PTR (-ENODEV ); mb = &hsp->mailboxes[index]; + mb->ops = &tegra_hsp_sm_32bit_ops;if ((args->args[1 ] &TEGRA_HSP_SM_FLAG_TX ) ==0 ) mb->producer = false;
Signature · 1 line
2.17.1
PATCH 2/3 dt-bindings: tegra186-hsp: add type for shared mailboxes
In reply to KartikTegra234 supports sending/receiving 32-bit and 128-bit data over a shared mailbox. Based on the data size to be used, clients need to specify the type of shared mailbox in the device tree.
Add a macro for 128-bit shared mailbox. Mailbox clients can use this macro as a flag in device tree to enable 128-bit data support for a shared mailbox.
--- .../devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 +++++++++ include/dt-bindings/mailbox/tegra186-hsp.h | 5 +++++ 2 files changed, 14 insertions(+)
Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml +9 -0
@@ -26,6 +26,15 @@ description: | second cell is used to identify the mailbox that the client is going to use. + For shared mailboxes, the first cell composed of two fields: + - bits 15..8: + A bit mask of flags that further specifies the type of shared + mailbox to be used (based on the data size). If no flag is + specified then, 32-bit shared mailbox is used. + - bits 7..0: + Defines the type of the mailbox to be used. This field should be + TEGRA_HSP_MBOX_TYPE_SM for shared mailboxes. + For doorbells, the second cell specifies the index of the doorbell to use.
include/dt-bindings/mailbox/tegra186-hsp.h +5 -0
@@ -15,6 +15,11 @@#define TEGRA_HSP_MBOX_TYPE_SS 0x2#define TEGRA_HSP_MBOX_TYPE_AS 0x3 +/* +* These define the types of shared mailbox supported based on data size. +*/ +#define TEGRA_HSP_MBOX_TYPE_SM_128BIT (1 << 8) +/* * These defines represent the bit associated with the given master ID in the * doorbell registers.
Signature · 1 line
2.17.1
Rob Herring
maintainerRe: [PATCH 2/3] dt-bindings: tegra186-hsp: add type for shared mailboxes
Quoted 9 lines · Kartik
Tegra234 supports sending/receiving 32-bit and 128-bit data over a shared mailbox. Based on the data size to be used, clients need to specify the type of shared mailbox in the device tree.
Add a macro for 128-bit shared mailbox. Mailbox clients can use this macro as a flag in device tree to enable 128-bit data support for a shared mailbox.
Signed-off-by Kartik <[email protected]>
Need a full name here.
Quoted 45 lines
--- .../devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 +++++++++ include/dt-bindings/mailbox/tegra186-hsp.h | 5 +++++ 2 files changed, 14 insertions(+)Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml +9
-0@@ -26,6 +26,15 @@ description: | second cell is used to identify the mailbox that the client is going to use. + For shared mailboxes, the first cell composed of two fields: + - bits 15..8: + A bit mask of flags that further specifies the type of shared + mailbox to be used (based on the data size). If no flag is + specified then, 32-bit shared mailbox is used. + - bits 7..0: + Defines the type of the mailbox to be used. This field should be + TEGRA_HSP_MBOX_TYPE_SM for shared mailboxes. + For doorbells, the second cell specifies the index of the doorbell to use.include/dt-bindings/mailbox/tegra186-hsp.h +5
-0@@ -15,6 +15,11 @@#define TEGRA_HSP_MBOX_TYPE_SS 0x2#define TEGRA_HSP_MBOX_TYPE_AS 0x3 +/* +* These define the types of shared mailbox supported based on data size. +*/ +#define TEGRA_HSP_MBOX_TYPE_SM_128BIT (1 << 8) +/* * These defines represent the bit associated with the given master ID in the * doorbell registers. Signature · 1 line
2.17.1
Re: [PATCH 2/3] dt-bindings: tegra186-hsp: add type for shared mailboxes
Quoted 11 lines · Rob Herring
Quoted 9 lines
Tegra234 supports sending/receiving 32-bit and 128-bit data over a shared mailbox. Based on the data size to be used, clients need to specify the type of shared mailbox in the device tree.
Add a macro for 128-bit shared mailbox. Mailbox clients can use this macro as a flag in device tree to enable 128-bit data support for a shared mailbox.
Signed-off-by Kartik <[email protected]>Need a full name here.
This is my legal name as per the government ID's.
Quoted 46 lines
Quoted 46 lines
--- .../devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 +++++++++ include/dt-bindings/mailbox/tegra186-hsp.h | 5 +++++ 2 files changed, 14 insertions(+)Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml +9
-0@@ -26,6 +26,15 @@ description: | second cell is used to identify the mailbox that the client is going to use. + For shared mailboxes, the first cell composed of two fields: + - bits 15..8: + A bit mask of flags that further specifies the type of shared + mailbox to be used (based on the data size). If no flag is + specified then, 32-bit shared mailbox is used. + - bits 7..0: + Defines the type of the mailbox to be used. This field should be + TEGRA_HSP_MBOX_TYPE_SM for shared mailboxes. + For doorbells, the second cell specifies the index of the doorbell to use.include/dt-bindings/mailbox/tegra186-hsp.h +5
-0@@ -15,6 +15,11 @@#define TEGRA_HSP_MBOX_TYPE_SS 0x2#define TEGRA_HSP_MBOX_TYPE_AS 0x3 +/* +* These define the types of shared mailbox supported based on data size. +*/ +#define TEGRA_HSP_MBOX_TYPE_SM_128BIT (1 << 8) +/* * These defines represent the bit associated with the given master ID in the * doorbell registers. Signature · 1 line
2.17.1
Re: [PATCH 2/3] dt-bindings: tegra186-hsp: add type for shared mailboxes
In reply to KartikQuoted 8 lines · Kartik
Tegra234 supports sending/receiving 32-bit and 128-bit data over a shared mailbox. Based on the data size to be used, clients need to specify the type of shared mailbox in the device tree.
Add a macro for 128-bit shared mailbox. Mailbox clients can use this macro as a flag in device tree to enable 128-bit data support for a shared mailbox.
Quoted 5 lines
Signed-off-by Kartik <[email protected]>--- .../devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 +++++++++ include/dt-bindings/mailbox/tegra186-hsp.h | 5 +++++ 2 files changed, 14 insertions(+)
PATCH 3/3 mailbox: tegra-hsp: Add 128-bit shared mailbox support
In reply to KartikAdd support for 128-bit shared mailboxes found on Tegra234 chips.
--- drivers/mailbox/tegra-hsp.c | 77 +++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-)
drivers/mailbox/tegra-hsp.c +74 -3
@@ -46,10 +46,18 @@#define HSP_SM_SHRD_MBOX_FULL_INT_IE 0x04#define HSP_SM_SHRD_MBOX_EMPTY_INT_IE 0x08 +#define HSP_SHRD_MBOX_TYPE1_TAG 0x40 +#define HSP_SHRD_MBOX_TYPE1_DATA0 0x48 +#define HSP_SHRD_MBOX_TYPE1_DATA1 0x4c +#define HSP_SHRD_MBOX_TYPE1_DATA2 0x50 +#define HSP_SHRD_MBOX_TYPE1_DATA3 0x54 +#define HSP_DB_CCPLEX 1#define HSP_DB_BPMP 3#define HSP_DB_MAX 7 +#define HSP_MBOX_TYPE_MASK 0xff +struct tegra_hsp_channel ;struct tegra_hsp ;
@@ -88,6 +96,7 @@ struct tegra_hsp_db_map {struct tegra_hsp_soc {const struct tegra_hsp_db_map *map;bool has_per_mb_ie; +bool has_128_bit_mb; };struct tegra_hsp {
@@ -396,6 +405,51 @@ static const struct tegra_hsp_sm_ops tegra_hsp_sm_32bit_ops = { .recv = tegra_hsp_sm_recv32, }; +static void tegra_hsp_sm_send128 (struct tegra_hsp_channel *channel,void *data) +{ +u32 value[4 ]; + +memcpy (value, data,sizeof (value)); + +/* Copy data */ +tegra_hsp_channel_writel (channel, value[0 ],HSP_SHRD_MBOX_TYPE1_DATA0 ); +tegra_hsp_channel_writel (channel, value[1 ],HSP_SHRD_MBOX_TYPE1_DATA1 ); +tegra_hsp_channel_writel (channel, value[2 ],HSP_SHRD_MBOX_TYPE1_DATA2 ); +tegra_hsp_channel_writel (channel, value[3 ],HSP_SHRD_MBOX_TYPE1_DATA3 ); + +/* Update tag to mark mailbox full */ +tegra_hsp_channel_writel (channel,HSP_SM_SHRD_MBOX_FULL , +HSP_SHRD_MBOX_TYPE1_TAG ); +} + +static void tegra_hsp_sm_recv128 (struct tegra_hsp_channel *channel) +{ +u32 value[4 ]; +void *msg; + + value[0 ] =tegra_hsp_channel_readl (channel,HSP_SHRD_MBOX_TYPE1_DATA0 ); + value[1 ] =tegra_hsp_channel_readl (channel,HSP_SHRD_MBOX_TYPE1_DATA1 ); + value[2 ] =tegra_hsp_channel_readl (channel,HSP_SHRD_MBOX_TYPE1_DATA2 ); + value[3 ] =tegra_hsp_channel_readl (channel,HSP_SHRD_MBOX_TYPE1_DATA3 ); + + msg = (void *)(unsigned long )value; +mbox_chan_received_data (channel->chan, msg); + +/* +* Clear data registers and tag. +*/ +tegra_hsp_channel_writel (channel,0x0 ,HSP_SHRD_MBOX_TYPE1_DATA0 ); +tegra_hsp_channel_writel (channel,0x0 ,HSP_SHRD_MBOX_TYPE1_DATA1 ); +tegra_hsp_channel_writel (channel,0x0 ,HSP_SHRD_MBOX_TYPE1_DATA2 ); +tegra_hsp_channel_writel (channel,0x0 ,HSP_SHRD_MBOX_TYPE1_DATA3 ); +tegra_hsp_channel_writel (channel,0x0 ,HSP_SHRD_MBOX_TYPE1_TAG ); +} + +static const struct tegra_hsp_sm_ops tegra_hsp_sm_128bit_ops = { + .send = tegra_hsp_sm_send128, + .recv = tegra_hsp_sm_recv128, +}; +static int tegra_hsp_mailbox_send_data (struct mbox_chan *chan,void *data) {struct tegra_hsp_mailbox *mb = chan->con_priv;
@@ -571,12 +625,20 @@ static struct mbox_chan *tegra_hsp_sm_xlate(struct mbox_controller *mbox, index = args->args[1 ] &TEGRA_HSP_SM_MASK ; -if (type !=TEGRA_HSP_MBOX_TYPE_SM || !hsp->shared_irqs || - index >= hsp->num_sm) +if ((type &HSP_MBOX_TYPE_MASK ) !=TEGRA_HSP_MBOX_TYPE_SM || + !hsp->shared_irqs || index >= hsp->num_sm)return ERR_PTR (-ENODEV ); mb = &hsp->mailboxes[index]; - mb->ops = &tegra_hsp_sm_32bit_ops; + +if (type &TEGRA_HSP_MBOX_TYPE_SM_128BIT ) { +if (!hsp->soc->has_128_bit_mb) +return ERR_PTR (-ENODEV ); + + mb->ops = &tegra_hsp_sm_128bit_ops; + }else { + mb->ops = &tegra_hsp_sm_32bit_ops; + }if ((args->args[1 ] &TEGRA_HSP_SM_FLAG_TX ) ==0 ) mb->producer = false;
@@ -853,16 +915,25 @@ static const struct tegra_hsp_db_map tegra186_hsp_db_map[] = {static const struct tegra_hsp_soc tegra186_hsp_soc = { .map = tegra186_hsp_db_map, .has_per_mb_ie = false, + .has_128_bit_mb = false, };static const struct tegra_hsp_soc tegra194_hsp_soc = { .map = tegra186_hsp_db_map, .has_per_mb_ie = true, + .has_128_bit_mb = false, +}; + +static const struct tegra_hsp_soc tegra234_hsp_soc = { + .map = tegra186_hsp_db_map, + .has_per_mb_ie = false, + .has_128_bit_mb = true, };static const struct of_device_id tegra_hsp_match[] = { { .compatible ="nvidia,tegra186-hsp" , .data = &tegra186_hsp_soc }, { .compatible ="nvidia,tegra194-hsp" , .data = &tegra194_hsp_soc }, + { .compatible ="nvidia,tegra234-hsp" , .data = &tegra234_hsp_soc }, { } };
Signature · 1 line
2.17.1
On 14/04/2022 13:05 +530, Kartik Wrote:
Quoted 9 lines
This series of patches adds support for 128-bit shared mailbox found on Tegra234 chips. It also introduce
tegra_hsp_sm_opsto abstract send & receive APIs for 32-bit and 128-bit shared mailboxes.Kartik (3):
mailbox: tegra-hsp: Addtegra_hsp_sm_ops
dt-bindings: tegra186-hsp: add type for shared mailboxes
mailbox: tegra-hsp: Add 128-bit shared mailbox support
Quoted 4 lines
.../bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 ++ drivers/mailbox/tegra-hsp.c | 149 ++++++++++++++---- include/dt-bindings/mailbox/tegra186-hsp.h | 5 + 3 files changed, 134 insertions(+), 29 deletions(-)
Hi Jassi,
Any comments on this from the mailbox side?
Regards,
Kartik
Quoted 10 lines · Kartik
On 14/04/2022 13:05 +530, Kartik Wrote:
Quoted 9 lines
This series of patches adds support for 128-bit shared mailbox found on Tegra234 chips. It also introduce
tegra_hsp_sm_opsto abstract send & receive APIs for 32-bit and 128-bit shared mailboxes.Kartik (3):
mailbox: tegra-hsp: Addtegra_hsp_sm_ops
dt-bindings: tegra186-hsp: add type for shared mailboxes
mailbox: tegra-hsp: Add 128-bit shared mailbox support
Quoted 8 lines
Quoted 4 lines
.../bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 ++ drivers/mailbox/tegra-hsp.c | 149 ++++++++++++++---- include/dt-bindings/mailbox/tegra186-hsp.h | 5 + 3 files changed, 134 insertions(+), 29 deletions(-)Hi Jassi,
Any comments on this from the mailbox side?
I noticed that Jassi pulled this in for v5.19-rc1, so I think this is all good now.
Thierry