Commit 3e5def42 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_arm: Improve initial VCHIQ connect 



The code to start the keep-alive thread on initial VCHIQ connect
within vchiq_platform_conn_state_changed is unnecessary complex.
Move the keep-alive thread wake-up into a separate function and call it
during VCHIQ connect.

Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Link: https://lore.kernel.org/r/20250309125014.37166-6-wahrenst@gmx.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86bc8821

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+7 −21
Original line number Diff line number Diff line
@@ -97,13 +97,6 @@ struct vchiq_arm_state { 
	 * tracked separately with the state.

	 */

	int peer_use_count;



	/*

	 * Flag to indicate that the first vchiq connect has made it through.

	 * This means that both sides should be fully ready, and we should

	 * be able to suspend after this point.

	 */

	int first_connect;

};



static int
@@ -1336,26 +1329,19 @@ vchiq_check_service(struct vchiq_service *service) 
	return ret;

}



void vchiq_platform_connected(struct vchiq_state *state)

{

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	wake_up_process(arm_state->ka_thread);

}



void vchiq_platform_conn_state_changed(struct vchiq_state *state,

				       enum vchiq_connstate oldstate,

				       enum vchiq_connstate newstate)

{

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	dev_dbg(state->dev, "suspend: %d: %s->%s\n",

		state->id, get_conn_state_name(oldstate), get_conn_state_name(newstate));

	if (state->conn_state != VCHIQ_CONNSTATE_CONNECTED)

		return;



	write_lock_bh(&arm_state->susp_res_lock);

	if (arm_state->first_connect) {

		write_unlock_bh(&arm_state->susp_res_lock);

		return;

	}



	arm_state->first_connect = 1;

	write_unlock_bh(&arm_state->susp_res_lock);

	wake_up_process(arm_state->ka_thread);

}



static const struct of_device_id vchiq_of_match[] = {

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+1 −0
Original line number Diff line number Diff line
@@ -3343,6 +3343,7 @@ vchiq_connect_internal(struct vchiq_state *state, struct vchiq_instance *instanc 
			return -EAGAIN;



		vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED);

		vchiq_platform_connected(state);

		complete(&state->connect);

	}

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

+2 −0
Original line number Diff line number Diff line
@@ -575,6 +575,8 @@ int vchiq_send_remote_use(struct vchiq_state *state); 


int vchiq_send_remote_use_active(struct vchiq_state *state);



void vchiq_platform_connected(struct vchiq_state *state);



void vchiq_platform_conn_state_changed(struct vchiq_state *state,

				       enum vchiq_connstate oldstate,

				  enum vchiq_connstate newstate);