Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee43f745 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_arm: get rid of vchi_mh.h 



The concept of VCHI_MEM_HANDLE_T is introduced by this header file and
was meant to be used with bulk transfers. After a quick look in
vchiq_core.c it is pretty clear that it actually accomplishes nothing
nor alters the bulk transfers in any way.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46e4b9ec

drivers/staging/vc04_services/interface/vchi/vchi.h

+0 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


#include "interface/vchi/vchi_cfg.h"

#include "interface/vchi/vchi_common.h"

#include "vchi_mh.h"



/******************************************************************************

 Global defs
@@ -239,7 +238,6 @@ extern int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle, 


// Prepare interface for a transfer from the other side into relocatable memory.

int32_t vchi_bulk_queue_receive_reloc(const VCHI_SERVICE_HANDLE_T handle,

				      VCHI_MEM_HANDLE_T h_dst,

				      uint32_t offset,

				      uint32_t data_size,

				      const VCHI_FLAGS_T flags,
@@ -261,7 +259,6 @@ extern int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle, 
#endif



extern int32_t vchi_bulk_queue_transmit_reloc(VCHI_SERVICE_HANDLE_T handle,

					      VCHI_MEM_HANDLE_T h_src,

					      uint32_t offset,

					      uint32_t data_size,

					      VCHI_FLAGS_T flags,

drivers/staging/vc04_services/interface/vchi/vchi_mh.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) */

/**

 * Copyright (c) 2010-2012 Broadcom. All rights reserved.

 */



#ifndef VCHI_MH_H_

#define VCHI_MH_H_



#include <linux/types.h>



typedef s32 VCHI_MEM_HANDLE_T;

#define VCHI_MEM_HANDLE_INVALID 0



#endif

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

+1 −5
Original line number Diff line number Diff line
@@ -247,13 +247,10 @@ remote_event_signal(REMOTE_EVENT_T *event) 
}



VCHIQ_STATUS_T

vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, VCHI_MEM_HANDLE_T memhandle,

	void *offset, int size, int dir)

vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, void *offset, int size, int dir)

{

	struct vchiq_pagelist_info *pagelistinfo;



	WARN_ON(memhandle != VCHI_MEM_HANDLE_INVALID);



	pagelistinfo = create_pagelist((char __user *)offset, size,

				       (dir == VCHIQ_BULK_RECEIVE)

				       ? PAGELIST_READ
@@ -262,7 +259,6 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, VCHI_MEM_HANDLE_T memhandle, 
	if (!pagelistinfo)

		return VCHIQ_ERROR;



	bulk->handle = memhandle;

	bulk->data = (void *)(unsigned long)pagelistinfo->dma_addr;



	/*

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

+12 −15
Original line number Diff line number Diff line
@@ -419,9 +419,9 @@ vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data, 
	switch (mode) {

	case VCHIQ_BULK_MODE_NOCALLBACK:

	case VCHIQ_BULK_MODE_CALLBACK:

		status = vchiq_bulk_transfer(handle,

			VCHI_MEM_HANDLE_INVALID, (void *)data, size, userdata,

			mode, VCHIQ_BULK_TRANSMIT);

		status = vchiq_bulk_transfer(handle, (void *)data, size,

					     userdata, mode,

					     VCHIQ_BULK_TRANSMIT);

		break;

	case VCHIQ_BULK_MODE_BLOCKING:

		status = vchiq_blocking_bulk_transfer(handle,
@@ -444,8 +444,7 @@ vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data, 
	switch (mode) {

	case VCHIQ_BULK_MODE_NOCALLBACK:

	case VCHIQ_BULK_MODE_CALLBACK:

		status = vchiq_bulk_transfer(handle,

			VCHI_MEM_HANDLE_INVALID, data, size, userdata,

		status = vchiq_bulk_transfer(handle, data, size, userdata,

					     mode, VCHIQ_BULK_RECEIVE);

		break;

	case VCHIQ_BULK_MODE_BLOCKING:
@@ -513,9 +512,8 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data, 
		}

	}



	status = vchiq_bulk_transfer(handle, VCHI_MEM_HANDLE_INVALID,

		data, size, &waiter->bulk_waiter, VCHIQ_BULK_MODE_BLOCKING,

		dir);

	status = vchiq_bulk_transfer(handle, data, size, &waiter->bulk_waiter,

				     VCHIQ_BULK_MODE_BLOCKING, dir);

	if ((status != VCHIQ_RETRY) || fatal_signal_pending(current) ||

		!waiter->bulk_waiter.bulk) {

		VCHIQ_BULK_T *bulk = waiter->bulk_waiter.bulk;
@@ -1149,14 +1147,13 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
				current->pid);

			args.userdata = &waiter->bulk_waiter;

		}

		status = vchiq_bulk_transfer

			(args.handle,

			 VCHI_MEM_HANDLE_INVALID,

			 args.data, args.size,

			 args.userdata, args.mode,

			 dir);



		status = vchiq_bulk_transfer(args.handle, args.data, args.size,

					     args.userdata, args.mode, dir);



		if (!waiter)

			break;



		if ((status != VCHIQ_RETRY) || fatal_signal_pending(current) ||

			!waiter->bulk_waiter.bulk) {

			if (waiter->bulk_waiter.bulk) {

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

+7 −10
Original line number Diff line number Diff line
@@ -3313,10 +3313,10 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle) 
 * When called in blocking mode, the userdata field points to a bulk_waiter

 * structure.

 */

VCHIQ_STATUS_T

vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,

	VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata,

	VCHIQ_BULK_MODE_T mode, VCHIQ_BULK_DIR_T dir)

VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,

				   void *offset, int size, void *userdata,

				   VCHIQ_BULK_MODE_T mode,

				   VCHIQ_BULK_DIR_T dir)

{

	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);

	VCHIQ_BULK_QUEUE_T *queue;
@@ -3328,10 +3328,8 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, 
		VCHIQ_MSG_BULK_TX : VCHIQ_MSG_BULK_RX;

	VCHIQ_STATUS_T status = VCHIQ_ERROR;



	if (!service ||

		 (service->srvstate != VCHIQ_SRVSTATE_OPEN) ||

		 ((memhandle == VCHI_MEM_HANDLE_INVALID) && (offset == NULL)) ||

		 (vchiq_check_service(service) != VCHIQ_SUCCESS))

	if (!service || service->srvstate != VCHIQ_SRVSTATE_OPEN ||

	    !offset || vchiq_check_service(service) != VCHIQ_SUCCESS)

		goto error_exit;



	switch (mode) {
@@ -3388,8 +3386,7 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, 
	bulk->size = size;

	bulk->actual = VCHIQ_BULK_ACTUAL_ABORTED;



	if (vchiq_prepare_bulk_data(bulk, memhandle, offset, size, dir) !=

		VCHIQ_SUCCESS)

	if (vchiq_prepare_bulk_data(bulk, offset, size, dir) != VCHIQ_SUCCESS)

		goto unlock_error_exit;



	wmb();