redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-23674-3 fw: imx: seco_mu: get message header tags from dt 

In order for a message sent to a V2X MU, the value indication the
type of the message chagne for each MU addressed.

This patch adds the read of the values from the device tree or
uses the default values which works with SECO MU.

Signed-off-by: Stéphane Dion <stephane.dion_1@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Stéphane Dion 2020-03-24 13:54:18 +01:00 committed by Franck LENORMAND
parent daeab4cb05
commit 56d318d214
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/firmware/imx/seco_mu.c
View File

@ -75,8 +75,8 @@
#define MESSAGE_SIZE(hdr) (((struct she_mu_hdr *)(&(hdr)))->size)
#define MESSAGE_TAG(hdr) (((struct she_mu_hdr *)(&(hdr)))->tag)
#define MESSAGING_TAG_COMMAND (0x17u)
#define MESSAGING_TAG_RESPONSE (0xe1u)
#define DEFAULT_MESSAGING_TAG_COMMAND (0x17u)
#define DEFAULT_MESSAGING_TAG_RESPONSE (0xe1u)
#define SECURE_RAM_BASE_ADDRESS (0x31800000ULL)
#define SECURE_RAM_BASE_ADDRESS_SCU (0x20800000u)
@ -157,6 +157,8 @@ struct seco_mu_priv {
struct mutex mu_cmd_lock;
struct device *dev;
u32 seco_mu_id;
u8 cmd_tag;
u8 rsp_tag;
struct mbox_client cl;
struct mbox_chan *tx_chan;
@ -395,14 +397,14 @@ static ssize_t seco_mu_fops_write(struct file *fp, const char __user *buf,
header = dev_ctx->temp_cmd[0];
/* Check the message is valid according to tags */
if (MESSAGE_TAG(header) == MESSAGING_TAG_COMMAND) {
if (MESSAGE_TAG(header) == mu_priv->cmd_tag) {
/*
* unlocked in seco_mu_receive_work_handler when the
* response to this command is received.
*/
mutex_lock(&mu_priv->mu_cmd_lock);
mu_priv->waiting_rsp_dev = dev_ctx;
} else if (MESSAGE_TAG(header) == MESSAGING_TAG_RESPONSE) {
} else if (MESSAGE_TAG(header) == mu_priv->rsp_tag) {
/* Check the device context can send the command */
if (dev_ctx != mu_priv->cmd_receiver_dev) {
devctx_err(dev_ctx,
@ -863,10 +865,10 @@ static void seco_mu_rx_callback(struct mbox_client *c, void *msg)
dev_dbg(dev, "Selecting device\n");
/* Incoming command: wake up the receiver if any. */
if (MESSAGE_TAG(header) == MESSAGING_TAG_COMMAND) {
if (MESSAGE_TAG(header) == priv->cmd_tag) {
dev_dbg(dev, "Selecting cmd receiver\n");
dev_ctx = priv->cmd_receiver_dev;
} else if (MESSAGE_TAG(header) == MESSAGING_TAG_RESPONSE) {
} else if (MESSAGE_TAG(header) == priv->rsp_tag) {
dev_dbg(dev, "Selecting rsp waiter\n");
dev_ctx = priv->waiting_rsp_dev;
is_response = true;
@ -1058,6 +1060,14 @@ static int seco_mu_probe(struct platform_device *pdev)
max_nb_users = SECO_MU_DEFAULT_MAX_USERS;
}
ret = of_property_read_u8(np, "fsl,cmd_tag", &priv->cmd_tag);
if (ret)
priv->cmd_tag = DEFAULT_MESSAGING_TAG_COMMAND;
ret = of_property_read_u8(np, "fsl,rsp_tag", &priv->rsp_tag);
if (ret)
priv->rsp_tag = DEFAULT_MESSAGING_TAG_RESPONSE;
/* Mailbox client configuration */
priv->cl.dev = dev;
priv->cl.knows_txdone = true;