09 Mar, 2021
2 commits
-
Release all resources before returning error exit ioctl_dma_map by using goto out label
Signed-off-by: Florinel Iordache
-
Clear all string buffers memory locations in ioctl_compat before using strncpy to copy the string name
Signed-off-by: Florinel Iordache
04 Mar, 2021
2 commits
-
Initialize to zero all ioctl_compat converted structures in fsl_usdpaa
Signed-off-by: Florinel Iordache
-
Initialize to zero ceetm sp_set_lni configuration structure in qman_high
Signed-off-by: Florinel Iordache
26 Feb, 2021
1 commit
-
Initialize to zero all ceetm configuration and query structures in qman_high
Signed-off-by: Florinel Iordache
29 Jan, 2021
1 commit
-
For normal case, userspace should call streamon/streamoff balance, but
for some special case, the process will be killed or terminated and the
streamoff ioctl will be ignored. So driver need to handle the case.Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai
20 Jan, 2021
3 commits
-
This is the 5.10.9 stable release
* tag 'v5.10.9': (153 commits)
Linux 5.10.9
netfilter: nf_nat: Fix memleak in nf_nat_init
netfilter: conntrack: fix reading nf_conntrack_buckets
...Signed-off-by: Jason Liu
-
This is the 5.10.7 stable release
* tag 'v5.10.7': (144 commits)
Linux 5.10.7
scsi: target: Fix XCOPY NAA identifier lookup
rtlwifi: rise completion at the last step of firmware callback
...Signed-off-by: Jason Liu
-
[ Upstream commit 12b38ea040b3bb2a30eb9cd488376df5be7ea81f ]
IN the probe function, if an error occurs after calling
'spmi_controller_alloc()', it must be undone by a corresponding
'spmi_controller_put() call.In the remove function, use 'spmi_controller_put(ctrl)' instead of
'kfree(ctrl)'.While a it fix an error message
(s/spmi_add_controller/spmi_controller_add/)Signed-off-by: Christophe JAILLET
Link: https://lore.kernel.org/r/20201213151105.137731-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Sasha Levin
13 Jan, 2021
2 commits
-
commit d887d6104adeb94d1b926936ea21f07367f0ff9f upstream.
If an error occurs after calling 'mtk_hsdma_init()', it must be undone by
a corresponding call to 'mtk_hsdma_uninit()' as already done in the
remove function.Fixes: 0853c7a53eb3 ("staging: mt7621-dma: ralink: add rt2880 dma engine")
Signed-off-by: Christophe JAILLET
Cc: stable
Link: https://lore.kernel.org/r/20201213153513.138723-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman -
commit cab36da4bf1a35739b091b73714a39a1bbd02b05 upstream.
Return -EFAULT on error instead of the number of bytes remaining to be
copied.Fixes: bac42fb21259 ("comedi: get rid of compat_alloc_user_space() mess in COMEDI_CMD{,TEST} compat")
Signed-off-by: Dan Carpenter
Cc: stable
Link: https://lore.kernel.org/r/X8c3pfwFy2jpy4BP@mwanda
Signed-off-by: Greg Kroah-Hartman
04 Jan, 2021
1 commit
-
This is the 5.10.4 stable release
* tag 'v5.10.4': (717 commits)
Linux 5.10.4
x86/CPU/AMD: Save AMD NodeId as cpu_die_id
drm/edid: fix objtool warning in drm_cvt_modes()
...Signed-off-by: Jason Liu
Conflicts:
drivers/gpu/drm/imx/dcss/dcss-plane.c
drivers/media/i2c/ov5640.c
30 Dec, 2020
8 commits
-
commit 56c90457ebfe9422496aac6ef3d3f0f0ea8b2ec2 upstream.
I have had reports from two different people that attempts to read the
analog input channels of the MF624 board fail with an `ETIMEDOUT` error.After triggering the conversion, the code calls `comedi_timeout()` with
`mf6x4_ai_eoc()` as the callback function to check if the conversion is
complete. The callback returns 0 if complete or `-EBUSY` if not yet
complete. `comedi_timeout()` returns `-ETIMEDOUT` if it has not
completed within a timeout period which is propagated as an error to the
user application.The existing code considers the conversion to be complete when the EOLC
bit is high. However, according to the user manuals for the MF624 and
MF634 boards, this test is incorrect because EOLC is an active low
signal that goes high when the conversion is triggered, and goes low
when the conversion is complete. Fix the problem by inverting the test
of the EOLC bit state.Fixes: 04b565021a83 ("comedi: Humusoft MF634 and MF624 DAQ cards driver")
Cc: # v4.4+
Cc: Rostislav Lisovy
Signed-off-by: Ian Abbott
Link: https://lore.kernel.org/r/20201207145806.4046-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman -
[ Upstream commit e77b259f67ab99f1e22ce895b9b1c637fd5f2d4c ]
In gbaudio_dapm_free_controls(), if one of the widgets is not found, an error
will be returned directly, which will cause the rest to be unable to be freed,
resulting in leak.This patch fixes the bug. If if one of them is not found, just skip and free the others.
Fixes: 510e340efe0c ("staging: greybus: audio: Add helper APIs for dynamic audio module")
Reported-by: Hulk Robot
Reviewed-by: Vaibhav Agarwal
Signed-off-by: Wang Hai
Link: https://lore.kernel.org/r/20201205103827.31244-1-wanghai38@huawei.com
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Sasha Levin -
[ Upstream commit 6c91799f59ed491a2b5bf5ef7c6d60306cda4e09 ]
When the MMAL code is built-in but the vchiq core config is
set to =m, the mmal code never gets built, which in turn can
lead to link errors:ERROR: modpost: "vchiq_mmal_port_set_format" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_port_disable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_port_parameter_set" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_component_finalise" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_port_connect_tunnel" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_component_enable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_finalise" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_component_init" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_component_disable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "mmal_vchi_buffer_init" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_port_enable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_version" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_submit_buffer" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_init" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "mmal_vchi_buffer_cleanup" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!
ERROR: modpost: "vchiq_mmal_port_parameter_get" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined!Change the Kconfig to depend on BCM2835_VCHIQ like the other drivers,
and remove the now redundant dependencies.Fixes: b18ee53ad297 ("staging: bcm2835: Break MMAL support out from camera")
Acked-by: Jacopo Mondi
Signed-off-by: Arnd Bergmann
Link: https://lore.kernel.org/r/20201203223836.1362313-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Sasha Levin -
[ Upstream commit ba3e4a2a0b3c639d3835f2f1dce27d79576ae453 ]
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.Fixes: 4524ac56cdca ("staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version")
Reported-by: Hulk Robot
Signed-off-by: Wang Hai
Link: https://lore.kernel.org/r/20201118103724.57451-1-wanghai38@huawei.com
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Sasha Levin -
[ Upstream commit 940727bf22f74cbdef8de327de34c4ae565c89ea ]
pm_runtime_get_sync will increment pm usage counter even it
failed. Forgetting to pm_runtime_put_noidle will result in
reference leak in cedrus_start_streaming. We should fix it.Fixes: d5aecd289babf ("media: cedrus: Implement runtime PM")
Signed-off-by: Zhang Qilong
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
Signed-off-by: Sasha Levin -
[ Upstream commit 4cbbe2aaa0536b0e7b3dfbd7febc3bc2ec300559 ]
pm_runtime_get_sync will increment pm usage counter even it
failed. Forgetting to pm_runtime_put_noidle will result in
reference imbalance in rkisp1_vb2_start_streaming, so we
should fix it.Fixes: 56e3b29f9f6b2 ("media: staging: rkisp1: add streaming paths")
Signed-off-by: Zhang Qilong
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
Signed-off-by: Sasha Levin -
[ Upstream commit ab5b769a23af12a675b9f3d7dd529250c527f5ac ]
gasket_interrupt_set_eventfd() misses to call eventfd_ctx_put() in an
error path. We check interrupt is valid before calling
eventfd_ctx_fdget() to fix it.There is the same issue in gasket_interrupt_clear_eventfd(), Add the
missed function call to fix it.Fixes: 9a69f5087ccc ("drivers/staging: Gasket driver framework + Apex driver")
Signed-off-by: Jing Xiangfeng
Link: https://lore.kernel.org/r/20201112064924.99680-1-jingxiangfeng@huawei.com
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Sasha Levin -
[ Upstream commit 3952659a6108f77a0d062d8e8487bdbdaf52a66c ]
gb_pm_runtime_get_sync has increased the usage counter of the device here.
Forgetting to call gb_pm_runtime_put_noidle will result in usage counter
leak in the error branch of (gbcodec_hw_params and gbcodec_prepare). We
fixed it by adding it.Fixes: c388ae7696992 ("greybus: audio: Update pm runtime support in dai_ops callback")
Signed-off-by: Zhang Qilong
Link: https://lore.kernel.org/r/20201109131347.1725288-2-zhangqilong3@huawei.com
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Sasha Levin
22 Dec, 2020
15 commits
-
Add VIDIOC_S/G_SELECTION ioctl support for ISI memory to memory device
Signed-off-by: Guoniu.zhou
-
Disable ISI channel clock after stream off
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
There is no RGBA format in V4L2 framework when develop ISI mem2mem
driver, so we add V4L2_PIX_FMT_RGBA in V4L2 framework. But in the
latest kernel version, V4L2 framework add V4L2_PIX_FMT_RGBA32 for
RGBA format, so change use RGBA format define in latest framework.Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai
(cherry picked from commit aae6e3f03e6cd67df6c97f9dae6f6c226542dc74) -
CHAIN_BUF occupy CHNL_CTRL[25:26], so the mask value should be 0x6000000.
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Remove "fsl,chain_buf" property parse because it's no longer used.
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Add workaround for iMX865 ISI to support 4K because for the ISI line
buffer management, the other chips used a single clock for all the
memories, where as in iMX865, each channel has the corresponding clock
which is used, so need to enable channel1 clock when channel0 chain
buffer enabled.Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Using spin_lock_irqsave instead of spin_lock to disable interrupt
when in irq handler to avoid potential race issue.Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Align discard buffer size to page size.
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Remove 4K feature for ISI channel1 due to ISI line buffer limitation
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Add V4L2_SEL_FLAG_LE/V4L2_SEL_FLAG_GE flags support
Signed-off-by: Guoniu.zhou
-
Add VIDIOC_S/G_SELECTION ioctl support to enable ISI crop feature
Signed-off-by: Guoniu.zhou
-
Adding 4K support for ISI of iMX8MN platform.
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Using list_del_init instead of list_del to remove list entry from list
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
Remove redundant code for clean out pending and active list
Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai -
subdev_notifier_complete will be called multi times in some cases
due to workaround to support hotplugin-like mechanism, so add checking
media device register status before register new media device.Signed-off-by: Guoniu.zhou
Reviewed-by: Robby Cai
(cherry picked from commit 985c60e55694a69effd2197f798cb039a17144c6)
18 Dec, 2020
5 commits
-
New headfile introduced from:
0a0f0d8be76d ("dma-mapping: split ")Including it to fix the build issue below:
drivers/staging/fsl_qbman/qman_high.c: In function ‘qman_create_portal’:
drivers/staging/fsl_qbman/qman_high.c:687:2: error: implicit declaration of function ‘arch_setup_dma_ops’; did you mean ‘arch_setup_new_exec’? [-Werror=implicit-function-declaration]
arch_setup_dma_ops(&portal->pdev->dev, 0, 0, NULL, true);
^~~~~~~~~~~~~~~~~~
arch_setup_new_execSigned-off-by: Li Yang
-
This API was removed since:
cf09ff78619f ("mm: remove unnecessary wrapper function do_mmap_pgoff()")Signed-off-by: Dong Aisheng
-
From commit 32a363d0b0, the way to deal with MEDIA related Kconfig
options have been changed. Update to avoid build issue:drivers/media/i2c/Kconfig:728:error: recursive dependency detected!
drivers/media/i2c/Kconfig:728: symbol VIDEO_IMX214 depends on V4L2_FWNODE
drivers/media/v4l2-core/Kconfig:71: symbol V4L2_FWNODE is selected by VIDEO_IMX_CAPTURE
drivers/staging/media/imx/Kconfig:36: symbol VIDEO_IMX_CAPTURE depends on MEDIA_CONTROLLER
drivers/media/Kconfig:168: symbol MEDIA_CONTROLLER is selected by VIDEO_IMX214Signed-off-by: Li Yang
-
* net/next: (207 commits)
LF-2788-2 net: ethernet: dwmac-imx: delete check for platform w/o SCU FW
tsn: status return variable initialize to be 0
net:tsn: fix coverity issues
net: tsn: fix headfile voliates the new rule
net:tsn: netlink interface for APP layer to config TSN capability hardware ports
... -
* misc/next: (8 commits)
LF-2567-5 dma-buf: inlcude new headfile linux/dma-map-ops.h
MGS-5565-1 staging: android: ion: Flush outer cache after zero CMA allocated memory
MGS-5565 staging: android: ion: Flush cache after zero CMA allocated memory
Documentation: mfd: Add DT bindings for i.MX Mix
mfd: Add i.MX generic mix support
...
