iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware: arm_scmi: Add support for type handling in common functions

Browse Source 
Add SCMI type handling to pack/unpack_scmi_header common helper functions.
Initialize hdr.type properly when initializing a command xfer.

Link: https://lore.kernel.org/r/20210803131024.40280-2-cristian.marussi@arm.com
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Cristian Marussi
2021-08-03 14:10:10 +01:00
committed by Sudeep Holla
parent bdb8742dc6
commit 63b282f172
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/firmware/arm_scmi/common.h
View File

@@ -70,6 +70,7 @@ struct scmi_msg_resp_prot_version {
* *
* @id: The identifier of the message being sent * @id: The identifier of the message being sent
* @protocol_id: The identifier of the protocol used to send @id message * @protocol_id: The identifier of the protocol used to send @id message
* @type: The SCMI type for this message
* @seq: The token to identify the message. When a message returns, the * @seq: The token to identify the message. When a message returns, the
* platform returns the whole message header unmodified including the * platform returns the whole message header unmodified including the
* token * token
@@ -80,6 +81,7 @@ struct scmi_msg_resp_prot_version {
struct scmi_msg_hdr { struct scmi_msg_hdr {
u8 id; u8 id;
u8 protocol_id; u8 protocol_id;
u8 type;
u16 seq; u16 seq;
u32 status; u32 status;
bool poll_completion; bool poll_completion;
@@ -89,13 +91,14 @@ struct scmi_msg_hdr {
* pack_scmi_header() - packs and returns 32-bit header * pack_scmi_header() - packs and returns 32-bit header
* *
* @hdr: pointer to header containing all the information on message id, * @hdr: pointer to header containing all the information on message id,
* protocol id and sequence id. * protocol id, sequence id and type.
* *
* Return: 32-bit packed message header to be sent to the platform. * Return: 32-bit packed message header to be sent to the platform.
*/ */
static inline u32 pack_scmi_header(struct scmi_msg_hdr *hdr) static inline u32 pack_scmi_header(struct scmi_msg_hdr *hdr)
{ {
return FIELD_PREP(MSG_ID_MASK, hdr->id) | return FIELD_PREP(MSG_ID_MASK, hdr->id) |
FIELD_PREP(MSG_TYPE_MASK, hdr->type) |
FIELD_PREP(MSG_TOKEN_ID_MASK, hdr->seq) | FIELD_PREP(MSG_TOKEN_ID_MASK, hdr->seq) |
FIELD_PREP(MSG_PROTOCOL_ID_MASK, hdr->protocol_id); FIELD_PREP(MSG_PROTOCOL_ID_MASK, hdr->protocol_id);
} }
@@ -110,6 +113,7 @@ static inline void unpack_scmi_header(u32 msg_hdr, struct scmi_msg_hdr *hdr)
{ {
hdr->id = MSG_XTRACT_ID(msg_hdr); hdr->id = MSG_XTRACT_ID(msg_hdr);
hdr->protocol_id = MSG_XTRACT_PROT_ID(msg_hdr); hdr->protocol_id = MSG_XTRACT_PROT_ID(msg_hdr);
hdr->type = MSG_XTRACT_TYPE(msg_hdr);
} }
/** /**

1
drivers/firmware/arm_scmi/driver.c
View File

@@ -566,6 +566,7 @@ static int xfer_get_init(const struct scmi_protocol_handle *ph,
xfer->tx.len = tx_size; xfer->tx.len = tx_size;
xfer->rx.len = rx_size ? : info->desc->max_msg_size; xfer->rx.len = rx_size ? : info->desc->max_msg_size;
xfer->hdr.type = MSG_TYPE_COMMAND;
xfer->hdr.id = msg_id; xfer->hdr.id = msg_id;
xfer->hdr.poll_completion = false; xfer->hdr.poll_completion = false;