Messages in this thread Patch in this message | | | From | peng.fan@nxp ... | Subject | [PATCH 2/2] firmware: arm_scmi: mark channel free when init | Date | Thu, 6 Feb 2020 20:59:26 +0800 |
| |
From: Peng Fan <peng.fan@nxp.com>
The firmware itself might not mark channel free, so let's explicitly mark it free when do initialization.
Also move struct scmi_shared_mem to common.h
Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/arm_scmi/common.h | 19 +++++++++++++++++-- drivers/firmware/arm_scmi/mailbox.c | 2 ++ drivers/firmware/arm_scmi/shmem.c | 18 ------------------ 3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h index fd091a4ccbff..5df262a564a4 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -211,8 +211,23 @@ extern const struct scmi_desc scmi_mailbox_desc; void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr); void scmi_free_channel(struct scmi_chan_info *cinfo, struct idr *idr, int id); -/* shmem related declarations */ -struct scmi_shared_mem; +/* + * SCMI specification requires all parameters, message headers, return + * arguments or any protocol data to be expressed in little endian + * format only. + */ +struct scmi_shared_mem { + __le32 reserved; + __le32 channel_status; +#define SCMI_SHMEM_CHAN_STAT_CHANNEL_ERROR BIT(1) +#define SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE BIT(0) + __le32 reserved1[2]; + __le32 flags; +#define SCMI_SHMEM_FLAG_INTR_ENABLED BIT(0) + __le32 length; + __le32 msg_header; + u8 msg_payload[0]; +}; void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, struct scmi_xfer *xfer); diff --git a/drivers/firmware/arm_scmi/mailbox.c b/drivers/firmware/arm_scmi/mailbox.c index 68ed58e2a47a..2d34bf6e94e2 100644 --- a/drivers/firmware/arm_scmi/mailbox.c +++ b/drivers/firmware/arm_scmi/mailbox.c @@ -104,6 +104,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, cinfo->transport_info = smbox; smbox->cinfo = cinfo; + iowrite32(BIT(0), &smbox->shmem->channel_status); + return 0; } diff --git a/drivers/firmware/arm_scmi/shmem.c b/drivers/firmware/arm_scmi/shmem.c index 02c6c7540f42..c9e334654ba3 100644 --- a/drivers/firmware/arm_scmi/shmem.c +++ b/drivers/firmware/arm_scmi/shmem.c @@ -11,24 +11,6 @@ #include "common.h" -/* - * SCMI specification requires all parameters, message headers, return - * arguments or any protocol data to be expressed in little endian - * format only. - */ -struct scmi_shared_mem { - __le32 reserved; - __le32 channel_status; -#define SCMI_SHMEM_CHAN_STAT_CHANNEL_ERROR BIT(1) -#define SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE BIT(0) - __le32 reserved1[2]; - __le32 flags; -#define SCMI_SHMEM_FLAG_INTR_ENABLED BIT(0) - __le32 length; - __le32 msg_header; - u8 msg_payload[0]; -}; - void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, struct scmi_xfer *xfer) { -- 2.16.4
| |