| Message ID | 20200504092611.9798-1-laurent.pinchart@ideasonboard.com |
|---|---|
| Headers | show |
| Series | Drivers for the BCM283x CSI-2/CCP2 receiver and ISP | expand |
Hi Dave, Nicolas, Laurent, On Wed, May 06, 2020 at 08:24:38PM +0100, Dave Stevenson wrote: > Hi Nicolas > > On Wed, 6 May 2020 at 19:04, Nicolas Saenz Julienne > <nsaenzjulienne@suse.de> wrote: > > > > Hi Laurent, Dave, > > > > On Mon, 2020-05-04 at 12:25 +0300, Laurent Pinchart wrote: > > > From: Dave Stevenson <dave.stevenson@raspberrypi.org> > > > > > > Add Broadcom VideoCore Shared Memory support. > > > > > > This new driver allows contiguous memory blocks to be imported > > > into the VideoCore VPU memory map, and manages the lifetime of > > > those objects, only releasing the source dmabuf once the VPU has > > > confirmed it has finished with it. > > > > > > > I'm still digesting all this, but a question came up, who is using the > > ioctls? > > We have a userspace library that uses it [1]. > It is used by things like MMAL to share buffers between the VPU and > ARM, rather than having to get VCHI to copy all the data between > mirrored buffers. > > I think what has happened here is that Laurent has picked up the > version of the driver from the top of our downstream kernel tree. > For libcamera and the ISP driver, we need a significantly smaller > feature set, basically import of dmabufs only, no allocations or cache > management. For the ISP driver it's mainly dmabuf import from > videobuf2 for the image buffers, but there's also a need to pass in > lens shading tables which are relatively large. With a small amount of > rework in libcamera, we can make it so that we use dma-buf heaps to do > the allocation, and pass in a dmabuf fd to the ISP driver to then map > onto the VPU. That removes all the ioctls handling from this driver. > > Downstream we do have other use cases that want to be able to do other > functions on shared memory, but that too should be reworkable into > using dma-buf heaps for allocations, and vcsm only handles importing > dmabufs via an ioctl. All that can be hidden away in the vcsm library, > so applications don't care. > We've also got some legacy code kicking around, as there was > originally a version of the driver that mapped the VPU's memory blocks > to the ARM. That's why the vcsm library has two code paths through > almost every function - one for each driver. > > Laurent: What's your view? Halt the review this particular patch for > now and rework, or try and get this all integrated? > Mainline obviously already has dma-buf heaps merged, whilst I have a > PR cherry-picking it back into our downstream 5.4. The main reason it > hasn't been merged is that I haven't had a test case to prove it > works. The rework should be relatively simple, but will need small > updates to both libcamera and ISP driver. As months have passed, libcamera moved to allocate lens shading tables using dma-buf heaps and the only user I can name of the vc-sm-cma driver is the actual ISP, that needs to import the dmabuf pointing to the lens shading maps with vc_sm_cma_import_dmabuf(). Upstreaming the whole vc-sm-cma driver as it is for this single kAPI seems a bit a no-go. Dave, what would you prefer here ? Should I provide a minimal vc-sm-cam driver that only performs buffer importing to support the ISP driver ? Is the buffer importing into VPU there to stay or is its usage transitional and can be kept out of the next submission of this series ? Thanks j > > Dave > > [1] https://github.com/raspberrypi/userland/tree/master/host_applications/linux/libs/sm > > > Regards, > > Nicolas > > > > > Driver upported from the RaspberryPi BSP at revision: > > > 890691d1c996 ("staging: vc04_services: Fix vcsm overflow bug when > > > counting transactions") > > > forward ported to recent mainline kernel version. > > > > > > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> > > > Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> > > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > > > --- > > > drivers/staging/vc04_services/Kconfig | 2 + > > > drivers/staging/vc04_services/Makefile | 1 + > > > .../include/linux/broadcom/vc_sm_cma_ioctl.h | 114 ++ > > > .../staging/vc04_services/vc-sm-cma/Kconfig | 10 + > > > .../staging/vc04_services/vc-sm-cma/Makefile | 13 + > > > drivers/staging/vc04_services/vc-sm-cma/TODO | 1 + > > > .../staging/vc04_services/vc-sm-cma/vc_sm.c | 1732 > > > +++++++++++++++++ > > > .../staging/vc04_services/vc-sm-cma/vc_sm.h | 84 + > > > .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.c | 505 +++++ > > > .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.h | 63 + > > > .../vc04_services/vc-sm-cma/vc_sm_defs.h | 300 +++ > > > .../vc04_services/vc-sm-cma/vc_sm_knl.h | 28 + > > > 12 files changed, 2853 insertions(+) > > > create mode 100644 > > > drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl. > > > h > > > create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Kconfig > > > create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Makefile > > > create mode 100644 drivers/staging/vc04_services/vc-sm-cma/TODO > > > create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.c > > > create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.h > > > create mode 100644 drivers/staging/vc04_services/vc-sm- > > > cma/vc_sm_cma_vchi.c > > > create mode 100644 drivers/staging/vc04_services/vc-sm- > > > cma/vc_sm_cma_vchi.h > > > create mode 100644 drivers/staging/vc04_services/vc-sm- > > > cma/vc_sm_defs.h > > > create mode 100644 drivers/staging/vc04_services/vc-sm- > > > cma/vc_sm_knl.h > > > > > > diff --git a/drivers/staging/vc04_services/Kconfig > > > b/drivers/staging/vc04_services/Kconfig > > > index 6baf9dd57f1f..b9f1f019ebd8 100644 > > > --- a/drivers/staging/vc04_services/Kconfig > > > +++ b/drivers/staging/vc04_services/Kconfig > > > @@ -23,5 +23,7 @@ source "drivers/staging/vc04_services/bcm2835- > > > audio/Kconfig" > > > > > > source "drivers/staging/vc04_services/bcm2835-camera/Kconfig" > > > > > > +source "drivers/staging/vc04_services/vc-sm-cma/Kconfig" > > > + > > > endif > > > > > > diff --git a/drivers/staging/vc04_services/Makefile > > > b/drivers/staging/vc04_services/Makefile > > > index 54d9e2f31916..6e1abf494c1a 100644 > > > --- a/drivers/staging/vc04_services/Makefile > > > +++ b/drivers/staging/vc04_services/Makefile > > > @@ -12,6 +12,7 @@ vchiq-objs := \ > > > > > > obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ > > > obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/ > > > +obj-$(CONFIG_BCM_VC_SM_CMA) += vc-sm-cma/ > > > > > > ccflags-y += -D__VCCOREVER__=0x04000000 > > > > > > diff --git > > > a/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioct > > > l.h > > > b/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioct > > > l.h > > > new file mode 100644 > > > index 000000000000..107460ad1be3 > > > --- /dev/null > > > +++ > > > b/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioct > > > l.h > > > @@ -0,0 +1,114 @@ > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > + > > > +/* > > > + * Copyright 2019 Raspberry Pi (Trading) Ltd. All rights reserved. > > > + * > > > + * Based on vmcs_sm_ioctl.h Copyright Broadcom Corporation. > > > + */ > > > + > > > +#ifndef __VC_SM_CMA_IOCTL_H > > > +#define __VC_SM_CMA_IOCTL_H > > > + > > > +/* ---- Include Files ---------------------------------------------- > > > ------ */ > > > + > > > +#if defined(__KERNEL__) > > > +#include <linux/types.h> /* Needed for standard types */ > > > +#else > > > +#include <stdint.h> > > > +#endif > > > + > > > +#include <linux/ioctl.h> > > > + > > > +/* ---- Constants and Types ---------------------------------------- > > > ------ */ > > > + > > > +#define VC_SM_CMA_RESOURCE_NAME 32 > > > +#define VC_SM_CMA_RESOURCE_NAME_DEFAULT "sm-host-resource" > > > + > > > +/* Type define used to create unique IOCTL number */ > > > +#define VC_SM_CMA_MAGIC_TYPE 'J' > > > + > > > +/* IOCTL commands on /dev/vc-sm-cma */ > > > +enum vc_sm_cma_cmd_e { > > > + VC_SM_CMA_CMD_ALLOC = 0x5A, /* Start at 0x5A arbitrarily > > > */ > > > + > > > + VC_SM_CMA_CMD_IMPORT_DMABUF, > > > + > > > + VC_SM_CMA_CMD_CLEAN_INVALID2, > > > + > > > + VC_SM_CMA_CMD_LAST /* Do not delete */ > > > +}; > > > + > > > +/* Cache type supported, conveniently matches the user space > > > definition in > > > + * user-vcsm.h. > > > + */ > > > +enum vc_sm_cma_cache_e { > > > + VC_SM_CMA_CACHE_NONE, > > > + VC_SM_CMA_CACHE_HOST, > > > + VC_SM_CMA_CACHE_VC, > > > + VC_SM_CMA_CACHE_BOTH, > > > +}; > > > + > > > +/* IOCTL Data structures */ > > > +struct vc_sm_cma_ioctl_alloc { > > > + /* user -> kernel */ > > > + __u32 size; > > > + __u32 num; > > > + __u32 cached; /* enum vc_sm_cma_cache_e */ > > > + __u32 pad; > > > + __u8 name[VC_SM_CMA_RESOURCE_NAME]; > > > + > > > + /* kernel -> user */ > > > + __s32 handle; > > > + __u32 vc_handle; > > > + __u64 dma_addr; > > > +}; > > > + > > > +struct vc_sm_cma_ioctl_import_dmabuf { > > > + /* user -> kernel */ > > > + __s32 dmabuf_fd; > > > + __u32 cached; /* enum vc_sm_cma_cache_e */ > > > + __u8 name[VC_SM_CMA_RESOURCE_NAME]; > > > + > > > + /* kernel -> user */ > > > + __s32 handle; > > > + __u32 vc_handle; > > > + __u32 size; > > > + __u32 pad; > > > + __u64 dma_addr; > > > +}; > > > + > > > +/* > > > + * Cache functions to be set to struct > > > vc_sm_cma_ioctl_clean_invalid2 > > > + * invalidate_mode. > > > + */ > > > +#define VC_SM_CACHE_OP_NOP 0x00 > > > +#define VC_SM_CACHE_OP_INV 0x01 > > > +#define VC_SM_CACHE_OP_CLEAN 0x02 > > > +#define VC_SM_CACHE_OP_FLUSH 0x03 > > > + > > > +struct vc_sm_cma_ioctl_clean_invalid2 { > > > + __u32 op_count; > > > + __u32 pad; > > > + struct vc_sm_cma_ioctl_clean_invalid_block { > > > + __u32 invalidate_mode; > > > + __u32 block_count; > > > + void * __user start_address; > > > + __u32 block_size; > > > + __u32 inter_block_stride; > > > + } s[0]; > > > +}; > > > + > > > +/* IOCTL numbers */ > > > +#define VC_SM_CMA_IOCTL_MEM_ALLOC\ > > > + _IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_ALLOC,\ > > > + struct vc_sm_cma_ioctl_alloc) > > > + > > > +#define VC_SM_CMA_IOCTL_MEM_IMPORT_DMABUF\ > > > + _IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_IMPORT_DMABUF,\ > > > + struct vc_sm_cma_ioctl_import_dmabuf) > > > + > > > +#define VC_SM_CMA_IOCTL_MEM_CLEAN_INVALID2\ > > > + _IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_CLEAN_INVALID2,\ > > > + struct vc_sm_cma_ioctl_clean_invalid2) > > > + > > > +#endif /* __VC_SM_CMA_IOCTL_H */ > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/Kconfig > > > b/drivers/staging/vc04_services/vc-sm-cma/Kconfig > > > new file mode 100644 > > > index 000000000000..5ac115da6b49 > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/Kconfig > > > @@ -0,0 +1,10 @@ > > > +config BCM_VC_SM_CMA > > > + bool "VideoCore Shared Memory (CMA) driver" > > > + select BCM2835_VCHIQ > > > + select RBTREE > > > + select DMA_SHARED_BUFFER > > > + help > > > + Say Y here to enable the shared memory interface that > > > + supports sharing dmabufs with VideoCore. > > > + This operates over the VCHIQ interface to a service > > > + running on VideoCore. > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/Makefile > > > b/drivers/staging/vc04_services/vc-sm-cma/Makefile > > > new file mode 100644 > > > index 000000000000..77d173694fbf > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/Makefile > > > @@ -0,0 +1,13 @@ > > > +ccflags-y += \ > > > + -I$(srctree)/$(src)/../ \ > > > + -I$(srctree)/$(src)/../interface/vchi \ > > > + -I$(srctree)/$(src)/../interface/vchiq_arm\ > > > + -I$(srctree)/$(src)/../include > > > + > > > +ccflags-y += \ > > > + -D__VCCOREVER__=0 > > > + > > > +vc-sm-cma-$(CONFIG_BCM_VC_SM_CMA) := \ > > > + vc_sm.o vc_sm_cma_vchi.o > > > + > > > +obj-$(CONFIG_BCM_VC_SM_CMA) += vc-sm-cma.o > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/TODO > > > b/drivers/staging/vc04_services/vc-sm-cma/TODO > > > new file mode 100644 > > > index 000000000000..ac9b5f8a7389 > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/TODO > > > @@ -0,0 +1 @@ > > > +No currently outstanding tasks except some clean-up. > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c > > > b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c > > > new file mode 100644 > > > index 000000000000..cd5fb561debb > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c > > > @@ -0,0 +1,1732 @@ > > > +// SPDX-License-Identifier: GPL-2.0 > > > +/* > > > + * VideoCore Shared Memory driver using CMA. > > > + * > > > + * Copyright: 2018, Raspberry Pi (Trading) Ltd > > > + * Dave Stevenson <dave.stevenson@raspberrypi.org> > > > + * > > > + * Based on vmcs_sm driver from Broadcom Corporation for some API, > > > + * and taking some code for buffer allocation and dmabuf handling > > > from > > > + * videobuf2. > > > + * > > > + * > > > + * This driver has 3 main uses: > > > + * 1) Allocating buffers for the kernel or userspace that can be > > > shared with the > > > + * VPU. > > > + * 2) Importing dmabufs from elsewhere for sharing with the VPU. > > > + * 3) Allocating buffers for use by the VPU. > > > + * > > > + * In the first and second cases the native handle is a dmabuf. > > > Releasing the > > > + * resource inherently comes from releasing the dmabuf, and this > > > will trigger > > > + * unmapping on the VPU. The underlying allocation and our buffer > > > structure are > > > + * retained until the VPU has confirmed that it has finished with > > > it. > > > + * > > > + * For the VPU allocations the VPU is responsible for triggering the > > > release, > > > + * and therefore the released message decrements the dma_buf > > > refcount (with the > > > + * VPU mapping having already been marked as released). > > > + */ > > > + > > > +/* ---- Include Files ---------------------------------------------- > > > ------- */ > > > +#include <linux/cdev.h> > > > +#include <linux/device.h> > > > +#include <linux/debugfs.h> > > > +#include <linux/dma-mapping.h> > > > +#include <linux/dma-buf.h> > > > +#include <linux/errno.h> > > > +#include <linux/fs.h> > > > +#include <linux/kernel.h> > > > +#include <linux/list.h> > > > +#include <linux/miscdevice.h> > > > +#include <linux/module.h> > > > +#include <linux/mm.h> > > > +#include <linux/of_device.h> > > > +#include <linux/platform_device.h> > > > +#include <linux/proc_fs.h> > > > +#include <linux/slab.h> > > > +#include <linux/seq_file.h> > > > +#include <linux/syscalls.h> > > > +#include <linux/types.h> > > > +#include <asm/cacheflush.h> > > > + > > > +#include "vchiq_connected.h" > > > +#include "vc_sm_cma_vchi.h" > > > + > > > +#include "vc_sm.h" > > > +#include "vc_sm_knl.h" > > > +#include <linux/broadcom/vc_sm_cma_ioctl.h> > > > + > > > +/* ---- Private Constants and Types -------------------------------- > > > ------- */ > > > + > > > +#define DEVICE_NAME "vcsm-cma" > > > +#define DEVICE_MINOR 0 > > > + > > > +#define VC_SM_RESOURCE_NAME_DEFAULT "sm-host-resource" > > > + > > > +#define VC_SM_DIR_ROOT_NAME "vcsm-cma" > > > +#define VC_SM_STATE "state" > > > + > > > +/* Private file data associated with each opened device. */ > > > +struct vc_sm_privdata_t { > > > + pid_t pid; /* PID of creator. */ > > > + > > > + int restart_sys; /* Tracks restart on interrupt. */ > > > + enum vc_sm_msg_type int_action; /* Interrupted action. */ > > > + u32 int_trans_id; /* Interrupted transaction. */ > > > +}; > > > + > > > +typedef int (*VC_SM_SHOW) (struct seq_file *s, void *v); > > > +struct sm_pde_t { > > > + VC_SM_SHOW show; /* Debug fs function hookup. */ > > > + struct dentry *dir_entry; /* Debug fs directory entry. */ > > > + void *priv_data; /* Private data */ > > > +}; > > > + > > > +/* Global state information. */ > > > +struct sm_state_t { > > > + struct platform_device *pdev; > > > + > > > + struct miscdevice misc_dev; > > > + > > > + struct sm_instance *sm_handle; /* Handle for videocore > > > service. */ > > > + > > > + spinlock_t kernelid_map_lock; /* Spinlock protecting > > > kernelid_map */ > > > + struct idr kernelid_map; > > > + > > > + struct mutex map_lock; /* Global map lock. */ > > > + struct list_head buffer_list; /* List of buffer. */ > > > + > > > + struct vc_sm_privdata_t *data_knl; /* Kernel internal data > > > tracking. */ > > > + struct vc_sm_privdata_t *vpu_allocs; /* All allocations from > > > the VPU */ > > > + struct dentry *dir_root; /* Debug fs entries root. */ > > > + struct sm_pde_t dir_state; /* Debug fs entries state > > > sub-tree. */ > > > + > > > + bool require_released_callback; /* VPU will send a released > > > msg when it > > > + * has finished with a > > > resource. > > > + */ > > > + u32 int_trans_id; /* Interrupted transaction. */ > > > +}; > > > + > > > +struct vc_sm_dma_buf_attachment { > > > + struct device *dev; > > > + struct sg_table sg_table; > > > + struct list_head list; > > > + enum dma_data_direction dma_dir; > > > +}; > > > + > > > +/* ---- Private Variables ------------------------------------------ > > > ----- */ > > > + > > > +static struct sm_state_t *sm_state; > > > +static int sm_inited; > > > + > > > +/* ---- Private Function Prototypes -------------------------------- > > > ------ */ > > > + > > > +/* ---- Private Functions ------------------------------------------ > > > ------ */ > > > + > > > +static int get_kernel_id(struct vc_sm_buffer *buffer) > > > +{ > > > + int handle; > > > + > > > + spin_lock(&sm_state->kernelid_map_lock); > > > + handle = idr_alloc(&sm_state->kernelid_map, buffer, 0, 0, > > > GFP_KERNEL); > > > + spin_unlock(&sm_state->kernelid_map_lock); > > > + > > > + return handle; > > > +} > > > + > > > +static struct vc_sm_buffer *lookup_kernel_id(int handle) > > > +{ > > > + return idr_find(&sm_state->kernelid_map, handle); > > > +} > > > + > > > +static void free_kernel_id(int handle) > > > +{ > > > + spin_lock(&sm_state->kernelid_map_lock); > > > + idr_remove(&sm_state->kernelid_map, handle); > > > + spin_unlock(&sm_state->kernelid_map_lock); > > > +} > > > + > > > +static int vc_sm_cma_seq_file_show(struct seq_file *s, void *v) > > > +{ > > > + struct sm_pde_t *sm_pde; > > > + > > > + sm_pde = (struct sm_pde_t *)(s->private); > > > + > > > + if (sm_pde && sm_pde->show) > > > + sm_pde->show(s, v); > > > + > > > + return 0; > > > +} > > > + > > > +static int vc_sm_cma_single_open(struct inode *inode, struct file > > > *file) > > > +{ > > > + return single_open(file, vc_sm_cma_seq_file_show, inode- > > > >i_private); > > > +} > > > + > > > +static const struct file_operations vc_sm_cma_debug_fs_fops = { > > > + .open = vc_sm_cma_single_open, > > > + .read = seq_read, > > > + .llseek = seq_lseek, > > > + .release = single_release, > > > +}; > > > + > > > +static int vc_sm_cma_global_state_show(struct seq_file *s, void *v) > > > +{ > > > + struct vc_sm_buffer *resource = NULL; > > > + int resource_count = 0; > > > + > > > + if (!sm_state) > > > + return 0; > > > + > > > + seq_printf(s, "\nVC-ServiceHandle %p\n", sm_state- > > > >sm_handle); > > > + > > > + /* Log all applicable mapping(s). */ > > > + > > > + mutex_lock(&sm_state->map_lock); > > > + seq_puts(s, "\nResources\n"); > > > + if (!list_empty(&sm_state->buffer_list)) { > > > + list_for_each_entry(resource, &sm_state->buffer_list, > > > + global_buffer_list) { > > > + resource_count++; > > > + > > > + seq_printf(s, "\nResource %p\n", > > > + resource); > > > + seq_printf(s, " NAME %s\n", > > > + resource->name); > > > + seq_printf(s, " SIZE %zu\n", > > > + resource->size); > > > + seq_printf(s, " DMABUF %p\n", > > > + resource->dma_buf); > > > + if (resource->imported) { > > > + seq_printf(s, > > > " ATTACH %p\n", > > > + resource->import.attach); > > > + seq_printf(s, > > > " SGT %p\n", > > > + resource->import.sgt); > > > + } else { > > > + seq_printf(s, > > > " SGT %p\n", > > > + resource->alloc.sg_table); > > > + } > > > + seq_printf(s, " DMA_ADDR %pad\n", > > > + &resource->dma_addr); > > > + seq_printf(s, > > > " VC_HANDLE %08x\n", > > > + resource->vc_handle); > > > + seq_printf(s, " VC_MAPPING %d\n", > > > + resource->vpu_state); > > > + } > > > + } > > > + seq_printf(s, "\n\nTotal resource count: %d\n\n", > > > resource_count); > > > + > > > + mutex_unlock(&sm_state->map_lock); > > > + > > > + return 0; > > > +} > > > + > > > +/* > > > + * Adds a buffer to the private data list which tracks all the > > > allocated > > > + * data. > > > + */ > > > +static void vc_sm_add_resource(struct vc_sm_privdata_t *privdata, > > > + struct vc_sm_buffer *buffer) > > > +{ > > > + mutex_lock(&sm_state->map_lock); > > > + list_add(&buffer->global_buffer_list, &sm_state->buffer_list); > > > + mutex_unlock(&sm_state->map_lock); > > > + > > > + pr_debug("[%s]: added buffer %p (name %s, size %zu)\n", > > > + __func__, buffer, buffer->name, buffer->size); > > > +} > > > + > > > +/* > > > + * Cleans up imported dmabuf. > > > + */ > > > +static void vc_sm_clean_up_dmabuf(struct vc_sm_buffer *buffer) > > > +{ > > > + if (!buffer->imported) > > > + return; > > > + > > > + /* Handle cleaning up imported dmabufs */ > > > + mutex_lock(&buffer->lock); > > > + if (buffer->import.sgt) { > > > + dma_buf_unmap_attachment(buffer->import.attach, > > > + buffer->import.sgt, > > > + DMA_BIDIRECTIONAL); > > > + buffer->import.sgt = NULL; > > > + } > > > + if (buffer->import.attach) { > > > + dma_buf_detach(buffer->dma_buf, buffer->import.attach); > > > + buffer->import.attach = NULL; > > > + } > > > + mutex_unlock(&buffer->lock); > > > +} > > > + > > > +/* > > > + * Instructs VPU to decrement the refcount on a buffer. > > > + */ > > > +static void vc_sm_vpu_free(struct vc_sm_buffer *buffer) > > > +{ > > > + if (buffer->vc_handle && buffer->vpu_state == VPU_MAPPED) { > > > + struct vc_sm_free_t free = { buffer->vc_handle, 0 }; > > > + int status = vc_sm_cma_vchi_free(sm_state->sm_handle, > > > &free, > > > + &sm_state->int_trans_id); > > > + if (status != 0 && status != -EINTR) { > > > + pr_err("[%s]: failed to free memory on > > > videocore (status: %u, trans_id: %u)\n", > > > + __func__, status, sm_state- > > > >int_trans_id); > > > + } > > > + > > > + if (sm_state->require_released_callback) { > > > + /* Need to wait for the VPU to confirm the > > > free. */ > > > + > > > + /* Retain a reference on this until the VPU has > > > + * released it > > > + */ > > > + buffer->vpu_state = VPU_UNMAPPING; > > > + } else { > > > + buffer->vpu_state = VPU_NOT_MAPPED; > > > + buffer->vc_handle = 0; > > > + } > > > + } > > > +} > > > + > > > +/* > > > + * Release an allocation. > > > + * All refcounting is done via the dma buf object. > > > + * > > > + * Must be called with the mutex held. The function will either > > > release the > > > + * mutex (if defering the release) or destroy it. The caller must > > > therefore not > > > + * reuse the buffer on return. > > > + */ > > > +static void vc_sm_release_resource(struct vc_sm_buffer *buffer) > > > +{ > > > + pr_debug("[%s]: buffer %p (name %s, size %zu), imported %u\n", > > > + __func__, buffer, buffer->name, buffer->size, > > > + buffer->imported); > > > + > > > + if (buffer->vc_handle) { > > > + /* We've sent the unmap request but not had the > > > response. */ > > > + pr_debug("[%s]: Waiting for VPU unmap response on > > > %p\n", > > > + __func__, buffer); > > > + goto defer; > > > + } > > > + if (buffer->in_use) { > > > + /* dmabuf still in use - we await the release */ > > > + pr_debug("[%s]: buffer %p is still in use\n", __func__, > > > buffer); > > > + goto defer; > > > + } > > > + > > > + /* Release the allocation (whether imported dmabuf or CMA > > > allocation) */ > > > + if (buffer->imported) { > > > + if (buffer->import.dma_buf) > > > + dma_buf_put(buffer->import.dma_buf); > > > + else > > > + pr_err("%s: Imported dmabuf already been put > > > for buf %p\n", > > > + __func__, buffer); > > > + buffer->import.dma_buf = NULL; > > > + } else { > > > + dma_free_coherent(&sm_state->pdev->dev, buffer->size, > > > + buffer->cookie, buffer->dma_addr); > > > + } > > > + > > > + /* Free our buffer. Start by removing it from the list */ > > > + mutex_lock(&sm_state->map_lock); > > > + list_del(&buffer->global_buffer_list); > > > + mutex_unlock(&sm_state->map_lock); > > > + > > > + pr_debug("%s: Release our allocation - done\n", __func__); > > > + mutex_unlock(&buffer->lock); > > > + > > > + mutex_destroy(&buffer->lock); > > > + > > > + kfree(buffer); > > > + return; > > > + > > > +defer: > > > + mutex_unlock(&buffer->lock); > > > +} > > > + > > > +/* Create support for private data tracking. */ > > > +static struct vc_sm_privdata_t *vc_sm_cma_create_priv_data(pid_t id) > > > +{ > > > + char alloc_name[32]; > > > + struct vc_sm_privdata_t *file_data = NULL; > > > + > > > + /* Allocate private structure. */ > > > + file_data = kzalloc(sizeof(*file_data), GFP_KERNEL); > > > + > > > + if (!file_data) > > > + return NULL; > > > + > > > + snprintf(alloc_name, sizeof(alloc_name), "%d", id); > > > + > > > + file_data->pid = id; > > > + > > > + return file_data; > > > +} > > > + > > > +/* Dma buf operations for use with our own allocations */ > > > + > > > +static int vc_sm_dma_buf_attach(struct dma_buf *dmabuf, > > > + struct dma_buf_attachment *attachment) > > > + > > > +{ > > > + struct vc_sm_dma_buf_attachment *a; > > > + struct sg_table *sgt; > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + struct scatterlist *rd, *wr; > > > + int ret, i; > > > + > > > + a = kzalloc(sizeof(*a), GFP_KERNEL); > > > + if (!a) > > > + return -ENOMEM; > > > + > > > + pr_debug("%s dmabuf %p attachment %p\n", __func__, dmabuf, > > > attachment); > > > + > > > + mutex_lock(&buf->lock); > > > + > > > + INIT_LIST_HEAD(&a->list); > > > + > > > + sgt = &a->sg_table; > > > + > > > + /* Copy the buf->base_sgt scatter list to the attachment, as we > > > can't > > > + * map the same scatter list to multiple attachments at the > > > same time. > > > + */ > > > + ret = sg_alloc_table(sgt, buf->alloc.sg_table->orig_nents, > > > GFP_KERNEL); > > > + if (ret) { > > > + kfree(a); > > > + return -ENOMEM; > > > + } > > > + > > > + rd = buf->alloc.sg_table->sgl; > > > + wr = sgt->sgl; > > > + for (i = 0; i < sgt->orig_nents; ++i) { > > > + sg_set_page(wr, sg_page(rd), rd->length, rd->offset); > > > + rd = sg_next(rd); > > > + wr = sg_next(wr); > > > + } > > > + > > > + a->dma_dir = DMA_NONE; > > > + attachment->priv = a; > > > + > > > + list_add(&a->list, &buf->attachments); > > > + mutex_unlock(&buf->lock); > > > + > > > + return 0; > > > +} > > > + > > > +static void vc_sm_dma_buf_detach(struct dma_buf *dmabuf, > > > + struct dma_buf_attachment *attachment) > > > +{ > > > + struct vc_sm_dma_buf_attachment *a = attachment->priv; > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + struct sg_table *sgt; > > > + > > > + pr_debug("%s dmabuf %p attachment %p\n", __func__, dmabuf, > > > attachment); > > > + if (!a) > > > + return; > > > + > > > + sgt = &a->sg_table; > > > + > > > + /* release the scatterlist cache */ > > > + if (a->dma_dir != DMA_NONE) > > > + dma_unmap_sg(attachment->dev, sgt->sgl, sgt- > > > >orig_nents, > > > + a->dma_dir); > > > + sg_free_table(sgt); > > > + > > > + mutex_lock(&buf->lock); > > > + list_del(&a->list); > > > + mutex_unlock(&buf->lock); > > > + > > > + kfree(a); > > > +} > > > + > > > +static struct sg_table *vc_sm_map_dma_buf(struct dma_buf_attachment > > > *attachment, > > > + enum dma_data_direction > > > direction) > > > +{ > > > + struct vc_sm_dma_buf_attachment *a = attachment->priv; > > > + /* stealing dmabuf mutex to serialize map/unmap operations */ > > > + struct mutex *lock = &attachment->dmabuf->lock; > > > + struct sg_table *table; > > > + > > > + mutex_lock(lock); > > > + pr_debug("%s attachment %p\n", __func__, attachment); > > > + table = &a->sg_table; > > > + > > > + /* return previously mapped sg table */ > > > + if (a->dma_dir == direction) { > > > + mutex_unlock(lock); > > > + return table; > > > + } > > > + > > > + /* release any previous cache */ > > > + if (a->dma_dir != DMA_NONE) { > > > + dma_unmap_sg(attachment->dev, table->sgl, table- > > > >orig_nents, > > > + a->dma_dir); > > > + a->dma_dir = DMA_NONE; > > > + } > > > + > > > + /* mapping to the client with new direction */ > > > + table->nents = dma_map_sg(attachment->dev, table->sgl, > > > + table->orig_nents, direction); > > > + if (!table->nents) { > > > + pr_err("failed to map scatterlist\n"); > > > + mutex_unlock(lock); > > > + return ERR_PTR(-EIO); > > > + } > > > + > > > + a->dma_dir = direction; > > > + mutex_unlock(lock); > > > + > > > + pr_debug("%s attachment %p\n", __func__, attachment); > > > + return table; > > > +} > > > + > > > +static void vc_sm_unmap_dma_buf(struct dma_buf_attachment > > > *attachment, > > > + struct sg_table *table, > > > + enum dma_data_direction direction) > > > +{ > > > + pr_debug("%s attachment %p\n", __func__, attachment); > > > + dma_unmap_sg(attachment->dev, table->sgl, table->nents, > > > direction); > > > +} > > > + > > > +static int vc_sm_dmabuf_mmap(struct dma_buf *dmabuf, struct > > > vm_area_struct *vma) > > > +{ > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + int ret; > > > + > > > + pr_debug("%s dmabuf %p, buf %p, vm_start %08lX\n", __func__, > > > dmabuf, > > > + buf, vma->vm_start); > > > + > > > + mutex_lock(&buf->lock); > > > + > > > + /* now map it to userspace */ > > > + vma->vm_pgoff = 0; > > > + > > > + ret = dma_mmap_coherent(&sm_state->pdev->dev, vma, buf->cookie, > > > + buf->dma_addr, buf->size); > > > + > > > + if (ret) { > > > + pr_err("Remapping memory failed, error: %d\n", ret); > > > + return ret; > > > + } > > > + > > > + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; > > > + > > > + mutex_unlock(&buf->lock); > > > + > > > + if (ret) > > > + pr_err("%s: failure mapping buffer to userspace\n", > > > + __func__); > > > + > > > + return ret; > > > +} > > > + > > > +static void vc_sm_dma_buf_release(struct dma_buf *dmabuf) > > > +{ > > > + struct vc_sm_buffer *buffer; > > > + > > > + if (!dmabuf) > > > + return; > > > + > > > + buffer = (struct vc_sm_buffer *)dmabuf->priv; > > > + > > > + mutex_lock(&buffer->lock); > > > + > > > + pr_debug("%s dmabuf %p, buffer %p\n", __func__, dmabuf, > > > buffer); > > > + > > > + buffer->in_use = 0; > > > + > > > + /* Unmap on the VPU */ > > > + vc_sm_vpu_free(buffer); > > > + pr_debug("%s vpu_free done\n", __func__); > > > + > > > + /* Unmap our dma_buf object (the vc_sm_buffer remains until > > > released > > > + * on the VPU). > > > + */ > > > + vc_sm_clean_up_dmabuf(buffer); > > > + pr_debug("%s clean_up dmabuf done\n", __func__); > > > + > > > + /* buffer->lock will be destroyed by vc_sm_release_resource if > > > finished > > > + * with, otherwise unlocked. Do NOT unlock here. > > > + */ > > > + vc_sm_release_resource(buffer); > > > + pr_debug("%s done\n", __func__); > > > +} > > > + > > > +static int vc_sm_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, > > > + enum dma_data_direction > > > direction) > > > +{ > > > + struct vc_sm_buffer *buf; > > > + struct vc_sm_dma_buf_attachment *a; > > > + > > > + if (!dmabuf) > > > + return -EFAULT; > > > + > > > + buf = dmabuf->priv; > > > + if (!buf) > > > + return -EFAULT; > > > + > > > + mutex_lock(&buf->lock); > > > + > > > + list_for_each_entry(a, &buf->attachments, list) { > > > + dma_sync_sg_for_cpu(a->dev, a->sg_table.sgl, > > > + a->sg_table.nents, direction); > > > + } > > > + mutex_unlock(&buf->lock); > > > + > > > + return 0; > > > +} > > > + > > > +static int vc_sm_dma_buf_end_cpu_access(struct dma_buf *dmabuf, > > > + enum dma_data_direction > > > direction) > > > +{ > > > + struct vc_sm_buffer *buf; > > > + struct vc_sm_dma_buf_attachment *a; > > > + > > > + if (!dmabuf) > > > + return -EFAULT; > > > + buf = dmabuf->priv; > > > + if (!buf) > > > + return -EFAULT; > > > + > > > + mutex_lock(&buf->lock); > > > + > > > + list_for_each_entry(a, &buf->attachments, list) { > > > + dma_sync_sg_for_device(a->dev, a->sg_table.sgl, > > > + a->sg_table.nents, direction); > > > + } > > > + mutex_unlock(&buf->lock); > > > + > > > + return 0; > > > +} > > > + > > > +static const struct dma_buf_ops dma_buf_ops = { > > > + .map_dma_buf = vc_sm_map_dma_buf, > > > + .unmap_dma_buf = vc_sm_unmap_dma_buf, > > > + .mmap = vc_sm_dmabuf_mmap, > > > + .release = vc_sm_dma_buf_release, > > > + .attach = vc_sm_dma_buf_attach, > > > + .detach = vc_sm_dma_buf_detach, > > > + .begin_cpu_access = vc_sm_dma_buf_begin_cpu_access, > > > + .end_cpu_access = vc_sm_dma_buf_end_cpu_access, > > > +}; > > > + > > > +/* Dma_buf operations for chaining through to an imported dma_buf */ > > > + > > > +static > > > +int vc_sm_import_dma_buf_attach(struct dma_buf *dmabuf, > > > + struct dma_buf_attachment *attachment) > > > +{ > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + > > > + if (!buf->imported) > > > + return -EINVAL; > > > + return buf->import.dma_buf->ops->attach(buf->import.dma_buf, > > > + attachment); > > > +} > > > + > > > +static > > > +void vc_sm_import_dma_buf_detatch(struct dma_buf *dmabuf, > > > + struct dma_buf_attachment > > > *attachment) > > > +{ > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + > > > + if (!buf->imported) > > > + return; > > > + buf->import.dma_buf->ops->detach(buf->import.dma_buf, > > > attachment); > > > +} > > > + > > > +static > > > +struct sg_table *vc_sm_import_map_dma_buf(struct dma_buf_attachment > > > *attachment, > > > + enum dma_data_direction > > > direction) > > > +{ > > > + struct vc_sm_buffer *buf = attachment->dmabuf->priv; > > > + > > > + if (!buf->imported) > > > + return NULL; > > > + return buf->import.dma_buf->ops->map_dma_buf(attachment, > > > + direction); > > > +} > > > + > > > +static > > > +void vc_sm_import_unmap_dma_buf(struct dma_buf_attachment > > > *attachment, > > > + struct sg_table *table, > > > + enum dma_data_direction direction) > > > +{ > > > + struct vc_sm_buffer *buf = attachment->dmabuf->priv; > > > + > > > + if (!buf->imported) > > > + return; > > > + buf->import.dma_buf->ops->unmap_dma_buf(attachment, table, > > > direction); > > > +} > > > + > > > +static > > > +int vc_sm_import_dmabuf_mmap(struct dma_buf *dmabuf, struct > > > vm_area_struct *vma) > > > +{ > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + > > > + pr_debug("%s: mmap dma_buf %p, buf %p, imported db %p\n", > > > __func__, > > > + dmabuf, buf, buf->import.dma_buf); > > > + if (!buf->imported) { > > > + pr_err("%s: mmap dma_buf %p- not an imported buffer\n", > > > + __func__, dmabuf); > > > + return -EINVAL; > > > + } > > > + return buf->import.dma_buf->ops->mmap(buf->import.dma_buf, > > > vma); > > > +} > > > + > > > +static > > > +void vc_sm_import_dma_buf_release(struct dma_buf *dmabuf) > > > +{ > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + > > > + pr_debug("%s: Relasing dma_buf %p\n", __func__, dmabuf); > > > + mutex_lock(&buf->lock); > > > + if (!buf->imported) > > > + return; > > > + > > > + buf->in_use = 0; > > > + > > > + vc_sm_vpu_free(buf); > > > + > > > + vc_sm_release_resource(buf); > > > +} > > > + > > > +static > > > +int vc_sm_import_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, > > > + enum dma_data_direction > > > direction) > > > +{ > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + > > > + if (!buf->imported) > > > + return -EINVAL; > > > + return buf->import.dma_buf->ops->begin_cpu_access(buf- > > > >import.dma_buf, > > > + direction); > > > +} > > > + > > > +static > > > +int vc_sm_import_dma_buf_end_cpu_access(struct dma_buf *dmabuf, > > > + enum dma_data_direction > > > direction) > > > +{ > > > + struct vc_sm_buffer *buf = dmabuf->priv; > > > + > > > + if (!buf->imported) > > > + return -EINVAL; > > > + return buf->import.dma_buf->ops->end_cpu_access(buf- > > > >import.dma_buf, > > > + direction); > > > +} > > > + > > > +static const struct dma_buf_ops dma_buf_import_ops = { > > > + .map_dma_buf = vc_sm_import_map_dma_buf, > > > + .unmap_dma_buf = vc_sm_import_unmap_dma_buf, > > > + .mmap = vc_sm_import_dmabuf_mmap, > > > + .release = vc_sm_import_dma_buf_release, > > > + .attach = vc_sm_import_dma_buf_attach, > > > + .detach = vc_sm_import_dma_buf_detatch, > > > + .begin_cpu_access = vc_sm_import_dma_buf_begin_cpu_access, > > > + .end_cpu_access = vc_sm_import_dma_buf_end_cpu_access, > > > +}; > > > + > > > +/* Import a dma_buf to be shared with VC. */ > > > +int > > > +vc_sm_cma_import_dmabuf_internal(struct vc_sm_privdata_t *private, > > > + struct dma_buf *dma_buf, > > > + int fd, > > > + struct dma_buf **imported_buf) > > > +{ > > > + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > > + struct vc_sm_buffer *buffer = NULL; > > > + struct vc_sm_import import = { }; > > > + struct vc_sm_import_result result = { }; > > > + struct dma_buf_attachment *attach = NULL; > > > + struct sg_table *sgt = NULL; > > > + dma_addr_t dma_addr; > > > + int ret = 0; > > > + int status; > > > + > > > + /* Setup our allocation parameters */ > > > + pr_debug("%s: importing dma_buf %p/fd %d\n", __func__, dma_buf, > > > fd); > > > + > > > + if (fd < 0) > > > + get_dma_buf(dma_buf); > > > + else > > > + dma_buf = dma_buf_get(fd); > > > + > > > + if (!dma_buf) > > > + return -EINVAL; > > > + > > > + attach = dma_buf_attach(dma_buf, &sm_state->pdev->dev); > > > + if (IS_ERR(attach)) { > > > + ret = PTR_ERR(attach); > > > + goto error; > > > + } > > > + > > > + sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); > > > + if (IS_ERR(sgt)) { > > > + ret = PTR_ERR(sgt); > > > + goto error; > > > + } > > > + > > > + /* Verify that the address block is contiguous */ > > > + if (sgt->nents != 1) { > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + /* Allocate local buffer to track this allocation. */ > > > + buffer = kzalloc(sizeof(*buffer), GFP_KERNEL); > > > + if (!buffer) { > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + import.type = VC_SM_ALLOC_NON_CACHED; > > > + dma_addr = sg_dma_address(sgt->sgl); > > > + import.addr = (u32)dma_addr; > > > + if ((import.addr & 0xC0000000) != 0xC0000000) { > > > + pr_err("%s: Expecting an uncached alias for dma_addr > > > %pad\n", > > > + __func__, &dma_addr); > > > + import.addr |= 0xC0000000; > > > + } > > > + import.size = sg_dma_len(sgt->sgl); > > > + import.allocator = current->tgid; > > > + import.kernel_id = get_kernel_id(buffer); > > > + > > > + memcpy(import.name, VC_SM_RESOURCE_NAME_DEFAULT, > > > + sizeof(VC_SM_RESOURCE_NAME_DEFAULT)); > > > + > > > + pr_debug("[%s]: attempt to import \"%s\" data - type %u, addr > > > %pad, size %u.\n", > > > + __func__, import.name, import.type, &dma_addr, > > > import.size); > > > + > > > + /* Allocate the videocore buffer. */ > > > + status = vc_sm_cma_vchi_import(sm_state->sm_handle, &import, > > > &result, > > > + &sm_state->int_trans_id); > > > + if (status == -EINTR) { > > > + pr_debug("[%s]: requesting import memory action restart > > > (trans_id: %u)\n", > > > + __func__, sm_state->int_trans_id); > > > + ret = -ERESTARTSYS; > > > + private->restart_sys = -EINTR; > > > + private->int_action = VC_SM_MSG_TYPE_IMPORT; > > > + goto error; > > > + } else if (status || !result.res_handle) { > > > + pr_debug("[%s]: failed to import memory on videocore > > > (status: %u, trans_id: %u)\n", > > > + __func__, status, sm_state->int_trans_id); > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + mutex_init(&buffer->lock); > > > + INIT_LIST_HEAD(&buffer->attachments); > > > + memcpy(buffer->name, import.name, > > > + min(sizeof(buffer->name), sizeof(import.name) - 1)); > > > + > > > + /* Keep track of the buffer we created. */ > > > + buffer->private = private; > > > + buffer->vc_handle = result.res_handle; > > > + buffer->size = import.size; > > > + buffer->vpu_state = VPU_MAPPED; > > > + > > > + buffer->imported = 1; > > > + buffer->import.dma_buf = dma_buf; > > > + > > > + buffer->import.attach = attach; > > > + buffer->import.sgt = sgt; > > > + buffer->dma_addr = dma_addr; > > > + buffer->in_use = 1; > > > + buffer->kernel_id = import.kernel_id; > > > + > > > + /* > > > + * We're done - we need to export a new dmabuf chaining through > > > most > > > + * functions, but enabling us to release our own internal > > > references > > > + * here. > > > + */ > > > + exp_info.ops = &dma_buf_import_ops; > > > + exp_info.size = import.size; > > > + exp_info.flags = O_RDWR; > > > + exp_info.priv = buffer; > > > + > > > + buffer->dma_buf = dma_buf_export(&exp_info); > > > + if (IS_ERR(buffer->dma_buf)) { > > > + ret = PTR_ERR(buffer->dma_buf); > > > + goto error; > > > + } > > > + > > > + vc_sm_add_resource(private, buffer); > > > + > > > + *imported_buf = buffer->dma_buf; > > > + > > > + return 0; > > > + > > > +error: > > > + if (result.res_handle) { > > > + struct vc_sm_free_t free = { result.res_handle, 0 }; > > > + > > > + vc_sm_cma_vchi_free(sm_state->sm_handle, &free, > > > + &sm_state->int_trans_id); > > > + } > > > + free_kernel_id(import.kernel_id); > > > + kfree(buffer); > > > + if (sgt) > > > + dma_buf_unmap_attachment(attach, sgt, > > > DMA_BIDIRECTIONAL); > > > + if (attach) > > > + dma_buf_detach(dma_buf, attach); > > > + dma_buf_put(dma_buf); > > > + return ret; > > > +} > > > + > > > +static int vc_sm_cma_vpu_alloc(u32 size, u32 align, const char > > > *name, > > > + u32 mem_handle, struct vc_sm_buffer > > > **ret_buffer) > > > +{ > > > + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > > + struct vc_sm_buffer *buffer = NULL; > > > + struct sg_table *sgt; > > > + int aligned_size; > > > + int ret = 0; > > > + > > > + /* Align to the user requested align */ > > > + aligned_size = ALIGN(size, align); > > > + /* and then to a page boundary */ > > > + aligned_size = PAGE_ALIGN(aligned_size); > > > + > > > + if (!aligned_size) > > > + return -EINVAL; > > > + > > > + /* Allocate local buffer to track this allocation. */ > > > + buffer = kzalloc(sizeof(*buffer), GFP_KERNEL); > > > + if (!buffer) > > > + return -ENOMEM; > > > + > > > + mutex_init(&buffer->lock); > > > + /* Acquire the mutex as vc_sm_release_resource will release it > > > in the > > > + * error path. > > > + */ > > > + mutex_lock(&buffer->lock); > > > + > > > + buffer->cookie = dma_alloc_coherent(&sm_state->pdev->dev, > > > + aligned_size, &buffer- > > > >dma_addr, > > > + GFP_KERNEL); > > > + if (!buffer->cookie) { > > > + pr_err("[%s]: dma_alloc_coherent alloc of %d bytes > > > failed\n", > > > + __func__, aligned_size); > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + pr_debug("[%s]: alloc of %d bytes success\n", > > > + __func__, aligned_size); > > > + > > > + sgt = kmalloc(sizeof(*sgt), GFP_KERNEL); > > > + if (!sgt) { > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + ret = dma_get_sgtable(&sm_state->pdev->dev, sgt, buffer- > > > >cookie, > > > + buffer->dma_addr, buffer->size); > > > + if (ret < 0) { > > > + pr_err("failed to get scatterlist from DMA API\n"); > > > + kfree(sgt); > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + buffer->alloc.sg_table = sgt; > > > + > > > + INIT_LIST_HEAD(&buffer->attachments); > > > + > > > + memcpy(buffer->name, name, > > > + min(sizeof(buffer->name), strlen(name))); > > > + > > > + exp_info.ops = &dma_buf_ops; > > > + exp_info.size = aligned_size; > > > + exp_info.flags = O_RDWR; > > > + exp_info.priv = buffer; > > > + > > > + buffer->dma_buf = dma_buf_export(&exp_info); > > > + if (IS_ERR(buffer->dma_buf)) { > > > + ret = PTR_ERR(buffer->dma_buf); > > > + goto error; > > > + } > > > + buffer->dma_addr = (u32)sg_dma_address(buffer->alloc.sg_table- > > > >sgl); > > > + if ((buffer->dma_addr & 0xC0000000) != 0xC0000000) { > > > + pr_warn_once("%s: Expecting an uncached alias for > > > dma_addr %pad\n", > > > + __func__, &buffer->dma_addr); > > > + buffer->dma_addr |= 0xC0000000; > > > + } > > > + buffer->private = sm_state->vpu_allocs; > > > + > > > + buffer->vc_handle = mem_handle; > > > + buffer->vpu_state = VPU_MAPPED; > > > + buffer->vpu_allocated = 1; > > > + buffer->size = size; > > > + /* > > > + * Create an ID that will be passed along with our message so > > > + * that when we service the release reply, we can look up which > > > + * resource is being released. > > > + */ > > > + buffer->kernel_id = get_kernel_id(buffer); > > > + > > > + vc_sm_add_resource(sm_state->vpu_allocs, buffer); > > > + > > > + mutex_unlock(&buffer->lock); > > > + > > > + *ret_buffer = buffer; > > > + return 0; > > > +error: > > > + if (buffer) > > > + vc_sm_release_resource(buffer); > > > + return ret; > > > +} > > > + > > > +static void > > > +vc_sm_vpu_event(struct sm_instance *instance, struct vc_sm_result_t > > > *reply, > > > + int reply_len) > > > +{ > > > + switch (reply->trans_id & ~0x80000000) { > > > + case VC_SM_MSG_TYPE_CLIENT_VERSION: > > > + { > > > + /* Acknowledge that the firmware supports the version > > > command */ > > > + pr_debug("%s: firmware acked version msg. Require > > > release cb\n", > > > + __func__); > > > + sm_state->require_released_callback = true; > > > + } > > > + break; > > > + case VC_SM_MSG_TYPE_RELEASED: > > > + { > > > + struct vc_sm_released *release = (struct vc_sm_released > > > *)reply; > > > + struct vc_sm_buffer *buffer = > > > + lookup_kernel_id(release- > > > >kernel_id); > > > + if (!buffer) { > > > + pr_err("%s: VC released a buffer that is > > > already released, kernel_id %d\n", > > > + __func__, release->kernel_id); > > > + break; > > > + } > > > + mutex_lock(&buffer->lock); > > > + > > > + pr_debug("%s: Released addr %08x, size %u, id %08x, > > > mem_handle %08x\n", > > > + __func__, release->addr, release->size, > > > + release->kernel_id, release->vc_handle); > > > + > > > + buffer->vc_handle = 0; > > > + buffer->vpu_state = VPU_NOT_MAPPED; > > > + free_kernel_id(release->kernel_id); > > > + > > > + if (buffer->vpu_allocated) { > > > + /* VPU allocation, so release the dmabuf which > > > will > > > + * trigger the clean up. > > > + */ > > > + mutex_unlock(&buffer->lock); > > > + dma_buf_put(buffer->dma_buf); > > > + } else { > > > + vc_sm_release_resource(buffer); > > > + } > > > + } > > > + break; > > > + case VC_SM_MSG_TYPE_VC_MEM_REQUEST: > > > + { > > > + struct vc_sm_buffer *buffer = NULL; > > > + struct vc_sm_vc_mem_request *req = > > > + (struct vc_sm_vc_mem_request > > > *)reply; > > > + struct vc_sm_vc_mem_request_result reply; > > > + int ret; > > > + > > > + pr_debug("%s: Request %u bytes of memory, align %d name > > > %s, trans_id %08x\n", > > > + __func__, req->size, req->align, req->name, > > > + req->trans_id); > > > + ret = vc_sm_cma_vpu_alloc(req->size, req->align, req- > > > >name, > > > + req->vc_handle, &buffer); > > > + > > > + reply.trans_id = req->trans_id; > > > + if (!ret) { > > > + reply.addr = buffer->dma_addr; > > > + reply.kernel_id = buffer->kernel_id; > > > + pr_debug("%s: Allocated resource buffer %p, > > > addr %pad\n", > > > + __func__, buffer, &buffer->dma_addr); > > > + } else { > > > + pr_err("%s: Allocation failed size %u, name %s, > > > vc_handle %u\n", > > > + __func__, req->size, req->name, req- > > > >vc_handle); > > > + reply.addr = 0; > > > + reply.kernel_id = 0; > > > + } > > > + vc_sm_vchi_client_vc_mem_req_reply(sm_state->sm_handle, > > > &reply, > > > + &sm_state- > > > >int_trans_id); > > > + break; > > > + } > > > + break; > > > + default: > > > + pr_err("%s: Unknown vpu cmd %x\n", __func__, reply- > > > >trans_id); > > > + break; > > > + } > > > +} > > > + > > > +/* Userspace handling */ > > > +/* > > > + * Open the device. Creates a private state to help track all > > > allocation > > > + * associated with this device. > > > + */ > > > +static int vc_sm_cma_open(struct inode *inode, struct file *file) > > > +{ > > > + /* Make sure the device was started properly. */ > > > + if (!sm_state) { > > > + pr_err("[%s]: invalid device\n", __func__); > > > + return -EPERM; > > > + } > > > + > > > + file->private_data = vc_sm_cma_create_priv_data(current->tgid); > > > + if (!file->private_data) { > > > + pr_err("[%s]: failed to create data tracker\n", > > > __func__); > > > + > > > + return -ENOMEM; > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +/* > > > + * Close the vcsm-cma device. > > > + * All allocations are file descriptors to the dmabuf objects, so we > > > will get > > > + * the clean up request on those as those are cleaned up. > > > + */ > > > +static int vc_sm_cma_release(struct inode *inode, struct file *file) > > > +{ > > > + struct vc_sm_privdata_t *file_data = > > > + (struct vc_sm_privdata_t *)file->private_data; > > > + int ret = 0; > > > + > > > + /* Make sure the device was started properly. */ > > > + if (!sm_state || !file_data) { > > > + pr_err("[%s]: invalid device\n", __func__); > > > + ret = -EPERM; > > > + goto out; > > > + } > > > + > > > + pr_debug("[%s]: using private data %p\n", __func__, file_data); > > > + > > > + /* Terminate the private data. */ > > > + kfree(file_data); > > > + > > > +out: > > > + return ret; > > > +} > > > + > > > +/* > > > + * Allocate a shared memory handle and block. > > > + * Allocation is from CMA, and then imported into the VPU mappings. > > > + */ > > > +int vc_sm_cma_ioctl_alloc(struct vc_sm_privdata_t *private, > > > + struct vc_sm_cma_ioctl_alloc *ioparam) > > > +{ > > > + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > > + struct vc_sm_buffer *buffer = NULL; > > > + struct vc_sm_import import = { 0 }; > > > + struct vc_sm_import_result result = { 0 }; > > > + struct dma_buf *dmabuf = NULL; > > > + struct sg_table *sgt; > > > + int aligned_size; > > > + int ret = 0; > > > + int status; > > > + int fd = -1; > > > + > > > + aligned_size = PAGE_ALIGN(ioparam->size); > > > + > > > + if (!aligned_size) > > > + return -EINVAL; > > > + > > > + /* Allocate local buffer to track this allocation. */ > > > + buffer = kzalloc(sizeof(*buffer), GFP_KERNEL); > > > + if (!buffer) { > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + buffer->cookie = dma_alloc_coherent(&sm_state->pdev->dev, > > > + aligned_size, > > > + &buffer->dma_addr, > > > + GFP_KERNEL); > > > + if (!buffer->cookie) { > > > + pr_err("[%s]: dma_alloc_coherent alloc of %d bytes > > > failed\n", > > > + __func__, aligned_size); > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + import.type = VC_SM_ALLOC_NON_CACHED; > > > + import.allocator = current->tgid; > > > + > > > + if (*ioparam->name) > > > + memcpy(import.name, ioparam->name, sizeof(import.name) > > > - 1); > > > + else > > > + memcpy(import.name, VC_SM_RESOURCE_NAME_DEFAULT, > > > + sizeof(VC_SM_RESOURCE_NAME_DEFAULT)); > > > + > > > + mutex_init(&buffer->lock); > > > + INIT_LIST_HEAD(&buffer->attachments); > > > + memcpy(buffer->name, import.name, > > > + min(sizeof(buffer->name), sizeof(import.name) - 1)); > > > + > > > + exp_info.ops = &dma_buf_ops; > > > + exp_info.size = aligned_size; > > > + exp_info.flags = O_RDWR; > > > + exp_info.priv = buffer; > > > + > > > + dmabuf = dma_buf_export(&exp_info); > > > + if (IS_ERR(dmabuf)) { > > > + ret = PTR_ERR(dmabuf); > > > + goto error; > > > + } > > > + buffer->dma_buf = dmabuf; > > > + > > > + import.addr = buffer->dma_addr; > > > + import.size = aligned_size; > > > + import.kernel_id = get_kernel_id(buffer); > > > + > > > + /* Wrap it into a videocore buffer. */ > > > + status = vc_sm_cma_vchi_import(sm_state->sm_handle, &import, > > > &result, > > > + &sm_state->int_trans_id); > > > + if (status == -EINTR) { > > > + pr_debug("[%s]: requesting import memory action restart > > > (trans_id: %u)\n", > > > + __func__, sm_state->int_trans_id); > > > + ret = -ERESTARTSYS; > > > + private->restart_sys = -EINTR; > > > + private->int_action = VC_SM_MSG_TYPE_IMPORT; > > > + goto error; > > > + } else if (status || !result.res_handle) { > > > + pr_err("[%s]: failed to import memory on videocore > > > (status: %u, trans_id: %u)\n", > > > + __func__, status, sm_state->int_trans_id); > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + /* Keep track of the buffer we created. */ > > > + buffer->private = private; > > > + buffer->vc_handle = result.res_handle; > > > + buffer->size = import.size; > > > + buffer->vpu_state = VPU_MAPPED; > > > + buffer->kernel_id = import.kernel_id; > > > + > > > + sgt = kmalloc(sizeof(*sgt), GFP_KERNEL); > > > + if (!sgt) { > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + > > > + ret = dma_get_sgtable(&sm_state->pdev->dev, sgt, buffer- > > > >cookie, > > > + buffer->dma_addr, buffer->size); > > > + if (ret < 0) { > > > + /* FIXME: error handling */ > > > + pr_err("failed to get scatterlist from DMA API\n"); > > > + kfree(sgt); > > > + ret = -ENOMEM; > > > + goto error; > > > + } > > > + buffer->alloc.sg_table = sgt; > > > + > > > + fd = dma_buf_fd(dmabuf, O_CLOEXEC); > > > + if (fd < 0) > > > + goto error; > > > + > > > + vc_sm_add_resource(private, buffer); > > > + > > > + pr_debug("[%s]: Added resource as fd %d, buffer %p, private %p, > > > dma_addr %pad\n", > > > + __func__, fd, buffer, private, &buffer->dma_addr); > > > + > > > + /* We're done */ > > > + ioparam->handle = fd; > > > + ioparam->vc_handle = buffer->vc_handle; > > > + ioparam->dma_addr = buffer->dma_addr; > > > + return 0; > > > + > > > +error: > > > + pr_err("[%s]: something failed - cleanup. ret %d\n", __func__, > > > ret); > > > + > > > + if (dmabuf) { > > > + /* dmabuf has been exported, therefore allow dmabuf > > > cleanup to > > > + * deal with this > > > + */ > > > + dma_buf_put(dmabuf); > > > + } else { > > > + /* No dmabuf, therefore just free the buffer here */ > > > + if (buffer->cookie) > > > + dma_free_coherent(&sm_state->pdev->dev, buffer- > > > >size, > > > + buffer->cookie, buffer- > > > >dma_addr); > > > + kfree(buffer); > > > + } > > > + return ret; > > > +} > > > + > > > +#ifndef CONFIG_ARM64 > > > +/* Converts VCSM_CACHE_OP_* to an operating function. */ > > > +static void (*cache_op_to_func(const unsigned int cache_op)) > > > + (const void*, const > > > void*) > > > +{ > > > + switch (cache_op) { > > > + case VC_SM_CACHE_OP_NOP: > > > + return NULL; > > > + > > > + case VC_SM_CACHE_OP_INV: > > > + case VC_SM_CACHE_OP_CLEAN: > > > + case VC_SM_CACHE_OP_FLUSH: > > > + return dmac_flush_range; > > > + > > > + default: > > > + pr_err("[%s]: Invalid cache_op: 0x%08x\n", __func__, > > > cache_op); > > > + return NULL; > > > + } > > > +} > > > + > > > +/* > > > + * Clean/invalid/flush cache of which buffer is already pinned (i.e. > > > accessed). > > > + */ > > > +static int clean_invalid_contig_2d(const void __user *addr, > > > + const size_t block_count, > > > + const size_t block_size, > > > + const size_t stride, > > > + const unsigned int cache_op) > > > +{ > > > + size_t i; > > > + void (*op_fn)(const void *start, const void *end); > > > + > > > + if (!block_size) { > > > + pr_err("[%s]: size cannot be 0\n", __func__); > > > + return -EINVAL; > > > + } > > > + > > > + op_fn = cache_op_to_func(cache_op); > > > + if (!op_fn) > > > + return -EINVAL; > > > + > > > + for (i = 0; i < block_count; i ++, addr += stride) > > > + op_fn(addr, addr + block_size); > > > + > > > + return 0; > > > +} > > > + > > > +static int vc_sm_cma_clean_invalid2(unsigned int cmdnr, unsigned > > > long arg) > > > +{ > > > + struct vc_sm_cma_ioctl_clean_invalid2 ioparam; > > > + struct vc_sm_cma_ioctl_clean_invalid_block *block = NULL; > > > + int i, ret = 0; > > > + > > > + /* Get parameter data. */ > > > + if (copy_from_user(&ioparam, (void *)arg, sizeof(ioparam))) { > > > + pr_err("[%s]: failed to copy-from-user header for cmd > > > %x\n", > > > + __func__, cmdnr); > > > + return -EFAULT; > > > + } > > > + block = kmalloc(ioparam.op_count * sizeof(*block), GFP_KERNEL); > > > + if (!block) > > > + return -EFAULT; > > > + > > > + if (copy_from_user(block, (void *)(arg + sizeof(ioparam)), > > > + ioparam.op_count * sizeof(*block)) != 0) { > > > + pr_err("[%s]: failed to copy-from-user payload for cmd > > > %x\n", > > > + __func__, cmdnr); > > > + ret = -EFAULT; > > > + goto out; > > > + } > > > + > > > + for (i = 0; i < ioparam.op_count; i++) { > > > + const struct vc_sm_cma_ioctl_clean_invalid_block * > > > const op = > > > + block + > > > i; > > > + > > > + if (op->invalidate_mode == VC_SM_CACHE_OP_NOP) > > > + continue; > > > + > > > + ret = clean_invalid_contig_2d((void __user *)op- > > > >start_address, > > > + op->block_count, op- > > > >block_size, > > > + op->inter_block_stride, > > > + op->invalidate_mode); > > > + if (ret) > > > + break; > > > + } > > > +out: > > > + kfree(block); > > > + > > > + return ret; > > > +} > > > +#endif > > > + > > > +static long vc_sm_cma_ioctl(struct file *file, unsigned int cmd, > > > + unsigned long arg) > > > +{ > > > + int ret = 0; > > > + unsigned int cmdnr = _IOC_NR(cmd); > > > + struct vc_sm_privdata_t *file_data = > > > + (struct vc_sm_privdata_t *)file->private_data; > > > + > > > + /* Validate we can work with this device. */ > > > + if (!sm_state || !file_data) { > > > + pr_err("[%s]: invalid device\n", __func__); > > > + return -EPERM; > > > + } > > > + > > > + /* Action is a re-post of a previously interrupted action? */ > > > + if (file_data->restart_sys == -EINTR) { > > > + struct vc_sm_action_clean_t action_clean; > > > + > > > + pr_debug("[%s]: clean up of action %u (trans_id: %u) > > > following EINTR\n", > > > + __func__, file_data->int_action, > > > + file_data->int_trans_id); > > > + > > > + action_clean.res_action = file_data->int_action; > > > + action_clean.action_trans_id = file_data->int_trans_id; > > > + > > > + file_data->restart_sys = 0; > > > + } > > > + > > > + /* Now process the command. */ > > > + switch (cmdnr) { > > > + /* New memory allocation. > > > + */ > > > + case VC_SM_CMA_CMD_ALLOC: > > > + { > > > + struct vc_sm_cma_ioctl_alloc ioparam; > > > + > > > + /* Get the parameter data. */ > > > + if (copy_from_user > > > + (&ioparam, (void *)arg, sizeof(ioparam)) != 0) { > > > + pr_err("[%s]: failed to copy-from-user for cmd > > > %x\n", > > > + __func__, cmdnr); > > > + ret = -EFAULT; > > > + break; > > > + } > > > + > > > + ret = vc_sm_cma_ioctl_alloc(file_data, &ioparam); > > > + if (!ret && > > > + (copy_to_user((void *)arg, &ioparam, > > > + sizeof(ioparam)) != 0)) { > > > + /* FIXME: Release allocation */ > > > + pr_err("[%s]: failed to copy-to-user for cmd > > > %x\n", > > > + __func__, cmdnr); > > > + ret = -EFAULT; > > > + } > > > + break; > > > + } > > > + > > > + case VC_SM_CMA_CMD_IMPORT_DMABUF: > > > + { > > > + struct vc_sm_cma_ioctl_import_dmabuf ioparam; > > > + struct dma_buf *new_dmabuf; > > > + > > > + /* Get the parameter data. */ > > > + if (copy_from_user > > > + (&ioparam, (void *)arg, sizeof(ioparam)) != 0) { > > > + pr_err("[%s]: failed to copy-from-user for cmd > > > %x\n", > > > + __func__, cmdnr); > > > + ret = -EFAULT; > > > + break; > > > + } > > > + > > > + ret = vc_sm_cma_import_dmabuf_internal(file_data, > > > + NULL, > > > + ioparam.dmabuf_f > > > d, > > > + &new_dmabuf); > > > + > > > + if (!ret) { > > > + struct vc_sm_buffer *buf = new_dmabuf->priv; > > > + > > > + ioparam.size = buf->size; > > > + ioparam.handle = dma_buf_fd(new_dmabuf, > > > + O_CLOEXEC); > > > + ioparam.vc_handle = buf->vc_handle; > > > + ioparam.dma_addr = buf->dma_addr; > > > + > > > + if (ioparam.handle < 0 || > > > + (copy_to_user((void *)arg, &ioparam, > > > + sizeof(ioparam)) != 0)) { > > > + dma_buf_put(new_dmabuf); > > > + /* FIXME: Release allocation */ > > > + ret = -EFAULT; > > > + } > > > + } > > > + break; > > > + } > > > + > > > +#ifndef CONFIG_ARM64 > > > + /* > > > + * Flush/Invalidate the cache for a given mapping. > > > + * Blocks must be pinned (i.e. accessed) before this call. > > > + */ > > > + case VC_SM_CMA_CMD_CLEAN_INVALID2: > > > + ret = vc_sm_cma_clean_invalid2(cmdnr, arg); > > > + break; > > > +#endif > > > + > > > + default: > > > + pr_debug("[%s]: cmd %x tgid %u, owner %u\n", __func__, > > > cmdnr, > > > + current->tgid, file_data->pid); > > > + > > > + ret = -EINVAL; > > > + break; > > > + } > > > + > > > + return ret; > > > +} > > > + > > > +#ifdef CONFIG_COMPAT > > > +struct vc_sm_cma_ioctl_clean_invalid2_32 { > > > + u32 op_count; > > > + struct vc_sm_cma_ioctl_clean_invalid_block_32 { > > > + u16 invalidate_mode; > > > + u16 block_count; > > > + compat_uptr_t start_address; > > > + u32 block_size; > > > + u32 inter_block_stride; > > > + } s[0]; > > > +}; > > > + > > > +#define VC_SM_CMA_CMD_CLEAN_INVALID2_32\ > > > + _IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_CLEAN_INVALID2,\ > > > + struct vc_sm_cma_ioctl_clean_invalid2_32) > > > + > > > +static long vc_sm_cma_compat_ioctl(struct file *file, unsigned int > > > cmd, > > > + unsigned long arg) > > > +{ > > > + switch (cmd) { > > > + case VC_SM_CMA_CMD_CLEAN_INVALID2_32: > > > + /* FIXME */ > > > + return -EINVAL; > > > + > > > + default: > > > + return vc_sm_cma_ioctl(file, cmd, arg); > > > + } > > > +} > > > +#endif > > > + > > > +/* Device operations that we managed in this driver. */ > > > +static const struct file_operations vc_sm_ops = { > > > + .owner = THIS_MODULE, > > > + .unlocked_ioctl = vc_sm_cma_ioctl, > > > +#ifdef CONFIG_COMPAT > > > + .compat_ioctl = vc_sm_cma_compat_ioctl, > > > +#endif > > > + .open = vc_sm_cma_open, > > > + .release = vc_sm_cma_release, > > > +}; > > > + > > > +/* Driver load/unload functions */ > > > +/* Videocore connected. */ > > > +static void vc_sm_connected_init(void) > > > +{ > > > + int ret; > > > + struct vchi_instance_handle *vchi_instance; > > > + struct vc_sm_version version; > > > + struct vc_sm_result_t version_result; > > > + > > > + pr_info("[%s]: start\n", __func__); > > > + > > > + /* > > > + * Initialize and create a VCHI connection for the shared > > > memory service > > > + * running on videocore. > > > + */ > > > + ret = vchi_initialise(&vchi_instance); > > > + if (ret) { > > > + pr_err("[%s]: failed to initialise VCHI instance > > > (ret=%d)\n", > > > + __func__, ret); > > > + > > > + return; > > > + } > > > + > > > + ret = vchi_connect(vchi_instance); > > > + if (ret) { > > > + pr_err("[%s]: failed to connect VCHI instance > > > (ret=%d)\n", > > > + __func__, ret); > > > + > > > + return; > > > + } > > > + > > > + /* Initialize an instance of the shared memory service. */ > > > + sm_state->sm_handle = vc_sm_cma_vchi_init(vchi_instance, 1, > > > + vc_sm_vpu_event); > > > + if (!sm_state->sm_handle) { > > > + pr_err("[%s]: failed to initialize shared memory > > > service\n", > > > + __func__); > > > + > > > + return; > > > + } > > > + > > > + /* Create a debug fs directory entry (root). */ > > > + sm_state->dir_root = debugfs_create_dir(VC_SM_DIR_ROOT_NAME, > > > NULL); > > > + > > > + sm_state->dir_state.show = &vc_sm_cma_global_state_show; > > > + sm_state->dir_state.dir_entry = > > > + debugfs_create_file(VC_SM_STATE, 0444, sm_state- > > > >dir_root, > > > + &sm_state->dir_state, > > > + &vc_sm_cma_debug_fs_fops); > > > + > > > + INIT_LIST_HEAD(&sm_state->buffer_list); > > > + > > > + /* Create a shared memory device. */ > > > + sm_state->misc_dev.minor = MISC_DYNAMIC_MINOR; > > > + sm_state->misc_dev.name = DEVICE_NAME; > > > + sm_state->misc_dev.fops = &vc_sm_ops; > > > + sm_state->misc_dev.parent = NULL; > > > + /* Temporarily set as 666 until udev rules have been sorted */ > > > + sm_state->misc_dev.mode = 0666; > > > + ret = misc_register(&sm_state->misc_dev); > > > + if (ret) { > > > + pr_err("vcsm-cma: failed to register misc device.\n"); > > > + goto err_remove_debugfs; > > > + } > > > + > > > + sm_state->data_knl = vc_sm_cma_create_priv_data(0); > > > + if (!sm_state->data_knl) { > > > + pr_err("[%s]: failed to create kernel private data > > > tracker\n", > > > + __func__); > > > + goto err_remove_misc_dev; > > > + } > > > + > > > + version.version = 2; > > > + ret = vc_sm_cma_vchi_client_version(sm_state->sm_handle, > > > &version, > > > + &version_result, > > > + &sm_state->int_trans_id); > > > + if (ret) { > > > + pr_err("[%s]: Failed to send version request %d\n", > > > __func__, > > > + ret); > > > + } > > > + > > > + /* Done! */ > > > + sm_inited = 1; > > > + pr_info("[%s]: installed successfully\n", __func__); > > > + return; > > > + > > > +err_remove_misc_dev: > > > + misc_deregister(&sm_state->misc_dev); > > > +err_remove_debugfs: > > > + debugfs_remove_recursive(sm_state->dir_root); > > > + vc_sm_cma_vchi_stop(&sm_state->sm_handle); > > > +} > > > + > > > +/* Driver loading. */ > > > +static int bcm2835_vc_sm_cma_probe(struct platform_device *pdev) > > > +{ > > > + pr_info("%s: Videocore shared memory driver\n", __func__); > > > + > > > + sm_state = devm_kzalloc(&pdev->dev, sizeof(*sm_state), > > > GFP_KERNEL); > > > + if (!sm_state) > > > + return -ENOMEM; > > > + sm_state->pdev = pdev; > > > + mutex_init(&sm_state->map_lock); > > > + > > > + spin_lock_init(&sm_state->kernelid_map_lock); > > > + idr_init_base(&sm_state->kernelid_map, 1); > > > + > > > + pdev->dev.dma_parms = devm_kzalloc(&pdev->dev, > > > + sizeof(*pdev- > > > >dev.dma_parms), > > > + GFP_KERNEL); > > > + /* dma_set_max_seg_size checks if dma_parms is NULL. */ > > > + dma_set_max_seg_size(&pdev->dev, 0x3FFFFFFF); > > > + > > > + vchiq_add_connected_callback(vc_sm_connected_init); > > > + return 0; > > > +} > > > + > > > +/* Driver unloading. */ > > > +static int bcm2835_vc_sm_cma_remove(struct platform_device *pdev) > > > +{ > > > + pr_debug("[%s]: start\n", __func__); > > > + if (sm_inited) { > > > + misc_deregister(&sm_state->misc_dev); > > > + > > > + /* Remove all proc entries. */ > > > + debugfs_remove_recursive(sm_state->dir_root); > > > + > > > + /* Stop the videocore shared memory service. */ > > > + vc_sm_cma_vchi_stop(&sm_state->sm_handle); > > > + } > > > + > > > + if (sm_state) { > > > + idr_destroy(&sm_state->kernelid_map); > > > + > > > + /* Free the memory for the state structure. */ > > > + mutex_destroy(&sm_state->map_lock); > > > + } > > > + > > > + pr_debug("[%s]: end\n", __func__); > > > + return 0; > > > +} > > > + > > > +/* Kernel API calls */ > > > +/* Get an internal resource handle mapped from the external one. */ > > > +int vc_sm_cma_int_handle(void *handle) > > > +{ > > > + struct dma_buf *dma_buf = (struct dma_buf *)handle; > > > + struct vc_sm_buffer *buf; > > > + > > > + /* Validate we can work with this device. */ > > > + if (!sm_state || !handle) { > > > + pr_err("[%s]: invalid input\n", __func__); > > > + return 0; > > > + } > > > + > > > + buf = (struct vc_sm_buffer *)dma_buf->priv; > > > + return buf->vc_handle; > > > +} > > > +EXPORT_SYMBOL_GPL(vc_sm_cma_int_handle); > > > + > > > +/* Free a previously allocated shared memory handle and block. */ > > > +int vc_sm_cma_free(void *handle) > > > +{ > > > + struct dma_buf *dma_buf = (struct dma_buf *)handle; > > > + > > > + /* Validate we can work with this device. */ > > > + if (!sm_state || !handle) { > > > + pr_err("[%s]: invalid input\n", __func__); > > > + return -EPERM; > > > + } > > > + > > > + pr_debug("%s: handle %p/dmabuf %p\n", __func__, handle, > > > dma_buf); > > > + > > > + dma_buf_put(dma_buf); > > > + > > > + return 0; > > > +} > > > +EXPORT_SYMBOL_GPL(vc_sm_cma_free); > > > + > > > +/* Import a dmabuf to be shared with VC. */ > > > +int vc_sm_cma_import_dmabuf(struct dma_buf *src_dmabuf, void > > > **handle) > > > +{ > > > + struct dma_buf *new_dma_buf; > > > + struct vc_sm_buffer *buf; > > > + int ret; > > > + > > > + /* Validate we can work with this device. */ > > > + if (!sm_state || !src_dmabuf || !handle) { > > > + pr_err("[%s]: invalid input\n", __func__); > > > + return -EPERM; > > > + } > > > + > > > + ret = vc_sm_cma_import_dmabuf_internal(sm_state->data_knl, > > > src_dmabuf, > > > + -1, &new_dma_buf); > > > + > > > + if (!ret) { > > > + pr_debug("%s: imported to ptr %p\n", __func__, > > > new_dma_buf); > > > + buf = (struct vc_sm_buffer *)new_dma_buf->priv; > > > + > > > + /* Assign valid handle at this time.*/ > > > + *handle = new_dma_buf; > > > + } else { > > > + /* > > > + * succeeded in importing the dma_buf, but then > > > + * failed to look it up again. How? > > > + * Release the fd again. > > > + */ > > > + pr_err("%s: imported vc_sm_cma_get_buffer failed %d\n", > > > + __func__, ret); > > > + } > > > + > > > + return ret; > > > +} > > > +EXPORT_SYMBOL_GPL(vc_sm_cma_import_dmabuf); > > > + > > > +static struct platform_driver bcm2835_vcsm_cma_driver = { > > > + .probe = bcm2835_vc_sm_cma_probe, > > > + .remove = bcm2835_vc_sm_cma_remove, > > > + .driver = { > > > + .name = DEVICE_NAME, > > > + .owner = THIS_MODULE, > > > + }, > > > +}; > > > + > > > +module_platform_driver(bcm2835_vcsm_cma_driver); > > > + > > > +MODULE_AUTHOR("Dave Stevenson"); > > > +MODULE_DESCRIPTION("VideoCore CMA Shared Memory Driver"); > > > +MODULE_LICENSE("GPL v2"); > > > +MODULE_ALIAS("platform:vcsm-cma"); > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h > > > b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h > > > new file mode 100644 > > > index 000000000000..f1c7b95b14ce > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h > > > @@ -0,0 +1,84 @@ > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > + > > > +/* > > > + * VideoCore Shared Memory driver using CMA. > > > + * > > > + * Copyright: 2018, Raspberry Pi (Trading) Ltd > > > + * > > > + */ > > > + > > > +#ifndef VC_SM_H > > > +#define VC_SM_H > > > + > > > +#include <linux/device.h> > > > +#include <linux/dma-direction.h> > > > +#include <linux/kref.h> > > > +#include <linux/mm_types.h> > > > +#include <linux/mutex.h> > > > +#include <linux/rbtree.h> > > > +#include <linux/sched.h> > > > +#include <linux/shrinker.h> > > > +#include <linux/types.h> > > > +#include <linux/miscdevice.h> > > > + > > > +#define VC_SM_MAX_NAME_LEN 32 > > > + > > > +enum vc_sm_vpu_mapping_state { > > > + VPU_NOT_MAPPED, > > > + VPU_MAPPED, > > > + VPU_UNMAPPING > > > +}; > > > + > > > +struct vc_sm_alloc_data { > > > + unsigned long num_pages; > > > + void *priv_virt; > > > + struct sg_table *sg_table; > > > +}; > > > + > > > +struct vc_sm_imported { > > > + struct dma_buf *dma_buf; > > > + struct dma_buf_attachment *attach; > > > + struct sg_table *sgt; > > > +}; > > > + > > > +struct vc_sm_buffer { > > > + struct list_head global_buffer_list; /* Global list of > > > buffers. */ > > > + > > > + /* Index in the kernel_id idr so that we can find the > > > + * mmal_msg_context again when servicing the VCHI reply. > > > + */ > > > + int kernel_id; > > > + > > > + size_t size; > > > + > > > + /* Lock over all the following state for this buffer */ > > > + struct mutex lock; > > > + struct list_head attachments; > > > + > > > + char name[VC_SM_MAX_NAME_LEN]; > > > + > > > + int in_use:1; /* Kernel is still using this resource */ > > > + int imported:1; /* Imported dmabuf */ > > > + > > > + enum vc_sm_vpu_mapping_state vpu_state; > > > + u32 vc_handle; /* VideoCore handle for this buffer */ > > > + int vpu_allocated; /* > > > + * The VPU made this allocation. > > > Release the > > > + * local dma_buf when the VPU releases > > > the > > > + * resource. > > > + */ > > > + > > > + /* DMABUF related fields */ > > > + struct dma_buf *dma_buf; > > > + dma_addr_t dma_addr; > > > + void *cookie; > > > + > > > + struct vc_sm_privdata_t *private; > > > + > > > + union { > > > + struct vc_sm_alloc_data alloc; > > > + struct vc_sm_imported import; > > > + }; > > > +}; > > > + > > > +#endif > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c > > > b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c > > > new file mode 100644 > > > index 000000000000..6a203c60bf7f > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c > > > @@ -0,0 +1,505 @@ > > > +// SPDX-License-Identifier: GPL-2.0 > > > +/* > > > + * VideoCore Shared Memory CMA allocator > > > + * > > > + * Copyright: 2018, Raspberry Pi (Trading) Ltd > > > + * Copyright 2011-2012 Broadcom Corporation. All rights reserved. > > > + * > > > + * Based on vmcs_sm driver from Broadcom Corporation. > > > + * > > > + */ > > > + > > > +/* ---- Include Files ---------------------------------------------- > > > ------- */ > > > +#include <linux/completion.h> > > > +#include <linux/kernel.h> > > > +#include <linux/kthread.h> > > > +#include <linux/list.h> > > > +#include <linux/mutex.h> > > > +#include <linux/semaphore.h> > > > +#include <linux/slab.h> > > > +#include <linux/types.h> > > > + > > > +#include "vc_sm_cma_vchi.h" > > > + > > > +#define VC_SM_VER 1 > > > +#define VC_SM_MIN_VER 0 > > > + > > > +/* ---- Private Constants and Types -------------------------------- > > > ------ */ > > > + > > > +/* Command blocks come from a pool */ > > > +#define SM_MAX_NUM_CMD_RSP_BLKS 32 > > > + > > > +struct sm_cmd_rsp_blk { > > > + struct list_head head; /* To create lists */ > > > + /* To be signaled when the response is there */ > > > + struct completion cmplt; > > > + > > > + u32 id; > > > + u16 length; > > > + > > > + u8 msg[VC_SM_MAX_MSG_LEN]; > > > + > > > + uint32_t wait:1; > > > + uint32_t sent:1; > > > + uint32_t alloc:1; > > > + > > > +}; > > > + > > > +struct sm_instance { > > > + u32 num_connections; > > > + struct vchi_service_handle > > > *vchi_handle[VCHI_MAX_NUM_CONNECTIONS]; > > > + struct task_struct *io_thread; > > > + struct completion io_cmplt; > > > + > > > + vpu_event_cb vpu_event; > > > + > > > + /* Mutex over the following lists */ > > > + struct mutex lock; > > > + u32 trans_id; > > > + struct list_head cmd_list; > > > + struct list_head rsp_list; > > > + struct list_head dead_list; > > > + > > > + struct sm_cmd_rsp_blk free_blk[SM_MAX_NUM_CMD_RSP_BLKS]; > > > + > > > + /* Mutex over the free_list */ > > > + struct mutex free_lock; > > > + struct list_head free_list; > > > + > > > + struct semaphore free_sema; > > > + > > > +}; > > > + > > > +/* ---- Private Variables ------------------------------------------ > > > ------ */ > > > + > > > +/* ---- Private Function Prototypes -------------------------------- > > > ------ */ > > > + > > > +/* ---- Private Functions ------------------------------------------ > > > ------ */ > > > +static int > > > +bcm2835_vchi_msg_queue(struct vchi_service_handle *handle, > > > + void *data, > > > + unsigned int size) > > > +{ > > > + return vchi_queue_kernel_message(handle, > > > + data, > > > + size); > > > +} > > > + > > > +static struct > > > +sm_cmd_rsp_blk *vc_vchi_cmd_create(struct sm_instance *instance, > > > + enum vc_sm_msg_type id, void *msg, > > > + u32 size, int wait) > > > +{ > > > + struct sm_cmd_rsp_blk *blk; > > > + struct vc_sm_msg_hdr_t *hdr; > > > + > > > + if (down_interruptible(&instance->free_sema)) { > > > + blk = kmalloc(sizeof(*blk), GFP_KERNEL); > > > + if (!blk) > > > + return NULL; > > > + > > > + blk->alloc = 1; > > > + init_completion(&blk->cmplt); > > > + } else { > > > + mutex_lock(&instance->free_lock); > > > + blk = > > > + list_first_entry(&instance->free_list, > > > + struct sm_cmd_rsp_blk, head); > > > + list_del(&blk->head); > > > + mutex_unlock(&instance->free_lock); > > > + } > > > + > > > + blk->sent = 0; > > > + blk->wait = wait; > > > + blk->length = sizeof(*hdr) + size; > > > + > > > + hdr = (struct vc_sm_msg_hdr_t *)blk->msg; > > > + hdr->type = id; > > > + mutex_lock(&instance->lock); > > > + instance->trans_id++; > > > + /* > > > + * Retain the top bit for identifying asynchronous events, or > > > VPU cmds. > > > + */ > > > + instance->trans_id &= ~0x80000000; > > > + hdr->trans_id = instance->trans_id; > > > + blk->id = instance->trans_id; > > > + mutex_unlock(&instance->lock); > > > + > > > + if (size) > > > + memcpy(hdr->body, msg, size); > > > + > > > + return blk; > > > +} > > > + > > > +static void > > > +vc_vchi_cmd_delete(struct sm_instance *instance, struct > > > sm_cmd_rsp_blk *blk) > > > +{ > > > + if (blk->alloc) { > > > + kfree(blk); > > > + return; > > > + } > > > + > > > + mutex_lock(&instance->free_lock); > > > + list_add(&blk->head, &instance->free_list); > > > + mutex_unlock(&instance->free_lock); > > > + up(&instance->free_sema); > > > +} > > > + > > > +static void vc_sm_cma_vchi_rx_ack(struct sm_instance *instance, > > > + struct sm_cmd_rsp_blk *cmd, > > > + struct vc_sm_result_t *reply, > > > + u32 reply_len) > > > +{ > > > + mutex_lock(&instance->lock); > > > + list_for_each_entry(cmd, > > > + &instance->rsp_list, > > > + head) { > > > + if (cmd->id == reply->trans_id) > > > + break; > > > + } > > > + mutex_unlock(&instance->lock); > > > + > > > + if (&cmd->head == &instance->rsp_list) { > > > + //pr_debug("%s: received response %u, throw away...", > > > + pr_err("%s: received response %u, throw away...", > > > + __func__, > > > + reply->trans_id); > > > + } else if (reply_len > sizeof(cmd->msg)) { > > > + pr_err("%s: reply too big (%u) %u, throw away...", > > > + __func__, reply_len, > > > + reply->trans_id); > > > + } else { > > > + memcpy(cmd->msg, reply, > > > + reply_len); > > > + complete(&cmd->cmplt); > > > + } > > > +} > > > + > > > +static int vc_sm_cma_vchi_videocore_io(void *arg) > > > +{ > > > + struct sm_instance *instance = arg; > > > + struct sm_cmd_rsp_blk *cmd = NULL, *cmd_tmp; > > > + struct vc_sm_result_t *reply; > > > + u32 reply_len; > > > + s32 status; > > > + int svc_use = 1; > > > + > > > + while (1) { > > > + if (svc_use) > > > + vchi_service_release(instance->vchi_handle[0]); > > > + svc_use = 0; > > > + > > > + if (wait_for_completion_interruptible(&instance- > > > >io_cmplt)) > > > + continue; > > > + > > > + vchi_service_use(instance->vchi_handle[0]); > > > + svc_use = 1; > > > + > > > + do { > > > + /* > > > + * Get new command and move it to response list > > > + */ > > > + mutex_lock(&instance->lock); > > > + if (list_empty(&instance->cmd_list)) { > > > + /* no more commands to process */ > > > + mutex_unlock(&instance->lock); > > > + break; > > > + } > > > + cmd = list_first_entry(&instance->cmd_list, > > > + struct sm_cmd_rsp_blk, > > > head); > > > + list_move(&cmd->head, &instance->rsp_list); > > > + cmd->sent = 1; > > > + mutex_unlock(&instance->lock); > > > + > > > + /* Send the command */ > > > + status = > > > + bcm2835_vchi_msg_queue(instance- > > > >vchi_handle[0], > > > + cmd->msg, cmd- > > > >length); > > > + if (status) { > > > + pr_err("%s: failed to queue message > > > (%d)", > > > + __func__, status); > > > + } > > > + > > > + /* If no reply is needed then we're done */ > > > + if (!cmd->wait) { > > > + mutex_lock(&instance->lock); > > > + list_del(&cmd->head); > > > + mutex_unlock(&instance->lock); > > > + vc_vchi_cmd_delete(instance, cmd); > > > + continue; > > > + } > > > + > > > + if (status) { > > > + complete(&cmd->cmplt); > > > + continue; > > > + } > > > + > > > + } while (1); > > > + > > > + while (!vchi_msg_peek(instance->vchi_handle[0], (void > > > **)&reply, > > > + &reply_len, VCHI_FLAGS_NONE)) { > > > + if (reply->trans_id & 0x80000000) { > > > + /* Async event or cmd from the VPU */ > > > + if (instance->vpu_event) > > > + instance->vpu_event(instance, > > > reply, > > > + reply_len); > > > + } else { > > > + vc_sm_cma_vchi_rx_ack(instance, cmd, > > > reply, > > > + reply_len); > > > + } > > > + > > > + vchi_msg_remove(instance->vchi_handle[0]); > > > + } > > > + > > > + /* Go through the dead list and free them */ > > > + mutex_lock(&instance->lock); > > > + list_for_each_entry_safe(cmd, cmd_tmp, &instance- > > > >dead_list, > > > + head) { > > > + list_del(&cmd->head); > > > + vc_vchi_cmd_delete(instance, cmd); > > > + } > > > + mutex_unlock(&instance->lock); > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +static void vc_sm_cma_vchi_callback(void *param, > > > + const enum vchi_callback_reason > > > reason, > > > + void *msg_handle) > > > +{ > > > + struct sm_instance *instance = param; > > > + > > > + (void)msg_handle; > > > + > > > + switch (reason) { > > > + case VCHI_CALLBACK_MSG_AVAILABLE: > > > + complete(&instance->io_cmplt); > > > + break; > > > + > > > + case VCHI_CALLBACK_SERVICE_CLOSED: > > > + pr_info("%s: service CLOSED!!", __func__); > > > + default: > > > + break; > > > + } > > > +} > > > + > > > +struct sm_instance *vc_sm_cma_vchi_init(struct vchi_instance_handle > > > *vchi_instance, > > > + unsigned int num_connections, > > > + vpu_event_cb vpu_event) > > > +{ > > > + u32 i; > > > + struct sm_instance *instance; > > > + int status; > > > + > > > + pr_debug("%s: start", __func__); > > > + > > > + if (num_connections > VCHI_MAX_NUM_CONNECTIONS) { > > > + pr_err("%s: unsupported number of connections %u > > > (max=%u)", > > > + __func__, num_connections, > > > VCHI_MAX_NUM_CONNECTIONS); > > > + > > > + goto err_null; > > > + } > > > + /* Allocate memory for this instance */ > > > + instance = kzalloc(sizeof(*instance), GFP_KERNEL); > > > + > > > + /* Misc initialisations */ > > > + mutex_init(&instance->lock); > > > + init_completion(&instance->io_cmplt); > > > + INIT_LIST_HEAD(&instance->cmd_list); > > > + INIT_LIST_HEAD(&instance->rsp_list); > > > + INIT_LIST_HEAD(&instance->dead_list); > > > + INIT_LIST_HEAD(&instance->free_list); > > > + sema_init(&instance->free_sema, SM_MAX_NUM_CMD_RSP_BLKS); > > > + mutex_init(&instance->free_lock); > > > + for (i = 0; i < SM_MAX_NUM_CMD_RSP_BLKS; i++) { > > > + init_completion(&instance->free_blk[i].cmplt); > > > + list_add(&instance->free_blk[i].head, &instance- > > > >free_list); > > > + } > > > + > > > + /* Open the VCHI service connections */ > > > + instance->num_connections = num_connections; > > > + for (i = 0; i < num_connections; i++) { > > > + struct service_creation params = { > > > + .version = VCHI_VERSION_EX(VC_SM_VER, > > > VC_SM_MIN_VER), > > > + .service_id = VC_SM_SERVER_NAME, > > > + .callback = vc_sm_cma_vchi_callback, > > > + .callback_param = instance, > > > + }; > > > + > > > + status = vchi_service_open(vchi_instance, > > > + ¶ms, &instance- > > > >vchi_handle[i]); > > > + if (status) { > > > + pr_err("%s: failed to open VCHI service (%d)", > > > + __func__, status); > > > + > > > + goto err_close_services; > > > + } > > > + } > > > + > > > + /* Create the thread which takes care of all io to/from > > > videoocore. */ > > > + instance->io_thread = > > > kthread_create(&vc_sm_cma_vchi_videocore_io, > > > + (void *)instance, "SMIO"); > > > + if (!instance->io_thread) { > > > + pr_err("%s: failed to create SMIO thread", __func__); > > > + > > > + goto err_close_services; > > > + } > > > + instance->vpu_event = vpu_event; > > > + set_user_nice(instance->io_thread, -10); > > > + wake_up_process(instance->io_thread); > > > + > > > + pr_debug("%s: success - instance %p", __func__, instance); > > > + return instance; > > > + > > > +err_close_services: > > > + for (i = 0; i < instance->num_connections; i++) { > > > + if (instance->vchi_handle[i]) > > > + vchi_service_close(instance->vchi_handle[i]); > > > + } > > > + kfree(instance); > > > +err_null: > > > + pr_debug("%s: FAILED", __func__); > > > + return NULL; > > > +} > > > + > > > +int vc_sm_cma_vchi_stop(struct sm_instance **handle) > > > +{ > > > + struct sm_instance *instance; > > > + u32 i; > > > + > > > + if (!handle) { > > > + pr_err("%s: invalid pointer to handle %p", __func__, > > > handle); > > > + goto lock; > > > + } > > > + > > > + if (!*handle) { > > > + pr_err("%s: invalid handle %p", __func__, *handle); > > > + goto lock; > > > + } > > > + > > > + instance = *handle; > > > + > > > + /* Close all VCHI service connections */ > > > + for (i = 0; i < instance->num_connections; i++) { > > > + s32 success; > > > + > > > + vchi_service_use(instance->vchi_handle[i]); > > > + > > > + success = vchi_service_close(instance->vchi_handle[i]); > > > + } > > > + > > > + kfree(instance); > > > + > > > + *handle = NULL; > > > + return 0; > > > + > > > +lock: > > > + return -EINVAL; > > > +} > > > + > > > +static int vc_sm_cma_vchi_send_msg(struct sm_instance *handle, > > > + enum vc_sm_msg_type msg_id, void > > > *msg, > > > + u32 msg_size, void *result, u32 > > > result_size, > > > + u32 *cur_trans_id, u8 wait_reply) > > > +{ > > > + int status = 0; > > > + struct sm_instance *instance = handle; > > > + struct sm_cmd_rsp_blk *cmd_blk; > > > + > > > + if (!handle) { > > > + pr_err("%s: invalid handle", __func__); > > > + return -EINVAL; > > > + } > > > + if (!msg) { > > > + pr_err("%s: invalid msg pointer", __func__); > > > + return -EINVAL; > > > + } > > > + > > > + cmd_blk = > > > + vc_vchi_cmd_create(instance, msg_id, msg, msg_size, > > > wait_reply); > > > + if (!cmd_blk) { > > > + pr_err("[%s]: failed to allocate global tracking > > > resource", > > > + __func__); > > > + return -ENOMEM; > > > + } > > > + > > > + if (cur_trans_id) > > > + *cur_trans_id = cmd_blk->id; > > > + > > > + mutex_lock(&instance->lock); > > > + list_add_tail(&cmd_blk->head, &instance->cmd_list); > > > + mutex_unlock(&instance->lock); > > > + complete(&instance->io_cmplt); > > > + > > > + if (!wait_reply) > > > + /* We're done */ > > > + return 0; > > > + > > > + /* Wait for the response */ > > > + if (wait_for_completion_interruptible(&cmd_blk->cmplt)) { > > > + mutex_lock(&instance->lock); > > > + if (!cmd_blk->sent) { > > > + list_del(&cmd_blk->head); > > > + mutex_unlock(&instance->lock); > > > + vc_vchi_cmd_delete(instance, cmd_blk); > > > + return -ENXIO; > > > + } > > > + > > > + list_move(&cmd_blk->head, &instance->dead_list); > > > + mutex_unlock(&instance->lock); > > > + complete(&instance->io_cmplt); > > > + return -EINTR; /* We're done */ > > > + } > > > + > > > + if (result && result_size) { > > > + memcpy(result, cmd_blk->msg, result_size); > > > + } else { > > > + struct vc_sm_result_t *res = > > > + (struct vc_sm_result_t *)cmd_blk->msg; > > > + status = (res->success == 0) ? 0 : -ENXIO; > > > + } > > > + > > > + mutex_lock(&instance->lock); > > > + list_del(&cmd_blk->head); > > > + mutex_unlock(&instance->lock); > > > + vc_vchi_cmd_delete(instance, cmd_blk); > > > + return status; > > > +} > > > + > > > +int vc_sm_cma_vchi_free(struct sm_instance *handle, struct > > > vc_sm_free_t *msg, > > > + u32 *cur_trans_id) > > > +{ > > > + return vc_sm_cma_vchi_send_msg(handle, VC_SM_MSG_TYPE_FREE, > > > + msg, sizeof(*msg), 0, 0, > > > cur_trans_id, 0); > > > +} > > > + > > > +int vc_sm_cma_vchi_import(struct sm_instance *handle, struct > > > vc_sm_import *msg, > > > + struct vc_sm_import_result *result, u32 > > > *cur_trans_id) > > > +{ > > > + return vc_sm_cma_vchi_send_msg(handle, VC_SM_MSG_TYPE_IMPORT, > > > + msg, sizeof(*msg), result, > > > sizeof(*result), > > > + cur_trans_id, 1); > > > +} > > > + > > > +int vc_sm_cma_vchi_client_version(struct sm_instance *handle, > > > + struct vc_sm_version *msg, > > > + struct vc_sm_result_t *result, > > > + u32 *cur_trans_id) > > > +{ > > > + return vc_sm_cma_vchi_send_msg(handle, > > > VC_SM_MSG_TYPE_CLIENT_VERSION, > > > + //msg, sizeof(*msg), result, > > > sizeof(*result), > > > + //cur_trans_id, 1); > > > + msg, sizeof(*msg), NULL, 0, > > > + cur_trans_id, 0); > > > +} > > > + > > > +int vc_sm_vchi_client_vc_mem_req_reply(struct sm_instance *handle, > > > + struct > > > vc_sm_vc_mem_request_result *msg, > > > + uint32_t *cur_trans_id) > > > +{ > > > + return vc_sm_cma_vchi_send_msg(handle, > > > + VC_SM_MSG_TYPE_VC_MEM_REQUEST_RE > > > PLY, > > > + msg, sizeof(*msg), 0, 0, > > > cur_trans_id, > > > + 0); > > > +} > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h > > > b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h > > > new file mode 100644 > > > index 000000000000..e8db34bd1e91 > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h > > > @@ -0,0 +1,63 @@ > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > + > > > +/* > > > + * VideoCore Shared Memory CMA allocator > > > + * > > > + * Copyright: 2018, Raspberry Pi (Trading) Ltd > > > + * Copyright 2011-2012 Broadcom Corporation. All rights reserved. > > > + * > > > + * Based on vmcs_sm driver from Broadcom Corporation. > > > + * > > > + */ > > > + > > > +#ifndef __VC_SM_CMA_VCHI_H__INCLUDED__ > > > +#define __VC_SM_CMA_VCHI_H__INCLUDED__ > > > + > > > +#include "interface/vchi/vchi.h" > > > + > > > +#include "vc_sm_defs.h" > > > + > > > +/* > > > + * Forward declare. > > > + */ > > > +struct sm_instance; > > > + > > > +typedef void (*vpu_event_cb)(struct sm_instance *instance, > > > + struct vc_sm_result_t *reply, int > > > reply_len); > > > + > > > +/* > > > + * Initialize the shared memory service, opens up vchi connection to > > > talk to it. > > > + */ > > > +struct sm_instance *vc_sm_cma_vchi_init(struct vchi_instance_handle > > > *vchi_instance, > > > + unsigned int num_connections, > > > + vpu_event_cb vpu_event); > > > + > > > +/* > > > + * Terminates the shared memory service. > > > + */ > > > +int vc_sm_cma_vchi_stop(struct sm_instance **handle); > > > + > > > +/* > > > + * Ask the shared memory service to free up some memory that was > > > previously > > > + * allocated by the vc_sm_cma_vchi_alloc function call. > > > + */ > > > +int vc_sm_cma_vchi_free(struct sm_instance *handle, struct > > > vc_sm_free_t *msg, > > > + u32 *cur_trans_id); > > > + > > > +/* > > > + * Import a contiguous block of memory and wrap it in a GPU > > > MEM_HANDLE_T. > > > + */ > > > +int vc_sm_cma_vchi_import(struct sm_instance *handle, struct > > > vc_sm_import *msg, > > > + struct vc_sm_import_result *result, > > > + u32 *cur_trans_id); > > > + > > > +int vc_sm_cma_vchi_client_version(struct sm_instance *handle, > > > + struct vc_sm_version *msg, > > > + struct vc_sm_result_t *result, > > > + u32 *cur_trans_id); > > > + > > > +int vc_sm_vchi_client_vc_mem_req_reply(struct sm_instance *handle, > > > + struct > > > vc_sm_vc_mem_request_result *msg, > > > + uint32_t *cur_trans_id); > > > + > > > +#endif /* __VC_SM_CMA_VCHI_H__INCLUDED__ */ > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h > > > b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h > > > new file mode 100644 > > > index 000000000000..8a0d1f6dbfe8 > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h > > > @@ -0,0 +1,300 @@ > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > + > > > +/* > > > + * VideoCore Shared Memory CMA allocator > > > + * > > > + * Copyright: 2018, Raspberry Pi (Trading) Ltd > > > + * > > > + * Based on vc_sm_defs.h from the vmcs_sm driver Copyright Broadcom > > > Corporation. > > > + * All IPC messages are copied across to this file, even if the vc- > > > sm-cma > > > + * driver is not currently using them. > > > + * > > > + > > > ********************************************************************* > > > ******* > > > + */ > > > + > > > +#ifndef __VC_SM_DEFS_H__INCLUDED__ > > > +#define __VC_SM_DEFS_H__INCLUDED__ > > > + > > > +/* FourCC code used for VCHI connection */ > > > +#define VC_SM_SERVER_NAME MAKE_FOURCC("SMEM") > > > + > > > +/* Maximum message length */ > > > +#define VC_SM_MAX_MSG_LEN (sizeof(union vc_sm_msg_union_t) + \ > > > + sizeof(struct vc_sm_msg_hdr_t)) > > > +#define VC_SM_MAX_RSP_LEN (sizeof(union vc_sm_msg_union_t)) > > > + > > > +/* Resource name maximum size */ > > > +#define VC_SM_RESOURCE_NAME 32 > > > + > > > +/* > > > + * Version to be reported to the VPU > > > + * VPU assumes 0 (aka 1) which does not require the released > > > callback, nor > > > + * expect the client to handle VC_MEM_REQUESTS. > > > + * Version 2 requires the released callback, and must support > > > VC_MEM_REQUESTS. > > > + */ > > > +#define VC_SM_PROTOCOL_VERSION 2 > > > + > > > +enum vc_sm_msg_type { > > > + /* Message types supported for HOST->VC direction */ > > > + > > > + /* Allocate shared memory block */ > > > + VC_SM_MSG_TYPE_ALLOC, > > > + /* Lock allocated shared memory block */ > > > + VC_SM_MSG_TYPE_LOCK, > > > + /* Unlock allocated shared memory block */ > > > + VC_SM_MSG_TYPE_UNLOCK, > > > + /* Unlock allocated shared memory block, do not answer command > > > */ > > > + VC_SM_MSG_TYPE_UNLOCK_NOANS, > > > + /* Free shared memory block */ > > > + VC_SM_MSG_TYPE_FREE, > > > + /* Resize a shared memory block */ > > > + VC_SM_MSG_TYPE_RESIZE, > > > + /* Walk the allocated shared memory block(s) */ > > > + VC_SM_MSG_TYPE_WALK_ALLOC, > > > + > > > + /* A previously applied action will need to be reverted */ > > > + VC_SM_MSG_TYPE_ACTION_CLEAN, > > > + > > > + /* > > > + * Import a physical address and wrap into a MEM_HANDLE_T. > > > + * Release with VC_SM_MSG_TYPE_FREE. > > > + */ > > > + VC_SM_MSG_TYPE_IMPORT, > > > + /* > > > + *Tells VC the protocol version supported by this client. > > > + * 2 supports the async/cmd messages from the VPU for final > > > release > > > + * of memory, and for VC allocations. > > > + */ > > > + VC_SM_MSG_TYPE_CLIENT_VERSION, > > > + /* Response to VC request for memory */ > > > + VC_SM_MSG_TYPE_VC_MEM_REQUEST_REPLY, > > > + > > > + /* > > > + * Asynchronous/cmd messages supported for VC->HOST direction. > > > + * Signalled by setting the top bit in vc_sm_result_t trans_id. > > > + */ > > > + > > > + /* > > > + * VC has finished with an imported memory allocation. > > > + * Release any Linux reference counts on the underlying block. > > > + */ > > > + VC_SM_MSG_TYPE_RELEASED, > > > + /* VC request for memory */ > > > + VC_SM_MSG_TYPE_VC_MEM_REQUEST, > > > + > > > + VC_SM_MSG_TYPE_MAX > > > +}; > > > + > > > +/* Type of memory to be allocated */ > > > +enum vc_sm_alloc_type_t { > > > + VC_SM_ALLOC_CACHED, > > > + VC_SM_ALLOC_NON_CACHED, > > > +}; > > > + > > > +/* Message header for all messages in HOST->VC direction */ > > > +struct vc_sm_msg_hdr_t { > > > + u32 type; > > > + u32 trans_id; > > > + u8 body[0]; > > > + > > > +}; > > > + > > > +/* Request to allocate memory (HOST->VC) */ > > > +struct vc_sm_alloc_t { > > > + /* type of memory to allocate */ > > > + enum vc_sm_alloc_type_t type; > > > + /* byte amount of data to allocate per unit */ > > > + u32 base_unit; > > > + /* number of unit to allocate */ > > > + u32 num_unit; > > > + /* alignment to be applied on allocation */ > > > + u32 alignment; > > > + /* identity of who allocated this block */ > > > + u32 allocator; > > > + /* resource name (for easier tracking on vc side) */ > > > + char name[VC_SM_RESOURCE_NAME]; > > > + > > > +}; > > > + > > > +/* Result of a requested memory allocation (VC->HOST) */ > > > +struct vc_sm_alloc_result_t { > > > + /* Transaction identifier */ > > > + u32 trans_id; > > > + > > > + /* Resource handle */ > > > + u32 res_handle; > > > + /* Pointer to resource buffer */ > > > + u32 res_mem; > > > + /* Resource base size (bytes) */ > > > + u32 res_base_size; > > > + /* Resource number */ > > > + u32 res_num; > > > + > > > +}; > > > + > > > +/* Request to free a previously allocated memory (HOST->VC) */ > > > +struct vc_sm_free_t { > > > + /* Resource handle (returned from alloc) */ > > > + u32 res_handle; > > > + /* Resource buffer (returned from alloc) */ > > > + u32 res_mem; > > > + > > > +}; > > > + > > > +/* Request to lock a previously allocated memory (HOST->VC) */ > > > +struct vc_sm_lock_unlock_t { > > > + /* Resource handle (returned from alloc) */ > > > + u32 res_handle; > > > + /* Resource buffer (returned from alloc) */ > > > + u32 res_mem; > > > + > > > +}; > > > + > > > +/* Request to resize a previously allocated memory (HOST->VC) */ > > > +struct vc_sm_resize_t { > > > + /* Resource handle (returned from alloc) */ > > > + u32 res_handle; > > > + /* Resource buffer (returned from alloc) */ > > > + u32 res_mem; > > > + /* Resource *new* size requested (bytes) */ > > > + u32 res_new_size; > > > + > > > +}; > > > + > > > +/* Result of a requested memory lock (VC->HOST) */ > > > +struct vc_sm_lock_result_t { > > > + /* Transaction identifier */ > > > + u32 trans_id; > > > + > > > + /* Resource handle */ > > > + u32 res_handle; > > > + /* Pointer to resource buffer */ > > > + u32 res_mem; > > > + /* > > > + * Pointer to former resource buffer if the memory > > > + * was reallocated > > > + */ > > > + u32 res_old_mem; > > > + > > > +}; > > > + > > > +/* Generic result for a request (VC->HOST) */ > > > +struct vc_sm_result_t { > > > + /* Transaction identifier */ > > > + u32 trans_id; > > > + > > > + s32 success; > > > + > > > +}; > > > + > > > +/* Request to revert a previously applied action (HOST->VC) */ > > > +struct vc_sm_action_clean_t { > > > + /* Action of interest */ > > > + enum vc_sm_msg_type res_action; > > > + /* Transaction identifier for the action of interest */ > > > + u32 action_trans_id; > > > + > > > +}; > > > + > > > +/* Request to remove all data associated with a given allocator > > > (HOST->VC) */ > > > +struct vc_sm_free_all_t { > > > + /* Allocator identifier */ > > > + u32 allocator; > > > +}; > > > + > > > +/* Request to import memory (HOST->VC) */ > > > +struct vc_sm_import { > > > + /* type of memory to allocate */ > > > + enum vc_sm_alloc_type_t type; > > > + /* pointer to the VC (ie physical) address of the allocated > > > memory */ > > > + u32 addr; > > > + /* size of buffer */ > > > + u32 size; > > > + /* opaque handle returned in RELEASED messages */ > > > + u32 kernel_id; > > > + /* Allocator identifier */ > > > + u32 allocator; > > > + /* resource name (for easier tracking on vc side) */ > > > + char name[VC_SM_RESOURCE_NAME]; > > > +}; > > > + > > > +/* Result of a requested memory import (VC->HOST) */ > > > +struct vc_sm_import_result { > > > + /* Transaction identifier */ > > > + u32 trans_id; > > > + > > > + /* Resource handle */ > > > + u32 res_handle; > > > +}; > > > + > > > +/* Notification that VC has finished with an allocation (VC->HOST) > > > */ > > > +struct vc_sm_released { > > > + /* cmd type / trans_id */ > > > + u32 cmd; > > > + > > > + /* pointer to the VC (ie physical) address of the allocated > > > memory */ > > > + u32 addr; > > > + /* size of buffer */ > > > + u32 size; > > > + /* opaque handle returned in RELEASED messages */ > > > + u32 kernel_id; > > > + u32 vc_handle; > > > +}; > > > + > > > +/* > > > + * Client informing VC as to the protocol version it supports. > > > + * >=2 requires the released callback, and supports VC asking for > > > memory. > > > + * Failure means that the firmware doesn't support this call, and > > > therefore the > > > + * client should either fail, or NOT rely on getting the released > > > callback. > > > + */ > > > +struct vc_sm_version { > > > + u32 version; > > > +}; > > > + > > > +/* Request FROM VideoCore for some memory */ > > > +struct vc_sm_vc_mem_request { > > > + /* cmd type */ > > > + u32 cmd; > > > + > > > + /* trans_id (from VPU) */ > > > + u32 trans_id; > > > + /* size of buffer */ > > > + u32 size; > > > + /* alignment of buffer */ > > > + u32 align; > > > + /* resource name (for easier tracking) */ > > > + char name[VC_SM_RESOURCE_NAME]; > > > + /* VPU handle for the resource */ > > > + u32 vc_handle; > > > +}; > > > + > > > +/* Response from the kernel to provide the VPU with some memory */ > > > +struct vc_sm_vc_mem_request_result { > > > + /* Transaction identifier for the VPU */ > > > + u32 trans_id; > > > + /* pointer to the physical address of the allocated memory */ > > > + u32 addr; > > > + /* opaque handle returned in RELEASED messages */ > > > + u32 kernel_id; > > > +}; > > > + > > > +/* Union of ALL messages */ > > > +union vc_sm_msg_union_t { > > > + struct vc_sm_alloc_t alloc; > > > + struct vc_sm_alloc_result_t alloc_result; > > > + struct vc_sm_free_t free; > > > + struct vc_sm_lock_unlock_t lock_unlock; > > > + struct vc_sm_action_clean_t action_clean; > > > + struct vc_sm_resize_t resize; > > > + struct vc_sm_lock_result_t lock_result; > > > + struct vc_sm_result_t result; > > > + struct vc_sm_free_all_t free_all; > > > + struct vc_sm_import import; > > > + struct vc_sm_import_result import_result; > > > + struct vc_sm_version version; > > > + struct vc_sm_released released; > > > + struct vc_sm_vc_mem_request vc_request; > > > + struct vc_sm_vc_mem_request_result vc_request_result; > > > +}; > > > + > > > +#endif /* __VC_SM_DEFS_H__INCLUDED__ */ > > > diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h > > > b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h > > > new file mode 100644 > > > index 000000000000..988fdd967922 > > > --- /dev/null > > > +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h > > > @@ -0,0 +1,28 @@ > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > + > > > +/* > > > + * VideoCore Shared Memory CMA allocator > > > + * > > > + * Copyright: 2018, Raspberry Pi (Trading) Ltd > > > + * > > > + * Based on vc_sm_defs.h from the vmcs_sm driver Copyright Broadcom > > > Corporation. > > > + * > > > + */ > > > + > > > +#ifndef __VC_SM_KNL_H__INCLUDED__ > > > +#define __VC_SM_KNL_H__INCLUDED__ > > > + > > > +#if !defined(__KERNEL__) > > > +#error "This interface is for kernel use only..." > > > +#endif > > > + > > > +/* Free a previously allocated or imported shared memory handle and > > > block. */ > > > +int vc_sm_cma_free(void *handle); > > > + > > > +/* Get an internal resource handle mapped from the external one. */ > > > +int vc_sm_cma_int_handle(void *handle); > > > + > > > +/* Import a block of memory into the GPU space. */ > > > +int vc_sm_cma_import_dmabuf(struct dma_buf *dmabuf, void **handle); > > > + > > > +#endif /* __VC_SM_KNL_H__INCLUDED__ */ > >
Hi Jacopo On Mon, 24 Aug 2020 at 17:36, Jacopo Mondi <jacopo@jmondi.org> wrote: > > Hi Dave, Nicolas, Laurent, > > On Wed, May 06, 2020 at 08:24:38PM +0100, Dave Stevenson wrote: > > Hi Nicolas > > > > On Wed, 6 May 2020 at 19:04, Nicolas Saenz Julienne > > <nsaenzjulienne@suse.de> wrote: > > > > > > Hi Laurent, Dave, > > > > > > On Mon, 2020-05-04 at 12:25 +0300, Laurent Pinchart wrote: > > > > From: Dave Stevenson <dave.stevenson@raspberrypi.org> > > > > > > > > Add Broadcom VideoCore Shared Memory support. > > > > > > > > This new driver allows contiguous memory blocks to be imported > > > > into the VideoCore VPU memory map, and manages the lifetime of > > > > those objects, only releasing the source dmabuf once the VPU has > > > > confirmed it has finished with it. > > > > > > > > > > I'm still digesting all this, but a question came up, who is using the > > > ioctls? > > > > We have a userspace library that uses it [1]. > > It is used by things like MMAL to share buffers between the VPU and > > ARM, rather than having to get VCHI to copy all the data between > > mirrored buffers. > > > > I think what has happened here is that Laurent has picked up the > > version of the driver from the top of our downstream kernel tree. > > For libcamera and the ISP driver, we need a significantly smaller > > feature set, basically import of dmabufs only, no allocations or cache > > management. For the ISP driver it's mainly dmabuf import from > > videobuf2 for the image buffers, but there's also a need to pass in > > lens shading tables which are relatively large. With a small amount of > > rework in libcamera, we can make it so that we use dma-buf heaps to do > > the allocation, and pass in a dmabuf fd to the ISP driver to then map > > onto the VPU. That removes all the ioctls handling from this driver. > > > > Downstream we do have other use cases that want to be able to do other > > functions on shared memory, but that too should be reworkable into > > using dma-buf heaps for allocations, and vcsm only handles importing > > dmabufs via an ioctl. All that can be hidden away in the vcsm library, > > so applications don't care. > > We've also got some legacy code kicking around, as there was > > originally a version of the driver that mapped the VPU's memory blocks > > to the ARM. That's why the vcsm library has two code paths through > > almost every function - one for each driver. > > > > Laurent: What's your view? Halt the review this particular patch for > > now and rework, or try and get this all integrated? > > Mainline obviously already has dma-buf heaps merged, whilst I have a > > PR cherry-picking it back into our downstream 5.4. The main reason it > > hasn't been merged is that I haven't had a test case to prove it > > works. The rework should be relatively simple, but will need small > > updates to both libcamera and ISP driver. > > As months have passed, libcamera moved to allocate lens shading tables > using dma-buf heaps and the only user I can name of the vc-sm-cma > driver is the actual ISP, that needs to import the dmabuf pointing to > the lens shading maps with vc_sm_cma_import_dmabuf(). You've also got vc04_services/vchiq-mmal/mmal-vchiq.c importing dmabufs, either from vb2_contig or imported from elsewhere when using VB2_MEMORY_DMABUF. > Upstreaming the whole vc-sm-cma driver as it is for this single kAPI > seems a bit a no-go. Dave, what would you prefer here ? Should I > provide a minimal vc-sm-cam driver that only performs buffer importing > to support the ISP driver ? Is the buffer importing into VPU there to > stay or is its usage transitional and can be kept out of the next > submission of this series ? Both imports are here to stay as the VPU needs to be able to use those blocks of memory. This first iteration picked up a fair number of extraneous lumps (eg the caching calls). I got a reminder last week that I promised a reworked version of vc-sm-cma to you and I hadn't done it - sorry, juggling too many things. I'll get on it now, so nudge me if I haven't pushed it to you by the end of the week for your review. We can trim it down significantly now that we have dma-heaps in and working. There's a niggle that the current dma-heaps are always cached on the ARM, but that just means that the user has to be careful to use DMA_BUF_IOCTL_SYNC correctly (which they should be doing anyway). Whilst waiting for that, the Unicam driver, and the prep work in mmal-vchiq could all be pushed first, and ideally as two independent patchsets as there are no inter-dependencies between them. Dave > Thanks > j > > > > > Dave > > > > [1] https://github.com/raspberrypi/userland/tree/master/host_applications/linux/libs/sm > > > > > Regards, > > > Nicolas > > >
Hi Dave, On Tue, Aug 25, 2020 at 06:52:18PM +0100, Dave Stevenson wrote: > Hi Jacopo > > On Mon, 24 Aug 2020 at 17:36, Jacopo Mondi <jacopo@jmondi.org> wrote: > > > > Hi Dave, Nicolas, Laurent, > > > > On Wed, May 06, 2020 at 08:24:38PM +0100, Dave Stevenson wrote: > > > Hi Nicolas > > > > > > On Wed, 6 May 2020 at 19:04, Nicolas Saenz Julienne > > > <nsaenzjulienne@suse.de> wrote: > > > > > > > > Hi Laurent, Dave, > > > > > > > > On Mon, 2020-05-04 at 12:25 +0300, Laurent Pinchart wrote: > > > > > From: Dave Stevenson <dave.stevenson@raspberrypi.org> > > > > > > > > > > Add Broadcom VideoCore Shared Memory support. > > > > > > > > > > This new driver allows contiguous memory blocks to be imported > > > > > into the VideoCore VPU memory map, and manages the lifetime of > > > > > those objects, only releasing the source dmabuf once the VPU has > > > > > confirmed it has finished with it. > > > > > > > > > > > > > I'm still digesting all this, but a question came up, who is using the > > > > ioctls? > > > > > > We have a userspace library that uses it [1]. > > > It is used by things like MMAL to share buffers between the VPU and > > > ARM, rather than having to get VCHI to copy all the data between > > > mirrored buffers. > > > > > > I think what has happened here is that Laurent has picked up the > > > version of the driver from the top of our downstream kernel tree. > > > For libcamera and the ISP driver, we need a significantly smaller > > > feature set, basically import of dmabufs only, no allocations or cache > > > management. For the ISP driver it's mainly dmabuf import from > > > videobuf2 for the image buffers, but there's also a need to pass in > > > lens shading tables which are relatively large. With a small amount of > > > rework in libcamera, we can make it so that we use dma-buf heaps to do > > > the allocation, and pass in a dmabuf fd to the ISP driver to then map > > > onto the VPU. That removes all the ioctls handling from this driver. > > > > > > Downstream we do have other use cases that want to be able to do other > > > functions on shared memory, but that too should be reworkable into > > > using dma-buf heaps for allocations, and vcsm only handles importing > > > dmabufs via an ioctl. All that can be hidden away in the vcsm library, > > > so applications don't care. > > > We've also got some legacy code kicking around, as there was > > > originally a version of the driver that mapped the VPU's memory blocks > > > to the ARM. That's why the vcsm library has two code paths through > > > almost every function - one for each driver. > > > > > > Laurent: What's your view? Halt the review this particular patch for > > > now and rework, or try and get this all integrated? > > > Mainline obviously already has dma-buf heaps merged, whilst I have a > > > PR cherry-picking it back into our downstream 5.4. The main reason it > > > hasn't been merged is that I haven't had a test case to prove it > > > works. The rework should be relatively simple, but will need small > > > updates to both libcamera and ISP driver. > > > > As months have passed, libcamera moved to allocate lens shading tables > > using dma-buf heaps and the only user I can name of the vc-sm-cma > > driver is the actual ISP, that needs to import the dmabuf pointing to > > the lens shading maps with vc_sm_cma_import_dmabuf(). > > You've also got vc04_services/vchiq-mmal/mmal-vchiq.c importing > dmabufs, either from vb2_contig or imported from elsewhere when using > VB2_MEMORY_DMABUF. Of course. Re-looking at it, the lens-shading tables are allocated on dmabuf heaps and the exported dmabuf fd passed with a custom control to the ISP, which uses it to set a mmal port parameter. I got lost in the code base at mmal-vchiq.c:port_parameter_set(), which receives a struct bcm2835_isp_lens_shading which contains the dmabuf fd. I assume it then maps it into the VPU memory to access the shading tables. But of course buffer queueing to the ISP requires dmabuf importing in the VPU, and that happens by 'submitting' a buffer to mmal-vchiq vchiq_mmal_submit_buffer() which does that by calling vc_sm_cma_import_dmabuf(). I hope I have a more clear idea of the two paths now. > > > Upstreaming the whole vc-sm-cma driver as it is for this single kAPI > > seems a bit a no-go. Dave, what would you prefer here ? Should I > > provide a minimal vc-sm-cam driver that only performs buffer importing > > to support the ISP driver ? Is the buffer importing into VPU there to > > stay or is its usage transitional and can be kept out of the next > > submission of this series ? > > Both imports are here to stay as the VPU needs to be able to use those > blocks of memory. > Of course. I was wondering if a fairly big component like vc-sma-cma isn't too much for just importing, and reading further it seems like this is a shared concern. > This first iteration picked up a fair number of extraneous lumps (eg > the caching calls). > I got a reminder last week that I promised a reworked version of > vc-sm-cma to you and I hadn't done it - sorry, juggling too many > things. I'll get on it now, so nudge me if I haven't pushed it to you > by the end of the week for your review. Great, so I'll wait for news from your side > > We can trim it down significantly now that we have dma-heaps in and > working. There's a niggle that the current dma-heaps are always cached > on the ARM, but that just means that the user has to be careful to use > DMA_BUF_IOCTL_SYNC correctly (which they should be doing anyway). I am running what was meant to be a v2 of this series and I get a complaint: vc_sm_cma_import_dmabuf_internal: Expecting an uncached alias for dma_addr When I read this paragraph from your email yesterday I immediately thought "this should be the LSC table". Debugging it further I found out it's actually a vb2 buffer. I have reduced the list of patches in v2 compared to this long one, and I'm probably left out something relevant :/ > > Whilst waiting for that, the Unicam driver, and the prep work in > mmal-vchiq could all be pushed first, and ideally as two independent > patchsets as there are no inter-dependencies between them. I could start sending out the unicam driver, yes. Currently I'm a bit stuck not being able to receive frames from the unicam driver. I see the buffers being returned by the ISR routine, but I never get a buffer available notification in libcamera. There's been a few changes to the downstream unicam driver (ie requesting the VPU clock frequency) and I see the RPi mainline support has moved forward quite a bit since v5.8. Are you aware of any trivial change I might be missing that could cause this ? Thanks j > > Dave > > > Thanks > > j > > > > > > > > Dave > > > > > > [1] https://github.com/raspberrypi/userland/tree/master/host_applications/linux/libs/sm > > > > > > > Regards, > > > > Nicolas > > > >
On Thu, 27 Aug 2020 at 11:34, Jacopo Mondi <jacopo@jmondi.org> wrote: > > Hi Dave, > > On Tue, Aug 25, 2020 at 06:52:18PM +0100, Dave Stevenson wrote: > > Hi Jacopo > > > > On Mon, 24 Aug 2020 at 17:36, Jacopo Mondi <jacopo@jmondi.org> wrote: > > > > > > Hi Dave, Nicolas, Laurent, > > > > > > On Wed, May 06, 2020 at 08:24:38PM +0100, Dave Stevenson wrote: > > > > Hi Nicolas > > > > > > > > On Wed, 6 May 2020 at 19:04, Nicolas Saenz Julienne > > > > <nsaenzjulienne@suse.de> wrote: > > > > > > > > > > Hi Laurent, Dave, > > > > > > > > > > On Mon, 2020-05-04 at 12:25 +0300, Laurent Pinchart wrote: > > > > > > From: Dave Stevenson <dave.stevenson@raspberrypi.org> > > > > > > > > > > > > Add Broadcom VideoCore Shared Memory support. > > > > > > > > > > > > This new driver allows contiguous memory blocks to be imported > > > > > > into the VideoCore VPU memory map, and manages the lifetime of > > > > > > those objects, only releasing the source dmabuf once the VPU has > > > > > > confirmed it has finished with it. > > > > > > > > > > > > > > > > I'm still digesting all this, but a question came up, who is using the > > > > > ioctls? > > > > > > > > We have a userspace library that uses it [1]. > > > > It is used by things like MMAL to share buffers between the VPU and > > > > ARM, rather than having to get VCHI to copy all the data between > > > > mirrored buffers. > > > > > > > > I think what has happened here is that Laurent has picked up the > > > > version of the driver from the top of our downstream kernel tree. > > > > For libcamera and the ISP driver, we need a significantly smaller > > > > feature set, basically import of dmabufs only, no allocations or cache > > > > management. For the ISP driver it's mainly dmabuf import from > > > > videobuf2 for the image buffers, but there's also a need to pass in > > > > lens shading tables which are relatively large. With a small amount of > > > > rework in libcamera, we can make it so that we use dma-buf heaps to do > > > > the allocation, and pass in a dmabuf fd to the ISP driver to then map > > > > onto the VPU. That removes all the ioctls handling from this driver. > > > > > > > > Downstream we do have other use cases that want to be able to do other > > > > functions on shared memory, but that too should be reworkable into > > > > using dma-buf heaps for allocations, and vcsm only handles importing > > > > dmabufs via an ioctl. All that can be hidden away in the vcsm library, > > > > so applications don't care. > > > > We've also got some legacy code kicking around, as there was > > > > originally a version of the driver that mapped the VPU's memory blocks > > > > to the ARM. That's why the vcsm library has two code paths through > > > > almost every function - one for each driver. > > > > > > > > Laurent: What's your view? Halt the review this particular patch for > > > > now and rework, or try and get this all integrated? > > > > Mainline obviously already has dma-buf heaps merged, whilst I have a > > > > PR cherry-picking it back into our downstream 5.4. The main reason it > > > > hasn't been merged is that I haven't had a test case to prove it > > > > works. The rework should be relatively simple, but will need small > > > > updates to both libcamera and ISP driver. > > > > > > As months have passed, libcamera moved to allocate lens shading tables > > > using dma-buf heaps and the only user I can name of the vc-sm-cma > > > driver is the actual ISP, that needs to import the dmabuf pointing to > > > the lens shading maps with vc_sm_cma_import_dmabuf(). > > > > You've also got vc04_services/vchiq-mmal/mmal-vchiq.c importing > > dmabufs, either from vb2_contig or imported from elsewhere when using > > VB2_MEMORY_DMABUF. > > Of course. Re-looking at it, the lens-shading tables are allocated on > dmabuf heaps and the exported dmabuf fd passed with a custom control to the > ISP, which uses it to set a mmal port parameter. I got lost in the code > base at mmal-vchiq.c:port_parameter_set(), which receives a > struct bcm2835_isp_lens_shading which contains the dmabuf fd. I assume > it then maps it into the VPU memory to access the shading tables. > > But of course buffer queueing to the ISP requires dmabuf importing in > the VPU, and that happens by 'submitting' a buffer to mmal-vchiq > vchiq_mmal_submit_buffer() which does that by calling > vc_sm_cma_import_dmabuf(). > > I hope I have a more clear idea of the two paths now. > > > > > > Upstreaming the whole vc-sm-cma driver as it is for this single kAPI > > > seems a bit a no-go. Dave, what would you prefer here ? Should I > > > provide a minimal vc-sm-cam driver that only performs buffer importing > > > to support the ISP driver ? Is the buffer importing into VPU there to > > > stay or is its usage transitional and can be kept out of the next > > > submission of this series ? > > > > Both imports are here to stay as the VPU needs to be able to use those > > blocks of memory. > > > > Of course. I was wondering if a fairly big component like vc-sma-cma > isn't too much for just importing, and reading further it seems like > this is a shared concern. > > > This first iteration picked up a fair number of extraneous lumps (eg > > the caching calls). > > I got a reminder last week that I promised a reworked version of > > vc-sm-cma to you and I hadn't done it - sorry, juggling too many > > things. I'll get on it now, so nudge me if I haven't pushed it to you > > by the end of the week for your review. > > Great, so I'll wait for news from your side > > > > > We can trim it down significantly now that we have dma-heaps in and > > working. There's a niggle that the current dma-heaps are always cached > > on the ARM, but that just means that the user has to be careful to use > > DMA_BUF_IOCTL_SYNC correctly (which they should be doing anyway). > > I am running what was meant to be a v2 of this series and I get a > complaint: > vc_sm_cma_import_dmabuf_internal: Expecting an uncached alias for dma_addr > > When I read this paragraph from your email yesterday I immediately > thought "this should be the LSC table". > > Debugging it further I found out it's actually a vb2 buffer. I have > reduced the list of patches in v2 compared to this long one, and I'm > probably left out something relevant :/ vb2 allocated by the ISP (VB2_MEMORY_MMAP), or from Unicam that is then imported into the ISP (VB2_MEMORY_DMABUF)? The former is the dma-ranges being incorrectly set, and the reason for the patch where VCHIQ children inherit the parent's dma config. It's possible something else has changed in the setup since. The latter is likely to be more involved and depend on what actually allocated it (which may mean I'm using the wrong API calls). I'm getting the dma address via sg_dma_address having attached and mapped the dmabuf. I'm expecting that dma address to therefore follow the dma-ranges of my device (not the allocator), but I'm not 100% certain that is what does happen. A few more details of what exactly the use case that triggers it would be useful. > > > > Whilst waiting for that, the Unicam driver, and the prep work in > > mmal-vchiq could all be pushed first, and ideally as two independent > > patchsets as there are no inter-dependencies between them. > > I could start sending out the unicam driver, yes. > > Currently I'm a bit stuck not being able to receive frames from the > unicam driver. I see the buffers being returned by the ISR routine, > but I never get a buffer available notification in libcamera. > > There's been a few changes to the downstream unicam driver (ie > requesting the VPU clock frequency) and I see the RPi mainline support > has moved forward quite a bit since v5.8. Are you aware of any trivial > change I might be missing that could cause this ? Things never stand still! Requesting the VPU clock is to avoid a FIFO overflow. We've gained pixel format support (with defines and docs) for Y12P and Y14P. And hopefully I fixed up all the review comments from v1. It's hard to guess why libcamera isn't happy if we're getting ISRs. We do need to get the appropriate flags in the ISR for frame end (FEI or PI0). Is this Pi3 or Pi4 that you're testing on? Pi3 support should be sound on mainline. AFAIK Pi4 is still a work in progress. Can you stream just using v4l2-ctl --stream-mmap=3 --stream-count=1000 --stream-to=/dev/null ? That should work with /dev/video0. Getting the embedded data is more involved over the ordering of opening and starting streaming on the nodes. (We do have an open issue regarding getting the correct DMA address for Unicam on PI0 & 1. Those share the L2 cache for many things so dma-ranges is set differently, and not in a way that currently works with the Unicam driver. That one may need a followup fix.) Dave > Thanks > j > > > > > Dave > > > > > Thanks > > > j > > > > > > > > > > > Dave > > > > > > > > [1] https://github.com/raspberrypi/userland/tree/master/host_applications/linux/libs/sm > > > > > > > > > Regards, > > > > > Nicolas > > > > >
Hi Dave, On Thu, Aug 27, 2020 at 01:51:07PM +0100, Dave Stevenson wrote: > On Thu, 27 Aug 2020 at 11:34, Jacopo Mondi <jacopo@jmondi.org> wrote: [snip] > > > > > > We can trim it down significantly now that we have dma-heaps in and > > > working. There's a niggle that the current dma-heaps are always cached > > > on the ARM, but that just means that the user has to be careful to use > > > DMA_BUF_IOCTL_SYNC correctly (which they should be doing anyway). > > > > I am running what was meant to be a v2 of this series and I get a > > complaint: > > vc_sm_cma_import_dmabuf_internal: Expecting an uncached alias for dma_addr > > > > When I read this paragraph from your email yesterday I immediately > > thought "this should be the LSC table". > > > > Debugging it further I found out it's actually a vb2 buffer. I have > > reduced the list of patches in v2 compared to this long one, and I'm > > probably left out something relevant :/ > > vb2 allocated by the ISP (VB2_MEMORY_MMAP), or from Unicam that is > then imported into the ISP (VB2_MEMORY_DMABUF)? > > The former is the dma-ranges being incorrectly set, and the reason for > the patch where VCHIQ children inherit the parent's dma config. It's > possible something else has changed in the setup since. Re-introducing those two patches which I left out yesterday waiting for more comments made the warning go away, so I presume that was memory allocated on the ISP, exported as dmabuf by libcamera, and then re-imported in the video device (that's what our FrameBufferAllocator does, and I was testing with 'cam' which uses that class to reserve memory per-stream). I have a discussion open with Phil and Nicolas to see how those two patches might be made upstream consumable, but I'll remember to keep them in when testing. > > The latter is likely to be more involved and depend on what actually > allocated it (which may mean I'm using the wrong API calls). > I'm getting the dma address via sg_dma_address having attached and > mapped the dmabuf. I'm expecting that dma address to therefore follow > the dma-ranges of my device (not the allocator), but I'm not 100% > certain that is what does happen. > > A few more details of what exactly the use case that triggers it would > be useful. > > > > > > > Whilst waiting for that, the Unicam driver, and the prep work in > > > mmal-vchiq could all be pushed first, and ideally as two independent > > > patchsets as there are no inter-dependencies between them. > > > > I could start sending out the unicam driver, yes. > > > > Currently I'm a bit stuck not being able to receive frames from the > > unicam driver. I see the buffers being returned by the ISR routine, > > but I never get a buffer available notification in libcamera. > > > > There's been a few changes to the downstream unicam driver (ie > > requesting the VPU clock frequency) and I see the RPi mainline support > > has moved forward quite a bit since v5.8. Are you aware of any trivial > > change I might be missing that could cause this ? > > Things never stand still! Isn't it great ? :D > Requesting the VPU clock is to avoid a FIFO overflow. > We've gained pixel format support (with defines and docs) for Y12P and Y14P. > And hopefully I fixed up all the review comments from v1. Do you think it's worth upstreaming those parts in v2 or should it be done on top ? I should check if the VPU clock is exposed or not in mainline first... > > It's hard to guess why libcamera isn't happy if we're getting ISRs. We > do need to get the appropriate flags in the ISR for frame end (FEI or > PI0). > Is this Pi3 or Pi4 that you're testing on? Pi3 support should be sound > on mainline. AFAIK Pi4 is still a work in progress. > Can you stream just using v4l2-ctl --stream-mmap=3 --stream-count=1000 > --stream-to=/dev/null ? That should work with /dev/video0. Getting the > embedded data is more involved over the ordering of opening and > starting streaming on the nodes. It's a Pi4. After a pleasant day of debugging I got a nice trace that shows me that it's actually the buffer importing part that hangs on a completion in vc_sm_cma_vchi_import. In mainline the whole vchi interface got dropped and I got to port the vc-sma-cma driver to use the vchiq interface directly. I might have screwed something up and I'm now looking suspiciously at this thread function: "vc_sm_cma_vchi_videocore_io()" (also because I had to move it to use msg_hold+msg_release, as peek+remove was killed by: b5f1547b6e3bd ("staging: vchi: Get rid of vchi_msg_peek()") I'll look into that again. In the meantime is there any chance this rings any bell to you? https://paste.debian.net/1161469/ Thanks j > > (We do have an open issue regarding getting the correct DMA address > for Unicam on PI0 & 1. Those share the L2 cache for many things so > dma-ranges is set differently, and not in a way that currently works > with the Unicam driver. That one may need a followup fix.) > > Dave >
Hi Jacopo On Thu, 27 Aug 2020 at 17:42, Jacopo Mondi <jacopo@jmondi.org> wrote: > > Hi Dave, > > On Thu, Aug 27, 2020 at 01:51:07PM +0100, Dave Stevenson wrote: > > On Thu, 27 Aug 2020 at 11:34, Jacopo Mondi <jacopo@jmondi.org> wrote: > > [snip] > > > > > > > > > We can trim it down significantly now that we have dma-heaps in and > > > > working. There's a niggle that the current dma-heaps are always cached > > > > on the ARM, but that just means that the user has to be careful to use > > > > DMA_BUF_IOCTL_SYNC correctly (which they should be doing anyway). > > > > > > I am running what was meant to be a v2 of this series and I get a > > > complaint: > > > vc_sm_cma_import_dmabuf_internal: Expecting an uncached alias for dma_addr > > > > > > When I read this paragraph from your email yesterday I immediately > > > thought "this should be the LSC table". > > > > > > Debugging it further I found out it's actually a vb2 buffer. I have > > > reduced the list of patches in v2 compared to this long one, and I'm > > > probably left out something relevant :/ > > > > vb2 allocated by the ISP (VB2_MEMORY_MMAP), or from Unicam that is > > then imported into the ISP (VB2_MEMORY_DMABUF)? > > > > The former is the dma-ranges being incorrectly set, and the reason for > > the patch where VCHIQ children inherit the parent's dma config. It's > > possible something else has changed in the setup since. > > Re-introducing those two patches which I left out yesterday waiting > for more comments made the warning go away, so I presume that was > memory allocated on the ISP, exported as dmabuf by libcamera, and then > re-imported in the video device (that's what our FrameBufferAllocator > does, and I was testing with 'cam' which uses that class to reserve > memory per-stream). > > I have a discussion open with Phil and Nicolas to see how those two > patches might be made upstream consumable, but I'll remember to keep > them in when testing. OK, I'd seen some emails flying around about those patches, but then couldn't find them when I went looking earlier. > > > > The latter is likely to be more involved and depend on what actually > > allocated it (which may mean I'm using the wrong API calls). > > I'm getting the dma address via sg_dma_address having attached and > > mapped the dmabuf. I'm expecting that dma address to therefore follow > > the dma-ranges of my device (not the allocator), but I'm not 100% > > certain that is what does happen. > > > > A few more details of what exactly the use case that triggers it would > > be useful. > > > > > > > > > > Whilst waiting for that, the Unicam driver, and the prep work in > > > > mmal-vchiq could all be pushed first, and ideally as two independent > > > > patchsets as there are no inter-dependencies between them. > > > > > > I could start sending out the unicam driver, yes. > > > > > > Currently I'm a bit stuck not being able to receive frames from the > > > unicam driver. I see the buffers being returned by the ISR routine, > > > but I never get a buffer available notification in libcamera. > > > > > > There's been a few changes to the downstream unicam driver (ie > > > requesting the VPU clock frequency) and I see the RPi mainline support > > > has moved forward quite a bit since v5.8. Are you aware of any trivial > > > change I might be missing that could cause this ? > > > > Things never stand still! > > Isn't it great ? :D > > > Requesting the VPU clock is to avoid a FIFO overflow. > > We've gained pixel format support (with defines and docs) for Y12P and Y14P. > > And hopefully I fixed up all the review comments from v1. > > Do you think it's worth upstreaming those parts in v2 or should it be > done on top ? I should check if the VPU clock is exposed or not in > mainline first... Adding in the clock would be useful to avoid odd image issues (particularly on imx477), but you're right it has a dependency on the clock driver. I thought Maxime had managed to get that merged, but I haven't checked. Adding the image formats is fairly uncontentious as long as I've got the docs for the image formats right. I did jump through the hoops to test the docs, so I hope they're OK. The changes to the driver to support them are a dozen lines adding them to a table. > > > > It's hard to guess why libcamera isn't happy if we're getting ISRs. We > > do need to get the appropriate flags in the ISR for frame end (FEI or > > PI0). > > Is this Pi3 or Pi4 that you're testing on? Pi3 support should be sound > > on mainline. AFAIK Pi4 is still a work in progress. > > Can you stream just using v4l2-ctl --stream-mmap=3 --stream-count=1000 > > --stream-to=/dev/null ? That should work with /dev/video0. Getting the > > embedded data is more involved over the ordering of opening and > > starting streaming on the nodes. > > It's a Pi4. Sorry, I've not tried mainline on a Pi4 yet. > After a pleasant day of debugging I got a nice trace that shows me > that it's actually the buffer importing part that hangs on a completion > in vc_sm_cma_vchi_import. > > In mainline the whole vchi interface got dropped and I got to port the > vc-sma-cma driver to use the vchiq interface directly. I might have > screwed something up and I'm now looking suspiciously at this thread > function: "vc_sm_cma_vchi_videocore_io()" (also because I had to move it > to use msg_hold+msg_release, as peek+remove was killed by: > b5f1547b6e3bd ("staging: vchi: Get rid of vchi_msg_peek()") I'll look at those vchi/vchiq patches if they've now been merged. It makes some sense for us to backport them so they get a real thrashing. If you've gone through any of the existing drivers doing the conversion, then feel free to throw me the files to have a look at (and it potentially saves me some effort in doing the same conversion). > I'll look into that again. > > In the meantime is there any chance this rings any bell to you? > https://paste.debian.net/1161469/ Nothing obvious - sorry. > Thanks > j > > > > > (We do have an open issue regarding getting the correct DMA address > > for Unicam on PI0 & 1. Those share the L2 cache for many things so > > dma-ranges is set differently, and not in a way that currently works > > with the Unicam driver. That one may need a followup fix.) Issue resolved. My check in the driver was invalid - we have a downstream PR for it now. Dave
Hello, This patch series adds drivers for the CSI-2/CCP2 receiver and ISP found in the Broadcom BCM283x and compatible SoCs (namely the BCM2711). The CSI-2/CCP2 receiver IP core is known as Unicam. The most well known platforms representative of these SoCs are the Raspberry Pi. The previous version of the series was titled "[PATCH 0/5] Driver for the BCM283x CSI-2/CCP2 receiver" and contained the CSI-2/CCP2 receiver only. A driver already exists in drivers/staging/vc04_services/bcm2835-camera/ to support cameras on Raspberry Pi platforms. The driver relies on the firmware running on the VC4 VPU to control the camera, and is thus limited to the camera sensors supported in the firmware. These drivers, on the other hand, have limited dependencies on the firmware: - The Unicam peripheral driver doesn't rely on the firmware at all and controls the Unicam hardware directly. It supports any camera sensor compatible with those interfaces. - The ISP driver relies on the VC4 VPU firmware to communicate with the ISP hardware, but, unlike with the existing bcm2835-camera driver, the firmware exposes the ISP instead of controlling it internally. The code is upported from the Raspberry Pi Linux kernel repository available at https://github.com/raspberrypi/linux. The patches are based on top of v5.7-rc2 with Jacopo's "[PATCH v4 0/5] media: Register read-only sub-dev devnode" series applied. Patches 01/34 to 05/34 are related to the bcm2835-unicam driver. Patches 01/34 and 02/34 add new a pixel format and media bus code for sensor embedded data. Patch 03/34 then adds DT bindings for the driver, and patch 04/34 adds the driver itself. Patch 05/34 adds the Unicam peripheral instances to the BCM2711 device tree. The bcm2835-unicam driver supports capturing both image data and embedded data. Support for embedded data is currently implemented through two sink pads, requiring two source pads on the sensor driver side. Work is ongoing to try and replace this with usage of a multiplexed streams API. The remaining patches are related to the bcm2835-isp driver. As the driver needs to communicate with the VC4 VPU firmware, whose support is currently in staging, the new driver is added to staging too. Patch 06/34 adds a new driver named vc-sm-cma to handle memory sharing with the VC4 VPU. This will likely be reworked in the future to use dmabuf heaps. Patch 07/34 then breaks the VC4 VPU multimedia access layer code (named vchiq-mmal) out of the existing bcm2835-camera driver to a new directory, to be shared with the bcm2835-isp driver. Patches 08/34 to 24/34 then upport various improvements to the MMAL code. Patches 25/34 to 31/34 follow with an upport of various improvement to the VCHIQ code, which handles the communication with the VC4 VPU (and is used by the MMAL code). At patch 32/34 we move to the media side, with a small extension to videobuf2. Patch 33/34 adds the bcm2835-isp driver, along with documentation of the related metadata format. Patch 34/34 then wires this up with the vchiq-mmal driver. The two drivers will likely be split into separate patch series for v3. I however wanted to bundle them here to emphasize that they're related, and that together they support full control of the Raspberry Pi cameras through libcamera without any closed-source software. The corresponding libcamera code is available from git://linuxtv.org/libcamera.git raspberrypi The 'raspberrypi' branch is temporary until the code gets integrated in the master branch after public review. I would like to thank Dave Stevenson, Naushir Patuk and David Plowman from Raspberry Pi (Trading) Ltd. for their hard work that made this all possible, as well as Jacopo Mondi, Kieran Bingham and Niklas Söderlund from the libcamera team for all their efforts on both the kernel and libcamera side. This is, I'm sure, the beginning of a new journey for computational camera support in Linux. And now, the customary v4l2-compliance report. There are three new failures with bcm2835-unicam compared to the previous version, and they will addressed in v3. pi@raspberrypi:~/src/v4l-utils $ ./utils/v4l2-compliance/v4l2-compliance -m /dev/media0 v4l2-compliance SHA: 2984938795a23e4bdf5a4b75c12a4245a2e0daff, 32 bits, 32-bit time_t Compliance test for unicam device /dev/media0: Media Driver Info: Driver name : unicam Model : unicam Serial : Bus info : platform:fe801000.csi Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Required ioctls: test MEDIA_IOC_DEVICE_INFO: OK Allow for multiple opens: test second /dev/media0 open: OK test MEDIA_IOC_DEVICE_INFO: OK test for unlimited opens: OK Media Controller ioctls: test MEDIA_IOC_G_TOPOLOGY: OK Entities: 3 Interfaces: 3 Pads: 4 Links: 5 test MEDIA_IOC_ENUM_ENTITIES/LINKS: OK test MEDIA_IOC_SETUP_LINK: OK test invalid ioctls: OK Total for unicam device /dev/media0: 8, Succeeded: 8, Failed: 0, Warnings: 0 -------------------------------------------------------------------------------- Compliance test for unicam device /dev/video0: Driver Info: Driver name : unicam Card type : unicam Bus info : platform:fe801000.csi Driver version : 5.7.0 Capabilities : 0x84a00001 Video Capture Metadata Capture Streaming Extended Pix Format Device Capabilities Device Caps : 0x04200001 Video Capture Streaming Extended Pix Format Media Driver Info: Driver name : unicam Model : unicam Serial : Bus info : platform:fe801000.csi Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Interface Info: ID : 0x03000006 Type : V4L Video Entity Info: ID : 0x00000004 (4) Name : unicam-image Function : V4L2 I/O Flags : default Pad 0x01000005 : 0: Sink Link 0x02000008: from remote pad 0x1000002 of entity 'imx219 10-0010': Data, Enabled, Immutable Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video0 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK test invalid ioctls: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 1 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls (Input 0): test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 16 Private Controls: 0 Format ioctls (Input 0): test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK fail: v4l2-test-formats.cpp(1038): Global format mismatch: 41415270(pRAA)/640x480 vs 30314752(RG10)/640x480 test VIDIOC_S_FMT: FAIL test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) fail: v4l2-test-formats.cpp(1529): !doioctl(node, VIDIOC_G_SELECTION, &sel) fail: v4l2-test-formats.cpp(1547): testLegacyCrop(node) test Cropping: FAIL test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls (Input 0): test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls (Input 0): test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for unicam device /dev/video0: 46, Succeeded: 44, Failed: 2, Warnings: 0 -------------------------------------------------------------------------------- Compliance test for unicam device /dev/video1: Driver Info: Driver name : unicam Card type : unicam Bus info : platform:fe801000.csi Driver version : 5.7.0 Capabilities : 0x84a00001 Video Capture Metadata Capture Streaming Extended Pix Format Device Capabilities Device Caps : 0x04a00000 Metadata Capture Streaming Extended Pix Format Media Driver Info: Driver name : unicam Model : unicam Serial : Bus info : platform:fe801000.csi Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Interface Info: ID : 0x0300000c Type : V4L Video Entity Info: ID : 0x0000000a (10) Name : unicam-embedded Function : V4L2 I/O Pad 0x0100000b : 0: Sink Link 0x0200000e: from remote pad 0x1000003 of entity 'imx219 10-0010': Data, Enabled, Immutable Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video1 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK test invalid ioctls: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 1 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls (Input 0): test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK (Not Supported) test VIDIOC_QUERYCTRL: OK (Not Supported) test VIDIOC_G/S_CTRL: OK (Not Supported) test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls (Input 0): test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls (Input 0): test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls (Input 0): test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for unicam device /dev/video1: 46, Succeeded: 46, Failed: 0, Warnings: 0 -------------------------------------------------------------------------------- Compliance test for device /dev/v4l-subdev0: Required ioctls: Allow for multiple opens: test second /dev/v4l-subdev0 open: OK test for unlimited opens: OK test invalid ioctls: OK Debug ioctls: test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 16 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported) test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK (Not Supported) test VIDIOC_TRY_FMT: OK (Not Supported) test VIDIOC_S_FMT: OK (Not Supported) test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported) test VIDIOC_EXPBUF: OK (Not Supported) test Requests: OK (Not Supported) Total for device /dev/v4l-subdev0: 41, Succeeded: 41, Failed: 0, Warnings: 0 Grand Total for unicam device /dev/media0: 141, Succeeded: 139, Failed: 2, Warnings: 0 pi@raspberrypi:~/src/v4l-utils $ ./utils/v4l2-compliance/v4l2-compliance -m /dev/media1 v4l2-compliance SHA: 2984938795a23e4bdf5a4b75c12a4245a2e0daff, 32 bits, 32-bit time_t Compliance test for bcm2835-isp device /dev/media1: Media Driver Info: Driver name : bcm2835-isp Model : bcm2835-isp Serial : Bus info : platform:bcm2835-isp Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Required ioctls: test MEDIA_IOC_DEVICE_INFO: OK Allow for multiple opens: test second /dev/media1 open: OK test MEDIA_IOC_DEVICE_INFO: OK test for unlimited opens: OK Media Controller ioctls: test MEDIA_IOC_G_TOPOLOGY: OK Entities: 5 Interfaces: 4 Pads: 8 Links: 8 test MEDIA_IOC_ENUM_ENTITIES/LINKS: OK test MEDIA_IOC_SETUP_LINK: OK test invalid ioctls: OK Total for bcm2835-isp device /dev/media1: 8, Succeeded: 8, Failed: 0, Warnings: 0 -------------------------------------------------------------------------------- Compliance test for bcm2835-isp device /dev/video13: Driver Info: Driver name : bcm2835-isp Card type : bcm2835-isp Bus info : platform:bcm2835-isp Driver version : 5.7.0 Capabilities : 0x84200002 Video Output Streaming Extended Pix Format Device Capabilities Device Caps : 0x04200002 Video Output Streaming Extended Pix Format Media Driver Info: Driver name : bcm2835-isp Model : bcm2835-isp Serial : Bus info : platform:bcm2835-isp Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Interface Info: ID : 0x03000008 Type : V4L Video Entity Info: ID : 0x00000006 (6) Name : bcm2835-isp0-output0 Function : V4L2 I/O Pad 0x01000007 : 0: Source Link 0x0200000a: to remote pad 0x1000002 of entity 'bcm2835_isp0': Data, Enabled, Immutable Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video13 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK test invalid ioctls: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 5 Private Controls: 8 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for bcm2835-isp device /dev/video13: 46, Succeeded: 46, Failed: 0, Warnings: 0 -------------------------------------------------------------------------------- Compliance test for bcm2835-isp device /dev/video14: Driver Info: Driver name : bcm2835-isp Card type : bcm2835-isp Bus info : platform:bcm2835-isp Driver version : 5.7.0 Capabilities : 0x84200001 Video Capture Streaming Extended Pix Format Device Capabilities Device Caps : 0x04200001 Video Capture Streaming Extended Pix Format Media Driver Info: Driver name : bcm2835-isp Model : bcm2835-isp Serial : Bus info : platform:bcm2835-isp Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Interface Info: ID : 0x0300000e Type : V4L Video Entity Info: ID : 0x0000000c (12) Name : bcm2835-isp0-capture1 Function : V4L2 I/O Pad 0x0100000d : 0: Sink Link 0x02000010: from remote pad 0x1000003 of entity 'bcm2835_isp0': Data, Enabled, Immutable Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video14 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK test invalid ioctls: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK (Not Supported) test VIDIOC_QUERYCTRL: OK (Not Supported) test VIDIOC_G/S_CTRL: OK (Not Supported) test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for bcm2835-isp device /dev/video14: 46, Succeeded: 46, Failed: 0, Warnings: 0 -------------------------------------------------------------------------------- Compliance test for bcm2835-isp device /dev/video15: Driver Info: Driver name : bcm2835-isp Card type : bcm2835-isp Bus info : platform:bcm2835-isp Driver version : 5.7.0 Capabilities : 0x84200001 Video Capture Streaming Extended Pix Format Device Capabilities Device Caps : 0x04200001 Video Capture Streaming Extended Pix Format Media Driver Info: Driver name : bcm2835-isp Model : bcm2835-isp Serial : Bus info : platform:bcm2835-isp Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Interface Info: ID : 0x03000014 Type : V4L Video Entity Info: ID : 0x00000012 (18) Name : bcm2835-isp0-capture2 Function : V4L2 I/O Pad 0x01000013 : 0: Sink Link 0x02000016: from remote pad 0x1000004 of entity 'bcm2835_isp0': Data, Enabled, Immutable Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video15 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK test invalid ioctls: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK (Not Supported) test VIDIOC_QUERYCTRL: OK (Not Supported) test VIDIOC_G/S_CTRL: OK (Not Supported) test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for bcm2835-isp device /dev/video15: 46, Succeeded: 46, Failed: 0, Warnings: 0 -------------------------------------------------------------------------------- Compliance test for bcm2835-isp device /dev/video16: Driver Info: Driver name : bcm2835-isp Card type : bcm2835-isp Bus info : platform:bcm2835-isp Driver version : 5.7.0 Capabilities : 0x84a00000 Metadata Capture Streaming Extended Pix Format Device Capabilities Device Caps : 0x04a00000 Metadata Capture Streaming Extended Pix Format Media Driver Info: Driver name : bcm2835-isp Model : bcm2835-isp Serial : Bus info : platform:bcm2835-isp Media version : 5.7.0 Hardware revision: 0x00000000 (0) Driver version : 5.7.0 Interface Info: ID : 0x0300001a Type : V4L Video Entity Info: ID : 0x00000018 (24) Name : bcm2835-isp0-capture3 Function : V4L2 I/O Pad 0x01000019 : 0: Sink Link 0x0200001c: from remote pad 0x1000005 of entity 'bcm2835_isp0': Data, Enabled, Immutable Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video16 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK test invalid ioctls: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK (Not Supported) test VIDIOC_QUERYCTRL: OK (Not Supported) test VIDIOC_G/S_CTRL: OK (Not Supported) test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for bcm2835-isp device /dev/video16: 46, Succeeded: 46, Failed: 0, Warnings: 0 Grand Total for bcm2835-isp device /dev/media1: 192, Succeeded: 192, Failed: 0, Warnings: 0 Dave Stevenson (22): dt-bindings: media: Document BCM283x CSI2/CCP2 receiver staging: vc04_services: Add new vc-sm-cma driver staging: mmal-vchiq: Allocate and free components as required staging: mmal-vchiq: Avoid use of bool in structures staging: mmal-vchiq: Make timeout a defined parameter staging: mmal-vchiq: Make a mmal_buf struct for passing parameters staging: mmal-vchiq: Add support for event callbacks. staging: mmal-vchiq: Support sending data to MMAL ports staging: mmal-vchiq: Fixup vchiq-mmal include ordering staging: mmal-vchiq: Use vc-sm-cma to support zero copy staging: mmal-vchiq: Fix client_component for 64 bit kernel staging: mmal_vchiq: Add in the Bayer encoding formats staging: mmal-vchiq: Always return the param size from param_get staging: mmal-vchiq: If the VPU returns an error, don't negate it staging: mmal-vchiq: Fix handling of VB2_MEMORY_DMABUF buffers staging: mmal-vchiq: Update mmal_parameters.h with recently defined params staging: mmal-vchiq: Free the event context for control ports staging: mmal-vchiq: Fix memory leak in error path staging: vchiq_arm: Register vcsm-cma as a platform driver staging: vchiq_arm: Set up dma ranges on child devices staging: vchiq: Use the old dma controller for OF config on platform devices media: videobuf2: Allow exporting of a struct dmabuf Jacopo Mondi (1): staging: bcm2835: Break MMAL support out from camera Laurent Pinchart (1): ARM: dts: bcm2711: Add Unicam DT nodes Naushir Patuck (6): media: uapi: v4l2-core: Add sensor ancillary data V4L2 fourcc type media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus format media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h staging: bcm2835-isp: Add support for BC2835 ISP staging: vchiq: Load bcm2835_isp driver from vchiq Oliver Gjoneski (1): staging: vchiq_2835_arm: Implement a DMA pool for small bulk transfers Phil Elwell (3): staging: vchiq: Add 36-bit address support staging: vchiq_arm: Give vchiq children DT nodes staging: vchiq_arm: Add a matching unregister call .../bindings/media/brcm,bcm2835-unicam.yaml | 155 + Documentation/media/uapi/v4l/meta-formats.rst | 1 + .../uapi/v4l/pixfmt-meta-sensor-data.rst | 32 + .../media/uapi/v4l/subdev-formats.rst | 33 + MAINTAINERS | 7 + arch/arm/boot/dts/bcm2711.dtsi | 43 + .../media/common/videobuf2/videobuf2-core.c | 21 +- drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 2 + drivers/media/platform/bcm2835/Kconfig | 15 + drivers/media/platform/bcm2835/Makefile | 3 + .../media/platform/bcm2835/bcm2835-unicam.c | 2825 +++++++++++++++++ .../media/platform/bcm2835/vc4-regs-unicam.h | 253 ++ drivers/media/v4l2-core/v4l2-ioctl.c | 1 + .../v4l/pixfmt-meta-bcm2835-isp-stats.rst | 41 + drivers/staging/vc04_services/Kconfig | 6 + drivers/staging/vc04_services/Makefile | 7 +- .../vc04_services/bcm2835-camera/Kconfig | 1 + .../vc04_services/bcm2835-camera/Makefile | 4 +- .../bcm2835-camera/bcm2835-camera.c | 64 +- .../staging/vc04_services/bcm2835-isp/Kconfig | 14 + .../vc04_services/bcm2835-isp/Makefile | 10 + .../bcm2835-isp/bcm2835-v4l2-isp.c | 1632 ++++++++++ .../bcm2835-isp/bcm2835_isp_ctrls.h | 67 + .../bcm2835-isp/bcm2835_isp_fmts.h | 301 ++ .../include/linux/broadcom/vc_sm_cma_ioctl.h | 114 + .../include/uapi/linux/bcm2835-isp.h | 333 ++ .../interface/vchiq_arm/vchiq_2835_arm.c | 126 +- .../interface/vchiq_arm/vchiq_arm.c | 38 + .../interface/vchiq_arm/vchiq_arm.h | 1 + .../staging/vc04_services/vc-sm-cma/Kconfig | 10 + .../staging/vc04_services/vc-sm-cma/Makefile | 13 + drivers/staging/vc04_services/vc-sm-cma/TODO | 1 + .../staging/vc04_services/vc-sm-cma/vc_sm.c | 1732 ++++++++++ .../staging/vc04_services/vc-sm-cma/vc_sm.h | 84 + .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.c | 505 +++ .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.h | 63 + .../vc04_services/vc-sm-cma/vc_sm_defs.h | 300 ++ .../vc04_services/vc-sm-cma/vc_sm_knl.h | 28 + .../staging/vc04_services/vchiq-mmal/Kconfig | 9 + .../staging/vc04_services/vchiq-mmal/Makefile | 8 + .../mmal-common.h | 10 + .../mmal-encodings.h | 31 + .../mmal-msg-common.h | 0 .../mmal-msg-format.h | 0 .../mmal-msg-port.h | 0 .../{bcm2835-camera => vchiq-mmal}/mmal-msg.h | 36 + .../mmal-parameters.h | 231 +- .../mmal-vchiq.c | 376 ++- .../mmal-vchiq.h | 13 +- include/media/videobuf2-core.h | 15 + include/uapi/linux/media-bus-format.h | 3 + include/uapi/linux/videodev2.h | 1 + 53 files changed, 9492 insertions(+), 128 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst create mode 100644 drivers/media/platform/bcm2835/Kconfig create mode 100644 drivers/media/platform/bcm2835/Makefile create mode 100644 drivers/media/platform/bcm2835/bcm2835-unicam.c create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h create mode 100644 drivers/staging/vc04_services/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst create mode 100644 drivers/staging/vc04_services/bcm2835-isp/Kconfig create mode 100644 drivers/staging/vc04_services/bcm2835-isp/Makefile create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h create mode 100644 drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h create mode 100644 drivers/staging/vc04_services/include/uapi/linux/bcm2835-isp.h create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Kconfig create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Makefile create mode 100644 drivers/staging/vc04_services/vc-sm-cma/TODO create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.c create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.h create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h create mode 100644 drivers/staging/vc04_services/vchiq-mmal/Kconfig create mode 100644 drivers/staging/vc04_services/vchiq-mmal/Makefile rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-common.h (84%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-encodings.h (80%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-common.h (100%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-format.h (100%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-port.h (100%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg.h (90%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-parameters.h (77%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.c (82%) rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.h (93%)