mailbox: zynqmp: Enable Bufferless IPIs for Versal based SOCs
Subsystems (2)
PATCH v3 1/3 mailbox: zynqmp: Move of_match structure closer to usage
In reply to Ben LevinskyThe of_match structure zynqmp_ipi_of_match is now adjacent to where it used in the zynqmp_ipi_driver structure for readability.
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +6 -6
@@ -415,12 +415,6 @@ static struct mbox_chan *zynqmp_ipi_of_xlate(struct mbox_controller *mbox,return chan; } -static const struct of_device_id zynqmp_ipi_of_match[] = { - { .compatible ="xlnx,zynqmp-ipi-mailbox" }, - {}, -}; -MODULE_DEVICE_TABLE (of, zynqmp_ipi_of_match); -/** * zynqmp_ipi_mbox_get_buf_res - Get buffer resource from the IPI dev node *
@@ -695,6 +689,12 @@ static void zynqmp_ipi_remove(struct platform_device *pdev)zynqmp_ipi_free_mboxes (pdata); } +static const struct of_device_id zynqmp_ipi_of_match[] = { + { .compatible ="xlnx,zynqmp-ipi-mailbox" }, + {}, +}; +MODULE_DEVICE_TABLE (of, zynqmp_ipi_of_match); +static struct platform_driver zynqmp_ipi_driver = { .probe = zynqmp_ipi_probe, .remove_new = zynqmp_ipi_remove,
Signature · 1 line
2.25.1
PATCH v3 2/3 mailbox: zynqmp: Move buffered IPI setup to of_match selected routine
In reply to Ben LevinskyMove routine that initializes the mailboxes for send and receive to a function pointer that is set based on compatible string.
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 122 +++++++++++++++++++-------- 1 file changed, 87 insertions(+), 35 deletions(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +87 -35
@@ -72,6 +72,10 @@ struct zynqmp_ipi_mchan {unsigned int chan_type; }; +struct zynqmp_ipi_mbox ; + +typedef int (*setup_ipi_fn )(struct zynqmp_ipi_mbox *ipi_mbox,struct device_node *node); +/** * struct zynqmp_ipi_mbox - Description of a ZynqMP IPI mailbox * platform data.
@@ -81,6 +85,7 @@ struct zynqmp_ipi_mchan {* @remote_id: remote IPI agent ID * @mbox: mailbox Controller * @mchans: array for channels, tx channel and rx channel. +* @setup_ipi_fn: Function Pointer to set up IPI Channels */ struct zynqmp_ipi_mbox {struct zynqmp_ipi_pdata *pdata;
@@ -88,6 +93,7 @@ struct zynqmp_ipi_mbox {u32 remote_id;struct mbox_controller mbox;struct zynqmp_ipi_mchan mchans[2 ]; +setup_ipi_fn setup_ipi_fn; };/**
@@ -464,12 +470,9 @@ static void zynqmp_ipi_mbox_dev_release(struct device *dev)static int zynqmp_ipi_mbox_probe (struct zynqmp_ipi_mbox *ipi_mbox,struct device_node *node) { -struct zynqmp_ipi_mchan *mchan;struct mbox_chan *chans;struct mbox_controller *mbox; -struct resource res;struct device *dev, *mdev; -const char *name;int ret; dev = ipi_mbox->pdata->dev;
@@ -489,6 +492,73 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, } mdev = &ipi_mbox->dev; +/* Get the IPI remote agent ID */ + ret =of_property_read_u32 (node,"xlnx,ipi-id" , &ipi_mbox->remote_id); +if (ret <0 ) { +dev_err (dev,"No IPI remote ID is specified.\n" ); +return ret; + } + + ret = ipi_mbox->setup_ipi_fn (ipi_mbox, node); +if (ret) { +dev_err (dev,"Failed to set up IPI Buffers.\n" ); +return ret; + } + + mbox = &ipi_mbox->mbox; + mbox->dev = mdev; + mbox->ops = &zynqmp_ipi_chan_ops; + mbox->num_chans =2 ; + mbox->txdone_irq = false; + mbox->txdone_poll = true; + mbox->txpoll_period =5 ; + mbox->of_xlate = zynqmp_ipi_of_xlate; + chans =devm_kzalloc (mdev,2 *sizeof (*chans),GFP_KERNEL ); +if (!chans) +return -ENOMEM ; + mbox->chans = chans; + chans[IPI_MB_CHNL_TX ].con_priv = &ipi_mbox->mchans[IPI_MB_CHNL_TX ]; + chans[IPI_MB_CHNL_RX ].con_priv = &ipi_mbox->mchans[IPI_MB_CHNL_RX ]; + ipi_mbox->mchans[IPI_MB_CHNL_TX ].chan_type =IPI_MB_CHNL_TX ; + ipi_mbox->mchans[IPI_MB_CHNL_RX ].chan_type =IPI_MB_CHNL_RX ; + ret =devm_mbox_controller_register (mdev, mbox); +if (ret) +dev_err (mdev, +"Failed to register mbox_controller(%d)\n" , ret); +else +dev_info (mdev, +"Registered ZynqMP IPI mbox with TX/RX channels.\n" ); +return ret; +} + +/** +* zynqmp_ipi_setup - set up IPI Buffers for classic flow +* +* @ipi_mbox: pointer to IPI mailbox private data structure +* @node: IPI mailbox device node +* +* This will be used to set up IPI Buffers for ZynqMP SOC if user +* wishes to use classic driver usage model on new SOC's with only +* buffered IPIs. +* +* Note that bufferless IPIs and mixed usage of buffered and bufferless +* IPIs are not supported with this flow. +* +* This will be invoked with compatible string "xlnx,zynqmp-ipi-mailbox". +* +* Return: 0 for success, negative value for failure +*/ +static int zynqmp_ipi_setup (struct zynqmp_ipi_mbox *ipi_mbox, +struct device_node *node) +{ +struct zynqmp_ipi_mchan *mchan; +struct device *mdev; +struct resource res; +const char *name; +int ret; + + mdev = &ipi_mbox->dev; + mchan = &ipi_mbox->mchans[IPI_MB_CHNL_TX ]; name ="local_request_region" ; ret =zynqmp_ipi_mbox_get_buf_res (node, name, &res);
@@ -563,37 +633,7 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox,if (!mchan->rx_buf)return -ENOMEM ; -/* Get the IPI remote agent ID */ - ret =of_property_read_u32 (node,"xlnx,ipi-id" , &ipi_mbox->remote_id); -if (ret <0 ) { -dev_err (dev,"No IPI remote ID is specified.\n" ); -return ret; - } - - mbox = &ipi_mbox->mbox; - mbox->dev = mdev; - mbox->ops = &zynqmp_ipi_chan_ops; - mbox->num_chans =2 ; - mbox->txdone_irq = false; - mbox->txdone_poll = true; - mbox->txpoll_period =5 ; - mbox->of_xlate = zynqmp_ipi_of_xlate; - chans =devm_kzalloc (mdev,2 *sizeof (*chans),GFP_KERNEL ); -if (!chans) -return -ENOMEM ; - mbox->chans = chans; - chans[IPI_MB_CHNL_TX ].con_priv = &ipi_mbox->mchans[IPI_MB_CHNL_TX ]; - chans[IPI_MB_CHNL_RX ].con_priv = &ipi_mbox->mchans[IPI_MB_CHNL_RX ]; - ipi_mbox->mchans[IPI_MB_CHNL_TX ].chan_type =IPI_MB_CHNL_TX ; - ipi_mbox->mchans[IPI_MB_CHNL_RX ].chan_type =IPI_MB_CHNL_RX ; - ret =devm_mbox_controller_register (mdev, mbox); -if (ret) -dev_err (mdev, -"Failed to register mbox_controller(%d)\n" , ret); -else -dev_info (mdev, -"Registered ZynqMP IPI mbox with TX/RX channels.\n" ); -return ret; +return 0 ; }/**
@@ -624,6 +664,7 @@ static int zynqmp_ipi_probe(struct platform_device *pdev)struct zynqmp_ipi_pdata *pdata;struct zynqmp_ipi_mbox *mbox;int num_mboxes, ret = -EINVAL ; +setup_ipi_fn ipi_fn; num_mboxes =of_get_available_child_count (np);if (num_mboxes ==0 ) {
@@ -644,9 +685,18 @@ static int zynqmp_ipi_probe(struct platform_device *pdev)return ret; } + ipi_fn = (setup_ipi_fn )device_get_match_data (&pdev->dev); +if (!ipi_fn) { +dev_err (dev, +"Mbox Compatible String is missing IPI Setup fn.\n" ); +return -ENODEV ; + } + pdata->num_mboxes = num_mboxes; mbox = pdata->ipi_mboxes; + mbox->setup_ipi_fn = ipi_fn; +for_each_available_child_of_node (np, nc) { mbox->pdata = pdata; ret =zynqmp_ipi_mbox_probe (mbox, nc);
@@ -690,7 +740,9 @@ static void zynqmp_ipi_remove(struct platform_device *pdev) }static const struct of_device_id zynqmp_ipi_of_match[] = { - { .compatible ="xlnx,zynqmp-ipi-mailbox" }, + { .compatible ="xlnx,zynqmp-ipi-mailbox" , + .data = &zynqmp_ipi_setup, + }, {}, };MODULE_DEVICE_TABLE (of, zynqmp_ipi_of_match);
Signature · 1 line
2.25.1
PATCH v3 3/3 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's
In reply to Ben LevinskyOn Xilinx-AMD Versal and Versal-NET, there exist both inter-processor-interrupts with corresponding message buffers and without such buffers.
Add a routine that, if the corresponding DT compatible string "xlnx,versal-ipi-mailbox" is used then a Versal-based SOC can use a mailbox Device Tree entry where both host and remote can use either of the buffered or bufferless interrupts.
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 129 +++++++++++++++++++++++++-- 1 file changed, 122 insertions(+), 7 deletions(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +122 -7
@@ -52,6 +52,13 @@#define IPI_MB_CHNL_TX 0/* IPI mailbox TX channel */ #define IPI_MB_CHNL_RX 1/* IPI mailbox RX channel */ +/* IPI Message Buffer Information */ +#define RESP_OFFSET 0x20U +#define DEST_OFFSET 0x40U +#define IPI_BUF_SIZE 0x20U +#define DST_BIT_POS 9U +#define SRC_BITMASK GENMASK(11, 8) +/** * struct zynqmp_ipi_mchan - Description of a Xilinx ZynqMP IPI mailbox channel * @is_opened: indicate if the IPI channel is opened
@@ -169,9 +176,11 @@ static irqreturn_t zynqmp_ipi_interrupt(int irq, void *data)if (ret >0 && ret &IPI_MB_STATUS_RECV_PENDING ) {if (mchan->is_opened) { msg = mchan->rx_buf; - msg->len = mchan->req_buf_size; -memcpy_fromio (msg->data, mchan->req_buf, - msg->len); +if (msg) { + msg->len = mchan->req_buf_size; +memcpy_fromio (msg->data, mchan->req_buf, + msg->len); + }mbox_chan_received_data (chan, (void *)msg); status =IRQ_HANDLED ; }
@@ -281,26 +290,26 @@ static int zynqmp_ipi_send_data(struct mbox_chan *chan, void *data)if (mchan->chan_type ==IPI_MB_CHNL_TX ) {/* Send request message */ -if (msg && msg->len > mchan->req_buf_size) { +if (msg && msg->len > mchan->req_buf_size && mchan->req_buf) {dev_err (dev,"channel %d message length %u > max %lu\n" , mchan->chan_type, (unsigned int )msg->len, mchan->req_buf_size);return -EINVAL ; } -if (msg && msg->len) +if (msg && msg->len && mchan->req_buf)memcpy_toio (mchan->req_buf, msg->data, msg->len);/* Kick IPI mailbox to send message */ arg0 =SMC_IPI_MAILBOX_NOTIFY ;zynqmp_ipi_fw_call (ipi_mbox, arg0,0 , &res); }else {/* Send response message */ -if (msg && msg->len > mchan->resp_buf_size) { +if (msg && msg->len > mchan->resp_buf_size && mchan->resp_buf) {dev_err (dev,"channel %d message length %u > max %lu\n" , mchan->chan_type, (unsigned int )msg->len, mchan->resp_buf_size);return -EINVAL ; } -if (msg && msg->len) +if (msg && msg->len && mchan->resp_buf)memcpy_toio (mchan->resp_buf, msg->data, msg->len); arg0 =SMC_IPI_MAILBOX_ACK ; zynqmp_ipi_fw_call(ipi_mbox, arg0, IPI_SMC_ACK_EIRQ_MASK,
@@ -636,6 +645,109 @@ static int zynqmp_ipi_setup(struct zynqmp_ipi_mbox *ipi_mbox,return 0 ; } +/** +* versal_ipi_setup - Set up IPIs to support mixed usage of +* Buffered and Bufferless IPIs. +* +* @ipi_mbox: pointer to IPI mailbox private data structure +* @node: IPI mailbox device node +* +* Return: 0 for success, negative value for failure +*/ +static int versal_ipi_setup (struct zynqmp_ipi_mbox *ipi_mbox, +struct device_node *node) +{ +struct zynqmp_ipi_mchan *tx_mchan, *rx_mchan; +struct resource host_res, remote_res; +struct device_node *parent_node; +int host_idx, remote_idx; +struct device *mdev; + + tx_mchan = &ipi_mbox->mchans[IPI_MB_CHNL_TX ]; + rx_mchan = &ipi_mbox->mchans[IPI_MB_CHNL_RX ]; + parent_node =of_get_parent (node); + mdev = &ipi_mbox->dev; + + host_idx =zynqmp_ipi_mbox_get_buf_res (parent_node,"msg" , &host_res); + remote_idx =zynqmp_ipi_mbox_get_buf_res (node,"msg" , &remote_res); + +/* +* Only set up buffers if both sides claim to have msg buffers. +* This is because each buffered IPI's corresponding msg buffers +* are reserved for use by other buffered IPI's. +*/ +if (!host_idx && !remote_idx) { +u32 host_src, host_dst, remote_src, remote_dst; +u32 buff_sz; + + buff_sz =resource_size (&host_res); + + host_src = host_res.start &SRC_BITMASK ; + remote_src = remote_res.start &SRC_BITMASK ; + + host_dst = (host_src >>DST_BIT_POS ) *DEST_OFFSET ; + remote_dst = (remote_src >>DST_BIT_POS ) *DEST_OFFSET ; + +/* Validate that IPI IDs is within IPI Message buffer space. */ +if (host_dst >= buff_sz || remote_dst >= buff_sz) { +dev_err (mdev, +"Invalid IPI Message buffer values: %x %x\n" , + host_dst, remote_dst); +return -EINVAL ; + } + + tx_mchan->req_buf =devm_ioremap (mdev, + host_res.start | remote_dst, +IPI_BUF_SIZE ); +if (!tx_mchan->req_buf) { +dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); +return -ENOMEM ; + } + + tx_mchan->resp_buf =devm_ioremap (mdev, + (remote_res.start | host_dst) + +RESP_OFFSET ,IPI_BUF_SIZE ); +if (!tx_mchan->resp_buf) { +dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); +return -ENOMEM ; + } + + rx_mchan->req_buf =devm_ioremap (mdev, + remote_res.start | host_dst, +IPI_BUF_SIZE ); +if (!rx_mchan->req_buf) { +dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); +return -ENOMEM ; + } + + rx_mchan->resp_buf =devm_ioremap (mdev, + (host_res.start | remote_dst) + +RESP_OFFSET ,IPI_BUF_SIZE ); +if (!rx_mchan->resp_buf) { +dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); +return -ENOMEM ; + } + + tx_mchan->resp_buf_size =IPI_BUF_SIZE ; + tx_mchan->req_buf_size =IPI_BUF_SIZE ; + tx_mchan->rx_buf =devm_kzalloc (mdev,IPI_BUF_SIZE + +sizeof (struct zynqmp_ipi_message ), +GFP_KERNEL ); +if (!tx_mchan->rx_buf) +return -ENOMEM ; + + rx_mchan->resp_buf_size =IPI_BUF_SIZE ; + rx_mchan->req_buf_size =IPI_BUF_SIZE ; + rx_mchan->rx_buf =devm_kzalloc (mdev,IPI_BUF_SIZE + +sizeof (struct zynqmp_ipi_message ), +GFP_KERNEL ); +if (!rx_mchan->rx_buf) +return -ENOMEM ; + } + +return 0 ; +} +/** * zynqmp_ipi_free_mboxes - Free IPI mailboxes devices *
@@ -743,6 +855,9 @@ static const struct of_device_id zynqmp_ipi_of_match[] = { { .compatible = "xlnx,zynqmp-ipi-mailbox", .data = &zynqmp_ipi_setup, }, + { .compatible = "xlnx,versal-ipi-mailbox", + .data = &versal_ipi_setup, + }, {}, };MODULE_DEVICE_TABLE (of, zynqmp_ipi_of_match);
Signature · 1 line
2.25.1
v3 cover mailbox: zynqmp: Enable Bufferless IPIs for Versal based SOCs
For Xilinx-AMD Versal and Versal NET SOC's there exist also inter-processor-interrupts (IPIs) without IPI Message Buffers. For these enable use of IPI Mailbox driver for send/receive as well.
This is enabled with new compatible string: "xlnx,versal-ipi-mailbox"
Original, buffered usage for ZynqMP based SOC is still supported.
Note that Versal bindings are already present in xlnx,zynqmp-ipi-mailbox.yaml
v2:
- formatting in 2/3 patch
- remove extra handling in 3/3 versal_ipi_setup()
v3:
1/3 - removed additional newline to avoid./scripts/checkpatch.pl --strict -f drivers/mailbox/zynqmp-ipi-mailbox.c
CHECK: Please don't use multiple blank lines
#434: FILE: drivers/mailbox/zynqmp-ipi-mailbox.c:434:
+
+
2/3 - remove unused variable dev drivers/mailbox/zynqmp-ipi-mailbox.c:565:24: warning: variable 'dev' set but not used [-Wunused-but-set-variable]
struct device *mdev, *dev;
3/3 - remove unused variable dev
^
drivers/mailbox/zynqmp-ipi-mailbox.c:666:24: warning: variable 'dev' set but not
used [-Wunused-but-set-variable]
struct device *mdev, *dev;
^Ben Levinsky (3):
mailbox: zynqmp: Move of_match structure closer to usage
mailbox: zynqmp: Move buffered IPI setup to of_match selected routine
mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's
drivers/mailbox/zynqmp-ipi-mailbox.c | 257 ++++++++++++++++++++++----- 1 file changed, 212 insertions(+), 45 deletions(-)
Signature · 1 line
2.25.1
Ping For Review
Quoted 45 lines
-------- Forwarded Message --------
Subject: [PATCH v3 0/3] mailbox: zynqmp: Enable Bufferless IPIs for Versal based SOCs
Date: Wed, 10 Apr 2024 10:08:22 -0700
From: Ben Levinsky <[email protected]>
To: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]For Xilinx-AMD Versal and Versal NET SOC's there exist also inter-processor-interrupts (IPIs) without IPI Message Buffers. For these enable use of IPI Mailbox driver for send/receive as well.
This is enabled with new compatible string: "xlnx,versal-ipi-mailbox"
Original, buffered usage for ZynqMP based SOC is still supported.
Note that Versal bindings are already present in xlnx,zynqmp-ipi-mailbox.yaml
v2:
- formatting in 2/3 patch
- remove extra handling in 3/3versal_ipi_setup()
v3:
1/3 - removed additional newline to avoid./scripts/checkpatch.pl--strict -fdrivers/mailbox/zynqmp-ipi-mailbox.c
CHECK: Please don't use multiple blank lines
#434: FILE:drivers/mailbox/zynqmp-ipi-mailbox.c:434:(quoted diff) +2
-0+ +2/3 - remove unused variable dev
drivers/mailbox/zynqmp-ipi-mailbox.c:565:24: warning: variable 'dev' set but not used [-Wunused-but-set-variable]struct device *mdev, *dev; 3/3 - remove unused variable dev ^ drivers/mailbox/zynqmp-ipi-mailbox.c:666:24: warning: variable 'dev' set but not used [-Wunused-but-set-variable] struct device *mdev, *dev; ^Ben Levinsky (3):
mailbox: zynqmp: Moveof_matchstructure closer to usage
mailbox: zynqmp: Move buffered IPI setup toof_matchselected routine
mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC'sdrivers/mailbox/zynqmp-ipi-mailbox.c | 257 ++++++++++++++++++++++----- 1 file changed, 212 insertions(+), 45 deletions(-)
Jassi Brar
maintainerQuoted 2 lines · Ben Levinsky
Ping For Review
It's a beautiful patchset :)
-jassi
Quoted 45 lines
Quoted 45 lines
-------- Forwarded Message --------
Subject: [PATCH v3 0/3] mailbox: zynqmp: Enable Bufferless IPIs for Versal based SOCs
Date: Wed, 10 Apr 2024 10:08:22 -0700
From: Ben Levinsky <[email protected]>
To: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]For Xilinx-AMD Versal and Versal NET SOC's there exist also inter-processor-interrupts (IPIs) without IPI Message Buffers. For these enable use of IPI Mailbox driver for send/receive as well.
This is enabled with new compatible string: "xlnx,versal-ipi-mailbox"
Original, buffered usage for ZynqMP based SOC is still supported.
Note that Versal bindings are already present in xlnx,zynqmp-ipi-mailbox.yaml
v2:
- formatting in 2/3 patch
- remove extra handling in 3/3versal_ipi_setup()
v3:
1/3 - removed additional newline to avoid./scripts/checkpatch.pl--strict -fdrivers/mailbox/zynqmp-ipi-mailbox.c
CHECK: Please don't use multiple blank lines
#434: FILE:drivers/mailbox/zynqmp-ipi-mailbox.c:434:(quoted diff) +2
-0+ +2/3 - remove unused variable dev
drivers/mailbox/zynqmp-ipi-mailbox.c:565:24: warning: variable 'dev' set but not used [-Wunused-but-set-variable]struct device *mdev, *dev; 3/3 - remove unused variable dev ^ drivers/mailbox/zynqmp-ipi-mailbox.c:666:24: warning: variable 'dev' set but not used [-Wunused-but-set-variable] struct device *mdev, *dev; ^Ben Levinsky (3):
mailbox: zynqmp: Moveof_matchstructure closer to usage
mailbox: zynqmp: Move buffered IPI setup toof_matchselected routine
mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC'sdrivers/mailbox/zynqmp-ipi-mailbox.c | 257 ++++++++++++++++++++++----- 1 file changed, 212 insertions(+), 45 deletions(-)