|
@@ -51,7 +51,7 @@ enum scmi_error_codes {
|
|
SCMI_ERR_MAX
|
|
SCMI_ERR_MAX
|
|
};
|
|
};
|
|
|
|
|
|
-/* List of all SCMI devices active in system */
|
|
|
|
|
|
+/* List of all SCMI devices active in system */
|
|
static LIST_HEAD(scmi_list);
|
|
static LIST_HEAD(scmi_list);
|
|
/* Protection for the entire list */
|
|
/* Protection for the entire list */
|
|
static DEFINE_MUTEX(scmi_list_mutex);
|
|
static DEFINE_MUTEX(scmi_list_mutex);
|
|
@@ -68,7 +68,6 @@ static DEFINE_MUTEX(scmi_list_mutex);
|
|
struct scmi_xfers_info {
|
|
struct scmi_xfers_info {
|
|
struct scmi_xfer *xfer_block;
|
|
struct scmi_xfer *xfer_block;
|
|
unsigned long *xfer_alloc_table;
|
|
unsigned long *xfer_alloc_table;
|
|
- /* protect transfer allocation */
|
|
|
|
spinlock_t xfer_lock;
|
|
spinlock_t xfer_lock;
|
|
};
|
|
};
|
|
|
|
|
|
@@ -94,6 +93,7 @@ struct scmi_desc {
|
|
* @payload: Transmit/Receive mailbox channel payload area
|
|
* @payload: Transmit/Receive mailbox channel payload area
|
|
* @dev: Reference to device in the SCMI hierarchy corresponding to this
|
|
* @dev: Reference to device in the SCMI hierarchy corresponding to this
|
|
* channel
|
|
* channel
|
|
|
|
+ * @handle: Pointer to SCMI entity handle
|
|
*/
|
|
*/
|
|
struct scmi_chan_info {
|
|
struct scmi_chan_info {
|
|
struct mbox_client cl;
|
|
struct mbox_client cl;
|
|
@@ -104,7 +104,7 @@ struct scmi_chan_info {
|
|
};
|
|
};
|
|
|
|
|
|
/**
|
|
/**
|
|
- * struct scmi_info - Structure representing a SCMI instance
|
|
|
|
|
|
+ * struct scmi_info - Structure representing a SCMI instance
|
|
*
|
|
*
|
|
* @dev: Device pointer
|
|
* @dev: Device pointer
|
|
* @desc: SoC description for this instance
|
|
* @desc: SoC description for this instance
|
|
@@ -113,9 +113,9 @@ struct scmi_chan_info {
|
|
* implementation version and (sub-)vendor identification.
|
|
* implementation version and (sub-)vendor identification.
|
|
* @minfo: Message info
|
|
* @minfo: Message info
|
|
* @tx_idr: IDR object to map protocol id to channel info pointer
|
|
* @tx_idr: IDR object to map protocol id to channel info pointer
|
|
- * @protocols_imp: list of protocols implemented, currently maximum of
|
|
|
|
|
|
+ * @protocols_imp: List of protocols implemented, currently maximum of
|
|
* MAX_PROTOCOLS_IMP elements allocated by the base protocol
|
|
* MAX_PROTOCOLS_IMP elements allocated by the base protocol
|
|
- * @node: list head
|
|
|
|
|
|
+ * @node: List head
|
|
* @users: Number of users of this instance
|
|
* @users: Number of users of this instance
|
|
*/
|
|
*/
|
|
struct scmi_info {
|
|
struct scmi_info {
|
|
@@ -221,9 +221,7 @@ static void scmi_rx_callback(struct mbox_client *cl, void *m)
|
|
|
|
|
|
xfer_id = MSG_XTRACT_TOKEN(ioread32(&mem->msg_header));
|
|
xfer_id = MSG_XTRACT_TOKEN(ioread32(&mem->msg_header));
|
|
|
|
|
|
- /*
|
|
|
|
- * Are we even expecting this?
|
|
|
|
- */
|
|
|
|
|
|
+ /* Are we even expecting this? */
|
|
if (!test_bit(xfer_id, minfo->xfer_alloc_table)) {
|
|
if (!test_bit(xfer_id, minfo->xfer_alloc_table)) {
|
|
dev_err(dev, "message for %d is not expected!\n", xfer_id);
|
|
dev_err(dev, "message for %d is not expected!\n", xfer_id);
|
|
return;
|
|
return;
|
|
@@ -248,6 +246,8 @@ static void scmi_rx_callback(struct mbox_client *cl, void *m)
|
|
*
|
|
*
|
|
* @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 and sequence id.
|
|
|
|
+ *
|
|
|
|
+ * Return: 32-bit packed command 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)
|
|
{
|
|
{
|
|
@@ -282,9 +282,9 @@ static void scmi_tx_prepare(struct mbox_client *cl, void *m)
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * scmi_one_xfer_get() - Allocate one message
|
|
|
|
|
|
+ * scmi_xfer_get() - Allocate one message
|
|
*
|
|
*
|
|
- * @handle: SCMI entity handle
|
|
|
|
|
|
+ * @handle: Pointer to SCMI entity handle
|
|
*
|
|
*
|
|
* Helper function which is used by various command functions that are
|
|
* Helper function which is used by various command functions that are
|
|
* exposed to clients of this driver for allocating a message traffic event.
|
|
* exposed to clients of this driver for allocating a message traffic event.
|
|
@@ -326,8 +326,8 @@ static struct scmi_xfer *scmi_one_xfer_get(const struct scmi_handle *handle)
|
|
/**
|
|
/**
|
|
* scmi_one_xfer_put() - Release a message
|
|
* scmi_one_xfer_put() - Release a message
|
|
*
|
|
*
|
|
- * @minfo: transfer info pointer
|
|
|
|
- * @xfer: message that was reserved by scmi_one_xfer_get
|
|
|
|
|
|
+ * @handle: Pointer to SCMI entity handle
|
|
|
|
+ * @xfer: message that was reserved by scmi_xfer_get
|
|
*
|
|
*
|
|
* This holds a spinlock to maintain integrity of internal data structures.
|
|
* This holds a spinlock to maintain integrity of internal data structures.
|
|
*/
|
|
*/
|
|
@@ -374,12 +374,12 @@ static bool scmi_xfer_done_no_timeout(const struct scmi_chan_info *cinfo,
|
|
/**
|
|
/**
|
|
* scmi_do_xfer() - Do one transfer
|
|
* scmi_do_xfer() - Do one transfer
|
|
*
|
|
*
|
|
- * @info: Pointer to SCMI entity information
|
|
|
|
|
|
+ * @handle: Pointer to SCMI entity handle
|
|
* @xfer: Transfer to initiate and wait for response
|
|
* @xfer: Transfer to initiate and wait for response
|
|
*
|
|
*
|
|
* Return: -ETIMEDOUT in case of no response, if transmit error,
|
|
* Return: -ETIMEDOUT in case of no response, if transmit error,
|
|
- * return corresponding error, else if all goes well,
|
|
|
|
- * return 0.
|
|
|
|
|
|
+ * return corresponding error, else if all goes well,
|
|
|
|
+ * return 0.
|
|
*/
|
|
*/
|
|
int scmi_do_xfer(const struct scmi_handle *handle, struct scmi_xfer *xfer)
|
|
int scmi_do_xfer(const struct scmi_handle *handle, struct scmi_xfer *xfer)
|
|
{
|
|
{
|
|
@@ -438,9 +438,9 @@ int scmi_do_xfer(const struct scmi_handle *handle, struct scmi_xfer *xfer)
|
|
/**
|
|
/**
|
|
* scmi_one_xfer_init() - Allocate and initialise one message
|
|
* scmi_one_xfer_init() - Allocate and initialise one message
|
|
*
|
|
*
|
|
- * @handle: SCMI entity handle
|
|
|
|
|
|
+ * @handle: Pointer to SCMI entity handle
|
|
* @msg_id: Message identifier
|
|
* @msg_id: Message identifier
|
|
- * @msg_prot_id: Protocol identifier for the message
|
|
|
|
|
|
+ * @prot_id: Protocol identifier for the message
|
|
* @tx_size: transmit message size
|
|
* @tx_size: transmit message size
|
|
* @rx_size: receive message size
|
|
* @rx_size: receive message size
|
|
* @p: pointer to the allocated and initialised message
|
|
* @p: pointer to the allocated and initialised message
|
|
@@ -478,13 +478,16 @@ int scmi_one_xfer_init(const struct scmi_handle *handle, u8 msg_id, u8 prot_id,
|
|
xfer->hdr.poll_completion = false;
|
|
xfer->hdr.poll_completion = false;
|
|
|
|
|
|
*p = xfer;
|
|
*p = xfer;
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* scmi_version_get() - command to get the revision of the SCMI entity
|
|
* scmi_version_get() - command to get the revision of the SCMI entity
|
|
*
|
|
*
|
|
- * @handle: Handle to SCMI entity information
|
|
|
|
|
|
+ * @handle: Pointer to SCMI entity handle
|
|
|
|
+ * @protocol: Protocol identifier for the message
|
|
|
|
+ * @version: Holds returned version of protocol.
|
|
*
|
|
*
|
|
* Updates the SCMI information in the internal data structure.
|
|
* Updates the SCMI information in the internal data structure.
|
|
*
|
|
*
|
|
@@ -541,7 +544,7 @@ scmi_is_protocol_implemented(const struct scmi_handle *handle, u8 prot_id)
|
|
* @dev: pointer to device for which we want SCMI handle
|
|
* @dev: pointer to device for which we want SCMI handle
|
|
*
|
|
*
|
|
* NOTE: The function does not track individual clients of the framework
|
|
* NOTE: The function does not track individual clients of the framework
|
|
- * and is expected to be maintained by caller of SCMI protocol library.
|
|
|
|
|
|
+ * and is expected to be maintained by caller of SCMI protocol library.
|
|
* scmi_handle_put must be balanced with successful scmi_handle_get
|
|
* scmi_handle_put must be balanced with successful scmi_handle_get
|
|
*
|
|
*
|
|
* Return: pointer to handle if successful, NULL on error
|
|
* Return: pointer to handle if successful, NULL on error
|
|
@@ -572,7 +575,7 @@ struct scmi_handle *scmi_handle_get(struct device *dev)
|
|
* @handle: handle acquired by scmi_handle_get
|
|
* @handle: handle acquired by scmi_handle_get
|
|
*
|
|
*
|
|
* NOTE: The function does not track individual clients of the framework
|
|
* NOTE: The function does not track individual clients of the framework
|
|
- * and is expected to be maintained by caller of SCMI protocol library.
|
|
|
|
|
|
+ * and is expected to be maintained by caller of SCMI protocol library.
|
|
* scmi_handle_put must be balanced with successful scmi_handle_get
|
|
* scmi_handle_put must be balanced with successful scmi_handle_get
|
|
*
|
|
*
|
|
* Return: 0 is successfully released
|
|
* Return: 0 is successfully released
|
|
@@ -595,7 +598,7 @@ int scmi_handle_put(const struct scmi_handle *handle)
|
|
}
|
|
}
|
|
|
|
|
|
static const struct scmi_desc scmi_generic_desc = {
|
|
static const struct scmi_desc scmi_generic_desc = {
|
|
- .max_rx_timeout_ms = 30, /* we may increase this if required */
|
|
|
|
|
|
+ .max_rx_timeout_ms = 30, /* We may increase this if required */
|
|
.max_msg = 20, /* Limited by MBOX_TX_QUEUE_LEN */
|
|
.max_msg = 20, /* Limited by MBOX_TX_QUEUE_LEN */
|
|
.max_msg_size = 128,
|
|
.max_msg_size = 128,
|
|
};
|
|
};
|