Move to version 5 of VCHIQ. Note: this requires a corresponding start…

….elf and /opt/vc/lib update
raspberrypi · lars90er · Jul 4, 2012 · Jul 5, 2012 · Jul 5, 2012 · Jul 5, 2012
commit eb0c5608f3fd94fa316135e71edfb2d359b73203
diff --git a/drivers/misc/vc04_services/Kconfig b/drivers/misc/vc04_services/Kconfig
@@ -1,7 +1,10 @@
 config BCM2708_VCHIQ
 	tristate "Videocore VCHIQ"
 	depends on MACH_BCM2708
-        default y
-        help
-          Helper for communication for VideoCore.
+	default CONFIG_BCM_VC_SERVICES
+	help
+		Kernel to VideoCore communication interface for the
+		BCM2708 family of products.
+		Defaults to Y when the Broadcom Videocore services
+		are included in the build, N otherwise.
 
diff --git a/drivers/misc/vc04_services/Makefile b/drivers/misc/vc04_services/Makefile
@@ -1,21 +1,101 @@
+ifeq ($(CONFIG_MACH_BCM2708),y)
+
+##############################################################################
+#
+# This section is for building the RaspberryPi model
+#
+##############################################################################
+
 obj-$(CONFIG_BCM2708_VCHIQ)	+= vchiq.o
 
 vchiq-objs := \
    interface/vchiq_arm/vchiq_core.o  \
-   interface/vchiq_arm/vchiq_shim.o  \
-   interface/vchiq_arm/vchiq_util.o  \
    interface/vchiq_arm/vchiq_arm.o \
    interface/vchiq_arm/vchiq_kern_lib.o \
    interface/vchiq_arm/vchiq_2835_arm.o \
-   interface/vcos/linuxkernel/vcos_linuxkernel.o \
-   interface/vcos/linuxkernel/vcos_thread_map.o \
-   interface/vcos/linuxkernel/vcos_linuxkernel_cfg.o \
-   interface/vcos/generic/vcos_generic_event_flags.o \
-   interface/vcos/generic/vcos_logcat.o \
-   interface/vcos/generic/vcos_mem_from_malloc.o \
-   interface/vcos/generic/vcos_cmd.o
+   interface/vchiq_arm/vchiq_proc.o \
+   interface/vchiq_arm/vchiq_shim.o \
+   interface/vchiq_arm/vchiq_util.o \
+   interface/vchiq_arm/vchiq_connected.o \
+
+EXTRA_CFLAGS += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000
+
+endif
+
+ifeq ($(CONFIG_ARCH_KONA),y)
+
+##############################################################################
+#
+# This section is for building the Capri/Island model
+#
+##############################################################################
+
+# Remove the quotes from the platform config name
+VCHIQ_PLATFORM_CONFIG = $(patsubst "%",%,$(CONFIG_VCHIQ_PLATFORM_CFG_NAME))
+
+$(info VCHIQ_PLATFORM_CONFIG = $(VCHIQ_PLATFORM_CONFIG))
+include $(srctree)/drivers/misc/vc04_services/interface/vchiq_arm/platform-cfg/$(VCHIQ_PLATFORM_CONFIG).mk
+
+$(info Building for MAP build system)
+$(info CONFIG_ARCH_KONA    = $(CONFIG_ARCH_KONA))
+
+EXTRA_CFLAGS  += -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -Wno-declaration-after-statement -Wno-parentheses
+
+EXTRA_CFLAGS  += -I"drivers/misc/vc04_services/"
+EXTRA_CFLAGS  += -I"drivers/misc/vc04_services/interface/vchiq_arm"
+EXTRA_CFLAGS  += -I"drivers/misc/vc04_services/interface/debug_sym"
+EXTRA_CFLAGS  += -I"include/linux/broadcom"
+
+EXTRA_CFLAGS  += -Werror
+
+VCHIQ_HOST_BUS_ALIGNMENT = 3
+
+EXTRA_CFLAGS  += -DOS_ASSERT_FAILURE
+EXTRA_CFLAGS  += -D__STDC_VERSION=199901L
+EXTRA_CFLAGS  += -D__STDC_VERSION__=199901L
+EXTRA_CFLAGS  += -D__VCCOREVER__=0
+EXTRA_CFLAGS  += -D__linux__
+EXTRA_CFLAGS  += -D__KERNEL__
+EXTRA_CFLAGS  += -DVCHIQ_HOST_BUS_ALIGNMENT=$(VCHIQ_HOST_BUS_ALIGNMENT)
+EXTRA_CFLAGS  += -DVCHIQ_SLOT_PADDING=16
+EXTRA_CFLAGS  += -DVCHIQ_ARM_SIDE
+EXTRA_CFLAGS  += -DUSE_VCHIQ_ARM
+ifeq ($(VCHIQ_SM_ALLOC),vcddr)
+EXTRA_CFLAGS  += -DVCHIQ_SM_ALLOC_VCDDR
+endif
+
+obj-$(CONFIG_KONA_VCHIQ) += vc-vchiq.o
+vc-vchiq-objs := \
+    interface/vchiq_arm/vchiq_arm.o \
+    interface/vchiq_arm/vchiq_connected.o \
+    interface/vchiq_arm/vchiq_core.o \
+    interface/vchiq_arm/vchiq_kern_lib.o \
+    interface/vchiq_arm/vchiq_shim.o \
+    interface/vchiq_arm/vchiq_util.o \
+    interface/vchiq_arm/vchiq_kona_arm.o \
+    interface/vchiq_arm/vchiq_$(VCHIQ_PLATFORM)_arm.o \
+    interface/vchiq_arm/vchiq_version.o \
+    interface/vchiq_arm/vchiq_proc.o
+ifeq ($(VCHIQ_SM_ALLOC),vcddr)
+vc-vchiq-objs += \
+    interface/debug_sym/debug_sym.o
+endif
+
+obj-$(CONFIG_KONA_VCHIQ_MEMDRV) += vc-vchiq-memdrv-kona.o
+vc-vchiq-memdrv-kona-objs := \
+    interface/vchiq_arm/vchiq_memdrv_kona.o
+
+genversion = drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
 
-EXTRA_CFLAGS += -DVCOS_VERIFY_BKPTS=1 -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel
+GENVERSION_SRC_ROOT_DIR = .
+ifeq ($(CONFIG_ANDROID),y)
+GENVERSION_SRC_ROOT_DIR = $(srctree)
+endif
 
+$(obj)/interface/vchiq_arm/vchiq_version.c: $(genversion) FORCE
+	echo "(new) Generating $@ ..."
+	perl $(srctree)/$(genversion) vchiq $(GENVERSION_SRC_ROOT_DIR) > $@
 
+clean-files := vchiq_version.c
 
+endif
diff --git a/drivers/misc/vc04_services/interface/vchi/connections/connection.h b/drivers/misc/vc04_services/interface/vchi/connections/connection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,10 @@
 #ifndef CONNECTION_H_
 #define CONNECTION_H_
 
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/semaphore.h>
+
 #include "interface/vchi/vchi_cfg_internal.h"
 #include "interface/vchi/vchi_common.h"
 #include "interface/vchi/message_drivers/message.h"
@@ -50,15 +54,15 @@ typedef int32_t (*VCHI_CONNECTION_CRC_CONTROL_T)( VCHI_CONNECTION_STATE_T *state
 
 // Routine to create a service
 typedef int32_t (*VCHI_CONNECTION_SERVICE_CONNECT_T)( VCHI_CONNECTION_STATE_T *state_handle,
-                                                      vcos_fourcc_t service_id,
+                                                      int32_t service_id,
                                                       uint32_t rx_fifo_size,
                                                       uint32_t tx_fifo_size,
                                                       int server,
                                                       VCHI_CALLBACK_T callback,
                                                       void *callback_param,
-                                                      vcos_bool_t want_crc,
-                                                      vcos_bool_t want_unaligned_bulk_rx,
-                                                      vcos_bool_t want_unaligned_bulk_tx,
+                                                      int32_t want_crc,
+                                                      int32_t want_unaligned_bulk_rx,
+                                                      int32_t want_unaligned_bulk_tx,
                                                       VCHI_CONNECTION_SERVICE_HANDLE_T *service_handle );
 
 // Routine to close a service
@@ -116,7 +120,7 @@ typedef int32_t (*VCHI_CONNECTION_HELD_MSG_INFO_T)( VCHI_CONNECTION_SERVICE_HAND
                                                     uint32_t *rx_timestamp );
 
 // Routine to check whether the iterator has a next message
-typedef vcos_bool_t (*VCHI_CONNECTION_MSG_ITER_HAS_NEXT_T)( VCHI_CONNECTION_SERVICE_HANDLE_T service,
+typedef int32_t (*VCHI_CONNECTION_MSG_ITER_HAS_NEXT_T)( VCHI_CONNECTION_SERVICE_HANDLE_T service,
                                                        const VCHI_MSG_ITER_T *iter );
 
 // Routine to advance the iterator
@@ -149,7 +153,7 @@ typedef int32_t (*VCHI_CONNECTION_BULK_QUEUE_RECEIVE_T)( VCHI_CONNECTION_SERVICE
                                                          void *bulk_handle );
 
 // Routine to report if a server is available
-typedef int32_t (*VCHI_CONNECTION_SERVER_PRESENT)( VCHI_CONNECTION_STATE_T *state, vcos_fourcc_t service_id, int32_t peer_flags );
+typedef int32_t (*VCHI_CONNECTION_SERVER_PRESENT)( VCHI_CONNECTION_STATE_T *state, int32_t service_id, int32_t peer_flags );
 
 // Routine to report the number of RX slots available
 typedef int (*VCHI_CONNECTION_RX_SLOTS_AVAILABLE)( const VCHI_CONNECTION_STATE_T *state );
@@ -159,18 +163,18 @@ typedef uint32_t (*VCHI_CONNECTION_RX_SLOT_SIZE)( const VCHI_CONNECTION_STATE_T
 
 // Callback to indicate that the other side has added a buffer to the rx bulk DMA FIFO
 typedef void (*VCHI_CONNECTION_RX_BULK_BUFFER_ADDED)(VCHI_CONNECTION_STATE_T *state,
-                                                     vcos_fourcc_t service,
+                                                     int32_t service,
                                                      uint32_t length,
                                                      MESSAGE_TX_CHANNEL_T channel,
                                                      uint32_t channel_params,
                                                      uint32_t data_length,
                                                      uint32_t data_offset);
 
 // Callback to inform a service that a Xon or Xoff message has been received
-typedef void (*VCHI_CONNECTION_FLOW_CONTROL)(VCHI_CONNECTION_STATE_T *state, vcos_fourcc_t service_id, int32_t xoff);
+typedef void (*VCHI_CONNECTION_FLOW_CONTROL)(VCHI_CONNECTION_STATE_T *state, int32_t service_id, int32_t xoff);
 
 // Callback to inform a service that a server available reply message has been received
-typedef void (*VCHI_CONNECTION_SERVER_AVAILABLE_REPLY)(VCHI_CONNECTION_STATE_T *state, vcos_fourcc_t service_id, uint32_t flags);
+typedef void (*VCHI_CONNECTION_SERVER_AVAILABLE_REPLY)(VCHI_CONNECTION_STATE_T *state, int32_t service_id, uint32_t flags);
 
 // Callback to indicate that bulk auxiliary messages have arrived
 typedef void (*VCHI_CONNECTION_BULK_AUX_RECEIVED)(VCHI_CONNECTION_STATE_T *state);
@@ -185,7 +189,7 @@ typedef void (*VCHI_CONNECTION_INFO)(VCHI_CONNECTION_STATE_T *state, uint32_t pr
 typedef void (*VCHI_CONNECTION_DISCONNECT)(VCHI_CONNECTION_STATE_T *state, uint32_t flags);
 
 // Callback to inform of a power control request
-typedef void (*VCHI_CONNECTION_POWER_CONTROL)(VCHI_CONNECTION_STATE_T *state, MESSAGE_TX_CHANNEL_T channel, vcos_bool_t enable);
+typedef void (*VCHI_CONNECTION_POWER_CONTROL)(VCHI_CONNECTION_STATE_T *state, MESSAGE_TX_CHANNEL_T channel, int32_t enable);
 
 // allocate memory suitably aligned for this connection
 typedef void * (*VCHI_BUFFER_ALLOCATE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_handle, uint32_t * length);
@@ -299,7 +303,7 @@ struct vchi_connection_t {
    const VCHI_CONNECTION_API_T *api;
    VCHI_CONNECTION_STATE_T     *state;
 #ifdef VCHI_COARSE_LOCKING
-   VCOS_SEMAPHORE_T             sem;
+   struct semaphore             sem;
 #endif
 };
 

diff --git a/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h b/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,11 @@
 #ifndef _VCHI_MESSAGE_H_
 #define _VCHI_MESSAGE_H_
 
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/semaphore.h>
+
 #include "interface/vchi/vchi_cfg_internal.h"
-#include "interface/vcos/vcos.h"
 #include "interface/vchi/vchi_common.h"
 
 
@@ -63,7 +66,7 @@ typedef struct rx_msg_slot_info {
    struct rx_msg_slot_info *next;
    //struct slot_info *prev;
 #if !defined VCHI_COARSE_LOCKING
-   VCOS_SEMAPHORE_T   sem;
+   struct semaphore   sem;
 #endif
 
    uint8_t           *addr;               // base address of slot
@@ -84,7 +87,7 @@ typedef struct rx_msg_slot_info {
 typedef struct rx_bulk_slotinfo_t {
    struct rx_bulk_slotinfo_t *next;
 
-   VCOS_SEMAPHORE_T *blocking;
+   struct semaphore *blocking;
 
    // needed by DMA
    void        *addr;
@@ -127,7 +130,7 @@ typedef struct {
       uint16_t slot_delta;     // whether this message indicated slot delta
       uint32_t len;            // length of message
       RX_MSG_SLOTINFO_T *slot; // slot this message is in
-      vcos_fourcc_t service;   // service id this message is destined for
+      int32_t  service;   // service id this message is destined for
       uint32_t tx_timestamp;   // timestamp from the header
       uint32_t rx_timestamp;   // timestamp when we parsed it
    } message;
@@ -156,14 +159,14 @@ struct opaque_vchi_message_driver_t {
    VCHI_MDRIVER_HANDLE_T *(*open)( VCHI_MESSAGE_DRIVER_OPEN_T *params, void *state );
    int32_t (*suspending)( VCHI_MDRIVER_HANDLE_T *handle );
    int32_t (*resumed)( VCHI_MDRIVER_HANDLE_T *handle );
-   int32_t (*power_control)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T, vcos_bool_t enable );
+   int32_t (*power_control)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T, int32_t enable );
    int32_t (*add_msg_rx_slot)( VCHI_MDRIVER_HANDLE_T *handle, RX_MSG_SLOTINFO_T *slot );      // rx message
    int32_t (*add_bulk_rx)( VCHI_MDRIVER_HANDLE_T *handle, void *data, uint32_t len, RX_BULK_SLOTINFO_T *slot );  // rx data (bulk)
    int32_t (*send)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel, const void *data, uint32_t len, VCHI_MSG_FLAGS_T flags, void *send_handle );      // tx (message & bulk)
    void    (*next_event)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_EVENT_T *event );     // get the next event from message_driver
    int32_t (*enable)( VCHI_MDRIVER_HANDLE_T *handle );
-   int32_t (*form_message)( VCHI_MDRIVER_HANDLE_T *handle, vcos_fourcc_t service_id, VCHI_MSG_VECTOR_T *vector, uint32_t count, void
-                            *address, uint32_t length_avail, uint32_t max_total_length, vcos_bool_t pad_to_fill, vcos_bool_t allow_partial );
+   int32_t (*form_message)( VCHI_MDRIVER_HANDLE_T *handle, int32_t service_id, VCHI_MSG_VECTOR_T *vector, uint32_t count, void
+                            *address, uint32_t length_avail, uint32_t max_total_length, int32_t pad_to_fill, int32_t allow_partial );
 
    int32_t (*update_message)( VCHI_MDRIVER_HANDLE_T *handle, void *dest, int16_t *slot_count );
    int32_t (*buffer_aligned)( VCHI_MDRIVER_HANDLE_T *handle, int tx, int uncached, const void *address, const uint32_t length );
@@ -172,7 +175,7 @@ struct opaque_vchi_message_driver_t {
    int     (*rx_slot_size)( VCHI_MDRIVER_HANDLE_T *handle, int msg_size );
    int     (*tx_slot_size)( VCHI_MDRIVER_HANDLE_T *handle, int msg_size );
 
-   vcos_bool_t  (*tx_supports_terminate)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
+   int32_t  (*tx_supports_terminate)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
    uint32_t (*tx_bulk_chunk_size)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
    int     (*tx_alignment)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
    int     (*rx_alignment)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_RX_CHANNEL_T channel );

diff --git a/drivers/misc/vc04_services/interface/vchi/vchi.h b/drivers/misc/vc04_services/interface/vchi/vchi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,14 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/*=============================================================================
-Contains the protypes for the vchi functions.
-=============================================================================*/
-
 #ifndef VCHI_H_
 #define VCHI_H_
 
-#include "interface/vcos/vcos.h"
 #include "interface/vchi/vchi_cfg.h"
 #include "interface/vchi/vchi_common.h"
 #include "interface/vchi/connections/connection.h"
@@ -44,6 +39,12 @@ Contains the protypes for the vchi functions.
 #define VCHI_BULK_ALIGNED(x)      (((unsigned long)(x) & (VCHI_BULK_ALIGN-1)) == 0)
 #endif
 
+struct vchi_version {
+	uint32_t version;
+	uint32_t version_min;
+};
+#define VCHI_VERSION(v_) { v_, v_ }
+#define VCHI_VERSION_EX(v_, m_) { v_, m_ }
 
 typedef enum
 {
@@ -88,8 +89,8 @@ typedef struct vchi_msg_vector_ex {
 // Construct an entry in a msg vector for a message handle (h), starting at offset (o) of length (l)
 #define VCHI_VEC_HANDLE(h,o,l) VCHI_VEC_HANDLE,  { { (h), (o), (l) } }
 
-// Macros to manipulate fourcc_t values
-#define MAKE_FOURCC(x) ((fourcc_t)( (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3] ))
+// Macros to manipulate 'FOURCC' values
+#define MAKE_FOURCC(x) ((int32_t)( (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3] ))
 #define FOURCC_TO_CHAR(x) (x >> 24) & 0xFF,(x >> 16) & 0xFF,(x >> 8) & 0xFF, x & 0xFF
 
 
@@ -108,15 +109,22 @@ typedef struct
 
 // structure used to provide the information needed to open a server or a client
 typedef struct {
-   vcos_fourcc_t service_id;
-   VCHI_CONNECTION_T *connection;
-   uint32_t rx_fifo_size;
-   uint32_t tx_fifo_size;
-   VCHI_CALLBACK_T callback;
-   void *callback_param;
-   vcos_bool_t want_unaligned_bulk_rx;    // client intends to receive bulk transfers of odd lengths or into unaligned buffers
-   vcos_bool_t want_unaligned_bulk_tx;    // client intends to transmit bulk transfers of odd lengths or out of unaligned buffers
-   vcos_bool_t want_crc;                  // client wants to check CRCs on (bulk) transfers. Only needs to be set at 1 end - will do both directions.
+	struct vchi_version version;
+	int32_t service_id;
+	VCHI_CONNECTION_T *connection;
+	uint32_t rx_fifo_size;
+	uint32_t tx_fifo_size;
+	VCHI_CALLBACK_T callback;
+	void *callback_param;
+	/* client intends to receive bulk transfers of
+		odd lengths or into unaligned buffers */
+	int32_t want_unaligned_bulk_rx;
+	/* client intends to transmit bulk transfers of
+		odd lengths or out of unaligned buffers */
+	int32_t want_unaligned_bulk_tx;
+	/* client wants to check CRCs on (bulk) xfers.
+		Only needs to be set at 1 end - will do both directions. */
+	int32_t want_crc;
 } SERVICE_CREATION_T;
 
 // Opaque handle for a VCHI instance
@@ -269,7 +277,7 @@ extern uint32_t vchi_held_msg_rx_timestamp( const VCHI_HELD_MSG_T *message );
 extern int32_t vchi_held_msg_release( VCHI_HELD_MSG_T *message );
 
 // Indicates whether the iterator has a next message.
-extern vcos_bool_t vchi_msg_iter_has_next( const VCHI_MSG_ITER_T *iter );
+extern int32_t vchi_msg_iter_has_next( const VCHI_MSG_ITER_T *iter );
 
 // Return the pointer and length for the next message and advance the iterator.
 extern int32_t vchi_msg_iter_next( VCHI_MSG_ITER_T *iter,