5.15.33-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 266/913 media: camss: csid-170: fix non-10bit formats
In reply to Greg Kroah-HartmanFrom: Jonathan Marek <[email protected]>
[ Upstream commit 14d510e040f85ff05734fd6db8bae44b47886464 ]
Use the decode_format/data_type from the "format" struct instead of a hardcoded 10-bit format.
--- drivers/media/platform/qcom/camss/camss-csid-170.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-csid-170.c +3 -2
@@ -366,7 +366,7 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) val |= input_format->width &0x1fff << TPG_DT_n_CFG_0_FRAME_WIDTH;writel_relaxed (val, csid->base +CSID_TPG_DT_n_CFG_0 (0 )); - val =DATA_TYPE_RAW_10BIT << TPG_DT_n_CFG_1_DATA_TYPE; + val = format->data_type << TPG_DT_n_CFG_1_DATA_TYPE;writel_relaxed (val, csid->base +CSID_TPG_DT_n_CFG_1 (0 )); val = tg->mode << TPG_DT_n_CFG_2_PAYLOAD_MODE;
@@ -382,8 +382,9 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) val =1 <<RDI_CFG0_BYTE_CNTR_EN ; val |=1 <<RDI_CFG0_FORMAT_MEASURE_EN ; val |=1 <<RDI_CFG0_TIMESTAMP_EN ; +/* note: for non-RDI path, this should be format->decode_format */ val |=DECODE_FORMAT_PAYLOAD_ONLY <<RDI_CFG0_DECODE_FORMAT ; - val |=DATA_TYPE_RAW_10BIT <<RDI_CFG0_DATA_TYPE ; + val |= format->data_type <<RDI_CFG0_DATA_TYPE ; val |= vc <<RDI_CFG0_VIRTUAL_CHANNEL ; val |= dt_id <<RDI_CFG0_DT_ID ;writel_relaxed (val, csid->base +CSID_RDI_CFG0 (0 ));
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 267/913 media: camss: csid-170: dont enable unused irqs
In reply to Greg Kroah-HartmanFrom: Jonathan Marek <[email protected]>
[ Upstream commit a6da362491e409de0978d733441e59db6584d69f ]
csid_isr() only checks for the reset irq, so enabling any other irqs doesn't make sense. The "RDI irq" comment is also wrong, the register should be CSID_CSI2_RDIN_IRQ_MASK. Without this fix there may be an excessive amount of irqs.
--- drivers/media/platform/qcom/camss/camss-csid-170.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/media/platform/qcom/camss/camss-csid-170.c +0 -6
@@ -444,12 +444,6 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) val |=1 <<CSI2_RX_CFG1_MISR_EN ;writel_relaxed (val, csid->base +CSID_CSI2_RX_CFG1 );// csi2_vc_mode_shift_val ? -/* error irqs start at BIT(11) */ -writel_relaxed (~0u , csid->base +CSID_CSI2_RX_IRQ_MASK ); - -/* RDI irq */ -writel_relaxed (~0u , csid->base +CSID_TOP_IRQ_MASK ); - val =1 <<RDI_CTRL_HALT_CMD ;writel_relaxed (val, csid->base +CSID_RDI_CTRL (0 )); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 268/913 media: camss: csid-170: set the right HALT_CMD when disabled
In reply to Greg Kroah-HartmanFrom: Jonathan Marek <[email protected]>
[ Upstream commit ee780cd7be3b5608550bafe7d5f113db2140e99b ]
Use the "HALT_CMD_RESUME_AT_FRAME_BOUNDARY" define instead of a "1" which is otherwise confusing, and add a "HALT_CMD_HALT_AT_FRAME_BOUNDARY" which is set when disabling.
--- drivers/media/platform/qcom/camss/camss-csid-170.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-csid-170.c +6 -2
@@ -105,7 +105,8 @@#define CSID_RDI_CTRL (rdi) ((IS_LITE ? 0x208 : 0x308)\ + 0x100 * (rdi))#define RDI_CTRL_HALT_CMD 0 -#define ALT_CMD_RESUME_AT_FRAME_BOUNDARY 1 +#define HALT_CMD_HALT_AT_FRAME_BOUNDARY 0 +#define HALT_CMD_RESUME_AT_FRAME_BOUNDARY 1#define RDI_CTRL_HALT_MODE 2#define CSID_RDI_FRM_DROP_PATTERN (rdi) ((IS_LITE ? 0x20C : 0x30C)\
@@ -444,7 +445,10 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) val |=1 <<CSI2_RX_CFG1_MISR_EN ;writel_relaxed (val, csid->base +CSID_CSI2_RX_CFG1 );// csi2_vc_mode_shift_val ? - val =1 <<RDI_CTRL_HALT_CMD ; +if (enable) + val =HALT_CMD_RESUME_AT_FRAME_BOUNDARY <<RDI_CTRL_HALT_CMD ; +else + val =HALT_CMD_HALT_AT_FRAME_BOUNDARY <<RDI_CTRL_HALT_CMD ;writel_relaxed (val, csid->base +CSID_RDI_CTRL (0 )); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 269/913 media: camss: vfe-170: fix "VFE halt timeout" error
In reply to Greg Kroah-HartmanFrom: Jonathan Marek <[email protected]>
[ Upstream commit 1ce8c48b06f249a9739e36c5d56883f6f49ce047 ]
This function waits for halt_complete but doesn't do anything to cause it to complete, and always hits the "VFE halt timeout" error. Just delete this code for now.
--- drivers/media/platform/qcom/camss/camss-vfe-170.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe-170.c +1 -11
@@ -399,17 +399,7 @@ static irqreturn_t vfe_isr(int irq, void *dev)*/ static int vfe_halt (struct vfe_device *vfe) { -unsigned long time; - -reinit_completion (&vfe->halt_complete); - - time =wait_for_completion_timeout (&vfe->halt_complete, -msecs_to_jiffies (VFE_HALT_TIMEOUT_MS )); -if (!time) { -dev_err (vfe->camss->dev,"VFE halt timeout\n" ); -return -EIO ; - } - +/* rely on vfe_disable_output() to stop the VFE */ return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 270/913 media: staging: media: imx: imx7-mipi-csis: Make subdev name unique
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 5be7f8c91d25089be847a71b336c13b5bb0db772 ]
When multiple CSIS instances are present in a single graph, they are currently all named "imx7-mipi-csis.0", which breaks the entity name uniqueness requirement. Fix it by using the device name to create the subdev name.
--- drivers/staging/media/imx/imx7-mipi-csis.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/media/imx/imx7-mipi-csis.c +2 -4
@@ -32,7 +32,6 @@#include <media/v4l2-subdev.h> #define CSIS_DRIVER_NAME "imx7-mipi-csis" -#define CSIS_SUBDEV_NAME CSIS_DRIVER_NAME#define CSIS_PAD_SINK 0#define CSIS_PAD_SOURCE 1
@@ -311,7 +310,6 @@ struct csi_state {struct reset_control *mrst;struct regulator *mipi_phy_regulator;const struct mipi_csis_info *info; -u8 index;struct v4l2_subdev sd;struct media_pad pads[CSIS_PADS_NUM ];
@@ -1303,8 +1301,8 @@ static int mipi_csis_subdev_init(struct csi_state *state)v4l2_subdev_init (sd, &mipi_csis_subdev_ops); sd->owner =THIS_MODULE ; -snprintf (sd->name,sizeof (sd->name),"%s.%d" , -CSIS_SUBDEV_NAME , state->index); +snprintf (sd->name,sizeof (sd->name),"csis-%s" , +dev_name (state->dev)); sd->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; sd->ctrl_handler =NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 271/913 media: v4l2-mem2mem: Apply DST_QUEUE_OFF_BASE on MMAP buffers across ioctls
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 8310ca94075e784bbb06593cd6c068ee6b6e4ca6 ]
DST_QUEUE_OFF_BASE is applied to offset/mem_offset on MMAP capture buffers only for the VIDIOC_QUERYBUF ioctl, while the userspace fields (including offset/mem_offset) are filled in for VIDIOC_{QUERY,PREPARE,Q,DQ}BUF ioctls. This leads to differences in the values presented to userspace. If userspace attempts to mmap the capture buffer directly using values from DQBUF, it will fail.
Move the code that applies the magic offset into a helper, and call that helper from all four ioctl entry points.
[hverkuil: drop unnecessary '= 0' in v4l2_m2m_querybuf() for ret]
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 53 ++++++++++++++++++++------ 1 file changed, 41 insertions(+), 12 deletions(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +41 -12
@@ -585,19 +585,14 @@ int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, }EXPORT_SYMBOL_GPL (v4l2_m2m_reqbufs); -int v4l2_m2m_querybuf (struct file *file,struct v4l2_m2m_ctx *m2m_ctx, -struct v4l2_buffer *buf) +static void v4l2_m2m_adjust_mem_offset (struct vb2_queue *vq, +struct v4l2_buffer *buf) { -struct vb2_queue *vq; -int ret =0 ; -unsigned int i; - - vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); - ret =vb2_querybuf (vq, buf); -/* Adjust MMAP memory offsets for the CAPTURE queue */ if (buf->memory ==V4L2_MEMORY_MMAP &&V4L2_TYPE_IS_CAPTURE (vq->type)) {if (V4L2_TYPE_IS_MULTIPLANAR (vq->type)) { +unsigned int i; +for (i =0 ; i < buf->length; ++i) buf->m.planes[i].m.mem_offset +=DST_QUEUE_OFF_BASE ;
@@ -605,8 +600,23 @@ int v4l2_m2m_querybuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, buf->m.offset +=DST_QUEUE_OFF_BASE ; } } +} -return ret; +int v4l2_m2m_querybuf (struct file *file,struct v4l2_m2m_ctx *m2m_ctx, +struct v4l2_buffer *buf) +{ +struct vb2_queue *vq; +int ret; + + vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); + ret =vb2_querybuf (vq, buf); +if (ret) +return ret; + +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); + +return 0 ; }EXPORT_SYMBOL_GPL (v4l2_m2m_querybuf);
@@ -763,6 +773,9 @@ int v4l2_m2m_qbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,if (ret)return ret; +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); +/* * If the capture queue is streaming, but streaming hasn't started * on the device, but was asked to stop, mark the previously queued
@@ -784,9 +797,17 @@ int v4l2_m2m_dqbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct v4l2_buffer *buf) {struct vb2_queue *vq; +int ret; vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); -return vb2_dqbuf (vq, buf, file->f_flags &O_NONBLOCK ); + ret =vb2_dqbuf (vq, buf, file->f_flags &O_NONBLOCK ); +if (ret) +return ret; + +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); + +return 0 ; }EXPORT_SYMBOL_GPL (v4l2_m2m_dqbuf);
@@ -795,9 +816,17 @@ int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, {struct video_device *vdev =video_devdata (file);struct vb2_queue *vq; +int ret; vq =v4l2_m2m_get_vq (m2m_ctx, buf->type); -return vb2_prepare_buf (vq, vdev->v4l2_dev->mdev, buf); + ret =vb2_prepare_buf (vq, vdev->v4l2_dev->mdev, buf); +if (ret) +return ret; + +/* Adjust MMAP memory offsets for the CAPTURE queue */ +v4l2_m2m_adjust_mem_offset (vq, buf); + +return 0 ; }EXPORT_SYMBOL_GPL (v4l2_m2m_prepare_buf);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 272/913 media: mtk-vcodec: potential dereference of null pointer
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit e25a89f743b18c029bfbe5e1663ae0c7190912b0 ]
The return value of devm_kzalloc() needs to be checked. To avoid use of null pointer in case of thefailure of alloc.
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +2 -0
@@ -102,6 +102,8 @@ struct mtk_vcodec_fw *mtk_vcodec_fw_vpu_init(struct mtk_vcodec_dev *dev,vpu_wdt_reg_handler (fw_pdev, mtk_vcodec_vpu_reset_handler, dev, rst_id); fw =devm_kzalloc (&dev->plat_dev->dev,sizeof (*fw),GFP_KERNEL ); +if (!fw) +return ERR_PTR (-ENOMEM ); fw->type =VPU ; fw->ops = &mtk_vcodec_vpu_msg; fw->pdev = fw_pdev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 273/913 media: imx: imx8mq-mipi-csi2: remove wrong irq config write operation
In reply to Greg Kroah-HartmanFrom: Martin Kepplinger <[email protected]>
[ Upstream commit 59c2b6d51803ad6b7af28f2a60a843b24374e692 ]
The place where this register writel() that masks one interrupt is placed does not guarantee that the device is powered so that's not allowed. Moreover imx8mq_mipi_csi_start_stream() masks the interrupt anyway so the write is not even needed. Remove it as this is a mistake that slipped in with the driver.
--- drivers/staging/media/imx/imx8mq-mipi-csi2.c | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/media/imx/imx8mq-mipi-csi2.c +0 -3
@@ -398,9 +398,6 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable)struct csi_state *state =mipi_sd_to_csi2_state (sd);int ret =0 ; -imx8mq_mipi_csi_write (state,CSI2RX_IRQ_MASK , -CSI2RX_IRQ_MASK_ULPS_STATUS_CHANGE ); -if (enable) { ret =pm_runtime_resume_and_get (state->dev);if (ret <0 )
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 274/913 media: imx: imx8mq-mipi_csi2: fix system resume
In reply to Greg Kroah-HartmanFrom: Martin Kepplinger <[email protected]>
[ Upstream commit f0c2ba1ed4ad868331d8c6ea9119669a729b01a9 ]
during system resume, interconnect bandwidth would currently be requested even though the device is runtime suspended. This leaves the system in an unbalanced state.
Fix that by only doing that in runtimem pm and splitting up runtime and system suspend to be a more readable:
imx8mq_mipi_csi_pm_*() does the generic things called from system- and runtime functions that each do specific things on top.
--- drivers/staging/media/imx/imx8mq-mipi-csi2.c | 71 +++++++++++++------- 1 file changed, 47 insertions(+), 24 deletions(-)
drivers/staging/media/imx/imx8mq-mipi-csi2.c +47 -24
@@ -693,7 +693,7 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state)* Suspend/resume */ -static int imx8mq_mipi_csi_pm_suspend (struct device *dev,bool runtime) +static int imx8mq_mipi_csi_pm_suspend (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);
@@ -705,36 +705,21 @@ static int imx8mq_mipi_csi_pm_suspend(struct device *dev, bool runtime)imx8mq_mipi_csi_stop_stream (state);imx8mq_mipi_csi_clk_disable (state); state->state &= ~ST_POWERED ; -if (!runtime) - state->state |=ST_SUSPENDED ; }mutex_unlock (&state->lock); - ret =icc_set_bw (state->icc_path,0 ,0 ); -if (ret) -dev_err (dev,"icc_set_bw failed with %d\n" , ret); -return ret ? -EAGAIN :0 ; } -static int imx8mq_mipi_csi_pm_resume (struct device *dev,bool runtime) +static int imx8mq_mipi_csi_pm_resume (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);int ret =0 ; - ret =icc_set_bw (state->icc_path,0 , state->icc_path_bw); -if (ret) { -dev_err (dev,"icc_set_bw failed with %d\n" , ret); -return ret; - } -mutex_lock (&state->lock); -if (!runtime && !(state->state &ST_SUSPENDED )) - goto unlock; -if (!(state->state &ST_POWERED )) { state->state |=ST_POWERED ; ret =imx8mq_mipi_csi_clk_enable (state);
@@ -755,22 +740,60 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev, bool runtime)static int __maybe_unused imx8mq_mipi_csi_suspend (struct device *dev) { -return imx8mq_mipi_csi_pm_suspend (dev, false); +struct v4l2_subdev *sd =dev_get_drvdata (dev); +struct csi_state *state =mipi_sd_to_csi2_state (sd); +int ret; + + ret =imx8mq_mipi_csi_pm_suspend (dev); +if (ret) +return ret; + + state->state |=ST_SUSPENDED ; + +return ret; }static int __maybe_unused imx8mq_mipi_csi_resume (struct device *dev) { -return imx8mq_mipi_csi_pm_resume (dev, false); +struct v4l2_subdev *sd =dev_get_drvdata (dev); +struct csi_state *state =mipi_sd_to_csi2_state (sd); + +if (!(state->state &ST_SUSPENDED )) +return 0 ; + +return imx8mq_mipi_csi_pm_resume (dev); }static int __maybe_unused imx8mq_mipi_csi_runtime_suspend (struct device *dev) { -return imx8mq_mipi_csi_pm_suspend (dev, true); +struct v4l2_subdev *sd =dev_get_drvdata (dev); +struct csi_state *state =mipi_sd_to_csi2_state (sd); +int ret; + + ret =imx8mq_mipi_csi_pm_suspend (dev); +if (ret) +return ret; + + ret =icc_set_bw (state->icc_path,0 ,0 ); +if (ret) +dev_err (dev,"icc_set_bw failed with %d\n" , ret); + +return ret; }static int __maybe_unused imx8mq_mipi_csi_runtime_resume (struct device *dev) { -return imx8mq_mipi_csi_pm_resume (dev, true); +struct v4l2_subdev *sd =dev_get_drvdata (dev); +struct csi_state *state =mipi_sd_to_csi2_state (sd); +int ret; + + ret =icc_set_bw (state->icc_path,0 , state->icc_path_bw); +if (ret) { +dev_err (dev,"icc_set_bw failed with %d\n" , ret); +return ret; + } + +return imx8mq_mipi_csi_pm_resume (dev); }static const struct dev_pm_ops imx8mq_mipi_csi_pm_ops = {
@@ -918,7 +941,7 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev)/* Enable runtime PM. */ pm_runtime_enable (dev);if (!pm_runtime_enabled (dev)) { - ret =imx8mq_mipi_csi_pm_resume (dev, true); + ret =imx8mq_mipi_csi_runtime_resume (dev);if (ret <0 ) goto icc; }
@@ -931,7 +954,7 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev) cleanup:pm_runtime_disable (&pdev->dev); -imx8mq_mipi_csi_pm_suspend (&pdev->dev, true); +imx8mq_mipi_csi_runtime_suspend (&pdev->dev);media_entity_cleanup (&state->sd.entity);v4l2_async_notifier_unregister (&state->notifier);
@@ -955,7 +978,7 @@ static int imx8mq_mipi_csi_remove(struct platform_device *pdev)v4l2_async_unregister_subdev (&state->sd);pm_runtime_disable (&pdev->dev); -imx8mq_mipi_csi_pm_suspend (&pdev->dev, true); +imx8mq_mipi_csi_runtime_suspend (&pdev->dev);media_entity_cleanup (&state->sd.entity);mutex_destroy (&state->lock);pm_runtime_set_suspended (&pdev->dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 275/913 media: bttv: fix WARNING regression on tunerless devices
In reply to Greg Kroah-HartmanFrom: Ondrej Zary <[email protected]>
[ Upstream commit ef058cc8b7193d15a771272359c7454839ae74ee ]
Commit 2161536516ed ("media: media/pci: set device_caps in struct video_device") introduced a regression: V4L2_CAP_TUNER is always present in device_caps, even when the device has no tuner.
This causes a warning:
WARNING: CPU: 0 PID: 249 at drivers/media/v4l2-core/v4l2-ioctl.c:1102 v4l_querycap+0xa0/0xb0 [videodev]
--- drivers/media/pci/bt8xx/bttv-driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/bt8xx/bttv-driver.c +2 -2
@@ -3890,7 +3890,7 @@ static int bttv_register_video(struct bttv *btv)/* video */ vdev_init (btv, &btv->video_dev, &bttv_video_template,"video" ); - btv->video_dev.device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_TUNER | + btv->video_dev.device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_READWRITE |V4L2_CAP_STREAMING ;if (btv->tuner_type !=TUNER_ABSENT ) btv->video_dev.device_caps |=V4L2_CAP_TUNER ;
@@ -3911,7 +3911,7 @@ static int bttv_register_video(struct bttv *btv)/* vbi */ vdev_init (btv, &btv->vbi_dev, &bttv_video_template,"vbi" ); btv->vbi_dev.device_caps =V4L2_CAP_VBI_CAPTURE |V4L2_CAP_READWRITE | -V4L2_CAP_STREAMING |V4L2_CAP_TUNER ; +V4L2_CAP_STREAMING ;if (btv->tuner_type !=TUNER_ABSENT ) btv->vbi_dev.device_caps |=V4L2_CAP_TUNER ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 276/913 media: atmel: atmel-sama7g5-isc: fix ispck leftover
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 1b52ce99e9f2dcda868a1a7026bfb58d04bd6bc8 ]
The ispck is not used for sama7g5 variant of the ISC. Calls to ispck have to be removed also from module insert/removal.
--- drivers/media/platform/atmel/atmel-sama7g5-isc.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/media/platform/atmel/atmel-sama7g5-isc.c +0 -6
@@ -555,7 +555,6 @@ static int microchip_xisc_remove(struct platform_device *pdev)v4l2_device_unregister (&isc->v4l2_dev); -clk_disable_unprepare (isc->ispck);clk_disable_unprepare (isc->hclock);isc_clk_cleanup (isc);
@@ -567,7 +566,6 @@ static int __maybe_unused xisc_runtime_suspend(struct device *dev) {struct isc_device *isc =dev_get_drvdata (dev); -clk_disable_unprepare (isc->ispck);clk_disable_unprepare (isc->hclock);return 0 ;
@@ -582,10 +580,6 @@ static int __maybe_unused xisc_runtime_resume(struct device *dev)if (ret)return ret; - ret =clk_prepare_enable (isc->ispck); -if (ret) -clk_disable_unprepare (isc->hclock); -return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 277/913 ASoC: sh: rz-ssi: Drop calling rz_ssi_pio_recv() recursively
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 6570f991582e32b7992601d0497c61962a2c5dcc ]
Instead of recursively calling rz_ssi_pio_recv() use a while loop to read the samples from RX fifo.
This also fixes an issue where the return value of rz_ssi_pio_recv() was ignored when called recursively.
--- sound/soc/sh/rz-ssi.c | 68 ++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 33 deletions(-)
sound/soc/sh/rz-ssi.c +35 -33
@@ -411,54 +411,56 @@ static int rz_ssi_pio_recv(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) {struct snd_pcm_substream *substream = strm->substream;struct snd_pcm_runtime *runtime; +bool done = false;u16 *buf;int fifo_samples;int frames_left; -int samples =0 ; +int samples;int i;if (!rz_ssi_stream_is_valid (ssi, strm))return -EINVAL ; runtime = substream->runtime; -/* frames left in this period */ - frames_left = runtime->period_size - (strm->buffer_pos % - runtime->period_size); -if (frames_left ==0 ) - frames_left = runtime->period_size; -/* Samples in RX FIFO */ - fifo_samples = (rz_ssi_reg_readl (ssi,SSIFSR ) >> -SSIFSR_RDC_SHIFT ) &SSIFSR_RDC_MASK ; - -/* Only read full frames at a time */ -while (frames_left && (fifo_samples >= runtime->channels)) { - samples += runtime->channels; - fifo_samples -= runtime->channels; - frames_left--; - } +while (!done) { +/* frames left in this period */ + frames_left = runtime->period_size - + (strm->buffer_pos % runtime->period_size); +if (!frames_left) + frames_left = runtime->period_size; + +/* Samples in RX FIFO */ + fifo_samples = (rz_ssi_reg_readl (ssi,SSIFSR ) >> +SSIFSR_RDC_SHIFT ) &SSIFSR_RDC_MASK ; + +/* Only read full frames at a time */ + samples =0 ; +while (frames_left && (fifo_samples >= runtime->channels)) { + samples += runtime->channels; + fifo_samples -= runtime->channels; + frames_left--; + } -/* not enough samples yet */ -if (samples ==0 ) -return 0 ; +/* not enough samples yet */ +if (!samples) +break ; -/* calculate new buffer index */ - buf = (u16 *)(runtime->dma_area); - buf += strm->buffer_pos * runtime->channels; +/* calculate new buffer index */ + buf = (u16 *)(runtime->dma_area); + buf += strm->buffer_pos * runtime->channels; -/* Note, only supports 16-bit samples */ -for (i =0 ; i < samples; i++) - *buf++ = (u16)(rz_ssi_reg_readl (ssi,SSIFRDR ) >>16 ); +/* Note, only supports 16-bit samples */ +for (i =0 ; i < samples; i++) + *buf++ = (u16)(rz_ssi_reg_readl (ssi,SSIFRDR ) >>16 ); -rz_ssi_reg_mask_setl (ssi,SSIFSR ,SSIFSR_RDF ,0 ); -rz_ssi_pointer_update (strm, samples / runtime->channels); +rz_ssi_reg_mask_setl (ssi,SSIFSR ,SSIFSR_RDF ,0 ); +rz_ssi_pointer_update (strm, samples / runtime->channels); -/* -* If we finished this period, but there are more samples in -* the RX FIFO, call this function again -*/ -if (frames_left ==0 && fifo_samples >= runtime->channels) -rz_ssi_pio_recv (ssi, strm); +/* check if there are no more samples in the RX FIFO */ +if (!(!frames_left && fifo_samples >= runtime->channels)) + done = true; + }return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 278/913 ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit aa505ecccf2ae7546e0e262d574e18a9241f3005 ]
Since the potential failure of the devm_regmap_init_mmio(), it will return error pointer and be assigned to the regmap.
Then the error pointer will be dereferenced.
For example rx->regmap will be used in rx_macro_mclk_enable(). Therefore, it should be better to check it.
--- sound/soc/codecs/lpass-rx-macro.c | 2 ++ sound/soc/codecs/lpass-tx-macro.c | 2 ++ sound/soc/codecs/lpass-wsa-macro.c | 2 ++ 3 files changed, 6 insertions(+)
sound/soc/codecs/lpass-rx-macro.c +2 -0
@@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev)return PTR_ERR (base); rx->regmap =devm_regmap_init_mmio (dev, base, &rx_regmap_config); +if (IS_ERR (rx->regmap)) +return PTR_ERR (rx->regmap);dev_set_drvdata (dev, rx);
sound/soc/codecs/lpass-tx-macro.c +2 -0
@@ -1803,6 +1803,8 @@ static int tx_macro_probe(struct platform_device *pdev)return PTR_ERR (base); tx->regmap =devm_regmap_init_mmio (dev, base, &tx_regmap_config); +if (IS_ERR (tx->regmap)) +return PTR_ERR (tx->regmap);dev_set_drvdata (dev, tx);
sound/soc/codecs/lpass-wsa-macro.c +2 -0
@@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev)return PTR_ERR (base); wsa->regmap =devm_regmap_init_mmio (dev, base, &wsa_regmap_config); +if (IS_ERR (wsa->regmap)) +return PTR_ERR (wsa->regmap);dev_set_drvdata (dev, wsa);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 279/913 ASoC: xilinx: xlnx_formatter_pcm: Handle sysclk setting
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit 1c5091fbe7e0d0804158200b7feac5123f7b4fbd ]
This driver did not set the MM2S Fs Multiplier Register to the proper value for playback streams. This needs to be set to the sample rate to MCLK multiplier, or random stream underflows can occur on the downstream I2S transmitter.
Store the sysclk value provided via the set_sysclk callback and use that in conjunction with the sample rate in the hw_params callback to calculate the proper value to set for this register.
--- sound/soc/xilinx/xlnx_formatter_pcm.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
sound/soc/xilinx/xlnx_formatter_pcm.c +25 -0
@@ -84,6 +84,7 @@ struct xlnx_pcm_drv_data {struct snd_pcm_substream *play_stream;struct snd_pcm_substream *capture_stream;struct clk *axi_clk; +unsigned int sysclk; };/*
@@ -314,6 +315,15 @@ static irqreturn_t xlnx_s2mm_irq_handler(int irq, void *arg)return IRQ_NONE ; } +static int xlnx_formatter_set_sysclk (struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir) +{ +struct xlnx_pcm_drv_data *adata =dev_get_drvdata (component->dev); + + adata->sysclk = freq; +return 0 ; +} +static int xlnx_formatter_pcm_open (struct snd_soc_component *component,struct snd_pcm_substream *substream) {
@@ -450,11 +460,25 @@ static int xlnx_formatter_pcm_hw_params(struct snd_soc_component *component,u64 size;struct snd_pcm_runtime *runtime = substream->runtime;struct xlnx_pcm_stream_param *stream_data = runtime->private_data; +struct xlnx_pcm_drv_data *adata =dev_get_drvdata (component->dev); active_ch =params_channels (params);if (active_ch > stream_data->ch_limit)return -EINVAL ; +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK && + adata->sysclk) { +unsigned int mclk_fs = adata->sysclk /params_rate (params); + +if (adata->sysclk %params_rate (params) !=0 ) { +dev_warn (component->dev,"sysclk %u not divisible by rate %u\n" , + adata->sysclk,params_rate (params)); +return -EINVAL ; + } + +writel (mclk_fs, stream_data->mmio +XLNX_AUD_FS_MULTIPLIER ); + } +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE && stream_data->xfer_mode ==AES_TO_PCM ) { val =readl (stream_data->mmio +XLNX_AUD_STS );
@@ -552,6 +576,7 @@ static int xlnx_formatter_pcm_new(struct snd_soc_component *component,static const struct snd_soc_component_driver xlnx_asoc_component = { .name =DRV_NAME , + .set_sysclk = xlnx_formatter_set_sysclk, .open = xlnx_formatter_pcm_open, .close = xlnx_formatter_pcm_close, .hw_params = xlnx_formatter_pcm_hw_params,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 280/913 ASoC: simple-card-utils: Set sysclk on all components
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit ce2f7b8d4290c22e462e465d1da38a1c113ae66a ]
If an mclk-fs value was provided in the device tree configuration, the calculated MCLK was fed into the downstream codec DAI and CPU DAI, however set_sysclk was not being called on the platform device. Some platform devices such as the Xilinx Audio Formatter need to know the MCLK as well.
Call snd_soc_component_set_sysclk on each component in the stream to set the proper sysclk value in addition to the existing call of snd_soc_dai_set_sysclk on the codec DAI and CPU DAI. This may end up resulting in redundant calls if one of the snd_soc_dai_set_sysclk calls ends up calling snd_soc_component_set_sysclk itself, but that isn't expected to cause any significant harm.
--- sound/soc/generic/simple-card-utils.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
sound/soc/generic/simple-card-utils.c +15 -0
@@ -275,6 +275,7 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream, mclk_fs = props->mclk_fs;if (mclk_fs) { +struct snd_soc_component *component; mclk =params_rate (params) * mclk_fs;for_each_prop_dai_codec (props, i, pdai) {
@@ -282,16 +283,30 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; } +for_each_prop_dai_cpu (props, i, pdai) { ret =asoc_simple_set_clk_rate (pdai, mclk);if (ret <0 )return ret; } + +/* Ensure sysclk is set on all components in case any +* (such as platform components) are missed by calls to +* snd_soc_dai_set_sysclk. +*/ +for_each_rtd_components (rtd, i, component) { + ret =snd_soc_component_set_sysclk (component,0 ,0 , + mclk,SND_SOC_CLOCK_IN ); +if (ret && ret != -ENOTSUPP ) +return ret; + } +for_each_rtd_codec_dais (rtd, i, sdai) { ret =snd_soc_dai_set_sysclk (sdai,0 , mclk,SND_SOC_CLOCK_IN );if (ret && ret != -ENOTSUPP )return ret; } +for_each_rtd_cpu_dais (rtd, i, sdai) { ret =snd_soc_dai_set_sysclk (sdai,0 , mclk,SND_SOC_CLOCK_OUT );if (ret && ret != -ENOTSUPP )
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 281/913 media: coda: Fix missing put_device() call in coda_get_vdoa_data
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ca85d271531a1e1c86f24b892f57b7d0a3ddb5a6 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/media/platform/coda/coda-common.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/coda/coda-common.c +1 -0
@@ -408,6 +408,7 @@ static struct vdoa_data *coda_get_vdoa_data(void)if (!vdoa_data) vdoa_data =ERR_PTR (-EPROBE_DEFER ); +put_device (&vdoa_pdev->dev); out:of_node_put (vdoa_node);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 282/913 media: meson: vdec: potential dereference of null pointer
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit c8c80c996182239ff9b05eda4db50184cf3b2e99 ]
As the possible failure of the kzalloc(), the 'new_ts' could be NULL pointer.
Therefore, it should be better to check it in order to avoid the dereference of the NULL pointer.
Also, the caller esparser_queue() needs to deal with the return value of the amvdec_add_ts().
--- drivers/staging/media/meson/vdec/esparser.c | 7 ++++++- drivers/staging/media/meson/vdec/vdec_helpers.c | 8 ++++++-- drivers/staging/media/meson/vdec/vdec_helpers.h | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-)
drivers/staging/media/meson/vdec/esparser.c +6 -1
@@ -328,7 +328,12 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) offset =esparser_get_offset (sess); -amvdec_add_ts (sess, vb->timestamp, vbuf->timecode, offset, vbuf->flags); + ret =amvdec_add_ts (sess, vb->timestamp, vbuf->timecode, offset, vbuf->flags); +if (ret) { +v4l2_m2m_buf_done (vbuf,VB2_BUF_STATE_ERROR ); +return ret; + } +dev_dbg (core->dev,"esparser: ts = %llu pld_size = %u offset = %08X flags = %08X\n" , vb->timestamp, payload_size, offset, vbuf->flags);
drivers/staging/media/meson/vdec/vdec_helpers.c +6 -2
@@ -227,13 +227,16 @@ int amvdec_set_canvases(struct amvdec_session *sess, }EXPORT_SYMBOL_GPL (amvdec_set_canvases); -void amvdec_add_ts (struct amvdec_session *sess,u64 ts, -struct v4l2_timecode tc,u32 offset,u32 vbuf_flags) +int amvdec_add_ts (struct amvdec_session *sess,u64 ts, +struct v4l2_timecode tc,u32 offset,u32 vbuf_flags) {struct amvdec_timestamp *new_ts;unsigned long flags; new_ts =kzalloc (sizeof (*new_ts),GFP_KERNEL ); +if (!new_ts) +return -ENOMEM ; + new_ts->ts = ts; new_ts->tc = tc; new_ts->offset = offset;
@@ -242,6 +245,7 @@ void amvdec_add_ts(struct amvdec_session *sess, u64 ts,spin_lock_irqsave (&sess->ts_spinlock, flags);list_add_tail (&new_ts->list, &sess->timestamps);spin_unlock_irqrestore (&sess->ts_spinlock, flags); +return 0 ; }EXPORT_SYMBOL_GPL (amvdec_add_ts);
drivers/staging/media/meson/vdec/vdec_helpers.h +2 -2
@@ -55,8 +55,8 @@ void amvdec_dst_buf_done_offset(struct amvdec_session *sess,* @offset: offset in the VIFIFO where the associated packet was written * @flags the vb2_v4l2_buffer flags */ -void amvdec_add_ts (struct amvdec_session *sess,u64 ts, -struct v4l2_timecode tc,u32 offset,u32 flags); +int amvdec_add_ts (struct amvdec_session *sess,u64 ts, +struct v4l2_timecode tc,u32 offset,u32 flags);void amvdec_remove_ts (struct amvdec_session *sess,u64 ts);/**
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 283/913 media: hantro: Fix overfill bottom register field name
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 89d78e0133e71ba324fb67ca776223fba4353418 ]
The Hantro H1 hardware can crop off pixels from the right and bottom of the source frame. These are controlled with the H1_REG_IN_IMG_CTRL_OVRFLB and H1_REG_IN_IMG_CTRL_OVRFLR in the H1_REG_IN_IMG_CTRL register.
The ChromeOS kernel driver that this was based on incorrectly added the _D4 suffix H1_REG_IN_IMG_CTRL_OVRFLB. This field crops the bottom of the input frame, and the number is _not_ divided by 4. [1]
Correct the name to avoid confusion when crop support with the selection API is added.
[1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/ \ heads/chromeos-4.19/drivers/staging/media/hantro/hantro_h1_vp8_enc.c#377
--- drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 2 +- drivers/staging/media/hantro/hantro_h1_regs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c +1 -1
@@ -23,7 +23,7 @@ static void hantro_h1_set_src_img_ctrl(struct hantro_dev *vpu, reg =H1_REG_IN_IMG_CTRL_ROW_LEN (pix_fmt->width) |H1_REG_IN_IMG_CTRL_OVRFLR_D4 (0 ) - |H1_REG_IN_IMG_CTRL_OVRFLB_D4 (0 ) + |H1_REG_IN_IMG_CTRL_OVRFLB (0 ) |H1_REG_IN_IMG_CTRL_FMT (ctx->vpu_src_fmt->enc_fmt);vepu_write_relaxed (vpu, reg,H1_REG_IN_IMG_CTRL ); }
drivers/staging/media/hantro/hantro_h1_regs.h +1 -1
@@ -47,7 +47,7 @@#define H1_REG_IN_IMG_CTRL 0x03c#define H1_REG_IN_IMG_CTRL_ROW_LEN (x) ((x) << 12)#define H1_REG_IN_IMG_CTRL_OVRFLR_D4 (x) ((x) << 10) -#define H1_REG_IN_IMG_CTRL_OVRFLB_D4 (x) ((x) << 6) +#define H1_REG_IN_IMG_CTRL_OVRFLB (x) ((x) << 6)#define H1_REG_IN_IMG_CTRL_FMT (x) ((x) << 2)#define H1_REG_ENC_CTRL0 0x040#define H1_REG_ENC_CTRL0_INIT_QP (x) ((x) << 26)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 284/913 media: ov6650: Fix set format try processing path
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 1f6f1e959a85ee999fbc86f4b094827f63194c7f ]
According to subdevice interface specification found in V4L2 API documentation, set format pad operations should not affect image geometry set in preceding image processing steps. Unfortunately, that requirement is not respected by the driver implementation of set format as it was not the case when that code was still implementing a pair of now obsolete .s_mbus_fmt() / .try_mbus_fmt() video operations before they have been merged and reused as an implementation of .set_fmt() pad operation by commit 717fd5b4907a ("[media] v4l2: replace try_mbus_fmt by set_fmt").
In case of set format active processing path the issue can be fixed easily by excluding a call to set active selection from that path. That will effectively limit frame size processing to optimal frame scaling against active crop rectangle without touching it. Users can just call set active selection themselves to obtain desired frame size. However, set format try processing path needs more work.
First of all, the driver should be extended with set try selection support. Lack of it constraints video device drivers to not use subdevice cropping at all while processing user requested active frame size, otherwise their set try format results might differ from active.
Next, set format try processing path should use pad config crop rectangle as a reference, not the active one as it does now. That issue can be resolved easily as soon as set try selection support is added to the driver so pad config crop rectangle can be maintained by users via selection API.
Last, set format try processing path should give the same results as active in respect to active vs. pad config crop rectangle geometry. Both rectangles should be either not touched by set format (that's what we are going to achieve) or modified the same way, otherwise users won't be able to obtain equal results from both paths while iterating through set format and set selection operations in order to obtain desired frame size.
We can't begin with modifying set format pad operation as not to touch crop rectangle since that depends on availability of set try selection for symmetry. Neither can we begin with adding set try selection since that in turn depends on equal handling of active and pad config crop rectangles by set format. We can either implement all required modifications in a single patch, or begin with fixing current set format try processing path to appropriately handle pad config crop rectangle. This patch implements the latter approach as believed to be more readable.
Move crop rectangle adjustments code from a helper (the former implementation of .s_fmt(), now called from set format active processing path) to the body of set format pad operation function where it can be also used for processing try requests for symmetry with active ones. As the helper no longer processes frame geometry, only frame format and half scaling, simplify its API accordingly and update its users.
Moreover, extract code that applies crop rectangle hardware limits (now a part of .set_selection() operation which is called from set format active processing path) to a new helper and call that helper from set format try processing path as well for symmetry with active.
[Sakari Ailus: Rebase on subdev state patches]
--- drivers/media/i2c/ov6650.c | 83 ++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 35 deletions(-)
drivers/media/i2c/ov6650.c +48 -35
@@ -491,6 +491,17 @@ static int ov6650_get_selection(struct v4l2_subdev *sd, } } +static void ov6650_bind_align_crop_rectangle (struct v4l2_rect *rect) +{ +v4l_bound_align_image (&rect->width,2 ,W_CIF ,1 , + &rect->height,2 ,H_CIF ,1 ,0 ); +v4l_bound_align_image (&rect->left,DEF_HSTRT <<1 , + (DEF_HSTRT <<1 ) +W_CIF - (__s32 )rect->width,1 , + &rect->top,DEF_VSTRT <<1 , + (DEF_VSTRT <<1 ) +H_CIF - (__s32 )rect->height, +1 ,0 ); +} +static int ov6650_set_selection (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state,struct v4l2_subdev_selection *sel)
@@ -503,13 +514,7 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, sel->target != V4L2_SEL_TGT_CROP)return -EINVAL ; -v4l_bound_align_image (&sel->r.width,2 ,W_CIF ,1 , - &sel->r.height,2 ,H_CIF ,1 ,0 ); -v4l_bound_align_image (&sel->r.left,DEF_HSTRT <<1 , - (DEF_HSTRT <<1 ) +W_CIF - (__s32 )sel->r.width,1 , - &sel->r.top,DEF_VSTRT <<1 , - (DEF_VSTRT <<1 ) +H_CIF - (__s32 )sel->r.height, -1 ,0 ); +ov6650_bind_align_crop_rectangle (&sel->r); ret =ov6650_reg_write (client,REG_HSTRT , sel->r.left >>1 );if (!ret) {
@@ -570,22 +575,10 @@ static bool is_unscaled_ok(int width, int height, struct v4l2_rect *rect)#define to_clkrc (div) ((div) - 1)/* set the format we will capture in */ -static int ov6650_s_fmt (struct v4l2_subdev *sd,struct v4l2_mbus_framefmt *mf) +static int ov6650_s_fmt (struct v4l2_subdev *sd,u32 code,bool half_scale) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -bool half_scale = !is_unscaled_ok (mf->width, mf->height, &priv->rect); -struct v4l2_subdev_selection sel = { - .which =V4L2_SUBDEV_FORMAT_ACTIVE , - .target =V4L2_SEL_TGT_CROP , - .r.left = priv->rect.left + (priv->rect.width >>1 ) - - (mf->width >> (1 - half_scale)), - .r.top = priv->rect.top + (priv->rect.height >>1 ) - - (mf->height >> (1 - half_scale)), - .r.width = mf->width << half_scale, - .r.height = mf->height << half_scale, - }; -u32 code = mf->code;u8 coma_set =0 , coma_mask =0 , coml_set, coml_mask;int ret;
@@ -653,9 +646,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) coma_mask |=COMA_QCIF ; } - ret =ov6650_set_selection (sd,NULL , &sel); -if (!ret) - ret =ov6650_reg_rmw (client,REG_COMA , coma_set, coma_mask); + ret =ov6650_reg_rmw (client,REG_COMA , coma_set, coma_mask);if (!ret) { priv->half_scale = half_scale;
@@ -674,14 +665,16 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,struct v4l2_mbus_framefmt *mf = &format->format;struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); +struct v4l2_subdev_selection sel = { + .which =V4L2_SUBDEV_FORMAT_ACTIVE , + .target =V4L2_SEL_TGT_CROP , + }; +struct v4l2_rect *crop = &sel.r; +bool half_scale;if (format->pad)return -EINVAL ; -if (is_unscaled_ok (mf->width, mf->height, &priv->rect)) -v4l_bound_align_image (&mf->width,2 ,W_CIF ,1 , - &mf->height,2 ,H_CIF ,1 ,0 ); -switch (mf->code) {case MEDIA_BUS_FMT_Y10_1X10 : mf->code =MEDIA_BUS_FMT_Y8_1X8 ;
@@ -699,10 +692,24 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,break ; } + *crop = priv->rect; + half_scale = !is_unscaled_ok (mf->width, mf->height, crop); + +/* adjust new crop rectangle position against its current center */ + crop->left += (crop->width - (mf->width << half_scale)) /2 ; + crop->top += (crop->height - (mf->height << half_scale)) /2 ; +/* adjust new crop rectangle size */ + crop->width = mf->width << half_scale; + crop->height = mf->height << half_scale; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { -/* store media bus format code and frame size in pad config */ - sd_state->pads->try_fmt.width = mf->width; - sd_state->pads->try_fmt.height = mf->height; +/* store new crop rectangle, hadware bound, in pad config */ +ov6650_bind_align_crop_rectangle (crop); + sd_state->pads->try_crop = *crop; + +/* store new mbus frame format code and size in pad config */ + sd_state->pads->try_fmt.width = crop->width >> half_scale; + sd_state->pads->try_fmt.height = crop->height >> half_scale; sd_state->pads->try_fmt.code = mf->code;/* return default mbus frame format updated with pad config */
@@ -712,9 +719,16 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd, mf->code = sd_state->pads->try_fmt.code; }else { -/* apply new media bus format code and frame size */ -int ret =ov6650_s_fmt (sd, mf); +int ret; +/* apply new crop rectangle */ + ret =ov6650_set_selection (sd,NULL , &sel); +if (ret) +return ret; + +/* apply new media bus frame format and scaling if changed */ +if (mf->code != priv->code || half_scale != priv->half_scale) + ret =ov6650_s_fmt (sd, mf->code, half_scale);if (ret)return ret;
@@ -890,9 +904,8 @@ static int ov6650_video_probe(struct v4l2_subdev *sd)if (!ret) ret =ov6650_prog_dflt (client, xclk->clkrc);if (!ret) { -struct v4l2_mbus_framefmt mf = ov6650_def_fmt; - - ret =ov6650_s_fmt (sd, &mf); +/* driver default frame format, no scaling */ + ret =ov6650_s_fmt (sd, ov6650_def_fmt.code, false); }if (!ret) ret =v4l2_ctrl_handler_setup (&priv->hdl);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 285/913 media: v4l: Avoid unaligned access warnings when printing 4cc modifiers
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit 24bb30c8c894ec7213ad810b46e2a6a4c12136c1 ]
Pointers V4L2 pixelformat and dataformat fields in a few packed structs are directly passed to printk family of functions. This could result in an unaligned access albeit no such possibility appears to exist at the moment i.e. this clang warning appears to be a false positive.
Address the warning by copying the pixelformat or dataformat value to a local variable first.
--- drivers/media/v4l2-core/v4l2-ioctl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/media/v4l2-core/v4l2-ioctl.c +7 -5
@@ -279,8 +279,8 @@ static void v4l_print_format(const void *arg, bool write_only)const struct v4l2_vbi_format *vbi;const struct v4l2_sliced_vbi_format *sliced;const struct v4l2_window *win; -const struct v4l2_sdr_format *sdr;const struct v4l2_meta_format *meta; +u32 pixelformat;u32 planes;unsigned i;
@@ -299,8 +299,9 @@ static void v4l_print_format(const void *arg, bool write_only)case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE : mp = &p->fmt.pix_mp; + pixelformat = mp->pixelformat;pr_cont (", width=%u, height=%u, format=%p4cc, field=%s, colorspace=%d, num_planes=%u, flags=0x%x, ycbcr_enc=%u, quantization=%u, xfer_func=%u\n" , - mp->width, mp->height, &mp->pixelformat, + mp->width, mp->height, &pixelformat,prt_names (mp->field, v4l2_field_names), mp->colorspace, mp->num_planes, mp->flags, mp->ycbcr_enc, mp->quantization, mp->xfer_func);
@@ -343,14 +344,15 @@ static void v4l_print_format(const void *arg, bool write_only)break ;case V4L2_BUF_TYPE_SDR_CAPTURE :case V4L2_BUF_TYPE_SDR_OUTPUT : - sdr = &p->fmt.sdr; -pr_cont (", pixelformat=%p4cc\n" , &sdr->pixelformat); + pixelformat = p->fmt.sdr.pixelformat; +pr_cont (", pixelformat=%p4cc\n" , &pixelformat);break ;case V4L2_BUF_TYPE_META_CAPTURE :case V4L2_BUF_TYPE_META_OUTPUT : meta = &p->fmt.meta; + pixelformat = meta->dataformat;pr_cont (", dataformat=%p4cc, buffersize=%u\n" , - &meta->dataformat, meta->buffersize); + &pixelformat, meta->buffersize);break ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 286/913 media: ov5648: Dont pack controls struct
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit edd4fbff5378a8103470304809195dc8f4b1d42a ]
Don't pack the driver specific struct containing control pointers. This lead to potential alignment issues when working with the pointers.
--- drivers/media/i2c/ov5648.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov5648.c +1 -1
@@ -639,7 +639,7 @@ struct ov5648_ctrls {struct v4l2_ctrl *pixel_rate;struct v4l2_ctrl_handler handler; -} __packed; +};struct ov5648_sensor {struct device *dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 287/913 media: aspeed: Correct value for h-total-pixels
In reply to Greg Kroah-HartmanFrom: Jammy Huang <[email protected]>
[ Upstream commit 4b732a0016853eaff35944f900b0db66f3914374 ]
Previous reg-field, 0x98[11:0], stands for the period of the detected hsync signal.
Use the correct reg, 0xa0, to get h-total in pixels.
--- drivers/media/platform/aspeed-video.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/platform/aspeed-video.c +6 -3
@@ -151,7 +151,7 @@#define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF)#define VE_MODE_DETECT_STATUS 0x098 -#define VE_MODE_DETECT_H_PIXELS GENMASK(11, 0) +#define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0)#define VE_MODE_DETECT_V_LINES_SHF 16#define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF)#define VE_MODE_DETECT_STATUS_VSYNC BIT(28)
@@ -162,6 +162,8 @@#define VE_SYNC_STATUS_VSYNC_SHF 16#define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF) +#define VE_H_TOTAL_PIXELS 0x0A0 +#define VE_INTERRUPT_CTRL 0x304#define VE_INTERRUPT_STATUS 0x308#define VE_INTERRUPT_MODE_DETECT_WD BIT(0)
@@ -765,6 +767,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)u32 src_lr_edge;u32 src_tb_edge;u32 sync; +u32 htotal;struct v4l2_bt_timings *det = &video->detected_timings; det->width =MIN_WIDTH ;
@@ -809,6 +812,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge =aspeed_video_read (video,VE_SRC_TB_EDGE_DET ); mds =aspeed_video_read (video,VE_MODE_DETECT_STATUS ); sync =aspeed_video_read (video,VE_SYNC_STATUS ); + htotal =aspeed_video_read (video,VE_H_TOTAL_PIXELS ); video->frame_bottom = (src_tb_edge &VE_SRC_TB_EDGE_DET_BOT ) >>VE_SRC_TB_EDGE_DET_BOT_SHF ;
@@ -825,8 +829,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)VE_SRC_LR_EDGE_DET_RT_SHF ; video->frame_left = src_lr_edge &VE_SRC_LR_EDGE_DET_LEFT ; det->hfrontporch = video->frame_left; - det->hbackporch = (mds &VE_MODE_DETECT_H_PIXELS ) - - video->frame_right; + det->hbackporch = htotal - video->frame_right; det->hsync = sync &VE_SYNC_STATUS_HSYNC ;if (video->frame_left > video->frame_right)continue ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 288/913 video: fbdev: matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid black screen
In reply to Greg Kroah-HartmanFrom: Z. Liu <[email protected]>
[ Upstream commit 62d89a7d49afe46e6b9bbe9e23b004ad848dbde4 ]
Start from commit 11be60bd66d54 "matroxfb: add Matrox MGA-G200eW board support", when maxvram is 0x800000, monitor become black w/ error message
said: "The current input timing is not supported by the monitor display. Please change your input timing to 1920x1080@60Hz ...".
--- drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/matrox/matroxfb_base.c +1 -1
@@ -1377,7 +1377,7 @@ static struct video_board vbG200 = { .lowlevel = &matrox_G100 };static struct video_board vbG200eW = { - .maxvram =0x800000 , + .maxvram =0x100000 , .maxdisplayable =0x800000 , .accelID =FB_ACCEL_MATROX_MGAG200 , .lowlevel = &matrox_G100
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 289/913 video: fbdev: controlfb: Fix COMPILE_TEST build
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 567e44fb51b4f909ae58038a7301352eecea8426 ]
If PPC_BOOK3S, PPC_PMAC and PPC32 is n, COMPILE_TEST build fails:
drivers/video/fbdev/controlfb.c:70:0: error: "pgprot_cached_wthru" redefined [-Werror]
#define pgprot_cached_wthru(prot) (prot)
In file included from ./arch/powerpc/include/asm/pgtable.h:20:0,
from ./include/linux/pgtable.h:6,
from ./include/linux/mm.h:33,
from drivers/video/fbdev/controlfb.c:37:./arch/powerpc/include/asm/nohash/pgtable.h:243:0: note: this is the location of the previous definition
#define pgprot_cached_wthru(prot) (__pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) | \
--- drivers/video/fbdev/controlfb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/controlfb.c +2 -0
@@ -67,7 +67,9 @@#define out_8 (addr, val) (void)(val)#define in_le32 (addr) 0#define out_le32 (addr, val) (void)(val) +#ifndef pgprot_cached_wthru#define pgprot_cached_wthru (prot) (prot) +#endif #else static void invalid_vram_cache (void __force *addr) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 290/913 video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 1791f487f877a9e83d81c8677bd3e7b259e7cb27 ]
I got a null-ptr-deref report:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:fb_destroy_modelist+0x38/0x100 ... Call Trace: ufx_usb_probe.cold+0x2b5/0xac1 [smscufx] usb_probe_interface+0x1aa/0x3c0 [usbcore] really_probe+0x167/0x460
...
ret_from_fork+0x1f/0x30
If fb_alloc_cmap() fails in ufx_usb_probe(), fb_destroy_modelist() will be called to destroy modelist in the error handling path. But modelist has not been initialized yet, so it will result in null-ptr-deref.
Initialize modelist before calling fb_alloc_cmap() to fix this bug.
--- drivers/video/fbdev/smscufx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/smscufx.c +1 -2
@@ -1656,6 +1656,7 @@ static int ufx_usb_probe(struct usb_interface *interface, info->par = dev; info->pseudo_palette = dev->pseudo_palette; info->fbops = &ufx_ops; +INIT_LIST_HEAD (&info->modelist); retval =fb_alloc_cmap (&info->cmap,256 ,0 );if (retval <0 ) {
@@ -1666,8 +1667,6 @@ static int ufx_usb_probe(struct usb_interface *interface,INIT_DELAYED_WORK (&dev->free_framebuffer_work, ufx_free_framebuffer_work); -INIT_LIST_HEAD (&info->modelist); - retval =ufx_reg_read (dev,0x3000 , &id_rev);check_warn_goto_error (retval,"error %d reading 0x3000 register from device" , retval);dev_dbg (dev->gdev,"ID_REV register value 0x%08x" , id_rev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 291/913 video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit fee5c1e4b789e41719af9fee0e2dd397cd31988f ]
If "sinfo->config" is not found, then return -ENODEV. Don't return success.
--- drivers/video/fbdev/atmel_lcdfb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/video/fbdev/atmel_lcdfb.c +6 -5
@@ -1062,15 +1062,16 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)INIT_LIST_HEAD (&info->modelist); -if (pdev->dev.of_node) { - ret =atmel_lcdfb_of_init (sinfo); -if (ret) - goto free_info; - }else { +if (!pdev->dev.of_node) {dev_err (dev,"cannot get default configuration\n" ); goto free_info; } + ret =atmel_lcdfb_of_init (sinfo); +if (ret) + goto free_info; + + ret = -ENODEV ;if (!sinfo->config) goto free_info;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 292/913 video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 78482af095abd9f4f29f1aa3fe575d25c6ae3028 ]
This code has two bugs:
1) "cnt" is 255 but the size of the buffer is 256 so the last byte is not used.
2) If we try to print more than 255 characters then "cnt" will be negative and that will trigger a WARN() in snprintf(). The fix for this is to use scnprintf() instead of snprintf().
We can re-write this code to be cleaner:
1) Rename "offset" to "off" because that's shorter.
2) Get rid of the "cnt" variable and just use "size - off" directly.
3) Get rid of the "read" variable and just increment "off" directly.
--- drivers/video/fbdev/core/fbcvt.c | 53 +++++++++++++------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/video/fbdev/core/fbcvt.c +21 -32
@@ -214,9 +214,11 @@ static u32 fb_cvt_aspect_ratio(struct fb_cvt_data *cvt)static void fb_cvt_print_name (struct fb_cvt_data *cvt) {u32 pixcount, pixcount_mod; -int cnt =255 , offset =0 , read =0 ; -u8 *buf =kzalloc (256 ,GFP_KERNEL ); +int size =256 ; +int off =0 ; +u8 *buf; + buf =kzalloc (size,GFP_KERNEL );if (!buf)return ;
@@ -224,43 +226,30 @@ static void fb_cvt_print_name(struct fb_cvt_data *cvt) pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) %1000000 ; pixcount_mod /=1000 ; - read =snprintf (buf+offset, cnt,"fbcvt: %dx%d@%d: CVT Name - " , - cvt->xres, cvt->yres, cvt->refresh); - offset += read; - cnt -= read; + off +=scnprintf (buf + off, size - off,"fbcvt: %dx%d@%d: CVT Name - " , + cvt->xres, cvt->yres, cvt->refresh); -if (cvt->status) -snprintf (buf+offset, cnt,"Not a CVT standard - %d.%03d Mega " -"Pixel Image\n" , pixcount, pixcount_mod); -else { -if (pixcount) { - read =snprintf (buf+offset, cnt,"%d" , pixcount); - cnt -= read; - offset += read; - } +if (cvt->status) { + off +=scnprintf (buf + off, size - off, +"Not a CVT standard - %d.%03d Mega Pixel Image\n" , + pixcount, pixcount_mod); + }else { +if (pixcount) + off +=scnprintf (buf + off, size - off,"%d" , pixcount); - read =snprintf (buf+offset, cnt,".%03dM" , pixcount_mod); - cnt -= read; - offset += read; + off +=scnprintf (buf + off, size - off,".%03dM" , pixcount_mod);if (cvt->aspect_ratio ==0 ) - read =snprintf (buf+offset, cnt,"3" ); + off +=scnprintf (buf + off, size - off,"3" );else if (cvt->aspect_ratio ==3 ) - read =snprintf (buf+offset, cnt,"4" ); + off +=scnprintf (buf + off, size - off,"4" );else if (cvt->aspect_ratio ==1 || cvt->aspect_ratio ==4 ) - read =snprintf (buf+offset, cnt,"9" ); + off +=scnprintf (buf + off, size - off,"9" );else if (cvt->aspect_ratio ==2 ) - read =snprintf (buf+offset, cnt,"A" ); -else - read =0 ; - cnt -= read; - offset += read; - -if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) { - read =snprintf (buf+offset, cnt,"-R" ); - cnt -= read; - offset += read; - } + off +=scnprintf (buf + off, size - off,"A" ); + +if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) + off +=scnprintf (buf + off, size - off,"-R" ); }printk (KERN_INFO "%s\n" , buf);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 293/913 ARM: dts: Fix OpenBMC flash layout label addresses
In reply to Greg Kroah-HartmanFrom: Zev Weiss <[email protected]>
[ Upstream commit e011df3579ac980d840db8e8c3b9431f88ebddab ]
We've ended up with some inconsistencies between the addresses in the DT node labels and the actual offsets of the partitions; this brings them back in sync.
--- arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 2 +- arch/arm/boot/dts/openbmc-flash-layout.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/openbmc-flash-layout-64.dtsi +1 -1
@@ -28,7 +28,7 @@ partitions { label = "rofs"; }; - rwfs@6000000 { + rwfs@2a00000 { reg = <0x2a00000 0x1600000>; // 22MB label = "rwfs"; };
arch/arm/boot/dts/openbmc-flash-layout.dtsi +1 -1
@@ -20,7 +20,7 @@ partitions { label = "kernel"; }; - rofs@c0000 { + rofs@4c0000 { reg = <0x4c0000 0x1740000>; label = "rofs"; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 294/913 firmware: qcom: scm: Remove reassignment to desc following initializer
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit 7823e5aa5d1dd9ed5849923c165eb8f29ad23c54 ]
Member assignments to qcom_scm_desc were moved into struct initializers in 57d3b816718c ("firmware: qcom_scm: Remove thin wrappers") including the case in qcom_scm_iommu_secure_ptbl_init, except that the - now duplicate - assignment to desc was left in place. While not harmful, remove this unnecessary extra reassignment.
--- drivers/firmware/qcom_scm.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/firmware/qcom_scm.c +0 -6
@@ -749,12 +749,6 @@ int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) };int ret; - desc.args[0 ] = addr; - desc.args[1 ] = size; - desc.args[2 ] = spare; - desc.arginfo =QCOM_SCM_ARGS (3 ,QCOM_SCM_RW ,QCOM_SCM_VAL , -QCOM_SCM_VAL ); - ret =qcom_scm_call (__scm->dev, &desc,NULL );/* the pg table has been initialized already, ignore the error */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 295/913 ARM: dts: qcom: ipq4019: fix sleep clock
In reply to Greg Kroah-HartmanFrom: Pavel Kubelun <[email protected]>
[ Upstream commit 3d7e7980993d2c1ae42d3d314040fc2de6a9c45f ]
It seems like sleep_clk was copied from ipq806x.
Fix ipq40xx sleep_clk to the value QSDK defines.
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +2 -1
@@ -142,7 +142,8 @@ clocks { sleep_clk: sleep_clk { compatible = "fixed-clock"; - clock-frequency = <32768>; + clock-frequency = <32000>; + clock-output-names = "gcc_sleep_clk_src"; #clock-cells = <0>; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 296/913 soc: qcom: rpmpd: Check for null return of devm_kcalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 5a811126d38f9767a20cc271b34db7c8efc5a46c ]
Because of the possible failure of the allocation, data->domains might be NULL pointer and will cause the dereference of the NULL pointer later.
Therefore, it might be better to check it and directly return -ENOMEM without releasing data manually if fails, because the comment of the devm_kmalloc() says "Memory allocated with this function is automatically freed on driver detach.".
--- drivers/soc/qcom/rpmpd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/qcom/rpmpd.c +3 -0
@@ -546,6 +546,9 @@ static int rpmpd_probe(struct platform_device *pdev) data->domains =devm_kcalloc (&pdev->dev, num,sizeof (*data->domains),GFP_KERNEL ); +if (!data->domains) +return -ENOMEM ; + data->num_domains = num;for (i =0 ; i < num; i++) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 297/913 soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 0ff027027e05a866491bbb53494f0e2a61354c85 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/soc/qcom/ocmem.c | 1 + 1 file changed, 1 insertion(+)
drivers/soc/qcom/ocmem.c +1 -0
@@ -206,6 +206,7 @@ struct ocmem *of_get_ocmem(struct device *dev) ocmem =platform_get_drvdata (pdev);if (!ocmem) {dev_err (dev,"Cannot get ocmem\n" ); +put_device (&pdev->dev);return ERR_PTR (-ENODEV ); }return ocmem;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 298/913 soc: qcom: aoss: remove spurious IRQF_ONESHOT flags
In reply to Greg Kroah-HartmanFrom: Daniel Thompson <[email protected]>
[ Upstream commit 8030cb9a55688c1339edd284d9d6ce5f9fc75160 ]
Quoting the header comments, IRQF_ONESHOT is "Used by threaded interrupts which need to keep the irq line disabled until the threaded handler has been run.". When applied to an interrupt that doesn't request a threaded irq then IRQF_ONESHOT has a lesser known (undocumented?) side effect, which it to disable the forced threading of the irq. For "normal" kernels (without forced threading) then, if there is no thread_fn, then IRQF_ONESHOT is a nop.
In this case disabling forced threading is not appropriate for this driver because it calls wake_up_all() and this API cannot be called from no-thread interrupt handlers on PREEMPT_RT systems (deadlock risk, triggers sleeping-while-atomic warnings).
Fix this by removing IRQF_ONESHOT.
--- drivers/soc/qcom/qcom_aoss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/qcom_aoss.c +1 -1
@@ -548,7 +548,7 @@ static int qmp_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); - ret =devm_request_irq (&pdev->dev, irq, qmp_intr,IRQF_ONESHOT , + ret =devm_request_irq (&pdev->dev, irq, qmp_intr,0 ,"aoss-qmp" , qmp);if (ret <0 ) {dev_err (&pdev->dev,"failed to request interrupt\n" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 299/913 arm64: dts: qcom: sdm845: fix microphone bias properties and values
In reply to Greg Kroah-HartmanFrom: David Heidelberg <[email protected]>
[ Upstream commit 625c24460dbbc3b6c9a148c0a30f0830893fc909 ]
replace millivolt with correct microvolt and adjust value to the minimal value allowed by documentation.
Found with make qcom/sdm845-oneplus-fajita.dtb.
Fixes:arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias1-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias2-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias3-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias4-microvolt' is a required property
From schema: Documentation/devicetree/bindings/sound/qcom,wcd934x.yamlarch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: codec@1: 'qcom,micbias1-millivolt', 'qcom,micbias2-millivolt', 'qcom,micbias3-millivolt', 'qcom,micbias4-millivolt' do not match any of the regexes: '^.*@[0-9a-f]+$', 'pinctrl-[0-9]+'
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +4 -4
@@ -3608,10 +3608,10 @@ #clock-cells = <0>; clock-frequency = <9600000>; clock-output-names = "mclk"; - qcom,micbias1-millivolt = <1800>; - qcom,micbias2-millivolt = <1800>; - qcom,micbias3-millivolt = <1800>; - qcom,micbias4-millivolt = <1800>; + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 300/913 arm64: dts: qcom: sm8250: fix PCIe bindings to follow schema
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit d60507200485bc778bf6a5556271d784ab09d913 ]
Replace (unused) enable-gpio binding with schema-defined wake-gpios. The GPIO line is still unused, but at least we'd follow the defined schema.
While we are at it, change perst-gpio property to follow the preferred naming schema (perst-gpios).
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +6 -6
@@ -1434,8 +1434,8 @@ phys = <&pcie0_lane>; phy-names = "pciephy"; - perst-gpio = <&tlmm 79 GPIO_ACTIVE_LOW>; - enable-gpio = <&tlmm 81 GPIO_ACTIVE_HIGH>; + perst-gpios = <&tlmm 79 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pcie0_default_state>;
@@ -1538,8 +1538,8 @@ phys = <&pcie1_lane>; phy-names = "pciephy"; - perst-gpio = <&tlmm 82 GPIO_ACTIVE_LOW>; - enable-gpio = <&tlmm 84 GPIO_ACTIVE_HIGH>; + perst-gpios = <&tlmm 82 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 84 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pcie1_default_state>;
@@ -1644,8 +1644,8 @@ phys = <&pcie2_lane>; phy-names = "pciephy"; - perst-gpio = <&tlmm 85 GPIO_ACTIVE_LOW>; - enable-gpio = <&tlmm 87 GPIO_ACTIVE_HIGH>; + perst-gpios = <&tlmm 85 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 87 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pcie2_default_state>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 301/913 arm64: dts: broadcom: bcm4908: use proper TWD binding
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 33826e9c6ba76b265d4e26cb95493fa27ed78974 ]
Block at <ff800400 0x4c> is a TWD that contains timers, watchdog and reset. Actual timers happen to be at block beginning but they only span across the first 0x28 registers. It means the old block description was incorrect (size 0x3c).
Drop timers binding for now and use documented TWD binding. Timers should be properly documented and defined as TWD subnode.
--- arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +4 -4
@@ -273,9 +273,9 @@ #size-cells = <1>; ranges = <0x00 0x00 0xff800000 0x3000>; - timer: timer@400 { - compatible = "brcm,bcm6328-timer", "syscon"; - reg = <0x400 0x3c>; + twd: timer-mfd@400 { + compatible = "brcm,bcm4908-twd", "simple-mfd", "syscon"; + reg = <0x400 0x4c>; }; gpio0: gpio-controller@500 {
@@ -330,7 +330,7 @@ reboot { compatible = "syscon-reboot"; - regmap = <&timer>; + regmap = <&twd>; offset = <0x34>; mask = <1>; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 302/913 arm64: dts: qcom: sm8150: Correct TCS configuration for apps rsc
In reply to Greg Kroah-HartmanFrom: Maulik Shah <[email protected]>
[ Upstream commit 17ac8af678b6da6a8f1df7da8ebf2c5198741827 ]
Correct the TCS config by updating the number of TCSes for each type.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sm8150.dtsi +3 -3
@@ -3434,9 +3434,9 @@ qcom,tcs-offset = <0xd00>; qcom,drv-id = <2>; qcom,tcs-config = <ACTIVE_TCS 2>, - <SLEEP_TCS 1>, - <WAKE_TCS 1>, - <CONTROL_TCS 0>; + <SLEEP_TCS 3>, + <WAKE_TCS 3>, + <CONTROL_TCS 1>; rpmhcc: clock-controller { compatible = "qcom,sm8150-rpmh-clk";
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 303/913 arm64: dts: qcom: sm8350: Correct TCS configuration for apps rsc
In reply to Greg Kroah-HartmanFrom: Maulik Shah <[email protected]>
[ Upstream commit a131255e4ad1ef8d4873ecba21561ba272b2547a ]
Correct the TCS config by updating the number of TCSes for each type.
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8350.dtsi +1 -1
@@ -979,7 +979,7 @@ qcom,tcs-offset = <0xd00>; qcom,drv-id = <2>; qcom,tcs-config = <ACTIVE_TCS 2>, <SLEEP_TCS 3>, - <WAKE_TCS 3>, <CONTROL_TCS 1>; + <WAKE_TCS 3>, <CONTROL_TCS 0>; rpmhcc: clock-controller { compatible = "qcom,sm8350-rpmh-clk";
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 304/913 firmware: ti_sci: Fix compilation failure when CONFIG_TI_SCI_PROTOCOL is not defined
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 043cfff99a18933fda2fb2e163daee73cc07910b ]
Remove an extra ";" which breaks compilation.
--- include/linux/soc/ti/ti_sci_protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/soc/ti/ti_sci_protocol.h +1 -1
@@ -645,7 +645,7 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,static inline struct ti_sci_resource *devm_ti_sci_get_resource (const struct ti_sci_handle *handle,struct device *dev, -u32 dev_id,u32 sub_type); +u32 dev_id,u32 sub_type) {return ERR_PTR (-EINVAL ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 305/913 soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c3d66a164c726cc3b072232d3b6d87575d194084 ]
platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example:
int irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;Fix the check of return value to catch errors correctly.
--- drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/ti/wkup_m3_ipc.c +2 -2
@@ -449,9 +449,9 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev)return PTR_ERR (m3_ipc->ipc_mem_base); irq =platform_get_irq (pdev,0 ); -if (!irq) { +if (irq <0 ) {dev_err (&pdev->dev,"no irq resource\n" ); -return -ENXIO ; +return irq; } ret = devm_request_irq(dev, irq, wkup_m3_txev_handler,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 306/913 ARM: dts: sun8i: v3s: Move the csi1 block to follow address order
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit c4af51698c4fb4fc683f2ac67f482cdf9ba2cd13 ]
The csi1 block node was mistakenly added before the gic node, although its address comes after the gic's. Move the node to its correct position.
--- arch/arm/boot/dts/sun8i-v3s.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/boot/dts/sun8i-v3s.dtsi +11 -11
@@ -593,6 +593,17 @@ #size-cells = <0>; }; + gic: interrupt-controller@1c81000 { + compatible = "arm,gic-400"; + reg = <0x01c81000 0x1000>, + <0x01c82000 0x2000>, + <0x01c84000 0x2000>, + <0x01c86000 0x2000>; + interrupt-controller; + #interrupt-cells = <3>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + }; + csi1: camera@1cb4000 { compatible = "allwinner,sun8i-v3s-csi"; reg = <0x01cb4000 0x3000>;
@@ -604,16 +615,5 @@ resets = <&ccu RST_BUS_CSI>; status = "disabled"; }; - - gic: interrupt-controller@1c81000 { - compatible = "arm,gic-400"; - reg = <0x01c81000 0x1000>, - <0x01c82000 0x2000>, - <0x01c84000 0x2000>, - <0x01c86000 0x2000>; - interrupt-controller; - #interrupt-cells = <3>; - interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; - }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 307/913 ARM: ftrace: ensure that ADR takes the Thumb bit into account
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ]
Using ADR to take the address of 'ftrace_stub' via a local label produces an address that has the Thumb bit cleared, which means the subsequent comparison is guaranteed to fail. Instead, use the badr macro, which forces the Thumb bit to be set.
--- arch/arm/kernel/entry-ftrace.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kernel/entry-ftrace.S +1 -1
@@ -40,7 +40,7 @@ mcount_enter ldr r0, =ftrace_trace_function ldr r2, [r0] - adr r0, .Lftrace_stub + badr r0, .Lftrace_stub cmp r0, r2 bne 1f
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 308/913 vsprintf: Fix potential unaligned access
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit d75b26f880f60ead301e79ba0f4a635c5a60767f ]
The %p4cc specifier in some cases might get an unaligned pointer. Due to this we need to make copy to local variable once to avoid potential crashes on some architectures due to improper access.
--- lib/vsprintf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
lib/vsprintf.c +7 -5
@@ -49,6 +49,7 @@#include <asm/page.h> /* for PAGE_SIZE */ #include <asm/byteorder.h> /* cpu_to_le16 */ +#include <asm/unaligned.h> #include <linux/string_helpers.h> #include "kstrtox.h"
@@ -1771,7 +1772,7 @@ char *fourcc_string(char *buf, char *end, const u32 *fourcc,char output[sizeof ("0123 little-endian (0x01234567)" )];char *p = output;unsigned int i; -u32 val; +u32 orig, val;if (fmt[1 ] !='c' || fmt[2 ] !='c' )return error_string (buf, end,"(%p4?)" , spec);
@@ -1779,21 +1780,22 @@ char *fourcc_string(char *buf, char *end, const u32 *fourcc,if (check_pointer (&buf, end, fourcc, spec))return buf; - val = *fourcc & ~BIT (31 ); + orig =get_unaligned (fourcc); + val = orig & ~BIT (31 ); -for (i =0 ; i <sizeof (*fourcc); i++) { +for (i =0 ; i <sizeof (u32); i++) {unsigned char c = val >> (i *8 );/* Print non-control ASCII characters as-is, dot otherwise */ *p++ =isascii (c) &&isprint (c) ? c :'.' ; } -strcpy (p, *fourcc &BIT (31 ) ?" big-endian" :" little-endian" ); +strcpy (p, orig &BIT (31 ) ?" big-endian" :" little-endian" ); p +=strlen (p); *p++ =' ' ; *p++ ='(' ; - p =special_hex_number (p, output +sizeof (output) -2 , *fourcc,sizeof (u32)); + p =special_hex_number (p, output +sizeof (output) -2 , orig,sizeof (u32)); *p++ =')' ; *p ='\0' ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 309/913 ARM: dts: imx: Add missing LVDS decoder on M53Menlo
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 0c6f71176ea43d6f4003a4d57f7bb518c5ad6145 ]
The M53Menlo display unit uses an LVDS-to-DPI bridge, TI DS90CF364A. Describe this bridge in DT, otherwise the DT incorrectly describes DPI panel attached directly to LVDS source.
--- arch/arm/boot/dts/imx53-m53menlo.dts | 29 ++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx53-m53menlo.dts +27 -2
@@ -53,6 +53,31 @@ }; }; + lvds-decoder { + compatible = "ti,ds90cf364a", "lvds-decoder"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + lvds_decoder_in: endpoint { + remote-endpoint = <&lvds0_out>; + }; + }; + + port@1 { + reg = <1>; + + lvds_decoder_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + }; + panel { compatible = "edt,etm0700g0dh6"; pinctrl-0 = <&pinctrl_display_gpio>;
@@ -61,7 +86,7 @@ port { panel_in: endpoint { - remote-endpoint = <&lvds0_out>; + remote-endpoint = <&lvds_decoder_out>; }; }; };
@@ -450,7 +475,7 @@ reg = <2>; lvds0_out: endpoint { - remote-endpoint = <&panel_in>; + remote-endpoint = <&lvds_decoder_in>; }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 310/913 media: mexon-ge2d: fixup frames size in registers
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
[ Upstream commit 79e8c421a099bfbcebe59740153e55aa0442ced6 ]
The CLIP, SRC & DST registers are coded to take the pixel/line start & end, starting from 0. Thus the end should be the width/height minus 1.
It can be an issue with clipping and rotation, where it will add spurious lines from uninitialized or unwanted data with a shift in the result.
--- drivers/media/platform/meson/ge2d/ge2d.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/media/platform/meson/ge2d/ge2d.c +12 -12
@@ -215,35 +215,35 @@ static void ge2d_hw_start(struct meson_ge2d *ge2d)regmap_write (ge2d->map,GE2D_SRC1_CLIPY_START_END ,FIELD_PREP (GE2D_START , ctx->in.crop.top) | -FIELD_PREP (GE2D_END , ctx->in.crop.top + ctx->in.crop.height)); +FIELD_PREP (GE2D_END , ctx->in.crop.top + ctx->in.crop.height -1 ));regmap_write (ge2d->map,GE2D_SRC1_CLIPX_START_END ,FIELD_PREP (GE2D_START , ctx->in.crop.left) | -FIELD_PREP (GE2D_END , ctx->in.crop.left + ctx->in.crop.width)); +FIELD_PREP (GE2D_END , ctx->in.crop.left + ctx->in.crop.width -1 ));regmap_write (ge2d->map,GE2D_SRC2_CLIPY_START_END ,FIELD_PREP (GE2D_START , ctx->out.crop.top) | -FIELD_PREP (GE2D_END , ctx->out.crop.top + ctx->out.crop.height)); +FIELD_PREP (GE2D_END , ctx->out.crop.top + ctx->out.crop.height -1 ));regmap_write (ge2d->map,GE2D_SRC2_CLIPX_START_END ,FIELD_PREP (GE2D_START , ctx->out.crop.left) | -FIELD_PREP (GE2D_END , ctx->out.crop.left + ctx->out.crop.width)); +FIELD_PREP (GE2D_END , ctx->out.crop.left + ctx->out.crop.width -1 ));regmap_write (ge2d->map,GE2D_DST_CLIPY_START_END ,FIELD_PREP (GE2D_START , ctx->out.crop.top) | -FIELD_PREP (GE2D_END , ctx->out.crop.top + ctx->out.crop.height)); +FIELD_PREP (GE2D_END , ctx->out.crop.top + ctx->out.crop.height -1 ));regmap_write (ge2d->map,GE2D_DST_CLIPX_START_END ,FIELD_PREP (GE2D_START , ctx->out.crop.left) | -FIELD_PREP (GE2D_END , ctx->out.crop.left + ctx->out.crop.width)); +FIELD_PREP (GE2D_END , ctx->out.crop.left + ctx->out.crop.width -1 ));regmap_write (ge2d->map,GE2D_SRC1_Y_START_END , -FIELD_PREP (GE2D_END , ctx->in.pix_fmt.height)); +FIELD_PREP (GE2D_END , ctx->in.pix_fmt.height -1 ));regmap_write (ge2d->map,GE2D_SRC1_X_START_END , -FIELD_PREP (GE2D_END , ctx->in.pix_fmt.width)); +FIELD_PREP (GE2D_END , ctx->in.pix_fmt.width -1 ));regmap_write (ge2d->map,GE2D_SRC2_Y_START_END , -FIELD_PREP (GE2D_END , ctx->out.pix_fmt.height)); +FIELD_PREP (GE2D_END , ctx->out.pix_fmt.height -1 ));regmap_write (ge2d->map,GE2D_SRC2_X_START_END , -FIELD_PREP (GE2D_END , ctx->out.pix_fmt.width)); +FIELD_PREP (GE2D_END , ctx->out.pix_fmt.width -1 ));regmap_write (ge2d->map,GE2D_DST_Y_START_END , -FIELD_PREP (GE2D_END , ctx->out.pix_fmt.height)); +FIELD_PREP (GE2D_END , ctx->out.pix_fmt.height -1 ));regmap_write (ge2d->map,GE2D_DST_X_START_END , -FIELD_PREP (GE2D_END , ctx->out.pix_fmt.width)); +FIELD_PREP (GE2D_END , ctx->out.pix_fmt.width -1 ));/* Color, no blend, use source color */ reg = GE2D_ALU_DO_COLOR_OPERATION_LOGIC(LOGIC_OPERATION_COPY,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 311/913 media: video/hdmi: handle short reads of hdmi info frame.
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 4a92fc6e55da5b87cecb572275deaff6ac9dd27e ]
Calling hdmi_infoframe_unpack() with static sizeof(buffer) skips all the size checking done later in hdmi_infoframe_unpack(). A better value is the amount of data read into buffer.
--- drivers/media/i2c/adv7511-v4l2.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/adv7842.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/i2c/adv7511-v4l2.c +1 -1
@@ -544,7 +544,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7511_cfg_read_ buffer[3 ] =0 ; buffer[3 ] =hdmi_infoframe_checksum (buffer, len +4 ); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +4 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
drivers/media/i2c/adv7604.c +1 -1
@@ -2484,7 +2484,7 @@ static int adv76xx_read_infoframe(struct v4l2_subdev *sd, int index, buffer[i +3 ] =infoframe_read (sd, adv76xx_cri[index].payload_addr + i); -if (hdmi_infoframe_unpack (frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, adv76xx_cri[index].desc);return -ENOENT ;
drivers/media/i2c/adv7842.c +1 -1
@@ -2593,7 +2593,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7842_cfg_read_for (i =0 ; i < len; i++) buffer[i +3 ] =infoframe_read (sd, cri->payload_addr + i); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 312/913 media: ti-vpe: cal: Fix a NULL pointer dereference in cal_ctx_v4l2_init_formats()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit abd77889851d2ead0d0c9c4d29f1808801477b00 ]
In cal_ctx_v4l2_init_formats(), devm_kzalloc() is assigned to ctx->active_fmt and there is a dereference of it after that, which could lead to NULL pointer dereference on failure of devm_kzalloc().
Fix this bug by adding a NULL check of ctx->active_fmt.
This bug was found by a static analyzer.
Builds with 'make allyesconfig' show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/media/platform/ti-vpe/cal-video.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/ti-vpe/cal-video.c +3 -0
@@ -823,6 +823,9 @@ static int cal_ctx_v4l2_init_formats(struct cal_ctx *ctx)/* Enumerate sub device formats and enable all matching local formats */ ctx->active_fmt =devm_kcalloc (ctx->cal->dev, cal_num_formats,sizeof (*ctx->active_fmt),GFP_KERNEL ); +if (!ctx->active_fmt) +return -ENOMEM ; + ctx->num_active_fmt =0 ;for (j =0 , i =0 ; ; ++j) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 313/913 media: em28xx: initialize refcount before kref_get
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit c08eadca1bdfa099e20a32f8fa4b52b2f672236d ]
The commit 47677e51e2a4("[media] em28xx: Only deallocate struct em28xx after finishing all extensions") adds kref_get to many init functions (e.g., em28xx_audio_init). However, kref_init is called too late in em28xx_usb_probe, since em28xx_init_dev before will invoke those init functions and call kref_get function. Then refcount bug occurs in my local syzkaller instance.
Fix it by moving kref_init before em28xx_init_dev. This issue occurs not only in dev but also dev->dev_next.
--- drivers/media/usb/em28xx/em28xx-cards.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/usb/em28xx/em28xx-cards.c +4 -4
@@ -3931,6 +3931,8 @@ static int em28xx_usb_probe(struct usb_interface *intf, goto err_free; } +kref_init (&dev->ref); + dev->devno = nr; dev->model = id->driver_info; dev->alt =-1 ;
@@ -4031,6 +4033,8 @@ static int em28xx_usb_probe(struct usb_interface *intf, }if (dev->board.has_dual_ts &&em28xx_duplicate_dev (dev) ==0 ) { +kref_init (&dev->dev_next->ref); + dev->dev_next->ts =SECONDARY_TS ; dev->dev_next->alt =-1 ; dev->dev_next->is_audio_only = has_vendor_audio &&
@@ -4085,12 +4089,8 @@ static int em28xx_usb_probe(struct usb_interface *intf,em28xx_write_reg (dev,0x0b ,0x82 );mdelay (100 ); } - -kref_init (&dev->dev_next->ref); } -kref_init (&dev->ref); -request_modules (dev);/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 314/913 media: usb: go7007: s2250-board: fix leak in probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 67e4550ecd6164bfbdff54c169e5bbf9ccfaf14d ]
Call i2c_unregister_device(audio) on this error path.
--- drivers/media/usb/go7007/s2250-board.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/media/usb/go7007/s2250-board.c +4 -6
@@ -504,6 +504,7 @@ static int s2250_probe(struct i2c_client *client,u8 *data;struct go7007 *go =i2c_get_adapdata (adapter);struct go7007_usb *usb = go->hpi_context; +int err = -EIO ; audio =i2c_new_dummy_device (adapter,TLV320_ADDRESS >>1 );if (IS_ERR (audio))
@@ -532,11 +533,8 @@ static int s2250_probe(struct i2c_client *client, V4L2_CID_HUE, -512, 511, 1, 0); sd->ctrl_handler = &state->hdl;if (state->hdl.error) { -int err = state->hdl.error; - -v4l2_ctrl_handler_free (&state->hdl); -kfree (state); -return err; + err = state->hdl.error; + goto fail; } state->std =V4L2_STD_NTSC ;
@@ -600,7 +598,7 @@ static int s2250_probe(struct i2c_client *client,i2c_unregister_device (audio);v4l2_ctrl_handler_free (&state->hdl);kfree (state); -return -EIO ; +return err; }static int s2250_remove (struct i2c_client *client)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 315/913 media: cedrus: H265: Fix neighbour info buffer size
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit ee8b887329c78971967506f3ac79b9302c9f83c1 ]
Neighbour info buffer size needs to be 794 kiB in H6. This is actually already indirectly mentioned in the comment, but smaller size is used nevertheless.
Increase buffer size to cover H6 needs. Since increase is not that big in absolute numbers, it doesn't make sense to complicate logic for older generations.
Bug was discovered using iommu, which reported access error when trying to play H265 video.
--- drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/sunxi/cedrus/cedrus_h265.c +1 -1
@@ -23,7 +23,7 @@* Subsequent BSP implementations seem to double the neighbor info buffer size * for the H6 SoC, which may be related to 10 bit H265 support. */ -#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (397 * SZ_1K) +#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (794 * SZ_1K)#define CEDRUS_H265_ENTRY_POINTS_BUF_SIZE (4 * SZ_1K)#define CEDRUS_H265_MV_COL_BUF_UNIT_CTB_SIZE 160
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 316/913 media: cedrus: h264: Fix neighbour info buffer size
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit fecd363ae2d5042553370b0adf60c47e35c34a83 ]
According to BSP library source, H264 neighbour info buffer size needs to be 32 kiB for H6. This is similar to H265 decoding, which also needs double buffer size in comparison to older Cedrus core generations.
Increase buffer size to cover H6 needs. Since increase is not that big in absolute numbers, it doesn't make sense to complicate logic for older generations.
Issue was discovered using iommu and cross checked with BSP library source.
--- drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/sunxi/cedrus/cedrus_h264.c +1 -1
@@ -38,7 +38,7 @@ struct cedrus_h264_sram_ref_pic {#define CEDRUS_H264_FRAME_NUM 18 -#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (16 * SZ_1K) +#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (32 * SZ_1K)#define CEDRUS_MIN_PIC_INFO_BUF_SIZE (130 * SZ_1K) static void cedrus_h264_write_sram(struct cedrus_dev *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 317/913 ASoC: codecs: rx-macro: fix accessing compander for aux
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 42c709c4e1ce4c136891530646c9abd5dff3524f ]
AUX interpolator does not have compander, so check before accessing compander data for this.
Without this checkan array of out bounds access will be made in comp_enabled[] array.
--- sound/soc/codecs/lpass-rx-macro.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/codecs/lpass-rx-macro.c +4 -0
@@ -2039,6 +2039,10 @@ static int rx_macro_load_compander_coeff(struct snd_soc_component *component,int i;int hph_pwr_mode; +/* AUX does not have compander */ +if (comp ==INTERP_AUX ) +return 0 ; +if (!rx->comp_enabled[comp])return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 318/913 ASoC: codecs: rx-macro: fix accessing array out of bounds for enum type
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit bcfe5f76cc4051ea3f9eb5d2c8ea621641f290a5 ]
Accessing enums using integer would result in array out of bounds access on platforms like aarch64 where sizeof(long) is 8 compared to enum size which is 4 bytes.
--- sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/lpass-rx-macro.c +4 -4
@@ -2272,7 +2272,7 @@ static int rx_macro_mux_get(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_dapm_to_component (widget->dapm);struct rx_macro *rx =snd_soc_component_get_drvdata (component); - ucontrol->value.integer.value[0 ] = + ucontrol->value.enumerated.item[0 ] = rx->rx_port_value[widget->shift];return 0 ; }
@@ -2284,7 +2284,7 @@ static int rx_macro_mux_put(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_dapm_to_component (widget->dapm);struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;struct snd_soc_dapm_update *update =NULL ; -u32 rx_port_value = ucontrol->value.integer.value[0 ]; +u32 rx_port_value = ucontrol->value.enumerated.item[0 ];u32 aif_rst;struct rx_macro *rx =snd_soc_component_get_drvdata (component);
@@ -2396,7 +2396,7 @@ static int rx_macro_get_hph_pwr_mode(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_kcontrol_component (kcontrol);struct rx_macro *rx =snd_soc_component_get_drvdata (component); - ucontrol->value.integer.value[0 ] = rx->hph_pwr_mode; + ucontrol->value.enumerated.item[0 ] = rx->hph_pwr_mode;return 0 ; }
@@ -2406,7 +2406,7 @@ static int rx_macro_put_hph_pwr_mode(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_kcontrol_component (kcontrol);struct rx_macro *rx =snd_soc_component_get_drvdata (component); - rx->hph_pwr_mode = ucontrol->value.integer.value[0 ]; + rx->hph_pwr_mode = ucontrol->value.enumerated.item[0 ];return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 319/913 ASoC: codecs: va-macro: fix accessing array out of bounds for enum type
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 0ea5eff7c6063a8f124188424f8e4c6727f35051 ]
Accessing enums using integer would result in array out of bounds access on platforms like aarch64 where sizeof(long) is 8 compared to enum size which is 4 bytes.
--- sound/soc/codecs/lpass-va-macro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/lpass-va-macro.c +2 -2
@@ -780,7 +780,7 @@ static int va_macro_dec_mode_get(struct snd_kcontrol *kcontrol,struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;int path = e->shift_l; - ucontrol->value.integer.value[0 ] = va->dec_mode[path]; + ucontrol->value.enumerated.item[0 ] = va->dec_mode[path];return 0 ; }
@@ -789,7 +789,7 @@ static int va_macro_dec_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct snd_soc_component *comp =snd_soc_kcontrol_component (kcontrol); -int value = ucontrol->value.integer.value[0 ]; +int value = ucontrol->value.enumerated.item[0 ];struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;int path = e->shift_l;struct va_macro *va =snd_soc_component_get_drvdata (comp);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 320/913 ASoC: codecs: wc938x: fix accessing array out of bounds for enum type
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit cc587b7c8fbbe128f6bd0dad025a0caea5e6d164 ]
Accessing enums using integer would result in array out of bounds access on platforms like aarch64 where sizeof(long) is 8 compared to enum size which is 4 bytes.
Fix this by using enumerated items instead of integers.
--- sound/soc/codecs/wcd938x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wcd938x.c +2 -2
@@ -2504,7 +2504,7 @@ static int wcd938x_tx_mode_get(struct snd_kcontrol *kcontrol,struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;int path = e->shift_l; - ucontrol->value.integer.value[0 ] = wcd938x->tx_mode[path]; + ucontrol->value.enumerated.item[0 ] = wcd938x->tx_mode[path];return 0 ; }
@@ -2528,7 +2528,7 @@ static int wcd938x_rx_hph_mode_get(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_kcontrol_component (kcontrol);struct wcd938x_priv *wcd938x =snd_soc_component_get_drvdata (component); - ucontrol->value.integer.value[0 ] = wcd938x->hph_mode; + ucontrol->value.enumerated.item[0 ] = wcd938x->hph_mode;return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 321/913 ASoC: codecs: wcd938x: fix kcontrol max values
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit b0217519236924f77a8382b4004e43ef8fd0dcbb ]
set "HPH Type" Kcontrol max value of WCD_MBHC_HPH_STEREO instead of UINT_MAX. set "HPHL/R Impedance" Kcontrols max value to INT_MAX instead of UINT_MAX as max field is integer type.
Without this patch amixer for these controls will show -1 as max value to userspace.
--- sound/soc/codecs/wcd938x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/wcd938x.c +3 -3
@@ -3577,14 +3577,14 @@ static int wcd938x_hph_impedance_get(struct snd_kcontrol *kcontrol, }static const struct snd_kcontrol_new hph_type_detect_controls[] = { -SOC_SINGLE_EXT ("HPH Type" ,0 ,0 ,UINT_MAX ,0 , +SOC_SINGLE_EXT ("HPH Type" ,0 ,0 ,WCD_MBHC_HPH_STEREO ,0 , wcd938x_get_hph_type,NULL ), };static const struct snd_kcontrol_new impedance_detect_controls[] = { -SOC_SINGLE_EXT ("HPHL Impedance" ,0 ,0 ,UINT_MAX ,0 , +SOC_SINGLE_EXT ("HPHL Impedance" ,0 ,0 ,INT_MAX ,0 , wcd938x_hph_impedance_get,NULL ), -SOC_SINGLE_EXT ("HPHR Impedance" ,0 ,1 ,UINT_MAX ,0 , +SOC_SINGLE_EXT ("HPHR Impedance" ,0 ,1 ,INT_MAX ,0 , wcd938x_hph_impedance_get,NULL ), };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 322/913 ASoC: codecs: wcd934x: fix kcontrol max values
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 61163c3e7480106804269182e24db05244866493 ]
set "HPH Type" Kcontrol max value of WCD_MBHC_HPH_STEREO instead of UINT_MAX. set "HPHL/R Impedance" Kcontrols max value to INT_MAX instead of UINT_MAX as max field is integer type.
Without this patch amixer for these controls will show -1 as max value to userspace.
--- sound/soc/codecs/wcd934x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/wcd934x.c +3 -3
@@ -3023,14 +3023,14 @@ static int wcd934x_hph_impedance_get(struct snd_kcontrol *kcontrol,return 0 ; }static const struct snd_kcontrol_new hph_type_detect_controls[] = { -SOC_SINGLE_EXT ("HPH Type" ,0 ,0 ,UINT_MAX ,0 , +SOC_SINGLE_EXT ("HPH Type" ,0 ,0 ,WCD_MBHC_HPH_STEREO ,0 , wcd934x_get_hph_type,NULL ), };static const struct snd_kcontrol_new impedance_detect_controls[] = { -SOC_SINGLE_EXT ("HPHL Impedance" ,0 ,0 ,UINT_MAX ,0 , +SOC_SINGLE_EXT ("HPHL Impedance" ,0 ,0 ,INT_MAX ,0 , wcd934x_hph_impedance_get,NULL ), -SOC_SINGLE_EXT ("HPHR Impedance" ,0 ,1 ,UINT_MAX ,0 , +SOC_SINGLE_EXT ("HPHR Impedance" ,0 ,1 ,INT_MAX ,0 , wcd934x_hph_impedance_get,NULL ), };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 323/913 ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 4b0bec6088588a120d33db85b1f0d9f096d1df71 ]
wcd934x_rx_hph_mode_put currently returns zero eventhough it changes the value. Fix this, so that change notifications are sent correctly.
--- sound/soc/codecs/wcd934x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/wcd934x.c +4 -1
@@ -3308,13 +3308,16 @@ static int wcd934x_rx_hph_mode_put(struct snd_kcontrol *kc, mode_val = ucontrol->value.enumerated.item[0 ]; +if (mode_val == wcd->hph_mode) +return 0 ; +if (mode_val ==0 ) {dev_err (wcd->dev,"Invalid HPH Mode, default to ClSH HiFi\n" ); mode_val =CLS_H_LOHIFI ; } wcd->hph_mode = mode_val; -return 0 ; +return 1 ; } static int slim_rx_mux_get(struct snd_kcontrol *kc,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 324/913 media: v4l2-core: Initialize h264 scaling matrix
In reply to Greg Kroah-HartmanFrom: Nicolas Dufresne <[email protected]>
[ Upstream commit 0f6146d476fc99862899e70f2554ee77b444b7b9 ]
In the final H264 API, it is not required to set scaling matrix if they are not present in the bitstream. A flag was added in order to let the driver know. The downside is that it leaves the default control value to 0, which isn't valid. As per the spec (see formulas 7-8/7-9), when the scaling matrix are absent from the bitstream, flat values of 16 should be used. This improves this control semantic in a way that the control value are always valid. Drivers can then use the scaling_matrix control values without having to check its presence. Same method was employed for MPEG2_QUANTISATION.
This fixes issues with MTK VCODEC H264 decoder when using GStreamer. GStreamer does not set this control if its not present in the bitstream. As MTK VDCODEC was using the initialized to 0 values, the frames ended up completely gray.
--- drivers/media/v4l2-core/v4l2-ctrls-core.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/media/v4l2-core/v4l2-ctrls-core.c +10 -0
@@ -113,6 +113,7 @@ static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx,struct v4l2_ctrl_mpeg2_quantisation *p_mpeg2_quant;struct v4l2_ctrl_vp8_frame *p_vp8_frame;struct v4l2_ctrl_fwht_params *p_fwht_params; +struct v4l2_ctrl_h264_scaling_matrix *p_h264_scaling_matrix;void *p = ptr.p + idx * ctrl->elem_size;if (ctrl->p_def.p_const)
@@ -160,6 +161,15 @@ static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx, p_fwht_params->flags =V4L2_FWHT_FL_PIXENC_YUV | (2 <<V4L2_FWHT_FL_COMPONENTS_NUM_OFFSET );break ; +case V4L2_CTRL_TYPE_H264_SCALING_MATRIX : + p_h264_scaling_matrix = p; +/* +* The default (flat) H.264 scaling matrix when none are +* specified in the bitstream, this is according to formulas +* (7-8) and (7-9) of the specification. +*/ +memset (p_h264_scaling_matrix,16 ,sizeof (*p_h264_scaling_matrix)); +break ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 325/913 media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated
In reply to Greg Kroah-HartmanFrom: Mirela Rabulea <[email protected]>
[ Upstream commit e738f5dd67eb8098d75345908a5e73782d0569a5 ]
In ov5640_set_fmt, pending_fmt_change will always be false, because the sensor format is saved before comparing it with the previous format:
fmt = &sensor->fmt;... *fmt = *mbus_fmt;... if (mbus_fmt->code != sensor->fmt.code) sensor->pending_fmt_change = true;
This causes the sensor to capture with the previous pixelcode.
Also, changes might happen even for V4L2_SUBDEV_FORMAT_TRY, so fix that.
Basically, revert back to the state before
commit 071154499193 ("media: ov5640: Fix set format regression") as it was more clear, and then update format even when pixelcode does not change, as resolution might change.
--- drivers/media/i2c/ov5640.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/media/i2c/ov5640.c +7 -7
@@ -2293,7 +2293,6 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,struct ov5640_dev *sensor =to_ov5640_dev (sd);const struct ov5640_mode_info *new_mode;struct v4l2_mbus_framefmt *mbus_fmt = &format->format; -struct v4l2_mbus_framefmt *fmt;int ret;if (format->pad !=0 )
@@ -2311,12 +2310,10 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,if (ret) goto out; -if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) - fmt =v4l2_subdev_get_try_format (sd, sd_state,0 ); -else - fmt = &sensor->fmt; - - *fmt = *mbus_fmt; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { + *v4l2_subdev_get_try_format (sd, sd_state,0 ) = *mbus_fmt; + goto out; + }if (new_mode != sensor->current_mode) { sensor->current_mode = new_mode;
@@ -2325,6 +2322,9 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,if (mbus_fmt->code != sensor->fmt.code) sensor->pending_fmt_change = true; +/* update format even if code is unchanged, resolution might change */ + sensor->fmt = *mbus_fmt; +__v4l2_ctrl_s_ctrl_int64 (sensor->ctrls.pixel_rate,ov5640_calc_pixel_rate (sensor)); out:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 326/913 selftests/lkdtm: Add UBSAN config
In reply to Greg Kroah-HartmanFrom: Muhammad Usama Anjum <[email protected]>
[ Upstream commit 1900be289b598b2c553b3add13e491c0bb8a8550 ]
UBSAN_BOUNDS and UBSAN_TRAP depend on UBSAN config option. merge_config.sh script generates following warnings if parent config doesn't have UBSAN config already enabled and UBSAN_BOUNDS/UBSAN_TRAP config options don't get added to the parent config.
Value requested for CONFIG_UBSAN_BOUNDS not in final .config Requested value: CONFIG_UBSAN_BOUNDS=y
Actual value:
Value requested for CONFIG_UBSAN_TRAP not in final .config Requested value: CONFIG_UBSAN_TRAP=y
Actual value:
Fix this by including UBSAN config.
--- tools/testing/selftests/lkdtm/config | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/lkdtm/config +1 -0
@@ -6,5 +6,6 @@ CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_FALLBACK is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +CONFIG_UBSAN=y CONFIG_UBSAN_BOUNDS=y CONFIG_UBSAN_TRAP=y
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 327/913 lib: uninline simple_strntoull() as well
In reply to Greg Kroah-HartmanFrom: Alexey Dobriyan <[email protected]>
[ Upstream commit 839b395eb9c13ae56ea5fc3ca9802734a72293f0 ]
Codegen become bloated again after simple_strntoull() introduction
add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-224 (-224)
Function old new delta
simple_strtoul 5 2 -3
simple_strtol 23 20 -3
simple_strtoull 119 15 -104
simple_strtoll 155 41 -114
--- lib/vsprintf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
lib/vsprintf.c +1 -2
@@ -54,8 +54,7 @@#include <linux/string_helpers.h> #include "kstrtox.h" -static unsigned long long simple_strntoull (const char *startp,size_t max_chars, -char **endp,unsigned int base) +static noinline unsigned long long simple_strntoull (const char *startp,size_t max_chars,char **endp,unsigned int base) {const char *cp;unsigned long long result =0ULL ;
Signature · 1 line
2.34.1
Re: [PATCH 5.15 327/913] lib: uninline simple_strntoull() as well
lib/vsprintf.c line 57
Quoted 11 lines · Greg Kroah-Hartman
From: Alexey Dobriyan <[email protected]>
[ Upstream commit
839b395eb9c13ae56ea5fc3ca9802734a72293f0]Codegen become bloated again after
simple_strntoull()introductionadd/remove: 0/0 grow/shrink: 0/4 up/down: 0/-224 (-224)lib/vsprintf.c +1
-2-static unsigned long long simple_strntoull (const char *startp,size_t max_chars, -char **endp,unsigned int base) +static noinline unsigned long long simple_strntoull (const char *startp,size_t max_chars,char **endp,unsigned int base)
This patch doesn't fix any bugs, why it is selected?
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 327/913] lib: uninline simple_strntoull() as well
Quoted 7 lines · Alexey Dobriyan
Quoted 6 lines · Greg Kroah-Hartman
From: Alexey Dobriyan <[email protected]>
[ Upstream commit
839b395eb9c13ae56ea5fc3ca9802734a72293f0]Codegen become bloated again after
simple_strntoull()introduction
Quoted 7 lines
lib/vsprintf.c line 57
Quoted 5 lines
add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-224 (-224)lib/vsprintf.c +1
-2-static unsigned long long simple_strntoull (const char *startp,size_t max_chars, -char **endp,unsigned int base) +static noinline unsigned long long simple_strntoull (const char *startp,size_t max_chars,char **endp,unsigned int base)This patch doesn't fix any bugs, why it is selected?
Easy change to make the kernel a tiny bit smaller?
Greg Kroah-Hartman
maintainerPATCH 328/913 vsprintf: Fix %pK with kptr_restrict == 0
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 84842911322fc6a02a03ab9e728a48c691fe3efd ]
Although kptr_restrict is set to 0 and the kernel is booted with no_hash_pointers parameter, the content of /proc/vmallocinfo is lacking the real addresses.
/ # cat /proc/vmallocinfo
0x(ptrval)-0x(ptrval) 8192 load_module+0xc0c/0x2c0c pages=1 vmalloc
0x(ptrval)-0x(ptrval) 12288 start_kernel+0x4e0/0x690 pages=2 vmalloc
0x(ptrval)-0x(ptrval) 12288 start_kernel+0x4e0/0x690 pages=2 vmalloc
0x(ptrval)-0x(ptrval) 8192 _mpic_map_mmio.constprop.0+0x20/0x44 phys=0x80041000 ioremap
0x(ptrval)-0x(ptrval) 12288 _mpic_map_mmio.constprop.0+0x20/0x44 phys=0x80041000 ioremap
...
According to the documentation for /proc/sys/kernel/, %pK is equivalent to %p when kptr_restrict is set to 0.
--- .../admin-guide/kernel-parameters.txt | 3 +- lib/vsprintf.c | 36 +++++++++++-------- 2 files changed, 22 insertions(+), 17 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +1 -2
@@ -3452,8 +3452,7 @@ difficult since unequal pointers can no longer be compared. However, if this command-line option is specified, then all normal pointers will have their true - value printed. Pointers printed via %pK may still be - hashed. This option should only be specified when + value printed. This option should only be specified when debugging the kernel. Please do not use on production kernels.
lib/vsprintf.c +21 -15
@@ -54,6 +54,10 @@#include <linux/string_helpers.h> #include "kstrtox.h" +/* Disable pointer hashing if requested */ +bool no_hash_pointers__ro_after_init ; +EXPORT_SYMBOL_GPL (no_hash_pointers); +static noinline unsigned long long simple_strntoull (const char *startp,size_t max_chars,char **endp,unsigned int base) {const char *cp;
@@ -848,6 +852,19 @@ static char *ptr_to_id(char *buf, char *end, const void *ptr,return pointer_string (buf, end, (const void *)hashval, spec); } +static char *default_pointer (char *buf,char *end,const void *ptr, +struct printf_spec spec) +{ +/* +* default is to _not_ leak addresses, so hash before printing, +* unless no_hash_pointers is specified on the command line. +*/ +if (unlikely (no_hash_pointers)) +return pointer_string (buf, end, ptr, spec); + +return ptr_to_id (buf, end, ptr, spec); +} +int kptr_restrict__read_mostly ; static noinline_for_stack
@@ -857,7 +874,7 @@ char *restricted_pointer(char *buf, char *end, const void *ptr,switch (kptr_restrict) {case 0 :/* Handle as %p, hash and do _not_ leak addresses. */ -return ptr_to_id (buf, end, ptr, spec); +return default_pointer (buf, end, ptr, spec);case 1 : {const struct cred *cred;
@@ -2226,10 +2243,6 @@ char *fwnode_string(char *buf, char *end, struct fwnode_handle *fwnode,return widen_string (buf, buf - buf_start, end, spec); } -/* Disable pointer hashing if requested */ -bool no_hash_pointers__ro_after_init ; -EXPORT_SYMBOL_GPL (no_hash_pointers); -int __init no_hash_pointers_enable (char *str) {if (no_hash_pointers)
@@ -2458,7 +2471,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,case 'e' :/* %pe with a non-ERR_PTR gets treated as plain %p */ if (!IS_ERR (ptr)) -break ; +return default_pointer (buf, end, ptr, spec);return err_ptr (buf, end, ptr, spec);case 'u' :case 'k' :
@@ -2468,16 +2481,9 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,default :return error_string (buf, end,"(einval)" , spec); } +default : +return default_pointer (buf, end, ptr, spec); } - -/* -* default is to _not_ leak addresses, so hash before printing, -* unless no_hash_pointers is specified on the command line. -*/ -if (unlikely (no_hash_pointers)) -return pointer_string (buf, end, ptr, spec); -else -return ptr_to_id (buf, end, ptr, spec); }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 329/913 uaccess: fix nios2 and microblaze get_user_8()
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit a97b693c3712f040c5802f32b2d685352e08cefa ]
These two architectures implement 8-byte get_user() through a memcpy() into a four-byte variable, which won't fit.
Use a temporary 64-bit variable instead here, and use a double cast the way that risc-v and openrisc do to avoid compile-time warnings.
--- arch/microblaze/include/asm/uaccess.h | 18 +++++++++--------- arch/nios2/include/asm/uaccess.h | 26 ++++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-)
arch/microblaze/include/asm/uaccess.h +9 -9
@@ -130,27 +130,27 @@ extern long __user_bad(void);#define __get_user (x, ptr) \ ({ \ - unsigned long __gu_val = 0; \ long __gu_err; \ switch (sizeof(*(ptr))) { \ case 1: \ - __get_user_asm("lbu", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lbu", (ptr), x, __gu_err); \ break; \ case 2: \ - __get_user_asm("lhu", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lhu", (ptr), x, __gu_err); \ break; \ case 4: \ - __get_user_asm("lw", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lw", (ptr), x, __gu_err); \ break; \ - case 8: \ - __gu_err = __copy_from_user(&__gu_val, ptr, 8); \ - if (__gu_err) \ - __gu_err = -EFAULT; \ + case 8: { \ + __u64 __x = 0; \ + __gu_err = raw_copy_from_user(&__x, ptr, 8) ? \ + -EFAULT : 0; \ + (x) = (typeof(x))(typeof((x) - (x)))__x; \ break; \ + } \ default: \/* __gu_val = 0; __gu_err = -EINVAL;*/ __gu_err =__user_bad ();\ } \ - x = (__force __typeof__(*(ptr))) __gu_val; \ __gu_err; \ })
arch/nios2/include/asm/uaccess.h +16 -10
@@ -88,6 +88,7 @@ extern __must_check long strnlen_user(const char __user *s, long n);/* Optimized macros */ #define __get_user_asm (val, insn, addr, err) \ { \ + unsigned long __gu_val; \ __asm__ __volatile__( \ " movi %0, %3\n" \ "1: " insn " %1, 0(%2)\n" \
@@ -96,14 +97,20 @@ extern __must_check long strnlen_user(const char __user *s, long n);" .section __ex_table,\"a\"\n" \" .word 1b, 2b\n" \" .previous" \ - : "=&r" (err), "=r" (val) \ + : "=&r" (err), "=r" (__gu_val) \: " r" (addr), " i" (-EFAULT)); \ +val = (__force __typeof__(*(addr)))__gu_val; \ } -#define __get_user_unknown (val, size, ptr, err) do { \ +extern void __get_user_unknown(void); + +#define __get_user_8 (val, ptr, err) do { \ + u64 __val = 0; \ err = 0; \ - if (__copy_from_user(&(val), ptr, size)) { \ + if (raw_copy_from_user(&(__val), ptr, sizeof(val))) { \ err = -EFAULT; \ + } else { \ + val = (typeof(val))(typeof((val) - (val)))__val; \ } \ } while (0)
@@ -119,8 +126,11 @@ do { \case 4 : \__get_user_asm (val,"ldw" , ptr, err); \break ; \ +case 8 : \ +__get_user_8 (val, ptr, err); \ +break ; \default : \ -__get_user_unknown (val, size, ptr, err); \ +__get_user_unknown (); \break ; \ } \ }while (0 )
@@ -129,9 +139,7 @@ do { \ ({ \long __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ -unsigned long __gu_val =0 ; \ -__get_user_common (__gu_val,sizeof (*(ptr)), __gu_ptr, __gu_err);\ - (x) = (__force __typeof__(x))__gu_val; \ +__get_user_common (x,sizeof (*(ptr)), __gu_ptr, __gu_err); \ __gu_err; \ })
@@ -139,11 +147,9 @@ do { \ ({ \long __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ -unsigned long __gu_val =0 ; \if (access_ok ( __gu_ptr,sizeof (*__gu_ptr))) \ -__get_user_common (__gu_val,sizeof (*__gu_ptr), \ +__get_user_common (x,sizeof (*__gu_ptr), \ __gu_ptr, __gu_err); \ - (x) = (__force __typeof__(x))__gu_val; \ __gu_err; \ })
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 330/913 ASoC: rt5663: check the return value of devm_kzalloc() in rt5663_parse_dp()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 4d06f92f38b799295ae22c98be7a20cac3e2a1a7 ]
The function devm_kzalloc() in rt5663_parse_dp() can fail, so its return value should be checked.
--- sound/soc/codecs/rt5663.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/rt5663.c +2 -0
@@ -3478,6 +3478,8 @@ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev) table_size =sizeof (struct impedance_mapping_table ) * rt5663->pdata.impedance_sensing_num; rt5663->imp_table =devm_kzalloc (dev, table_size,GFP_KERNEL ); +if (!rt5663->imp_table) +return -ENOMEM ; ret =device_property_read_u32_array (dev,"realtek,impedance_sensing_table" , (u32 *)rt5663->imp_table, table_size);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 331/913 soc: mediatek: pm-domains: Add wakeup capacity support in power domain
In reply to Greg Kroah-HartmanFrom: Chun-Jie Chen <[email protected]>
[ Upstream commit ac0ca395543af061f7ad77afcda0afb323d82468 ]
Due to some power domain needs to keep on for wakeup in system suspend, so add GENPD_FLAG_ACTIVE_WAKEUP support in Mediatek power domain driver.
--- drivers/soc/mediatek/mtk-pm-domains.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/mediatek/mtk-pm-domains.c +3 -0
@@ -443,6 +443,9 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no pd->genpd.power_off = scpsys_power_off; pd->genpd.power_on = scpsys_power_on; +if (MTK_SCPD_CAPS (pd,MTK_SCPD_ACTIVE_WAKEUP )) + pd->genpd.flags |=GENPD_FLAG_ACTIVE_WAKEUP ; +if (MTK_SCPD_CAPS (pd,MTK_SCPD_KEEP_DEFAULT_OFF ))pm_genpd_init (&pd->genpd,NULL , true);else
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 332/913 mmc: sdhci_am654: Fix the driver data of AM64 SoC
In reply to Greg Kroah-HartmanFrom: Aswath Govindraju <[email protected]>
[ Upstream commit 3b7340f1c89cc488e4df0b033bf7ae502ebbf5b2 ]
The MMCSD IPs used in AM64 are the same as the ones used in J721E. Therefore, fix this by using the driver data from J721E for AM64 too, for both 8 and 4 bit instances.
--- drivers/mmc/host/sdhci_am654.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-)
drivers/mmc/host/sdhci_am654.c +2 -22
@@ -514,26 +514,6 @@ static const struct sdhci_am654_driver_data sdhci_j721e_4bit_drvdata = { .flags = IOMUX_PRESENT, }; -static const struct sdhci_pltfm_data sdhci_am64_8bit_pdata = { - .ops = &sdhci_j721e_8bit_ops, - .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN , -}; - -static const struct sdhci_am654_driver_data sdhci_am64_8bit_drvdata = { - .pdata = &sdhci_am64_8bit_pdata, - .flags =DLL_PRESENT |DLL_CALIB , -}; - -static const struct sdhci_pltfm_data sdhci_am64_4bit_pdata = { - .ops = &sdhci_j721e_4bit_ops, - .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN , -}; - -static const struct sdhci_am654_driver_data sdhci_am64_4bit_drvdata = { - .pdata = &sdhci_am64_4bit_pdata, - .flags =IOMUX_PRESENT , -}; -static const struct soc_device_attribute sdhci_am654_devices[] = { { .family ="AM65X" , .revision ="SR1.0" ,
@@ -759,11 +739,11 @@ static const struct of_device_id sdhci_am654_of_match[] = { }, { .compatible = "ti,am64-sdhci-8bit", - .data = &sdhci_am64_8bit_drvdata, + .data = &sdhci_j721e_8bit_drvdata, }, { .compatible = "ti,am64-sdhci-4bit", - .data = &sdhci_am64_4bit_drvdata, + .data = &sdhci_j721e_4bit_drvdata, }, {/* sentinel */ } };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 333/913 ASoC: ti: davinci-i2s: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ed7c9fef11931fc5d32a83d68017ff390bf5c280 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/ti/davinci-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/ti/davinci-i2s.c +4 -1
@@ -708,7 +708,9 @@ static int davinci_i2s_probe(struct platform_device *pdev) dev->clk =clk_get (&pdev->dev,NULL );if (IS_ERR (dev->clk))return -ENODEV ; -clk_enable (dev->clk); + ret =clk_enable (dev->clk); +if (ret) + goto err_put_clk; dev->dev = &pdev->dev;dev_set_drvdata (&pdev->dev, dev);
@@ -730,6 +732,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)snd_soc_unregister_component (&pdev->dev); err_release_clk:clk_disable (dev->clk); +err_put_clk:clk_put (dev->clk);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 334/913 ALSA: spi: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ca1697eb09208f0168d94b88b72f57505339cbe5 ]
As the potential failure of the clk_enable(), it should be better to check it and return error if fails.
--- sound/spi/at73c213.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
sound/spi/at73c213.c +21 -6
@@ -218,7 +218,9 @@ static int snd_at73c213_pcm_open(struct snd_pcm_substream *substream) runtime->hw = snd_at73c213_playback_hw; chip->substream = substream; -clk_enable (chip->ssc->clk); + err =clk_enable (chip->ssc->clk); +if (err) +return err;return 0 ; }
@@ -776,7 +778,9 @@ static int snd_at73c213_chip_init(struct snd_at73c213 *chip) goto out;/* Enable DAC master clock. */ -clk_enable (chip->board->dac_clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) + goto out;/* Initialize at73c213 on SPI bus. */ retval =snd_at73c213_write_reg (chip,DAC_RST ,0x04 );
@@ -889,7 +893,9 @@ static int snd_at73c213_dev_init(struct snd_card *card, chip->card = card; chip->irq =-1 ; -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) +return retval; retval =request_irq (irq, snd_at73c213_interrupt,0 ,"at73c213" , chip);if (retval) {
@@ -1008,7 +1014,9 @@ static int snd_at73c213_remove(struct spi_device *spi)int retval;/* Stop playback. */ -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) + goto out;ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXDIS ));clk_disable (chip->ssc->clk);
@@ -1088,9 +1096,16 @@ static int snd_at73c213_resume(struct device *dev) {struct snd_card *card =dev_get_drvdata (dev);struct snd_at73c213 *chip = card->private_data; +int retval; -clk_enable (chip->board->dac_clk); -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) +return retval; + retval =clk_enable (chip->ssc->clk); +if (retval) { +clk_disable (chip->board->dac_clk); +return retval; + }ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXEN ));return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 335/913 arm64: dts: ns2: Fix spi-cpol and spi-cpha property
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
[ Upstream commit c953c764e505428f59ffe6afb1c73b89b5b1ac35 ]
Broadcom ns2 platform has spi-cpol and spi-cpho properties set incorrectly. As per spi-slave-peripheral-prop.yaml, these properties are of flag or boolean type and not integer type. Fix the values.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts +4 -4
@@ -111,8 +111,8 @@ compatible = "silabs,si3226x"; reg = <0>; spi-max-frequency = <5000000>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
@@ -135,8 +135,8 @@ at25,byte-len = <0x8000>; at25,addr-mode = <2>; at25,page-size = <64>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 336/913 arm64: dts: broadcom: Fix sata nodename
In reply to Greg Kroah-HartmanFrom: Frank Wunderlich <[email protected]>
[ Upstream commit 55927cb44db43a57699fa652e2437a91620385dc ]
After converting ahci-platform txt binding to yaml nodename is reported as not matching the standard:
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dt.yaml:
ahci@663f2000: $nodename:0: 'ahci@663f2000' does not match '^sata(@.*)?$'
Fix it to match binding.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +1 -1
@@ -687,7 +687,7 @@ }; }; - sata: ahci@663f2000 { + sata: sata@663f2000 { compatible = "brcm,iproc-ahci", "generic-ahci"; reg = <0x663f2000 0x1000>; dma-coherent;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 337/913 printk: fix return value of printk.devkmsg __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b665eae7a788c5e2bc10f9ac3c0137aa0ad1fc97 ]
If an invalid option value is used with "printk.devkmsg=<value>", it is silently ignored.
If a valid option value is used, it is honored but the wrong return value (0) is used, indicating that the command line option had an error and was not handled. This string is not added to init's environment strings due to init/main.c::unknown_bootoption() checking for a '.' in the boot option string and then considering that string to be an "Unused module parameter".
Print a warning message if a bad option string is used. Always return 1 from the __setup handler to indicate that the command line option has been handled.
--- kernel/printk/printk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/printk/printk.c +4 -2
@@ -146,8 +146,10 @@ static int __control_devkmsg(char *str)static int __init control_devkmsg (char *str) { -if (__control_devkmsg (str) <0 ) +if (__control_devkmsg (str) <0 ) { +pr_warn ("printk.devkmsg: bad option string '%s'\n" , str);return 1 ; + }/* * Set sysctl string accordingly:
@@ -166,7 +168,7 @@ static int __init control_devkmsg(char *str)*/ devkmsg_log |=DEVKMSG_LOG_MASK_LOCK ; -return 0 ; +return 1 ; }__setup ("printk.devkmsg=" , control_devkmsg);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 338/913 ASoC: mxs-saif: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 2ecf362d220317debf5da376e0390e9f7a3f7b29 ]
As the potential failure of the clk_enable(),
it should be better to check it, like mxs_saif_trigger().
--- sound/soc/mxs/mxs-saif.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/mxs/mxs-saif.c +4 -1
@@ -455,7 +455,10 @@ static int mxs_saif_hw_params(struct snd_pcm_substream *substream,* basic clock which should be fast enough for the internal * logic. */ -clk_enable (saif->clk); + ret =clk_enable (saif->clk); +if (ret) +return ret; + ret =clk_set_rate (saif->clk,24000000 );clk_disable (saif->clk);if (ret)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 339/913 ASoC: atmel_ssc_dai: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit f9e2ca0640e59d19af0ff285ee5591ed39069b09 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error if fals.
--- sound/soc/atmel/atmel_ssc_dai.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/atmel/atmel_ssc_dai.c +4 -1
@@ -280,7 +280,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,/* Enable PMC peripheral clock for this SSC */ pr_debug ("atmel_ssc_dai: Starting clock\n" ); -clk_enable (ssc_p->ssc->clk); + ret =clk_enable (ssc_p->ssc->clk); +if (ret) +return ret; + ssc_p->mck_rate =clk_get_rate (ssc_p->ssc->clk);/* Reset the SSC unless initialized to keep it in a clean state */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 340/913 ASoC: dwc-i2s: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 45ea97d74313bae681328b0c36fa348036777644 ]
As the potential failure of the clk_enable(),
it should be better to check it, as same as clk_prepare_enable().
--- sound/soc/dwc/dwc-i2s.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
sound/soc/dwc/dwc-i2s.c +12 -5
@@ -403,9 +403,13 @@ static int dw_i2s_runtime_suspend(struct device *dev)static int dw_i2s_runtime_resume (struct device *dev) {struct dw_i2s_dev *dw_dev =dev_get_drvdata (dev); +int ret; -if (dw_dev->capability &DW_I2S_MASTER ) -clk_enable (dw_dev->clk); +if (dw_dev->capability &DW_I2S_MASTER ) { + ret =clk_enable (dw_dev->clk); +if (ret) +return ret; + }return 0 ; }
@@ -422,10 +426,13 @@ static int dw_i2s_resume(struct snd_soc_component *component) {struct dw_i2s_dev *dev =snd_soc_component_get_drvdata (component);struct snd_soc_dai *dai; -int stream; +int stream, ret; -if (dev->capability &DW_I2S_MASTER ) -clk_enable (dev->clk); +if (dev->capability &DW_I2S_MASTER ) { + ret =clk_enable (dev->clk); +if (ret) +return ret; + }for_each_component_dais (component, dai) {for_each_pcm_streams (stream)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 341/913 ASoC: soc-compress: prevent the potentially use of null pointer
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit de2c6f98817fa5decb9b7d3b3a8a3ab864c10588 ]
There is one call trace that snd_soc_register_card() ->snd_soc_bind_card()->soc_init_pcm_runtime() ->snd_soc_dai_compress_new()->snd_soc_new_compress().
In the trace the 'codec_dai' transfers from card->dai_link, and we can see from the snd_soc_add_pcm_runtime() in snd_soc_bind_card() that, if value of card->dai_link->num_codecs is 0, then 'codec_dai' could be null pointer caused
by index out of bound in 'asoc_rtd_to_codec(rtd, 0)'.
And snd_soc_register_card() is called by various platforms. Therefore, it is better to add the check in the case of misusing. And because 'cpu_dai' has already checked in soc_init_pcm_runtime(), there is no need to check again.
Adding the check as follow, then if 'codec_dai' is null, snd_soc_new_compress() will not pass through the check 'if (playback + capture != 1)', avoiding the leftover use of 'codec_dai'.
--- sound/soc/soc-compress.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/soc-compress.c +8 -6
@@ -535,12 +535,14 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) }/* check client and interface hw capabilities */ -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) - playback =1 ; -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) - capture =1 ; +if (codec_dai) { +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) + playback =1 ; +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) + capture =1 ; + }/* * Compress devices are unidirectional so only one of the directions
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 342/913 memory: emif: Add check for setup_interrupts
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit fd7bd80b46373887b390852f490f21b07e209498 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value of the setup_interrupts() and return error if fails.
--- drivers/memory/emif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/memory/emif.c +4 -2
@@ -1117,7 +1117,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev) {struct emif_data *emif;struct resource *res; -int irq; +int irq, ret;if (pdev->dev.of_node) emif =of_get_memory_device_details (pdev->dev.of_node, &pdev->dev);
@@ -1147,7 +1147,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev)emif_onetime_settings (emif);emif_debugfs_init (emif);disable_and_clear_all_interrupts (emif); -setup_interrupts (emif, irq); + ret =setup_interrupts (emif, irq); +if (ret) + goto error;/* One-time actions taken on probing the first device */ if (!emif1) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 343/913 memory: emif: check the pointer temp in get_device_details()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 5b5ab1bfa1898c6d52936a57c25c5ceba2cb2f87 ]
The pointer temp is allocated by devm_kzalloc(), so it should be checked for error handling.
--- drivers/memory/emif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memory/emif.c +1 -1
@@ -1025,7 +1025,7 @@ static struct emif_data *__init_or_module get_device_details( temp =devm_kzalloc (dev,sizeof (*pd),GFP_KERNEL ); dev_info =devm_kzalloc (dev,sizeof (*dev_info),GFP_KERNEL ); -if (!emif || !pd || !dev_info) { +if (!emif || !temp || !dev_info) {dev_err (dev,"%s:%d: allocation error\n" , __func__, __LINE__); goto error; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 344/913 ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit bf0cd60b7e33cf221fbe1114e4acb2c828b0af0d ]
AV/C deferred transaction was supported at a commit 00a7bb81c20f ("ALSA:
firewire-lib: Add support for deferred transaction") while 'deferrable' flag can be uninitialized for non-control/notify AV/C transactions. UBSAN reports it:
kernel: ================================================================================ kernel: UBSAN: invalid-load in /build/linux-aa0B4d/linux-5.15.0/sound/firewire/fcp.c:363:9 kernel: load of value 158 is not a valid value for type '_Bool' kernel: CPU: 3 PID: 182227 Comm: irq/35-firewire Tainted: P OE 5.15.0-18-generic #18-Ubuntu kernel: Hardware name: Gigabyte Technology Co., Ltd. AX370-Gaming 5/AX370-Gaming 5, BIOS F42b 08/01/2019 kernel: Call Trace: kernel: <IRQ> kernel: show_stack+0x52/0x58 kernel: dump_stack_lvl+0x4a/0x5f kernel: dump_stack+0x10/0x12 kernel: ubsan_epilogue+0x9/0x45 kernel: __ubsan_handle_load_invalid_value.cold+0x44/0x49 kernel: fcp_response.part.0.cold+0x1a/0x2b [snd_firewire_lib] kernel: fcp_response+0x28/0x30 [snd_firewire_lib] kernel: fw_core_handle_request+0x230/0x3d0 [firewire_core] kernel: handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? transmit_complete_callback+0x9f/0x120 [firewire_core] kernel: ar_context_tasklet+0xa8/0x2e0 [firewire_ohci] kernel: tasklet_action_common.constprop.0+0xea/0xf0 kernel: tasklet_action+0x22/0x30 kernel: __do_softirq+0xd9/0x2e3 kernel: ? irq_finalize_oneshot.part.0+0xf0/0xf0 kernel: do_softirq+0x75/0xa0 kernel: </IRQ> kernel: <TASK> kernel: __local_bh_enable_ip+0x50/0x60 kernel: irq_forced_thread_fn+0x7e/0x90 kernel: irq_thread+0xba/0x190 kernel: ? irq_thread_fn+0x60/0x60 kernel: kthread+0x11e/0x140 kernel: ? irq_thread_check_affinity+0xf0/0xf0 kernel: ? set_kthread_struct+0x50/0x50 kernel: ret_from_fork+0x22/0x30 kernel: </TASK> kernel: ================================================================================
This commit fixes the bug. The bug has no disadvantage for the non- control/notify AV/C transactions since the flag has an effect for AV/C response with INTERIM (0x0f) status which is not used for the transactions in AV/C general specification.
--- sound/firewire/fcp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/firewire/fcp.c +1 -3
@@ -240,9 +240,7 @@ int fcp_avc_transaction(struct fw_unit *unit, t.response_match_bytes = response_match_bytes; t.state =STATE_PENDING ;init_waitqueue_head (&t.wait); - -if (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 ) - t.deferrable = true; + t.deferrable = (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 );spin_lock_irq (&transactions_lock);list_add_tail (&t.list, &transactions);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 345/913 arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 37cbd3c522869247ed4525b5042ff4c6a276c813 ]
A label reference without brackets is a path string, not a phandle as intended. Add the missing brackets.
--- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +2 -2
@@ -770,8 +770,8 @@ sd-uhs-sdr104; /* Power supply */ - vqmmc-supply = &vcc1v8_s3; /* IO line */ - vmmc-supply = &vcc_sdio; /* card's power */ + vqmmc-supply = <&vcc1v8_s3>; /* IO line */ + vmmc-supply = <&vcc_sdio>; /* card's power */ #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 346/913 m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit e6e1e7b19fa132d23d09c465942aab4c110d3da9 ]
When CONFIG_MCF_EDMA is set (due to COMPILE_TEST, not due to CONFIG_M5441x), coldfire/device.c has compile errors due to missing MCFEDMA_* symbols. In the .config file that was provided, CONFIG_M5206=y, not CONFIG_M5441x, so <asm/m5441xsim.h> is not included in coldfire/device.c.
Only build the MCF_EDMA code in coldfire/device.c if the MCFEDMA_* hardware macros are defined.
Fixes these build errors:
../arch/m68k/coldfire/device.c:512:35: error: 'MCFEDMA_BASE' undeclared here (not in a function); did you mean 'MCFDMA_BASE1'?
512 | .start = MCFEDMA_BASE,../arch/m68k/coldfire/device.c:513:50: error: 'MCFEDMA_SIZE' undeclared here (not in a function)
513 | .end = MCFEDMA_BASE + MCFEDMA_SIZE - 1,../arch/m68k/coldfire/device.c:517:35: error: 'MCFEDMA_IRQ_INTR0' undeclared here (not in a function)
517 | .start = MCFEDMA_IRQ_INTR0,../arch/m68k/coldfire/device.c:523:35: error: 'MCFEDMA_IRQ_INTR16' undeclared here (not in a function)
523 | .start = MCFEDMA_IRQ_INTR16,../arch/m68k/coldfire/device.c:529:35: error: 'MCFEDMA_IRQ_INTR56' undeclared here (not in a function)
529 | .start = MCFEDMA_IRQ_INTR56,../arch/m68k/coldfire/device.c:535:35: error: 'MCFEDMA_IRQ_ERR' undeclared here (not in a function)
535 | .start = MCFEDMA_IRQ_ERR,
--- arch/m68k/coldfire/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m68k/coldfire/device.c +3 -3
@@ -480,7 +480,7 @@ static struct platform_device mcf_i2c5 = {#endif /* MCFI2C_BASE5 */ #endif /* IS_ENABLED(CONFIG_I2C_IMX) */ -#if IS_ENABLED (CONFIG_MCF_EDMA ) +#ifdef MCFEDMA_BASE static const struct dma_slave_map mcf_edma_map[] = { { "dreq0", "rx-tx", MCF_EDMA_FILTER_PARAM(0) },
@@ -552,7 +552,7 @@ static struct platform_device mcf_edma = { .platform_data = &mcf_edma_data, } }; -#endif /* IS_ENABLED(CONFIG_MCF_EDMA) */ +#endif /* MCFEDMA_BASE */ #ifdef MCFSDHC_BASE static struct mcf_esdhc_platform_data mcf_esdhc_data = {
@@ -651,7 +651,7 @@ static struct platform_device *mcf_devices[] __initdata = { &mcf_i2c5,#endif #endif -#if IS_ENABLED (CONFIG_MCF_EDMA ) +#ifdef MCFEDMA_BASE &mcf_edma,#endif #ifdef MCFSDHC_BASE
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 347/913 media: stk1160: If start stream fails, return buffers with VB2_BUF_STATE_QUEUED
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit fbe04b49a54e31f4321d632270207f0e6304cd16 ]
If the callback 'start_streaming' fails, then all queued buffers in the driver should be returned with state 'VB2_BUF_STATE_QUEUED'. Currently, they are returned with 'VB2_BUF_STATE_ERROR' which is wrong. Fix this. This also fixes the warning:
[ 65.583633] WARNING: CPU: 5 PID: 593 at drivers/media/common/videobuf2/videobuf2-core.c:1612 vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.585027] Modules linked in: snd_usb_audio snd_hwdep snd_usbmidi_lib snd_rawmidi snd_soc_hdmi_codec dw_hdmi_i2s_audio saa7115 stk1160 videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev mc crct10dif_ce panfrost snd_soc_simple_card snd_soc_audio_graph_card snd_soc_spdif_tx snd_soc_simple_card_utils gpu_sched phy_rockchip_pcie snd_soc_rockchip_i2s rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi cec drm_kms_helper drm rtc_rk808 rockchip_saradc industrialio_triggered_buffer kfifo_buf rockchip_thermal pcie_rockchip_host ip_tables x_tables ipv6 [ 65.589383] CPU: 5 PID: 593 Comm: v4l2src0:src Tainted: G W 5.16.0-rc4-62408-g32447129cb30-dirty #14 [ 65.590293] Hardware name: Radxa ROCK Pi 4B (DT) [ 65.590696] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 65.591304] pc : vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.591850] lr : vb2_start_streaming+0x6c/0x160 [videobuf2_common] [ 65.592395] sp : ffff800012bc3ad0 [ 65.592685] x29: ffff800012bc3ad0 x28: 0000000000000000 x27: ffff800012bc3cd8 [ 65.593312] x26: 0000000000000000 x25: ffff00000d8a7800 x24: 0000000040045612 [ 65.593938] x23: ffff800011323000 x22: ffff800012bc3cd8 x21: ffff00000908a8b0 [ 65.594562] x20: ffff00000908a8c8 x19: 00000000fffffff4 x18: ffffffffffffffff [ 65.595188] x17: 000000040044ffff x16: 00400034b5503510 x15: ffff800011323f78 [ 65.595813] x14: ffff000013163886 x13: ffff000013163885 x12: 00000000000002ce [ 65.596439] x11: 0000000000000028 x10: 0000000000000001 x9 : 0000000000000228 [ 65.597064] x8 : 0101010101010101 x7 : 7f7f7f7f7f7f7f7f x6 : fefefeff726c5e78 [ 65.597690] x5 : ffff800012bc3990 x4 : 0000000000000000 x3 : ffff000009a34880 [ 65.598315] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff000007cd99f0 [ 65.598940] Call trace: [ 65.599155] vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.599672] vb2_core_streamon+0x17c/0x1a8 [videobuf2_common] [ 65.600179] vb2_streamon+0x54/0x88 [videobuf2_v4l2] [ 65.600619] vb2_ioctl_streamon+0x54/0x60 [videobuf2_v4l2] [ 65.601103] v4l_streamon+0x3c/0x50 [videodev] [ 65.601521] __video_do_ioctl+0x1a4/0x428 [videodev] [ 65.601977] video_usercopy+0x320/0x828 [videodev] [ 65.602419] video_ioctl2+0x3c/0x58 [videodev] [ 65.602830] v4l2_ioctl+0x60/0x90 [videodev] [ 65.603227] __arm64_sys_ioctl+0xa8/0xe0 [ 65.603576] invoke_syscall+0x54/0x118 [ 65.603911] el0_svc_common.constprop.3+0x84/0x100 [ 65.604332] do_el0_svc+0x34/0xa0 [ 65.604625] el0_svc+0x1c/0x50 [ 65.604897] el0t_64_sync_handler+0x88/0xb0 [ 65.605264] el0t_64_sync+0x16c/0x170 [ 65.605587] ---[ end trace 578e0ba07742170d ]---
--- drivers/media/usb/stk1160/stk1160-core.c | 2 +- drivers/media/usb/stk1160/stk1160-v4l.c | 10 +++++----- drivers/media/usb/stk1160/stk1160.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/media/usb/stk1160/stk1160-core.c +1 -1
@@ -403,7 +403,7 @@ static void stk1160_disconnect(struct usb_interface *interface)/* Here is the only place where isoc get released */ stk1160_uninit_isoc (dev); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_ERROR );video_unregister_device (&dev->vdev);v4l2_device_disconnect (&dev->v4l2_dev);
drivers/media/usb/stk1160/stk1160-v4l.c +5 -5
@@ -258,7 +258,7 @@ static int stk1160_start_streaming(struct stk1160 *dev)stk1160_uninit_isoc (dev); out_stop_hw:usb_set_interface (dev->udev,0 ,0 ); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_QUEUED );mutex_unlock (&dev->v4l_lock);
@@ -306,7 +306,7 @@ static int stk1160_stop_streaming(struct stk1160 *dev)stk1160_stop_hw (dev); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_ERROR );stk1160_dbg ("streaming stopped\n" );
@@ -745,7 +745,7 @@ static const struct video_device v4l_template = {/********************************************************************/ /* Must be called with both v4l_lock and vb_queue_lock hold */ -void stk1160_clear_queue (struct stk1160 *dev) +void stk1160_clear_queue (struct stk1160 *dev,enum vb2_buffer_state vb2_state) {struct stk1160_buffer *buf;unsigned long flags;
@@ -756,7 +756,7 @@ void stk1160_clear_queue(struct stk1160 *dev) buf =list_first_entry (&dev->avail_bufs, struct stk1160_buffer, list);list_del (&buf->list); -vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +vb2_buffer_done (&buf->vb.vb2_buf, vb2_state);stk1160_dbg ("buffer [%p/%d] aborted\n" , buf, buf->vb.vb2_buf.index); }
@@ -766,7 +766,7 @@ void stk1160_clear_queue(struct stk1160 *dev) buf = dev->isoc_ctl.buf; dev->isoc_ctl.buf =NULL ; -vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +vb2_buffer_done (&buf->vb.vb2_buf, vb2_state);stk1160_dbg ("buffer [%p/%d] aborted\n" , buf, buf->vb.vb2_buf.index); }
drivers/media/usb/stk1160/stk1160.h +1 -1
@@ -166,7 +166,7 @@ struct regval {int stk1160_vb2_setup (struct stk1160 *dev);int stk1160_video_register (struct stk1160 *dev);void stk1160_video_unregister (struct stk1160 *dev); -void stk1160_clear_queue (struct stk1160 *dev); +void stk1160_clear_queue (struct stk1160 *dev,enum vb2_buffer_state vb2_state);/* Provided by stk1160-video.c */ int stk1160_alloc_isoc (struct stk1160 *dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 348/913 media: vidtv: Check for null return of vzalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit e6a21a14106d9718aa4f8e115b1e474888eeba44 ]
As the possible failure of the vzalloc(), e->encoder_buf might be NULL. Therefore, it should be better to check it in order
to guarantee the success of the initialization.
If fails, we need to free not only 'e' but also 'e->name'. Also, if the allocation for ctx fails, we need to free 'e->encoder_buf' else.
--- drivers/media/test-drivers/vidtv/vidtv_s302m.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/media/test-drivers/vidtv/vidtv_s302m.c +13 -4
@@ -455,6 +455,9 @@ struct vidtv_encoder e->name =kstrdup (args.name,GFP_KERNEL ); e->encoder_buf =vzalloc (VIDTV_S302M_BUF_SZ ); +if (!e->encoder_buf) + goto out_kfree_e; + e->encoder_buf_sz =VIDTV_S302M_BUF_SZ ; e->encoder_buf_offset =0 ;
@@ -467,10 +470,8 @@ struct vidtv_encoder e->is_video_encoder = false; ctx =kzalloc (priv_sz,GFP_KERNEL ); -if (!ctx) { -kfree (e); -return NULL ; - } +if (!ctx) + goto out_kfree_buf; e->ctx = ctx; ctx->last_duration =0 ;
@@ -498,6 +499,14 @@ struct vidtv_encoder e->next =NULL ;return e; + +out_kfree_buf: +kfree (e->encoder_buf); + +out_kfree_e: +kfree (e->name); +kfree (e); +return NULL ; }void vidtv_s302m_encoder_destroy (struct vidtv_encoder *e)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 349/913 ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit f590797fa3c1bccdd19e55441592a23b46aef449 ]
This node pointer is returned by of_parse_phandle() with refcount incremented in this function.
Calling of_node_put() to avoid the refcount leak.
--- sound/soc/atmel/sam9g20_wm8731.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/atmel/sam9g20_wm8731.c +1 -0
@@ -214,6 +214,7 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) cpu_np =of_parse_phandle (np,"atmel,ssc-controller" ,0 );if (!cpu_np) {dev_err (&pdev->dev,"dai and pcm info missing\n" ); +of_node_put (codec_np);return -EINVAL ; } at91sam9g20ek_dai.cpus->of_node = cpu_np;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 350/913 ASoC: wm8350: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit db0350da8084ad549bca16cc0486c11cc70a1f9b ]
As the potential failure of the wm8350_register_irq(), it should be better to check it and return error if fails. Also, use 'free_' in order to avoid the same code.
--- sound/soc/codecs/wm8350.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8350.c +24 -4
@@ -1537,18 +1537,38 @@ static int wm8350_component_probe(struct snd_soc_component *component)wm8350_clear_bits (wm8350,WM8350_JACK_DETECT ,WM8350_JDL_ENA |WM8350_JDR_ENA ); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , wm8350_hpl_jack_handler,0 ,"Left jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , +if (ret !=0 ) + goto err; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , wm8350_hpr_jack_handler,0 ,"Right jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , +if (ret !=0 ) + goto free_jck_det_l; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , wm8350_mic_handler,0 ,"Microphone short" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , +if (ret !=0 ) + goto free_jck_det_r; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , wm8350_mic_handler,0 ,"Microphone detect" , priv); +if (ret !=0 ) + goto free_micscd;return 0 ; + +free_micscd: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , priv); +free_jck_det_r: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , priv); +free_jck_det_l: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , priv); +err: +return ret; }static void wm8350_component_remove (struct snd_soc_component *component)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 351/913 ASoC: fsi: Add check for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 405afed8a728f23cfaa02f75bbc8bdd6b7322123 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/sh/fsi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
sound/soc/sh/fsi.c +16 -3
@@ -816,14 +816,27 @@ static int fsi_clk_enable(struct device *dev,return ret; } -clk_enable (clock->xck); -clk_enable (clock->ick); -clk_enable (clock->div); + ret =clk_enable (clock->xck); +if (ret) + goto err; + ret =clk_enable (clock->ick); +if (ret) + goto disable_xck; + ret =clk_enable (clock->div); +if (ret) + goto disable_ick; clock->count++; }return ret; + +disable_ick: +clk_disable (clock->ick); +disable_xck: +clk_disable (clock->xck); +err: +return ret; } static int fsi_clk_disable(struct device *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 352/913 video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit a58c22cfbbf62fefca090334bbd35fd132e92a23 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c +1 -0
@@ -246,6 +246,7 @@ static int dvic_probe_of(struct platform_device *pdev) adapter_node =of_parse_phandle (node,"ddc-i2c-bus" ,0 );if (adapter_node) { adapter =of_get_i2c_adapter_by_node (adapter_node); +of_node_put (adapter_node);if (adapter ==NULL ) {dev_err (&pdev->dev,"failed to parse ddc-i2c-bus\n" );omap_dss_put_device (ddata->in);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 353/913 media: saa7134: fix incorrect use to determine if list is empty
In reply to Greg Kroah-HartmanFrom: Jakob Koschel <[email protected]>
[ Upstream commit 9f1f4b642451d35667a4dc6a9c0a89d954b530a3 ]
'dev' will *always* be set by list_for_each_entry().
It is incorrect to assume that the iterator value will be NULL if the list is empty.
Instead of checking the pointer it should be checked if the list is empty.
--- drivers/media/pci/saa7134/saa7134-alsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/saa7134/saa7134-alsa.c +2 -2
@@ -1214,7 +1214,7 @@ static int alsa_device_exit(struct saa7134_dev *dev)static int saa7134_alsa_init (void ) { -struct saa7134_dev *dev =NULL ; +struct saa7134_dev *dev; saa7134_dmasound_init = alsa_device_init; saa7134_dmasound_exit = alsa_device_exit;
@@ -1229,7 +1229,7 @@ static int saa7134_alsa_init(void)alsa_device_init (dev); } -if (dev ==NULL ) +if (list_empty (&saa7134_devlist))pr_info ("saa7134 ALSA: no saa7134 cards found\n" );return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 354/913 ivtv: fix incorrect device_caps for ivtvfb
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 25e94139218c0293b4375233c14f2256d7dcfaa8 ]
The VIDIOC_G_FBUF and related overlay ioctls no longer worked (-ENOTTY was returned).
The root cause was the introduction of the caps field in ivtv-driver.h. While loading the ivtvfb module would update the video_device device_caps field with V4L2_CAP_VIDEO_OUTPUT_OVERLAY it would not update that caps field, and that's what the overlay ioctls would look at.
It's a bad idea to keep information in two places, so drop the caps field and only use vdev.device_caps.
--- drivers/media/pci/ivtv/ivtv-driver.h | 1 - drivers/media/pci/ivtv/ivtv-ioctl.c | 10 +++++----- drivers/media/pci/ivtv/ivtv-streams.c | 11 ++++------- 3 files changed, 9 insertions(+), 13 deletions(-)
drivers/media/pci/ivtv/ivtv-driver.h +0 -1
@@ -330,7 +330,6 @@ struct ivtv_stream {struct ivtv *itv;/* for ease of use */ const char *name;/* name of the stream */ int type;/* stream type */ -u32 caps;/* V4L2 capabilities */ struct v4l2_fh *fh;/* pointer to the streaming filehandle */ spinlock_t qlock;/* locks access to the queues */
drivers/media/pci/ivtv/ivtv-ioctl.c +5 -5
@@ -438,7 +438,7 @@ static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_fstruct ivtv_stream *s = &itv->streams[fh2id (fh)->type];struct v4l2_window *winfmt = &fmt->fmt.win; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -EINVAL ;if (!itv->osd_video_pbase)return -EINVAL ;
@@ -549,7 +549,7 @@ static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2u32 chromakey = fmt->fmt.win.chromakey;u8 global_alpha = fmt->fmt.win.global_alpha; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -EINVAL ;if (!itv->osd_video_pbase)return -EINVAL ;
@@ -1383,7 +1383,7 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) 0, }; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
@@ -1450,7 +1450,7 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffestruct ivtv_stream *s = &itv->streams[fh2id (fh)->type];struct yuv_playback_info *yi = &itv->yuv_info; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
@@ -1470,7 +1470,7 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)struct ivtv *itv = id->itv;struct ivtv_stream *s = &itv->streams[fh2id (fh)->type]; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
drivers/media/pci/ivtv/ivtv-streams.c +4 -7
@@ -176,7 +176,7 @@ static void ivtv_stream_init(struct ivtv *itv, int type) s->itv = itv; s->type = type; s->name = ivtv_stream_info[type].name; - s->caps = ivtv_stream_info[type].v4l2_caps; + s->vdev.device_caps = ivtv_stream_info[type].v4l2_caps;if (ivtv_stream_info[type].pio) s->dma =PCI_DMA_NONE ;
@@ -299,12 +299,9 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)if (s_mpg->vdev.v4l2_dev) num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset; } - s->vdev.device_caps = s->caps; -if (itv->osd_video_pbase) { - itv->streams[IVTV_DEC_STREAM_TYPE_YUV ].vdev.device_caps |= -V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; - itv->streams[IVTV_DEC_STREAM_TYPE_MPG ].vdev.device_caps |= -V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; +if (itv->osd_video_pbase && (type ==IVTV_DEC_STREAM_TYPE_YUV || + type ==IVTV_DEC_STREAM_TYPE_MPG )) { + s->vdev.device_caps |=V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; itv->v4l2_cap |=V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; }video_set_drvdata (&s->vdev, s);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 355/913 ASoC: atmel: Fix error handling in snd_proto_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit b0bfaf0544d08d093d6211d7ef8816fb0b5b6c75 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths. Fix this by calling of_node_put() in error handling too.
--- sound/soc/atmel/mikroe-proto.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
sound/soc/atmel/mikroe-proto.c +12 -8
@@ -115,7 +115,8 @@ static int snd_proto_probe(struct platform_device *pdev) cpu_np =of_parse_phandle (np,"i2s-controller" ,0 );if (!cpu_np) {dev_err (&pdev->dev,"i2s-controller missing\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_codec_node; } dai->cpus->of_node = cpu_np; dai->platforms->of_node = cpu_np;
@@ -125,7 +126,8 @@ static int snd_proto_probe(struct platform_device *pdev) &bitclkmaster, &framemaster);if (bitclkmaster != framemaster) {dev_err (&pdev->dev,"Must be the same bitclock and frame master\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_cpu_node; }if (bitclkmaster) {if (codec_np == bitclkmaster)
@@ -136,18 +138,20 @@ static int snd_proto_probe(struct platform_device *pdev) dai_fmt |=snd_soc_daifmt_parse_clock_provider_as_flag (np,NULL ); } -of_node_put (bitclkmaster); -of_node_put (framemaster); - dai->dai_fmt = dai_fmt; - -of_node_put (codec_np); -of_node_put (cpu_np); + dai->dai_fmt = dai_fmt; ret =snd_soc_register_card (&snd_proto);if (ret && ret != -EPROBE_DEFER )dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret); + +put_cpu_node: +of_node_put (bitclkmaster); +of_node_put (framemaster); +of_node_put (cpu_np); +put_codec_node: +of_node_put (codec_np);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 356/913 ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit f725d20579807a68afbe5dba69e78b8fa05f5ef0 ]
Fix the missing clk_disable_unprepare() before return from rockchip_i2s_probe() in the error handling case.
--- sound/soc/rockchip/rockchip_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/rockchip/rockchip_i2s.c +10 -5
@@ -717,19 +717,23 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->mclk =devm_clk_get (&pdev->dev,"i2s_clk" );if (IS_ERR (i2s->mclk)) {dev_err (&pdev->dev,"Can't retrieve i2s master clock\n" ); -return PTR_ERR (i2s->mclk); + ret =PTR_ERR (i2s->mclk); + goto err_clk; } regs =devm_platform_get_and_ioremap_resource (pdev,0 , &res); -if (IS_ERR (regs)) -return PTR_ERR (regs); +if (IS_ERR (regs)) { + ret =PTR_ERR (regs); + goto err_clk; + } i2s->regmap =devm_regmap_init_mmio (&pdev->dev, regs, &rockchip_i2s_regmap_config);if (IS_ERR (i2s->regmap)) {dev_err (&pdev->dev,"Failed to initialise managed register map\n" ); -return PTR_ERR (i2s->regmap); + ret =PTR_ERR (i2s->regmap); + goto err_clk; } i2s->bclk_ratio =64 ;
@@ -769,7 +773,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)i2s_runtime_suspend (&pdev->dev); err_pm_disable:pm_runtime_disable (&pdev->dev); - +err_clk: +clk_disable_unprepare (i2s->hclk);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 357/913 ASoC: SOF: Add missing of_node_put() in imx8m_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 5575f7f49134c7386a684335c9007737c606d3b5 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- sound/soc/sof/imx/imx8m.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/sof/imx/imx8m.c +1 -0
@@ -191,6 +191,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) } ret =of_address_to_resource (res_node,0 , &res); +of_node_put (res_node);if (ret) {dev_err (&pdev->dev,"failed to get reserved region address\n" ); goto exit_pdev_unregister;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 358/913 ASoC: mediatek: use of_device_get_match_data()
In reply to Greg Kroah-HartmanFrom: Tzung-Bi Shih <[email protected]>
[ Upstream commit 3667a037e50a31555276a7989435126e501f0f15 ]
Uses of_device_get_match_data() helper to clean some boilerplate code.
--- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 7 ++----- sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 7 ++----- sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-)
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +2 -5
@@ -685,7 +685,6 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)struct snd_soc_dai_link *dai_link;struct mt8183_da7219_max98357_priv *priv;struct pinctrl *pinctrl; -const struct of_device_id *match;int ret, i; platform_node = of_parse_phandle(pdev->dev.of_node,
@@ -695,11 +694,9 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)return -EINVAL ; } - match =of_match_device (pdev->dev.driver->of_match_table, &pdev->dev); -if (!match || !match->data) + card = (struct snd_soc_card *)of_device_get_match_data (&pdev->dev); +if (!card)return -EINVAL ; - - card = (struct snd_soc_card *)match->data; card->dev = &pdev->dev; hdmi_codec = of_parse_phandle(pdev->dev.of_node,
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +2 -5
@@ -637,7 +637,6 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)struct device_node *platform_node, *ec_codec, *hdmi_codec;struct snd_soc_dai_link *dai_link;struct mt8183_mt6358_ts3a227_max98357_priv *priv; -const struct of_device_id *match;int ret, i; platform_node = of_parse_phandle(pdev->dev.of_node,
@@ -647,11 +646,9 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)return -EINVAL ; } - match =of_match_device (pdev->dev.driver->of_match_table, &pdev->dev); -if (!match || !match->data) + card = (struct snd_soc_card *)of_device_get_match_data (&pdev->dev); +if (!card)return -EINVAL ; - - card = (struct snd_soc_card *)match->data; card->dev = &pdev->dev; ec_codec =of_parse_phandle (pdev->dev.of_node,"mediatek,ec-codec" ,0 );
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +2 -5
@@ -1106,7 +1106,6 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)struct device_node *platform_node, *hdmi_codec;int ret, i;struct snd_soc_dai_link *dai_link; -const struct of_device_id *match;struct mt8192_mt6359_priv *priv; platform_node = of_parse_phandle(pdev->dev.of_node,
@@ -1116,11 +1115,9 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)return -EINVAL ; } - match =of_match_device (pdev->dev.driver->of_match_table, &pdev->dev); -if (!match || !match->data) + card = (struct snd_soc_card *)of_device_get_match_data (&pdev->dev); +if (!card)return -EINVAL ; - - card = (struct snd_soc_card *)match->data; card->dev = &pdev->dev; hdmi_codec = of_parse_phandle(pdev->dev.of_node,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 359/913 ASoC: mediatek: mt8192-mt6359: Fix error handling in mt8192_mt6359_dev_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e45ac7831ff3e2934d58cce319c17c8ec763c95c ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths. Fix this by calling of_node_put() in error handling too.
--- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +12 -6
@@ -1116,8 +1116,10 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) } card = (struct snd_soc_card *)of_device_get_match_data (&pdev->dev); -if (!card) -return -EINVAL ; +if (!card) { + ret = -EINVAL ; + goto put_platform_node; + } card->dev = &pdev->dev; hdmi_codec = of_parse_phandle(pdev->dev.of_node,
@@ -1159,20 +1161,24 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) } priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; +if (!priv) { + ret = -ENOMEM ; + goto put_hdmi_codec; + }snd_soc_card_set_drvdata (card, priv); ret =mt8192_afe_gpio_init (&pdev->dev);if (ret) {dev_err (&pdev->dev,"init gpio error %d\n" , ret); -return ret; + goto put_hdmi_codec; } ret =devm_snd_soc_register_card (&pdev->dev, card); -of_node_put (platform_node); +put_hdmi_codec:of_node_put (hdmi_codec); +put_platform_node: +of_node_put (platform_node);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 360/913 ASoC: rk817: Fix missing clk_disable_unprepare() in rk817_platform_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit a6b44a2518a08348bd0f0401e4d2b99233bbabc2 ]
Fix the missing clk_disable_unprepare() before return from rk817_platform_probe() in the error handling case.
--- sound/soc/codecs/rk817_codec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/codecs/rk817_codec.c +4 -2
@@ -508,12 +508,14 @@ static int rk817_platform_probe(struct platform_device *pdev)if (ret <0 ) {dev_err (&pdev->dev,"%s() register codec error %d\n" , __func__, ret); - goto err_; + goto err_clk; }return 0 ; -err_: +err_clk: +clk_disable_unprepare (rk817_codec_data->mclk); +err_:return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 361/913 ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
In reply to Greg Kroah-HartmanFrom: Codrin Ciubotariu <[email protected]>
[ Upstream commit 9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4 ]
Even if struct snd_dmaengine_pcm_config is used, prepare_slave_config() callback might not be set. Check if this callback is set before using it.
--- sound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-generic-dmaengine-pcm.c +3 -3
@@ -82,10 +82,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,memset (&slave_config,0 ,sizeof (slave_config)); -if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) {int ret =prepare_slave_config (substream, params, &slave_config);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 362/913 ASoC: mxs: Fix error handling in mxs_sgtl5000_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6ae0a4d8fec551ec581d620f0eb1fe31f755551c ]
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths.
For example, when codec_np is NULL, saif_np[0] and saif_np[1] are not NULL, it will cause leaks.
of_node_put() will check if the node pointer is NULL, so we can call it directly to release the refcount of regular pointers.
--- sound/soc/mxs/mxs-sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/mxs/mxs-sgtl5000.c +3 -0
@@ -118,6 +118,9 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) codec_np =of_parse_phandle (np,"audio-codec" ,0 );if (!saif_np[0 ] || !saif_np[1 ] || !codec_np) {dev_err (&pdev->dev,"phandle missing or invalid\n" ); +of_node_put (codec_np); +of_node_put (saif_np[0 ]); +of_node_put (saif_np[1 ]);return -EINVAL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 363/913 ASoC: fsl_spdif: Disable TX clock when stop
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 6ddf611219ba8f7c8fa0d26b39710a641e7d37a5 ]
The TX clock source may be changed in next case, need to disable it when stop, otherwise the TX may not work after changing the clock source, error log is:
aplay: pcm_write:2058: write error: Input/output error
--- sound/soc/fsl/fsl_spdif.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/fsl/fsl_spdif.c +2 -0
@@ -598,6 +598,8 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream, mask =SCR_TXFIFO_AUTOSYNC_MASK |SCR_TXFIFO_CTRL_MASK |SCR_TXSEL_MASK |SCR_USRC_SEL_MASK |SCR_TXFIFO_FSEL_MASK ; +/* Disable TX clock */ +regmap_update_bits (regmap,REG_SPDIF_STC ,STC_TXCLK_ALL_EN_MASK ,0 ); }else { scr =SCR_RXFIFO_OFF |SCR_RXFIFO_CTL_ZERO ; mask = SCR_RXFIFO_FSEL_MASK | SCR_RXFIFO_AUTOSYNC_MASK|
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 364/913 ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
In reply to Greg Kroah-HartmanFrom: Wang Wensheng <[email protected]>
[ Upstream commit 3b891513f95cba3944e72c1139ea706d04f3781b ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- sound/soc/fsl/imx-es8328.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/imx-es8328.c +1 -0
@@ -87,6 +87,7 @@ static int imx_es8328_probe(struct platform_device *pdev)if (int_port >MUX_PORT_MAX || int_port ==0 ) {dev_err (dev,"mux-int-port: hardware only has %d mux ports\n" ,MUX_PORT_MAX ); + ret = -EINVAL ; goto fail; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 365/913 ASoC: SOF: Intel: enable DMI L1 for playback streams
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit a174e72e2355b9025205b4b6727bf43047eac6c6 ]
Add back logic to mark all playback streams as L1 compatible.
--- sound/soc/sof/intel/hda-pcm.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/sof/intel/hda-pcm.c +1 -0
@@ -242,6 +242,7 @@ int hda_dsp_pcm_open(struct snd_sof_dev *sdev, runtime->hw.info &= ~SNDRV_PCM_INFO_PAUSE ;if (hda_always_enable_dmi_l1 || + direction ==SNDRV_PCM_STREAM_PLAYBACK || spcm->stream[substream->stream].d0i3_compatible) flags |=SOF_HDA_STREAM_DMI_L1_COMPATIBLE ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 366/913 ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 375a347da4889f64d86e1ab7f4e6702b6e9bf299 ]
Fix the missing clk_disable_unprepare() before return from msm8916_wcd_digital_probe in the error handling case.
--- sound/soc/codecs/msm8916-wcd-digital.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/msm8916-wcd-digital.c +4 -1
@@ -1201,7 +1201,7 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev) ret =clk_prepare_enable (priv->mclk);if (ret <0 ) {dev_err (dev,"failed to enable mclk %d\n" , ret); -return ret; + goto err_clk; }dev_set_drvdata (dev, priv);
@@ -1209,6 +1209,9 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev)return devm_snd_soc_register_component (dev, &msm8916_wcd_digital, msm8916_wcd_digital_dai,ARRAY_SIZE (msm8916_wcd_digital_dai)); +err_clk: +clk_disable_unprepare (priv->ahbclk); +return ret; }static int msm8916_wcd_digital_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 367/913 mmc: davinci_mmc: Handle error for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 09e7af76db02c74f2a339b3cb2d95460fa2ddbe4 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- drivers/mmc/host/davinci_mmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/davinci_mmc.c +5 -1
@@ -1375,8 +1375,12 @@ static int davinci_mmcsd_suspend(struct device *dev)static int davinci_mmcsd_resume (struct device *dev) {struct mmc_davinci_host *host =dev_get_drvdata (dev); +int ret; + + ret =clk_enable (host->clk); +if (ret) +return ret; -clk_enable (host->clk);mmc_davinci_reset_ctrl (host,0 );return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 368/913 ASoC: atmel: Fix error handling in sam9x5_wm8731_driver_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 740dc3e846537c3743da98bf106f376023fd085c ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error path.
--- sound/soc/atmel/sam9x5_wm8731.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
sound/soc/atmel/sam9x5_wm8731.c +7 -6
@@ -142,7 +142,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)if (!cpu_np) {dev_err (&pdev->dev,"atmel,ssc-controller node missing\n" ); ret = -EINVAL ; - goto out; + goto out_put_codec_np; } dai->cpus->of_node = cpu_np; dai->platforms->of_node = cpu_np;
@@ -153,12 +153,9 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)if (ret !=0 ) {dev_err (&pdev->dev,"Failed to set SSC %d for audio: %d\n" , ret, priv->ssc_id); - goto out; + goto out_put_cpu_np; } -of_node_put (codec_np); -of_node_put (cpu_np); - ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"Platform device allocation failed\n" );
@@ -167,10 +164,14 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"%s ok\n" , __func__); -return ret; + goto out_put_cpu_np; out_put_audio:atmel_ssc_put_audio (priv->ssc_id); +out_put_cpu_np: +of_node_put (cpu_np); +out_put_codec_np: +of_node_put (codec_np); out:return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 369/913 ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 9ebd62d60edcd4d9c75485e5ccd0b79581ad3c49 ]
In the error handling path, the clk_prepare_enable() function call should be balanced by a corresponding 'clk_disable_unprepare()' call , as already done in the remove function.
--- sound/soc/codecs/msm8916-wcd-analog.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
sound/soc/codecs/msm8916-wcd-analog.c +16 -6
@@ -1221,8 +1221,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) } irq =platform_get_irq_byname (pdev,"mbhc_switch_int" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_mbhc_switch_irq_handler,
@@ -1234,8 +1236,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)if (priv->mbhc_btn_enabled) { irq =platform_get_irq_byname (pdev,"mbhc_but_press_det" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_press_irq_handler,
@@ -1246,8 +1250,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)dev_err (dev,"cannot request mbhc button press irq\n" ); irq =platform_get_irq_byname (pdev,"mbhc_but_rel_det" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_release_irq_handler,
@@ -1264,6 +1270,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)return devm_snd_soc_register_component (dev, &pm8916_wcd_analog, pm8916_wcd_analog_dai,ARRAY_SIZE (pm8916_wcd_analog_dai)); + +err_disable_clk: +clk_disable_unprepare (priv->mclk); +return ret; }static int pm8916_wcd_analog_spmi_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 370/913 ASoC: codecs: wcd934x: Add missing of_node_put() in wcd934x_codec_parse_data
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 9531a631379169d57756b2411178c6238655df88 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done. This is similar to commit 64b92de9603f
("ASoC: wcd9335: fix a leaked reference by adding missing of_node_put")
--- sound/soc/codecs/wcd934x.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wcd934x.c +1 -0
@@ -5888,6 +5888,7 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd) } wcd->sidev =of_slim_get_device (wcd->sdev->ctrl, ifc_dev_np); +of_node_put (ifc_dev_np);if (!wcd->sidev) {dev_err (dev,"Unable to get SLIM Interface device\n" );return -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 371/913 ASoC: amd: Fix reference to PCM buffer address
In reply to Greg Kroah-HartmanFrom: Meng Tang <[email protected]>
[ Upstream commit 54e1bf9f6177a3ffbd920474f4481a25361163aa ]
PCM buffers might be allocated dynamically when the buffer preallocation failed or a larger buffer is requested, and it's not guaranteed that substream->dma_buffer points to the actually used buffer. The driver needs to refer to substream->runtime->dma_addr instead for the buffer address.
--- sound/soc/amd/vangogh/acp5x-pcm-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/amd/vangogh/acp5x-pcm-dma.c +1 -1
@@ -281,7 +281,7 @@ static int acp5x_dma_hw_params(struct snd_soc_component *component,return -EINVAL ; } size =params_buffer_bytes (params); - rtd->dma_addr = substream->dma_buffer.addr; + rtd->dma_addr = substream->runtime->dma_addr; rtd->num_pages = (PAGE_ALIGN (size) >>PAGE_SHIFT );config_acp5x_dma (rtd, substream->stream);return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 372/913 ARM: configs: multi_v5_defconfig: re-enable CONFIG_V4L_PLATFORM_DRIVERS
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit f5eb04d7a0e419d61f784de3ced708259ddb71d7 ]
Commit 06b93644f4d1 ("media: Kconfig: add an option to filter in/out platform drivers") introduced CONFIG_MEDIA_PLATFORM_SUPPORT, to allow more fine grained control over the inclusion of certain Kconfig files. multi_v5_defconfig was selecting some drivers described in drivers/media/platform/Kconfig, which now wasn't included anymore.
Explicitly set the new symbol in multi_v5_defconfig to bring those drivers back.
This enables some new V4L2 and VIDEOBUF2 features, but as modules only.
--- arch/arm/configs/multi_v5_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v5_defconfig +1 -0
@@ -188,6 +188,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ASPEED=m CONFIG_VIDEO_ATMEL_ISI=m
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 373/913 ARM: configs: multi_v5_defconfig: re-enable DRM_PANEL and FB_xxx
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit 9c44d0805f949c56121b4ae6949fb064537bf198 ]
Commit 91185d55b32e ("drm: Remove DRM_KMS_FB_HELPER Kconfig option") led to de-selection of CONFIG_FB, which was a prerequisite for BACKLIGHT_CLASS_DEVICE, which CONFIG_DRM_PANEL_SIMPLE depended on. Explicitly set CONFIG_FB, to bring DRM_PANEL_SIMPLE, DRM_PANEL_EDP, FB_IMX and FB_ATMEL back into the generated .config.
This also adds some new FB related features like fonts and the framebuffer console.
See also commit 8c1768967e27 ("ARM: config: mutli v7: Reenable FB dependency"), which solved the same problem for multi_v7_defconfig.
This relies on [1], to fix a broken Kconfig dependency.
[1] https://lore.kernel.org/dri-devel/[email protected]/raw
--- arch/arm/configs/multi_v5_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v5_defconfig +1 -0
@@ -196,6 +196,7 @@ CONFIG_DRM=y CONFIG_DRM_ATMEL_HLCDC=m CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_ASPEED_GFX=m +CONFIG_FB=y CONFIG_FB_IMX=y CONFIG_FB_ATMEL=y CONFIG_BACKLIGHT_ATMEL_LCDC=y
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 374/913 drm/meson: osd_afbcd: Add an exit callback to struct meson_afbcd_ops
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 04b8a5d9cfd171f65df75f444b5617a372649edd ]
Use this to simplify the driver shutdown. It will also come handy when fixing the error handling in meson_drv_bind_master().
--- drivers/gpu/drm/meson/meson_drv.c | 6 ++-- drivers/gpu/drm/meson/meson_osd_afbcd.c | 41 ++++++++++++++++--------- drivers/gpu/drm/meson/meson_osd_afbcd.h | 1 + 3 files changed, 30 insertions(+), 18 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +2 -4
@@ -381,10 +381,8 @@ static void meson_drv_unbind(struct device *dev)free_irq (priv->vsync_irq, drm);drm_dev_put (drm); -if (priv->afbcd.ops) { - priv->afbcd.ops->reset (priv); -meson_rdma_free (priv); - } +if (priv->afbcd.ops) + priv->afbcd.ops->exit (priv); }static const struct component_master_ops meson_drv_master_ops = {
drivers/gpu/drm/meson/meson_osd_afbcd.c +27 -14
78 lines not on this page · raw message
drivers/gpu/drm/meson/meson_osd_afbcd.h +1 -0
@@ -14,6 +14,7 @@struct meson_afbcd_ops {int (*init)(struct meson_drm *priv); +void (*exit)(struct meson_drm *priv);int (*reset)(struct meson_drm *priv);int (*enable)(struct meson_drm *priv);int (*disable)(struct meson_drm *priv);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 375/913 drm/meson: Make use of the helper function devm_platform_ioremap_resourcexxx()
In reply to Greg Kroah-HartmanFrom: Cai Huoqing <[email protected]>
[ Upstream commit d4cb82aa2e4bc0e46582a625cb41b64c83fdde49 ]
Use the devm_platform_ioremap_resource_byname() helper instead of calling platform_get_resource_byname() and devm_ioremap_resource() separately
Use the devm_platform_ioremap_resource() helper instead of calling platform_get_resource() and devm_ioremap_resource() separately
--- drivers/gpu/drm/meson/meson_drv.c | 3 +-- drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +1 -2
@@ -206,8 +206,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) priv->compat = match->compat; priv->afbcd.ops = match->afbcd_ops; - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"vpu" ); - regs =devm_ioremap_resource (dev, res); + regs =devm_platform_ioremap_resource_byname (pdev,"vpu" );if (IS_ERR (regs)) { ret =PTR_ERR (regs); goto free_drm;
drivers/gpu/drm/meson/meson_dw_hdmi.c +1 -3
@@ -978,7 +978,6 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,struct dw_hdmi_plat_data *dw_plat_data;struct drm_bridge *next_bridge;struct drm_encoder *encoder; -struct resource *res;int irq;int ret;
@@ -1042,8 +1041,7 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,return PTR_ERR (meson_dw_hdmi->hdmitx_phy); } - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - meson_dw_hdmi->hdmitx =devm_ioremap_resource (dev, res); + meson_dw_hdmi->hdmitx =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (meson_dw_hdmi->hdmitx))return PTR_ERR (meson_dw_hdmi->hdmitx);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 376/913 drm/meson: split out encoder from meson_dw_hdmi
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
[ Upstream commit e67f6037ae1be34b2b686bab72caa41d57714534 ]
This moves all the non-DW-HDMI code where it should be:
an encoder in the drm/meson core driver.
The bridge functions are copied as-is, except:
- the encoder init uses the simple kms helper
- the mode_set has been moved to atomic_enable()
- debug prints are converted to dev_debg()
For now the bridge attach flags is 0, DRM_BRIDGE_ATTACH_NO_CONNECTOR will be handled later.
The meson dw-hdmi glue is slightly fixed to live without the encoder in the same driver.
--- drivers/gpu/drm/meson/Makefile | 1 + drivers/gpu/drm/meson/meson_drv.c | 5 + drivers/gpu/drm/meson/meson_dw_hdmi.c | 341 ++----------------- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 370 +++++++++++++++++++++ drivers/gpu/drm/meson/meson_encoder_hdmi.h | 12 + 5 files changed, 407 insertions(+), 322 deletions(-) create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.c create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.h
drivers/gpu/drm/meson/Makefile +1 -0
@@ -2,6 +2,7 @@ meson-drm-y := meson_drv.o meson_plane.o meson_crtc.o meson_venc_cvbs.o meson-drm-y += meson_viu.o meson_vpp.o meson_venc.o meson_vclk.o meson_overlay.o meson-drm-y += meson_rdma.o meson_osd_afbcd.o +meson-drm-y += meson_encoder_hdmi.o obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o
drivers/gpu/drm/meson/meson_drv.c +5 -0
@@ -32,6 +32,7 @@#include "meson_osd_afbcd.h" #include "meson_registers.h" #include "meson_venc_cvbs.h" +#include "meson_encoder_hdmi.h" #include "meson_viu.h" #include "meson_vpp.h" #include "meson_rdma.h"
@@ -318,6 +319,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) } } + ret =meson_encoder_hdmi_init (priv); +if (ret) + goto free_drm; + ret =meson_plane_create (priv);if (ret) goto free_drm;
drivers/gpu/drm/meson/meson_dw_hdmi.c +19 -322
460 lines not on this page · raw message
drivers/gpu/drm/meson/meson_encoder_hdmi.c new file +370 -0
370 lines not on this page · raw message
drivers/gpu/drm/meson/meson_encoder_hdmi.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2021 BayLibre, SAS +* Author: Neil Armstrong <[email protected]> +*/ + +#ifndef __MESON_ENCODER_HDMI_H +#define __MESON_ENCODER_HDMI_H + +int meson_encoder_hdmi_init (struct meson_drm *priv); + +#endif /* __MESON_ENCODER_HDMI_H */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 377/913 drm/meson: Fix error handling when afbcd.ops->init fails
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit fa747d75f65d1b1cbc3f4691fa67b695e8a399c8 ]
When afbcd.ops->init fails we need to free the struct drm_device. Also all errors which come after afbcd.ops->init was successful need to exit the AFBCD, just like meson_drv_unbind() does.
--- drivers/gpu/drm/meson/meson_drv.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +11 -8
@@ -302,42 +302,42 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)if (priv->afbcd.ops) { ret = priv->afbcd.ops->init (priv);if (ret) -return ret; + goto free_drm; }/* Encoder Initialization */ ret =meson_venc_cvbs_create (priv);if (ret) - goto free_drm; + goto exit_afbcd;if (has_components) { ret =component_bind_all (drm->dev, drm);if (ret) {dev_err (drm->dev,"Couldn't bind all components\n" ); - goto free_drm; + goto exit_afbcd; } } ret =meson_encoder_hdmi_init (priv);if (ret) - goto free_drm; + goto exit_afbcd; ret =meson_plane_create (priv);if (ret) - goto free_drm; + goto exit_afbcd; ret =meson_overlay_create (priv);if (ret) - goto free_drm; + goto exit_afbcd; ret =meson_crtc_create (priv);if (ret) - goto free_drm; + goto exit_afbcd; ret =request_irq (priv->vsync_irq, meson_irq,0 , drm->driver->name, drm);if (ret) - goto free_drm; + goto exit_afbcd;drm_mode_config_reset (drm);
@@ -355,6 +355,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) uninstall_irq:free_irq (priv->vsync_irq, drm); +exit_afbcd: +if (priv->afbcd.ops) + priv->afbcd.ops->exit (priv); free_drm:drm_dev_put (drm);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 378/913 drm/bridge: Fix free wrong object in sii8620_init_rcp_input_dev
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 7c442e76c06cb1bef16a6c523487438175584eea ]
rc_dev is allocated by rc_allocate_device(), and doesn't assigned to ctx->rc_dev before calling rc_free_device(ctx->rc_dev). So it should call rc_free_device(rc_dev);
--- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/sil-sii8620.c +1 -1
@@ -2120,7 +2120,7 @@ static void sii8620_init_rcp_input_dev(struct sii8620 *ctx)if (ret) {dev_err (ctx->dev,"Failed to register RC device\n" ); ctx->error = ret; -rc_free_device (ctx->rc_dev); +rc_free_device (rc_dev);return ; } ctx->rc_dev = rc_dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 379/913 drm/bridge: Add missing pm_runtime_disable() in __dw_mipi_dsi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 96211b7c56b109a52768e6cc5e23a1f79316eca0 ]
If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable().
Add missing pm_runtime_disable() for __dw_mipi_dsi_probe.
--- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
@@ -1199,6 +1199,7 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, ret =mipi_dsi_host_register (&dsi->dsi_host);if (ret) {dev_err (dev,"Failed to register MIPI host: %d\n" , ret); +pm_runtime_disable (dev);dw_mipi_dsi_debugfs_remove (dsi);return ERR_PTR (ret); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 380/913 drm/bridge: nwl-dsi: Fix PM disable depth imbalance in nwl_dsi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit b146e343a9e05605b491b1bf4a2b62a39d5638d8 ]
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context.
--- drivers/gpu/drm/bridge/nwl-dsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/nwl-dsi.c +1 -0
@@ -1204,6 +1204,7 @@ static int nwl_dsi_probe(struct platform_device *pdev) ret =nwl_dsi_select_input (dsi);if (ret <0 ) { +pm_runtime_disable (dev);mipi_dsi_host_unregister (&dsi->dsi_host);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 381/913 drm: bridge: adv7511: Fix ADV7535 HPD enablement
In reply to Greg Kroah-HartmanFrom: Jagan Teki <[email protected]>
[ Upstream commit 3dbc84a595d17f64f14fcea00120d31e33e98880 ]
Existing HPD enablement logic is not compatible with ADV7535 bridge, thus any runtime plug-in of HDMI cable is not working on these bridge designs.
Unlike other ADV7511 family of bridges, the ADV7535 require HPD_OVERRIDE bit to set and reset for proper handling of HPD functionality.
Fix it.
--- drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 29 +++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-)
drivers/gpu/drm/bridge/adv7511/adv7511.h +1 -0
@@ -169,6 +169,7 @@#define ADV7511_PACKET_ENABLE_SPARE2 BIT(1)#define ADV7511_PACKET_ENABLE_SPARE1 BIT(0) +#define ADV7535_REG_POWER2_HPD_OVERRIDE BIT(6)#define ADV7511_REG_POWER2_HPD_SRC_MASK 0xc0#define ADV7511_REG_POWER2_HPD_SRC_BOTH 0x00#define ADV7511_REG_POWER2_HPD_SRC_HPD 0x40
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +22 -7
@@ -351,11 +351,17 @@ static void __adv7511_power_on(struct adv7511 *adv7511)* from standby or are enabled. When the HPD goes low the adv7511 is * reset and the outputs are disabled which might cause the monitor to * go to standby again. To avoid this we ignore the HPD pin for the -* first few seconds after enabling the output. +* first few seconds after enabling the output. On the other hand +* adv7535 require to enable HPD Override bit for proper HPD. */ -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , -ADV7511_REG_POWER2_HPD_SRC_MASK , -ADV7511_REG_POWER2_HPD_SRC_NONE ); +if (adv7511->type ==ADV7535 ) +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7535_REG_POWER2_HPD_OVERRIDE , +ADV7535_REG_POWER2_HPD_OVERRIDE ); +else +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7511_REG_POWER2_HPD_SRC_MASK , +ADV7511_REG_POWER2_HPD_SRC_NONE ); }static void adv7511_power_on (struct adv7511 *adv7511)
@@ -375,6 +381,10 @@ static void adv7511_power_on(struct adv7511 *adv7511)static void __adv7511_power_off (struct adv7511 *adv7511) {/* TODO: setup additional power down modes */ +if (adv7511->type ==ADV7535 ) +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7535_REG_POWER2_HPD_OVERRIDE ,0 ); +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER ,ADV7511_POWER_POWER_DOWN ,ADV7511_POWER_POWER_DOWN );
@@ -672,9 +682,14 @@ adv7511_detect(struct adv7511 *adv7511, struct drm_connector *connector) status = connector_status_disconnected; }else {/* Renable HPD sensing */ -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , -ADV7511_REG_POWER2_HPD_SRC_MASK , -ADV7511_REG_POWER2_HPD_SRC_BOTH ); +if (adv7511->type ==ADV7535 ) +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7535_REG_POWER2_HPD_OVERRIDE , +ADV7535_REG_POWER2_HPD_OVERRIDE ); +else +regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , +ADV7511_REG_POWER2_HPD_SRC_MASK , +ADV7511_REG_POWER2_HPD_SRC_BOTH ); } adv7511->status = status;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 382/913 ath10k: fix memory overwrite of the WoWLAN wakeup packet pattern
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
[ Upstream commit e3fb3d4418fce5484dfe7995fcd94c18b10a431a ]
In function ath10k_wow_convert_8023_to_80211(), it will do memcpy for the new->pattern, and currently the new->pattern and new->mask is same with the old, then the memcpy of new->pattern will also overwrite the old->pattern, because the header format of new->pattern is 802.11, its length is larger than the old->pattern which is 802.3. Then the operation of "Copy frame body" will copy a mistake value because the body memory has been overwrite when memcpy the new->pattern.
Assign another empty value to new_pattern to avoid the overwrite issue.
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
--- drivers/net/wireless/ath/ath10k/wow.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/wow.c +4 -3
@@ -337,14 +337,15 @@ static int ath10k_vif_wow_set_wakeups(struct ath10k_vif *arvif,if (patterns[i].mask[j /8 ] &BIT (j %8 )) bitmask[j] =0xff ; old_pattern.mask = bitmask; - new_pattern = old_pattern;if (ar->wmi.rx_decap_mode ==ATH10K_HW_TXRX_NATIVE_WIFI ) { -if (patterns[i].pkt_offset <ETH_HLEN ) +if (patterns[i].pkt_offset <ETH_HLEN ) {ath10k_wow_convert_8023_to_80211 (&new_pattern, &old_pattern); -else + }else { + new_pattern = old_pattern; new_pattern.pkt_offset +=WOW_HDR_LEN -ETH_HLEN ; + } }if (WARN_ON (new_pattern.pattern_len >WOW_MAX_PATTERN_SIZE ))
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 383/913 drm/v3d/v3d_drv: Check for error num after setting mask
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 4a39156166b90465da0f9a33b3442d63b5651bec ]
Because of the possible failure of the dma_supported(), the dma_set_mask_and_coherent() may return error num. Therefore, it should be better to check it and return the error if fails.
Also, we can create a variable for the mask to solve the alignment issue.
--- drivers/gpu/drm/v3d/v3d_drv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/v3d/v3d_drv.c +6 -2
@@ -221,6 +221,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)int ret;u32 mmu_debug;u32 ident1; +u64 mask; v3d = devm_drm_dev_alloc(dev, &v3d_drm_driver, struct v3d_dev, drm);
@@ -240,8 +241,11 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)return ret; mmu_debug =V3D_READ (V3D_MMU_DEBUG_INFO ); -dma_set_mask_and_coherent (dev, -DMA_BIT_MASK (30 +V3D_GET_FIELD (mmu_debug,V3D_MMU_PA_WIDTH ))); + mask =DMA_BIT_MASK (30 +V3D_GET_FIELD (mmu_debug,V3D_MMU_PA_WIDTH )); + ret =dma_set_mask_and_coherent (dev, mask); +if (ret) +return ret; + v3d->va_width =30 +V3D_GET_FIELD (mmu_debug,V3D_MMU_VA_WIDTH ); ident1 =V3D_READ (V3D_HUB_IDENT1 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 384/913 drm/panfrost: Check for error num after setting mask
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 44ab30b056149bd59dd7989a593dd25ead6007fd ]
Because of the possible failure of the dma_supported(), the dma_set_mask_and_coherent() may return error num. Therefore, it should be better to check it and return the error if fails.
--- drivers/gpu/drm/panfrost/panfrost_gpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_gpu.c +4 -1
@@ -360,8 +360,11 @@ int panfrost_gpu_init(struct panfrost_device *pfdev)panfrost_gpu_init_features (pfdev); -dma_set_mask_and_coherent (pfdev->dev, + err =dma_set_mask_and_coherent (pfdev->dev,DMA_BIT_MASK (FIELD_GET (0xff00 , pfdev->features.mmu_features))); +if (err) +return err; +dma_set_max_seg_size (pfdev->dev,UINT_MAX ); irq =platform_get_irq_byname (to_platform_device (pfdev->dev),"gpu" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 385/913 libbpf: Fix possible NULL pointer dereference when destroying skeleton
In reply to Greg Kroah-HartmanFrom: Yafang Shao <[email protected]>
[ Upstream commit a32ea51a3f17ce6524c9fc19d311e708331c8b5f ]
When I checked the code in skeleton header file generated with my own bpf prog, I found there may be possible NULL pointer dereference when destroying skeleton. Then I checked the in-tree bpf progs, finding that is a common issue. Let's take the generated samples/bpf/xdp_redirect_cpu.skel.h for example. Below is the generated code in xdp_redirect_cpu__create_skeleton():
xdp_redirect_cpu__create_skeleton struct bpf_object_skeleton *s; s = (struct bpf_object_skeleton *)calloc(1, sizeof(*s)); if (!s) goto error; ... error: bpf_object__destroy_skeleton(s); return -ENOMEM;
After goto error, the NULL 's' will be deferenced in bpf_object__destroy_skeleton().
We can simply fix this issue by just adding a NULL check in bpf_object__destroy_skeleton().
--- tools/lib/bpf/libbpf.c | 3 +++ 1 file changed, 3 insertions(+)
tools/lib/bpf/libbpf.c +3 -0
@@ -10809,6 +10809,9 @@ void bpf_object__detach_skeleton(struct bpf_object_skeleton *s)void bpf_object__destroy_skeleton (struct bpf_object_skeleton *s) { +if (!s) +return ; +if (s->progs)bpf_object__detach_skeleton (s);if (s->obj)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 386/913 bpftool: Only set obj->skeleton on complete success
In reply to Greg Kroah-HartmanFrom: Wei Fu <[email protected]>
[ Upstream commit 0991f6a38f576aa9a5e34713e23c998a3310d4d0 ]
After bpftool gen skeleton, the ${bpf_app}.skel.h will provide that ${bpf_app_name}__open helper to load bpf. If there is some error like ENOMEM, the ${bpf_app_name}__open will rollback(free) the allocated object, including bpf_object_skeleton.
Since the ${bpf_app_name}__create_skeleton set the obj->skeleton first and not rollback it when error, it will cause double-free in ${bpf_app_name}__destory at ${bpf_app_name}__open. Therefore, we should set the obj->skeleton before return 0;
--- tools/bpf/bpftool/gen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/gen.c +1 -1
@@ -870,7 +870,6 @@ static int do_skeleton(int argc, char **argv) s = (struct bpf_object_skeleton *)calloc(1, sizeof(*s));\n\ if (!s) \n\ goto err; \n\ - obj->skeleton = s; \n\ \n\ s->sz = sizeof(*s); \n\ s->name = \"%1$s\"; \n\
@@ -955,6 +954,7 @@ static int do_skeleton(int argc, char **argv) \n\ \"; \n\\n\ +obj->skeleton = s; \n\ return 0; \n\ err: \n\ bpf_object__destroy_skeleton(s); \n\
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 387/913 udmabuf: validate ubuf->pagecount
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 2b6dd600dd72573c23ea180b5b0b2f1813405882 ]
Syzbot has reported GPF in sg_alloc_append_table_from_pages(). The problem was in ubuf->pages == ZERO_PTR.
ubuf->pagecount is calculated from arguments passed from user-space. If user creates udmabuf with list.size == 0 then ubuf->pagecount will be also equal to zero; it causes kmalloc_array() to return ZERO_PTR.
Fix it by validating ubuf->pagecount before passing it to kmalloc_array().
--- drivers/dma-buf/udmabuf.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/dma-buf/udmabuf.c +4 -0
@@ -190,6 +190,10 @@ static long udmabuf_create(struct miscdevice *device,if (ubuf->pagecount > pglimit) goto err; } + +if (!ubuf->pagecount) + goto err; + ubuf->pages =kmalloc_array (ubuf->pagecount,sizeof (*ubuf->pages),GFP_KERNEL );if (!ubuf->pages) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 388/913 bpf: Fix UAF due to race between btf_try_get_module and load_module
In reply to Greg Kroah-HartmanFrom: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit 18688de203b47e5d8d9d0953385bf30b5949324f ]
While working on code to populate kfunc BTF ID sets for module BTF from its initcall, I noticed that by the time the initcall is invoked, the module BTF can already be seen by userspace (and the BPF verifier). The existing btf_try_get_module calls try_module_get which only fails if mod->state == MODULE_STATE_GOING, i.e. it can increment module reference when module initcall is happening in parallel.
Currently, BTF parsing happens from MODULE_STATE_COMING notifier callback. At this point, the module initcalls have not been invoked. The notifier callback parses and prepares the module BTF, allocates an ID, which publishes it to userspace, and then adds it to the btf_modules list allowing the kernel to invoke btf_try_get_module for the BTF.
However, at this point, the module has not been fully initialized (i.e. its initcalls have not finished). The code in module.c can still fail and free the module, without caring for other users. However, nothing stops btf_try_get_module from succeeding between the state transition from MODULE_STATE_COMING to MODULE_STATE_LIVE.
This leads to a use-after-free issue when BPF program loads successfully in the state transition, load_module's do_init_module call fails and frees the module, and BPF program fd on close calls module_put for the freed module. Future patch has test case to verify we don't regress in this area in future.
There are multiple points after prepare_coming_module (in load_module) where failure can occur and module loading can return error. We illustrate and test for the race using the last point where it can practically occur (in module __init function).
An illustration of the race:
CPU 0 CPU 1
load_module
notifier_call(MODULE_STATE_COMING)
btf_parse_module
btf_alloc_id // Published to userspace
list_add(&btf_mod->list, btf_modules)
mod->init(...)
... ^
bpf_check |
check_pseudo_btf_id |
btf_try_get_module |
returns true | ...
... | module __init in progress
return prog_fd | ...
... V
if (ret < 0)
free_module(mod)
...close(prog_fd)
...
bpf_prog_free_deferred
module_put(used_btf.mod) // use-after-free
We fix this issue by setting a flag BTF_MODULE_F_LIVE, from the notifier callback when MODULE_STATE_LIVE state is reached for the module, so that we return NULL from btf_try_get_module for modules that are not fully formed. Since try_module_get already checks that module is not in MODULE_STATE_GOING state, and that is the only transition a live module can make before being removed from btf_modules list, this is enough to close the race and prevent the bug.
A later selftest patch crafts the race condition artifically to verify that it has been fixed, and that verifier fails to load program (with ENXIO).
Lastly, a couple of comments:
1. Even if this race didn't exist, it seems more appropriate to only access resources (ksyms and kfuncs) of a fully formed module which has been initialized completely.
2. This patch was born out of need for synchronization against module initcall for the next patch, so it is needed for correctness even without the aforementioned race condition. The BTF resources initialized by module initcall are set up once and then only looked up, so just waiting until the initcall has finished ensures correct behavior.
--- kernel/bpf/btf.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
kernel/bpf/btf.c +24 -2
@@ -6006,12 +6006,17 @@ bool btf_id_set_contains(const struct btf_id_set *set, u32 id)return bsearch (&id, set->ids, set->cnt,sizeof (u32), btf_id_cmp_func) !=NULL ; } +enum { +BTF_MODULE_F_LIVE = (1 <<0 ), +}; +#ifdef CONFIG_DEBUG_INFO_BTF_MODULES struct btf_module {struct list_head list;struct module *module;struct btf *btf;struct bin_attribute *sysfs_attr; +int flags; };static LIST_HEAD (btf_modules);
@@ -6037,7 +6042,8 @@ static int btf_module_notify(struct notifier_block *nb, unsigned long op,int err =0 ;if (mod->btf_data_size ==0 || - (op !=MODULE_STATE_COMING && op !=MODULE_STATE_GOING )) + (op !=MODULE_STATE_COMING && op !=MODULE_STATE_LIVE && + op !=MODULE_STATE_GOING )) goto out;switch (op) {
@@ -6094,6 +6100,17 @@ static int btf_module_notify(struct notifier_block *nb, unsigned long op, btf_mod->sysfs_attr = attr; } +break ; +case MODULE_STATE_LIVE : +mutex_lock (&btf_module_mutex); +list_for_each_entry_safe (btf_mod, tmp, &btf_modules, list) { +if (btf_mod->module != module) +continue ; + + btf_mod->flags |=BTF_MODULE_F_LIVE ; +break ; + } +mutex_unlock (&btf_module_mutex);break ;case MODULE_STATE_GOING :mutex_lock (&btf_module_mutex);
@@ -6140,7 +6157,12 @@ struct module *btf_try_get_module(const struct btf *btf)if (btf_mod->btf != btf)continue ; -if (try_module_get (btf_mod->module)) +/* We must only consider module whose __init routine has +* finished, hence we must check for BTF_MODULE_F_LIVE flag, +* which is set from the notifier callback for +* MODULE_STATE_LIVE. +*/ +if ((btf_mod->flags &BTF_MODULE_F_LIVE ) &&try_module_get (btf_mod->module)) res = btf_mod->module;break ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 389/913 drm/selftests/test-drm_dp_mst_helper: Fix memory leak in sideband_msg_req_encode_decode
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
[ Upstream commit ba3a5ddcf1e5df31f2291006d5297ca62035584f ]
Avoid leaking the "out" variable if it is not possible to allocate the "txmsg" variable.
Addresses-Coverity-ID: 1475685 ("Resource leak")
--- drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +3 -1
@@ -131,8 +131,10 @@ sideband_msg_req_encode_decode(struct drm_dp_sideband_msg_req_body *in)return false; txmsg =kzalloc (sizeof (*txmsg),GFP_KERNEL ); -if (!txmsg) +if (!txmsg) { +kfree (out);return false; + }drm_dp_encode_sideband_req (in, txmsg); ret =drm_dp_decode_sideband_req (txmsg, out);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 390/913 selftests: bpf: Fix bind on used port
In reply to Greg Kroah-HartmanFrom: Felix Maurer <[email protected]>
[ Upstream commit 8c0be0631d81e48f77d0ebf0534c86e32bef5f89 ]
The bind_perm BPF selftest failed when port 111/tcp was already in use during the test. To fix this, the test now runs in its own network name space.
To use unshare, it is necessary to reorder the includes. The style of the includes is adapted to be consistent with the other prog_tests.
v2: Replace deprecated CHECK macro with ASSERT_OK
--- .../selftests/bpf/prog_tests/bind_perm.c | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/prog_tests/bind_perm.c +17 -3
@@ -1,13 +1,24 @@// SPDX-License-Identifier: GPL-2.0 -#include <test_progs.h> -#include "bind_perm.skel.h" - +#define _GNU_SOURCE +#include <sched.h> +#include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/capability.h> +#include "test_progs.h" +#include "bind_perm.skel.h" +static int duration; +static int create_netns (void ) +{ +if (!ASSERT_OK (unshare (CLONE_NEWNET ),"create netns" )) +return -1 ; + +return 0 ; +} +void try_bind (int family,int port,int expected_errno) {struct sockaddr_storage addr = {};
@@ -75,6 +86,9 @@ void test_bind_perm(void)struct bind_perm *skel;int cgroup_fd; +if (create_netns ()) +return ; + cgroup_fd =test__join_cgroup ("/bind_perm" );if (CHECK (cgroup_fd <0 ,"cg-join" ,"errno %d" , errno))return ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 391/913 Bluetooth: btintel: Fix WBS setting for Intel legacy ROM products
In reply to Greg Kroah-HartmanFrom: Tedd Ho-Jeong An <[email protected]>
[ Upstream commit 55235304c2560d4a94ccfff2a47ea927b4114064 ]
This patch adds the flag to identify the Intel legacy ROM products that don't support WBS like WP and StP.
--- drivers/bluetooth/btintel.c | 11 ++++++++--- drivers/bluetooth/btintel.h | 1 + drivers/bluetooth/btusb.c | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-)
drivers/bluetooth/btintel.c +8 -3
@@ -2263,10 +2263,15 @@ static int btintel_setup_combined(struct hci_dev *hdev)/* Apply the device specific HCI quirks * -* WBS for SdP - SdP and Stp have a same hw_varaint but -* different fw_variant +* WBS for SdP - For the Legacy ROM products, only SdP +* supports the WBS. But the version information is not +* enough to use here because the StP2 and SdP have same +* hw_variant and fw_variant. So, this flag is set by +* the transport driver (btusb) based on the HW info +* (idProduct) */ -if (ver.hw_variant ==0x08 && ver.fw_variant ==0x22 ) +if (!btintel_test_flag (hdev, +INTEL_ROM_LEGACY_NO_WBS_SUPPORT ))set_bit (HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED , &hdev->quirks);
drivers/bluetooth/btintel.h +1 -0
@@ -147,6 +147,7 @@ enum {INTEL_BROKEN_INITIAL_NCMD ,INTEL_BROKEN_SHUTDOWN_LED ,INTEL_ROM_LEGACY , +INTEL_ROM_LEGACY_NO_WBS_SUPPORT , __INTEL_NUM_FLAGS, };
drivers/bluetooth/btusb.c +6 -0
@@ -61,6 +61,7 @@ static struct usb_driver btusb_driver;#define BTUSB_QCA_WCN6855 0x1000000#define BTUSB_INTEL_BROKEN_SHUTDOWN_LED 0x2000000#define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000 +#define BTUSB_INTEL_NO_WBS_SUPPORT 0x8000000static const struct usb_device_id btusb_table[] = {/* Generic Bluetooth USB device */
@@ -384,9 +385,11 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED | +BTUSB_INTEL_NO_WBS_SUPPORT |BTUSB_INTEL_BROKEN_INITIAL_NCMD | BTUSB_INTEL_BROKEN_SHUTDOWN_LED }, { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED | +BTUSB_INTEL_NO_WBS_SUPPORT | BTUSB_INTEL_BROKEN_SHUTDOWN_LED }, { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL_COMBINED |
@@ -3863,6 +3866,9 @@ static int btusb_probe(struct usb_interface *intf, hdev->send = btusb_send_frame_intel; hdev->cmd_timeout = btusb_intel_cmd_timeout; +if (id->driver_info &BTUSB_INTEL_NO_WBS_SUPPORT ) +btintel_set_flag (hdev,INTEL_ROM_LEGACY_NO_WBS_SUPPORT ); +if (id->driver_info &BTUSB_INTEL_BROKEN_INITIAL_NCMD )btintel_set_flag (hdev,INTEL_BROKEN_INITIAL_NCMD );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 392/913 Bluetooth: hci_serdev: call init_rwsem() before p->open()
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 9d7cbe2b9cf5f650067df4f402fdd799d4bbb4e1 ]
kvartet reported, that hci_uart_tx_wakeup() uses uninitialized rwsem. The problem was in wrong place for percpu_init_rwsem() call.
hci_uart_proto::open() may register a timer whose callback may call hci_uart_tx_wakeup(). There is a chance, that hci_uart_register_device() thread won't be fast enough to call percpu_init_rwsem().
Fix it my moving percpu_init_rwsem() call before p->open().
INFO: trying to register non-static key.
The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator.
CPU: 2 PID: 18524 Comm: syz-executor.5 Not tainted 5.16.0-rc6 #9 ... Call Trace: <IRQ> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 assign_lock_key kernel/locking/lockdep.c:951 [inline] register_lock_class+0x148d/0x1950 kernel/locking/lockdep.c:1263 __lock_acquire+0x106/0x57e0 kernel/locking/lockdep.c:4906 lock_acquire kernel/locking/lockdep.c:5637 [inline] lock_acquire+0x1ab/0x520 kernel/locking/lockdep.c:5602 percpu_down_read_trylock include/linux/percpu-rwsem.h:92 [inline] hci_uart_tx_wakeup+0x12e/0x490 drivers/bluetooth/hci_ldisc.c:124 h5_timed_event+0x32f/0x6a0 drivers/bluetooth/hci_h5.c:188 call_timer_fn+0x1a5/0x6b0 kernel/time/timer.c:1421
--- drivers/bluetooth/hci_serdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_serdev.c +2 -1
@@ -305,6 +305,8 @@ int hci_uart_register_device(struct hci_uart *hu,if (err)return err; +percpu_init_rwsem (&hu->proto_lock); + err = p->open (hu);if (err) goto err_open;
@@ -327,7 +329,6 @@ int hci_uart_register_device(struct hci_uart *hu,INIT_WORK (&hu->init_ready, hci_uart_init_work);INIT_WORK (&hu->write_work, hci_uart_write_work); -percpu_init_rwsem (&hu->proto_lock);/* Only when vendor specific setup callback is provided, consider * the manufacturer information valid. This avoids filling in the
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 393/913 mtd: onenand: Check for error irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 3e68f331c8c759c0daa31cc92c3449b23119a215 ]
For the possible failure of the platform_get_irq(), the returned irq could be error number and will finally cause the failure of the request_irq().
Consider that platform_get_irq() can now in certain cases return -EPROBE_DEFER, and the consequences of letting request_irq() effectively convert that into -EINVAL, even at probe time rather than later on. So it might be better to check just now.
--- drivers/mtd/nand/onenand/generic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/generic.c +6 -1
@@ -53,7 +53,12 @@ static int generic_onenand_probe(struct platform_device *pdev) } info->onenand.mmcontrol = pdata ? pdata->mmcontrol :NULL ; - info->onenand.irq =platform_get_irq (pdev,0 ); + + err =platform_get_irq (pdev,0 ); +if (err <0 ) + goto out_iounmap; + + info->onenand.irq = err; info->mtd.dev.parent = &pdev->dev; info->mtd.priv = &info->onenand;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 394/913 mtd: rawnand: gpmi: fix controller timings setting
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 2970bf5a32f079e1e9197411db4fe9faccb1503a ]
Set the controller registers according to the real clock rate. The controller registers configuration (setup, hold, timeout, ... cycles) depends on the clock rate of the GPMI. Using the real rate instead of the ideal one, avoids that this inaccuracy (required_rate - real_rate) affects the registers setting.
This patch has been tested on two custom boards with i.MX28 and i.MX6 SOCs:
- i.MX28:
required rate 100MHz, real rate 99.3MHz
- i.MX6
required rate 100MHz, real rate 99MHz
--- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +3 -0
@@ -648,6 +648,7 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this, const struct nand_sdr_timings *sdr) {struct gpmi_nfc_hardware_timing *hw = &this->hw; +struct resources *r = &this->resources;unsigned int dll_threshold_ps = this->devdata->max_chain_delay;unsigned int period_ps, reference_period_ps;unsigned int data_setup_cycles, data_hold_cycles, addr_setup_cycles;
@@ -671,6 +672,8 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this, wrn_dly_sel =BV_GPMI_CTRL1_WRN_DLY_SEL_NO_DELAY ; } + hw->clk_rate =clk_round_rate (r->clock[0 ], hw->clk_rate); +/* SDR core timings are given in picoseconds */ period_ps =div_u64 ((u64 )NSEC_PER_SEC *1000 , hw->clk_rate);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 395/913 drm/edid: Dont clear formats if using deep color
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 75478b3b393bcbdca4e6da76fe3a9f1a4133ec5d ]
The current code, when parsing the EDID Deep Color depths, that the YUV422 cannot be used, referring to the HDMI 1.3 Specification.
This specification, in its section 6.2.4, indeed states:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is not permitted for any Deep Color mode.
This indeed can be interpreted like the code does, but the HDMI 1.4 specification further clarifies that statement in its section 6.2.4:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is also 36-bit mode but does not require the further use of the Deep Color modes described in section 6.5.2 and 6.5.3.
This means that, even though YUV422 can be used with 12 bit per color, it shouldn't be treated as a deep color mode.
This is also broken with YUV444 if it's supported by the display, but DRM_EDID_HDMI_DC_Y444 isn't set. In such a case, the code will clear color_formats of the YUV444 support set previously in drm_parse_cea_ext(), but will not set it back.
Since the formats supported are already setup properly in drm_parse_cea_ext(), let's just remove the code modifying the formats in drm_parse_hdmi_deep_color_info()
--- drivers/gpu/drm/drm_edid.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -8
@@ -5033,16 +5033,8 @@ static void drm_parse_hdmi_deep_color_in connector->name, dc_bpc); info->bpc = dc_bpc; -/* -* Deep color support mandates RGB444 support for all video -* modes and forbids YCRCB422 support for all video modes per -* HDMI 1.3 spec. -*/ - info->color_formats =DRM_COLOR_FORMAT_RGB444 ; -/* YCRCB444 is optional according to spec. */ if (hdmi[6 ] &DRM_EDID_HDMI_DC_Y444 ) { - info->color_formats |=DRM_COLOR_FORMAT_YCRCB444 ;DRM_DEBUG ("%s: HDMI sink does YCRCB444 in deep color.\n" , connector->name); }
Greg Kroah-Hartman
maintainerPATCH 396/913 drm/edid: Split deep color modes between RGB and YUV444
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 4adc33f36d80489339f1b43dfeee96bb9ea8e459 ]
The current code assumes that the RGB444 and YUV444 formats are the same, but the HDMI 2.0 specification states that:
The three DC_XXbit bits above only indicate support for RGB 4:4:4 at that pixel size. Support for YCBCR 4:4:4 in Deep Color modes is indicated with the DC_Y444 bit. If DC_Y444 is set, then YCBCR 4:4:4 is supported for all modes indicated by the DC_XXbit flags.
So if we have YUV444 support and any DC_XXbit flag set but the DC_Y444 flag isn't, we'll assume that we support that deep colour mode for YUV444 which breaks the specification.
In order to fix this, let's split the edid_hdmi_dc_modes field in struct drm_display_info into two fields, one for RGB444 and one for YUV444.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- drivers/gpu/drm/drm_edid.c | 7 ++++--- drivers/gpu/drm/i915/display/intel_hdmi.c | 4 ++-- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- include/drm/drm_connector.h | 12 +++++++++--- 5 files changed, 17 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +1 -1
@@ -175,7 +175,7 @@ int amdgpu_connector_get_monitor_bpc(str/* Check if bpc is within clock limit. Try to degrade gracefully otherwise */ if ((bpc ==12 ) && (mode_clock *3 /2 > max_tmds_clock)) { -if ((connector->display_info.edid_hdmi_dc_modes &DRM_EDID_HDMI_DC_30 ) && +if ((connector->display_info.edid_hdmi_rgb444_dc_modes &DRM_EDID_HDMI_DC_30 ) && (mode_clock *5 /4 <= max_tmds_clock)) bpc =10 ;else
drivers/gpu/drm/drm_edid.c +4 -3
@@ -5004,21 +5004,21 @@ static void drm_parse_hdmi_deep_color_inif (hdmi[6 ] &DRM_EDID_HDMI_DC_30 ) { dc_bpc =10 ; - info->edid_hdmi_dc_modes |=DRM_EDID_HDMI_DC_30 ; + info->edid_hdmi_rgb444_dc_modes |=DRM_EDID_HDMI_DC_30 ;DRM_DEBUG ("%s: HDMI sink does deep color 30.\n" , connector->name); }if (hdmi[6 ] &DRM_EDID_HDMI_DC_36 ) { dc_bpc =12 ; - info->edid_hdmi_dc_modes |=DRM_EDID_HDMI_DC_36 ; + info->edid_hdmi_rgb444_dc_modes |=DRM_EDID_HDMI_DC_36 ;DRM_DEBUG ("%s: HDMI sink does deep color 36.\n" , connector->name); }if (hdmi[6 ] &DRM_EDID_HDMI_DC_48 ) { dc_bpc =16 ; - info->edid_hdmi_dc_modes |=DRM_EDID_HDMI_DC_48 ; + info->edid_hdmi_rgb444_dc_modes |=DRM_EDID_HDMI_DC_48 ;DRM_DEBUG ("%s: HDMI sink does deep color 48.\n" , connector->name); }
@@ -5035,6 +5035,7 @@ static void drm_parse_hdmi_deep_color_in/* YCRCB444 is optional according to spec. */ if (hdmi[6 ] &DRM_EDID_HDMI_DC_Y444 ) { + info->edid_hdmi_ycbcr444_dc_modes = info->edid_hdmi_rgb444_dc_modes;DRM_DEBUG ("%s: HDMI sink does YCRCB444 in deep color.\n" , connector->name); }
drivers/gpu/drm/i915/display/intel_hdmi.c +2 -2
@@ -1892,7 +1892,7 @@ static bool intel_hdmi_bpc_possible(struif (ycbcr420_output)return hdmi->y420_dc_modes &DRM_EDID_YCBCR420_DC_36 ;else -return info->edid_hdmi_dc_modes &DRM_EDID_HDMI_DC_36 ; +return info->edid_hdmi_rgb444_dc_modes &DRM_EDID_HDMI_DC_36 ;case 10 :if (DISPLAY_VER (i915) <11 )return false;
@@ -1903,7 +1903,7 @@ static bool intel_hdmi_bpc_possible(struif (ycbcr420_output)return hdmi->y420_dc_modes &DRM_EDID_YCBCR420_DC_30 ;else -return info->edid_hdmi_dc_modes &DRM_EDID_HDMI_DC_30 ; +return info->edid_hdmi_rgb444_dc_modes &DRM_EDID_HDMI_DC_30 ;case 8 :return true;default :
drivers/gpu/drm/radeon/radeon_connectors.c +1 -1
@@ -204,7 +204,7 @@ int radeon_get_monitor_bpc(struct drm_co/* Check if bpc is within clock limit. Try to degrade gracefully otherwise */ if ((bpc ==12 ) && (mode_clock *3 /2 > max_tmds_clock)) { -if ((connector->display_info.edid_hdmi_dc_modes &DRM_EDID_HDMI_DC_30 ) && +if ((connector->display_info.edid_hdmi_rgb444_dc_modes &DRM_EDID_HDMI_DC_30 ) && (mode_clock *5 /4 <= max_tmds_clock)) bpc =10 ;else
include/drm/drm_connector.h +9 -3
@@ -566,10 +566,16 @@ struct drm_display_info {bool rgb_quant_range_selectable;/** -* @edid_hdmi_dc_modes: Mask of supported hdmi deep color modes. Even -* more stuff redundant with @bus_formats. +* @edid_hdmi_dc_rgb444_modes: Mask of supported hdmi deep color modes +* in RGB 4:4:4. Even more stuff redundant with @bus_formats. */ -u8 edid_hdmi_dc_modes; +u8 edid_hdmi_rgb444_dc_modes; + +/** +* @edid_hdmi_dc_ycbcr444_modes: Mask of supported hdmi deep color +* modes in YCbCr 4:4:4. Even more stuff redundant with @bus_formats. +*/ +u8 edid_hdmi_ycbcr444_dc_modes;/** * @cea_rev: CEA revision of the HDMI sink.
Greg Kroah-Hartman
maintainerPATCH 397/913 ionic: fix type complaint in ionic_dev_cmd_clean()
In reply to Greg Kroah-HartmanFrom: Shannon Nelson <[email protected]>
[ Upstream commit bc0bf9de6f48268f4ee59e57fb42ac751be3ecda ]
Sparse seems to have gotten a little more picky lately and we need to revisit this bit of code to make sparse happy.
warning: incorrect type in initializer (different address spaces)
expected union ionic_dev_cmd_regs *regs
got union ionic_dev_cmd_regs [noderef] __iomem *dev_cmd_regs
warning: incorrect type in argument 2 (different address spaces)
expected void [noderef] __iomem *
got unsigned int *
warning: incorrect type in argument 1 (different address spaces)
expected void volatile [noderef] __iomem *
got union ionic_dev_cmd *
--- drivers/net/ethernet/pensando/ionic/ionic_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_main.c +3 -3
@@ -328,10 +328,10 @@ int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)static void ionic_dev_cmd_clean (struct ionic *ionic) { -union __iomem ionic_dev_cmd_regs *regs = ionic->idev.dev_cmd_regs; +struct ionic_dev *idev = &ionic->idev; -iowrite32 (0 , ®s->doorbell); -memset_io (®s->cmd,0 ,sizeof (regs->cmd)); +iowrite32 (0 , &idev->dev_cmd_regs->doorbell); +memset_io (&idev->dev_cmd_regs->cmd,0 ,sizeof (idev->dev_cmd_regs->cmd)); }int ionic_dev_cmd_wait (struct ionic *ionic,unsigned long max_seconds)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 398/913 ionic: start watchdog after all is setup
In reply to Greg Kroah-HartmanFrom: Shannon Nelson <[email protected]>
[ Upstream commit 9ad2939a1525962a79a2fd974ec7e3a71455b964 ]
The watchdog expects the lif to fully exist when it goes off, so lets not start the watchdog until all is ready in case there is some quirky time dialation that makes probe take multiple seconds.
--- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 4 +++- drivers/net/ethernet/pensando/ionic/ionic_dev.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +3 -1
@@ -331,6 +331,9 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_deregister_lifs; } +mod_timer (&ionic->watchdog_timer, +round_jiffies (jiffies + ionic->watchdog_period)); +return 0 ; err_out_deregister_lifs:
@@ -348,7 +351,6 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_out_reset:ionic_reset (ionic); err_out_teardown: -del_timer_sync (&ionic->watchdog_timer);pci_clear_master (pdev);/* Don't fail the probe for these errors, keep * the hw interface around for inspection
drivers/net/ethernet/pensando/ionic/ionic_dev.c +0 -3
@@ -122,9 +122,6 @@ int ionic_dev_setup(struct ionic *ionic) idev->fw_generation =IONIC_FW_STS_F_GENERATION &ioread8 (&idev->dev_info_regs->fw_status); -mod_timer (&ionic->watchdog_timer, -round_jiffies (jiffies + ionic->watchdog_period)); - idev->db_pages = bar->vaddr; idev->phy_db_pages = bar->bus_addr;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 399/913 ionic: Dont send reset commands if FW isnt running
In reply to Greg Kroah-HartmanFrom: Brett Creeley <[email protected]>
[ Upstream commit b8fd0271dad00b953caaabe73474788d3d19e252 ]
It's possible the FW is already shutting down while the driver is being removed and/or when the driver is going through reset. This can cause unexpected/unnecessary errors to be printed:
eth0: DEV_CMD IONIC_CMD_PORT_RESET (12) error, IONIC_RC_ERROR (29) failed
eth1: DEV_CMD IONIC_CMD_RESET (3) error, IONIC_RC_ERROR (29) failed
Fix this by checking the FW status register before issuing the reset commands.
Also, since err may not be assigned in ionic_port_reset(), assign it a default value of 0, and remove an unnecessary log message.
--- .../net/ethernet/pensando/ionic/ionic_dev.c | 17 ++++++++++++----- .../net/ethernet/pensando/ionic/ionic_dev.h | 1 + .../net/ethernet/pensando/ionic/ionic_main.c | 18 ++++++++++-------- 3 files changed, 23 insertions(+), 13 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_dev.c +12 -5
@@ -129,6 +129,16 @@ int ionic_dev_setup(struct ionic *ionic) }/* Devcmd Interface */ +bool ionic_is_fw_running (struct ionic_dev *idev) +{ +u8 fw_status =ioread8 (&idev->dev_info_regs->fw_status); + +/* firmware is useful only if the running bit is set and +* fw_status != 0xff (bad PCI read) +*/ +return (fw_status !=0xff ) && (fw_status &IONIC_FW_STS_F_RUNNING ); +} +int ionic_heartbeat_check (struct ionic *ionic) {struct ionic_dev *idev = &ionic->idev;
@@ -152,13 +162,10 @@ int ionic_heartbeat_check(struct ionic *ionic) goto do_check_time; } -/* firmware is useful only if the running bit is set and -* fw_status != 0xff (bad PCI read) -* If fw_status is not ready don't bother with the generation. -*/ fw_status =ioread8 (&idev->dev_info_regs->fw_status); -if (fw_status ==0xff || !(fw_status &IONIC_FW_STS_F_RUNNING )) { +/* If fw_status is not ready don't bother with the generation */ +if (!ionic_is_fw_running (idev)) { fw_status_ready = false; }else { fw_generation = fw_status &IONIC_FW_STS_F_GENERATION ;
drivers/net/ethernet/pensando/ionic/ionic_dev.h +1 -0
@@ -357,5 +357,6 @@ void ionic_q_rewind(struct ionic_queue *q, struct ionic_desc_info *start);void ionic_q_service (struct ionic_queue *q,struct ionic_cq_info *cq_info,unsigned int stop_index);int ionic_heartbeat_check (struct ionic *ionic); +bool ionic_is_fw_running (struct ionic_dev *idev);#endif /* _IONIC_DEV_H_ */
drivers/net/ethernet/pensando/ionic/ionic_main.c +10 -8
@@ -488,6 +488,9 @@ int ionic_reset(struct ionic *ionic)struct ionic_dev *idev = &ionic->idev;int err; +if (!ionic_is_fw_running (idev)) +return 0 ; +mutex_lock (&ionic->dev_cmd_lock);ionic_dev_cmd_reset (idev); err =ionic_dev_cmd_wait (ionic,DEVCMD_TIMEOUT );
@@ -560,15 +563,17 @@ int ionic_port_init(struct ionic *ionic)int ionic_port_reset (struct ionic *ionic) {struct ionic_dev *idev = &ionic->idev; -int err; +int err =0 ;if (!idev->port_info)return 0 ; -mutex_lock (&ionic->dev_cmd_lock); -ionic_dev_cmd_port_reset (idev); - err =ionic_dev_cmd_wait (ionic,DEVCMD_TIMEOUT ); -mutex_unlock (&ionic->dev_cmd_lock); +if (ionic_is_fw_running (idev)) { +mutex_lock (&ionic->dev_cmd_lock); +ionic_dev_cmd_port_reset (idev); + err =ionic_dev_cmd_wait (ionic,DEVCMD_TIMEOUT ); +mutex_unlock (&ionic->dev_cmd_lock); + }dma_free_coherent (ionic->dev, idev->port_info_sz, idev->port_info, idev->port_info_pa);
@@ -576,9 +581,6 @@ int ionic_port_reset(struct ionic *ionic) idev->port_info =NULL ; idev->port_info_pa =0 ; -if (err) -dev_err (ionic->dev,"Failed to reset port\n" ); -return err; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 400/913 drm/nouveau/acr: Fix undefined behavior in nvkm_acr_hsfw_load_bl()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit 2343bcdb4747d4f418a4daf2e898b94f86c24a59 ]
In nvkm_acr_hsfw_load_bl(), the return value of kmalloc() is directly passed to memcpy(), which could lead to undefined behavior on failure of kmalloc().
Fix this bug by using kmemdup() instead of kmalloc()+memcpy().
This bug was found by a static analyzer.
Builds with 'make allyesconfig' show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c +5 -4
@@ -142,11 +142,12 @@ nvkm_acr_hsfw_load_bl(struct nvkm_acr *acr, const char *name, int ver, hsfw->imem_size = desc->code_size; hsfw->imem_tag = desc->start_tag; - hsfw->imem =kmalloc (desc->code_size,GFP_KERNEL ); -memcpy (hsfw->imem, data + desc->code_off, desc->code_size); - + hsfw->imem =kmemdup (data + desc->code_off, desc->code_size,GFP_KERNEL );nvkm_firmware_put (fw); -return 0 ; +if (!hsfw->imem) +return -ENOMEM ; +else +return 0 ; }int
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 401/913 drm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit 588a70177df3b1777484267584ef38ab2ca899a2 ]
In amdgpu_dm_connector_add_common_modes(), amdgpu_dm_create_common_mode() is assigned to mode and is passed to drm_mode_probed_add() directly after that. drm_mode_probed_add() passes &mode->head to list_add_tail(), and there is a dereference of it in list_add_tail() without recoveries, which could lead to NULL pointer dereference on failure of amdgpu_dm_create_common_mode().
Fix this by adding a NULL check of mode.
This bug was found by a static analyzer.
Builds with 'make allyesconfig' show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -7554,6 +7554,9 @@ static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder, mode =amdgpu_dm_create_common_mode (encoder, common_modes[i].name, common_modes[i].w, common_modes[i].h); +if (!mode) +continue ; +drm_mode_probed_add (connector, mode); amdgpu_dm_connector->num_modes++; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 402/913 drm/amd/pm: return -ENOTSUPP if there is no get_dpm_ultimate_freq function
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 430e6a0212b2a0eb1de5e9d47a016fa79edf3978 ]
clang static analysis reports this represenative problem amdgpu_smu.c:144:18: warning: The left operand of '*' is a garbage value
return clk_freq * 100;
~~~~~~~~ ^If there is no get_dpm_ultimate_freq function, smu_get_dpm_freq_range returns success without setting the output min,max parameters. So return an -ENOTSUPP error.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -1
@@ -138,7 +138,7 @@ int smu_get_dpm_freq_range(struct smu_context *smu,uint32_t *min, uint32_t *max) { - int ret = 0; + int ret = -ENOTSUPP;if (!min && !max)return -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 403/913 net: phy: at803x: move page selection fix to config_init
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit 4f3a00c7f5b2cfe4e127fd3fe49b55e1b318c01f ]
The fix to select the copper page on AR8031 was being done in the probe function rather than config_init, so it would not be redone after resume from suspend. Move this to config_init so it is always redone when needed.
--- drivers/net/phy/at803x.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-)
drivers/net/phy/at803x.c +16 -24
@@ -666,25 +666,7 @@ static int at803x_probe(struct phy_device *phydev)return ret; } -/* Some bootloaders leave the fiber page selected. -* Switch to the copper page, as otherwise we read -* the PHY capabilities from the fiber side. -*/ -if (phydev->drv->phy_id ==ATH8031_PHY_ID ) { -phy_lock_mdio_bus (phydev); - ret =at803x_write_page (phydev,AT803X_PAGE_COPPER ); -phy_unlock_mdio_bus (phydev); -if (ret) - goto err; - } -return 0 ; - -err: -if (priv->vddio) -regulator_disable (priv->vddio); - -return ret; }static void at803x_remove (struct phy_device *phydev)
@@ -785,6 +767,22 @@ static int at803x_config_init(struct phy_device *phydev) {int ret; +if (phydev->drv->phy_id ==ATH8031_PHY_ID ) { +/* Some bootloaders leave the fiber page selected. +* Switch to the copper page, as otherwise we read +* the PHY capabilities from the fiber side. +*/ +phy_lock_mdio_bus (phydev); + ret =at803x_write_page (phydev,AT803X_PAGE_COPPER ); +phy_unlock_mdio_bus (phydev); +if (ret) +return ret; + + ret =at8031_pll_config (phydev); +if (ret <0 ) +return ret; + } +/* The RX and TX delay default is: * after HW reset: RX delay enabled and TX delay disabled * after SW reset: RX delay enabled, while TX delay retains the
@@ -814,12 +812,6 @@ static int at803x_config_init(struct phy_device *phydev)if (ret <0 )return ret; -if (phydev->drv->phy_id ==ATH8031_PHY_ID ) { - ret =at8031_pll_config (phydev); -if (ret <0 ) -return ret; - } -/* Ar803x extended next page bit is enabled by default. Cisco * multigig switches read this bit and attempt to negotiate 10Gbps * rates even if the next page bit is disabled. This is incorrect
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 404/913 selftests/bpf: Normalize XDP section names in selftests
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 8fffa0e3451abdd84e4b4e427f7e66040eb24f43 ]
Convert almost all SEC("xdp_blah") uses to strict SEC("xdp") to comply with strict libbpf 1.0 logic of exact section name match for XDP program types. There is only one exception, which is only tested through iproute2 and defines multiple XDP programs within the same BPF object. Given iproute2 still works in non-strict libbpf mode and it doesn't have means to specify XDP programs by its name (not section name/title), leave that single file alone for now until iproute2 gains lookup by function/program name.
--- tools/testing/selftests/bpf/progs/test_map_in_map.c | 2 +- .../selftests/bpf/progs/test_tcp_check_syncookie_kern.c | 2 +- tools/testing/selftests/bpf/progs/test_xdp.c | 2 +- .../testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c | 2 +- .../selftests/bpf/progs/test_xdp_adjust_tail_shrink.c | 4 +--- tools/testing/selftests/bpf/progs/test_xdp_devmap_helpers.c | 2 +- tools/testing/selftests/bpf/progs/test_xdp_link.c | 2 +- tools/testing/selftests/bpf/progs/test_xdp_loop.c | 2 +- tools/testing/selftests/bpf/progs/test_xdp_noinline.c | 4 ++-- .../selftests/bpf/progs/test_xdp_with_cpumap_helpers.c | 4 ++-- .../selftests/bpf/progs/test_xdp_with_devmap_helpers.c | 4 ++-- tools/testing/selftests/bpf/progs/xdp_dummy.c | 2 +- tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c | 4 ++-- tools/testing/selftests/bpf/progs/xdping_kern.c | 4 ++-- tools/testing/selftests/bpf/test_tcp_check_syncookie.sh | 2 +- tools/testing/selftests/bpf/test_xdp_redirect.sh | 4 ++-- tools/testing/selftests/bpf/test_xdp_redirect_multi.sh | 2 +- tools/testing/selftests/bpf/test_xdp_veth.sh | 4 ++-- tools/testing/selftests/bpf/xdping.c | 5 ++--- 19 files changed, 27 insertions(+), 30 deletions(-)
tools/testing/selftests/bpf/progs/test_map_in_map.c +1 -1
@@ -23,7 +23,7 @@ struct {__uint (value_size,sizeof (__u32)); } mim_hash SEC(".maps"); -SEC("xdp_mimtest") +SEC("xdp")int xdp_mimtest0 (struct xdp_md *ctx) {int value =123 ;
tools/testing/selftests/bpf/progs/test_tcp_check_syncookie_kern.c +1 -1
@@ -156,7 +156,7 @@ int check_syncookie_clsact(struct __sk_buff *skb)return TC_ACT_OK ; } -SEC("xdp/check_syncookie") +SEC("xdp")int check_syncookie_xdp (struct xdp_md *ctx) { check_syncookie(ctx, (void *)(long)ctx->data,
tools/testing/selftests/bpf/progs/test_xdp.c +1 -1
@@ -210,7 +210,7 @@ static __always_inline int handle_ipv6(struct xdp_md *xdp)return XDP_TX ; } -SEC("xdp_tx_iptunnel") +SEC("xdp")int _xdp_tx_iptunnel (struct xdp_md *xdp) {void *data_end = (void *)(long )xdp->data_end;
tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c +1 -1
@@ -2,7 +2,7 @@#include <linux/bpf.h> #include <bpf/bpf_helpers.h> -SEC("xdp_adjust_tail_grow") +SEC("xdp")int _xdp_adjust_tail_grow (struct xdp_md *xdp) {void *data_end = (void *)(long )xdp->data_end;
tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_shrink.c +1 -3
@@ -9,9 +9,7 @@#include <linux/if_ether.h> #include <bpf/bpf_helpers.h> -int _version SEC("version") = 1; - -SEC("xdp_adjust_tail_shrink") +SEC("xdp")int _xdp_adjust_tail_shrink (struct xdp_md *xdp) {void *data_end = (void *)(long )xdp->data_end;
tools/testing/selftests/bpf/progs/test_xdp_devmap_helpers.c +1 -1
@@ -5,7 +5,7 @@#include <linux/bpf.h> #include <bpf/bpf_helpers.h> -SEC("xdp_dm_log") +SEC("xdp")int xdpdm_devlog (struct xdp_md *ctx) {char fmt[] ="devmap redirect: dev %u -> dev %u len %u\n" ;
tools/testing/selftests/bpf/progs/test_xdp_link.c +1 -1
@@ -5,7 +5,7 @@ char LICENSE[] SEC("license") = "GPL"; -SEC("xdp/handler") +SEC("xdp")int xdp_handler (struct xdp_md *xdp) {return 0 ;
tools/testing/selftests/bpf/progs/test_xdp_loop.c +1 -1
@@ -206,7 +206,7 @@ static __always_inline int handle_ipv6(struct xdp_md *xdp)return XDP_TX ; } -SEC("xdp_tx_iptunnel") +SEC("xdp")int _xdp_tx_iptunnel (struct xdp_md *xdp) {void *data_end = (void *)(long )xdp->data_end;
tools/testing/selftests/bpf/progs/test_xdp_noinline.c +2 -2
@@ -797,7 +797,7 @@ static int process_packet(void *data, __u64 off, void *data_end,return XDP_DROP ; } -SEC("xdp-test-v4") +SEC("xdp")int balancer_ingress_v4 (struct xdp_md *ctx) {void *data = (void *)(long )ctx->data;
@@ -816,7 +816,7 @@ int balancer_ingress_v4(struct xdp_md *ctx)return XDP_DROP ; } -SEC("xdp-test-v6") +SEC("xdp")int balancer_ingress_v6 (struct xdp_md *ctx) {void *data = (void *)(long )ctx->data;
tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c +2 -2
@@ -12,13 +12,13 @@ struct {__uint (max_entries,4 ); } cpu_map SEC(".maps"); -SEC("xdp_redir") +SEC("xdp")int xdp_redir_prog (struct xdp_md *ctx) {return bpf_redirect_map (&cpu_map,1 ,0 ); } -SEC("xdp_dummy") +SEC("xdp")int xdp_dummy_prog (struct xdp_md *ctx) {return XDP_PASS ;
tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c +2 -2
@@ -9,7 +9,7 @@ struct {__uint (max_entries,4 ); } dm_ports SEC(".maps"); -SEC("xdp_redir") +SEC("xdp")int xdp_redir_prog (struct xdp_md *ctx) {return bpf_redirect_map (&dm_ports,1 ,0 );
@@ -18,7 +18,7 @@ int xdp_redir_prog(struct xdp_md *ctx)/* invalid program on DEVMAP entry; * SEC name means expected attach type not set */ -SEC("xdp_dummy") +SEC("xdp")int xdp_dummy_prog (struct xdp_md *ctx) {return XDP_PASS ;
tools/testing/selftests/bpf/progs/xdp_dummy.c +1 -1
@@ -4,7 +4,7 @@#include <linux/bpf.h> #include <bpf/bpf_helpers.h> -SEC("xdp_dummy") +SEC("xdp")int xdp_dummy_prog (struct xdp_md *ctx) {return XDP_PASS ;
tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c +2 -2
@@ -34,7 +34,7 @@ struct {__uint (max_entries,128 ); } mac_map SEC(".maps"); -SEC("xdp_redirect_map_multi") +SEC("xdp")int xdp_redirect_map_multi_prog (struct xdp_md *ctx) {void *data_end = (void *)(long )ctx->data_end;
@@ -63,7 +63,7 @@ int xdp_redirect_map_multi_prog(struct xdp_md *ctx) }/* The following 2 progs are for 2nd devmap prog testing */ -SEC("xdp_redirect_map_ingress") +SEC("xdp")int xdp_redirect_map_all_prog (struct xdp_md *ctx) { return bpf_redirect_map(&map_egress, 0,
tools/testing/selftests/bpf/progs/xdping_kern.c +2 -2
@@ -86,7 +86,7 @@ static __always_inline int icmp_check(struct xdp_md *ctx, int type)return XDP_TX ; } -SEC("xdpclient") +SEC("xdp")int xdping_client (struct xdp_md *ctx) {void *data_end = (void *)(long )ctx->data_end;
@@ -150,7 +150,7 @@ int xdping_client(struct xdp_md *ctx)return XDP_TX ; } -SEC("xdpserver") +SEC("xdp")int xdping_server (struct xdp_md *ctx) {void *data_end = (void *)(long )ctx->data_end;
tools/testing/selftests/bpf/test_tcp_check_syncookie.sh +1 -1
@@ -77,7 +77,7 @@ TEST_IF=lo MAX_PING_TRIES=5 BPF_PROG_OBJ="${DIR}/test_tcp_check_syncookie_kern.o" CLSACT_SECTION="clsact/check_syncookie" -XDP_SECTION="xdp/check_syncookie" +XDP_SECTION="xdp" BPF_PROG_ID=0 PROG="${DIR}/test_tcp_check_syncookie_user"
tools/testing/selftests/bpf/test_xdp_redirect.sh +2 -2
@@ -52,8 +52,8 @@ test_xdp_redirect() return 0 fi - ip -n ns1 link set veth11 $xdpmode obj xdp_dummy.o sec xdp_dummy &> /dev/null - ip -n ns2 link set veth22 $xdpmode obj xdp_dummy.o sec xdp_dummy &> /dev/null + ip -n ns1 link set veth11 $xdpmode obj xdp_dummy.o sec xdp &> /dev/null + ip -n ns2 link set veth22 $xdpmode obj xdp_dummy.o sec xdp &> /dev/null ip link set dev veth1 $xdpmode obj test_xdp_redirect.o sec redirect_to_222 &> /dev/null ip link set dev veth2 $xdpmode obj test_xdp_redirect.o sec redirect_to_111 &> /dev/null
tools/testing/selftests/bpf/test_xdp_redirect_multi.sh +1 -1
@@ -92,7 +92,7 @@ setup_ns() # Add a neigh entry for IPv4 ping test ip -n ns$i neigh add 192.0.2.253 lladdr 00:00:00:00:00:01 dev veth0 ip -n ns$i link set veth0 $mode obj \ - xdp_dummy.o sec xdp_dummy &> /dev/null || \ + xdp_dummy.o sec xdp &> /dev/null || \ { test_fail "Unable to load dummy xdp" && exit 1; } IFACES="$IFACES veth$i" veth_mac[$i]=$(ip -n ns0 link show veth$i | awk '/link\/ether/ {print $2}')
tools/testing/selftests/bpf/test_xdp_veth.sh +2 -2
@@ -107,9 +107,9 @@ ip link set dev veth1 xdp pinned $BPF_DIR/progs/redirect_map_0 ip link set dev veth2 xdp pinned $BPF_DIR/progs/redirect_map_1 ip link set dev veth3 xdp pinned $BPF_DIR/progs/redirect_map_2 -ip -n ns1 link set dev veth11 xdp obj xdp_dummy.o sec xdp_dummy +ip -n ns1 link set dev veth11 xdp obj xdp_dummy.o sec xdp ip -n ns2 link set dev veth22 xdp obj xdp_tx.o sec xdp -ip -n ns3 link set dev veth33 xdp obj xdp_dummy.o sec xdp_dummy +ip -n ns3 link set dev veth33 xdp obj xdp_dummy.o sec xdp trap cleanup EXIT
tools/testing/selftests/bpf/xdping.c +2 -3
@@ -178,9 +178,8 @@ int main(int argc, char **argv)return 1 ; } - main_prog =bpf_object__find_program_by_title (obj, - server ?"xdpserver" : -"xdpclient" ); + main_prog =bpf_object__find_program_by_name (obj, + server ?"xdping_server" :"xdping_client" );if (main_prog) prog_fd =bpf_program__fd (main_prog);if (!main_prog || prog_fd <0 ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 405/913 selftests/bpf/test_xdp_redirect_multi: use temp netns for testing
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit cec74489a8dee93053340ec88ea938ff4008c3c0 ]
Use temp netns instead of hard code name for testing in case the netns already exists.
Remove the hard code interface index when creating the veth interfaces. Because when the system loads some virtual interface modules, e.g. tunnels. the ifindex of 2 will be used and the cmd will fail.
As the netns has not created if checking environment failed. Trap the clean up function after checking env.
--- .../selftests/bpf/test_xdp_redirect_multi.sh | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-)
tools/testing/selftests/bpf/test_xdp_redirect_multi.sh +31 -29
@@ -32,6 +32,11 @@ DRV_MODE="xdpgeneric xdpdrv xdpegress" PASS=0 FAIL=0 LOG_DIR=$(mktemp -d) +declare -a NS +NS[0]="ns0-$(mktemp -u XXXXXX)" +NS[1]="ns1-$(mktemp -u XXXXXX)" +NS[2]="ns2-$(mktemp -u XXXXXX)" +NS[3]="ns3-$(mktemp -u XXXXXX)" test_pass() {
@@ -47,11 +52,9 @@ test_fail() clean_up() { - for i in $(seq $NUM); do - ip link del veth$i 2> /dev/null - ip netns del ns$i 2> /dev/null + for i in $(seq 0 $NUM); do + ip netns del ${NS[$i]} 2> /dev/null done - ip netns del ns0 2> /dev/null } # Kselftest framework requirement - SKIP code is 4.
@@ -79,23 +82,22 @@ setup_ns() mode="xdpdrv" fi - ip netns add ns0 + ip netns add ${NS[0]} for i in $(seq $NUM); do - ip netns add ns$i - ip -n ns$i link add veth0 index 2 type veth \ - peer name veth$i netns ns0 index $((1 + $i)) - ip -n ns0 link set veth$i up - ip -n ns$i link set veth0 up - - ip -n ns$i addr add 192.0.2.$i/24 dev veth0 - ip -n ns$i addr add 2001:db8::$i/64 dev veth0 + ip netns add ${NS[$i]} + ip -n ${NS[$i]} link add veth0 type veth peer name veth$i netns ${NS[0]} + ip -n ${NS[$i]} link set veth0 up + ip -n ${NS[0]} link set veth$i up + + ip -n ${NS[$i]} addr add 192.0.2.$i/24 dev veth0 + ip -n ${NS[$i]} addr add 2001:db8::$i/64 dev veth0 # Add a neigh entry for IPv4 ping test - ip -n ns$i neigh add 192.0.2.253 lladdr 00:00:00:00:00:01 dev veth0 - ip -n ns$i link set veth0 $mode obj \ + ip -n ${NS[$i]} neigh add 192.0.2.253 lladdr 00:00:00:00:00:01 dev veth0 + ip -n ${NS[$i]} link set veth0 $mode obj \ xdp_dummy.o sec xdp &> /dev/null || \ { test_fail "Unable to load dummy xdp" && exit 1; } IFACES="$IFACES veth$i" - veth_mac[$i]=$(ip -n ns0 link show veth$i | awk '/link\/ether/ {print $2}') + veth_mac[$i]=$(ip -n ${NS[0]} link show veth$i | awk '/link\/ether/ {print $2}') done }
@@ -104,10 +106,10 @@ do_egress_tests() local mode=$1 # mac test - ip netns exec ns2 tcpdump -e -i veth0 -nn -l -e &> ${LOG_DIR}/mac_ns1-2_${mode}.log & - ip netns exec ns3 tcpdump -e -i veth0 -nn -l -e &> ${LOG_DIR}/mac_ns1-3_${mode}.log & + ip netns exec ${NS[2]} tcpdump -e -i veth0 -nn -l -e &> ${LOG_DIR}/mac_ns1-2_${mode}.log & + ip netns exec ${NS[3]} tcpdump -e -i veth0 -nn -l -e &> ${LOG_DIR}/mac_ns1-3_${mode}.log & sleep 0.5 - ip netns exec ns1 ping 192.0.2.254 -i 0.1 -c 4 &> /dev/null + ip netns exec ${NS[1]} ping 192.0.2.254 -i 0.1 -c 4 &> /dev/null sleep 0.5 pkill tcpdump
@@ -123,18 +125,18 @@ do_ping_tests() local mode=$1 # ping6 test: echo request should be redirect back to itself, not others - ip netns exec ns1 ip neigh add 2001:db8::2 dev veth0 lladdr 00:00:00:00:00:02 + ip netns exec ${NS[1]} ip neigh add 2001:db8::2 dev veth0 lladdr 00:00:00:00:00:02 - ip netns exec ns1 tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-1_${mode}.log & - ip netns exec ns2 tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-2_${mode}.log & - ip netns exec ns3 tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-3_${mode}.log & + ip netns exec ${NS[1]} tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-1_${mode}.log & + ip netns exec ${NS[2]} tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-2_${mode}.log & + ip netns exec ${NS[3]} tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-3_${mode}.log & sleep 0.5 # ARP test - ip netns exec ns1 arping -q -c 2 -I veth0 192.0.2.254 + ip netns exec ${NS[1]} arping -q -c 2 -I veth0 192.0.2.254 # IPv4 test - ip netns exec ns1 ping 192.0.2.253 -i 0.1 -c 4 &> /dev/null + ip netns exec ${NS[1]} ping 192.0.2.253 -i 0.1 -c 4 &> /dev/null # IPv6 test - ip netns exec ns1 ping6 2001:db8::2 -i 0.1 -c 2 &> /dev/null + ip netns exec ${NS[1]} ping6 2001:db8::2 -i 0.1 -c 2 &> /dev/null sleep 0.5 pkill tcpdump
@@ -180,7 +182,7 @@ do_tests() xdpgeneric) drv_p="-S";; esac - ip netns exec ns0 ./xdp_redirect_multi $drv_p $IFACES &> ${LOG_DIR}/xdp_redirect_${mode}.log & + ip netns exec ${NS[0]} ./xdp_redirect_multi $drv_p $IFACES &> ${LOG_DIR}/xdp_redirect_${mode}.log & xdp_pid=$! sleep 1 if ! ps -p $xdp_pid > /dev/null; then
@@ -197,10 +199,10 @@ do_tests() kill $xdp_pid } -trap clean_up EXIT - check_env +trap clean_up EXIT + for mode in ${DRV_MODE}; do setup_ns $mode do_tests $mode
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 406/913 ath9k_htc: fix uninit value bugs
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit d1e0df1c57bd30871dd1c855742a7c346dbca853 ]
Syzbot reported 2 KMSAN bugs in ath9k. All of them are caused by missing field initialization.
In htc_connect_service() svc_meta_len and pad are not initialized. Based on code it looks like in current skb there is no service data, so simply initialize svc_meta_len to 0.
htc_issue_send() does not initialize htc_frame_hdr::control array. Based on firmware code, it will initialize it by itself, so simply zero whole array to make KMSAN happy
Fail logs:
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 4-7 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 16-17 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
--- drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath9k/htc_hst.c +5 -0
@@ -30,6 +30,7 @@ static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, hdr->endpoint_id = epid; hdr->flags = flags; hdr->payload_len =cpu_to_be16 (len); +memset (hdr->control,0 ,sizeof (hdr->control)); status = target->hif->send (target->hif_dev, endpoint->ul_pipeid, skb);
@@ -272,6 +273,10 @@ int htc_connect_service(struct htc_target *target, conn_msg->dl_pipeid = endpoint->dl_pipeid; conn_msg->ul_pipeid = endpoint->ul_pipeid; +/* To prevent infoleak */ + conn_msg->svc_meta_len =0 ; + conn_msg->pad =0 ; + ret =htc_issue_send (target, skb, skb->len,0 ,ENDPOINT0 );if (ret) goto err;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 407/913 RDMA/core: Set MR type in ib_reg_user_mr
In reply to Greg Kroah-HartmanFrom: Maor Gottlieb <[email protected]>
[ Upstream commit 32a88d16615c2be295571c29273c4ac94cb75309 ]
Add missing assignment of MR type to IB_MR_TYPE_USER.
--- drivers/infiniband/core/verbs.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/verbs.c +1 -0
@@ -2153,6 +2153,7 @@ struct ib_mr *ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,return mr; mr->device = pd->device; + mr->type =IB_MR_TYPE_USER ; mr->pd = pd; mr->dm =NULL ;atomic_inc (&pd->usecnt);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 408/913 KVM: PPC: Fix vmx/vsx mixup in mmio emulation
In reply to Greg Kroah-HartmanFrom: Fabiano Rosas <[email protected]>
[ Upstream commit b99234b918c6e36b9aa0a5b2981e86b6bd11f8e2 ]
The MMIO emulation code for vector instructions is duplicated between VSX and VMX. When emulating VMX we should check the VMX copy size instead of the VSX one.
--- arch/powerpc/kvm/powerpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/powerpc.c +2 -2
@@ -1507,7 +1507,7 @@ int kvmppc_handle_vmx_load(struct kvm_vcpu *vcpu, {enum emulation_result emulated =EMULATE_DONE ; -if (vcpu->arch.mmio_vsx_copy_nums >2 ) +if (vcpu->arch.mmio_vmx_copy_nums >2 )return EMULATE_FAIL ;while (vcpu->arch.mmio_vmx_copy_nums) {
@@ -1604,7 +1604,7 @@ int kvmppc_handle_vmx_store(struct kvm_vcpu *vcpu,unsigned int index = rs &KVM_MMIO_REG_MASK ;enum emulation_result emulated =EMULATE_DONE ; -if (vcpu->arch.mmio_vsx_copy_nums >2 ) +if (vcpu->arch.mmio_vmx_copy_nums >2 )return EMULATE_FAIL ; vcpu->arch.io_gpr = rs;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 409/913 selftests/net: timestamping: Fix bind_phc check
In reply to Greg Kroah-HartmanFrom: Gerhard Engleder <[email protected]>
[ Upstream commit 678dfd5280341d877ca646499bfdc82a3d8b4356 ]
timestamping checks socket options during initialisation. For the field bind_phc of the socket option SO_TIMESTAMPING it expects the value -1 if PHC is not bound. Actually the value of bind_phc is 0 if PHC is not bound. This results in the following output:
SIOCSHWTSTAMP: tx_type 0 requested, got 0; rx_filter 0 requested, got 0 SO_TIMESTAMP 0SO_TIMESTAMPNS 0SO_TIMESTAMPING flags 0, bind phc 0
not expected, flags 0, bind phc -1
This is fixed by setting default value and expected value of bind_phc to 0.
--- tools/testing/selftests/net/timestamping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/timestamping.c +2 -2
@@ -325,8 +325,8 @@ int main(int argc, char **argv)struct ifreq device;struct ifreq hwtstamp;struct hwtstamp_config hwconfig, hwconfig_requested; -struct so_timestamping so_timestamping_get = {0 ,-1 }; -struct so_timestamping so_timestamping = {0 ,-1 }; +struct so_timestamping so_timestamping_get = {0 ,0 }; +struct so_timestamping so_timestamping = {0 ,0 };struct sockaddr_in addr;struct ip_mreq imr;struct in_addr iaddr;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 410/913 i40e: dont reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit bc97f9c6f988b31b728eb47a94ca825401dbeffe ]
{__,}napi_alloc_skb() allocates and reserves additional NET_SKB_PAD
+ NET_IP_ALIGN for any skb.
OTOH, i40e_construct_skb_zc() currently allocates and reserves additional xdp->data - xdp->data_hard_start, which is XDP_PACKET_HEADROOM for XSK frames.
There's no need for that at all as the frame is post-XDP and will go only to the networking stack core.
Pass the size of the actual data only to __napi_alloc_skb() and don't reserve anything. This will give enough headroom for stack processing.
--- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_xsk.c +1 -3
@@ -248,13 +248,11 @@ static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring,struct sk_buff *skb;/* allocate a skb to store the frags */ - skb =__napi_alloc_skb (&rx_ring->q_vector->napi, - xdp->data_end - xdp->data_hard_start, + skb =__napi_alloc_skb (&rx_ring->q_vector->napi, datasize,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb)) goto out; -skb_reserve (skb, xdp->data - xdp->data_hard_start);memcpy (__skb_put (skb, datasize), xdp->data, datasize);if (metasize)skb_metadata_set (skb, metasize);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 411/913 i40e: respect metadata on XSK Rx to skb
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 6dba29537c0f639b482bd8f8bbd50ab4ae74b48d ]
For now, if the XDP prog returns XDP_PASS on XSK, the metadata will be lost as it doesn't get copied to the skb.
Copy it along with the frame headers. Account its size on skb allocation, and when copying just treat it as a part of the frame and do a pull after to "move" it to the "reserved" zone.
net_prefetch() xdp->data_meta and align the copy size to speed-up memcpy() a little and better match i40e_construct_skb().
--- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_xsk.c +10 -4
@@ -243,19 +243,25 @@ bool i40e_alloc_rx_buffers_zc(struct i40e_ring *rx_ring, u16 count)static struct sk_buff *i40e_construct_skb_zc (struct i40e_ring *rx_ring,struct xdp_buff *xdp) { +unsigned int totalsize = xdp->data_end - xdp->data_meta;unsigned int metasize = xdp->data - xdp->data_meta; -unsigned int datasize = xdp->data_end - xdp->data;struct sk_buff *skb; +net_prefetch (xdp->data_meta); +/* allocate a skb to store the frags */ - skb =__napi_alloc_skb (&rx_ring->q_vector->napi, datasize, + skb =__napi_alloc_skb (&rx_ring->q_vector->napi, totalsize,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb)) goto out; -memcpy (__skb_put (skb, datasize), xdp->data, datasize); -if (metasize) +memcpy (__skb_put (skb, totalsize), xdp->data_meta, +ALIGN (totalsize,sizeof (long ))); + +if (metasize) {skb_metadata_set (skb, metasize); +__skb_pull (skb, metasize); + } out:xsk_buff_free (xdp);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 412/913 igc: dont reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit f9e61d365bafdee40fe2586fc6be490c3e824dad ]
{__,}napi_alloc_skb() allocates and reserves additional NET_SKB_PAD
+ NET_IP_ALIGN for any skb.
OTOH, igc_construct_skb_zc() currently allocates and reserves additional xdp->data_meta - xdp->data_hard_start, which is about XDP_PACKET_HEADROOM for XSK frames.
There's no need for that at all as the frame is post-XDP and will go only to the networking stack core.
Pass the size of the actual data only (+ meta) to __napi_alloc_skb() and don't reserve anything. This will give enough headroom for stack processing.
Also, net_prefetch() xdp->data_meta and align the copy size to speed-up memcpy() a little and better match igc_construct_skb().
--- drivers/net/ethernet/intel/igc/igc_main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/igc/igc_main.c +7 -6
@@ -2434,19 +2434,20 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget)static struct sk_buff *igc_construct_skb_zc (struct igc_ring *ring,struct xdp_buff *xdp) { +unsigned int totalsize = xdp->data_end - xdp->data_meta;unsigned int metasize = xdp->data - xdp->data_meta; -unsigned int datasize = xdp->data_end - xdp->data; -unsigned int totalsize = metasize + datasize;struct sk_buff *skb; - skb =__napi_alloc_skb (&ring->q_vector->napi, - xdp->data_end - xdp->data_hard_start, +net_prefetch (xdp->data_meta); + + skb =__napi_alloc_skb (&ring->q_vector->napi, totalsize,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb))return NULL ; -skb_reserve (skb, xdp->data_meta - xdp->data_hard_start); -memcpy (__skb_put (skb, totalsize), xdp->data_meta, totalsize); +memcpy (__skb_put (skb, totalsize), xdp->data_meta, +ALIGN (totalsize,sizeof (long ))); +if (metasize) {skb_metadata_set (skb, metasize);__skb_pull (skb, metasize);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 413/913 ixgbe: pass bi->xdp to ixgbe_construct_skb_zc() directly
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 1fbdaa13386804a31eefd3db3c5fe00e80ce9bc3 ]
To not dereference bi->xdp each time in ixgbe_construct_skb_zc(), pass bi->xdp as an argument instead of bi. We can also call xsk_buff_free() outside of the function as well as assign bi->xdp to NULL, which seems to make it closer to its name.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +10 -9
@@ -201,26 +201,24 @@ bool ixgbe_alloc_rx_buffers_zc(struct ixgbe_ring *rx_ring, u16 count) }static struct sk_buff *ixgbe_construct_skb_zc (struct ixgbe_ring *rx_ring, -struct ixgbe_rx_buffer *bi) +const struct xdp_buff *xdp) { -unsigned int metasize = bi->xdp->data - bi->xdp->data_meta; -unsigned int datasize = bi->xdp->data_end - bi->xdp->data; +unsigned int metasize = xdp->data - xdp->data_meta; +unsigned int datasize = xdp->data_end - xdp->data;struct sk_buff *skb;/* allocate a skb to store the frags */ skb =__napi_alloc_skb (&rx_ring->q_vector->napi, - bi->xdp->data_end - bi->xdp->data_hard_start, + xdp->data_end - xdp->data_hard_start,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb))return NULL ; -skb_reserve (skb, bi->xdp->data - bi->xdp->data_hard_start); -memcpy (__skb_put (skb, datasize), bi->xdp->data, datasize); +skb_reserve (skb, xdp->data - xdp->data_hard_start); +memcpy (__skb_put (skb, datasize), xdp->data, datasize);if (metasize)skb_metadata_set (skb, metasize); -xsk_buff_free (bi->xdp); - bi->xdp =NULL ;return skb; }
@@ -311,12 +309,15 @@ int ixgbe_clean_rx_irq_zc(struct ixgbe_q_vector *q_vector, }/* XDP_PASS path */ - skb =ixgbe_construct_skb_zc (rx_ring, bi); + skb =ixgbe_construct_skb_zc (rx_ring, bi->xdp);if (!skb) { rx_ring->rx_stats.alloc_rx_buff_failed++;break ; } +xsk_buff_free (bi->xdp); + bi->xdp =NULL ; + cleaned_count++;ixgbe_inc_ntc (rx_ring);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 414/913 ixgbe: dont reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 8f405221a73a53234486c185d8ef647377a53cc6 ]
{__,}napi_alloc_skb() allocates and reserves additional NET_SKB_PAD
+ NET_IP_ALIGN for any skb.
OTOH, ixgbe_construct_skb_zc() currently allocates and reserves additional xdp->data - xdp->data_hard_start, which is XDP_PACKET_HEADROOM for XSK frames.
There's no need for that at all as the frame is post-XDP and will go only to the networking stack core.
Pass the size of the actual data only to __napi_alloc_skb() and don't reserve anything. This will give enough headroom for stack processing.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +1 -3
@@ -208,13 +208,11 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,struct sk_buff *skb;/* allocate a skb to store the frags */ - skb =__napi_alloc_skb (&rx_ring->q_vector->napi, - xdp->data_end - xdp->data_hard_start, + skb =__napi_alloc_skb (&rx_ring->q_vector->napi, datasize,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb))return NULL ; -skb_reserve (skb, xdp->data - xdp->data_hard_start);memcpy (__skb_put (skb, datasize), xdp->data, datasize);if (metasize)skb_metadata_set (skb, metasize);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 415/913 ixgbe: respect metadata on XSK Rx to skb
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit f322a620be69e95594eda89502b478aa7dbf6ec2 ]
For now, if the XDP prog returns XDP_PASS on XSK, the metadata will be lost as it doesn't get copied to the skb.
Copy it along with the frame headers. Account its size on skb allocation, and when copying just treat it as a part of the frame and do a pull after to "move" it to the "reserved" zone.
net_prefetch() xdp->data_meta and align the copy size to speed-up memcpy() a little and better match ixgbe_construct_skb().
--- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +10 -4
@@ -203,19 +203,25 @@ bool ixgbe_alloc_rx_buffers_zc(struct ixgbe_ring *rx_ring, u16 count)static struct sk_buff *ixgbe_construct_skb_zc (struct ixgbe_ring *rx_ring,const struct xdp_buff *xdp) { +unsigned int totalsize = xdp->data_end - xdp->data_meta;unsigned int metasize = xdp->data - xdp->data_meta; -unsigned int datasize = xdp->data_end - xdp->data;struct sk_buff *skb; +net_prefetch (xdp->data_meta); +/* allocate a skb to store the frags */ - skb =__napi_alloc_skb (&rx_ring->q_vector->napi, datasize, + skb =__napi_alloc_skb (&rx_ring->q_vector->napi, totalsize,GFP_ATOMIC | __GFP_NOWARN);if (unlikely (!skb))return NULL ; -memcpy (__skb_put (skb, datasize), xdp->data, datasize); -if (metasize) +memcpy (__skb_put (skb, totalsize), xdp->data_meta, +ALIGN (totalsize,sizeof (long ))); + +if (metasize) {skb_metadata_set (skb, metasize); +__skb_pull (skb, metasize); + }return skb; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 416/913 power: reset: gemini-poweroff: Fix IRQ check in gemini_poweroff_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ba18dad0fb880cd29aa97b6b75560ef14d1061ba ]
platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example:
int irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;Fix the check of return value to catch errors correctly.
--- drivers/power/reset/gemini-poweroff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/power/reset/gemini-poweroff.c +2 -2
@@ -107,8 +107,8 @@ static int gemini_poweroff_probe(struct platform_device *pdev)return PTR_ERR (gpw->base); irq =platform_get_irq (pdev,0 ); -if (!irq) -return -EINVAL ; +if (irq <0 ) +return irq; gpw->dev = dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 417/913 ray_cs: Check ioremap return value
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 7e4760713391ee46dc913194b33ae234389a174e ]
As the possible failure of the ioremap(), the 'local->sram' and other two could be NULL.
Therefore it should be better to check it in order to avoid the later dev_dbg.
--- drivers/net/wireless/ray_cs.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ray_cs.c +6 -0
@@ -382,6 +382,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->sram =ioremap (link->resource[2 ]->start,resource_size (link->resource[2 ])); +if (!local->sram) + goto failed;/*** Set up 16k window for shared memory (receive buffer) ***************/ link->resource[3]->flags |=
@@ -396,6 +398,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->rmem =ioremap (link->resource[3 ]->start,resource_size (link->resource[3 ])); +if (!local->rmem) + goto failed;/*** Set up window for attribute memory ***********************************/ link->resource[4]->flags |=
@@ -410,6 +414,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->amem =ioremap (link->resource[4 ]->start,resource_size (link->resource[4 ])); +if (!local->amem) + goto failed;dev_dbg (&link->dev,"ray_config sram=%p\n" , local->sram);dev_dbg (&link->dev,"ray_config rmem=%p\n" , local->rmem);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 418/913 powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch
In reply to Greg Kroah-HartmanFrom: Maxim Kiselev <[email protected]>
[ Upstream commit 5ebb74749202a25da4b3cc2eb15470225a05527c ]
On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.
This patch fixes network interface names for the switch ports according to labels that are written on the front panel of the board rev B. They start from ETH3 and end at ETH10.
This patch also introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.
--- arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 30 ++++++++++++++++++++ arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 +++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * T1040RDB-REV-A Device Tree Source + * + * Copyright 2014 - 2015 Freescale Semiconductor Inc. + * + */ + +#include "t1040rdb.dts" + +/ { + model = "fsl,T1040RDB-REV-A"; + compatible = "fsl,T1040RDB-REV-A"; +}; + +&seville_port0 { + label = "ETH5"; +}; + +&seville_port2 { + label = "ETH7"; +}; + +&seville_port4 { + label = "ETH9"; +}; + +&seville_port6 { + label = "ETH11"; +};
arch/powerpc/boot/dts/fsl/t1040rdb.dts +4 -4
@@ -119,7 +119,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_0>; phy-mode = "qsgmii"; - label = "ETH5"; + label = "ETH3"; status = "okay"; };
@@ -135,7 +135,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_2>; phy-mode = "qsgmii"; - label = "ETH7"; + label = "ETH5"; status = "okay"; };
@@ -151,7 +151,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_4>; phy-mode = "qsgmii"; - label = "ETH9"; + label = "ETH7"; status = "okay"; };
@@ -167,7 +167,7 @@ managed = "in-band-status"; phy-handle = <&phy_qsgmii_6>; phy-mode = "qsgmii"; - label = "ETH11"; + label = "ETH9"; status = "okay"; };
Signature · 1 line
2.34.1