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

!15111 net: wwan: t7xx: Fix FSM command timeout issue 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PJ2GNT7F4CCONZEABZQRWHQGXSEEKKH5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBID39 
 
Link:https://gitee.com/openeuler/kernel/pulls/15111

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e81c5b39 1fbde9e4

drivers/net/wwan/t7xx/t7xx_state_monitor.c

+17 −9
Original line number Diff line number Diff line
@@ -97,14 +97,21 @@ void t7xx_fsm_broadcast_state(struct t7xx_fsm_ctl *ctl, enum md_state state) 
	fsm_state_notify(ctl->md, state);

}



static void fsm_release_command(struct kref *ref)

{

	struct t7xx_fsm_command *cmd = container_of(ref, typeof(*cmd), refcnt);



	kfree(cmd);

}



static void fsm_finish_command(struct t7xx_fsm_ctl *ctl, struct t7xx_fsm_command *cmd, int result)

{

	if (cmd->flag & FSM_CMD_FLAG_WAIT_FOR_COMPLETION) {

		*cmd->ret = result;

		complete_all(cmd->done);

		cmd->result = result;

		complete_all(&cmd->done);

	}



	kfree(cmd);

	kref_put(&cmd->refcnt, fsm_release_command);

}



static void fsm_del_kf_event(struct t7xx_fsm_event *event)
@@ -396,7 +403,6 @@ static int fsm_main_thread(void *data) 


int t7xx_fsm_append_cmd(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_cmd_state cmd_id, unsigned int flag)

{

	DECLARE_COMPLETION_ONSTACK(done);

	struct t7xx_fsm_command *cmd;

	unsigned long flags;

	int ret;
@@ -408,11 +414,13 @@ int t7xx_fsm_append_cmd(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_cmd_state cmd_id 
	INIT_LIST_HEAD(&cmd->entry);

	cmd->cmd_id = cmd_id;

	cmd->flag = flag;

	kref_init(&cmd->refcnt);

	if (flag & FSM_CMD_FLAG_WAIT_FOR_COMPLETION) {

		cmd->done = &done;

		cmd->ret = &ret;

		init_completion(&cmd->done);

		kref_get(&cmd->refcnt);

	}



	kref_get(&cmd->refcnt);

	spin_lock_irqsave(&ctl->command_lock, flags);

	list_add_tail(&cmd->entry, &ctl->command_queue);

	spin_unlock_irqrestore(&ctl->command_lock, flags);
@@ -422,11 +430,11 @@ int t7xx_fsm_append_cmd(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_cmd_state cmd_id 
	if (flag & FSM_CMD_FLAG_WAIT_FOR_COMPLETION) {

		unsigned long wait_ret;



		wait_ret = wait_for_completion_timeout(&done,

		wait_ret = wait_for_completion_timeout(&cmd->done,

						       msecs_to_jiffies(FSM_CMD_TIMEOUT_MS));

		if (!wait_ret)

			return -ETIMEDOUT;



		ret = wait_ret ? cmd->result : -ETIMEDOUT;

		kref_put(&cmd->refcnt, fsm_release_command);

		return ret;

	}

drivers/net/wwan/t7xx/t7xx_state_monitor.h

+3 −2
Original line number Diff line number Diff line
@@ -109,8 +109,9 @@ struct t7xx_fsm_command { 
	struct list_head	entry;

	enum t7xx_fsm_cmd_state	cmd_id;

	unsigned int		flag;

	struct completion	*done;

	int			*ret;

	struct completion	done;

	int			result;

	struct kref		refcnt;

};



struct t7xx_fsm_notifier {