Commit 4c512104 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_core: introduce parse_message 



The function parse_rx_slots is very longer. So move at least the message
parsing into a separate function to improve readability. In good case
the function returns the message payload length which is necessary to
move to the next message.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1621105859-30215-19-git-send-email-stefan.wahren@i2se.com


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

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

+313 −292
Original line number Diff line number Diff line
@@ -1545,46 +1545,26 @@ parse_open(struct vchiq_state *state, struct vchiq_header *header) 
	return 0;

}



/* Called by the slot handler thread */

static void

parse_rx_slots(struct vchiq_state *state)

/**

 * parse_message() - parses a single message from the rx slot

 * @state:  vchiq state struct

 * @header: message header

 *

 * Context: Process context

 *

 * Return:

 * * >= 0     - size of the parsed message payload (without header)

 * * -EINVAL  - fatal error occurred, bail out is required

 */

static int

parse_message(struct vchiq_state *state, struct vchiq_header *header)

{

	struct vchiq_shared_state *remote = state->remote;

	struct vchiq_service *service = NULL;

	int tx_pos;



	DEBUG_INITIALISE(state->local)



	tx_pos = remote->tx_pos;



	while (state->rx_pos != tx_pos) {

		struct vchiq_header *header;

		int msgid, size;

		int type;

	unsigned int localport, remoteport;

	int msgid, size, type, ret = -EINVAL;



		DEBUG_TRACE(PARSE_LINE);

		if (!state->rx_data) {

			int rx_index;



			WARN_ON(!((state->rx_pos & VCHIQ_SLOT_MASK) == 0));

			rx_index = remote->slot_queue[

				SLOT_QUEUE_INDEX_FROM_POS_MASKED(state->rx_pos)];

			state->rx_data = (char *)SLOT_DATA_FROM_INDEX(state,

				rx_index);

			state->rx_info = SLOT_INFO_FROM_INDEX(state, rx_index);



			/*

			 * Initialise use_count to one, and increment

			 * release_count at the end of the slot to avoid

			 * releasing the slot prematurely.

			 */

			state->rx_info->use_count = 1;

			state->rx_info->release_count = 0;

		}

	DEBUG_INITIALISE(state->local)



		header = (struct vchiq_header *)(state->rx_data +

			(state->rx_pos & VCHIQ_SLOT_MASK));

	DEBUG_VALUE(PARSE_HEADER, (int)(long)header);

	msgid = header->msgid;

	DEBUG_VALUE(PARSE_MSGID, msgid);
@@ -1869,11 +1849,56 @@ parse_rx_slots(struct vchiq_state *state) 
	}



skip_message:

		if (service) {

	ret = size;



bail_not_ready:

	if (service)

		unlock_service(service);

			service = NULL;



	return ret;

}



/* Called by the slot handler thread */

static void

parse_rx_slots(struct vchiq_state *state)

{

	struct vchiq_shared_state *remote = state->remote;

	int tx_pos;



	DEBUG_INITIALISE(state->local)



	tx_pos = remote->tx_pos;



	while (state->rx_pos != tx_pos) {

		struct vchiq_header *header;

		int size;



		DEBUG_TRACE(PARSE_LINE);

		if (!state->rx_data) {

			int rx_index;



			WARN_ON(!((state->rx_pos & VCHIQ_SLOT_MASK) == 0));

			rx_index = remote->slot_queue[

				SLOT_QUEUE_INDEX_FROM_POS_MASKED(state->rx_pos)];

			state->rx_data = (char *)SLOT_DATA_FROM_INDEX(state,

				rx_index);

			state->rx_info = SLOT_INFO_FROM_INDEX(state, rx_index);



			/*

			 * Initialise use_count to one, and increment

			 * release_count at the end of the slot to avoid

			 * releasing the slot prematurely.

			 */

			state->rx_info->use_count = 1;

			state->rx_info->release_count = 0;

		}



		header = (struct vchiq_header *)(state->rx_data +

			(state->rx_pos & VCHIQ_SLOT_MASK));

		size = parse_message(state, header);

		if (size < 0)

			return;



		state->rx_pos += calc_stride(size);



		DEBUG_TRACE(PARSE_LINE);
@@ -1887,10 +1912,6 @@ parse_rx_slots(struct vchiq_state *state) 
			state->rx_data = NULL;

		}

	}



bail_not_ready:

	if (service)

		unlock_service(service);

}



/* Called by the slot handler thread */