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

SSI-87: firmware: imx: scu: Support reception of message of any size 

The word of a message can arrive in any order and the current driver
cannot receive more than 4-word message.

As the message can arrive in any order, the position where they
should be stored is stored in the sc_chan struct:
 - initialized at the index of the MU slot
 - incremented each time after a new word is stored

Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Franck LENORMAND 2020-03-20 10:42:48 +01:00
parent d00fdf9c4e
commit 16338e4fe9
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/firmware/imx/imx-scu.c
View File

@ -33,6 +33,7 @@ struct imx_sc_chan {
struct mbox_chan *ch;
int idx;
struct completion tx_done;
u8 rx_pos;
};
struct imx_sc_ipc {
@ -119,22 +120,20 @@ static void imx_scu_rx_callback(struct mbox_client *c, void *msg)
struct imx_sc_rpc_msg *hdr;
u32 *data = msg;
if (sc_chan->idx == 0) {
if (sc_chan->rx_pos == 0) {
hdr = msg;
sc_ipc->rx_size = hdr->size;
dev_dbg(sc_ipc->dev, "msg rx size %u\n", sc_ipc->rx_size);
if (sc_ipc->rx_size > 4)
dev_warn(sc_ipc->dev, "RPC does not support receiving over 4 words: %u\n",
sc_ipc->rx_size);
}
sc_ipc->msg[sc_chan->idx] = *data;
sc_ipc->msg[sc_chan->rx_pos] = *data;
sc_chan->rx_pos += 4;
sc_ipc->count++;
dev_dbg(sc_ipc->dev, "mu %u msg %u 0x%x\n", sc_chan->idx,
sc_ipc->count, *data);
if ((sc_ipc->rx_size != 0) && (sc_ipc->count == sc_ipc->rx_size))
if (sc_ipc->count == sc_ipc->rx_size)
complete(&sc_ipc->done);
}
@ -207,16 +206,25 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp)
struct imx_sc_rpc_msg *hdr;
struct arm_smccc_res res;
int ret;
int i;
if (WARN_ON(!sc_ipc || !msg))
return -EINVAL;
mutex_lock(&sc_ipc->lock);
for (i = 4; i < 8; i++) {
struct imx_sc_chan *sc_chan = &sc_ipc->chans[i];
sc_chan->rx_pos = sc_chan->idx;
}
reinit_completion(&sc_ipc->done);
sc_ipc->msg = msg;
sc_ipc->count = 0;
sc_ipc->rx_size = 0;
if (xen_initial_domain()) {
arm_smccc_hvc(FSL_HVC_SC, (uint64_t)msg, !have_resp, 0, 0, 0,
0, 0, &res);