Skip to content

Commit 437a310

Browse files
cris-masudeep-holla
authored andcommitted
firmware: arm_scmi: Check mailbox/SMT channel for consistency
On reception of a completion interrupt the shared memory area is accessed to retrieve the message header at first and then, if the message sequence number identifies a transaction which is still pending, the related payload is fetched too. When an SCMI command times out the channel ownership remains with the platform until eventually a late reply is received and, as a consequence, any further transmission attempt remains pending, waiting for the channel to be relinquished by the platform. Once that late reply is received the channel ownership is given back to the agent and any pending request is then allowed to proceed and overwrite the SMT area of the just delivered late reply; then the wait for the reply to the new request starts. It has been observed that the spurious IRQ related to the late reply can be wrongly associated with the freshly enqueued request: when that happens the SCMI stack in-flight lookup procedure is fooled by the fact that the message header now present in the SMT area is related to the new pending transaction, even though the real reply has still to arrive. This race-condition on the A2P channel can be detected by looking at the channel status bits: a genuine reply from the platform will have set the channel free bit before triggering the completion IRQ. Add a consistency check to validate such condition in the A2P ISR. Reported-by: Xinglong Yang <[email protected]> Closes: https://lore.kernel.org/all/PUZPR06MB54981E6FA00D82BFDBB864FBF08DA@PUZPR06MB5498.apcprd06.prod.outlook.com/ Fixes: 5c8a47a ("firmware: arm_scmi: Make scmi core independent of the transport type") Cc: [email protected] # 5.15+ Signed-off-by: Cristian Marussi <[email protected]> Tested-by: Xinglong Yang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sudeep Holla <[email protected]>
1 parent 6613476 commit 437a310

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

drivers/firmware/arm_scmi/common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem,
314314
void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem);
315315
bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
316316
struct scmi_xfer *xfer);
317+
bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem);
317318

318319
/* declarations for message passing transports */
319320
struct scmi_msg_payld;

drivers/firmware/arm_scmi/mailbox.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,20 @@ static void rx_callback(struct mbox_client *cl, void *m)
4545
{
4646
struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl);
4747

48+
/*
49+
* An A2P IRQ is NOT valid when received while the platform still has
50+
* the ownership of the channel, because the platform at first releases
51+
* the SMT channel and then sends the completion interrupt.
52+
*
53+
* This addresses a possible race condition in which a spurious IRQ from
54+
* a previous timed-out reply which arrived late could be wrongly
55+
* associated with the next pending transaction.
56+
*/
57+
if (cl->knows_txdone && !shmem_channel_free(smbox->shmem)) {
58+
dev_warn(smbox->cinfo->dev, "Ignoring spurious A2P IRQ !\n");
59+
return;
60+
}
61+
4862
scmi_rx_callback(smbox->cinfo, shmem_read_header(smbox->shmem), NULL);
4963
}
5064

drivers/firmware/arm_scmi/shmem.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,9 @@ bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
122122
(SCMI_SHMEM_CHAN_STAT_CHANNEL_ERROR |
123123
SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);
124124
}
125+
126+
bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem)
127+
{
128+
return (ioread32(&shmem->channel_status) &
129+
SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);
130+
}

0 commit comments

Comments
 (0)