media: rkisp1: Fix source pad format configuration
Subsystems (15)
Sasha Levin
maintainerPATCH 2/34 media: rkisp1: Don't pass the quantization to rkisp1_csm_config()
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 711d91497e203b058cf0a08c0f7d41c04efbde76 ]
The rkisp1_csm_config() function takes a pointer to the rkisp1_params structure which contains the quantization value. There's no need to pass it separately to the function. Drop it from the function parameters.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +3 -7
@@ -1066,7 +1066,7 @@ static void rkisp1_ie_enable(struct rkisp1_params *params, bool en) } } -static void rkisp1_csm_config (struct rkisp1_params *params,bool full_range) +static void rkisp1_csm_config (struct rkisp1_params *params) {static const u16 full_range_coeff[] = {0x0026 ,0x004b ,0x000f ,
@@ -1080,7 +1080,7 @@ static void rkisp1_csm_config(struct rkisp1_params *params, bool full_range) };unsigned int i; -if (full_range) { +if (params->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) {for (i =0 ; i <ARRAY_SIZE (full_range_coeff); i++) rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_CC_COEFF_0 + i * 4,
@@ -1552,11 +1552,7 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP_V10 , rkisp1_hst_params_default_config.mode); -/* set the range */ -if (params->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) -rkisp1_csm_config (params, true); -else -rkisp1_csm_config (params, false); +rkisp1_csm_config (params);spin_lock_irq (¶ms->config_lock);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 1/34 media: rkisp1: Fix source pad format configuration
From: Laurent Pinchart <[email protected]>
[ Upstream commit cb00f3a4421d5c7d7155bd4bded7fb2ff8eec211 ]
The ISP converts Bayer data to YUV when operating normally, and can also operate in pass-through mode where the input and output formats must match. Converting from YUV to Bayer isn't possible. If such an invalid configuration is attempted, adjust it by copying the sink pad media bus code to the source pad.
--- .../platform/rockchip/rkisp1/rkisp1-isp.c | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +32 -8
@@ -472,23 +472,43 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp, struct v4l2_mbus_framefmt *format, unsigned int which) { -const struct rkisp1_mbus_info *mbus_info; +const struct rkisp1_mbus_info *sink_info; +const struct rkisp1_mbus_info *src_info; +struct v4l2_mbus_framefmt *sink_fmt;struct v4l2_mbus_framefmt *src_fmt;const struct v4l2_rect *src_crop; + sink_fmt =rkisp1_isp_get_pad_fmt (isp, sd_state, +RKISP1_ISP_PAD_SINK_VIDEO , which); src_fmt =rkisp1_isp_get_pad_fmt (isp, sd_state,RKISP1_ISP_PAD_SOURCE_VIDEO , which); src_crop =rkisp1_isp_get_pad_crop (isp, sd_state,RKISP1_ISP_PAD_SOURCE_VIDEO , which); +/* +* Media bus code. The ISP can operate in pass-through mode (Bayer in, +* Bayer out or YUV in, YUV out) or process Bayer data to YUV, but +* can't convert from YUV to Bayer. +*/ + sink_info =rkisp1_mbus_info_get_by_code (sink_fmt->code); + src_fmt->code = format->code; - mbus_info =rkisp1_mbus_info_get_by_code (src_fmt->code); -if (!mbus_info || !(mbus_info->direction &RKISP1_ISP_SD_SRC )) { + src_info =rkisp1_mbus_info_get_by_code (src_fmt->code); +if (!src_info || !(src_info->direction &RKISP1_ISP_SD_SRC )) { src_fmt->code =RKISP1_DEF_SRC_PAD_FMT ; - mbus_info =rkisp1_mbus_info_get_by_code (src_fmt->code); + src_info =rkisp1_mbus_info_get_by_code (src_fmt->code); } -if (which ==V4L2_SUBDEV_FORMAT_ACTIVE ) - isp->src_fmt = mbus_info; + +if (sink_info->pixel_enc ==V4L2_PIXEL_ENC_YUV && + src_info->pixel_enc ==V4L2_PIXEL_ENC_BAYER ) { + src_fmt->code = sink_fmt->code; + src_info = sink_info; + } + +/* +* The source width and height must be identical to the source crop +* size. +*/ src_fmt->width = src_crop->width; src_fmt->height = src_crop->height;
@@ -498,14 +518,18 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,*/ if (format->flags &V4L2_MBUS_FRAMEFMT_SET_CSC && format->quantization ==V4L2_QUANTIZATION_FULL_RANGE && - mbus_info->pixel_enc ==V4L2_PIXEL_ENC_YUV ) + src_info->pixel_enc ==V4L2_PIXEL_ENC_YUV ) src_fmt->quantization =V4L2_QUANTIZATION_FULL_RANGE ; -else if (mbus_info->pixel_enc ==V4L2_PIXEL_ENC_YUV ) +else if (src_info->pixel_enc ==V4L2_PIXEL_ENC_YUV ) src_fmt->quantization =V4L2_QUANTIZATION_LIM_RANGE ;else src_fmt->quantization =V4L2_QUANTIZATION_FULL_RANGE ; *format = *src_fmt; + +/* Store the source format info when setting the active format. */ +if (which ==V4L2_SUBDEV_FORMAT_ACTIVE ) + isp->src_fmt = src_info; } static void rkisp1_isp_set_src_crop(struct rkisp1_isp *isp,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 3/34 media: rkisp1: Initialize color space on resizer sink and source pads
From: Laurent Pinchart <[email protected]>
[ Upstream commit 83b9296e399367862845d3b19984444fc756bd61 ]
Initialize the four color space fields on the sink and source video pads of the resizer in the .init_cfg() operation. The resizer can't perform any color space conversion, so set the sink and source color spaces to the same defaults, which match the ISP source video pad default.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c +4 -0
@@ -411,6 +411,10 @@ static int rkisp1_rsz_init_config(struct v4l2_subdev *sd, sink_fmt->height =RKISP1_DEFAULT_HEIGHT ; sink_fmt->field =V4L2_FIELD_NONE ; sink_fmt->code =RKISP1_DEF_FMT ; + sink_fmt->colorspace =V4L2_COLORSPACE_SRGB ; + sink_fmt->xfer_func =V4L2_XFER_FUNC_SRGB ; + sink_fmt->ycbcr_enc =V4L2_YCBCR_ENC_601 ; + sink_fmt->quantization =V4L2_QUANTIZATION_LIM_RANGE ; sink_crop =v4l2_subdev_get_try_crop (sd, sd_state,RKISP1_RSZ_PAD_SINK );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 7/34 media: cros-ec-cec: limit msg.len to CEC_MAX_MSG_SIZE
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 2dc73b48665411a08c4e5f0f823dea8510761603 ]
I expect that the hardware will have limited this to 16, but just in case it hasn't, check for this corner case.
--- drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/cec/platform/cros-ec/cros-ec-cec.c +2 -0
@@ -44,6 +44,8 @@ static void handle_cec_message(struct cros_ec_cec *cros_ec_cec)uint8_t *cec_message = cros_ec->event_data.data.cec_message;unsigned int len = cros_ec->event_size; +if (len >CEC_MAX_MSG_SIZE ) + len =CEC_MAX_MSG_SIZE ; cros_ec_cec->rx_msg.len = len;memcpy (cros_ec_cec->rx_msg.msg, cec_message, len);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 4/34 media: rkisp1: Use correct macro for gradient registers
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 4c3501f13e8e60f6e7e7308c77ac4404e1007c18 ]
The rkisp1_lsc_config() function incorrectly uses the RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace it with the correct macro, and rename it from RKISP1_CIF_ISP_LSC_GRAD_SIZE() to RKISP1_CIF_ISP_LSC_SECT_GRAD() as the corresponding registers store the gradients for each sector, not a size. This doesn't cause any functional change as the two macros are defined identically (the size and gradient registers store fields in the same number of bits at the same positions).
--- drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++-- drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +2 -2
@@ -343,7 +343,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);/* program x grad tables */ - data =RKISP1_CIF_ISP_LSC_SECT_SIZE (arg->x_grad_tbl[i *2 ], + data =RKISP1_CIF_ISP_LSC_SECT_GRAD (arg->x_grad_tbl[i *2 ], arg->x_grad_tbl[i *2 +1 ]);rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_LSC_XGRAD_01 + i *4 , data);
@@ -355,7 +355,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);/* program y grad tables */ - data =RKISP1_CIF_ISP_LSC_SECT_SIZE (arg->y_grad_tbl[i *2 ], + data =RKISP1_CIF_ISP_LSC_SECT_GRAD (arg->y_grad_tbl[i *2 ], arg->y_grad_tbl[i *2 +1 ]);rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_LSC_YGRAD_01 + i *4 , data);
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +1 -1
@@ -576,7 +576,7 @@ (((v0) & 0x1FFF) | (((v1) & 0x1FFF) << 13))#define RKISP1_CIF_ISP_LSC_SECT_SIZE (v0, v1) \ (((v0) & 0xFFF) | (((v1) & 0xFFF) << 16)) -#define RKISP1_CIF_ISP_LSC_GRAD_SIZE (v0, v1) \ +#define RKISP1_CIF_ISP_LSC_SECT_GRAD (v0, v1) \ (((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))/* LSC: ISP_LSC_TABLE_SEL */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 5/34 media: rkisp1: Zero v4l2_subdev_format fields in when validating links
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit c53e3a049f35978a150526671587fd46b1ae7ca1 ]
The local sd_fmt variable in rkisp1_capture_link_validate() has uninitialized fields, which causes random failures when calling the subdev .get_fmt() operation. Fix it by initializing the variable when declaring it, which zeros all other fields.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +4 -3
@@ -1273,11 +1273,12 @@ static int rkisp1_capture_link_validate(struct media_link *link)struct rkisp1_capture *cap =video_get_drvdata (vdev);const struct rkisp1_capture_fmt_cfg *fmt =rkisp1_find_fmt_cfg (cap, cap->pix.fmt.pixelformat); -struct v4l2_subdev_format sd_fmt; +struct v4l2_subdev_format sd_fmt = { + .which =V4L2_SUBDEV_FORMAT_ACTIVE , + .pad = link->source->index, + };int ret; - sd_fmt.which =V4L2_SUBDEV_FORMAT_ACTIVE ; - sd_fmt.pad = link->source->index; ret =v4l2_subdev_call (sd, pad, get_fmt,NULL , &sd_fmt);if (ret)return ret;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 9/34 media: platform: cros-ec: Add Kuldax to the match table
In reply to Sasha LevinFrom: Rory Liu <[email protected]>
[ Upstream commit 594b6bdde2e7833a56413de5092b6e4188d33ff7 ]
The Google Kuldax device uses the same approach as the Google Brask which enables the HDMI CEC via the cros-ec-cec driver.
--- drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/cec/platform/cros-ec/cros-ec-cec.c +2 -0
@@ -223,6 +223,8 @@ static const struct cec_dmi_match cec_dmi_match_table[] = { { "Google", "Moli", "0000:00:02.0", "Port B" },/* Google Kinox */ { "Google", "Kinox", "0000:00:02.0", "Port B" }, +/* Google Kuldax */ + { "Google", "Kuldax", "0000:00:02.0", "Port B" }, }; static struct device *cros_ec_cec_find_hdmi_dev(struct device *dev,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 10/34 media: meson: vdec: fix possible refcount leak in vdec_probe()
In reply to Sasha LevinFrom: Hangyu Hua <[email protected]>
[ Upstream commit 7718999356234d9cc6a11b4641bb773928f1390f ]
v4l2_device_unregister need to be called to put the refcount got by v4l2_device_register when vdec_probe fails or vdec_remove is called.
--- drivers/staging/media/meson/vdec/vdec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/media/meson/vdec/vdec.c +2 -0
@@ -1102,6 +1102,7 @@ static int vdec_probe(struct platform_device *pdev) err_vdev_release:video_device_release (vdev); +v4l2_device_unregister (&core->v4l2_dev);return ret; }
@@ -1110,6 +1111,7 @@ static int vdec_remove(struct platform_device *pdev)struct amvdec_core *core =platform_get_drvdata (pdev);video_unregister_device (core->vdev_dec); +v4l2_device_unregister (&core->v4l2_dev);return 0 ; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 11/34 media: hantro: Store HEVC bit depth in context
In reply to Sasha LevinFrom: Benjamin Gaignard <[email protected]>
[ Upstream commit 4bec03301ecd81760c159402467dbb2cfd527684 ]
Store HEVC bit depth in context.
Bit depth is equal to hevc sps bit_depth_luma_minus8 + 8.
--- drivers/staging/media/hantro/hantro_drv.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/staging/media/hantro/hantro_drv.c +7 -0
@@ -251,6 +251,11 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)static int hantro_try_ctrl (struct v4l2_ctrl *ctrl) { +struct hantro_ctx *ctx; + + ctx =container_of (ctrl->handler, + struct hantro_ctx, ctrl_handler); +if (ctrl->id ==V4L2_CID_STATELESS_H264_SPS ) {const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;
@@ -272,6 +277,8 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)if (sps->bit_depth_luma_minus8 !=0 )/* Only 8-bit is supported */ return -EINVAL ; + + ctx->bit_depth = sps->bit_depth_luma_minus8 +8 ; }else if (ctrl->id ==V4L2_CID_STATELESS_VP9_FRAME ) {const struct v4l2_ctrl_vp9_frame *dec_params = ctrl->p_new.p_vp9_frame;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 12/34 media: hantro: HEVC: Fix auxilary buffer size calculation
In reply to Sasha LevinFrom: Benjamin Gaignard <[email protected]>
[ Upstream commit 8a438580a09ecef78cd6c5825d628b4d5ae1c127 ]
SAO and FILTER buffers size depend of the bit depth. Make sure we have enough space for 10bit bitstreams.
--- drivers/staging/media/hantro/hantro_hevc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/hantro/hantro_hevc.c +2 -2
@@ -104,7 +104,7 @@ static int tile_buffer_reallocate(struct hantro_ctx *ctx) hevc_dec->tile_bsd.cpu =NULL ; } - size =VERT_FILTER_RAM_SIZE * height64 * (num_tile_cols -1 ); + size = (VERT_FILTER_RAM_SIZE * height64 * (num_tile_cols -1 ) * ctx->bit_depth) /8 ; hevc_dec->tile_filter.cpu =dma_alloc_coherent (vpu->dev, size, &hevc_dec->tile_filter.dma,GFP_KERNEL );
@@ -112,7 +112,7 @@ static int tile_buffer_reallocate(struct hantro_ctx *ctx) goto err_free_tile_buffers; hevc_dec->tile_filter.size = size; - size =VERT_SAO_RAM_SIZE * height64 * (num_tile_cols -1 ); + size = (VERT_SAO_RAM_SIZE * height64 * (num_tile_cols -1 ) * ctx->bit_depth) /8 ; hevc_dec->tile_sao.cpu =dma_alloc_coherent (vpu->dev, size, &hevc_dec->tile_sao.dma,GFP_KERNEL );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 13/34 media: hantro: HEVC: Fix chroma offset computation
In reply to Sasha LevinFrom: Benjamin Gaignard <[email protected]>
[ Upstream commit f64853ad7f964b3bf7c1d63b27ca7ef972797a1c ]
The chroma offset depends of the bitstream depth. Make sure that ctx->bit_depth is used to compute it.
--- drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/hantro/hantro_g2_hevc_dec.c +1 -1
@@ -12,7 +12,7 @@static size_t hantro_hevc_chroma_offset (struct hantro_ctx *ctx) { -return ctx->dst_fmt.width * ctx->dst_fmt.height; +return ctx->dst_fmt.width * ctx->dst_fmt.height * ctx->bit_depth /8 ; }static size_t hantro_hevc_motion_vectors_offset (struct hantro_ctx *ctx)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 15/34 media: atomisp-ov2680: Fix ov2680_set_fmt()
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit adea153b4f6537f367fe77abada263fde8a1f7b6 ]
On sets actually store the set (closest) format inside ov2680_device.dev, so that it also properly gets returned by get_fmt.
This fixes the following problem:
1. App does an VIDIOC_SET_FMT 640x480, calling ov2680_set_fmt()
2. Internal buffers (atomisp_create_pipes_stream()) get allocated at 640x480 size by atomisp_set_fmt()
3. ov2680_get_fmt() gets called later on and returns 1600x1200 since ov2680_device.dev was not updated. So things get configured to stream at 1600x1200, but the internal buffers created during atomisp_create_pipes_stream() do not get updated in size
4. streaming starts, internal buffers overflow and the entire machine freezes eventually due to memory being corrupted
--- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +1 -5
@@ -894,11 +894,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,if (v_flag)ov2680_v_flip (sd, v_flag); -/* -* ret = startup(sd); -* if (ret) -* dev_err(&client->dev, "ov2680 startup err\n"); -*/ + dev->res = res; err:mutex_unlock (&dev->input_lock);return ret;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 16/34 media: atomisp: Fix VIDIOC_TRY_FMT
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 4d3aafb9c9bba59c9b6f6df8ea6c89483bfed8d4 ]
atomisp_try_fmt() calls the sensor's try_fmt handler but it does not copy the result back to the passed in v4l2_pix_format under some circumstances.
Potentially returning an unsupported resolution to userspace, which VIDIOC_TRY_FMT is not supposed to do.
atomisp_set_fmt() also uses atomisp_try_fmt() and relies on this wrong behavior. The VIDIOC_TRY_FMT call passes NULL for the res_overflow argument where as the atomisp_set_fmt() call passes non NULL.
Use the res_overflow argument to differentiate between the 2 callers and always propagate the sensors result in the VIDIOC_TRY_FMT case.
This fixes the resolution list in camorama showing resolutions like e.g. 1584x1184 instead of 1600x1200.
--- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +2 -2
@@ -4886,8 +4886,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,return 0 ; } -if (snr_mbus_fmt->width < f->width - && snr_mbus_fmt->height < f->height) { +if (!res_overflow || (snr_mbus_fmt->width < f->width && + snr_mbus_fmt->height < f->height)) { f->width = snr_mbus_fmt->width; f->height = snr_mbus_fmt->height;/* Set the flag when resolution requested is
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 17/34 media: atomisp: Ensure that USERPTR pointers are page aligned
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 6e6c4ae0f0ba295dbf6cbd48d93bec169d6ce431 ]
The atomisp code needs USERPTR pointers to be page aligned, otherwise bad things (scribbling over other parts of the process' RAM) happen.
Add a check to ensure this and exit VIDIOC_QBUF calls with unaligned pointers with -EINVAL.
--- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +6 -0
@@ -1338,6 +1338,12 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)* address and reprograme out page table properly */ if (buf->memory ==V4L2_MEMORY_USERPTR ) { +if (offset_in_page (buf->m.userptr)) { +dev_err (isp->dev,"Error userptr is not page aligned.\n" ); + ret = -EINVAL ; + goto error; + } + vb = pipe->capq.bufs[buf->index]; vm_mem = vb->priv;if (!vm_mem) {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 6/34 media: s5p_cec: limit msg.len to CEC_MAX_MSG_SIZE
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 93f65ce036863893c164ca410938e0968964b26c ]
I expect that the hardware will have limited this to 16, but just in case it hasn't, check for this corner case.
--- drivers/media/cec/platform/s5p/s5p_cec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/cec/platform/s5p/s5p_cec.c +2 -0
@@ -115,6 +115,8 @@ static irqreturn_t s5p_cec_irq_handler(int irq, void *priv)dev_dbg (cec->dev,"Buffer overrun (worker did not process previous message)\n" ); cec->rx =STATE_BUSY ; cec->msg.len = status >>24 ; +if (cec->msg.len >CEC_MAX_MSG_SIZE ) + cec->msg.len =CEC_MAX_MSG_SIZE ; cec->msg.rx_status =CEC_RX_STATUS_OK ;s5p_cec_get_rx_buf (cec, cec->msg.len, cec->msg.msg);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 18/34 media: atomisp: Fix v4l2_fh resource leak on open errors
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 5b9853ad1329be49343a608d574eb232ff1273d0 ]
When atomisp_open() fails then it must call v4l2_fh_release() to undo the results of v4l2_fh_open().
--- drivers/staging/media/atomisp/pci/atomisp_fops.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/media/atomisp/pci/atomisp_fops.c +1 -0
@@ -903,6 +903,7 @@ static int atomisp_open(struct file *file)pm_runtime_put (vdev->v4l2_dev->dev); error:rt_mutex_unlock (&isp->mutex); +v4l2_fh_release (file);return ret; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 19/34 media: atomisp: Fix locking around asd->streaming read/write
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 2468083f799eb9eef7b03f48ebb9673ad5655f88 ]
For reading / writing the asd->streaming enum the following rules should be followed:
1. Writers of streaming must hold both isp->mutex and isp->lock.
2. Readers of streaming need to hold only one of the two locks.
Not all writers where properly taking both locks this fixes this.
In the case of the readers, many readers depend on their caller to hold isp->mutex, add asserts for this
And in the case of atomisp_css_get_dis_stat() it is called with isp->mutex held, so there is no need to take the spinlock just for reading the streaming value.
--- .../staging/media/atomisp/pci/atomisp_cmd.c | 32 +++++++++++++++++-- .../media/atomisp/pci/atomisp_compat_css20.c | 10 +++--- .../staging/media/atomisp/pci/atomisp_fops.c | 3 ++ .../media/atomisp/pci/atomisp_internal.h | 2 +- .../staging/media/atomisp/pci/atomisp_ioctl.c | 4 +++ .../media/atomisp/pci/atomisp_subdev.c | 8 ++++- .../media/atomisp/pci/atomisp_subdev.h | 6 +++- 7 files changed, 55 insertions(+), 10 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +30 -2
@@ -908,6 +908,8 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error,struct v4l2_control ctrl;bool reset_wdt_timer = false; +lockdep_assert_held (&isp->mutex); + if ( buf_type != IA_CSS_BUFFER_TYPE_METADATA && buf_type != IA_CSS_BUFFER_TYPE_3A_STATISTICS &&
@@ -1307,6 +1309,9 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout)bool stream_restart[MAX_STREAM_NUM ] = {0 };bool depth_mode = false;int i, ret, depth_cnt =0 ; +unsigned long flags; + +lockdep_assert_held (&isp->mutex);if (!isp->sw_contex.file_input) atomisp_css_irq_enable(isp,
@@ -1331,7 +1336,9 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout) stream_restart[asd->index] = true; +spin_lock_irqsave (&isp->lock, flags); asd->streaming =ATOMISP_DEVICE_STREAMING_STOPPING ; +spin_unlock_irqrestore (&isp->lock, flags);/* stream off sensor */ ret = v4l2_subdev_call(
@@ -1346,7 +1353,9 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout) css_pipe_id =atomisp_get_css_pipe_id (asd);atomisp_css_stop (asd, css_pipe_id, true); +spin_lock_irqsave (&isp->lock, flags); asd->streaming =ATOMISP_DEVICE_STREAMING_DISABLED ; +spin_unlock_irqrestore (&isp->lock, flags); asd->preview_exp_id =1 ; asd->postview_exp_id =1 ;
@@ -1387,11 +1396,14 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout) IA_CSS_INPUT_MODE_BUFFERED_SENSOR); css_pipe_id =atomisp_get_css_pipe_id (asd); -if (atomisp_css_start (asd, css_pipe_id, true)) +if (atomisp_css_start (asd, css_pipe_id, true)) {dev_warn (isp->dev,"start SP failed, so do not set streaming to be enable!\n" ); -else + }else { +spin_lock_irqsave (&isp->lock, flags); asd->streaming =ATOMISP_DEVICE_STREAMING_ENABLED ; +spin_unlock_irqrestore (&isp->lock, flags); + }atomisp_csi2_configure (asd); }
@@ -1627,6 +1639,8 @@ void atomisp_css_flush(struct atomisp_device *isp) {int i; +lockdep_assert_held (&isp->mutex); +if (!atomisp_streaming_count (isp))return ;
@@ -4077,6 +4091,8 @@ void atomisp_handle_parameter_and_buffer(struct atomisp_video_pipe *pipe)unsigned long irqflags;bool need_to_enqueue_buffer = false; +lockdep_assert_held (&asd->isp->mutex); +if (!asd) {dev_err (pipe->isp->dev,"%s(): asd is NULL, device is %s\n" , __func__, pipe->vdev.name);
@@ -4170,6 +4186,8 @@ int atomisp_set_parameters(struct video_device *vdev,struct atomisp_css_params *css_param = &asd->params.css_param;int ret; +lockdep_assert_held (&asd->isp->mutex); +if (!asd) {dev_err (pipe->isp->dev,"%s(): asd is NULL, device is %s\n" , __func__, vdev->name);
@@ -5604,6 +5622,8 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)struct v4l2_subdev_fh fh;int ret; +lockdep_assert_held (&isp->mutex); +if (!asd) {dev_err (isp->dev,"%s(): asd is NULL, device is %s\n" , __func__, vdev->name);
@@ -6275,6 +6295,8 @@ int atomisp_offline_capture_configure(struct atomisp_sub_device *asd, {struct v4l2_ctrl *c; +lockdep_assert_held (&asd->isp->mutex); +/* * In case of M10MO ZSL capture case, we need to issue a separate * capture request to M10MO which will output captured jpeg image
@@ -6549,6 +6571,8 @@ int atomisp_exp_id_capture(struct atomisp_sub_device *asd, int *exp_id)int value = *exp_id;int ret; +lockdep_assert_held (&isp->mutex); + ret =__is_raw_buffer_locked (asd, value);if (ret) {dev_err (isp->dev,"%s exp_id %d invalid %d.\n" , __func__, value, ret);
@@ -6570,6 +6594,8 @@ int atomisp_exp_id_unlock(struct atomisp_sub_device *asd, int *exp_id)int value = *exp_id;int ret; +lockdep_assert_held (&isp->mutex); + ret =__clear_raw_buffer_bitmap (asd, value);if (ret) {dev_err (isp->dev,"%s exp_id %d invalid %d.\n" , __func__, value, ret);
@@ -6605,6 +6631,8 @@ int atomisp_inject_a_fake_event(struct atomisp_sub_device *asd, int *event)if (!event || asd->streaming !=ATOMISP_DEVICE_STREAMING_ENABLED )return -EINVAL ; +lockdep_assert_held (&asd->isp->mutex); +dev_dbg (asd->isp->dev,"%s: trying to inject a fake event 0x%x\n" , __func__, *event);
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +5 -5
@@ -3626,6 +3626,8 @@ int atomisp_css_get_dis_stat(struct atomisp_sub_device *asd,struct atomisp_dis_buf *dis_buf;unsigned long flags; +lockdep_assert_held (&isp->mutex); + if (!asd->params.dvs_stat->hor_prod.odd_real || !asd->params.dvs_stat->hor_prod.odd_imag || !asd->params.dvs_stat->hor_prod.even_real ||
@@ -3637,12 +3639,8 @@ int atomisp_css_get_dis_stat(struct atomisp_sub_device *asd,return -EINVAL ;/* isp needs to be streaming to get DIS statistics */ -spin_lock_irqsave (&isp->lock, flags); -if (asd->streaming !=ATOMISP_DEVICE_STREAMING_ENABLED ) { -spin_unlock_irqrestore (&isp->lock, flags); +if (asd->streaming !=ATOMISP_DEVICE_STREAMING_ENABLED )return -EINVAL ; - } -spin_unlock_irqrestore (&isp->lock, flags);if (atomisp_compare_dvs_grid (asd, &stats->dvs2_stat.grid_info) !=0 )/* If the grid info in the argument differs from the current
@@ -3827,6 +3825,8 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,bool reset_wdt_timer[MAX_STREAM_NUM ] = {false};int i; +lockdep_assert_held (&isp->mutex); +while (!ia_css_dequeue_psys_event (¤t_event.event)) {if (current_event.event.type ==IA_CSS_EVENT_TYPE_FW_ASSERT ) {
drivers/staging/media/atomisp/pci/atomisp_fops.c +3 -0
@@ -918,6 +918,7 @@ static int atomisp_release(struct file *file)struct v4l2_requestbuffers req;struct v4l2_subdev_fh fh;struct v4l2_rect clear_compose = {0 }; +unsigned long flags;int ret =0 ;v4l2_fh_init (&fh.vfh, vdev);
@@ -1008,7 +1009,9 @@ static int atomisp_release(struct file *file)/* clear the asd field to show this camera is not used */ isp->inputs[asd->input_curr].asd =NULL ; +spin_lock_irqsave (&isp->lock, flags); asd->streaming =ATOMISP_DEVICE_STREAMING_DISABLED ; +spin_unlock_irqrestore (&isp->lock, flags);if (atomisp_dev_users (isp)) goto done;
drivers/staging/media/atomisp/pci/atomisp_internal.h +1 -1
@@ -280,7 +280,7 @@ struct atomisp_device {atomic_t wdt_work_queued; -spinlock_t lock;/* Just for streaming below */ +spinlock_t lock;/* Protects asd[i].streaming */ bool need_gfx_throttle;
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +4 -0
@@ -1925,7 +1925,9 @@ static int atomisp_streamon(struct file *file, void *fh,if (ret) goto out; +spin_lock_irqsave (&isp->lock, irqflags); asd->streaming =ATOMISP_DEVICE_STREAMING_ENABLED ; +spin_unlock_irqrestore (&isp->lock, irqflags);atomic_set (&asd->sof_count,-1 );atomic_set (&asd->sequence,-1 );atomic_set (&asd->sequence_temp,-1 );
@@ -2005,7 +2007,9 @@ static int atomisp_streamon(struct file *file, void *fh, ret =v4l2_subdev_call (isp->inputs[asd->input_curr].camera, video, s_stream,1 );if (ret) { +spin_lock_irqsave (&isp->lock, irqflags); asd->streaming =ATOMISP_DEVICE_STREAMING_DISABLED ; +spin_unlock_irqrestore (&isp->lock, irqflags); ret = -EINVAL ; goto out; }
drivers/staging/media/atomisp/pci/atomisp_subdev.c +7 -1
@@ -874,12 +874,18 @@ static int s_ctrl(struct v4l2_ctrl *ctrl) {struct atomisp_sub_device *asd =container_of ( ctrl->handler, struct atomisp_sub_device, ctrl_handler); +unsigned int streaming; +unsigned long flags;switch (ctrl->id) {case V4L2_CID_RUN_MODE :return __atomisp_update_run_mode (asd);case V4L2_CID_DEPTH_MODE : -if (asd->streaming !=ATOMISP_DEVICE_STREAMING_DISABLED ) { +/* Use spinlock instead of mutex to avoid possible locking issues */ +spin_lock_irqsave (&asd->isp->lock, flags); + streaming = asd->streaming; +spin_unlock_irqrestore (&asd->isp->lock, flags); +if (streaming !=ATOMISP_DEVICE_STREAMING_DISABLED ) {dev_err (asd->isp->dev,"ISP is streaming, it is not supported to change the depth mode\n" );return -EINVAL ;
drivers/staging/media/atomisp/pci/atomisp_subdev.h +5 -1
@@ -364,7 +364,11 @@ struct atomisp_sub_device {atomic_t sequence;/* Sequence value that is assigned to buffer. */ atomic_t sequence_temp; -unsigned int streaming;/* Hold both mutex and lock to change this */ +/* +* Writers of streaming must hold both isp->mutex and isp->lock. +* Readers of streaming need to hold only one of the two locks. +*/ +unsigned int streaming;bool stream_prepared;/* whether css stream is created */ /* subdev index: will be used to show which subdev is holding the
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 20/34 drm/vc4: hdmi: Check the HSM rate at runtime_resume
In reply to Sasha LevinFrom: Maxime Ripard <[email protected]>
[ Upstream commit 4190e8bbcbc77a9c36724681801cedc5229e7fc2 ]
If our HSM clock has not been properly initialized, any register access will silently lock up the system.
Let's check that this can't happen by adding a check for the rate before any register access, and error out otherwise.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/gpu/drm/vc4/vc4_hdmi.c +20 -0
@@ -2869,12 +2869,28 @@ static int vc4_hdmi_runtime_resume(struct device *dev)struct vc4_hdmi *vc4_hdmi =dev_get_drvdata (dev);unsigned long __maybe_unused flags;u32 __maybe_unused value; +unsigned long rate;int ret; ret =clk_prepare_enable (vc4_hdmi->hsm_clock);if (ret)return ret; +/* +* Whenever the RaspberryPi boots without an HDMI monitor +* plugged in, the firmware won't have initialized the HSM clock +* rate and it will be reported as 0. +* +* If we try to access a register of the controller in such a +* case, it will lead to a silent CPU stall. Let's make sure we +* prevent such a case. +*/ + rate =clk_get_rate (vc4_hdmi->hsm_clock); +if (!rate) { + ret = -EINVAL ; + goto err_disable_clk; + } +if (vc4_hdmi->variant->reset) vc4_hdmi->variant->reset (vc4_hdmi);
@@ -2896,6 +2912,10 @@ static int vc4_hdmi_runtime_resume(struct device *dev)#endif return 0 ; + +err_disable_clk: +clk_disable_unprepare (vc4_hdmi->hsm_clock); +return ret; }static int vc4_hdmi_bind (struct device *dev,struct device *master,void *data)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 8/34 media: dvb-frontends/drxk: initialize err to 0
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 20694e96ca089ce6693c2348f8f628ee621e4e74 ]
Fix a compiler warning:
drivers/media/dvb-frontends/drxk_hard.c: In function 'drxk_read_ucblocks':drivers/media/dvb-frontends/drxk_hard.c:6673:21: warning: 'err' may be used uninitialized [-Wmaybe-uninitialized]
6673 | *ucblocks = (u32) err;
| ^~~~~~~~~drivers/media/dvb-frontends/drxk_hard.c:6663:13: note: 'err' was declared here
6663 | u16 err;
| ^~~
--- drivers/media/dvb-frontends/drxk_hard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb-frontends/drxk_hard.c +1 -1
@@ -6660,7 +6660,7 @@ static int drxk_read_snr(struct dvb_frontend *fe, u16 *snr)static int drxk_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) {struct drxk_state *state = fe->demodulator_priv; -u16 err; +u16 err =0 ;dprintk (1 ,"\n" );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 14/34 media: v4l: subdev: Fail graciously when getting try data for NULL state
In reply to Sasha LevinFrom: Sakari Ailus <[email protected]>
[ Upstream commit 2ba3e38517f5a4ebf9c997168079dca01b7f9fc6 ]
The state argument for the functions for obtaining various parts of the state is NULL if it is called by drivers for active state. Fail graciously in that case instead of dereferencing a NULL pointer.
--- include/media/v4l2-subdev.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/media/v4l2-subdev.h +6 -0
@@ -1046,6 +1046,8 @@ v4l2_subdev_get_pad_format(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, unsigned int pad) { + if (WARN_ON(!state)) + return NULL;if (WARN_ON (pad >= sd->entity.num_pads)) pad =0 ;return &state->pads[pad].try_fmt;
@@ -1064,6 +1066,8 @@ v4l2_subdev_get_pad_crop(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, unsigned int pad) { + if (WARN_ON(!state)) + return NULL;if (WARN_ON (pad >= sd->entity.num_pads)) pad =0 ;return &state->pads[pad].try_crop;
@@ -1082,6 +1086,8 @@ v4l2_subdev_get_pad_compose(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, unsigned int pad) { + if (WARN_ON(!state)) + return NULL;if (WARN_ON (pad >= sd->entity.num_pads)) pad =0 ;return &state->pads[pad].try_compose;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 28/34 drm/amdkfd: Fix type of reset_type parameter in hqd_destroy() callback
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit e688ba3e276422aa88eae7a54186a95320836081 ]
When booting a kernel compiled with CONFIG_CFI_CLANG on a machine with an RX 6700 XT, there is a CFI failure in kfd_destroy_mqd_cp():
[ 12.894543] CFI failure at kfd_destroy_mqd_cp+0x2a/0x40 [amdgpu] (target: hqd_destroy_v10_3+0x0/0x260 [amdgpu]; expected type: 0x8594d794)
Clang's kernel Control Flow Integrity (kCFI) makes sure that all indirect call targets have a type that exactly matches the function pointer prototype. In this case, hqd_destroy()'s third parameter, reset_type, should have a type of 'uint32_t' but every implementation of this callback has a third parameter type of 'enum kfd_preempt_type'.
Update the function pointer prototype to match reality so that there is no more CFI violation.
--- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +3 -2
@@ -262,8 +262,9 @@ struct kfd2kgd_calls { uint32_t queue_id);int (*hqd_destroy)(struct amdgpu_device *adev,void *mqd, -uint32_t reset_type,unsigned int timeout, -uint32_t pipe_id,uint32_t queue_id); +enum kfd_preempt_type reset_type, +unsigned int timeout,uint32_t pipe_id, +uint32_t queue_id);bool (*hqd_sdma_is_occupied)(struct amdgpu_device *adev,void *mqd);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 26/34 drm/amdgpu: set vm_update_mode=0 as default for Sienna Cichlid in SRIOV case
In reply to Sasha LevinFrom: Danijel Slivka <[email protected]>
[ Upstream commit 65f8682b9aaae20c2cdee993e6fe52374ad513c9 ]
For asic with VF MMIO access protection avoid using CPU for VM table updates. CPU pagetable updates have issues with HDP flush as VF MMIO access protection blocks write to mmBIF_BX_DEV0_EPF0_VF0_HDP_MEM_COHERENCY_FLUSH_CNTL register during sriov runtime.
v3: introduce virtualization capability flag AMDGPU_VF_MMIO_ACCESS_PROTECT which indicates that VF MMIO write access is not allowed in sriov runtime
--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +6 -0
@@ -726,6 +726,12 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) adev->virt.caps |=AMDGPU_PASSTHROUGH_MODE ; } +if (amdgpu_sriov_vf (adev) && adev->asic_type ==CHIP_SIENNA_CICHLID ) +/* VF MMIO access (except mailbox range) from CPU +* will be blocked during sriov runtime +*/ + adev->virt.caps |=AMDGPU_VF_MMIO_ACCESS_PROTECT ; +/* we have the ability to check now */ if (amdgpu_sriov_vf (adev)) {switch (adev->asic_type) {
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +4 -0
@@ -31,6 +31,7 @@#define AMDGPU_SRIOV_CAPS_IS_VF (1 << 2)/* this GPU is a virtual function */ #define AMDGPU_PASSTHROUGH_MODE (1 << 3)/* thw whole GPU is pass through for VM */ #define AMDGPU_SRIOV_CAPS_RUNTIME (1 << 4)/* is out of full access mode */ +#define AMDGPU_VF_MMIO_ACCESS_PROTECT (1 << 5)/* MMIO write access is not allowed in sriov runtime */ /* flags for indirect register access path supported by rlcg for sriov */ #define AMDGPU_RLCG_GC_WRITE_LEGACY (0x8 << 28)
@@ -294,6 +295,9 @@ struct amdgpu_video_codec_info;#define amdgpu_passthrough (adev) \ ((adev)->virt.caps & AMDGPU_PASSTHROUGH_MODE) +#define amdgpu_sriov_vf_mmio_access_protection (adev) \ +((adev)->virt.caps & AMDGPU_VF_MMIO_ACCESS_PROTECT) +static inline bool is_virtual_machine (void ) {#if defined(CONFIG_X86 )
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +5 -1
@@ -2301,7 +2301,11 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev)*/ #ifdef CONFIG_X86_64 if (amdgpu_vm_update_mode ==-1 ) { -if (amdgpu_gmc_vram_full_visible (&adev->gmc)) +/* For asic with VF MMIO access protection +* avoid using CPU for VM table updates +*/ +if (amdgpu_gmc_vram_full_visible (&adev->gmc) && + !amdgpu_sriov_vf_mmio_access_protection (adev)) adev->vm_manager.vm_update_mode =AMDGPU_VM_USE_CPU_FOR_COMPUTE ;else
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 27/34 drm/amd/pm: skip loading pptable from driver on secure board for smu_v13_0_10
In reply to Sasha LevinFrom: Kenneth Feng <[email protected]>
[ Upstream commit f700486cd1f2bf381671d1c2c7dc9000db10c50e ]
skip loading pptable from driver on secure board since it's loaded from psp.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -1
@@ -210,7 +210,8 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu)return 0 ;if ((adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,7 )) || - (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,0 ))) + (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,0 )) || + (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,10 )))return 0 ;/* override pptable_id from driver parameter */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 29/34 drm/amdgpu: Program GC registers through RLCG interface in gfx_v11/gmc_v11
In reply to Sasha LevinFrom: Yifan Zha <[email protected]>
[ Upstream commit 97a3d6090f5c2a165dc88bda05c1dcf9f08bf886 ]
[Why]
L1 blocks most of GC registers accessing by MMIO.
[How]
Use RLCG interface to program GC registers under SRIOV VF in full access time.
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 18 +++++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c +1 -1
@@ -111,7 +111,7 @@ static int init_interrupts_v11(struct amdgpu_device *adev, uint32_t pipe_id)lock_srbm (adev, mec, pipe,0 ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , regCPC_INT_CNTL), +WREG32_SOC15 (GC ,0 , regCPC_INT_CNTL,CP_INT_CNTL_RING0__TIME_STAMP_INT_ENABLE_MASK |CP_INT_CNTL_RING0__OPCODE_ERROR_INT_ENABLE_MASK );
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +1 -1
@@ -1729,7 +1729,7 @@ static void gfx_v11_0_init_compute_vmid(struct amdgpu_device *adev)WREG32_SOC15 (GC ,0 , regSH_MEM_BASES, sh_mem_bases);/* Enable trap for each kfd vmid. */ - data =RREG32 (SOC15_REG_OFFSET (GC ,0 , regSPI_GDBG_PER_VMID_CNTL)); + data =RREG32_SOC15 (GC ,0 , regSPI_GDBG_PER_VMID_CNTL); data =REG_SET_FIELD (data,SPI_GDBG_PER_VMID_CNTL ,TRAP_EN ,1 ); }soc21_grbm_select (adev,0 ,0 ,0 ,0 );
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +11 -7
@@ -185,6 +185,10 @@ static void gmc_v11_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,/* Use register 17 for GART */ const unsigned eng =17 ;unsigned int i; +unsigned char hub_ip =0 ; + + hub_ip = (vmhub ==AMDGPU_GFXHUB_0 ) ? +GC_HWIP :MMHUB_HWIP ;spin_lock (&adev->gmc.invalidate_lock);/*
@@ -198,8 +202,8 @@ static void gmc_v11_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,if (use_semaphore) {for (i =0 ; i < adev->usec_timeout; i++) {/* a read return value of 1 means semaphore acuqire */ - tmp =RREG32_NO_KIQ (hub->vm_inv_eng0_sem + - hub->eng_distance * eng); + tmp =RREG32_RLC_NO_KIQ (hub->vm_inv_eng0_sem + + hub->eng_distance * eng, hub_ip);if (tmp &0x1 )break ;udelay (1 );
@@ -209,12 +213,12 @@ static void gmc_v11_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,DRM_ERROR ("Timeout waiting for sem acquire in VM flush!\n" ); } -WREG32_NO_KIQ (hub->vm_inv_eng0_req + hub->eng_distance * eng, inv_req); +WREG32_RLC_NO_KIQ (hub->vm_inv_eng0_req + hub->eng_distance * eng, inv_req, hub_ip);/* Wait for ACK with a delay.*/ for (i =0 ; i < adev->usec_timeout; i++) { - tmp =RREG32_NO_KIQ (hub->vm_inv_eng0_ack + - hub->eng_distance * eng); + tmp =RREG32_RLC_NO_KIQ (hub->vm_inv_eng0_ack + + hub->eng_distance * eng, hub_ip); tmp &=1 << vmid;if (tmp)break ;
@@ -228,8 +232,8 @@ static void gmc_v11_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,* add semaphore release after invalidation, * write with 0 means semaphore release */ -WREG32_NO_KIQ (hub->vm_inv_eng0_sem + - hub->eng_distance * eng,0 ); +WREG32_RLC_NO_KIQ (hub->vm_inv_eng0_sem + + hub->eng_distance * eng,0 , hub_ip);/* Issue additional private vm invalidation to MMHUB */ if ((vmhub != AMDGPU_GFXHUB_0) &&
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 30/34 drm/amdgpu: dequeue mes scheduler during fini
In reply to Sasha LevinFrom: YuBiao Wang <[email protected]>
[ Upstream commit 2abe92c7adc9c0397ba51bf74909b85bc0fff84b ]
[Why]
If mes is not dequeued during fini, mes will be in an uncleaned state during reload, then mes couldn't receive some commands which leads to reload failure.
[How]
Perform MES dequeue via MMIO after all the unmap jobs are done by mes and before kiq fini.
v2: Move the dequeue operation inside kiq_hw_fini.
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 42 ++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +39 -3
@@ -1145,6 +1145,42 @@ static int mes_v11_0_sw_fini(void *handle)return 0 ; } +static void mes_v11_0_kiq_dequeue_sched (struct amdgpu_device *adev) +{ +uint32_t data; +int i; + +mutex_lock (&adev->srbm_mutex); +soc21_grbm_select (adev,3 ,AMDGPU_MES_SCHED_PIPE ,0 ,0 ); + +/* disable the queue if it's active */ +if (RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 ) { +WREG32_SOC15 (GC ,0 , regCP_HQD_DEQUEUE_REQUEST,1 ); +for (i =0 ; i < adev->usec_timeout; i++) { +if (!(RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 )) +break ; +udelay (1 ); + } + } + data =RREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL); + data =REG_SET_FIELD (data,CP_HQD_PQ_DOORBELL_CONTROL , +DOORBELL_EN ,0 ); + data =REG_SET_FIELD (data,CP_HQD_PQ_DOORBELL_CONTROL , +DOORBELL_HIT ,1 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL, data); + +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL,0 ); + +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_WPTR_LO,0 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_WPTR_HI,0 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_RPTR,0 ); + +soc21_grbm_select (adev,0 ,0 ,0 ,0 ); +mutex_unlock (&adev->srbm_mutex); + + adev->mes.ring.sched.ready = false; +} +static void mes_v11_0_kiq_setting (struct amdgpu_ring *ring) {uint32_t tmp;
@@ -1196,6 +1232,9 @@ static int mes_v11_0_kiq_hw_init(struct amdgpu_device *adev)static int mes_v11_0_kiq_hw_fini (struct amdgpu_device *adev) { +if (adev->mes.ring.sched.ready) +mes_v11_0_kiq_dequeue_sched (adev); +mes_v11_0_enable (adev, false);return 0 ; }
@@ -1251,9 +1290,6 @@ static int mes_v11_0_hw_init(void *handle)static int mes_v11_0_hw_fini (void *handle) { -struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - adev->mes.ring.sched.ready = false;return 0 ; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 32/34 nvme-hwmon: consistently ignore errors from nvme_hwmon_init
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 6b8cf94005187952f794c0c4ed3920a1e8accfa3 ]
An NVMe controller works perfectly fine even when the hwmon initialization fails. Stop returning errors that do not come from a controller reset from nvme_hwmon_init to handle this case consistently.
--- drivers/nvme/host/core.c | 6 +++++- drivers/nvme/host/hwmon.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/nvme/host/core.c +5 -1
@@ -3256,8 +3256,12 @@ int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl)return ret;if (!ctrl->identified && !nvme_discovery_ctrl (ctrl)) { +/* +* Do not return errors unless we are in a controller reset, +* the controller works perfectly fine without hwmon. +*/ ret =nvme_hwmon_init (ctrl); -if (ret <0 ) +if (ret == -EINTR )return ret; }
drivers/nvme/host/hwmon.c +8 -5
@@ -230,7 +230,7 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl) data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data) -return 0 ; +return -ENOMEM ; data->ctrl = ctrl;mutex_init (&data->read_lock);
@@ -238,8 +238,7 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl) err =nvme_hwmon_get_smart_log (data);if (err) {dev_warn (dev,"Failed to read smart log (error %d)\n" , err); -kfree (data); -return err; + goto err_free_data; } hwmon = hwmon_device_register_with_info(dev, "nvme",
@@ -247,11 +246,15 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl) NULL);if (IS_ERR (hwmon)) {dev_warn (dev,"Failed to instantiate hwmon device\n" ); -kfree (data); -return PTR_ERR (hwmon); + err =PTR_ERR (hwmon); + goto err_free_data; } ctrl->hwmon_device = hwmon;return 0 ; + +err_free_data: +kfree (data); +return err; }void nvme_hwmon_exit (struct nvme_ctrl *ctrl)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 21/34 ACPI: APEI: Fix integer overflow in ghes_estatus_pool_init()
In reply to Sasha LevinFrom: Ashish Kalra <[email protected]>
[ Upstream commit 43d2748394c3feb86c0c771466f5847e274fc043 ]
Change num_ghes from int to unsigned int, preventing an overflow and causing subsequent vmalloc() to fail.
The overflow happens in ghes_estatus_pool_init() when calculating len during execution of the statement below as both multiplication operands here are signed int:
len += (num_ghes * GHES_ESOURCE_PREALLOC_MAX_SIZE);
The following call trace is observed because of this bug:
[ 9.317108] swapper/0: vmalloc error: size 18446744071562596352, exceeds total pages, mode:0xcc0(GFP_KERNEL), nodemask=(null),cpuset=/,mems_allowed=0-1 [ 9.317131] Call Trace: [ 9.317134] <TASK> [ 9.317137] dump_stack_lvl+0x49/0x5f [ 9.317145] dump_stack+0x10/0x12 [ 9.317146] warn_alloc.cold+0x7b/0xdf [ 9.317150] ? __device_attach+0x16a/0x1b0 [ 9.317155] __vmalloc_node_range+0x702/0x740 [ 9.317160] ? device_add+0x17f/0x920 [ 9.317164] ? dev_set_name+0x53/0x70 [ 9.317166] ? platform_device_add+0xf9/0x240 [ 9.317168] __vmalloc_node+0x49/0x50 [ 9.317170] ? ghes_estatus_pool_init+0x43/0xa0 [ 9.317176] vmalloc+0x21/0x30 [ 9.317177] ghes_estatus_pool_init+0x43/0xa0 [ 9.317179] acpi_hest_init+0x129/0x19c [ 9.317185] acpi_init+0x434/0x4a4 [ 9.317188] ? acpi_sleep_proc_init+0x2a/0x2a [ 9.317190] do_one_initcall+0x48/0x200 [ 9.317195] kernel_init_freeable+0x221/0x284 [ 9.317200] ? rest_init+0xe0/0xe0 [ 9.317204] kernel_init+0x1a/0x130 [ 9.317205] ret_from_fork+0x22/0x30 [ 9.317208] </TASK>
--- drivers/acpi/apei/ghes.c | 2 +- include/acpi/ghes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/apei/ghes.c +1 -1
@@ -163,7 +163,7 @@ static void ghes_unmap(void __iomem *vaddr, enum fixed_addresses fixmap_idx)clear_fixmap (fixmap_idx); } -int ghes_estatus_pool_init (int num_ghes) +int ghes_estatus_pool_init (unsigned int num_ghes) {unsigned long addr, len;int rc;
include/acpi/ghes.h +1 -1
@@ -71,7 +71,7 @@ int ghes_register_vendor_record_notifier(struct notifier_block *nb);void ghes_unregister_vendor_record_notifier (struct notifier_block *nb);#endif -int ghes_estatus_pool_init (int num_ghes); +int ghes_estatus_pool_init (unsigned int num_ghes);/* From drivers/edac/ghes_edac.c */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 23/34 io_uring: don't iopoll from io_ring_ctx_wait_and_kill()
In reply to Sasha LevinFrom: Pavel Begunkov <[email protected]>
[ Upstream commit 02bac94bd8efd75f615ac7515dd2def75b43e5b9 ]
We should not be completing requests from a task context that has already undergone io_uring cancellations, i.e. __io_uring_cancel(), as there are some assumptions, e.g. around cached task refs draining. Remove iopolling from io_ring_ctx_wait_and_kill() as it can be called later after PF_EXITING is set with the last task_work run.
--- io_uring/io_uring.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
io_uring/io_uring.c +5 -8
@@ -2653,15 +2653,12 @@ static __cold void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)io_poll_remove_all (ctx,NULL , true);mutex_unlock (&ctx->uring_lock); -/* failed during ring init, it couldn't have issued any requests */ -if (ctx->rings) { +/* +* If we failed setting up the ctx, we might not have any rings +* and therefore did not submit any requests +*/ +if (ctx->rings)io_kill_timeouts (ctx,NULL , true); -/* if we failed setting up the ctx, we might not have any rings */ -io_iopoll_try_reap_events (ctx); -/* drop cached put refs after potentially doing completions */ -if (current->io_uring) -io_uring_drop_tctx_refs (current); - }INIT_WORK (&ctx->exit_work, io_ring_exit_work);/*
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 22/34 hwrng: bcm2835 - use hwrng_msleep() instead of cpu_relax()
In reply to Sasha LevinFrom: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit 96cb9d0554457086664d3bd10630b11193d863f1 ]
Rather than busy looping, yield back to the scheduler and sleep for a bit in the event that there's no data. This should hopefully prevent the stalls that Mark reported:
<6>[ 3.362859] Freeing initrd memory: 16196K <3>[ 23.160131] rcu: INFO: rcu_sched self-detected stall on CPU <3>[ 23.166057] rcu: 0-....: (2099 ticks this GP) idle=03b4/1/0x40000002 softirq=28/28 fqs=1050 <4>[ 23.174895] (t=2101 jiffies g=-1147 q=2353 ncpus=4) <4>[ 23.180203] CPU: 0 PID: 49 Comm: hwrng Not tainted 6.0.0 #1 <4>[ 23.186125] Hardware name: BCM2835 <4>[ 23.189837] PC is at bcm2835_rng_read+0x30/0x6c <4>[ 23.194709] LR is at hwrng_fillfn+0x71/0xf4 <4>[ 23.199218] pc : [<c07ccdc8>] lr : [<c07cb841>] psr: 40000033 <4>[ 23.205840] sp : f093df70 ip : 00000000 fp : 00000000 <4>[ 23.211404] r10: c3c7e800 r9 : 00000000 r8 : c17e6b20 <4>[ 23.216968] r7 : c17e6b64 r6 : c18b0a74 r5 : c07ccd99 r4 : c3f171c0 <4>[ 23.223855] r3 : 000fffff r2 : 00000040 r1 : c3c7e800 r0 : c3f171c0 <4>[ 23.230743] Flags: nZcv IRQs on FIQs on Mode SVC_32 ISA Thumb Segment none <4>[ 23.238426] Control: 50c5387d Table: 0020406a DAC: 00000051 <4>[ 23.244519] CPU: 0 PID: 49 Comm: hwrng Not tainted 6.0.0 #1
--- drivers/char/hw_random/bcm2835-rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/hw_random/bcm2835-rng.c +1 -1
@@ -71,7 +71,7 @@ static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max,while ((rng_readl (priv,RNG_STATUS ) >>24 ) ==0 ) {if (!wait)return 0 ; -cpu_relax (); +hwrng_msleep (rng,1000 ); } num_words =rng_readl (priv,RNG_STATUS ) >>24 ;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 24/34 scsi: core: Restrict legal sdev_state transitions via sysfs
In reply to Sasha LevinFrom: Uday Shankar <[email protected]>
[ Upstream commit 2331ce6126be8864b39490e705286b66e2344aac ]
Userspace can currently write to sysfs to transition sdev_state to RUNNING or OFFLINE from any source state. This causes issues because proper transitioning out of some states involves steps besides just changing sdev_state, so allowing userspace to change sdev_state regardless of the source state can result in inconsistencies; e.g. with ISCSI we can end up with sdev_state == SDEV_RUNNING while the device queue is quiesced. Any task attempting I/O on the device will then hang, and in more recent kernels, iscsid will hang as well.
More detail about this bug is provided in my first attempt:
https://groups.google.com/g/open-iscsi/c/PNKca4HgPDs/m/CXaDkntOAQAJ
--- drivers/scsi/scsi_sysfs.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/scsi/scsi_sysfs.c +8 -0
@@ -828,6 +828,14 @@ store_state_field(struct device *dev, struct device_attribute *attr, }mutex_lock (&sdev->state_mutex); +switch (sdev->sdev_state) { +case SDEV_RUNNING : +case SDEV_OFFLINE : +break ; +default : +mutex_unlock (&sdev->state_mutex); +return -EINVAL ; + }if (sdev->sdev_state ==SDEV_RUNNING && state ==SDEV_RUNNING ) { ret =0 ; }else {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 25/34 HID: saitek: add madcatz variant of MMO7 mouse device ID
In reply to Sasha LevinFrom: Samuel Bailey <[email protected]>
[ Upstream commit 79425b297f56bd481c6e97700a9a4e44c7bcfa35 ]
The MadCatz variant of the MMO7 mouse has the ID 0738:1713 and the same quirks as the Saitek variant.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hid/hid-saitek.c | 2 ++ 3 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -867,6 +867,7 @@#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540#define USB_DEVICE_ID_MADCATZ_RAT5 0x1705#define USB_DEVICE_ID_MADCATZ_RAT9 0x1709 +#define USB_DEVICE_ID_MADCATZ_MMO7 0x1713#define USB_VENDOR_ID_MCC 0x09db#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
drivers/hid/hid-quirks.c +1 -0
@@ -620,6 +620,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) }, { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT5) }, { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_MMO7) }, #endif #if IS_ENABLED(CONFIG_HID_SAMSUNG) { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
drivers/hid/hid-saitek.c +2 -0
@@ -187,6 +187,8 @@ static const struct hid_device_id saitek_devices[] = { .driver_data = SAITEK_RELEASE_MODE_RAT7 }, { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7), .driver_data = SAITEK_RELEASE_MODE_MMO7 }, + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_MMO7), + .driver_data = SAITEK_RELEASE_MODE_MMO7 }, { } };
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 31/34 nvme-pci: disable write zeroes on various Kingston SSD
In reply to Sasha LevinFrom: Xander Li <[email protected]>
[ Upstream commit ac9b57d4e1e3ecf0122e915bbba1bd4c90ec3031 ]
Kingston SSDs do support NVMe Write_Zeroes cmd but take long time to process. The firmware version is locked by these SSDs, we can not expect firmware improvement, so disable Write_Zeroes cmd.
--- drivers/nvme/host/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/nvme/host/pci.c +10 -0
@@ -3508,6 +3508,16 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, { PCI_DEVICE(0x2646, 0x2263), /* KINGSTON A2000 NVMe SSD */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, + { PCI_DEVICE(0x2646, 0x5018), /* KINGSTON OM8SFP4xxxxP OS21012 NVMe SSD */ + .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE(0x2646, 0x5016), /* KINGSTON OM3PGP4xxxxP OS21011 NVMe SSD */ + .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE(0x2646, 0x501A), /* KINGSTON OM8PGP4xxxxP OS21005 NVMe SSD */ + .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE(0x2646, 0x501B), /* KINGSTON OM8PGP4xxxxQ OS21005 NVMe SSD */ + .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE(0x2646, 0x501E), /* KINGSTON OM3PGP4xxxxQ OS21011 NVMe SSD */ + .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, { PCI_DEVICE(0x1e4B, 0x1001), /* MAXIO MAP1001 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e4B, 0x1002), /* MAXIO MAP1002 */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 33/34 i2c: xiic: Add platform module alias
In reply to Sasha LevinFrom: Martin Tůma <[email protected]>
[ Upstream commit b8caf0a0e04583fb71e21495bef84509182227ea ]
The missing "platform" alias is required for the mgb4 v4l2 driver to load the i2c controller driver when probing the HW.
--- drivers/i2c/busses/i2c-xiic.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-xiic.c +1 -0
@@ -920,6 +920,7 @@ static struct platform_driver xiic_i2c_driver = {module_platform_driver (xiic_i2c_driver); +MODULE_ALIAS ("platform:" DRIVER_NAME );MODULE_AUTHOR ("[email protected]" );MODULE_DESCRIPTION ("Xilinx I2C bus driver" );MODULE_LICENSE ("GPL v2" );
Signature · 7 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 34/34 bio: safeguard REQ_ALLOC_CACHE bio put
In reply to Sasha LevinFrom: Pavel Begunkov <[email protected]>
[ Upstream commit d4347d50407daea6237872281ece64c4bdf1ec99 ]
bio_put() with REQ_ALLOC_CACHE assumes that it's executed not from an irq context. Let's add a warning if the invariant is not respected, especially since there is a couple of places removing REQ_POLLED by hand without also clearing REQ_ALLOC_CACHE.
--- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/bio.c +1 -1
@@ -741,7 +741,7 @@ void bio_put(struct bio *bio)return ; } -if (bio->bi_opf &REQ_ALLOC_CACHE ) { +if ((bio->bi_opf &REQ_ALLOC_CACHE ) && !WARN_ON_ONCE (in_interrupt ())) {struct bio_alloc_cache *cache;bio_uninit (bio);
Signature · 1 line
2.35.1
Re: [PATCH AUTOSEL 6.0 15/34] media: atomisp-ov2680: Fix ov2680_set_fmt()
In reply to Sasha LevinHi Sasha,
I have no specific objections against the backporting of this and other atomisp related patches.
But in general the atomisp driver is not yet in a state where it is ready to be used by normal users. Progress is being made but atm I don't really expect normal users to have it enabled / in active use.
As such I'm also not sure if there is much value in backporting atomisp changes to the stable series.
I don't know if you have a way to opt out certain drivers / file-paths from stable series backporting, but if you do you may want to consider opting out everything under:
drivers/staging/media/atomisp/
As said above I don't think doing the backports offers much (if any) value to end users and I assume it does take you some time, so opting this path out might be better.
Also given the fragile state of atomisp support atm it is hard to say for me if partially backporting some of the changes won't break the driver.
Regards,
Hans
Quoted 44 lines · Sasha Levin
From: Hans de Goede <[email protected]>
[ Upstream commit
adea153b4f6537f367fe77abada263fde8a1f7b6]On sets actually store the set (closest) format inside ov2680_device.dev, so that it also properly gets returned by
get_fmt.This fixes the following problem:
1. App does an
VIDIOC_SET_FMT640x480, callingov2680_set_fmt()
2. Internal buffers (atomisp_create_pipes_stream()) get allocated at 640x480 size byatomisp_set_fmt()
3.ov2680_get_fmt()gets called later on and returns 1600x1200 since ov2680_device.dev was not updated. So things get configured to stream at 1600x1200, but the internal buffers created duringatomisp_create_pipes_stream()do not get updated in size
4. streaming starts, internal buffers overflow and the entire machine freezes eventually due to memory being corruptedReviewed-by Andy Shevchenko <[email protected]>Signed-off-by Hans de Goede <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +1
-5@@ -894,11 +894,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,if (v_flag)ov2680_v_flip (sd, v_flag); -/* -* ret = startup(sd); -* if (ret) -* dev_err(&client->dev, "ov2680 startup err\n"); -*/ + dev->res = res; err:mutex_unlock (&dev->input_lock);return ret;
Sasha Levin
maintainerRe: [PATCH AUTOSEL 6.0 15/34] media: atomisp-ov2680: Fix ov2680_set_fmt()
Quoted 19 lines · Hans de Goede
Hi Sasha,
I have no specific objections against the backporting of this and other atomisp related patches.
But in general the atomisp driver is not yet in a state where it is ready to be used by normal users. Progress is being made but atm I don't really expect normal users to have it enabled / in active use.
As such I'm also not sure if there is much value in backporting atomisp changes to the stable series.
I don't know if you have a way to opt out certain drivers / file-paths from stable series backporting, but if you do you may want to consider opting out everything under:
drivers/staging/media/atomisp/
Quoted 7 lines
As said above I don't think doing the backports offers much (if any) value to end users and I assume it does take you some time, so opting this path out might be better.
Also given the fragile state of atomisp support atm it is hard to say for me if partially backporting some of the changes won't break the driver.
I'll blacklist drivers/staging/media/atomisp/, thank you!
Signature · 2 lines
Thanks, Sasha