media: sun6i-csi: Convert to active state and improve MC support
v5 cover media: sun6i-csi: Convert to active state and improve MC support
Hi,
This series modernizes the sun6i-csi driver by aligning the bridge and capture components with the V4L2 subdev active state API and improving media controller integration.
The first patch migrates the bridge driver to the V4L2 subdev active state framework. The private mbus_format field and its associated lock are removed, with the framework-managed state becoming the single source of truth. As part of this change, the capture driver no longer accesses bridge-private data directly and instead resolves the active format through the subdev pad API. Since the hardware does not perform format conversion, identical formats are enforced on both pads.
The second patch implements vidioc_enum_framesizes for the capture device, reporting a stepwise range of even frame sizes within the hardware limits.
Hardware testing performed on LicheePi Zero Dock (Allwinner V3s):
- Parallel pipeline (csi1):
ov7670 -> sun6i-csi-bridge -> sun6i-csi-capture
- MIPI pipeline (csi0):
ov5647 -> sun6i-mipi-csi2 -> sun6i-csi-bridge -> sun6i-csi-capture
---
Changes in v5:
- Check NV12_16L16 format in enum_framesizes based on Sashiko feedback
- Dropped Rb tags due to changes in second patch
- Link to Sashiko feedback: https://linuxtv.org/mailman3/hyperkitty/list/[email protected]/message/22UBXCNQCK3JZSSWMDWIHRIFNAZ3EK6V/
- Link to v4: https://patchwork.kernel.org/project/linux-media/list/?series=1129723
Changes in v4:
- Remove sun6i-csi MC centric patch due to Paul feedback
- Link to discussion: https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
- Link to v3: https://patchwork.kernel.org/project/linux-media/list/?series=1091921
Changes in v3:
- Fix Media CI robot warnings about open parenthesis
- Link to report: https://linux-media.pages.freedesktop.org/-/users/patchwork/-/jobs/99380724/artifacts/report.htm
- Link to v2: https://patchwork.kernel.org/project/linux-media/list/?series=1091728
Changes in v2:
- Fix indentation in link validation path
- Return pixelformat directly instead of a pointer
- Link to v1: https://patchwork.kernel.org/project/linux-media/list/?series=1054768
Arash Golgol (2):
media: sun6i-csi: bridge: Use V4L2 subdev active state
media: sun6i-csi: capture: Implement vidioc_enum_framesizes
.../sunxi/sun6i-csi/sun6i_csi_bridge.c | 155 ++++++++---------- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 9 - .../sunxi/sun6i-csi/sun6i_csi_capture.c | 55 ++++++- 3 files changed, 114 insertions(+), 105 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/2 media: sun6i-csi: bridge: Use V4L2 subdev active state
Use the V4L2 subdev active state API to store the active format. This simplifies the driver not only by dropping the bridge mbus_format field, but it also allows dropping the bridge lock, replaced with the state lock.
Previously, capture accessed bridge private state directly. After moving to framework-managed state, resolve the format through the subdev pad API.
The sun6i-csi-bridge hardware does not perform any format conversion. Enforce identical formats on the sink and source pads in the set_fmt() and init_state() callbacks.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 155 ++++++++---------- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 9 - .../sunxi/sun6i-csi/sun6i_csi_capture.c | 27 ++- 3 files changed, 86 insertions(+), 105 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +68 -87
@@ -13,26 +13,6 @@#include "sun6i_csi_bridge.h" #include "sun6i_csi_reg.h" -/* Helpers */ - -void sun6i_csi_bridge_dimensions (struct sun6i_csi_device *csi_dev, -unsigned int *width,unsigned int *height) -{ -if (width) - *width = csi_dev->bridge.mbus_format.width; -if (height) - *height = csi_dev->bridge.mbus_format.height; -} - -void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev, -u32 *mbus_code,u32 *field) -{ -if (mbus_code) - *mbus_code = csi_dev->bridge.mbus_format.code; -if (field) - *field = csi_dev->bridge.mbus_format.field; -} -/* Format */ static const struct sun6i_csi_bridge_format sun6i_csi_bridge_formats[] = {
@@ -226,7 +206,8 @@ static void sun6i_csi_bridge_disable(struct sun6i_csi_device *csi_dev) }static void -sun6i_csi_bridge_configure_parallel (struct sun6i_csi_device *csi_dev) +sun6i_csi_bridge_configure_parallel (struct sun6i_csi_device *csi_dev, +const struct v4l2_mbus_framefmt *mbus_format) {struct device *dev = csi_dev->dev;struct regmap *regmap = csi_dev->regmap;
@@ -234,11 +215,9 @@ sun6i_csi_bridge_configure_parallel(struct sun6i_csi_device *csi_dev) &csi_dev->bridge.source_parallel.endpoint;unsigned char bus_width = endpoint->bus.parallel.bus_width;unsigned int flags = endpoint->bus.parallel.flags; -u32 field; +u32 field = mbus_format->field;u32 value =SUN6I_CSI_IF_CFG_IF_CSI ; -sun6i_csi_bridge_format (csi_dev,NULL , &field); -if (field ==V4L2_FIELD_INTERLACED || field ==V4L2_FIELD_INTERLACED_TB || field ==V4L2_FIELD_INTERLACED_BT )
@@ -317,13 +296,12 @@ sun6i_csi_bridge_configure_parallel(struct sun6i_csi_device *csi_dev) }static void -sun6i_csi_bridge_configure_mipi_csi2 (struct sun6i_csi_device *csi_dev) +sun6i_csi_bridge_configure_mipi_csi2 (struct sun6i_csi_device *csi_dev, +const struct v4l2_mbus_framefmt *mbus_format) {struct regmap *regmap = csi_dev->regmap;u32 value =SUN6I_CSI_IF_CFG_IF_MIPI ; -u32 field; - -sun6i_csi_bridge_format (csi_dev,NULL , &field); +u32 field = mbus_format->field; if (field == V4L2_FIELD_INTERLACED || field == V4L2_FIELD_INTERLACED_TB ||
@@ -335,19 +313,20 @@ sun6i_csi_bridge_configure_mipi_csi2(struct sun6i_csi_device *csi_dev)regmap_write (regmap,SUN6I_CSI_IF_CFG_REG , value); } -static void sun6i_csi_bridge_configure_format (struct sun6i_csi_device *csi_dev) +static void +sun6i_csi_bridge_configure_format (struct sun6i_csi_device *csi_dev, +const struct v4l2_mbus_framefmt *mbus_format) {struct regmap *regmap = csi_dev->regmap;bool capture_streaming = csi_dev->capture.state.streaming;const struct sun6i_csi_bridge_format *bridge_format;const struct sun6i_csi_capture_format *capture_format; -u32 mbus_code, field, pixelformat; +u32 pixelformat; +u32 field = mbus_format->field;u8 input_format, input_yuv_seq, output_format;u32 value =0 ; -sun6i_csi_bridge_format (csi_dev, &mbus_code, &field); - - bridge_format =sun6i_csi_bridge_format_find (mbus_code); + bridge_format =sun6i_csi_bridge_format_find (mbus_format->code);if (WARN_ON (!bridge_format))return ;
@@ -391,16 +370,17 @@ static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev) }static void sun6i_csi_bridge_configure (struct sun6i_csi_device *csi_dev, -struct sun6i_csi_bridge_source *source) +struct sun6i_csi_bridge_source *source, +const struct v4l2_mbus_framefmt *mbus_format) {struct sun6i_csi_bridge *bridge = &csi_dev->bridge;if (source == &bridge->source_parallel) -sun6i_csi_bridge_configure_parallel (csi_dev); +sun6i_csi_bridge_configure_parallel (csi_dev, mbus_format);else -sun6i_csi_bridge_configure_mipi_csi2 (csi_dev); +sun6i_csi_bridge_configure_mipi_csi2 (csi_dev, mbus_format); -sun6i_csi_bridge_configure_format (csi_dev); +sun6i_csi_bridge_configure_format (csi_dev, mbus_format); }/* V4L2 Subdev */
@@ -415,6 +395,8 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)struct sun6i_csi_bridge_source *source;struct v4l2_subdev *source_subdev;struct media_pad *remote_pad; +struct v4l2_subdev_state *state; +const struct v4l2_mbus_framefmt *mbus_format;int ret;/* Source */
@@ -433,6 +415,10 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)else source = &bridge->source_mipi_csi2; +/* Active State */ + + state =v4l2_subdev_lock_and_get_active_state (subdev); +if (!on) {v4l2_subdev_call (source_subdev, video, s_stream,0 ); ret =0 ;
@@ -443,7 +429,7 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on) ret =pm_runtime_resume_and_get (dev);if (ret <0 ) -return ret; + goto unlock;/* Clear */
@@ -451,7 +437,9 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)/* Configure */ -sun6i_csi_bridge_configure (csi_dev, source); + mbus_format =v4l2_subdev_state_get_format (state, +SUN6I_CSI_BRIDGE_PAD_SINK ); +sun6i_csi_bridge_configure (csi_dev, source, mbus_format);if (capture_streaming)sun6i_csi_capture_configure (csi_dev);
@@ -472,7 +460,8 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)if (ret && ret != -ENOIOCTLCMD ) goto disable; -return 0 ; + ret =0 ; + goto unlock; disable:if (capture_streaming)
@@ -482,6 +471,8 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)pm_runtime_put (dev); +unlock: +v4l2_subdev_unlock_state (state);return ret; }
@@ -504,21 +495,23 @@ sun6i_csi_bridge_mbus_format_prepare(struct v4l2_mbus_framefmt *mbus_format)static int sun6i_csi_bridge_init_state (struct v4l2_subdev *subdev,struct v4l2_subdev_state *state) { -struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); -unsigned int pad =SUN6I_CSI_BRIDGE_PAD_SINK ; -struct v4l2_mbus_framefmt *mbus_format = -v4l2_subdev_state_get_format (state, pad); -struct mutex *lock = &csi_dev->bridge.lock; +unsigned int pad; -mutex_lock (lock); +/* +* This subdev does not perform format conversion, +* initialize both pads identically. +*/ +for (pad =0 ; pad < subdev->entity.num_pads; pad++) { +struct v4l2_mbus_framefmt *mbus_format; - mbus_format->code = sun6i_csi_bridge_formats[0 ].mbus_code; - mbus_format->width =1280 ; - mbus_format->height =720 ; + mbus_format =v4l2_subdev_state_get_format (state, pad); -sun6i_csi_bridge_mbus_format_prepare (mbus_format); + mbus_format->code = sun6i_csi_bridge_formats[0 ].mbus_code; + mbus_format->width =1280 ; + mbus_format->height =720 ; -mutex_unlock (lock); +sun6i_csi_bridge_mbus_format_prepare (mbus_format); + }return 0 ; }
@@ -536,53 +529,32 @@ sun6i_csi_bridge_enum_mbus_code(struct v4l2_subdev *subdev,return 0 ; } -static int sun6i_csi_bridge_get_fmt (struct v4l2_subdev *subdev, -struct v4l2_subdev_state *state, -struct v4l2_subdev_format *format) -{ -struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); -struct v4l2_mbus_framefmt *mbus_format = &format->format; -struct mutex *lock = &csi_dev->bridge.lock; - -mutex_lock (lock); - -if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) - *mbus_format = *v4l2_subdev_state_get_format (state, - format->pad); -else - *mbus_format = csi_dev->bridge.mbus_format; - -mutex_unlock (lock); - -return 0 ; -} -static int sun6i_csi_bridge_set_fmt (struct v4l2_subdev *subdev,struct v4l2_subdev_state *state,struct v4l2_subdev_format *format) { -struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); -struct v4l2_mbus_framefmt *mbus_format = &format->format; -struct mutex *lock = &csi_dev->bridge.lock; +struct v4l2_mbus_framefmt *fmt; -mutex_lock (lock); +/* The format on the source pad always matches the sink pad. */ +if (format->pad !=SUN6I_CSI_BRIDGE_PAD_SINK ) +return v4l2_subdev_get_fmt (subdev, state, format); -sun6i_csi_bridge_mbus_format_prepare (mbus_format); +sun6i_csi_bridge_mbus_format_prepare (&format->format); -if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) - *v4l2_subdev_state_get_format (state, format->pad) = - *mbus_format; -else - csi_dev->bridge.mbus_format = *mbus_format; +/* Set the format on the sink pad. */ + fmt =v4l2_subdev_state_get_format (state, format->pad); + *fmt = format->format; -mutex_unlock (lock); +/* Propagate the format to the source pad. */ + fmt =v4l2_subdev_state_get_format (state,SUN6I_CSI_BRIDGE_PAD_SOURCE ); + *fmt = format->format;return 0 ; }static const struct v4l2_subdev_pad_ops sun6i_csi_bridge_pad_ops = { .enum_mbus_code = sun6i_csi_bridge_enum_mbus_code, - .get_fmt = sun6i_csi_bridge_get_fmt, + .get_fmt = v4l2_subdev_get_fmt, .set_fmt = sun6i_csi_bridge_set_fmt, };
@@ -780,8 +752,6 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev) };int ret; -mutex_init (&bridge->lock); -/* V4L2 Subdev */ v4l2_subdev_init (subdev, &sun6i_csi_bridge_subdev_ops);
@@ -809,6 +779,12 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)if (ret <0 )return ret; +/* V4L2 Subdev finalize */ + + ret =v4l2_subdev_init_finalize (subdev); +if (ret <0 ) + goto error_media_entity; +/* V4L2 Subdev */ if (csi_dev->isp_available)
@@ -818,7 +794,7 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)if (ret) {dev_err (dev,"failed to register v4l2 subdev: %d\n" , ret); - goto error_media_entity; + goto error_subdev_finalize; }/* V4L2 Async */
@@ -852,6 +828,9 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)else v4l2_device_unregister_subdev (subdev); +error_subdev_finalize: +v4l2_subdev_cleanup (subdev); + error_media_entity:media_entity_cleanup (&subdev->entity);
@@ -868,5 +847,7 @@ void sun6i_csi_bridge_cleanup(struct sun6i_csi_device *csi_dev)v4l2_device_unregister_subdev (subdev); +v4l2_subdev_cleanup (subdev); +media_entity_cleanup (&subdev->entity); }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +0 -9
@@ -42,20 +42,11 @@ struct sun6i_csi_bridge {struct v4l2_subdev subdev;struct v4l2_async_notifier notifier;struct media_pad pads[2 ]; -struct v4l2_mbus_framefmt mbus_format; -struct mutex lock;/* Mbus format lock. */ struct sun6i_csi_bridge_source source_parallel;struct sun6i_csi_bridge_source source_mipi_csi2; }; -/* Helpers */ - -void sun6i_csi_bridge_dimensions (struct sun6i_csi_device *csi_dev, -unsigned int *width,unsigned int *height); -void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev, -u32 *mbus_code,u32 *field); -/* Format */ const struct sun6i_csi_bridge_format *
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +18 -9
@@ -888,14 +888,19 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)media_entity_to_video_device (link->sink->entity);struct sun6i_csi_device *csi_dev =video_get_drvdata (video_dev);struct v4l2_device *v4l2_dev = csi_dev->v4l2_dev; +struct v4l2_subdev *src_subdev = +media_entity_to_v4l2_subdev (link->source->entity);const struct sun6i_csi_capture_format *capture_format;const struct sun6i_csi_bridge_format *bridge_format;unsigned int capture_width, capture_height; -unsigned int bridge_width, bridge_height;const struct v4l2_format_info *format_info; +struct v4l2_subdev_format src_fmt = { + .which =V4L2_SUBDEV_FORMAT_ACTIVE , + .pad = link->source->index + };u32 pixelformat, capture_field; -u32 mbus_code, bridge_field;bool match; +int ret;sun6i_csi_capture_dimensions (csi_dev, &capture_width, &capture_height);
@@ -904,19 +909,22 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)if (WARN_ON (!capture_format))return -EINVAL ; -sun6i_csi_bridge_dimensions (csi_dev, &bridge_width, &bridge_height); +/* Resolve csi bridge format. */ + ret =v4l2_subdev_call (src_subdev, pad, get_fmt,NULL , &src_fmt); +if (ret) +return ret; -sun6i_csi_bridge_format (csi_dev, &mbus_code, &bridge_field); - bridge_format =sun6i_csi_bridge_format_find (mbus_code); + bridge_format =sun6i_csi_bridge_format_find (src_fmt.format.code);if (WARN_ON (!bridge_format))return -EINVAL ;/* No cropping/scaling is supported. */ -if (capture_width != bridge_width || capture_height != bridge_height) { +if (capture_width != src_fmt.format.width || + capture_height != src_fmt.format.height) {v4l2_err (v4l2_dev,"invalid input/output dimensions: %ux%u/%ux%u\n" , - bridge_width, bridge_height, capture_width, - capture_height); + src_fmt.format.width, src_fmt.format.height, + capture_width, capture_height);return -EINVAL ; }
@@ -947,7 +955,8 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)/* With raw input mode, we need a 1:1 match between input and output. */ if (bridge_format->input_format ==SUN6I_CSI_INPUT_FMT_RAW || capture_format->input_format_raw) { - match =sun6i_csi_capture_format_match (pixelformat, mbus_code); + match =sun6i_csi_capture_format_match (pixelformat, + src_fmt.format.code);if (!match) goto invalid; }
Signature · 1 line
2.34.1
[email protected]
AI reviewRe: [PATCH v5 1/2] media: sun6i-csi: bridge: Use V4L2 subdev active state
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] The driver registers a shared IRQ but accesses hardware unconditionally in the handler without checking if the device is active. Furthermore, it powers down hardware in its runtime suspend callback without calling synchronize_irq().
- [High] Asymmetric unregistration in sun6i_csi_bridge_cleanup leaves the subdevice in the global async list, causing list corruption and use-after-free.
--
--- Patch [1]: [PATCH v5 1/2] media: sun6i-csi: bridge: Use V4L2 subdev active state --- commit 83bd3dbd77fc8cb9460cfb43960a67e0c7ee1c83
Author: Arash Golgol <[email protected]>
media: sun6i-csi: bridge: Use V4L2 subdev active state
This commit updates the driver to use the V4L2 subdev active state API for storing the active format. It simplifies the driver by removing the bridge mbus_format field and replacing the bridge lock with the state lock. It also enforces identical formats on the sink and source pads.
Quoted 3 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +0
-0
[ ... ]
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c void sun6i_csi_bridge_cleanup(struct sun6i_csi_device *csi_dev) · line 848
Quoted 3 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +0
-0@@ -868,5 +847,7 @@ void sun6i_csi_bridge_cleanup(struct sun6i_csi_device *csi_dev)v4l2_device_unregister_subdev (subdev);
[Severity: High]
This is a pre-existing issue, but does this unconditional call to v4l2_device_unregister_subdev() leave a dangling pointer in the global async list if the device was registered asynchronously?
During setup in sun6i_csi_bridge_setup(), the subdevice is registered using v4l2_async_register_subdev() when csi_dev->isp_available is true. This adds the subdevice's async_list entry to the global subdev_list. If v4l2_device_unregister_subdev() is called here during cleanup instead of v4l2_async_unregister_subdev(), the entry remains in the global list, which can lead to a use-after-free when the list is traversed later.
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c void sun6i_csi_bridge_cleanup(struct sun6i_csi_device *csi_dev) · line 853
Quoted 4 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +2
-0+v4l2_subdev_cleanup (subdev); +media_entity_cleanup (&subdev->entity); }
I also noticed a couple of pre-existing issues in the related sun6i_csi.c file.
[Severity: High]
This is a pre-existing issue, but does the shared IRQ handler access hardware while the device might be suspended?
When devices use shared IRQs, another device on the same IRQ line can trigger an interrupt while this device is suspended.
In drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c:sun6i_csi_interrupt():
regmap_read(regmap, SUN6I_CSI_CH_INT_STA_REG, &status);
regmap_read(regmap, SUN6I_CSI_CH_INT_EN_REG, &enable);The handler performs unconditional MMIO reads without checking the PM state via pm_runtime_get_if_active(). Reading powered-off hardware can cause a bus fault or external abort.
Additionally, in sun6i_csi_suspend():
reset_control_assert(csi_dev->reset);
clk_disable_unprepare(csi_dev->clock_ram);
clk_disable_unprepare(csi_dev->clock_mod);Is it safe to power down the hardware here without calling synchronize_irq() first? Without waiting for any executing shared interrupt handlers to finish, the IRQ handler could execute mid-flight during power down.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
PATCH v5 2/2 media: sun6i-csi: capture: Implement vidioc_enum_framesizes
In reply to Arash GolgolReport the stepwise frame size range supported by the CSI capture hardware for the pixel formats exposed by the driver.
The hardware does not perform scaling and accepts any even width and height within the reported limits.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +28 -0
@@ -738,6 +738,33 @@ static int sun6i_csi_capture_enum_fmt(struct file *file, void *priv,return 0 ; } +static int sun6i_csi_capture_enum_framesize (struct file *file,void *fh, +struct v4l2_frmsizeenum *fsize) +{ +if (fsize->index) +return -EINVAL ; + +/* Only accept format in map table. */ +if (!sun6i_csi_capture_format_find (fsize->pixel_format)) +return -EINVAL ; + + fsize->type =V4L2_FRMSIZE_TYPE_STEPWISE ; + fsize->stepwise.min_width =SUN6I_CSI_CAPTURE_WIDTH_MIN ; + fsize->stepwise.max_width =SUN6I_CSI_CAPTURE_WIDTH_MAX ; + fsize->stepwise.min_height =SUN6I_CSI_CAPTURE_HEIGHT_MIN ; + fsize->stepwise.max_height =SUN6I_CSI_CAPTURE_HEIGHT_MAX ; + +if (fsize->pixel_format ==V4L2_PIX_FMT_NV12_16L16 ) { + fsize->stepwise.step_width =16 ; + fsize->stepwise.step_height =16 ; + }else { + fsize->stepwise.step_width =2 ; + fsize->stepwise.step_height =2 ; + } + +return 0 ; +} +static int sun6i_csi_capture_g_fmt (struct file *file,void *priv,struct v4l2_format *format) {
@@ -805,6 +832,7 @@ static const struct v4l2_ioctl_ops sun6i_csi_capture_ioctl_ops = { .vidioc_querycap = sun6i_csi_capture_querycap, .vidioc_enum_fmt_vid_cap = sun6i_csi_capture_enum_fmt, + .vidioc_enum_framesizes = sun6i_csi_capture_enum_framesize, .vidioc_g_fmt_vid_cap = sun6i_csi_capture_g_fmt, .vidioc_s_fmt_vid_cap = sun6i_csi_capture_s_fmt, .vidioc_try_fmt_vid_cap = sun6i_csi_capture_try_fmt,
Signature · 1 line
2.34.1
[email protected]
AI reviewRe: [PATCH v5 2/2] media: sun6i-csi: capture: Implement vidioc_enum_framesizes
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
New issues:
- [Medium] Inconsistent frame size constraints between VIDIOC_ENUM_FRAMESIZES and VIDIOC_TRY_FMT / VIDIOC_S_FMT for V4L2_PIX_FMT_NV12_16L16.
Pre-existing issues:
- [High] TRY_FMT calculates sizeimage incorrectly for NV12_16L16 with unaligned dimensions, leading to potential DMA buffer overflows. --
--- Patch [2]: [PATCH v5 2/2] media: sun6i-csi: capture: Implement vidioc_enum_framesizes --- commit f5cc5843b18ce4fd2988ebb6c61247d1f5cd63a3
Author: Arash Golgol <[email protected]>
media: sun6i-csi: capture: Implement vidioc_enum_framesizes
This commit reports the stepwise frame size range supported by the CSI capture hardware for the pixel formats exposed by the driver.
Quoted 21 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +13
-0@@ -738,6 +738,33 @@ static int sun6i_csi_capture_enum_fmt(struct file *file, void *priv,return 0 ; } +static int sun6i_csi_capture_enum_framesize (struct file *file,void *fh, +struct v4l2_frmsizeenum *fsize) +{ +if (fsize->index) +return -EINVAL ; + +/* Only accept format in map table. */ +if (!sun6i_csi_capture_format_find (fsize->pixel_format)) +return -EINVAL ; + + fsize->type =V4L2_FRMSIZE_TYPE_STEPWISE ; + fsize->stepwise.min_width =SUN6I_CSI_CAPTURE_WIDTH_MIN ; + fsize->stepwise.max_width =SUN6I_CSI_CAPTURE_WIDTH_MAX ;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c static int sun6i_csi_capture_enum_fmt(struct file *file, void *priv, · line 763
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +10
-0+ fsize->stepwise.min_height =SUN6I_CSI_CAPTURE_HEIGHT_MIN ; + fsize->stepwise.max_height =SUN6I_CSI_CAPTURE_HEIGHT_MAX ; + +if (fsize->pixel_format ==V4L2_PIX_FMT_NV12_16L16 ) { + fsize->stepwise.step_width =16 ; + fsize->stepwise.step_height =16 ; + }else { + fsize->stepwise.step_width =2 ; + fsize->stepwise.step_height =2 ; + }
[Severity: Medium]
Will this lead to inconsistent frame size constraints?
While this reports a 16-pixel step width and height for V4L2_PIX_FMT_NV12_16L16 via ENUM_FRAMESIZES, drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c:sun6i_csi_capture_format_prepare() (used by TRY_FMT and S_FMT) unconditionally uses v4l_bound_align_image()
with an alignment of 2:
v4l_bound_align_image(&pix_format->width, SUN6I_CSI_CAPTURE_WIDTH_MIN, SUN6I_CSI_CAPTURE_WIDTH_MAX, 1, &pix_format->height, SUN6I_CSI_CAPTURE_HEIGHT_MIN, SUN6I_CSI_CAPTURE_HEIGHT_MAX, 1, 0);
Could this allow userspace to successfully request sizes via TRY_FMT that ENUM_FRAMESIZES claims are unsupported, potentially leading to v4l2-compliance test failures and contradictory format negotiation?
[Severity: High]
This isn't a bug introduced by this patch, but does TRY_FMT calculate sizeimage incorrectly for NV12_16L16 with unaligned dimensions?
Since drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c:sun6i_csi_capture_format_prepare() allows width and height to be unaligned multiples of 2 and computes
sizeimage purely linearly:
case V4L2_PIX_FMT_NV12_16L16: pix_format->bytesperline = width * 12 / 8; pix_format->sizeimage = pix_format->bytesperline * height; break;
Could this lead to a DMA buffer overflow?
The CSI DMA hardware natively writes in 16x16 tiles. If a user requests an unaligned frame size (e.g., 34x34) for V4L2_PIX_FMT_NV12_16L16 via VIDIOC_TRY_FMT, the allocated vb2 buffer will be smaller than what the hardware DMA actually writes.
For example, a 34x34 image will be written as 3x3 tiles (48x48 pixels), consuming 3456 bytes. However, the allocated buffer for 34x34 is only 1734 bytes (34 * 1.5 * 34), which would cause a buffer overflow when the DMA writes the padded tiles past the end of the allocation.
Quoted 3 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +3
-0+ +return 0 ; +}
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2