Unverified Commit bcfb3359 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6502 [sync] PR-5772: firmware: arm_scmi: Check mailbox/SMT channel for consistency 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5772 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/F2MLLBGEH7CG3YY23UHSR3RMHZVXUP2E/ 
 
https://gitee.com/src-openeuler/kernel/issues/I98BNA 
 
Link:https://gitee.com/openeuler/kernel/pulls/6502

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3990327e 6bd4030a

drivers/firmware/arm_scmi/common.h

+1 −0
Original line number Diff line number Diff line
@@ -263,5 +263,6 @@ void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem, 
void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem);

bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,

		     struct scmi_xfer *xfer);

bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem);



#endif /* _SCMI_COMMON_H */

drivers/firmware/arm_scmi/mailbox.c

+14 −0
Original line number Diff line number Diff line
@@ -43,6 +43,20 @@ static void rx_callback(struct mbox_client *cl, void *m) 
{

	struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl);



	/*

	 * An A2P IRQ is NOT valid when received while the platform still has

	 * the ownership of the channel, because the platform at first releases

	 * the SMT channel and then sends the completion interrupt.

	 *

	 * This addresses a possible race condition in which a spurious IRQ from

	 * a previous timed-out reply which arrived late could be wrongly

	 * associated with the next pending transaction.

	 */

	if (cl->knows_txdone && !shmem_channel_free(smbox->shmem)) {

		dev_warn(smbox->cinfo->dev, "Ignoring spurious A2P IRQ !\n");

		return;

	}



	scmi_rx_callback(smbox->cinfo, shmem_read_header(smbox->shmem));

}

drivers/firmware/arm_scmi/shmem.c

+6 −0
Original line number Diff line number Diff line
@@ -96,3 +96,9 @@ bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem, 
		(SCMI_SHMEM_CHAN_STAT_CHANNEL_ERROR |

		 SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);

}



bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem)

{

	return (ioread32(&shmem->channel_status) &

			SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);

}