media: pci: intel: ivsc: Add driver of Intel Visual Sensing Controller(IVSC)
Subsystems (2)
Sakari Ailus
maintainerv11 cover media: pci: intel: ivsc: Add driver of Intel Visual Sensing Controller(IVSC)
Hi folks,
Here's just a small update to Wentong's MEI ACE+CSI patches.
v10 is here <URL:https://lore.kernel.org/linux-media/[email protected]/>.
since v10:
- Update V4L2 async API usage.
- Fix owner configuration for MEI ACE --- wrong enum was being used, thus ownership was always assigned to the host.
Wentong Wu (2):
media: pci: intel: ivsc: Add CSI submodule
media: pci: intel: ivsc: Add ACE submodule
drivers/media/pci/intel/Kconfig | 1 + drivers/media/pci/intel/Makefile | 1 + drivers/media/pci/intel/ivsc/Kconfig | 12 + drivers/media/pci/intel/ivsc/Makefile | 9 + drivers/media/pci/intel/ivsc/mei_ace.c | 579 +++++++++++++++++ drivers/media/pci/intel/ivsc/mei_csi.c | 825 +++++++++++++++++++++++++ 6 files changed, 1427 insertions(+) create mode 100644 drivers/media/pci/intel/ivsc/Kconfig create mode 100644 drivers/media/pci/intel/ivsc/Makefile create mode 100644 drivers/media/pci/intel/ivsc/mei_ace.c create mode 100644 drivers/media/pci/intel/ivsc/mei_csi.c
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v11 1/2 media: pci: intel: ivsc: Add CSI submodule
From: Wentong Wu <[email protected]>
CSI is a submodule of IVSC which can route camera sensor data to the outbound MIPI CSI-2 interface.
The interface communicating with firmware is via MEI. There is a separate MEI UUID, which this driver uses to enumerate.
To route camera sensor data to host, the information of link frequency and number of data lanes is sent to firmware by sending MEI command when starting stream.
CSI also provides a privacy mode. When privacy mode is turned on, camera sensor can't be used. This means that both IVSC and host Image Processing Unit(IPU) can't get image data. And when this mode is turned on, user is notified via v4l2 control callback.
--- drivers/media/pci/intel/Kconfig | 1 + drivers/media/pci/intel/Makefile | 1 + drivers/media/pci/intel/ivsc/Kconfig | 12 + drivers/media/pci/intel/ivsc/Makefile | 6 + drivers/media/pci/intel/ivsc/mei_csi.c | 825 +++++++++++++++++++++++++ 5 files changed, 845 insertions(+) create mode 100644 drivers/media/pci/intel/ivsc/Kconfig create mode 100644 drivers/media/pci/intel/ivsc/Makefile create mode 100644 drivers/media/pci/intel/ivsc/mei_csi.c
drivers/media/pci/intel/Kconfig +1 -0
@@ -8,3 +8,4 @@ config IPU_BRIDGE dependencies, this is selected by each driver that needs it. source "drivers/media/pci/intel/ipu3/Kconfig" +source "drivers/media/pci/intel/ivsc/Kconfig"
drivers/media/pci/intel/Makefile +1 -0
@@ -4,3 +4,4 @@ # obj-$(CONFIG_IPU_BRIDGE) += ipu-bridge.o obj-y += ipu3/ +obj-y += ivsc/
drivers/media/pci/intel/ivsc/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023, Intel Corporation. All rights reserved. + +config INTEL_VSC + tristate "Intel Visual Sensing Controller" + depends on INTEL_MEI + help + This adds support for Intel Visual Sensing Controller (IVSC). + + Enables the IVSC firmware services required for controlling + camera sensor ownership and CSI-2 link through Image Processing + Unit(IPU) driver of Intel.
drivers/media/pci/intel/ivsc/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Copyright (C) 2023, Intel Corporation. All rights reserved. + +obj-$(CONFIG_INTEL_VSC) += ivsc-csi.o +ivsc-csi-y += mei_csi.o
drivers/media/pci/intel/ivsc/mei_csi.c new file +825 -0
825 lines not on this page · raw message
Signature · 1 line
2.39.2
Re: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Hi Sakari and Wentong,
Thank you for the patch.
Quoted 8 lines · Sakari Ailus
From: Wentong Wu <[email protected]>
CSI is a submodule of IVSC which can route camera sensor data to the outbound MIPI CSI-2 interface.
The interface communicating with firmware is via MEI. There is a separate MEI UUID, which this driver uses to enumerate.
Quoted 7 lines
To route camera sensor data to host, the information of link frequency and number of data lanes is sent to firmware by sending MEI command when starting stream.
CSI also provides a privacy mode. When privacy mode is turned on, camera sensor can't be used. This means that both IVSC and host Image Processing Unit(IPU) can't get image data. And when
s/Unit/Unit /
I'd like to see a proof of that statement though :-) Handling camera privacy in a closed-source firmware known to have backdoors doesn't seem very private to me.
Is the IVSC found in lots of IPU6-based machines ?
Quoted 42 lines
this mode is turned on, user is notified via v4l2 control callback.
Signed-off-by Wentong Wu <[email protected]>Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/Kconfig | 1 + drivers/media/pci/intel/Makefile | 1 + drivers/media/pci/intel/ivsc/Kconfig | 12 + drivers/media/pci/intel/ivsc/Makefile | 6 + drivers/media/pci/intel/ivsc/mei_csi.c | 825 +++++++++++++++++++++++++ 5 files changed, 845 insertions(+) create mode 100644 drivers/media/pci/intel/ivsc/Kconfig create mode 100644 drivers/media/pci/intel/ivsc/Makefile create mode 100644 drivers/media/pci/intel/ivsc/mei_csi.cdrivers/media/pci/intel/Kconfig +1
-0@@ -8,3 +8,4 @@ config IPU_BRIDGE dependencies, this is selected by each driver that needs it. source "drivers/media/pci/intel/ipu3/Kconfig" +source "drivers/media/pci/intel/ivsc/Kconfig"drivers/media/pci/intel/Makefile +1
-0@@ -4,3 +4,4 @@ # obj-$(CONFIG_IPU_BRIDGE) += ipu-bridge.o obj-y += ipu3/ +obj-y += ivsc/drivers/media/pci/intel/ivsc/Kconfig new file +2
-0@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023, Intel Corporation. All rights reserved.
drivers/media/pci/intel/ivsc/Kconfig line 12
Quoted 10 lines
drivers/media/pci/intel/ivsc/Kconfig new file +10
-0+ +config INTEL_VSC + tristate "Intel Visual Sensing Controller" + depends on INTEL_MEI + help + This adds support for Intel Visual Sensing Controller (IVSC). + + Enables the IVSC firmware services required for controlling + camera sensor ownership and CSI-2 link through Image Processing + Unit(IPU) driver of Intel.
s/Unit/Unit /
This would benefit from being reworded, it's not very clear.
Quoted 511 lines
drivers/media/pci/intel/ivsc/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Copyright (C) 2023, Intel Corporation. All rights reserved. + +obj-$(CONFIG_INTEL_VSC) += ivsc-csi.o +ivsc-csi-y += mei_csi.odrivers/media/pci/intel/ivsc/mei_csi.c new file +493
-0@@ -0,0 +1,825 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Intel Corporation. All rights reserved. +* Intel Visual Sensing Controller CSI Linux driver +*/ + +/* +* To set ownership of CSI-2 link and to configure CSI-2 link, there +* are specific commands, which are sent via MEI protocol. The send +* command function uses "completion" as a synchronization mechanism. +* The response for command is received via a mei callback which wakes +* up the caller. There can be only one outstanding command at a time. +*/ + +#include <linux/completion.h> +#include <linux/delay.h> +#include <linux/kernel.h> +#include <linux/math64.h> +#include <linux/mei_cl_bus.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> +#include <linux/units.h> +#include <linux/uuid.h> +#include <linux/workqueue.h> + +#include <media/v4l2-async.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> + +#define MEI_CSI_DRIVER_NAME "ivsc_csi" +#define MEI_CSI_ENTITY_NAME "Intel IVSC CSI" + +#define MEI_CSI_LINK_FREQ_400MHZ 400000000ULL + +/* the 5s used here is based on experiment */ +#define CSI_CMD_TIMEOUT (5 * HZ) +/* to setup CSI-2 link an extra delay needed and determined experimentally */ +#define CSI_FW_READY_DELAY_MS 100 +/* link frequency unit is 100kHz */ +#define CSI_LINK_FREQ (x) ((u32)(div_u64(x, 100 * HZ_PER_KHZ))) + +/* +* identify the command id supported by firmware +* IPC, as well as the privacy notification id +* used when processing privacy event. +*/ +enum csi_cmd_id { +/* used to set csi ownership */ +CSI_SET_OWNER =0 , + +/* used to configure CSI-2 link */ +CSI_SET_CONF =2 , + +/* privacy notification id used when privacy state changes */ +CSI_PRIVACY_NOTIF =6 , +}; + +/* CSI-2 link ownership definition */ +enum csi_link_owner { +CSI_LINK_IVSC , +CSI_LINK_HOST , +}; + +/* privacy status definition */ +enum ivsc_privacy_status { +CSI_PRIVACY_OFF , +CSI_PRIVACY_ON , +CSI_PRIVACY_MAX , +}; + +enum csi_pads { +CSI_PAD_SOURCE , +CSI_PAD_SINK , +CSI_NUM_PADS +}; + +/* configuration of the CSI-2 link between host and IVSC */ +struct csi_link_cfg { +/* number of data lanes used on the CSI-2 link */ +u32 nr_of_lanes; + +/* frequency of the CSI-2 link */ +u32 link_freq; + +/* for future use */ +u32 rsvd[2 ]; +} __packed; + +/* CSI command structure */ +struct csi_cmd { +u32 cmd_id; +union _cmd_param { +u32 param; +struct csi_link_cfg conf; + } param; +} __packed; + +/* CSI notification structure */ +struct csi_notif { +u32 cmd_id; +int status; +union _resp_cont { +u32 cont; +struct csi_link_cfg conf; + } cont; +} __packed; + +struct mei_csi { +struct mei_cl_device *cldev; + +/* command response */ +struct csi_notif cmd_response; +/* used to wait for command response from firmware */ +struct completion cmd_completion; +/* protect command download */ +struct mutex lock; + +struct v4l2_subdev subdev; +struct v4l2_subdev *remote; +struct v4l2_async_notifier notifier; +struct v4l2_ctrl_handler ctrl_handler; +struct v4l2_ctrl *freq_ctrl; +struct v4l2_ctrl *privacy_ctrl; +unsigned int remote_pad; +/* start streaming or not */ +int streaming; + +struct media_pad pads[CSI_NUM_PADS ]; +struct v4l2_mbus_framefmt format_mbus[CSI_NUM_PADS ]; + +/* number of data lanes used on the CSI-2 link */ +u32 nr_of_lanes; +/* frequency of the CSI-2 link */ +u64 link_freq; + +/* privacy status */ +enum ivsc_privacy_status status; +}; + +static const struct v4l2_mbus_framefmt mei_csi_format_mbus_default = { + .width =1 , + .height =1 , + .code =MEDIA_BUS_FMT_Y8_1X8 , + .field =V4L2_FIELD_NONE , +}; + +static s64 link_freq_menu_items[] = { +MEI_CSI_LINK_FREQ_400MHZ +}; + +static inline struct mei_csi *notifier_to_csi (struct v4l2_async_notifier *n) +{ + return container_of(n, struct mei_csi, notifier); +} + +static inline struct mei_csi *sd_to_csi (struct v4l2_subdev *sd) +{ + return container_of(sd, struct mei_csi, subdev); +} + +static inline struct mei_csi *ctrl_to_csi (struct v4l2_ctrl *ctrl) +{ + return container_of(ctrl->handler, struct mei_csi, ctrl_handler); +} + +/* send a command to firmware and mutex must be held by caller */ +static int mei_csi_send (struct mei_csi *csi,u8 *buf,size_t len) +{ +struct csi_cmd *cmd = (struct csi_cmd *)buf; +int ret; + +reinit_completion (&csi->cmd_completion); + + ret =mei_cldev_send (csi->cldev, buf, len); +if (ret <0 ) + goto out; + + ret =wait_for_completion_killable_timeout (&csi->cmd_completion, +CSI_CMD_TIMEOUT ); +if (ret <0 ) { + goto out; + }else if (!ret) { + ret = -ETIMEDOUT ; + goto out; + } + +/* command response status */ + ret = csi->cmd_response.status; +if (ret) { + ret = -EINVAL ; + goto out; + } + +if (csi->cmd_response.cmd_id != cmd->cmd_id) + ret = -EINVAL ; + +out: +return ret; +} + +/* set CSI-2 link ownership */ +static int csi_set_link_owner (struct mei_csi *csi,enum csi_link_owner owner) +{ +struct csi_cmd cmd = {0 }; +size_t cmd_size; +int ret; + + cmd.cmd_id =CSI_SET_OWNER ; + cmd.param.param = owner; + cmd_size =sizeof (cmd.cmd_id) +sizeof (cmd.param.param); + +mutex_lock (&csi->lock); + + ret =mei_csi_send (csi, (u8 *)&cmd, cmd_size); + +mutex_unlock (&csi->lock); + +return ret; +} + +/* configure CSI-2 link between host and IVSC */ +static int csi_set_link_cfg (struct mei_csi *csi) +{ +struct csi_cmd cmd = {0 }; +size_t cmd_size; +int ret; + + cmd.cmd_id =CSI_SET_CONF ; + cmd.param.conf.nr_of_lanes = csi->nr_of_lanes; + cmd.param.conf.link_freq =CSI_LINK_FREQ (csi->link_freq); + cmd_size =sizeof (cmd.cmd_id) +sizeof (cmd.param.conf); + +mutex_lock (&csi->lock); + + ret =mei_csi_send (csi, (u8 *)&cmd, cmd_size); +/* +* wait configuration ready if download success. placing +* delay under mutex is to make sure current command flow +* completed before starting a possible new one. +*/ +if (!ret) +msleep (CSI_FW_READY_DELAY_MS ); + +mutex_unlock (&csi->lock); + +return ret; +} + +/* callback for receive */ +static void mei_csi_rx (struct mei_cl_device *cldev) +{ +struct mei_csi *csi =mei_cldev_get_drvdata (cldev); +struct csi_notif notif = {0 }; +int ret; + + ret =mei_cldev_recv (cldev, (u8 *)¬if,sizeof (notif)); +if (ret <0 ) { +dev_err (&cldev->dev,"recv error: %d\n" , ret); +return ; + } + +switch (notif.cmd_id) { +case CSI_PRIVACY_NOTIF : +if (notif.cont.cont <CSI_PRIVACY_MAX ) { + csi->status = notif.cont.cont; +v4l2_ctrl_s_ctrl (csi->privacy_ctrl, csi->status); + } +break ; +case CSI_SET_OWNER : +case CSI_SET_CONF : +memcpy (&csi->cmd_response, ¬if, ret); + +complete (&csi->cmd_completion); +break ; +default : +break ; + } +} + +static int mei_csi_set_stream (struct v4l2_subdev *sd,int enable) +{ +struct mei_csi *csi =sd_to_csi (sd); +s64 freq; +int ret; + +if (enable && csi->streaming ==0 ) { + freq =v4l2_get_link_freq (csi->remote->ctrl_handler,0 ,0 ); +if (freq <0 ) { +dev_err (&csi->cldev->dev, +"error %lld, invalid link_freq\n" , freq); + ret = freq; + goto err; + } + csi->link_freq = freq; + +/* switch CSI-2 link to host */ + ret =csi_set_link_owner (csi,CSI_LINK_HOST ); +if (ret <0 ) + goto err; + +/* configure CSI-2 link */ + ret =csi_set_link_cfg (csi); +if (ret <0 ) + goto err_switch; + + ret =v4l2_subdev_call (csi->remote, video, s_stream,1 ); +if (ret) + goto err_switch; + }else if (!enable && csi->streaming ==1 ) { +v4l2_subdev_call (csi->remote, video, s_stream,0 ); + +/* switch CSI-2 link to IVSC */ + ret =csi_set_link_owner (csi,CSI_LINK_IVSC ); +if (ret <0 ) +dev_warn (&csi->cldev->dev, +"failed to switch CSI2 link: %d\n" , ret); + } + + csi->streaming = enable; + +return 0 ; + +err_switch: +csi_set_link_owner (csi,CSI_LINK_IVSC ); + +err: +return ret; +} + +static struct v4l2_mbus_framefmt * +mei_csi_get_pad_format (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +unsigned int pad,u32 which) +{ +struct mei_csi *csi =sd_to_csi (sd); + +switch (which) { +case V4L2_SUBDEV_FORMAT_TRY : +return v4l2_subdev_get_try_format (sd, sd_state, pad); +case V4L2_SUBDEV_FORMAT_ACTIVE : +return &csi->format_mbus[pad]; +default : +return NULL ; + } +} + +static int mei_csi_init_cfg (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state) +{ +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +unsigned int i; + +mutex_lock (&csi->lock); + +for (i =0 ; i < sd->entity.num_pads; i++) { + mbusformat =v4l2_subdev_get_try_format (sd, sd_state, i); + *mbusformat = mei_csi_format_mbus_default; + } + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_get_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); + +mutex_lock (&csi->lock); + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (mbusformat) + format->format = *mbusformat; + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *source_mbusformat; +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +struct media_pad *pad; + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (!mbusformat) +return -EINVAL ; + + source_mbusformat =mei_csi_get_pad_format (sd, sd_state,CSI_PAD_SOURCE , + format->which); +if (!source_mbusformat) +return -EINVAL ; + +v4l_bound_align_image (&format->format.width,1 ,65536 ,0 , + &format->format.height,1 ,65536 ,0 ,0 ); + +switch (format->format.code) { +case MEDIA_BUS_FMT_RGB444_1X12 : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_BGR565_2X8_BE : +case MEDIA_BUS_FMT_BGR565_2X8_LE : +case MEDIA_BUS_FMT_RGB565_2X8_BE : +case MEDIA_BUS_FMT_RGB565_2X8_LE : +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RBG888_1X24 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_GBR888_1X24 : +case MEDIA_BUS_FMT_RGB888_1X24 : +case MEDIA_BUS_FMT_RGB888_2X12_BE : +case MEDIA_BUS_FMT_RGB888_2X12_LE : +case MEDIA_BUS_FMT_ARGB8888_1X32 : +case MEDIA_BUS_FMT_RGB888_1X32_PADHI : +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_RGB121212_1X36 : +case MEDIA_BUS_FMT_RGB161616_1X48 : +case MEDIA_BUS_FMT_Y8_1X8 : +case MEDIA_BUS_FMT_UV8_1X8 : +case MEDIA_BUS_FMT_UYVY8_1_5X8 : +case MEDIA_BUS_FMT_VYUY8_1_5X8 : +case MEDIA_BUS_FMT_YUYV8_1_5X8 : +case MEDIA_BUS_FMT_YVYU8_1_5X8 : +case MEDIA_BUS_FMT_UYVY8_2X8 : +case MEDIA_BUS_FMT_VYUY8_2X8 : +case MEDIA_BUS_FMT_YUYV8_2X8 : +case MEDIA_BUS_FMT_YVYU8_2X8 : +case MEDIA_BUS_FMT_Y10_1X10 : +case MEDIA_BUS_FMT_UYVY10_2X10 : +case MEDIA_BUS_FMT_VYUY10_2X10 : +case MEDIA_BUS_FMT_YUYV10_2X10 : +case MEDIA_BUS_FMT_YVYU10_2X10 : +case MEDIA_BUS_FMT_Y12_1X12 : +case MEDIA_BUS_FMT_UYVY12_2X12 : +case MEDIA_BUS_FMT_VYUY12_2X12 : +case MEDIA_BUS_FMT_YUYV12_2X12 : +case MEDIA_BUS_FMT_YVYU12_2X12 : +case MEDIA_BUS_FMT_UYVY8_1X16 : +case MEDIA_BUS_FMT_VYUY8_1X16 : +case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_YVYU8_1X16 : +case MEDIA_BUS_FMT_YDYUYDYV8_1X16 : +case MEDIA_BUS_FMT_UYVY10_1X20 : +case MEDIA_BUS_FMT_VYUY10_1X20 : +case MEDIA_BUS_FMT_YUYV10_1X20 : +case MEDIA_BUS_FMT_YVYU10_1X20 : +case MEDIA_BUS_FMT_VUY8_1X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_UYVY12_1X24 : +case MEDIA_BUS_FMT_VYUY12_1X24 : +case MEDIA_BUS_FMT_YUYV12_1X24 : +case MEDIA_BUS_FMT_YVYU12_1X24 : +case MEDIA_BUS_FMT_YUV10_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_AYUV8_1X32 : +case MEDIA_BUS_FMT_UYYVYY12_0_5X36 : +case MEDIA_BUS_FMT_YUV12_1X36 : +case MEDIA_BUS_FMT_YUV16_1X48 : +case MEDIA_BUS_FMT_UYYVYY16_0_5X48 : +case MEDIA_BUS_FMT_JPEG_1X8 : +case MEDIA_BUS_FMT_AHSV8888_1X32 : +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SBGGR14_1X14 : +case MEDIA_BUS_FMT_SGBRG14_1X14 : +case MEDIA_BUS_FMT_SGRBG14_1X14 :
drivers/media/pci/intel/ivsc/mei_csi.c line 503
Quoted 10 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +10
-0+case MEDIA_BUS_FMT_SRGGB14_1X14 : +case MEDIA_BUS_FMT_SBGGR16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SRGGB16_1X16 : +break ; +default : + format->format.code =MEDIA_BUS_FMT_Y8_1X8 ; +break ; + }
I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
Quoted 322 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +322
-0+ +if (format->format.field ==V4L2_FIELD_ANY ) + format->format.field =V4L2_FIELD_NONE ; + +mutex_lock (&csi->lock); + + pad = &csi->pads[format->pad]; +if (pad->flags &MEDIA_PAD_FL_SOURCE ) + format->format = csi->format_mbus[CSI_PAD_SINK ]; + + *mbusformat = format->format; + +if (pad->flags &MEDIA_PAD_FL_SINK ) + *source_mbusformat = format->format; + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_g_volatile_ctrl (struct v4l2_ctrl *ctrl) +{ +struct mei_csi *csi =ctrl_to_csi (ctrl); +s64 freq; + +if (ctrl->id ==V4L2_CID_LINK_FREQ ) { +if (!csi->remote) +return -EINVAL ; + + freq =v4l2_get_link_freq (csi->remote->ctrl_handler,0 ,0 ); +if (freq <0 ) { +dev_err (&csi->cldev->dev, +"error %lld, invalid link_freq\n" , freq); +return -EINVAL ; + } + + link_freq_menu_items[0 ] = freq; + ctrl->val =0 ; + +return 0 ; + } + +return -EINVAL ; +} + +static const struct v4l2_ctrl_ops mei_csi_ctrl_ops = { + .g_volatile_ctrl = mei_csi_g_volatile_ctrl, +}; + +static const struct v4l2_subdev_video_ops mei_csi_video_ops = { + .s_stream = mei_csi_set_stream, +}; + +static const struct v4l2_subdev_pad_ops mei_csi_pad_ops = { + .init_cfg = mei_csi_init_cfg, + .get_fmt = mei_csi_get_fmt, + .set_fmt = mei_csi_set_fmt, +}; + +static const struct v4l2_subdev_ops mei_csi_subdev_ops = { + .video = &mei_csi_video_ops, + .pad = &mei_csi_pad_ops, +}; + +static const struct media_entity_operations mei_csi_entity_ops = { + .link_validate = v4l2_subdev_link_validate, +}; + +static int mei_csi_notify_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_connection *asd) +{ +struct mei_csi *csi =notifier_to_csi (notifier); +int pad; + + pad =media_entity_get_fwnode_pad (&subdev->entity, asd->match.fwnode, +MEDIA_PAD_FL_SOURCE ); +if (pad <0 ) +return pad; + + csi->remote = subdev; + csi->remote_pad = pad; + +return media_create_pad_link (&subdev->entity, pad, + &csi->subdev.entity,1 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +} + +static void mei_csi_notify_unbind (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_connection *asd) +{ +struct mei_csi *csi =notifier_to_csi (notifier); + + csi->remote =NULL ; +} + +static const struct v4l2_async_notifier_operations mei_csi_notify_ops = { + .bound = mei_csi_notify_bound, + .unbind = mei_csi_notify_unbind, +}; + +static int mei_csi_init_controls (struct mei_csi *csi) +{ +u32 max; +int ret; + + ret =v4l2_ctrl_handler_init (&csi->ctrl_handler,2 ); +if (ret) +return ret; + + csi->ctrl_handler.lock = &csi->lock; + + max =ARRAY_SIZE (link_freq_menu_items) -1 ; + csi->freq_ctrl =v4l2_ctrl_new_int_menu (&csi->ctrl_handler, + &mei_csi_ctrl_ops, +V4L2_CID_LINK_FREQ , + max, +0 , + link_freq_menu_items); +if (csi->freq_ctrl) + csi->freq_ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY | +V4L2_CTRL_FLAG_VOLATILE ; + + csi->privacy_ctrl =v4l2_ctrl_new_std (&csi->ctrl_handler,NULL , +V4L2_CID_PRIVACY ,0 ,1 ,1 ,0 ); +if (csi->privacy_ctrl) + csi->privacy_ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY ; + +if (csi->ctrl_handler.error) +return csi->ctrl_handler.error; + + csi->subdev.ctrl_handler = &csi->ctrl_handler; + +return 0 ; +} + +static int mei_csi_parse_firmware (struct mei_csi *csi) +{ +struct v4l2_fwnode_endpoint v4l2_ep = { + .bus_type =V4L2_MBUS_CSI2_DPHY , + }; +struct device *dev = &csi->cldev->dev; +struct v4l2_async_connection *asd; +struct fwnode_handle *fwnode; +struct fwnode_handle *ep; +int ret; + + ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (dev),0 ,0 ,0 ); +if (!ep) { +dev_err (dev,"not connected to subdevice\n" ); +return -EINVAL ; + } + + ret =v4l2_fwnode_endpoint_parse (ep, &v4l2_ep); +if (ret) { +dev_err (dev,"could not parse v4l2 endpoint\n" ); +fwnode_handle_put (ep); +return -EINVAL ; + } + + fwnode =fwnode_graph_get_remote_endpoint (ep); +fwnode_handle_put (ep); + +v4l2_async_subdev_nf_init (&csi->notifier, &csi->subdev); + csi->notifier.ops = &mei_csi_notify_ops; + + asd =v4l2_async_nf_add_fwnode (&csi->notifier, fwnode, + struct v4l2_async_connection); +if (IS_ERR (asd)) { +fwnode_handle_put (fwnode); +return PTR_ERR (asd); + } + + ret =v4l2_fwnode_endpoint_alloc_parse (fwnode, &v4l2_ep); +fwnode_handle_put (fwnode); +if (ret) +return ret; + csi->nr_of_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes; + + ret =v4l2_async_nf_register (&csi->notifier); +if (ret) +v4l2_async_nf_cleanup (&csi->notifier); + +v4l2_fwnode_endpoint_free (&v4l2_ep); + +return ret; +} + +static int mei_csi_probe (struct mei_cl_device *cldev, +const struct mei_cl_device_id *id) +{ +struct device *dev = &cldev->dev; +struct mei_csi *csi; +int ret; + +if (!dev_fwnode (dev)) +return -EPROBE_DEFER ; + + csi =devm_kzalloc (dev,sizeof (struct mei_csi ),GFP_KERNEL ); +if (!csi) +return -ENOMEM ; + + csi->cldev = cldev; +mutex_init (&csi->lock); +init_completion (&csi->cmd_completion); + +mei_cldev_set_drvdata (cldev, csi); + + ret =mei_cldev_enable (cldev); +if (ret <0 ) { +dev_err (dev,"mei_cldev_enable failed: %d\n" , ret); + goto destroy_mutex; + } + + ret =mei_cldev_register_rx_cb (cldev, mei_csi_rx); +if (ret) { +dev_err (dev,"event cb registration failed: %d\n" , ret); + goto err_disable; + } + + ret =mei_csi_parse_firmware (csi); +if (ret) + goto err_disable; + + csi->subdev.dev = &cldev->dev; +v4l2_subdev_init (&csi->subdev, &mei_csi_subdev_ops); +v4l2_set_subdevdata (&csi->subdev, csi); + csi->subdev.flags =V4L2_SUBDEV_FL_HAS_DEVNODE | +V4L2_SUBDEV_FL_HAS_EVENTS ; + csi->subdev.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + csi->subdev.entity.ops = &mei_csi_entity_ops; + +snprintf (csi->subdev.name,sizeof (csi->subdev.name), +MEI_CSI_ENTITY_NAME ); + + ret =mei_csi_init_controls (csi); +if (ret) + goto err_ctrl_handler; + + csi->format_mbus[CSI_PAD_SOURCE ] = mei_csi_format_mbus_default; + csi->format_mbus[CSI_PAD_SINK ] = mei_csi_format_mbus_default; + + csi->pads[CSI_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + csi->pads[CSI_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&csi->subdev.entity,CSI_NUM_PADS , + csi->pads); +if (ret) + goto err_ctrl_handler; + + ret =v4l2_subdev_init_finalize (&csi->subdev); +if (ret <0 ) + goto err_entity; + + ret =v4l2_async_register_subdev (&csi->subdev); +if (ret <0 ) + goto err_subdev; + +pm_runtime_enable (&cldev->dev); + +return 0 ; + +err_subdev: +v4l2_subdev_cleanup (&csi->subdev); + +err_entity: +media_entity_cleanup (&csi->subdev.entity); + +err_ctrl_handler: +v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); + +err_disable: +mei_cldev_disable (cldev); + +destroy_mutex: +mutex_destroy (&csi->lock); + +return ret; +} + +static void mei_csi_remove (struct mei_cl_device *cldev) +{ +struct mei_csi *csi =mei_cldev_get_drvdata (cldev); + +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); +v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_async_unregister_subdev (&csi->subdev); +v4l2_subdev_cleanup (&csi->subdev); +media_entity_cleanup (&csi->subdev.entity); + +pm_runtime_disable (&cldev->dev); + +mutex_destroy (&csi->lock); +} + +#define MEI_CSI_UUID UUID_LE(0x92335FCF, 0x3203, 0x4472, \ + 0xAF, 0x93, 0x7b, 0x44, 0x53, 0xAC, 0x29, 0xDA) + +static const struct mei_cl_device_id mei_csi_tbl[] = { + {MEI_CSI_DRIVER_NAME ,MEI_CSI_UUID ,MEI_CL_VERSION_ANY }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (mei, mei_csi_tbl); + +static struct mei_cl_driver mei_csi_driver = { + .id_table = mei_csi_tbl, + .name =MEI_CSI_DRIVER_NAME , + + .probe = mei_csi_probe, + .remove = mei_csi_remove, +}; + +module_mei_cl_driver (mei_csi_driver); + +MODULE_AUTHOR ("Wentong Wu <[email protected]>" ); +MODULE_AUTHOR ("Zhifeng Wang <[email protected]>" ); +MODULE_DESCRIPTION ("Device driver for IVSC CSI" ); +MODULE_LICENSE ("GPL" );
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerRe: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Hi Laurent,
(Dropping Xiang, his e-mail doesn't seem to work.)
Quoted 21 lines · Laurent Pinchart
Hi Sakari and Wentong,
Thank you for the patch.
Quoted 8 lines · Sakari Ailus
From: Wentong Wu <[email protected]>
CSI is a submodule of IVSC which can route camera sensor data to the outbound MIPI CSI-2 interface.
The interface communicating with firmware is via MEI. There is a separate MEI UUID, which this driver uses to enumerate.
Quoted 7 lines
To route camera sensor data to host, the information of link frequency and number of data lanes is sent to firmware by sending MEI command when starting stream.
CSI also provides a privacy mode. When privacy mode is turned on, camera sensor can't be used. This means that both IVSC and host Image Processing Unit(IPU) can't get image data. And when
Quoted 7 lines
s/Unit/Unit /
I'd like to see a proof of that statement though :-) Handling camera privacy in a closed-source firmware known to have backdoors doesn't seem very private to me.
Is the IVSC found in lots of IPU6-based machines ?
I think it's found in most of what I'm aware of, not all though.
Quoted 56 lines
Quoted 43 lines
this mode is turned on, user is notified via v4l2 control callback.
Signed-off-by Wentong Wu <[email protected]>Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/Kconfig | 1 + drivers/media/pci/intel/Makefile | 1 + drivers/media/pci/intel/ivsc/Kconfig | 12 + drivers/media/pci/intel/ivsc/Makefile | 6 + drivers/media/pci/intel/ivsc/mei_csi.c | 825 +++++++++++++++++++++++++ 5 files changed, 845 insertions(+) create mode 100644 drivers/media/pci/intel/ivsc/Kconfig create mode 100644 drivers/media/pci/intel/ivsc/Makefile create mode 100644 drivers/media/pci/intel/ivsc/mei_csi.cdrivers/media/pci/intel/Kconfig +1
-0@@ -8,3 +8,4 @@ config IPU_BRIDGE dependencies, this is selected by each driver that needs it. source "drivers/media/pci/intel/ipu3/Kconfig" +source "drivers/media/pci/intel/ivsc/Kconfig"drivers/media/pci/intel/Makefile +1
-0@@ -4,3 +4,4 @@ # obj-$(CONFIG_IPU_BRIDGE) += ipu-bridge.o obj-y += ipu3/ +obj-y += ivsc/drivers/media/pci/intel/ivsc/Kconfig new file +2
-0@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023, Intel Corporation. All rights reserved.drivers/media/pci/intel/ivsc/Kconfig line 12
Quoted 10 lines
drivers/media/pci/intel/ivsc/Kconfig new file +10
-0+ +config INTEL_VSC + tristate "Intel Visual Sensing Controller" + depends on INTEL_MEI + help + This adds support for Intel Visual Sensing Controller (IVSC). + + Enables the IVSC firmware services required for controlling + camera sensor ownership and CSI-2 link through Image Processing + Unit(IPU) driver of Intel.s/Unit/Unit /
Quoted 1 line
This would benefit from being reworded, it's not very clear.
I'll post a patch to improve the text, this patch is already in a PR.
Quoted 517 lines
Quoted 517 lines
drivers/media/pci/intel/ivsc/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Copyright (C) 2023, Intel Corporation. All rights reserved. + +obj-$(CONFIG_INTEL_VSC) += ivsc-csi.o +ivsc-csi-y += mei_csi.odrivers/media/pci/intel/ivsc/mei_csi.c new file +498
-0@@ -0,0 +1,825 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Intel Corporation. All rights reserved. +* Intel Visual Sensing Controller CSI Linux driver +*/ + +/* +* To set ownership of CSI-2 link and to configure CSI-2 link, there +* are specific commands, which are sent via MEI protocol. The send +* command function uses "completion" as a synchronization mechanism. +* The response for command is received via a mei callback which wakes +* up the caller. There can be only one outstanding command at a time. +*/ + +#include <linux/completion.h> +#include <linux/delay.h> +#include <linux/kernel.h> +#include <linux/math64.h> +#include <linux/mei_cl_bus.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> +#include <linux/units.h> +#include <linux/uuid.h> +#include <linux/workqueue.h> + +#include <media/v4l2-async.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> + +#define MEI_CSI_DRIVER_NAME "ivsc_csi" +#define MEI_CSI_ENTITY_NAME "Intel IVSC CSI" + +#define MEI_CSI_LINK_FREQ_400MHZ 400000000ULL + +/* the 5s used here is based on experiment */ +#define CSI_CMD_TIMEOUT (5 * HZ) +/* to setup CSI-2 link an extra delay needed and determined experimentally */ +#define CSI_FW_READY_DELAY_MS 100 +/* link frequency unit is 100kHz */ +#define CSI_LINK_FREQ (x) ((u32)(div_u64(x, 100 * HZ_PER_KHZ))) + +/* +* identify the command id supported by firmware +* IPC, as well as the privacy notification id +* used when processing privacy event. +*/ +enum csi_cmd_id { +/* used to set csi ownership */ +CSI_SET_OWNER =0 , + +/* used to configure CSI-2 link */ +CSI_SET_CONF =2 , + +/* privacy notification id used when privacy state changes */ +CSI_PRIVACY_NOTIF =6 , +}; + +/* CSI-2 link ownership definition */ +enum csi_link_owner { +CSI_LINK_IVSC , +CSI_LINK_HOST , +}; + +/* privacy status definition */ +enum ivsc_privacy_status { +CSI_PRIVACY_OFF , +CSI_PRIVACY_ON , +CSI_PRIVACY_MAX , +}; + +enum csi_pads { +CSI_PAD_SOURCE , +CSI_PAD_SINK , +CSI_NUM_PADS +}; + +/* configuration of the CSI-2 link between host and IVSC */ +struct csi_link_cfg { +/* number of data lanes used on the CSI-2 link */ +u32 nr_of_lanes; + +/* frequency of the CSI-2 link */ +u32 link_freq; + +/* for future use */ +u32 rsvd[2 ]; +} __packed; + +/* CSI command structure */ +struct csi_cmd { +u32 cmd_id; +union _cmd_param { +u32 param; +struct csi_link_cfg conf; + } param; +} __packed; + +/* CSI notification structure */ +struct csi_notif { +u32 cmd_id; +int status; +union _resp_cont { +u32 cont; +struct csi_link_cfg conf; + } cont; +} __packed; + +struct mei_csi { +struct mei_cl_device *cldev; + +/* command response */ +struct csi_notif cmd_response; +/* used to wait for command response from firmware */ +struct completion cmd_completion; +/* protect command download */ +struct mutex lock; + +struct v4l2_subdev subdev; +struct v4l2_subdev *remote; +struct v4l2_async_notifier notifier; +struct v4l2_ctrl_handler ctrl_handler; +struct v4l2_ctrl *freq_ctrl; +struct v4l2_ctrl *privacy_ctrl; +unsigned int remote_pad; +/* start streaming or not */ +int streaming; + +struct media_pad pads[CSI_NUM_PADS ]; +struct v4l2_mbus_framefmt format_mbus[CSI_NUM_PADS ]; + +/* number of data lanes used on the CSI-2 link */ +u32 nr_of_lanes; +/* frequency of the CSI-2 link */ +u64 link_freq; + +/* privacy status */ +enum ivsc_privacy_status status; +}; + +static const struct v4l2_mbus_framefmt mei_csi_format_mbus_default = { + .width =1 , + .height =1 , + .code =MEDIA_BUS_FMT_Y8_1X8 , + .field =V4L2_FIELD_NONE , +}; + +static s64 link_freq_menu_items[] = { +MEI_CSI_LINK_FREQ_400MHZ +}; + +static inline struct mei_csi *notifier_to_csi (struct v4l2_async_notifier *n) +{ + return container_of(n, struct mei_csi, notifier); +} + +static inline struct mei_csi *sd_to_csi (struct v4l2_subdev *sd) +{ + return container_of(sd, struct mei_csi, subdev); +} + +static inline struct mei_csi *ctrl_to_csi (struct v4l2_ctrl *ctrl) +{ + return container_of(ctrl->handler, struct mei_csi, ctrl_handler); +} + +/* send a command to firmware and mutex must be held by caller */ +static int mei_csi_send (struct mei_csi *csi,u8 *buf,size_t len) +{ +struct csi_cmd *cmd = (struct csi_cmd *)buf; +int ret; + +reinit_completion (&csi->cmd_completion); + + ret =mei_cldev_send (csi->cldev, buf, len); +if (ret <0 ) + goto out; + + ret =wait_for_completion_killable_timeout (&csi->cmd_completion, +CSI_CMD_TIMEOUT ); +if (ret <0 ) { + goto out; + }else if (!ret) { + ret = -ETIMEDOUT ; + goto out; + } + +/* command response status */ + ret = csi->cmd_response.status; +if (ret) { + ret = -EINVAL ; + goto out; + } + +if (csi->cmd_response.cmd_id != cmd->cmd_id) + ret = -EINVAL ; + +out: +return ret; +} + +/* set CSI-2 link ownership */ +static int csi_set_link_owner (struct mei_csi *csi,enum csi_link_owner owner) +{ +struct csi_cmd cmd = {0 }; +size_t cmd_size; +int ret; + + cmd.cmd_id =CSI_SET_OWNER ; + cmd.param.param = owner; + cmd_size =sizeof (cmd.cmd_id) +sizeof (cmd.param.param); + +mutex_lock (&csi->lock); + + ret =mei_csi_send (csi, (u8 *)&cmd, cmd_size); + +mutex_unlock (&csi->lock); + +return ret; +} + +/* configure CSI-2 link between host and IVSC */ +static int csi_set_link_cfg (struct mei_csi *csi) +{ +struct csi_cmd cmd = {0 }; +size_t cmd_size; +int ret; + + cmd.cmd_id =CSI_SET_CONF ; + cmd.param.conf.nr_of_lanes = csi->nr_of_lanes; + cmd.param.conf.link_freq =CSI_LINK_FREQ (csi->link_freq); + cmd_size =sizeof (cmd.cmd_id) +sizeof (cmd.param.conf); + +mutex_lock (&csi->lock); + + ret =mei_csi_send (csi, (u8 *)&cmd, cmd_size); +/* +* wait configuration ready if download success. placing +* delay under mutex is to make sure current command flow +* completed before starting a possible new one. +*/ +if (!ret) +msleep (CSI_FW_READY_DELAY_MS ); + +mutex_unlock (&csi->lock); + +return ret; +} + +/* callback for receive */ +static void mei_csi_rx (struct mei_cl_device *cldev) +{ +struct mei_csi *csi =mei_cldev_get_drvdata (cldev); +struct csi_notif notif = {0 }; +int ret; + + ret =mei_cldev_recv (cldev, (u8 *)¬if,sizeof (notif)); +if (ret <0 ) { +dev_err (&cldev->dev,"recv error: %d\n" , ret); +return ; + } + +switch (notif.cmd_id) { +case CSI_PRIVACY_NOTIF : +if (notif.cont.cont <CSI_PRIVACY_MAX ) { + csi->status = notif.cont.cont; +v4l2_ctrl_s_ctrl (csi->privacy_ctrl, csi->status); + } +break ; +case CSI_SET_OWNER : +case CSI_SET_CONF : +memcpy (&csi->cmd_response, ¬if, ret); + +complete (&csi->cmd_completion); +break ; +default : +break ; + } +} + +static int mei_csi_set_stream (struct v4l2_subdev *sd,int enable) +{ +struct mei_csi *csi =sd_to_csi (sd); +s64 freq; +int ret; + +if (enable && csi->streaming ==0 ) { + freq =v4l2_get_link_freq (csi->remote->ctrl_handler,0 ,0 ); +if (freq <0 ) { +dev_err (&csi->cldev->dev, +"error %lld, invalid link_freq\n" , freq); + ret = freq; + goto err; + } + csi->link_freq = freq; + +/* switch CSI-2 link to host */ + ret =csi_set_link_owner (csi,CSI_LINK_HOST ); +if (ret <0 ) + goto err; + +/* configure CSI-2 link */ + ret =csi_set_link_cfg (csi); +if (ret <0 ) + goto err_switch; + + ret =v4l2_subdev_call (csi->remote, video, s_stream,1 ); +if (ret) + goto err_switch; + }else if (!enable && csi->streaming ==1 ) { +v4l2_subdev_call (csi->remote, video, s_stream,0 ); + +/* switch CSI-2 link to IVSC */ + ret =csi_set_link_owner (csi,CSI_LINK_IVSC ); +if (ret <0 ) +dev_warn (&csi->cldev->dev, +"failed to switch CSI2 link: %d\n" , ret); + } + + csi->streaming = enable; + +return 0 ; + +err_switch: +csi_set_link_owner (csi,CSI_LINK_IVSC ); + +err: +return ret; +} + +static struct v4l2_mbus_framefmt * +mei_csi_get_pad_format (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +unsigned int pad,u32 which) +{ +struct mei_csi *csi =sd_to_csi (sd); + +switch (which) { +case V4L2_SUBDEV_FORMAT_TRY : +return v4l2_subdev_get_try_format (sd, sd_state, pad); +case V4L2_SUBDEV_FORMAT_ACTIVE : +return &csi->format_mbus[pad]; +default : +return NULL ; + } +} + +static int mei_csi_init_cfg (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state) +{ +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +unsigned int i; + +mutex_lock (&csi->lock); + +for (i =0 ; i < sd->entity.num_pads; i++) { + mbusformat =v4l2_subdev_get_try_format (sd, sd_state, i); + *mbusformat = mei_csi_format_mbus_default; + } + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_get_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); + +mutex_lock (&csi->lock); + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (mbusformat) + format->format = *mbusformat; + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *source_mbusformat; +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +struct media_pad *pad; + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (!mbusformat) +return -EINVAL ; + + source_mbusformat =mei_csi_get_pad_format (sd, sd_state,CSI_PAD_SOURCE , + format->which); +if (!source_mbusformat) +return -EINVAL ; + +v4l_bound_align_image (&format->format.width,1 ,65536 ,0 , + &format->format.height,1 ,65536 ,0 ,0 ); + +switch (format->format.code) { +case MEDIA_BUS_FMT_RGB444_1X12 : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_BGR565_2X8_BE : +case MEDIA_BUS_FMT_BGR565_2X8_LE : +case MEDIA_BUS_FMT_RGB565_2X8_BE : +case MEDIA_BUS_FMT_RGB565_2X8_LE : +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RBG888_1X24 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_GBR888_1X24 : +case MEDIA_BUS_FMT_RGB888_1X24 : +case MEDIA_BUS_FMT_RGB888_2X12_BE : +case MEDIA_BUS_FMT_RGB888_2X12_LE : +case MEDIA_BUS_FMT_ARGB8888_1X32 : +case MEDIA_BUS_FMT_RGB888_1X32_PADHI : +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_RGB121212_1X36 : +case MEDIA_BUS_FMT_RGB161616_1X48 : +case MEDIA_BUS_FMT_Y8_1X8 : +case MEDIA_BUS_FMT_UV8_1X8 : +case MEDIA_BUS_FMT_UYVY8_1_5X8 : +case MEDIA_BUS_FMT_VYUY8_1_5X8 : +case MEDIA_BUS_FMT_YUYV8_1_5X8 : +case MEDIA_BUS_FMT_YVYU8_1_5X8 : +case MEDIA_BUS_FMT_UYVY8_2X8 : +case MEDIA_BUS_FMT_VYUY8_2X8 : +case MEDIA_BUS_FMT_YUYV8_2X8 : +case MEDIA_BUS_FMT_YVYU8_2X8 : +case MEDIA_BUS_FMT_Y10_1X10 : +case MEDIA_BUS_FMT_UYVY10_2X10 : +case MEDIA_BUS_FMT_VYUY10_2X10 : +case MEDIA_BUS_FMT_YUYV10_2X10 : +case MEDIA_BUS_FMT_YVYU10_2X10 : +case MEDIA_BUS_FMT_Y12_1X12 : +case MEDIA_BUS_FMT_UYVY12_2X12 : +case MEDIA_BUS_FMT_VYUY12_2X12 : +case MEDIA_BUS_FMT_YUYV12_2X12 : +case MEDIA_BUS_FMT_YVYU12_2X12 : +case MEDIA_BUS_FMT_UYVY8_1X16 : +case MEDIA_BUS_FMT_VYUY8_1X16 : +case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_YVYU8_1X16 : +case MEDIA_BUS_FMT_YDYUYDYV8_1X16 : +case MEDIA_BUS_FMT_UYVY10_1X20 : +case MEDIA_BUS_FMT_VYUY10_1X20 : +case MEDIA_BUS_FMT_YUYV10_1X20 : +case MEDIA_BUS_FMT_YVYU10_1X20 : +case MEDIA_BUS_FMT_VUY8_1X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_UYVY12_1X24 : +case MEDIA_BUS_FMT_VYUY12_1X24 : +case MEDIA_BUS_FMT_YUYV12_1X24 : +case MEDIA_BUS_FMT_YVYU12_1X24 : +case MEDIA_BUS_FMT_YUV10_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_AYUV8_1X32 : +case MEDIA_BUS_FMT_UYYVYY12_0_5X36 : +case MEDIA_BUS_FMT_YUV12_1X36 : +case MEDIA_BUS_FMT_YUV16_1X48 : +case MEDIA_BUS_FMT_UYYVYY16_0_5X48 : +case MEDIA_BUS_FMT_JPEG_1X8 : +case MEDIA_BUS_FMT_AHSV8888_1X32 : +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SBGGR14_1X14 : +case MEDIA_BUS_FMT_SGBRG14_1X14 : +case MEDIA_BUS_FMT_SGRBG14_1X14 : +case MEDIA_BUS_FMT_SRGGB14_1X14 : +case MEDIA_BUS_FMT_SBGGR16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SRGGB16_1X16 :
Quoted 8 lines
drivers/media/pci/intel/ivsc/mei_csi.c line 503
Quoted 5 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +5
-0+break ; +default : + format->format.code =MEDIA_BUS_FMT_Y8_1X8 ; +break ; + }I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
The video mux needs something similar. I was thinking of adding a generic helper for such functions, perhaps with flags to suggest which formats to accept.
Quoted 324 lines
Quoted 323 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +322
-0+ +if (format->format.field ==V4L2_FIELD_ANY ) + format->format.field =V4L2_FIELD_NONE ; + +mutex_lock (&csi->lock); + + pad = &csi->pads[format->pad]; +if (pad->flags &MEDIA_PAD_FL_SOURCE ) + format->format = csi->format_mbus[CSI_PAD_SINK ]; + + *mbusformat = format->format; + +if (pad->flags &MEDIA_PAD_FL_SINK ) + *source_mbusformat = format->format; + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_g_volatile_ctrl (struct v4l2_ctrl *ctrl) +{ +struct mei_csi *csi =ctrl_to_csi (ctrl); +s64 freq; + +if (ctrl->id ==V4L2_CID_LINK_FREQ ) { +if (!csi->remote) +return -EINVAL ; + + freq =v4l2_get_link_freq (csi->remote->ctrl_handler,0 ,0 ); +if (freq <0 ) { +dev_err (&csi->cldev->dev, +"error %lld, invalid link_freq\n" , freq); +return -EINVAL ; + } + + link_freq_menu_items[0 ] = freq; + ctrl->val =0 ; + +return 0 ; + } + +return -EINVAL ; +} + +static const struct v4l2_ctrl_ops mei_csi_ctrl_ops = { + .g_volatile_ctrl = mei_csi_g_volatile_ctrl, +}; + +static const struct v4l2_subdev_video_ops mei_csi_video_ops = { + .s_stream = mei_csi_set_stream, +}; + +static const struct v4l2_subdev_pad_ops mei_csi_pad_ops = { + .init_cfg = mei_csi_init_cfg, + .get_fmt = mei_csi_get_fmt, + .set_fmt = mei_csi_set_fmt, +}; + +static const struct v4l2_subdev_ops mei_csi_subdev_ops = { + .video = &mei_csi_video_ops, + .pad = &mei_csi_pad_ops, +}; + +static const struct media_entity_operations mei_csi_entity_ops = { + .link_validate = v4l2_subdev_link_validate, +}; + +static int mei_csi_notify_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_connection *asd) +{ +struct mei_csi *csi =notifier_to_csi (notifier); +int pad; + + pad =media_entity_get_fwnode_pad (&subdev->entity, asd->match.fwnode, +MEDIA_PAD_FL_SOURCE ); +if (pad <0 ) +return pad; + + csi->remote = subdev; + csi->remote_pad = pad; + +return media_create_pad_link (&subdev->entity, pad, + &csi->subdev.entity,1 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +} + +static void mei_csi_notify_unbind (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_connection *asd) +{ +struct mei_csi *csi =notifier_to_csi (notifier); + + csi->remote =NULL ; +} + +static const struct v4l2_async_notifier_operations mei_csi_notify_ops = { + .bound = mei_csi_notify_bound, + .unbind = mei_csi_notify_unbind, +}; + +static int mei_csi_init_controls (struct mei_csi *csi) +{ +u32 max; +int ret; + + ret =v4l2_ctrl_handler_init (&csi->ctrl_handler,2 ); +if (ret) +return ret; + + csi->ctrl_handler.lock = &csi->lock; + + max =ARRAY_SIZE (link_freq_menu_items) -1 ; + csi->freq_ctrl =v4l2_ctrl_new_int_menu (&csi->ctrl_handler, + &mei_csi_ctrl_ops, +V4L2_CID_LINK_FREQ , + max, +0 , + link_freq_menu_items); +if (csi->freq_ctrl) + csi->freq_ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY | +V4L2_CTRL_FLAG_VOLATILE ; + + csi->privacy_ctrl =v4l2_ctrl_new_std (&csi->ctrl_handler,NULL , +V4L2_CID_PRIVACY ,0 ,1 ,1 ,0 ); +if (csi->privacy_ctrl) + csi->privacy_ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY ; + +if (csi->ctrl_handler.error) +return csi->ctrl_handler.error; + + csi->subdev.ctrl_handler = &csi->ctrl_handler; + +return 0 ; +} + +static int mei_csi_parse_firmware (struct mei_csi *csi) +{ +struct v4l2_fwnode_endpoint v4l2_ep = { + .bus_type =V4L2_MBUS_CSI2_DPHY , + }; +struct device *dev = &csi->cldev->dev; +struct v4l2_async_connection *asd; +struct fwnode_handle *fwnode; +struct fwnode_handle *ep; +int ret; + + ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (dev),0 ,0 ,0 ); +if (!ep) { +dev_err (dev,"not connected to subdevice\n" ); +return -EINVAL ; + } + + ret =v4l2_fwnode_endpoint_parse (ep, &v4l2_ep); +if (ret) { +dev_err (dev,"could not parse v4l2 endpoint\n" ); +fwnode_handle_put (ep); +return -EINVAL ; + } + + fwnode =fwnode_graph_get_remote_endpoint (ep); +fwnode_handle_put (ep); + +v4l2_async_subdev_nf_init (&csi->notifier, &csi->subdev); + csi->notifier.ops = &mei_csi_notify_ops; + + asd =v4l2_async_nf_add_fwnode (&csi->notifier, fwnode, + struct v4l2_async_connection); +if (IS_ERR (asd)) { +fwnode_handle_put (fwnode); +return PTR_ERR (asd); + } + + ret =v4l2_fwnode_endpoint_alloc_parse (fwnode, &v4l2_ep); +fwnode_handle_put (fwnode); +if (ret) +return ret; + csi->nr_of_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes; + + ret =v4l2_async_nf_register (&csi->notifier); +if (ret) +v4l2_async_nf_cleanup (&csi->notifier); + +v4l2_fwnode_endpoint_free (&v4l2_ep); + +return ret; +} + +static int mei_csi_probe (struct mei_cl_device *cldev, +const struct mei_cl_device_id *id) +{ +struct device *dev = &cldev->dev; +struct mei_csi *csi; +int ret; + +if (!dev_fwnode (dev)) +return -EPROBE_DEFER ; + + csi =devm_kzalloc (dev,sizeof (struct mei_csi ),GFP_KERNEL ); +if (!csi) +return -ENOMEM ; + + csi->cldev = cldev; +mutex_init (&csi->lock); +init_completion (&csi->cmd_completion); + +mei_cldev_set_drvdata (cldev, csi); + + ret =mei_cldev_enable (cldev); +if (ret <0 ) { +dev_err (dev,"mei_cldev_enable failed: %d\n" , ret); + goto destroy_mutex; + } + + ret =mei_cldev_register_rx_cb (cldev, mei_csi_rx); +if (ret) { +dev_err (dev,"event cb registration failed: %d\n" , ret); + goto err_disable; + } + + ret =mei_csi_parse_firmware (csi); +if (ret) + goto err_disable; + + csi->subdev.dev = &cldev->dev; +v4l2_subdev_init (&csi->subdev, &mei_csi_subdev_ops); +v4l2_set_subdevdata (&csi->subdev, csi); + csi->subdev.flags =V4L2_SUBDEV_FL_HAS_DEVNODE | +V4L2_SUBDEV_FL_HAS_EVENTS ; + csi->subdev.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + csi->subdev.entity.ops = &mei_csi_entity_ops; + +snprintf (csi->subdev.name,sizeof (csi->subdev.name), +MEI_CSI_ENTITY_NAME ); + + ret =mei_csi_init_controls (csi); +if (ret) + goto err_ctrl_handler; + + csi->format_mbus[CSI_PAD_SOURCE ] = mei_csi_format_mbus_default; + csi->format_mbus[CSI_PAD_SINK ] = mei_csi_format_mbus_default; + + csi->pads[CSI_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + csi->pads[CSI_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&csi->subdev.entity,CSI_NUM_PADS , + csi->pads); +if (ret) + goto err_ctrl_handler; + + ret =v4l2_subdev_init_finalize (&csi->subdev); +if (ret <0 ) + goto err_entity; + + ret =v4l2_async_register_subdev (&csi->subdev); +if (ret <0 ) + goto err_subdev; + +pm_runtime_enable (&cldev->dev); + +return 0 ; + +err_subdev: +v4l2_subdev_cleanup (&csi->subdev); + +err_entity: +media_entity_cleanup (&csi->subdev.entity); + +err_ctrl_handler: +v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); + +err_disable: +mei_cldev_disable (cldev); + +destroy_mutex: +mutex_destroy (&csi->lock); + +return ret; +} + +static void mei_csi_remove (struct mei_cl_device *cldev) +{ +struct mei_csi *csi =mei_cldev_get_drvdata (cldev); + +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); +v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_async_unregister_subdev (&csi->subdev); +v4l2_subdev_cleanup (&csi->subdev); +media_entity_cleanup (&csi->subdev.entity); + +pm_runtime_disable (&cldev->dev); + +mutex_destroy (&csi->lock); +} + +#define MEI_CSI_UUID UUID_LE(0x92335FCF, 0x3203, 0x4472, \ + 0xAF, 0x93, 0x7b, 0x44, 0x53, 0xAC, 0x29, 0xDA) + +static const struct mei_cl_device_id mei_csi_tbl[] = { + {MEI_CSI_DRIVER_NAME ,MEI_CSI_UUID ,MEI_CL_VERSION_ANY }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (mei, mei_csi_tbl); + +static struct mei_cl_driver mei_csi_driver = { + .id_table = mei_csi_tbl, + .name =MEI_CSI_DRIVER_NAME , + + .probe = mei_csi_probe, + .remove = mei_csi_remove, +}; + +module_mei_cl_driver (mei_csi_driver); + +MODULE_AUTHOR ("Wentong Wu <[email protected]>" ); +MODULE_AUTHOR ("Zhifeng Wang <[email protected]>" ); +MODULE_DESCRIPTION ("Device driver for IVSC CSI" ); +MODULE_LICENSE ("GPL" );
Signature · 3 lines
Kind regards, Sakari Ailus
Re: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Quoted 622 lines · Sakari Ailus
Hi Laurent,
(Dropping Xiang, his e-mail doesn't seem to work.)
Quoted 21 lines · Laurent Pinchart
Hi Sakari and Wentong,
Thank you for the patch.
Quoted 8 lines · Sakari Ailus
From: Wentong Wu <[email protected]>
CSI is a submodule of IVSC which can route camera sensor data to the outbound MIPI CSI-2 interface.
The interface communicating with firmware is via MEI. There is a separate MEI UUID, which this driver uses to enumerate.
Quoted 7 lines
To route camera sensor data to host, the information of link frequency and number of data lanes is sent to firmware by sending MEI command when starting stream.
CSI also provides a privacy mode. When privacy mode is turned on, camera sensor can't be used. This means that both IVSC and host Image Processing Unit(IPU) can't get image data. And when
Quoted 7 lines
s/Unit/Unit /
I'd like to see a proof of that statement though :-) Handling camera privacy in a closed-source firmware known to have backdoors doesn't seem very private to me.
Is the IVSC found in lots of IPU6-based machines ?
I think it's found in most of what I'm aware of, not all though.
Quoted 56 lines
Quoted 43 lines
this mode is turned on, user is notified via v4l2 control callback.
Signed-off-by Wentong Wu <[email protected]>Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/Kconfig | 1 + drivers/media/pci/intel/Makefile | 1 + drivers/media/pci/intel/ivsc/Kconfig | 12 + drivers/media/pci/intel/ivsc/Makefile | 6 + drivers/media/pci/intel/ivsc/mei_csi.c | 825 +++++++++++++++++++++++++ 5 files changed, 845 insertions(+) create mode 100644 drivers/media/pci/intel/ivsc/Kconfig create mode 100644 drivers/media/pci/intel/ivsc/Makefile create mode 100644 drivers/media/pci/intel/ivsc/mei_csi.cdrivers/media/pci/intel/Kconfig +1
-0@@ -8,3 +8,4 @@ config IPU_BRIDGE dependencies, this is selected by each driver that needs it. source "drivers/media/pci/intel/ipu3/Kconfig" +source "drivers/media/pci/intel/ivsc/Kconfig"drivers/media/pci/intel/Makefile +1
-0@@ -4,3 +4,4 @@ # obj-$(CONFIG_IPU_BRIDGE) += ipu-bridge.o obj-y += ipu3/ +obj-y += ivsc/drivers/media/pci/intel/ivsc/Kconfig new file +2
-0@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023, Intel Corporation. All rights reserved.drivers/media/pci/intel/ivsc/Kconfig line 12
Quoted 10 lines
drivers/media/pci/intel/ivsc/Kconfig new file +10
-0+ +config INTEL_VSC + tristate "Intel Visual Sensing Controller" + depends on INTEL_MEI + help + This adds support for Intel Visual Sensing Controller (IVSC). + + Enables the IVSC firmware services required for controlling + camera sensor ownership and CSI-2 link through Image Processing + Unit(IPU) driver of Intel.s/Unit/Unit /
Quoted 1 line
This would benefit from being reworded, it's not very clear.
I'll post a patch to improve the text, this patch is already in a PR.
Quoted 517 lines
Quoted 517 lines
drivers/media/pci/intel/ivsc/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Copyright (C) 2023, Intel Corporation. All rights reserved. + +obj-$(CONFIG_INTEL_VSC) += ivsc-csi.o +ivsc-csi-y += mei_csi.odrivers/media/pci/intel/ivsc/mei_csi.c new file +498
-0@@ -0,0 +1,825 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Intel Corporation. All rights reserved. +* Intel Visual Sensing Controller CSI Linux driver +*/ + +/* +* To set ownership of CSI-2 link and to configure CSI-2 link, there +* are specific commands, which are sent via MEI protocol. The send +* command function uses "completion" as a synchronization mechanism. +* The response for command is received via a mei callback which wakes +* up the caller. There can be only one outstanding command at a time. +*/ + +#include <linux/completion.h> +#include <linux/delay.h> +#include <linux/kernel.h> +#include <linux/math64.h> +#include <linux/mei_cl_bus.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> +#include <linux/units.h> +#include <linux/uuid.h> +#include <linux/workqueue.h> + +#include <media/v4l2-async.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> + +#define MEI_CSI_DRIVER_NAME "ivsc_csi" +#define MEI_CSI_ENTITY_NAME "Intel IVSC CSI" + +#define MEI_CSI_LINK_FREQ_400MHZ 400000000ULL + +/* the 5s used here is based on experiment */ +#define CSI_CMD_TIMEOUT (5 * HZ) +/* to setup CSI-2 link an extra delay needed and determined experimentally */ +#define CSI_FW_READY_DELAY_MS 100 +/* link frequency unit is 100kHz */ +#define CSI_LINK_FREQ (x) ((u32)(div_u64(x, 100 * HZ_PER_KHZ))) + +/* +* identify the command id supported by firmware +* IPC, as well as the privacy notification id +* used when processing privacy event. +*/ +enum csi_cmd_id { +/* used to set csi ownership */ +CSI_SET_OWNER =0 , + +/* used to configure CSI-2 link */ +CSI_SET_CONF =2 , + +/* privacy notification id used when privacy state changes */ +CSI_PRIVACY_NOTIF =6 , +}; + +/* CSI-2 link ownership definition */ +enum csi_link_owner { +CSI_LINK_IVSC , +CSI_LINK_HOST , +}; + +/* privacy status definition */ +enum ivsc_privacy_status { +CSI_PRIVACY_OFF , +CSI_PRIVACY_ON , +CSI_PRIVACY_MAX , +}; + +enum csi_pads { +CSI_PAD_SOURCE , +CSI_PAD_SINK , +CSI_NUM_PADS +}; + +/* configuration of the CSI-2 link between host and IVSC */ +struct csi_link_cfg { +/* number of data lanes used on the CSI-2 link */ +u32 nr_of_lanes; + +/* frequency of the CSI-2 link */ +u32 link_freq; + +/* for future use */ +u32 rsvd[2 ]; +} __packed; + +/* CSI command structure */ +struct csi_cmd { +u32 cmd_id; +union _cmd_param { +u32 param; +struct csi_link_cfg conf; + } param; +} __packed; + +/* CSI notification structure */ +struct csi_notif { +u32 cmd_id; +int status; +union _resp_cont { +u32 cont; +struct csi_link_cfg conf; + } cont; +} __packed; + +struct mei_csi { +struct mei_cl_device *cldev; + +/* command response */ +struct csi_notif cmd_response; +/* used to wait for command response from firmware */ +struct completion cmd_completion; +/* protect command download */ +struct mutex lock; + +struct v4l2_subdev subdev; +struct v4l2_subdev *remote; +struct v4l2_async_notifier notifier; +struct v4l2_ctrl_handler ctrl_handler; +struct v4l2_ctrl *freq_ctrl; +struct v4l2_ctrl *privacy_ctrl; +unsigned int remote_pad; +/* start streaming or not */ +int streaming; + +struct media_pad pads[CSI_NUM_PADS ]; +struct v4l2_mbus_framefmt format_mbus[CSI_NUM_PADS ]; + +/* number of data lanes used on the CSI-2 link */ +u32 nr_of_lanes; +/* frequency of the CSI-2 link */ +u64 link_freq; + +/* privacy status */ +enum ivsc_privacy_status status; +}; + +static const struct v4l2_mbus_framefmt mei_csi_format_mbus_default = { + .width =1 , + .height =1 , + .code =MEDIA_BUS_FMT_Y8_1X8 , + .field =V4L2_FIELD_NONE , +}; + +static s64 link_freq_menu_items[] = { +MEI_CSI_LINK_FREQ_400MHZ +}; + +static inline struct mei_csi *notifier_to_csi (struct v4l2_async_notifier *n) +{ + return container_of(n, struct mei_csi, notifier); +} + +static inline struct mei_csi *sd_to_csi (struct v4l2_subdev *sd) +{ + return container_of(sd, struct mei_csi, subdev); +} + +static inline struct mei_csi *ctrl_to_csi (struct v4l2_ctrl *ctrl) +{ + return container_of(ctrl->handler, struct mei_csi, ctrl_handler); +} + +/* send a command to firmware and mutex must be held by caller */ +static int mei_csi_send (struct mei_csi *csi,u8 *buf,size_t len) +{ +struct csi_cmd *cmd = (struct csi_cmd *)buf; +int ret; + +reinit_completion (&csi->cmd_completion); + + ret =mei_cldev_send (csi->cldev, buf, len); +if (ret <0 ) + goto out; + + ret =wait_for_completion_killable_timeout (&csi->cmd_completion, +CSI_CMD_TIMEOUT ); +if (ret <0 ) { + goto out; + }else if (!ret) { + ret = -ETIMEDOUT ; + goto out; + } + +/* command response status */ + ret = csi->cmd_response.status; +if (ret) { + ret = -EINVAL ; + goto out; + } + +if (csi->cmd_response.cmd_id != cmd->cmd_id) + ret = -EINVAL ; + +out: +return ret; +} + +/* set CSI-2 link ownership */ +static int csi_set_link_owner (struct mei_csi *csi,enum csi_link_owner owner) +{ +struct csi_cmd cmd = {0 }; +size_t cmd_size; +int ret; + + cmd.cmd_id =CSI_SET_OWNER ; + cmd.param.param = owner; + cmd_size =sizeof (cmd.cmd_id) +sizeof (cmd.param.param); + +mutex_lock (&csi->lock); + + ret =mei_csi_send (csi, (u8 *)&cmd, cmd_size); + +mutex_unlock (&csi->lock); + +return ret; +} + +/* configure CSI-2 link between host and IVSC */ +static int csi_set_link_cfg (struct mei_csi *csi) +{ +struct csi_cmd cmd = {0 }; +size_t cmd_size; +int ret; + + cmd.cmd_id =CSI_SET_CONF ; + cmd.param.conf.nr_of_lanes = csi->nr_of_lanes; + cmd.param.conf.link_freq =CSI_LINK_FREQ (csi->link_freq); + cmd_size =sizeof (cmd.cmd_id) +sizeof (cmd.param.conf); + +mutex_lock (&csi->lock); + + ret =mei_csi_send (csi, (u8 *)&cmd, cmd_size); +/* +* wait configuration ready if download success. placing +* delay under mutex is to make sure current command flow +* completed before starting a possible new one. +*/ +if (!ret) +msleep (CSI_FW_READY_DELAY_MS ); + +mutex_unlock (&csi->lock); + +return ret; +} + +/* callback for receive */ +static void mei_csi_rx (struct mei_cl_device *cldev) +{ +struct mei_csi *csi =mei_cldev_get_drvdata (cldev); +struct csi_notif notif = {0 }; +int ret; + + ret =mei_cldev_recv (cldev, (u8 *)¬if,sizeof (notif)); +if (ret <0 ) { +dev_err (&cldev->dev,"recv error: %d\n" , ret); +return ; + } + +switch (notif.cmd_id) { +case CSI_PRIVACY_NOTIF : +if (notif.cont.cont <CSI_PRIVACY_MAX ) { + csi->status = notif.cont.cont; +v4l2_ctrl_s_ctrl (csi->privacy_ctrl, csi->status); + } +break ; +case CSI_SET_OWNER : +case CSI_SET_CONF : +memcpy (&csi->cmd_response, ¬if, ret); + +complete (&csi->cmd_completion); +break ; +default : +break ; + } +} + +static int mei_csi_set_stream (struct v4l2_subdev *sd,int enable) +{ +struct mei_csi *csi =sd_to_csi (sd); +s64 freq; +int ret; + +if (enable && csi->streaming ==0 ) { + freq =v4l2_get_link_freq (csi->remote->ctrl_handler,0 ,0 ); +if (freq <0 ) { +dev_err (&csi->cldev->dev, +"error %lld, invalid link_freq\n" , freq); + ret = freq; + goto err; + } + csi->link_freq = freq; + +/* switch CSI-2 link to host */ + ret =csi_set_link_owner (csi,CSI_LINK_HOST ); +if (ret <0 ) + goto err; + +/* configure CSI-2 link */ + ret =csi_set_link_cfg (csi); +if (ret <0 ) + goto err_switch; + + ret =v4l2_subdev_call (csi->remote, video, s_stream,1 ); +if (ret) + goto err_switch; + }else if (!enable && csi->streaming ==1 ) { +v4l2_subdev_call (csi->remote, video, s_stream,0 ); + +/* switch CSI-2 link to IVSC */ + ret =csi_set_link_owner (csi,CSI_LINK_IVSC ); +if (ret <0 ) +dev_warn (&csi->cldev->dev, +"failed to switch CSI2 link: %d\n" , ret); + } + + csi->streaming = enable; + +return 0 ; + +err_switch: +csi_set_link_owner (csi,CSI_LINK_IVSC ); + +err: +return ret; +} + +static struct v4l2_mbus_framefmt * +mei_csi_get_pad_format (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +unsigned int pad,u32 which) +{ +struct mei_csi *csi =sd_to_csi (sd); + +switch (which) { +case V4L2_SUBDEV_FORMAT_TRY : +return v4l2_subdev_get_try_format (sd, sd_state, pad); +case V4L2_SUBDEV_FORMAT_ACTIVE : +return &csi->format_mbus[pad]; +default : +return NULL ; + } +} + +static int mei_csi_init_cfg (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state) +{ +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +unsigned int i; + +mutex_lock (&csi->lock); + +for (i =0 ; i < sd->entity.num_pads; i++) { + mbusformat =v4l2_subdev_get_try_format (sd, sd_state, i); + *mbusformat = mei_csi_format_mbus_default; + } + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_get_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); + +mutex_lock (&csi->lock); + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (mbusformat) + format->format = *mbusformat; + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *source_mbusformat; +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +struct media_pad *pad; + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (!mbusformat) +return -EINVAL ; + + source_mbusformat =mei_csi_get_pad_format (sd, sd_state,CSI_PAD_SOURCE , + format->which); +if (!source_mbusformat) +return -EINVAL ; + +v4l_bound_align_image (&format->format.width,1 ,65536 ,0 , + &format->format.height,1 ,65536 ,0 ,0 ); + +switch (format->format.code) { +case MEDIA_BUS_FMT_RGB444_1X12 : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_BGR565_2X8_BE : +case MEDIA_BUS_FMT_BGR565_2X8_LE : +case MEDIA_BUS_FMT_RGB565_2X8_BE : +case MEDIA_BUS_FMT_RGB565_2X8_LE : +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RBG888_1X24 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_GBR888_1X24 : +case MEDIA_BUS_FMT_RGB888_1X24 : +case MEDIA_BUS_FMT_RGB888_2X12_BE : +case MEDIA_BUS_FMT_RGB888_2X12_LE : +case MEDIA_BUS_FMT_ARGB8888_1X32 : +case MEDIA_BUS_FMT_RGB888_1X32_PADHI : +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_RGB121212_1X36 : +case MEDIA_BUS_FMT_RGB161616_1X48 : +case MEDIA_BUS_FMT_Y8_1X8 : +case MEDIA_BUS_FMT_UV8_1X8 : +case MEDIA_BUS_FMT_UYVY8_1_5X8 : +case MEDIA_BUS_FMT_VYUY8_1_5X8 : +case MEDIA_BUS_FMT_YUYV8_1_5X8 : +case MEDIA_BUS_FMT_YVYU8_1_5X8 : +case MEDIA_BUS_FMT_UYVY8_2X8 : +case MEDIA_BUS_FMT_VYUY8_2X8 : +case MEDIA_BUS_FMT_YUYV8_2X8 : +case MEDIA_BUS_FMT_YVYU8_2X8 : +case MEDIA_BUS_FMT_Y10_1X10 : +case MEDIA_BUS_FMT_UYVY10_2X10 : +case MEDIA_BUS_FMT_VYUY10_2X10 : +case MEDIA_BUS_FMT_YUYV10_2X10 : +case MEDIA_BUS_FMT_YVYU10_2X10 : +case MEDIA_BUS_FMT_Y12_1X12 : +case MEDIA_BUS_FMT_UYVY12_2X12 : +case MEDIA_BUS_FMT_VYUY12_2X12 : +case MEDIA_BUS_FMT_YUYV12_2X12 : +case MEDIA_BUS_FMT_YVYU12_2X12 : +case MEDIA_BUS_FMT_UYVY8_1X16 : +case MEDIA_BUS_FMT_VYUY8_1X16 : +case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_YVYU8_1X16 : +case MEDIA_BUS_FMT_YDYUYDYV8_1X16 : +case MEDIA_BUS_FMT_UYVY10_1X20 : +case MEDIA_BUS_FMT_VYUY10_1X20 : +case MEDIA_BUS_FMT_YUYV10_1X20 : +case MEDIA_BUS_FMT_YVYU10_1X20 : +case MEDIA_BUS_FMT_VUY8_1X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_UYVY12_1X24 : +case MEDIA_BUS_FMT_VYUY12_1X24 : +case MEDIA_BUS_FMT_YUYV12_1X24 : +case MEDIA_BUS_FMT_YVYU12_1X24 : +case MEDIA_BUS_FMT_YUV10_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_AYUV8_1X32 : +case MEDIA_BUS_FMT_UYYVYY12_0_5X36 : +case MEDIA_BUS_FMT_YUV12_1X36 : +case MEDIA_BUS_FMT_YUV16_1X48 : +case MEDIA_BUS_FMT_UYYVYY16_0_5X48 : +case MEDIA_BUS_FMT_JPEG_1X8 : +case MEDIA_BUS_FMT_AHSV8888_1X32 : +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SBGGR14_1X14 : +case MEDIA_BUS_FMT_SGBRG14_1X14 : +case MEDIA_BUS_FMT_SGRBG14_1X14 : +case MEDIA_BUS_FMT_SRGGB14_1X14 : +case MEDIA_BUS_FMT_SBGGR16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SRGGB16_1X16 :Quoted 8 lines
drivers/media/pci/intel/ivsc/mei_csi.c line 503
Quoted 5 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +5
-0+break ; +default : + format->format.code =MEDIA_BUS_FMT_Y8_1X8 ; +break ; + }I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
Quoted 3 lines
The video mux needs something similar. I was thinking of adding a generic helper for such functions, perhaps with flags to suggest which formats to accept.
What would be the drawbacks of accepting all formats ?
Quoted 322 lines
Quoted 322 lines
Quoted 322 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +322
-0+ +if (format->format.field ==V4L2_FIELD_ANY ) + format->format.field =V4L2_FIELD_NONE ; + +mutex_lock (&csi->lock); + + pad = &csi->pads[format->pad]; +if (pad->flags &MEDIA_PAD_FL_SOURCE ) + format->format = csi->format_mbus[CSI_PAD_SINK ]; + + *mbusformat = format->format; + +if (pad->flags &MEDIA_PAD_FL_SINK ) + *source_mbusformat = format->format; + +mutex_unlock (&csi->lock); + +return 0 ; +} + +static int mei_csi_g_volatile_ctrl (struct v4l2_ctrl *ctrl) +{ +struct mei_csi *csi =ctrl_to_csi (ctrl); +s64 freq; + +if (ctrl->id ==V4L2_CID_LINK_FREQ ) { +if (!csi->remote) +return -EINVAL ; + + freq =v4l2_get_link_freq (csi->remote->ctrl_handler,0 ,0 ); +if (freq <0 ) { +dev_err (&csi->cldev->dev, +"error %lld, invalid link_freq\n" , freq); +return -EINVAL ; + } + + link_freq_menu_items[0 ] = freq; + ctrl->val =0 ; + +return 0 ; + } + +return -EINVAL ; +} + +static const struct v4l2_ctrl_ops mei_csi_ctrl_ops = { + .g_volatile_ctrl = mei_csi_g_volatile_ctrl, +}; + +static const struct v4l2_subdev_video_ops mei_csi_video_ops = { + .s_stream = mei_csi_set_stream, +}; + +static const struct v4l2_subdev_pad_ops mei_csi_pad_ops = { + .init_cfg = mei_csi_init_cfg, + .get_fmt = mei_csi_get_fmt, + .set_fmt = mei_csi_set_fmt, +}; + +static const struct v4l2_subdev_ops mei_csi_subdev_ops = { + .video = &mei_csi_video_ops, + .pad = &mei_csi_pad_ops, +}; + +static const struct media_entity_operations mei_csi_entity_ops = { + .link_validate = v4l2_subdev_link_validate, +}; + +static int mei_csi_notify_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_connection *asd) +{ +struct mei_csi *csi =notifier_to_csi (notifier); +int pad; + + pad =media_entity_get_fwnode_pad (&subdev->entity, asd->match.fwnode, +MEDIA_PAD_FL_SOURCE ); +if (pad <0 ) +return pad; + + csi->remote = subdev; + csi->remote_pad = pad; + +return media_create_pad_link (&subdev->entity, pad, + &csi->subdev.entity,1 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +} + +static void mei_csi_notify_unbind (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *subdev, +struct v4l2_async_connection *asd) +{ +struct mei_csi *csi =notifier_to_csi (notifier); + + csi->remote =NULL ; +} + +static const struct v4l2_async_notifier_operations mei_csi_notify_ops = { + .bound = mei_csi_notify_bound, + .unbind = mei_csi_notify_unbind, +}; + +static int mei_csi_init_controls (struct mei_csi *csi) +{ +u32 max; +int ret; + + ret =v4l2_ctrl_handler_init (&csi->ctrl_handler,2 ); +if (ret) +return ret; + + csi->ctrl_handler.lock = &csi->lock; + + max =ARRAY_SIZE (link_freq_menu_items) -1 ; + csi->freq_ctrl =v4l2_ctrl_new_int_menu (&csi->ctrl_handler, + &mei_csi_ctrl_ops, +V4L2_CID_LINK_FREQ , + max, +0 , + link_freq_menu_items); +if (csi->freq_ctrl) + csi->freq_ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY | +V4L2_CTRL_FLAG_VOLATILE ; + + csi->privacy_ctrl =v4l2_ctrl_new_std (&csi->ctrl_handler,NULL , +V4L2_CID_PRIVACY ,0 ,1 ,1 ,0 ); +if (csi->privacy_ctrl) + csi->privacy_ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY ; + +if (csi->ctrl_handler.error) +return csi->ctrl_handler.error; + + csi->subdev.ctrl_handler = &csi->ctrl_handler; + +return 0 ; +} + +static int mei_csi_parse_firmware (struct mei_csi *csi) +{ +struct v4l2_fwnode_endpoint v4l2_ep = { + .bus_type =V4L2_MBUS_CSI2_DPHY , + }; +struct device *dev = &csi->cldev->dev; +struct v4l2_async_connection *asd; +struct fwnode_handle *fwnode; +struct fwnode_handle *ep; +int ret; + + ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (dev),0 ,0 ,0 ); +if (!ep) { +dev_err (dev,"not connected to subdevice\n" ); +return -EINVAL ; + } + + ret =v4l2_fwnode_endpoint_parse (ep, &v4l2_ep); +if (ret) { +dev_err (dev,"could not parse v4l2 endpoint\n" ); +fwnode_handle_put (ep); +return -EINVAL ; + } + + fwnode =fwnode_graph_get_remote_endpoint (ep); +fwnode_handle_put (ep); + +v4l2_async_subdev_nf_init (&csi->notifier, &csi->subdev); + csi->notifier.ops = &mei_csi_notify_ops; + + asd =v4l2_async_nf_add_fwnode (&csi->notifier, fwnode, + struct v4l2_async_connection); +if (IS_ERR (asd)) { +fwnode_handle_put (fwnode); +return PTR_ERR (asd); + } + + ret =v4l2_fwnode_endpoint_alloc_parse (fwnode, &v4l2_ep); +fwnode_handle_put (fwnode); +if (ret) +return ret; + csi->nr_of_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes; + + ret =v4l2_async_nf_register (&csi->notifier); +if (ret) +v4l2_async_nf_cleanup (&csi->notifier); + +v4l2_fwnode_endpoint_free (&v4l2_ep); + +return ret; +} + +static int mei_csi_probe (struct mei_cl_device *cldev, +const struct mei_cl_device_id *id) +{ +struct device *dev = &cldev->dev; +struct mei_csi *csi; +int ret; + +if (!dev_fwnode (dev)) +return -EPROBE_DEFER ; + + csi =devm_kzalloc (dev,sizeof (struct mei_csi ),GFP_KERNEL ); +if (!csi) +return -ENOMEM ; + + csi->cldev = cldev; +mutex_init (&csi->lock); +init_completion (&csi->cmd_completion); + +mei_cldev_set_drvdata (cldev, csi); + + ret =mei_cldev_enable (cldev); +if (ret <0 ) { +dev_err (dev,"mei_cldev_enable failed: %d\n" , ret); + goto destroy_mutex; + } + + ret =mei_cldev_register_rx_cb (cldev, mei_csi_rx); +if (ret) { +dev_err (dev,"event cb registration failed: %d\n" , ret); + goto err_disable; + } + + ret =mei_csi_parse_firmware (csi); +if (ret) + goto err_disable; + + csi->subdev.dev = &cldev->dev; +v4l2_subdev_init (&csi->subdev, &mei_csi_subdev_ops); +v4l2_set_subdevdata (&csi->subdev, csi); + csi->subdev.flags =V4L2_SUBDEV_FL_HAS_DEVNODE | +V4L2_SUBDEV_FL_HAS_EVENTS ; + csi->subdev.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + csi->subdev.entity.ops = &mei_csi_entity_ops; + +snprintf (csi->subdev.name,sizeof (csi->subdev.name), +MEI_CSI_ENTITY_NAME ); + + ret =mei_csi_init_controls (csi); +if (ret) + goto err_ctrl_handler; + + csi->format_mbus[CSI_PAD_SOURCE ] = mei_csi_format_mbus_default; + csi->format_mbus[CSI_PAD_SINK ] = mei_csi_format_mbus_default; + + csi->pads[CSI_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + csi->pads[CSI_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&csi->subdev.entity,CSI_NUM_PADS , + csi->pads); +if (ret) + goto err_ctrl_handler; + + ret =v4l2_subdev_init_finalize (&csi->subdev); +if (ret <0 ) + goto err_entity; + + ret =v4l2_async_register_subdev (&csi->subdev); +if (ret <0 ) + goto err_subdev; + +pm_runtime_enable (&cldev->dev); + +return 0 ; + +err_subdev: +v4l2_subdev_cleanup (&csi->subdev); + +err_entity: +media_entity_cleanup (&csi->subdev.entity); + +err_ctrl_handler: +v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); + +err_disable: +mei_cldev_disable (cldev); + +destroy_mutex: +mutex_destroy (&csi->lock); + +return ret; +} + +static void mei_csi_remove (struct mei_cl_device *cldev) +{ +struct mei_csi *csi =mei_cldev_get_drvdata (cldev); + +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); +v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_async_unregister_subdev (&csi->subdev); +v4l2_subdev_cleanup (&csi->subdev); +media_entity_cleanup (&csi->subdev.entity); + +pm_runtime_disable (&cldev->dev); + +mutex_destroy (&csi->lock); +} + +#define MEI_CSI_UUID UUID_LE(0x92335FCF, 0x3203, 0x4472, \ + 0xAF, 0x93, 0x7b, 0x44, 0x53, 0xAC, 0x29, 0xDA) + +static const struct mei_cl_device_id mei_csi_tbl[] = { + {MEI_CSI_DRIVER_NAME ,MEI_CSI_UUID ,MEI_CL_VERSION_ANY }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (mei, mei_csi_tbl); + +static struct mei_cl_driver mei_csi_driver = { + .id_table = mei_csi_tbl, + .name =MEI_CSI_DRIVER_NAME , + + .probe = mei_csi_probe, + .remove = mei_csi_remove, +}; + +module_mei_cl_driver (mei_csi_driver); + +MODULE_AUTHOR ("Wentong Wu <[email protected]>" ); +MODULE_AUTHOR ("Zhifeng Wang <[email protected]>" ); +MODULE_DESCRIPTION ("Device driver for IVSC CSI" ); +MODULE_LICENSE ("GPL" );
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerRe: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Hi Laurent,
Quoted 120 lines · Laurent Pinchart
Quoted 120 lines
Quoted 119 lines
Quoted 106 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +106
-0+static int mei_csi_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *source_mbusformat; +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +struct media_pad *pad; + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (!mbusformat) +return -EINVAL ; + + source_mbusformat =mei_csi_get_pad_format (sd, sd_state,CSI_PAD_SOURCE , + format->which); +if (!source_mbusformat) +return -EINVAL ; + +v4l_bound_align_image (&format->format.width,1 ,65536 ,0 , + &format->format.height,1 ,65536 ,0 ,0 ); + +switch (format->format.code) { +case MEDIA_BUS_FMT_RGB444_1X12 : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_BGR565_2X8_BE : +case MEDIA_BUS_FMT_BGR565_2X8_LE : +case MEDIA_BUS_FMT_RGB565_2X8_BE : +case MEDIA_BUS_FMT_RGB565_2X8_LE : +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RBG888_1X24 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_GBR888_1X24 : +case MEDIA_BUS_FMT_RGB888_1X24 : +case MEDIA_BUS_FMT_RGB888_2X12_BE : +case MEDIA_BUS_FMT_RGB888_2X12_LE : +case MEDIA_BUS_FMT_ARGB8888_1X32 : +case MEDIA_BUS_FMT_RGB888_1X32_PADHI : +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_RGB121212_1X36 : +case MEDIA_BUS_FMT_RGB161616_1X48 : +case MEDIA_BUS_FMT_Y8_1X8 : +case MEDIA_BUS_FMT_UV8_1X8 : +case MEDIA_BUS_FMT_UYVY8_1_5X8 : +case MEDIA_BUS_FMT_VYUY8_1_5X8 : +case MEDIA_BUS_FMT_YUYV8_1_5X8 : +case MEDIA_BUS_FMT_YVYU8_1_5X8 : +case MEDIA_BUS_FMT_UYVY8_2X8 : +case MEDIA_BUS_FMT_VYUY8_2X8 : +case MEDIA_BUS_FMT_YUYV8_2X8 : +case MEDIA_BUS_FMT_YVYU8_2X8 : +case MEDIA_BUS_FMT_Y10_1X10 : +case MEDIA_BUS_FMT_UYVY10_2X10 : +case MEDIA_BUS_FMT_VYUY10_2X10 : +case MEDIA_BUS_FMT_YUYV10_2X10 : +case MEDIA_BUS_FMT_YVYU10_2X10 : +case MEDIA_BUS_FMT_Y12_1X12 : +case MEDIA_BUS_FMT_UYVY12_2X12 : +case MEDIA_BUS_FMT_VYUY12_2X12 : +case MEDIA_BUS_FMT_YUYV12_2X12 : +case MEDIA_BUS_FMT_YVYU12_2X12 : +case MEDIA_BUS_FMT_UYVY8_1X16 : +case MEDIA_BUS_FMT_VYUY8_1X16 : +case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_YVYU8_1X16 : +case MEDIA_BUS_FMT_YDYUYDYV8_1X16 : +case MEDIA_BUS_FMT_UYVY10_1X20 : +case MEDIA_BUS_FMT_VYUY10_1X20 : +case MEDIA_BUS_FMT_YUYV10_1X20 : +case MEDIA_BUS_FMT_YVYU10_1X20 : +case MEDIA_BUS_FMT_VUY8_1X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_UYVY12_1X24 : +case MEDIA_BUS_FMT_VYUY12_1X24 : +case MEDIA_BUS_FMT_YUYV12_1X24 : +case MEDIA_BUS_FMT_YVYU12_1X24 : +case MEDIA_BUS_FMT_YUV10_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_AYUV8_1X32 : +case MEDIA_BUS_FMT_UYYVYY12_0_5X36 : +case MEDIA_BUS_FMT_YUV12_1X36 : +case MEDIA_BUS_FMT_YUV16_1X48 : +case MEDIA_BUS_FMT_UYYVYY16_0_5X48 : +case MEDIA_BUS_FMT_JPEG_1X8 : +case MEDIA_BUS_FMT_AHSV8888_1X32 : +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SBGGR14_1X14 : +case MEDIA_BUS_FMT_SGBRG14_1X14 : +case MEDIA_BUS_FMT_SGRBG14_1X14 :drivers/media/pci/intel/ivsc/mei_csi.c line 503
Quoted 10 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +10
-0+case MEDIA_BUS_FMT_SRGGB14_1X14 : +case MEDIA_BUS_FMT_SBGGR16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SRGGB16_1X16 : +break ; +default : + format->format.code =MEDIA_BUS_FMT_Y8_1X8 ; +break ; + }I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
Quoted 5 lines
Quoted 3 lines
The video mux needs something similar. I was thinking of adding a generic helper for such functions, perhaps with flags to suggest which formats to accept.
What would be the drawbacks of accepting all formats ?
Also the ones that aren't defined at the moment?
They're not valid, although in practice there might not be issues, as they are compared across links in any case.
I guess there should also be support for enum_mbus_codes, and for that we need a list of some sort.
Signature · 1 line
Sakari Ailus
Re: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Quoted 125 lines · Sakari Ailus
Quoted 124 lines · Laurent Pinchart
Quoted 123 lines
Quoted 111 lines
Quoted 111 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +111
-0+static int mei_csi_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *source_mbusformat; +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +struct media_pad *pad; + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (!mbusformat) +return -EINVAL ; + + source_mbusformat =mei_csi_get_pad_format (sd, sd_state,CSI_PAD_SOURCE , + format->which); +if (!source_mbusformat) +return -EINVAL ; + +v4l_bound_align_image (&format->format.width,1 ,65536 ,0 , + &format->format.height,1 ,65536 ,0 ,0 ); + +switch (format->format.code) { +case MEDIA_BUS_FMT_RGB444_1X12 : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_BGR565_2X8_BE : +case MEDIA_BUS_FMT_BGR565_2X8_LE : +case MEDIA_BUS_FMT_RGB565_2X8_BE : +case MEDIA_BUS_FMT_RGB565_2X8_LE : +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RBG888_1X24 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_GBR888_1X24 : +case MEDIA_BUS_FMT_RGB888_1X24 : +case MEDIA_BUS_FMT_RGB888_2X12_BE : +case MEDIA_BUS_FMT_RGB888_2X12_LE : +case MEDIA_BUS_FMT_ARGB8888_1X32 : +case MEDIA_BUS_FMT_RGB888_1X32_PADHI : +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_RGB121212_1X36 : +case MEDIA_BUS_FMT_RGB161616_1X48 : +case MEDIA_BUS_FMT_Y8_1X8 : +case MEDIA_BUS_FMT_UV8_1X8 : +case MEDIA_BUS_FMT_UYVY8_1_5X8 : +case MEDIA_BUS_FMT_VYUY8_1_5X8 : +case MEDIA_BUS_FMT_YUYV8_1_5X8 : +case MEDIA_BUS_FMT_YVYU8_1_5X8 : +case MEDIA_BUS_FMT_UYVY8_2X8 : +case MEDIA_BUS_FMT_VYUY8_2X8 : +case MEDIA_BUS_FMT_YUYV8_2X8 : +case MEDIA_BUS_FMT_YVYU8_2X8 : +case MEDIA_BUS_FMT_Y10_1X10 : +case MEDIA_BUS_FMT_UYVY10_2X10 : +case MEDIA_BUS_FMT_VYUY10_2X10 : +case MEDIA_BUS_FMT_YUYV10_2X10 : +case MEDIA_BUS_FMT_YVYU10_2X10 : +case MEDIA_BUS_FMT_Y12_1X12 : +case MEDIA_BUS_FMT_UYVY12_2X12 : +case MEDIA_BUS_FMT_VYUY12_2X12 : +case MEDIA_BUS_FMT_YUYV12_2X12 : +case MEDIA_BUS_FMT_YVYU12_2X12 : +case MEDIA_BUS_FMT_UYVY8_1X16 : +case MEDIA_BUS_FMT_VYUY8_1X16 : +case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_YVYU8_1X16 : +case MEDIA_BUS_FMT_YDYUYDYV8_1X16 : +case MEDIA_BUS_FMT_UYVY10_1X20 : +case MEDIA_BUS_FMT_VYUY10_1X20 : +case MEDIA_BUS_FMT_YUYV10_1X20 : +case MEDIA_BUS_FMT_YVYU10_1X20 : +case MEDIA_BUS_FMT_VUY8_1X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_UYVY12_1X24 : +case MEDIA_BUS_FMT_VYUY12_1X24 : +case MEDIA_BUS_FMT_YUYV12_1X24 : +case MEDIA_BUS_FMT_YVYU12_1X24 : +case MEDIA_BUS_FMT_YUV10_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_AYUV8_1X32 : +case MEDIA_BUS_FMT_UYYVYY12_0_5X36 : +case MEDIA_BUS_FMT_YUV12_1X36 : +case MEDIA_BUS_FMT_YUV16_1X48 : +case MEDIA_BUS_FMT_UYYVYY16_0_5X48 : +case MEDIA_BUS_FMT_JPEG_1X8 : +case MEDIA_BUS_FMT_AHSV8888_1X32 : +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SBGGR14_1X14 : +case MEDIA_BUS_FMT_SGBRG14_1X14 : +case MEDIA_BUS_FMT_SGRBG14_1X14 : +case MEDIA_BUS_FMT_SRGGB14_1X14 : +case MEDIA_BUS_FMT_SBGGR16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SRGGB16_1X16 :Quoted 8 lines
drivers/media/pci/intel/ivsc/mei_csi.c line 503
Quoted 5 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +5
-0+break ; +default : + format->format.code =MEDIA_BUS_FMT_Y8_1X8 ; +break ; + }I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
The video mux needs something similar. I was thinking of adding a generic helper for such functions, perhaps with flags to suggest which formats to accept.
Quoted 6 lines
Quoted 1 line
What would be the drawbacks of accepting all formats ?
Also the ones that aren't defined at the moment?
They're not valid, although in practice there might not be issues, as they are compared across links in any case.
That was my reasoning too.
Quoted 2 lines
I guess there should also be support for
enum_mbus_codes, and for that we need a list of some sort.
Hmmm... If a subdev really implements pass-through for video data, I wonder if we could lift the requirement of implementing format enumeration.
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerRe: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Quoted 133 lines · Laurent Pinchart
Quoted 125 lines · Sakari Ailus
Quoted 124 lines · Laurent Pinchart
Quoted 123 lines
Quoted 111 lines
Quoted 111 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +111
-0+static int mei_csi_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *format) +{ +struct v4l2_mbus_framefmt *source_mbusformat; +struct v4l2_mbus_framefmt *mbusformat; +struct mei_csi *csi =sd_to_csi (sd); +struct media_pad *pad; + + mbusformat =mei_csi_get_pad_format (sd, sd_state, format->pad, + format->which); +if (!mbusformat) +return -EINVAL ; + + source_mbusformat =mei_csi_get_pad_format (sd, sd_state,CSI_PAD_SOURCE , + format->which); +if (!source_mbusformat) +return -EINVAL ; + +v4l_bound_align_image (&format->format.width,1 ,65536 ,0 , + &format->format.height,1 ,65536 ,0 ,0 ); + +switch (format->format.code) { +case MEDIA_BUS_FMT_RGB444_1X12 : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE : +case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE : +case MEDIA_BUS_FMT_RGB565_1X16 : +case MEDIA_BUS_FMT_BGR565_2X8_BE : +case MEDIA_BUS_FMT_BGR565_2X8_LE : +case MEDIA_BUS_FMT_RGB565_2X8_BE : +case MEDIA_BUS_FMT_RGB565_2X8_LE : +case MEDIA_BUS_FMT_RGB666_1X18 : +case MEDIA_BUS_FMT_RBG888_1X24 : +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : +case MEDIA_BUS_FMT_BGR888_1X24 : +case MEDIA_BUS_FMT_GBR888_1X24 : +case MEDIA_BUS_FMT_RGB888_1X24 : +case MEDIA_BUS_FMT_RGB888_2X12_BE : +case MEDIA_BUS_FMT_RGB888_2X12_LE : +case MEDIA_BUS_FMT_ARGB8888_1X32 : +case MEDIA_BUS_FMT_RGB888_1X32_PADHI : +case MEDIA_BUS_FMT_RGB101010_1X30 : +case MEDIA_BUS_FMT_RGB121212_1X36 : +case MEDIA_BUS_FMT_RGB161616_1X48 : +case MEDIA_BUS_FMT_Y8_1X8 : +case MEDIA_BUS_FMT_UV8_1X8 : +case MEDIA_BUS_FMT_UYVY8_1_5X8 : +case MEDIA_BUS_FMT_VYUY8_1_5X8 : +case MEDIA_BUS_FMT_YUYV8_1_5X8 : +case MEDIA_BUS_FMT_YVYU8_1_5X8 : +case MEDIA_BUS_FMT_UYVY8_2X8 : +case MEDIA_BUS_FMT_VYUY8_2X8 : +case MEDIA_BUS_FMT_YUYV8_2X8 : +case MEDIA_BUS_FMT_YVYU8_2X8 : +case MEDIA_BUS_FMT_Y10_1X10 : +case MEDIA_BUS_FMT_UYVY10_2X10 : +case MEDIA_BUS_FMT_VYUY10_2X10 : +case MEDIA_BUS_FMT_YUYV10_2X10 : +case MEDIA_BUS_FMT_YVYU10_2X10 : +case MEDIA_BUS_FMT_Y12_1X12 : +case MEDIA_BUS_FMT_UYVY12_2X12 : +case MEDIA_BUS_FMT_VYUY12_2X12 : +case MEDIA_BUS_FMT_YUYV12_2X12 : +case MEDIA_BUS_FMT_YVYU12_2X12 : +case MEDIA_BUS_FMT_UYVY8_1X16 : +case MEDIA_BUS_FMT_VYUY8_1X16 : +case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_YVYU8_1X16 : +case MEDIA_BUS_FMT_YDYUYDYV8_1X16 : +case MEDIA_BUS_FMT_UYVY10_1X20 : +case MEDIA_BUS_FMT_VYUY10_1X20 : +case MEDIA_BUS_FMT_YUYV10_1X20 : +case MEDIA_BUS_FMT_YVYU10_1X20 : +case MEDIA_BUS_FMT_VUY8_1X24 : +case MEDIA_BUS_FMT_YUV8_1X24 : +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_UYVY12_1X24 : +case MEDIA_BUS_FMT_VYUY12_1X24 : +case MEDIA_BUS_FMT_YUYV12_1X24 : +case MEDIA_BUS_FMT_YVYU12_1X24 : +case MEDIA_BUS_FMT_YUV10_1X30 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_AYUV8_1X32 : +case MEDIA_BUS_FMT_UYYVYY12_0_5X36 : +case MEDIA_BUS_FMT_YUV12_1X36 : +case MEDIA_BUS_FMT_YUV16_1X48 : +case MEDIA_BUS_FMT_UYYVYY16_0_5X48 : +case MEDIA_BUS_FMT_JPEG_1X8 : +case MEDIA_BUS_FMT_AHSV8888_1X32 : +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SBGGR14_1X14 : +case MEDIA_BUS_FMT_SGBRG14_1X14 : +case MEDIA_BUS_FMT_SGRBG14_1X14 : +case MEDIA_BUS_FMT_SRGGB14_1X14 : +case MEDIA_BUS_FMT_SBGGR16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SRGGB16_1X16 :Quoted 8 lines
drivers/media/pci/intel/ivsc/mei_csi.c line 503
Quoted 5 lines
drivers/media/pci/intel/ivsc/mei_csi.c new file +5
-0+break ; +default : + format->format.code =MEDIA_BUS_FMT_Y8_1X8 ; +break ; + }I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
The video mux needs something similar. I was thinking of adding a generic helper for such functions, perhaps with flags to suggest which formats to accept.
Quoted 6 lines
Quoted 1 line
What would be the drawbacks of accepting all formats ?
Also the ones that aren't defined at the moment?
They're not valid, although in practice there might not be issues, as they are compared across links in any case.
Quoted 8 lines
That was my reasoning too.
Quoted 2 lines
I guess there should also be support for
enum_mbus_codes, and for that we need a list of some sort.Hmmm... If a subdev really implements pass-through for video data, I wonder if we could lift the requirement of implementing format enumeration.
v4l2-compliance tests for that.
There are also other drivers that don't implement it but they're mostly old.
I guess libcamera wouldn't need this, is that right?
Signature · 3 lines
Regards, Sakari Ailus
Re: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Quoted 136 lines · Sakari Ailus
Quoted 135 lines · Laurent Pinchart
Quoted 125 lines · Sakari Ailus
Quoted 124 lines · Laurent Pinchart
Quoted 123 lines
Quoted 111 lines
Quoted 111 lines
(quoted diff) +111
-0+static int mei_csi_set_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_state *sd_state, + struct v4l2_subdev_format *format) +{ + struct v4l2_mbus_framefmt *source_mbusformat; + struct v4l2_mbus_framefmt *mbusformat; + struct mei_csi *csi = sd_to_csi(sd); + struct media_pad *pad; + + mbusformat = mei_csi_get_pad_format(sd, sd_state, format->pad, + format->which); + if (!mbusformat) + return -EINVAL; + + source_mbusformat = mei_csi_get_pad_format(sd, sd_state, CSI_PAD_SOURCE, + format->which); + if (!source_mbusformat) + return -EINVAL; + + v4l_bound_align_image(&format->format.width, 1, 65536, 0, + &format->format.height, 1, 65536, 0, 0); + + switch (format->format.code) { + case MEDIA_BUS_FMT_RGB444_1X12: + case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE: + case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE: + case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE: + case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE: + case MEDIA_BUS_FMT_RGB565_1X16: + case MEDIA_BUS_FMT_BGR565_2X8_BE: + case MEDIA_BUS_FMT_BGR565_2X8_LE: + case MEDIA_BUS_FMT_RGB565_2X8_BE: + case MEDIA_BUS_FMT_RGB565_2X8_LE: + case MEDIA_BUS_FMT_RGB666_1X18: + case MEDIA_BUS_FMT_RBG888_1X24: + case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: + case MEDIA_BUS_FMT_BGR888_1X24: + case MEDIA_BUS_FMT_GBR888_1X24: + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_RGB888_2X12_BE: + case MEDIA_BUS_FMT_RGB888_2X12_LE: + case MEDIA_BUS_FMT_ARGB8888_1X32: + case MEDIA_BUS_FMT_RGB888_1X32_PADHI: + case MEDIA_BUS_FMT_RGB101010_1X30: + case MEDIA_BUS_FMT_RGB121212_1X36: + case MEDIA_BUS_FMT_RGB161616_1X48: + case MEDIA_BUS_FMT_Y8_1X8: + case MEDIA_BUS_FMT_UV8_1X8: + case MEDIA_BUS_FMT_UYVY8_1_5X8: + case MEDIA_BUS_FMT_VYUY8_1_5X8: + case MEDIA_BUS_FMT_YUYV8_1_5X8: + case MEDIA_BUS_FMT_YVYU8_1_5X8: + case MEDIA_BUS_FMT_UYVY8_2X8: + case MEDIA_BUS_FMT_VYUY8_2X8: + case MEDIA_BUS_FMT_YUYV8_2X8: + case MEDIA_BUS_FMT_YVYU8_2X8: + case MEDIA_BUS_FMT_Y10_1X10: + case MEDIA_BUS_FMT_UYVY10_2X10: + case MEDIA_BUS_FMT_VYUY10_2X10: + case MEDIA_BUS_FMT_YUYV10_2X10: + case MEDIA_BUS_FMT_YVYU10_2X10: + case MEDIA_BUS_FMT_Y12_1X12: + case MEDIA_BUS_FMT_UYVY12_2X12: + case MEDIA_BUS_FMT_VYUY12_2X12: + case MEDIA_BUS_FMT_YUYV12_2X12: + case MEDIA_BUS_FMT_YVYU12_2X12: + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_VYUY8_1X16: + case MEDIA_BUS_FMT_YUYV8_1X16: + case MEDIA_BUS_FMT_YVYU8_1X16: + case MEDIA_BUS_FMT_YDYUYDYV8_1X16: + case MEDIA_BUS_FMT_UYVY10_1X20: + case MEDIA_BUS_FMT_VYUY10_1X20: + case MEDIA_BUS_FMT_YUYV10_1X20: + case MEDIA_BUS_FMT_YVYU10_1X20: + case MEDIA_BUS_FMT_VUY8_1X24: + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: + case MEDIA_BUS_FMT_UYVY12_1X24: + case MEDIA_BUS_FMT_VYUY12_1X24: + case MEDIA_BUS_FMT_YUYV12_1X24: + case MEDIA_BUS_FMT_YVYU12_1X24: + case MEDIA_BUS_FMT_YUV10_1X30: + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: + case MEDIA_BUS_FMT_AYUV8_1X32: + case MEDIA_BUS_FMT_UYYVYY12_0_5X36: + case MEDIA_BUS_FMT_YUV12_1X36: + case MEDIA_BUS_FMT_YUV16_1X48: + case MEDIA_BUS_FMT_UYYVYY16_0_5X48: + case MEDIA_BUS_FMT_JPEG_1X8: + case MEDIA_BUS_FMT_AHSV8888_1X32: + case MEDIA_BUS_FMT_SBGGR8_1X8: + case MEDIA_BUS_FMT_SGBRG8_1X8: + case MEDIA_BUS_FMT_SGRBG8_1X8: + case MEDIA_BUS_FMT_SRGGB8_1X8: + case MEDIA_BUS_FMT_SBGGR10_1X10: + case MEDIA_BUS_FMT_SGBRG10_1X10: + case MEDIA_BUS_FMT_SGRBG10_1X10: + case MEDIA_BUS_FMT_SRGGB10_1X10: + case MEDIA_BUS_FMT_SBGGR12_1X12: + case MEDIA_BUS_FMT_SGBRG12_1X12: + case MEDIA_BUS_FMT_SGRBG12_1X12: + case MEDIA_BUS_FMT_SRGGB12_1X12: + case MEDIA_BUS_FMT_SBGGR14_1X14: + case MEDIA_BUS_FMT_SGBRG14_1X14: + case MEDIA_BUS_FMT_SGRBG14_1X14: + case MEDIA_BUS_FMT_SRGGB14_1X14: + case MEDIA_BUS_FMT_SBGGR16_1X16: + case MEDIA_BUS_FMT_SGBRG16_1X16: + case MEDIA_BUS_FMT_SGRBG16_1X16: + case MEDIA_BUS_FMT_SRGGB16_1X16:Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ break; + default: + format->format.code = MEDIA_BUS_FMT_Y8_1X8; + break; + }I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
The video mux needs something similar. I was thinking of adding a generic helper for such functions, perhaps with flags to suggest which formats to accept.
Quoted 6 lines
Quoted 1 line
What would be the drawbacks of accepting all formats ?
Also the ones that aren't defined at the moment?
They're not valid, although in practice there might not be issues, as they are compared across links in any case.
That was my reasoning too.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
I guess there should also be support for
enum_mbus_codes, and for that we need a list of some sort.Hmmm... If a subdev really implements pass-through for video data, I wonder if we could lift the requirement of implementing format enumeration.
v4l2-compliance tests for that.
If we officially lift the requirement, we would also update v4l2-compliance accordingly. We should then have a way to report to userspace that the subdev operates in pass-through mode.
Quoted 4 lines
There are also other drivers that don't implement it but they're mostly old.
I guess libcamera wouldn't need this, is that right?
No, it shouldn't need it.
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerRe: [PATCH v11 1/2] media: pci: intel: ivsc: Add CSI submodule
Hi Laurent,
Quoted 144 lines · Laurent Pinchart
Quoted 143 lines · Sakari Ailus
Quoted 141 lines · Laurent Pinchart
Quoted 125 lines · Sakari Ailus
Quoted 124 lines · Laurent Pinchart
Quoted 123 lines
Quoted 111 lines
Quoted 111 lines
(quoted diff) +111
-0+static int mei_csi_set_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_state *sd_state, + struct v4l2_subdev_format *format) +{ + struct v4l2_mbus_framefmt *source_mbusformat; + struct v4l2_mbus_framefmt *mbusformat; + struct mei_csi *csi = sd_to_csi(sd); + struct media_pad *pad; + + mbusformat = mei_csi_get_pad_format(sd, sd_state, format->pad, + format->which); + if (!mbusformat) + return -EINVAL; + + source_mbusformat = mei_csi_get_pad_format(sd, sd_state, CSI_PAD_SOURCE, + format->which); + if (!source_mbusformat) + return -EINVAL; + + v4l_bound_align_image(&format->format.width, 1, 65536, 0, + &format->format.height, 1, 65536, 0, 0); + + switch (format->format.code) { + case MEDIA_BUS_FMT_RGB444_1X12: + case MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE: + case MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE: + case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE: + case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE: + case MEDIA_BUS_FMT_RGB565_1X16: + case MEDIA_BUS_FMT_BGR565_2X8_BE: + case MEDIA_BUS_FMT_BGR565_2X8_LE: + case MEDIA_BUS_FMT_RGB565_2X8_BE: + case MEDIA_BUS_FMT_RGB565_2X8_LE: + case MEDIA_BUS_FMT_RGB666_1X18: + case MEDIA_BUS_FMT_RBG888_1X24: + case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: + case MEDIA_BUS_FMT_BGR888_1X24: + case MEDIA_BUS_FMT_GBR888_1X24: + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_RGB888_2X12_BE: + case MEDIA_BUS_FMT_RGB888_2X12_LE: + case MEDIA_BUS_FMT_ARGB8888_1X32: + case MEDIA_BUS_FMT_RGB888_1X32_PADHI: + case MEDIA_BUS_FMT_RGB101010_1X30: + case MEDIA_BUS_FMT_RGB121212_1X36: + case MEDIA_BUS_FMT_RGB161616_1X48: + case MEDIA_BUS_FMT_Y8_1X8: + case MEDIA_BUS_FMT_UV8_1X8: + case MEDIA_BUS_FMT_UYVY8_1_5X8: + case MEDIA_BUS_FMT_VYUY8_1_5X8: + case MEDIA_BUS_FMT_YUYV8_1_5X8: + case MEDIA_BUS_FMT_YVYU8_1_5X8: + case MEDIA_BUS_FMT_UYVY8_2X8: + case MEDIA_BUS_FMT_VYUY8_2X8: + case MEDIA_BUS_FMT_YUYV8_2X8: + case MEDIA_BUS_FMT_YVYU8_2X8: + case MEDIA_BUS_FMT_Y10_1X10: + case MEDIA_BUS_FMT_UYVY10_2X10: + case MEDIA_BUS_FMT_VYUY10_2X10: + case MEDIA_BUS_FMT_YUYV10_2X10: + case MEDIA_BUS_FMT_YVYU10_2X10: + case MEDIA_BUS_FMT_Y12_1X12: + case MEDIA_BUS_FMT_UYVY12_2X12: + case MEDIA_BUS_FMT_VYUY12_2X12: + case MEDIA_BUS_FMT_YUYV12_2X12: + case MEDIA_BUS_FMT_YVYU12_2X12: + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_VYUY8_1X16: + case MEDIA_BUS_FMT_YUYV8_1X16: + case MEDIA_BUS_FMT_YVYU8_1X16: + case MEDIA_BUS_FMT_YDYUYDYV8_1X16: + case MEDIA_BUS_FMT_UYVY10_1X20: + case MEDIA_BUS_FMT_VYUY10_1X20: + case MEDIA_BUS_FMT_YUYV10_1X20: + case MEDIA_BUS_FMT_YVYU10_1X20: + case MEDIA_BUS_FMT_VUY8_1X24: + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: + case MEDIA_BUS_FMT_UYVY12_1X24: + case MEDIA_BUS_FMT_VYUY12_1X24: + case MEDIA_BUS_FMT_YUYV12_1X24: + case MEDIA_BUS_FMT_YVYU12_1X24: + case MEDIA_BUS_FMT_YUV10_1X30: + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: + case MEDIA_BUS_FMT_AYUV8_1X32: + case MEDIA_BUS_FMT_UYYVYY12_0_5X36: + case MEDIA_BUS_FMT_YUV12_1X36: + case MEDIA_BUS_FMT_YUV16_1X48: + case MEDIA_BUS_FMT_UYYVYY16_0_5X48: + case MEDIA_BUS_FMT_JPEG_1X8: + case MEDIA_BUS_FMT_AHSV8888_1X32: + case MEDIA_BUS_FMT_SBGGR8_1X8: + case MEDIA_BUS_FMT_SGBRG8_1X8: + case MEDIA_BUS_FMT_SGRBG8_1X8: + case MEDIA_BUS_FMT_SRGGB8_1X8: + case MEDIA_BUS_FMT_SBGGR10_1X10: + case MEDIA_BUS_FMT_SGBRG10_1X10: + case MEDIA_BUS_FMT_SGRBG10_1X10: + case MEDIA_BUS_FMT_SRGGB10_1X10: + case MEDIA_BUS_FMT_SBGGR12_1X12: + case MEDIA_BUS_FMT_SGBRG12_1X12: + case MEDIA_BUS_FMT_SGRBG12_1X12: + case MEDIA_BUS_FMT_SRGGB12_1X12: + case MEDIA_BUS_FMT_SBGGR14_1X14: + case MEDIA_BUS_FMT_SGBRG14_1X14: + case MEDIA_BUS_FMT_SGRBG14_1X14: + case MEDIA_BUS_FMT_SRGGB14_1X14: + case MEDIA_BUS_FMT_SBGGR16_1X16: + case MEDIA_BUS_FMT_SGBRG16_1X16: + case MEDIA_BUS_FMT_SGRBG16_1X16: + case MEDIA_BUS_FMT_SRGGB16_1X16:Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ break; + default: + format->format.code = MEDIA_BUS_FMT_Y8_1X8; + break; + }I wonder if we should simply accept all formats. The IVSC doesn't seem to cara.
The video mux needs something similar. I was thinking of adding a generic helper for such functions, perhaps with flags to suggest which formats to accept.
Quoted 6 lines
Quoted 1 line
What would be the drawbacks of accepting all formats ?
Also the ones that aren't defined at the moment?
They're not valid, although in practice there might not be issues, as they are compared across links in any case.
That was my reasoning too.
Quoted 2 lines
I guess there should also be support for
enum_mbus_codes, and for that we need a list of some sort.Hmmm... If a subdev really implements pass-through for video data, I wonder if we could lift the requirement of implementing format enumeration.
Quoted 5 lines
Quoted 1 line
v4l2-compliance tests for that.
If we officially lift the requirement, we would also update v4l2-compliance accordingly. We should then have a way to report to userspace that the subdev operates in pass-through mode.
Is it useful to implement SUBDEV_[GS]_FMT in that case at all? This would need to be taken into account in pipeline validation but it shouldn't be that hard.
Also cc Hans.
Signature · 3 lines
Kind regards, Sakari Ailus
Sakari Ailus
maintainerPATCH v11 2/2 media: pci: intel: ivsc: Add ACE submodule
In reply to Sakari AilusFrom: Wentong Wu <[email protected]>
ACE is a submodule of IVSC which controls camera sensor's ownership, belonging to host or IVSC. When IVSC owns camera sensor, it is for algorithm computing. When host wants to control camera sensor, ACE module needs to be informed of ownership with defined interface.
The interface is via MEI. There is a separate MEI UUID, which this driver uses to enumerate.
To switch ownership of camera sensor between IVSC and host, the caller specifies the defined ownership information which will be sent to firmware by sending MEI command.
Device link(device_link_add) is used to set the right camera sensor ownership before accessing the sensor via I2C. With DL_FLAG_PM_RUNTIME and DL_FLAG_RPM_ACTIVE, the supplier device will be PM runtime resumed before the consumer(camera sensor). So use runtime PM callbacks to transfer the ownership between host and IVSC.
--- drivers/media/pci/intel/ivsc/Makefile | 3 + drivers/media/pci/intel/ivsc/mei_ace.c | 579 +++++++++++++++++++++++++ 2 files changed, 582 insertions(+) create mode 100644 drivers/media/pci/intel/ivsc/mei_ace.c
drivers/media/pci/intel/ivsc/Makefile +3 -0
@@ -4,3 +4,6 @@ obj-$(CONFIG_INTEL_VSC) += ivsc-csi.o ivsc-csi-y += mei_csi.o + +obj-$(CONFIG_INTEL_VSC) += ivsc-ace.o +ivsc-ace-y += mei_ace.o
drivers/media/pci/intel/ivsc/mei_ace.c new file +579 -0
579 lines not on this page · raw message
Signature · 1 line
2.39.2