andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1772 from glneo/clear-proxy-queue 

TI K3 Clear proxy receive queue on transmit
This commit is contained in:
Antonio Niño Díaz 2019-01-22 15:03:01 +00:00 committed by GitHub
parent 94764b06fa 73522f0087
commit a0d894397d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c
View File

@ -162,6 +162,44 @@ static inline int k3_sec_proxy_verify_thread(struct k3_sec_proxy_thread *spt,
return 0;
}
/**
* k3_sec_proxy_clear_rx_thread() - Clear Secure Proxy thread
*
* @id: Channel Identifier
*
* Return: 0 if all goes well, else appropriate error message
*/
int k3_sec_proxy_clear_rx_thread(enum k3_sec_proxy_chan_id id)
{
struct k3_sec_proxy_thread *spt = &spm.threads[id];
/* Check for any errors already available */
if (mmio_read_32(spt->rt + RT_THREAD_STATUS) &
RT_THREAD_STATUS_ERROR_MASK) {
ERROR("Thread %d is corrupted, cannot send data\n", spt->id);
return -EINVAL;
}
/* Make sure thread is configured for right direction */
if (!(mmio_read_32(spt->scfg + SCFG_THREAD_CTRL) & SCFG_THREAD_CTRL_DIR_MASK)) {
ERROR("Cannot clear a transmit thread %d\n", spt->id);
return -EINVAL;
}
/* Read off messages from thread until empty */
uint32_t try_count = 10;
while (mmio_read_32(spt->rt + RT_THREAD_STATUS) & RT_THREAD_STATUS_CUR_CNT_MASK) {
if (!(try_count--)) {
ERROR("Could not clear all messages from thread %d\n", spt->id);
return -ETIMEDOUT;
}
WARN("Clearing message from thread %d\n", spt->id);
mmio_read_32(spt->data + spm.desc.data_end_offset);
}
return 0;
}
/**
* k3_sec_proxy_send() - Send data over a Secure Proxy thread
* @id: Channel Identifier

9
plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h
View File

@ -37,6 +37,15 @@ struct k3_sec_proxy_msg {
uint8_t *buf;
};
/**
* k3_sec_proxy_send() - Send data over a Secure Proxy thread
* @id: Channel Identifier
* @msg: Pointer to k3_sec_proxy_msg
*
* Return: 0 if all goes well, else appropriate error message
*/
int k3_sec_proxy_clear_rx_thread(enum k3_sec_proxy_chan_id id);
/**
* k3_sec_proxy_send() - Send data over a Secure Proxy thread
* @id: Channel Identifier

8
plat/ti/k3/common/drivers/ti_sci/ti_sci.c
View File

@ -158,6 +158,13 @@ static inline int ti_sci_do_xfer(struct ti_sci_xfer *xfer)
struct k3_sec_proxy_msg *msg = &xfer->tx_message;
int ret;
/* Clear any spurious messages in receive queue */
ret = k3_sec_proxy_clear_rx_thread(SP_RESPONSE);
if (ret) {
ERROR("Could not clear response queue (%d)\n", ret);
return ret;
}
/* Send the message */
ret = k3_sec_proxy_send(SP_HIGH_PRIORITY, msg);
if (ret) {
@ -165,6 +172,7 @@ static inline int ti_sci_do_xfer(struct ti_sci_xfer *xfer)
return ret;
}
/* Get the response */
ret = ti_sci_get_response(xfer, SP_RESPONSE);
if (ret) {
ERROR("Failed to get response (%d)\n", ret);