drm/vc4/vc4_hdmi: fill in connector info
Subsystems (12)
Sasha Levin
maintainerPATCH 1/350 drm/vc4/vc4_hdmi: fill in connector info
From: Dariusz Marcinkiewicz <[email protected]>
[ Upstream commit 66c2dee4ae10a2d841c40b9dd9c7141eb23eee76 ]
Fill in the connector info, allowing userspace to associate the CEC device with the drm connector.
Tested on a Raspberry Pi 3B.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +9 -4
@@ -1285,6 +1285,9 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = {static int vc4_hdmi_bind (struct device *dev,struct device *master,void *data) { +#ifdef CONFIG_DRM_VC4_HDMI_CEC +struct cec_connector_info conn_info; +#endif struct platform_device *pdev =to_platform_device (dev);struct drm_device *drm =dev_get_drvdata (master);struct vc4_dev *vc4 = drm->dev_private;
@@ -1403,13 +1406,15 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)#ifdef CONFIG_DRM_VC4_HDMI_CEC hdmi->cec_adap =cec_allocate_adapter (&vc4_hdmi_cec_adap_ops, vc4,"vc4" , -CEC_CAP_TRANSMIT | -CEC_CAP_LOG_ADDRS | -CEC_CAP_PASSTHROUGH | -CEC_CAP_RC ,1 ); +CEC_CAP_DEFAULTS | +CEC_CAP_CONNECTOR_INFO ,1 ); ret =PTR_ERR_OR_ZERO (hdmi->cec_adap);if (ret <0 ) goto err_destroy_conn; + +cec_fill_conn_info_from_drm (&conn_info, hdmi->connector); +cec_s_conn_info (hdmi->cec_adap, &conn_info); +HDMI_WRITE (VC4_HDMI_CPU_MASK_SET ,0xffffffff ); value =HDMI_READ (VC4_HDMI_CEC_CNTRL_1 ); value &= ~VC4_HDMI_CEC_DIV_CLK_CNT_MASK ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/350 drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper.
From: Gerd Hoffmann <[email protected]>
[ Upstream commit 29cf12394c0565d7eb1685bf0c1b4749aa6a8b66 ]
Use drm_gem_reservation_object_wait() in virtio_gpu_wait_ioctl(). This also makes the ioctl run lockless.
v9: fix return value.
v5: handle lookup failure.
v2: use reservation_object_test_signaled_rcu for VIRTGPU_WAIT_NOWAIT.
--- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 28 +++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/virtio/virtgpu_ioctl.c +16 -12
@@ -463,25 +463,29 @@ out: }static int virtio_gpu_wait_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +struct drm_file *file) {struct drm_virtgpu_3d_wait *args = data; -struct drm_gem_object *gobj =NULL ; -struct virtio_gpu_object *qobj =NULL ; +struct drm_gem_object *obj; +long timeout =15 *HZ ;int ret; -bool nowait = false; - gobj =drm_gem_object_lookup (file, args->handle); -if (gobj ==NULL ) + obj =drm_gem_object_lookup (file, args->handle); +if (obj ==NULL )return -ENOENT ; - qobj =gem_to_virtio_gpu_obj (gobj); - -if (args->flags &VIRTGPU_WAIT_NOWAIT ) - nowait = true; - ret =virtio_gpu_object_wait (qobj, nowait); +if (args->flags &VIRTGPU_WAIT_NOWAIT ) { + ret =dma_resv_test_signaled_rcu (obj->resv, true); + }else { + ret =dma_resv_wait_timeout_rcu (obj->resv, true, true, + timeout); + } +if (ret ==0 ) + ret = -EBUSY ; +else if (ret >0 ) + ret =0 ; -drm_gem_object_put_unlocked (gobj); +drm_gem_object_put_unlocked (obj);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/350 drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper.
In reply to Sasha LevinFrom: Gerd Hoffmann <[email protected]>
[ Upstream commit 29cf12394c0565d7eb1685bf0c1b4749aa6a8b66 ]
Use drm_gem_reservation_object_wait() in virtio_gpu_wait_ioctl(). This also makes the ioctl run lockless.
v9: fix return value.
v5: handle lookup failure.
v2: use reservation_object_test_signaled_rcu for VIRTGPU_WAIT_NOWAIT.
--- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 28 +++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/virtio/virtgpu_ioctl.c +16 -12
@@ -463,25 +463,29 @@ out: }static int virtio_gpu_wait_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +struct drm_file *file) {struct drm_virtgpu_3d_wait *args = data; -struct drm_gem_object *gobj =NULL ; -struct virtio_gpu_object *qobj =NULL ; +struct drm_gem_object *obj; +long timeout =15 *HZ ;int ret; -bool nowait = false; - gobj =drm_gem_object_lookup (file, args->handle); -if (gobj ==NULL ) + obj =drm_gem_object_lookup (file, args->handle); +if (obj ==NULL )return -ENOENT ; - qobj =gem_to_virtio_gpu_obj (gobj); - -if (args->flags &VIRTGPU_WAIT_NOWAIT ) - nowait = true; - ret =virtio_gpu_object_wait (qobj, nowait); +if (args->flags &VIRTGPU_WAIT_NOWAIT ) { + ret =dma_resv_test_signaled_rcu (obj->resv, true); + }else { + ret =dma_resv_wait_timeout_rcu (obj->resv, true, true, + timeout); + } +if (ret ==0 ) + ret = -EBUSY ; +else if (ret >0 ) + ret =0 ; -drm_gem_object_put_unlocked (gobj); +drm_gem_object_put_unlocked (obj);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/350 drm: mst: Fix query_payload ack reply struct
In reply to Sasha LevinFrom: Sean Paul <[email protected]>
[ Upstream commit 268de6530aa18fe5773062367fd119f0045f6e88 ]
Spec says[1] Allocated_PBN is 16 bits
[1]- DisplayPort 1.2 Spec, Section 2.11.9.8, Table 2-98
--- include/drm/drm_dp_mst_helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_dp_mst_helper.h +1 -1
@@ -334,7 +334,7 @@ struct drm_dp_resource_status_notify {struct drm_dp_query_payload_ack_reply {u8 port_number; -u8 allocated_pbn; +u16 allocated_pbn; };struct drm_dp_sideband_msg_req_body {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/350 drm/mipi-dbi: fix a loop in debugfs code
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d72cf01f410aa09868d98b672f3f92328c96b32d ]
This code will likely crash if we try to do a zero byte write. The code looks like this:
/* strip trailing whitespace */
for (i = count - 1; i > 0; i--)
if (isspace(buf[i]))
...We're writing zero bytes so count = 0. You would think that "count - 1" would be negative one, but because "i" is unsigned it is a large positive numer instead. The "i > 0" condition is true and the "buf[i]" access will be out of bounds.
The fix is to make "i" signed and now everything works as expected. The upper bound of "count" is capped in __kernel_write() at MAX_RW_COUNT so we don't have to worry about it being higher than INT_MAX.
--- drivers/gpu/drm/drm_mipi_dbi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/drm_mipi_dbi.c +1 -2
@@ -1187,8 +1187,7 @@ static ssize_t mipi_dbi_debugfs_command_write(struct file *file,struct mipi_dbi_dev *dbidev = m->private;u8 val, cmd =0 , parameters[64 ];char *buf, *pos, *token; -unsigned int i; -int ret, idx; +int i, ret, idx;if (!drm_dev_enter (&dbidev->drm, &idx))return -ENODEV ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/350 drm/panel: Add missing drm_panel_init() in panel drivers
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 65abbda8ed7ca48c8807d6b04a77431b438fa659 ]
Panels must be initialised with drm_panel_init(). Add the missing function call in the panel-raspberrypi-touchscreen.c and panel-sitronix-st7789v.c drivers.
--- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +1 -0
@@ -426,6 +426,7 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,return PTR_ERR (ts->dsi); } +drm_panel_init (&ts->base); ts->base.dev = dev; ts->base.funcs = &rpi_touchscreen_funcs;
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +1 -0
@@ -381,6 +381,7 @@ static int st7789v_probe(struct spi_device *spi)spi_set_drvdata (spi, ctx); ctx->spi = spi; +drm_panel_init (&ctx->panel); ctx->panel.dev = &spi->dev; ctx->panel.funcs = &st7789v_drm_funcs;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/350 drm: exynos: exynos_hdmi: use cec_notifier_conn_(un)register
In reply to Sasha LevinFrom: Dariusz Marcinkiewicz <[email protected]>
[ Upstream commit 71137bfd98973efb7b762ba168df077b87b34311 ]
Use the new cec_notifier_conn_(un)register() functions to (un)register the notifier for the HDMI connector, and fill in the cec_connector_info.
Changes since v7:
- err_runtime_disable -> err_rpm_disable
Changes since v2:
- removed unnecessary call to invalidate phys address before deregistering the notifier,
- use cec_notifier_phys_addr_invalidate instead of setting invalid address on a notifier.
--- drivers/gpu/drm/exynos/exynos_hdmi.c | 31 ++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-)
drivers/gpu/drm/exynos/exynos_hdmi.c +18 -13
@@ -852,6 +852,10 @@ static enum drm_connector_status hdmi_detect(struct drm_connector *connector,static void hdmi_connector_destroy (struct drm_connector *connector) { +struct hdmi_context *hdata =connector_to_hdmi (connector); + +cec_notifier_conn_unregister (hdata->notifier); +drm_connector_unregister (connector);drm_connector_cleanup (connector); }
@@ -935,6 +939,7 @@ static int hdmi_create_connector(struct drm_encoder *encoder) {struct hdmi_context *hdata =encoder_to_hdmi (encoder);struct drm_connector *connector = &hdata->connector; +struct cec_connector_info conn_info;int ret; connector->interlace_allowed = true;
@@ -957,6 +962,15 @@ static int hdmi_create_connector(struct drm_encoder *encoder)DRM_DEV_ERROR (hdata->dev,"Failed to attach bridge\n" ); } +cec_fill_conn_info_from_drm (&conn_info, connector); + + hdata->notifier =cec_notifier_conn_register (hdata->dev,NULL , + &conn_info); +if (!hdata->notifier) { + ret = -ENOMEM ; +DRM_DEV_ERROR (hdata->dev,"Failed to allocate CEC notifier\n" ); + } +return ret; }
@@ -1528,8 +1542,8 @@ static void hdmi_disable(struct drm_encoder *encoder)*/ mutex_unlock (&hdata->mutex);cancel_delayed_work (&hdata->hotplug_work); -cec_notifier_set_phys_addr (hdata->notifier, -CEC_PHYS_ADDR_INVALID ); +if (hdata->notifier) +cec_notifier_phys_addr_invalidate (hdata->notifier);return ; }
@@ -2006,12 +2020,6 @@ static int hdmi_probe(struct platform_device *pdev) } } - hdata->notifier =cec_notifier_get (&pdev->dev); -if (hdata->notifier ==NULL ) { - ret = -ENOMEM ; - goto err_hdmiphy; - } -pm_runtime_enable (dev); audio_infoframe = &hdata->audio.infoframe;
@@ -2023,7 +2031,7 @@ static int hdmi_probe(struct platform_device *pdev) ret =hdmi_register_audio_device (hdata);if (ret) - goto err_notifier_put; + goto err_rpm_disable; ret =component_add (&pdev->dev, &hdmi_component_ops);if (ret)
@@ -2034,8 +2042,7 @@ static int hdmi_probe(struct platform_device *pdev) err_unregister_audio:platform_device_unregister (hdata->audio.pdev); -err_notifier_put: -cec_notifier_put (hdata->notifier); +err_rpm_disable:pm_runtime_disable (dev); err_hdmiphy:
@@ -2054,12 +2061,10 @@ static int hdmi_remove(struct platform_device *pdev)struct hdmi_context *hdata =platform_get_drvdata (pdev);cancel_delayed_work_sync (&hdata->hotplug_work); -cec_notifier_set_phys_addr (hdata->notifier,CEC_PHYS_ADDR_INVALID );component_del (&pdev->dev, &hdmi_component_ops);platform_device_unregister (hdata->audio.pdev); -cec_notifier_put (hdata->notifier);pm_runtime_disable (&pdev->dev);if (!IS_ERR (hdata->reg_hdmi_en))
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 7/350 drm: Use EOPNOTSUPP, not ENOTSUPP
In reply to Sasha LevinFrom: Daniel Vetter <[email protected]>
[ Upstream commit c7581a414d28413c1dd6d116d44859b5a52e0950 ]
- it's what we recommend in our docs:
https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#recommended-ioctl-return-values
- it's the overwhelmingly used error code for "operation not supported", at least in drm core (slightly less so in drivers):
$ git grep EOPNOTSUPP -- drivers/gpu/drm/*c | wc -l 83 $ git grep ENOTSUPP -- drivers/gpu/drm/*c | wc -l 5
- include/linux/errno.h makes it fairly clear that these are for nfsv3 (plus they also have error codes above 512, which is the block with some special behaviour ...)
/* Defined for the NFSv3 protocol */
If the above isn't reflecting current practice, then I guess we should at least update the docs.
Noralf commented:
Ben Hutchings made this comment[1] in a thread about use of ENOTSUPP in drivers:
glibc's strerror() returns these strings for ENOTSUPP and EOPNOTSUPP respectively:
"Unknown error 524"
"Operation not supported"
So at least for errors returned to userspace EOPNOTSUPP makes sense.
José asked:
Quoted 1 line
Hopefully this will not break any userspace
None of the functions in drm_edid.c affected by this reach userspace, it's all driver internal.
Same for the mipi function, that error code should be handled by drivers. Drivers are supposed to remap "the hw is on fire" to EIO when reporting up to userspace, but I think if a driver sees this it would be a driver bug.
v2: Augment commit message with comments from Noralf and José
--- drivers/gpu/drm/drm_edid.c | 6 +++--- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_edid.c +3 -3
@@ -3722,7 +3722,7 @@ cea_db_offsets(const u8 *cea, int *start, int *end)if (*end <4 || *end >127 )return -ERANGE ; }else { -return -ENOTSUPP ; +return -EOPNOTSUPP ; }return 0 ;
@@ -4191,7 +4191,7 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)if (cea_revision (cea) <3 ) {DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }if (cea_db_offsets (cea, &start, &end)) {
@@ -4252,7 +4252,7 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)if (cea_revision (cea) <3 ) {DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }if (cea_db_offsets (cea, &start, &end)) {
drivers/gpu/drm/drm_mipi_dbi.c +1 -1
@@ -955,7 +955,7 @@ static int mipi_dbi_typec1_command(struct mipi_dbi *dbi, u8 *cmd,int ret;if (mipi_dbi_command_is_read (dbi, *cmd)) -return -ENOTSUPP ; +return -EOPNOTSUPP ;MIPI_DBI_DEBUG_COMMAND (*cmd, parameters, num);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/350 drm/amd/display: verify stream link before link test
In reply to Sasha LevinFrom: Jing Zhou <[email protected]>
[ Upstream commit b131932215c993ea5adf8192d1de2e8d6b23048d ]
[Why]
DP1.2 LL CTS test failure.
[How]
The failure is caused by not verify stream link is equal to link, only check stream and link is not null.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +2 -1
@@ -277,7 +277,8 @@ void dp_retrain_link_dp_test(struct dc_link *link,if (pipes[i].stream !=NULL && !pipes[i].top_pipe && !pipes[i].prev_odm_pipe && pipes[i].stream->link !=NULL && - pipes[i].stream_res.stream_enc !=NULL ) { + pipes[i].stream_res.stream_enc !=NULL && + pipes[i].stream->link == link) {udelay (100 ); pipes[i].stream_res.stream_enc->funcs->dp_blank(
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/350 drm/bridge: analogix-anx78xx: silence -EPROBE_DEFER warnings
In reply to Sasha LevinFrom: Brian Masney <[email protected]>
[ Upstream commit 2708e876272d89bbbff811d12834adbeef85f022 ]
Silence two warning messages that occur due to -EPROBE_DEFER errors to help cleanup the system boot log.
--- drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/analogix-anx78xx.c +6 -2
@@ -715,7 +715,9 @@ static int anx78xx_init_pdata(struct anx78xx *anx78xx)/* 1.0V digital core power regulator */ pdata->dvdd10 =devm_regulator_get (dev,"dvdd10" );if (IS_ERR (pdata->dvdd10)) { -DRM_ERROR ("DVDD10 regulator not found\n" ); +if (PTR_ERR (pdata->dvdd10) != -EPROBE_DEFER ) +DRM_ERROR ("DVDD10 regulator not found\n" ); +return PTR_ERR (pdata->dvdd10); }
@@ -1332,7 +1334,9 @@ static int anx78xx_i2c_probe(struct i2c_client *client, err =anx78xx_init_pdata (anx78xx);if (err) { -DRM_ERROR ("Failed to initialize pdata: %d\n" , err); +if (err != -EPROBE_DEFER ) +DRM_ERROR ("Failed to initialize pdata: %d\n" , err); +return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/350 drm/amd/display: OTC underflow fix
In reply to Sasha LevinFrom: Jaehyun Chung <[email protected]>
[ Upstream commit 785908cf19c9eb4803f6bf9c0a7447dc3661d5c3 ]
[Why] Underflow occurs on some display setups(repro'd on 3x4K HDR) on boot, mode set, and hot-plugs with. Underflow occurs because mem clk is not set high after disabling pstate switching. This behaviour occurs because some calculations assumed displays were synchronized.
[How] Add a condition to check if timing sync is disabled so that synchronized vblank can be set to false.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -1
@@ -1765,7 +1765,7 @@ int dcn20_populate_dml_pipes_from_context( pipe_cnt = i;continue ; } -if (!resource_are_streams_timing_synchronizable ( +if (dc->debug.disable_timing_sync || !resource_are_streams_timing_synchronizable ( res_ctx->pipe_ctx[pipe_cnt].stream, res_ctx->pipe_ctx[i].stream)) { synchronized_vblank = false;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/350 iio: max31856: add missing of_node and parent references to iio_dev
In reply to Sasha LevinFrom: Andrea Merello <[email protected]>
[ Upstream commit 505ea3ada665c466d0064b11b6e611b7f995517d ]
Adding missing indio_dev->dev.of_node references so that, in case multiple max31856 are present, users can get some clues to being able to distinguish each of them. While at it, add also the missing parent reference.
--- drivers/iio/temperature/max31856.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iio/temperature/max31856.c +2 -0
@@ -284,6 +284,8 @@ static int max31856_probe(struct spi_device *spi)spi_set_drvdata (spi, indio_dev); indio_dev->info = &max31856_info; + indio_dev->dev.parent = &spi->dev; + indio_dev->dev.of_node = spi->dev.of_node; indio_dev->name = id->name; indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->channels = max31856_channels;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/350 iio: light: bh1750: Resolve compiler warning and make code more readable
In reply to Sasha LevinFrom: Krzysztof Wilczynski <[email protected]>
[ Upstream commit f552fde983d378e7339f9ea74a25f918563bf0d3 ]
Separate the declaration of struct bh1750_chip_info from definition of bh1750_chip_info_tbl[] in a single statement as it makes the code hard to read, and with the extra newline it makes it look as if the bh1750_chip_info_tbl[] had no explicit type.
This change also resolves the following compiler warning about the unusual position of the static keyword that can be seen when building with warnings enabled (W=1):
drivers/iio/light/bh1750.c:64:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]
Related to commit 3a11fbb037a1 ("iio: light: add support for ROHM BH1710/BH1715/BH1721/BH1750/BH1751 ambient light sensors").
--- drivers/iio/light/bh1750.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/light/bh1750.c +2 -2
@@ -59,9 +59,9 @@ struct bh1750_chip_info {u16 int_time_low_mask;u16 int_time_high_mask; -} +}; -static const bh1750_chip_info_tbl[] = { +static const struct bh1750_chip_info bh1750_chip_info_tbl[] = { [BH1710 ] = {140 ,1022 ,300 ,400 ,250000000 ,2 ,0x001F ,0x03E0 }, [BH1721 ] = {140 ,1020 ,300 ,400 ,250000000 ,2 ,0x0010 ,0x03E0 }, [BH1750 ] = {31 ,254 ,69 ,1740 ,57500000 ,1 ,0x001F ,0x00E0 },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/350 drm/amdgpu/sriov: add ring_stop before ring_create in psp v11 code
In reply to Sasha LevinFrom: Jack Zhang <[email protected]>
[ Upstream commit 51c0f58e9f6af3a387d14608033e6796a7ad90ee ]
psp v11 code missed ring stop in ring create function(VMR) while psp v3.1 code had the code. This will cause VM destroy1 fail and psp ring create fail.
For SIOV-VF, ring_stop should not be deleted in ring_create function.
--- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 61 ++++++++++++++------------ 1 file changed, 34 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +34 -27
@@ -398,6 +398,34 @@ static bool psp_v11_0_support_vmr_ring(struct psp_context *psp)return false; } +static int psp_v11_0_ring_stop (struct psp_context *psp, +enum psp_ring_type ring_type) +{ +int ret =0 ; +struct amdgpu_device *adev = psp->adev; + +/* Write the ring destroy command*/ +if (psp_v11_0_support_vmr_ring (psp)) +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_101, +GFX_CTRL_CMD_ID_DESTROY_GPCOM_RING ); +else +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, +GFX_CTRL_CMD_ID_DESTROY_RINGS ); + +/* there might be handshake issue with hardware which needs delay */ +mdelay (20 ); + +/* Wait for response flag (bit 31) */ +if (psp_v11_0_support_vmr_ring (psp)) + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), +0x80000000 ,0x80000000 , false); +else + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +0x80000000 ,0x80000000 , false); + +return ret; +} +static int psp_v11_0_ring_create (struct psp_context *psp,enum psp_ring_type ring_type) {
@@ -407,6 +435,12 @@ static int psp_v11_0_ring_create(struct psp_context *psp,struct amdgpu_device *adev = psp->adev;if (psp_v11_0_support_vmr_ring (psp)) { + ret =psp_v11_0_ring_stop (psp, ring_type); +if (ret) { +DRM_ERROR ("psp_v11_0_ring_stop_sriov failed!\n" ); +return ret; + } +/* Write low address of the ring to C2PMSG_102 */ psp_ring_reg =lower_32_bits (ring->ring_mem_mc_addr);WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_102, psp_ring_reg);
@@ -451,33 +485,6 @@ static int psp_v11_0_ring_create(struct psp_context *psp,return ret; } -static int psp_v11_0_ring_stop (struct psp_context *psp, -enum psp_ring_type ring_type) -{ -int ret =0 ; -struct amdgpu_device *adev = psp->adev; - -/* Write the ring destroy command*/ -if (psp_v11_0_support_vmr_ring (psp)) -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_101, -GFX_CTRL_CMD_ID_DESTROY_GPCOM_RING ); -else -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, -GFX_CTRL_CMD_ID_DESTROY_RINGS ); - -/* there might be handshake issue with hardware which needs delay */ -mdelay (20 ); - -/* Wait for response flag (bit 31) */ -if (psp_v11_0_support_vmr_ring (psp)) - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); -else - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); - -return ret; -}static int psp_v11_0_ring_destroy (struct psp_context *psp,enum psp_ring_type ring_type)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/350 drm/amdgpu: grab the id mgr lock while accessing passid_mapping
In reply to Sasha LevinFrom: Christian König <[email protected]>
[ Upstream commit 6817bf283b2b851095825ec7f0e9f10398e09125 ]
Need to make sure that we actually dropping the right fence. Could be done with RCU as well, but to complicated for a fix.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +9 -3
@@ -1034,10 +1034,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ id->oa_base != job->oa_base || id->oa_size != job->oa_size);bool vm_flush_needed = job->vm_needs_flush; -bool pasid_mapping_needed = id->pasid != job->pasid || - !id->pasid_mapping || - !dma_fence_is_signaled (id->pasid_mapping);struct dma_fence *fence =NULL ; +bool pasid_mapping_needed;unsigned patch_offset =0 ;int r;
@@ -1047,6 +1045,12 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ pasid_mapping_needed = true; } +mutex_lock (&id_mgr->lock); +if (id->pasid != job->pasid || !id->pasid_mapping || + !dma_fence_is_signaled (id->pasid_mapping)) + pasid_mapping_needed = true; +mutex_unlock (&id_mgr->lock); + gds_switch_needed &= !!ring->funcs->emit_gds_switch; vm_flush_needed &= !!ring->funcs->emit_vm_flush && job->vm_pd_addr !=AMDGPU_BO_INVALID_OFFSET ;
@@ -1086,9 +1090,11 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ }if (pasid_mapping_needed) { +mutex_lock (&id_mgr->lock); id->pasid = job->pasid;dma_fence_put (id->pasid_mapping); id->pasid_mapping =dma_fence_get (fence); +mutex_unlock (&id_mgr->lock); }dma_fence_put (fence);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/350 drm/ttm: return -EBUSY on pipelining with no_gpu_wait (v2)
In reply to Sasha LevinFrom: Christian König <[email protected]>
[ Upstream commit 3084cf46cf8110826a42de8c8ef30e8fa48974c2 ]
Setting the no_gpu_wait flag means that the allocate BO must be available immediately and we can't wait for any GPU operation to finish.
v2: squash in mem leak fix, rebase
--- drivers/gpu/drm/ttm/ttm_bo.c | 44 +++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 18 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +26 -18
@@ -926,7 +926,8 @@ EXPORT_SYMBOL(ttm_bo_mem_put);*/ static int ttm_bo_add_move_fence (struct ttm_buffer_object *bo,struct ttm_mem_type_manager *man, -struct ttm_mem_reg *mem) +struct ttm_mem_reg *mem, +bool no_wait_gpu) {struct dma_fence *fence;int ret;
@@ -935,19 +936,22 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, fence =dma_fence_get (man->move);spin_unlock (&man->move_lock); -if (fence) { -dma_resv_add_shared_fence (bo->base.resv, fence); +if (!fence) +return 0 ; - ret =dma_resv_reserve_shared (bo->base.resv,1 ); -if (unlikely (ret)) { -dma_fence_put (fence); -return ret; - } +if (no_wait_gpu) +return -EBUSY ; + +dma_resv_add_shared_fence (bo->base.resv, fence); -dma_fence_put (bo->moving); - bo->moving = fence; + ret =dma_resv_reserve_shared (bo->base.resv,1 ); +if (unlikely (ret)) { +dma_fence_put (fence); +return ret; } +dma_fence_put (bo->moving); + bo->moving = fence;return 0 ; }
@@ -978,7 +982,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,return ret; }while (1 ); -return ttm_bo_add_move_fence (bo, man, mem); +return ttm_bo_add_move_fence (bo, man, mem, ctx->no_wait_gpu); } static uint32_t ttm_bo_select_caching(struct ttm_mem_type_manager *man,
@@ -1120,14 +1124,18 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,if (unlikely (ret)) goto error; -if (mem->mm_node) { - ret =ttm_bo_add_move_fence (bo, man, mem); -if (unlikely (ret)) { - (*man->func->put_node)(man, mem); - goto error; - } -return 0 ; +if (!mem->mm_node) +continue ; + + ret =ttm_bo_add_move_fence (bo, man, mem, ctx->no_wait_gpu); +if (unlikely (ret)) { + (*man->func->put_node)(man, mem); +if (ret == -EBUSY ) +continue ; + + goto error; } +return 0 ; }for (i =0 ; i < placement->num_busy_placement; ++i) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/350 drm/amd/display: Rebuild mapped resources after pipe split
In reply to Sasha LevinFrom: Mikita Lipski <[email protected]>
[ Upstream commit 387596ef2859c37d564ce15abddbc9063a132e2c ]
[why]
The issue is specific for linux, as on timings such as 8K@60 or 4K@144 DSC should be working in combination with ODM Combine in order to ensure that we can run those timings. The validation for those timings was passing, but when pipe split was happening second pipe wasn't being programmed.
[how]
Rebuild mapped resources if we split stream for ODM.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -0
@@ -2474,6 +2474,7 @@ bool dcn20_fast_validate_bw( &context->res_ctx, dc->res_pool, pipe, hsplit_pipe)) goto validate_fail; +dcn20_build_mapped_resource (dc, context, pipe->stream); }else dcn20_split_stream_for_mpc( &context->res_ctx, dc->res_pool,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/350 ath10k: add cleanup in ath10k_sta_state()
In reply to Sasha LevinFrom: Wenwen Wang <[email protected]>
[ Upstream commit 334f5b61a6f29834e881923b98d1e27e5ce9620d ]
If 'sta->tdls' is false, no cleanup is executed, leading to memory/resource leaks, e.g., 'arsta->tx_stats'. To fix this issue, perform cleanup before go to the 'exit' label.
--- drivers/net/wireless/ath/ath10k/mac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/mac.c +5 -1
@@ -6549,8 +6549,12 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,spin_unlock_bh (&ar->data_lock); -if (!sta->tdls) +if (!sta->tdls) { +ath10k_peer_delete (ar, arvif->vdev_id, sta->addr); +ath10k_mac_dec_num_stations (arvif, sta); +kfree (arsta->tx_stats); goto exit; + } ret =ath10k_wmi_update_fw_tdls_state (ar, arvif->vdev_id,WMI_TDLS_ENABLE_ACTIVE );
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 18/350 drm/amd/display: Handle virtual signal type in disable_link()
In reply to Sasha LevinFrom: Martin Tsai <[email protected]>
[ Upstream commit 616f5b65f1c02d3d6ae370644670d14c57de2fd8 ]
[Why]
The new implementation changed the behavior to allow process setMode to DAL when DAL returns empty mode query for unplugged display. This will trigger additional disable_link().
When unplug HDMI from MST dock, driver will update stream->signal to "Virtual". disable_link() will call disable_output() if the signal type is not DP and induce other displays on MST dock show black screen.
[How]
Don't need to process disable_output() if the signal type is virtual.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +4 -2
@@ -2169,8 +2169,10 @@ static void disable_link(struct dc_link *link, enum signal_type signal) dp_set_fec_ready(link, false); }#endif - }else - link->link_enc->funcs->disable_output (link->link_enc, signal); + }else { +if (signal !=SIGNAL_TYPE_VIRTUAL ) + link->link_enc->funcs->disable_output (link->link_enc, signal); + }if (signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) {/* MST disable link only when no stream use the link */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/350 iio: tcs3414: fix iio_triggered_buffer_{pre,post}enable positions
In reply to Sasha LevinFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit 0fe2f2b789190661df24bb8bf62294145729a1fe ]
The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
For the predisable hook, the disable code should occur before detaching the poll func, and for the postenable hook, the poll func should be attached before the enable code.
The driver was slightly reworked. The preenable hook was moved to the postenable, to add some symmetry to the postenable/predisable part.
--- drivers/iio/light/tcs3414.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
drivers/iio/light/tcs3414.c +20 -10
@@ -240,32 +240,42 @@ static const struct iio_info tcs3414_info = { .attrs = &tcs3414_attribute_group, }; -static int tcs3414_buffer_preenable (struct iio_dev *indio_dev) +static int tcs3414_buffer_postenable (struct iio_dev *indio_dev) {struct tcs3414_data *data =iio_priv (indio_dev); +int ret; + + ret =iio_triggered_buffer_postenable (indio_dev); +if (ret) +return ret; data->control |=TCS3414_CONTROL_ADC_EN ; -return i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , + ret =i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , data->control); +if (ret) +iio_triggered_buffer_predisable (indio_dev); + +return ret; }static int tcs3414_buffer_predisable (struct iio_dev *indio_dev) {struct tcs3414_data *data =iio_priv (indio_dev); -int ret; - - ret =iio_triggered_buffer_predisable (indio_dev); -if (ret <0 ) -return ret; +int ret, ret2; data->control &= ~TCS3414_CONTROL_ADC_EN ; -return i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , + ret =i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , data->control); + + ret2 =iio_triggered_buffer_predisable (indio_dev); +if (!ret) + ret = ret2; + +return ret; }static const struct iio_buffer_setup_ops tcs3414_buffer_setup_ops = { - .preenable = tcs3414_buffer_preenable, - .postenable = &iio_triggered_buffer_postenable, + .postenable = tcs3414_buffer_postenable, .predisable = tcs3414_buffer_predisable, };
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 019/350] iio: tcs3414: fix iio_triggered_buffer_{pre,post}enable positions
Quoted 11 lines · On Tue, 10 Dec 2019 15:58:31 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
0fe2f2b789190661df24bb8bf62294145729a1fe]The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
For the predisable hook, the disable code should occur before detaching the poll func, and for the postenable hook, the poll func should be attached before the enable code.
Quoted 6 lines
The driver was slightly reworked. The preenable hook was moved to the postenable, to add some symmetry to the postenable/predisable part.
Signed-off-by Alexandru Ardelean <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>
I doubt this did any harm, but wouldn't consider it stable material normally.
This is part of a general rework going on to allow some core refactoring.
I should have added a note to this one like some related patches that it is a logical fix, but we don't have an actual known bug afaik.
Sorry about that.
Jonathan
Quoted 61 lines
--- drivers/iio/light/tcs3414.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)drivers/iio/light/tcs3414.c +20
-10@@ -240,32 +240,42 @@ static const struct iio_info tcs3414_info = { .attrs = &tcs3414_attribute_group, }; -static int tcs3414_buffer_preenable (struct iio_dev *indio_dev) +static int tcs3414_buffer_postenable (struct iio_dev *indio_dev) {struct tcs3414_data *data =iio_priv (indio_dev); +int ret; + + ret =iio_triggered_buffer_postenable (indio_dev); +if (ret) +return ret; data->control |=TCS3414_CONTROL_ADC_EN ; -return i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , + ret =i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , data->control); +if (ret) +iio_triggered_buffer_predisable (indio_dev); + +return ret; }static int tcs3414_buffer_predisable (struct iio_dev *indio_dev) {struct tcs3414_data *data =iio_priv (indio_dev); -int ret; - - ret =iio_triggered_buffer_predisable (indio_dev); -if (ret <0 ) -return ret; +int ret, ret2; data->control &= ~TCS3414_CONTROL_ADC_EN ; -return i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , + ret =i2c_smbus_write_byte_data (data->client,TCS3414_CONTROL , data->control); + + ret2 =iio_triggered_buffer_predisable (indio_dev); +if (!ret) + ret = ret2; + +return ret; }static const struct iio_buffer_setup_ops tcs3414_buffer_setup_ops = { - .preenable = tcs3414_buffer_preenable, - .postenable = &iio_triggered_buffer_postenable, + .postenable = tcs3414_buffer_postenable, .predisable = tcs3414_buffer_predisable, };
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.4 019/350] iio: tcs3414: fix iio_triggered_buffer_{pre,post}enable positions
Quoted 20 lines · Jonathan Cameron
Quoted 11 lines · On Tue, 10 Dec 2019 15:58:31 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
0fe2f2b789190661df24bb8bf62294145729a1fe]The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
For the predisable hook, the disable code should occur before detaching the poll func, and for the postenable hook, the poll func should be attached before the enable code.
Quoted 6 lines
The driver was slightly reworked. The preenable hook was moved to the postenable, to add some symmetry to the postenable/predisable part.
Signed-off-by Alexandru Ardelean <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 6 lines
I doubt this did any harm, but wouldn't consider it stable material normally.
This is part of a general rework going on to allow some core refactoring.
I should have added a note to this one like some related patches that it is a logical fix, but we don't have an actual known bug afaik.
I'll drop it from everywhere, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 20/350 ath10k: Check if station exists before forwarding tx airtime report
In reply to Sasha LevinFrom: Hauke Mehrtens <[email protected]>
[ Upstream commit b10f32672946ad638a430cc4289029b7acf8e979 ]
It looks like the FW on QCA9984 already reports the tx airtimes before the station is added to the peer entry. The peer entry is created in ath10k_peer_map_event() just with the vdev_id and the ethaddr, but not with a station entry, this is added later in ath10k_peer_create() in callbacks from mac80211.
When there is no sta added to the peer entry, this function fails because it calls ieee80211_sta_register_airtime() with NULL.
This was reported in OpenWrt some time ago:
https://bugs.openwrt.org/index.php?do=details&task_id=2414
This commit should fix this crash:
[ 75.991714] Unable to handle kernel paging request at virtual address fffff9e8 [ 75.991756] pgd = c0204000 [ 75.997955] [fffff9e8] *pgd=5fdfd861, *pte=00000000, *ppte=00000000 [ 76.000537] Internal error: Oops: 37 [#1] SMP ARM [ 76.006686] Modules linked in: pppoe ppp_async ath10k_pci ath10k_core ath pptp pppox ppp_mppe ppp_generic mac80211 iptable_nat ipt_REJECT ipt_MASQUERADE cfg80211 xt_time xt_tcpudp xt_tcpmss xt_statistic xt_state xt_recent xt_nat xt_multiport xt_mark xt_mac xt_limit xt_length xt_hl xt_helper xt_esp xt_ecn xt_dscp xt_conntrack xt_connmark xt_connlimit xt_connbytes xt_comment xt_TCPMSS xt_REDIRECT xt_LOG xt_HL xt_FLOWOFFLOAD xt_DSCP xt_CT xt_CLASSIFY usbserial slhc nf_reject_ipv4 nf_nat_redirect nf_nat_masquerade_ipv4 nf_conntrack_ipv4 nf_nat_ipv4 nf_log_ipv4 nf_flow_table_hw nf_flow_table nf_defrag_ipv4 nf_conntrack_rtcache nf_conntrack_netlink iptable_raw iptable_mangle iptable_filter ipt_ah ipt_ECN ip_tables crc_ccitt compat chaoskey fuse sch_cake sch_tbf sch_ingress sch_htb sch_hfsc em_u32 cls_u32 [ 76.059974] cls_tcindex cls_route cls_matchall cls_fw cls_flow cls_basic act_skbedit act_mirred ledtrig_usbport xt_set ip_set_list_set ip_set_hash_netportnet ip_set_hash_netport ip_set_hash_netnet ip_set_hash_netiface ip_set_hash_net ip_set_hash_mac ip_set_hash_ipportnet ip_set_hash_ipportip ip_set_hash_ipport ip_set_hash_ipmark ip_set_hash_ip ip_set_bitmap_port ip_set_bitmap_ipmac ip_set_bitmap_ip ip_set nfnetlink ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6t_NPT ip6t_MASQUERADE nf_nat_masquerade_ipv6 nf_nat nf_conntrack nf_log_ipv6 nf_log_common ip6table_mangle ip6table_filter ip6_tables ip6t_REJECT x_tables nf_reject_ipv6 msdos ip_gre gre ifb sit tunnel4 ip_tunnel tun vfat fat hfsplus cifs nls_utf8 nls_iso8859_15 nls_iso8859_1 nls_cp850 nls_cp437 nls_cp1250 sha1_generic md5 md4 [ 76.130634] usb_storage leds_gpio xhci_plat_hcd xhci_pci xhci_hcd dwc3 dwc3_of_simple ohci_platform ohci_hcd phy_qcom_dwc3 ahci ehci_platform sd_mod ahci_platform libahci_platform libahci libata scsi_mod ehci_hcd gpio_button_hotplug ext4 mbcache jbd2 exfat crc32c_generic [ 76.154772] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.14.132 #0 [ 76.177001] Hardware name: Generic DT based system [ 76.182990] task: c0b06d80 task.stack: c0b00000 [ 76.187832] PC is at ieee80211_sta_register_airtime+0x24/0x148 [mac80211] [ 76.192211] LR is at ath10k_htt_t2h_msg_handler+0x678/0x10f4 [ath10k_core] [ 76.199052] pc : [<bf75bfac>] lr : [<bf83e8b0>] psr: a0000113 [ 76.205820] sp : c0b01d54 ip : 00000002 fp : bf869c0c [ 76.211981] r10: 0000003c r9 : dbdca138 r8 : 00060002 [ 76.217192] r7 : 00000000 r6 : dabe1150 r5 : 00000000 r4 : dbdc95c0 [ 76.222401] r3 : 00000000 r2 : 00060002 r1 : 00000000 r0 : 00000000 [ 76.229003] Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none [ 76.235509] Control: 10c5787d Table: 5c94006a DAC: 00000051 [ 76.242716] Process swapper/0 (pid: 0, stack limit = 0xc0b00210) [ 76.248446] Stack: (0xc0b01d54 to 0xc0b02000) [ 76.254532] 1d40: dbdc95c0 00000000 dabe1150 [ 76.258808] 1d60: 00000001 dabe1150 dbdca138 0000003c bf869c0c bf83e8b0 00000002 c0314b10 [ 76.266969] 1d80: dbdc9c70 00000001 00000001 dabe114c 00010000 00000000 dbdcd724 bf88f3d8 [ 76.275126] 1da0: c0310d28 db393c00 dbdc95c0 00000000 c0b01dd0 c07fb4c4 dbdcd724 00000001 [ 76.283286] 1dc0: 00000022 bf88b09c db393c00 00000022 c0b01dd0 c0b01dd0 00000000 dbdcc5c0 [ 76.291445] 1de0: bf88f04c dbdcd654 dbdcd71c dbdc95c0 00000014 dbdcd724 dbdcc5c0 00000005 [ 76.299605] 1e00: 0004b400 bf85c360 00000000 bf87101c c0b01e24 00000006 00000000 dbdc95c0 [ 76.307764] 1e20: 00000001 00000040 0000012c c0b01e80 1cf51000 bf85c448 dbdcd440 dbdc95c0 [ 76.315925] 1e40: dbdca440 ffffa880 00000040 bf88cb68 dbdcd440 00000001 00000040 ffffa880 [ 76.324084] 1e60: c0b02d00 c06d72e0 dd990080 c0a3f080 c0b255dc c0b047e4 c090afac c090e80c [ 76.332244] 1e80: c0b01e80 c0b01e80 c0b01e88 c0b01e88 dd4cc200 00000000 00000003 c0b0208c [ 76.340405] 1ea0: c0b02080 40000003 ffffe000 00000100 c0b02080 c03015c8 00000000 00000001 [ 76.348564] 1ec0: dd408000 c0a38210 c0b2c7c0 0000000a ffffa880 c0b02d00 c07fb764 00200102 [ 76.356723] 1ee0: dd4cc268 c0a3e414 00000000 00000000 00000001 dd408000 de803000 00000000 [ 76.364883] 1f00: 00000000 c03247cc c0a3e414 c0368f1c c0b03f60 c0b153cc de80200c de802000 [ 76.373042] 1f20: c0b01f48 c0301488 c0308630 60000013 ffffffff c0b01f7c 00000000 c0b00000 [ 76.381204] 1f40: 00000000 c030c08c 00000001 00000000 00000000 c0315180 ffffe000 c0b03cc0 [ 76.389363] 1f60: c0b03c70 00000000 00000000 c0a2da28 00000000 00000000 c0b01f90 c0b01f98 [ 76.397522] 1f80: c030862c c0308630 60000013 ffffffff 00000051 00000000 ffffe000 c035dd18 [ 76.405681] 1fa0: 000000bf c0b03c40 00000000 c0b2c000 dddfce80 c035e060 c0b2c040 c0a00cf4 [ 76.413842] 1fc0: ffffffff ffffffff 00000000 c0a0067c c0a2da28 00000000 00000000 c0b2c1d4 [ 76.422001] 1fe0: c0b03c5c c0a2da24 c0b07ee0 4220406a 512f04d0 4220807c 00000000 00000000 [ 76.430335] [<bf75bfac>] (ieee80211_sta_register_airtime [mac80211]) from [<00000002>] (0x2) [ 76.438314] Code: e1cd81f0 e1a08002 e1cda1f8 e58de020 (e5102618) [ 76.446965] ---[ end trace 227a38ade964d642 ]---
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +1 -1
@@ -2726,7 +2726,7 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,spin_lock_bh (&ar->data_lock); peer =ath10k_peer_find_by_id (ar, peer_id); -if (!peer) { +if (!peer || !peer->sta) {spin_unlock_bh (&ar->data_lock);rcu_read_unlock ();continue ;
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 21/350 spi: Add call to spi_slave_abort() function when spidev driver is released
In reply to Sasha LevinFrom: Lukasz Majewski <[email protected]>
[ Upstream commit 9f918a728cf86b2757b6a7025e1f46824bfe3155 ]
This change is necessary for spidev devices (e.g. /dev/spidev3.0) working in the slave mode (like NXP's dspi driver for Vybrid SoC).
When SPI HW works in this mode - the master is responsible for providing CS and CLK signals. However, when some fault happens - like for example distortion on SPI lines - the SPI Linux driver needs a chance to recover from this abnormal situation and prepare itself for next (correct) transmission.
This change doesn't pose any threat on drivers working in master mode as spi_slave_abort() function checks if SPI slave mode is supported.
--- drivers/spi/spidev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spidev.c +3 -0
@@ -627,6 +627,9 @@ static int spidev_release(struct inode *inode, struct file *filp)if (dofree)kfree (spidev); } +#ifdef CONFIG_SPI_SLAVE +spi_slave_abort (spidev->spi); +#endif mutex_unlock (&device_list_lock);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/350 drm/meson: vclk: use the correct G12A frac max value
In reply to Sasha LevinFrom: Neil Armstrong <[email protected]>
[ Upstream commit d56276a13c2b9ea287b9fc7cc78bed4c43b286f9 ]
When calculating the HDMI PLL settings for a DMT mode PHY frequency, use the correct max fractional PLL value for G12A VPU.
With this fix, we can finally setup the 1024x768-60 mode.
--- drivers/gpu/drm/meson/meson_vclk.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/meson/meson_vclk.c +7 -2
@@ -638,13 +638,18 @@ static bool meson_hdmi_pll_validate_params(struct meson_drm *priv,if (frac >=HDMI_FRAC_MAX_GXBB )return false; }else if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_GXM ) || -meson_vpu_is_compatible (priv,VPU_COMPATIBLE_GXL ) || -meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A )) { +meson_vpu_is_compatible (priv,VPU_COMPATIBLE_GXL )) {/* Empiric supported min/max dividers */ if (m <106 || m >247 )return false;if (frac >=HDMI_FRAC_MAX_GXL )return false; + }else if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A )) { +/* Empiric supported min/max dividers */ +if (m <106 || m >247 ) +return false; +if (frac >=HDMI_FRAC_MAX_G12A ) +return false; }return true;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/350 staging: rtl8192u: fix multiple memory leaks on error path
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit ca312438cf176a16d4b89350cade8789ba8d7133 ]
In rtl8192_tx on error handling path allocated urbs and also skb should be released.
--- drivers/staging/rtl8192u/r8192U_core.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +12 -5
@@ -1422,7 +1422,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) (struct tx_fwinfo_819x_usb *)(skb->data +USB_HWDESC_HEADER_LEN );struct usb_device *udev = priv->udev;int pend; -int status; +int status, rt =-1 ;struct urb *tx_urb =NULL , *tx_urb_zero =NULL ;unsigned int idx_pipe;
@@ -1566,8 +1566,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) }if (bSend0Byte) { tx_urb_zero =usb_alloc_urb (0 ,GFP_ATOMIC ); -if (!tx_urb_zero) -return -ENOMEM ; +if (!tx_urb_zero) { + rt = -ENOMEM ; + goto error; + }usb_fill_bulk_urb (tx_urb_zero, udev,usb_sndbulkpipe (udev, idx_pipe), &zero,0 , tx_zero_isr, dev);
@@ -1577,7 +1579,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)"Error TX URB for zero byte %d, error %d" ,atomic_read (&priv->tx_pending[tcb_desc->queue_index]), status); -return -1 ; + goto error; } }netif_trans_update (dev);
@@ -1588,7 +1590,12 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)RT_TRACE (COMP_ERR ,"Error TX URB %d, error %d" ,atomic_read (&priv->tx_pending[tcb_desc->queue_index]), status); -return -1 ; + +error: +dev_kfree_skb_any (skb); +usb_free_urb (tx_urb); +usb_free_urb (tx_urb_zero); +return rt; }static short rtl8192_usb_initendpoints (struct net_device *dev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/350 staging: rtl8188eu: fix possible null dereference
In reply to Sasha LevinFrom: Connor Kuehl <[email protected]>
[ Upstream commit 228241944a48113470d3c3b46c88ba7fbe0a274b ]
Inside a nested 'else' block at the beginning of this function is a call that assigns 'psta' to the return value of 'rtw_get_stainfo()'. If 'rtw_get_stainfo()' returns NULL and the flow of control reaches the 'else if' where 'psta' is dereferenced, then we will dereference a NULL pointer.
Fix this by checking if 'psta' is not NULL before reading its 'psta->qos_option' data member.
Addresses-Coverity: ("Dereference null return value")
--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +2 -2
@@ -776,7 +776,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrmemcpy (pwlanhdr->addr2,get_bssid (pmlmepriv),ETH_ALEN );memcpy (pwlanhdr->addr3, pattrib->src,ETH_ALEN ); -if (psta->qos_option) +if (psta && psta->qos_option) qos_option = true; }else if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) ||check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {
@@ -784,7 +784,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrmemcpy (pwlanhdr->addr2, pattrib->src,ETH_ALEN );memcpy (pwlanhdr->addr3,get_bssid (pmlmepriv),ETH_ALEN ); -if (psta->qos_option) +if (psta && psta->qos_option) qos_option = true; }else {RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n" ,get_fwstate (pmlmepriv)));
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/350 objtool: add kunit_try_catch_throw to the noreturn list
In reply to Sasha LevinFrom: Brendan Higgins <[email protected]>
[ Upstream commit 33adf80f5b52e3f7c55ad66ffcaaff93c6888aaa ]
Fix the following warning seen on GCC 7.3:
kunit/test-test.o: warning: objtool: kunit_test_unsuccessful_try() falls through to next function kunit_test_catch()
kunit_try_catch_throw is a function added in the following patch in this series; it allows KUnit, a unit testing framework for the kernel, to bail out of a broken test. As a consequence, it is a new __noreturn function that objtool thinks is broken (as seen above). So fix this warning by adding kunit_try_catch_throw to objtool's noreturn list.
--- tools/objtool/check.c | 1 + 1 file changed, 1 insertion(+)
tools/objtool/check.c +1 -0
@@ -144,6 +144,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,"usercopy_abort" ,"machine_real_restart" ,"rewind_stack_do_exit" , + "kunit_try_catch_throw", };if (!func)
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 025/350] objtool: add kunit_try_catch_throw to the noreturn list
Quoted 14 lines · Sasha Levin
From: Brendan Higgins <[email protected]>
[ Upstream commit
33adf80f5b52e3f7c55ad66ffcaaff93c6888aaa]Fix the following warning seen on GCC 7.3:
kunit/test-test.o: warning: objtool:kunit_test_unsuccessful_try()falls through to next functionkunit_test_catch()
kunit_try_catch_throwis a function added in the following patch in this series; it allows KUnit, a unit testing framework for the kernel, to bail out of a broken test. As a consequence, it is a new__noreturnfunction that objtool thinks is broken (as seen above). So fix this warning by addingkunit_try_catch_throwto objtool's noreturn list.
Quoted 7 lines
Reported-by kbuild test robot <[email protected]>Signed-off-by Brendan Higgins <[email protected]>Acked-by Josh Poimboeuf <[email protected]>Cc Peter Zijlstra <[email protected]>Signed-off-by Shuah Khan <[email protected]>Signed-off-by Sasha Levin <[email protected]>
I don't think this change should be backported. This patch is to ignore an erroneous warning introduced by KUnit; it serves no purpose prior to the KUnit patches being merged.
Quoted 19 lines
--- tools/objtool/check.c | 1 + 1 file changed, 1 insertion(+)tools/objtool/check.c +1
-1@@ -144,6 +144,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,"usercopy_abort" ,"machine_real_restart" ,"rewind_stack_do_exit" , + "kunit_try_catch_throw", };if (!func) --2.20.1
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.4 025/350] objtool: add kunit_try_catch_throw to the noreturn list
Quoted 23 lines · Brendan Higgins
Quoted 14 lines · Sasha Levin
From: Brendan Higgins <[email protected]>
[ Upstream commit
33adf80f5b52e3f7c55ad66ffcaaff93c6888aaa]Fix the following warning seen on GCC 7.3:
kunit/test-test.o: warning: objtool:kunit_test_unsuccessful_try()falls through to next functionkunit_test_catch()
kunit_try_catch_throwis a function added in the following patch in this series; it allows KUnit, a unit testing framework for the kernel, to bail out of a broken test. As a consequence, it is a new__noreturnfunction that objtool thinks is broken (as seen above). So fix this warning by addingkunit_try_catch_throwto objtool's noreturn list.Quoted 7 lines
Reported-by kbuild test robot <[email protected]>Signed-off-by Brendan Higgins <[email protected]>Acked-by Josh Poimboeuf <[email protected]>Cc Peter Zijlstra <[email protected]>Signed-off-by Shuah Khan <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 3 lines
I don't think this change should be backported. This patch is to ignore an erroneous warning introduced by KUnit; it serves no purpose prior to the KUnit patches being merged.
I'll drop it, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 26/350 rtlwifi: prevent memory leak in rtl_usb_probe
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 3f93616951138a598d930dcaec40f2bfd9ce43bb ]
In rtl_usb_probe if allocation for usb_data fails the allocated hw should be released. In addition the allocated rtlpriv->usb_data should be released on error handling path.
--- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/usb.c +4 -1
@@ -1021,8 +1021,10 @@ int rtl_usb_probe(struct usb_interface *intf, rtlpriv->hw = hw; rtlpriv->usb_data =kcalloc (RTL_USB_MAX_RX_COUNT ,sizeof (u32),GFP_KERNEL ); -if (!rtlpriv->usb_data) +if (!rtlpriv->usb_data) { +ieee80211_free_hw (hw);return -ENOMEM ; + }/* this spin lock must be initialized early */ spin_lock_init (&rtlpriv->locks.usb_lock);
@@ -1083,6 +1085,7 @@ error_out2:_rtl_usb_io_handler_release (hw);usb_put_dev (udev);complete (&rtlpriv->firmware_loading_complete); +kfree (rtlpriv->usb_data);return -ENODEV ; }EXPORT_SYMBOL (rtl_usb_probe);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/350 libertas: fix a potential NULL pointer dereference
In reply to Sasha LevinFrom: Allen Pais <[email protected]>
[ Upstream commit 7da413a18583baaf35dd4a8eb414fa410367d7f2 ]
alloc_workqueue is not checked for errors and as a result, a potential NULL dereference could occur.
--- drivers/net/wireless/marvell/libertas/if_sdio.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/marvell/libertas/if_sdio.c +5 -0
@@ -1179,6 +1179,10 @@ static int if_sdio_probe(struct sdio_func *func,spin_lock_init (&card->lock); card->workqueue =alloc_workqueue ("libertas_sdio" ,WQ_MEM_RECLAIM ,0 ); +if (unlikely (!card->workqueue)) { + ret = -ENOMEM ; + goto err_queue; + }INIT_WORK (&card->packet_worker, if_sdio_host_to_card_worker);init_waitqueue_head (&card->pwron_waitq);
@@ -1230,6 +1234,7 @@ err_activate_card:lbs_remove_card (priv); free:destroy_workqueue (card->workqueue); +err_queue:while (card->packets) { packet = card->packets; card->packets = card->packets->next;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/350 Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit30 when using SSI_SCK2 and SSI_WS2"
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 3672bc7093434621c83299ef27ea3b3225a67600 ]
This reverts commit e87882eb9be10b2b9e28156922c2a47d877f5db4.
According to the R-Car Gen3 Hardware Manual Errata for Rev 1.00 of Aug 24, 2018, the SEL_SSI2_{0,1} definition was to be deleted. However, this errata merely fixed an accidental double definition in the Hardware User's Manual Rev. 1.00. The real definition is still present in later revisions of the manual (Rev. 1.50 and Rev. 2.00).
Hence revert the commit to recover the definition.
Based on a patch in the BSP by Takeshi Kihara
<[email protected]>.
--- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77990.c +11 -9
@@ -448,6 +448,7 @@ FM(IP12_31_28) IP12_31_28 FM(IP13_31_28) IP13_31_28 FM(IP14_31_28) IP14_31_28 FM#define MOD_SEL0_1_0 REV4(FM(SEL_SPEED_PULSE_IF_0), FM(SEL_SPEED_PULSE_IF_1), FM(SEL_SPEED_PULSE_IF_2), F_(0, 0))/* MOD_SEL1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ +#define MOD_SEL1_30 FM(SEL_SSI2_0) FM(SEL_SSI2_1)#define MOD_SEL1_29 FM(SEL_TIMER_TMU_0) FM(SEL_TIMER_TMU_1)#define MOD_SEL1_28 FM(SEL_USB_20_CH0_0) FM(SEL_USB_20_CH0_1)#define MOD_SEL1_26 FM(SEL_DRIF2_0) FM(SEL_DRIF2_1)
@@ -468,7 +469,7 @@ FM(IP12_31_28) IP12_31_28 FM(IP13_31_28) IP13_31_28 FM(IP14_31_28) IP14_31_28 FM#define PINMUX_MOD_SELS \ \ -MOD_SEL0_30_29 \ +MOD_SEL0_30_29 MOD_SEL1_30 \ MOD_SEL1_29 \ MOD_SEL0_28 MOD_SEL1_28 \ MOD_SEL0_27_26 \
@@ -1058,7 +1059,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP10_27_24 ,RIF0_CLK_B ,SEL_DRIF0_1 ),PINMUX_IPSR_MSEL (IP10_27_24 ,SCL2_B ,SEL_I2C2_1 ),PINMUX_IPSR_MSEL (IP10_27_24 ,TCLK1_A ,SEL_TIMER_TMU_0 ), -PINMUX_IPSR_GPSR (IP10_27_24 ,SSI_SCK2_B ), +PINMUX_IPSR_MSEL (IP10_27_24 ,SSI_SCK2_B ,SEL_SSI2_1 ),PINMUX_IPSR_GPSR (IP10_27_24 ,TS_SCK0 ), PINMUX_IPSR_GPSR(IP10_31_28, SD0_WP),
@@ -1067,7 +1068,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP10_31_28 ,RIF0_D0_B ,SEL_DRIF0_1 ),PINMUX_IPSR_MSEL (IP10_31_28 ,SDA2_B ,SEL_I2C2_1 ),PINMUX_IPSR_MSEL (IP10_31_28 ,TCLK2_A ,SEL_TIMER_TMU_0 ), -PINMUX_IPSR_GPSR (IP10_31_28 ,SSI_WS2_B ), +PINMUX_IPSR_MSEL (IP10_31_28 ,SSI_WS2_B ,SEL_SSI2_1 ), PINMUX_IPSR_GPSR(IP10_31_28, TS_SDAT0),/* IPSR11 */
@@ -1085,13 +1086,13 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP11_11_8 ,RX0_A ,SEL_SCIF0_0 ),PINMUX_IPSR_MSEL (IP11_11_8 ,HRX1_A ,SEL_HSCIF1_0 ), -PINMUX_IPSR_GPSR (IP11_11_8 ,SSI_SCK2_A ), +PINMUX_IPSR_MSEL (IP11_11_8 ,SSI_SCK2_A ,SEL_SSI2_0 ),PINMUX_IPSR_GPSR (IP11_11_8 ,RIF1_SYNC ),PINMUX_IPSR_GPSR (IP11_11_8 ,TS_SCK1 ),PINMUX_IPSR_MSEL (IP11_15_12 ,TX0_A ,SEL_SCIF0_0 ),PINMUX_IPSR_GPSR (IP11_15_12 ,HTX1_A ), -PINMUX_IPSR_GPSR (IP11_15_12 ,SSI_WS2_A ), +PINMUX_IPSR_MSEL (IP11_15_12 ,SSI_WS2_A ,SEL_SSI2_0 ),PINMUX_IPSR_GPSR (IP11_15_12 ,RIF1_D0 ), PINMUX_IPSR_GPSR(IP11_15_12, TS_SDAT1),
@@ -4957,11 +4958,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { MOD_SEL0_1_0 )) }, { PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32, - GROUP(2, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, - 2, 2, 2, 1, 1, 2, 1, 4), + GROUP(1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, + 1, 2, 2, 2, 1, 1, 2, 1, 4), GROUP( - /* RESERVED 31, 30 */ - 0, 0, 0, 0, + /* RESERVED 31 */ + 0, 0, + MOD_SEL1_30 MOD_SEL1_29 MOD_SEL1_28 /* RESERVED 27 */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/350 Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D"
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 7666dfd533d4c55733037775d47a8e3551b341a2 ]
This reverts commit e167d723e1a472d252e5c4baf823b77ce5543b05.
According to the R-Car Gen3 Hardware Manual Errata for Rev 1.00 of Aug 24, 2018, the SEL_SIMCARD_{0,1} definition was to be deleted. However, this errata merely fixed an accidental double definition in the Hardware User's Manual Rev. 1.00. The real definition is still present in later revisions of the manual (Rev. 1.50 and Rev. 2.00).
Hence revert the commit to recover the definition.
Based on a patch in the BSP by Takeshi Kihara
<[email protected]>.
--- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77990.c +5 -4
@@ -448,6 +448,7 @@ FM(IP12_31_28) IP12_31_28 FM(IP13_31_28) IP13_31_28 FM(IP14_31_28) IP14_31_28 FM#define MOD_SEL0_1_0 REV4(FM(SEL_SPEED_PULSE_IF_0), FM(SEL_SPEED_PULSE_IF_1), FM(SEL_SPEED_PULSE_IF_2), F_(0, 0))/* MOD_SEL1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ +#define MOD_SEL1_31 FM(SEL_SIMCARD_0) FM(SEL_SIMCARD_1)#define MOD_SEL1_30 FM(SEL_SSI2_0) FM(SEL_SSI2_1)#define MOD_SEL1_29 FM(SEL_TIMER_TMU_0) FM(SEL_TIMER_TMU_1)#define MOD_SEL1_28 FM(SEL_USB_20_CH0_0) FM(SEL_USB_20_CH0_1)
@@ -469,6 +470,7 @@ FM(IP12_31_28) IP12_31_28 FM(IP13_31_28) IP13_31_28 FM(IP14_31_28) IP14_31_28 FM#define PINMUX_MOD_SELS \ \ + MOD_SEL1_31 \ MOD_SEL0_30_29 MOD_SEL1_30 \ MOD_SEL1_29 \ MOD_SEL0_28 MOD_SEL1_28 \
@@ -1197,7 +1199,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP13_19_16 ,RIF0_D1_A ,SEL_DRIF0_0 ),PINMUX_IPSR_MSEL (IP13_19_16 ,SDA1_B ,SEL_I2C1_1 ),PINMUX_IPSR_MSEL (IP13_19_16 ,TCLK2_B ,SEL_TIMER_TMU_1 ), -PINMUX_IPSR_GPSR (IP13_19_16 ,SIM0_D_A ), +PINMUX_IPSR_MSEL (IP13_19_16 ,SIM0_D_A ,SEL_SIMCARD_0 ),PINMUX_IPSR_GPSR (IP13_23_20 ,MLB_DAT ), PINMUX_IPSR_MSEL(IP13_23_20, TX0_B, SEL_SCIF0_1),
@@ -1265,7 +1267,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP15_15_12 ,TPU0TO2 ),PINMUX_IPSR_MSEL (IP15_15_12 ,SDA1_D ,SEL_I2C1_3 ),PINMUX_IPSR_MSEL (IP15_15_12 ,FSO_CFE_1_N_B ,SEL_FSO_1 ), -PINMUX_IPSR_GPSR (IP15_15_12 ,SIM0_D_B ), +PINMUX_IPSR_MSEL (IP15_15_12 ,SIM0_D_B ,SEL_SIMCARD_1 ),PINMUX_IPSR_GPSR (IP15_19_16 ,SSI_SDATA6 ), PINMUX_IPSR_MSEL(IP15_19_16, HRTS2_N_A, SEL_HSCIF2_0),
@@ -4961,8 +4963,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { GROUP(1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 2, 2, 2, 1, 1, 2, 1, 4), GROUP( - /* RESERVED 31 */ - 0, 0, + MOD_SEL1_31 MOD_SEL1_30 MOD_SEL1_29 MOD_SEL1_28
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/350 ath10k: fix backtrace on coredump
In reply to Sasha LevinFrom: Anilkumar Kolli <[email protected]>
[ Upstream commit d98ddae85a4a57124f87960047b1b6419312147f ]
In a multiradio board with one QCA9984 and one AR9987 after enabling the crashdump with module parameter coredump_mask=7, below backtrace is seen.
vmalloc: allocation failure: 0 bytes
kworker/u4:0: page allocation failure: order:0, mode:0x80d2
CPU: 0 PID: 6 Comm: kworker/u4:0 Not tainted 3.14.77 #130 Workqueue: ath10k_wq ath10k_core_register_work [ath10k_core] (unwind_backtrace) from [<c021abf8>] (show_stack+0x10/0x14) (dump_stack+0x80/0xa0) (warn_alloc_failed+0xd0/0xfc) (__vmalloc_node_range+0x1b4/0x1d8) (__vmalloc_node+0x34/0x40) (vzalloc+0x24/0x30) (ath10k_coredump_register+0x6c/0x88 [ath10k_core]) (ath10k_core_register_work+0x350/0xb34 [ath10k_core]) (process_one_work+0x20c/0x32c) (worker_thread+0x228/0x360)
This is due to ath10k_hw_mem_layout is not defined for AR9987. For coredump undefined hw ramdump_size is 0.
Check for the ramdump_size before allocation memory.
Tested on: AR9987, QCA9984
FW version: 10.4-3.9.0.2-00044
--- drivers/net/wireless/ath/ath10k/coredump.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/coredump.c +8 -3
@@ -1208,9 +1208,11 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar) dump_tlv = (struct ath10k_tlv_dump_data *)(buf + sofar); dump_tlv->type =cpu_to_le32 (ATH10K_FW_CRASH_DUMP_RAM_DATA ); dump_tlv->tlv_len =cpu_to_le32 (crash_data->ramdump_buf_len); -memcpy (dump_tlv->tlv_data, crash_data->ramdump_buf, - crash_data->ramdump_buf_len); - sofar +=sizeof (*dump_tlv) + crash_data->ramdump_buf_len; +if (crash_data->ramdump_buf_len) { +memcpy (dump_tlv->tlv_data, crash_data->ramdump_buf, + crash_data->ramdump_buf_len); + sofar +=sizeof (*dump_tlv) + crash_data->ramdump_buf_len; + } }mutex_unlock (&ar->dump_mutex);
@@ -1257,6 +1259,9 @@ int ath10k_coredump_register(struct ath10k *ar)if (test_bit (ATH10K_FW_CRASH_DUMP_RAM_DATA , &ath10k_coredump_mask)) { crash_data->ramdump_buf_len =ath10k_coredump_get_ramdump_size (ar); +if (!crash_data->ramdump_buf_len) +return 0 ; + crash_data->ramdump_buf =vzalloc (crash_data->ramdump_buf_len);if (!crash_data->ramdump_buf)return -ENOMEM ;
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 31/350 IB/iser: bound protection_sg size by data_sg size
In reply to Sasha LevinFrom: Max Gurtovoy <[email protected]>
[ Upstream commit 7718cf03c3ce4b6ebd90107643ccd01c952a1fce ]
In case we don't set the sg_prot_tablesize, the scsi layer assign the default size (65535 entries). We should limit this size since we should take into consideration the underlaying device capability. This cap is considered when calculating the sg_tablesize. Otherwise, for example, we can get that /sys/block/sdb/queue/max_segments is 128 and /sys/block/sdb/queue/max_integrity_segments is 65535.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/ulp/iser/iscsi_iser.c +1 -0
@@ -646,6 +646,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,if (ib_conn->pi_support) {u32 sig_caps = ib_dev->attrs.sig_prot_cap; + shost->sg_prot_tablesize = shost->sg_tablesize;scsi_host_set_prot (shost,iser_dif_prot_caps (sig_caps));scsi_host_set_guard (shost,SHOST_DIX_GUARD_IP |SHOST_DIX_GUARD_CRC );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/350 drm/komeda: Workaround for broken FLIP_COMPLETE timestamps
In reply to Sasha LevinFrom: Mihail Atanassov <[email protected]>
[ Upstream commit f59769c52cd7d158df53487ec2936f5592073340 ]
When initially turning a crtc on, drm_reset_vblank_timestamp will set the vblank timestamp to 0 for any driver that doesn't provide a ->get_vblank_timestamp() hook.
Unfortunately, the FLIP_COMPLETE event depends on that timestamp, and the only way to regenerate a valid one is to have vblank interrupts enabled and have a valid in-ISR call to drm_crtc_handle_vblank.
Additionally, if the user doesn't request vblanks but _does_ request FLIP_COMPLETE events, we still don't have a good timestamp: it'll be the same stamp as the last vblank one.
Work around the issue by always enabling vblanks when the CRTC is on. Reducing the amount of time that PL0 has to be unmasked would be nice to fix at a later time.
Changes since v1 [https://patchwork.freedesktop.org/patch/331727/]:
- moved drm_crtc_vblank_put call to the ->atomic_disable() hook
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2 -0
@@ -250,6 +250,7 @@ komeda_crtc_atomic_enable(struct drm_crtc *crtc, {komeda_crtc_prepare (to_kcrtc (crtc));drm_crtc_vblank_on (crtc); +WARN_ON (drm_crtc_vblank_get (crtc));komeda_crtc_do_flush (crtc, old); }
@@ -319,6 +320,7 @@ komeda_crtc_atomic_disable(struct drm_crtc *crtc, } } +drm_crtc_vblank_put (crtc);drm_crtc_vblank_off (crtc);komeda_crtc_unprepare (kcrtc); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/350 spi: gpio: prevent memory leak in spi_gpio_probe
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit d3b0ffa1d75d5305ebe34735598993afbb8a869d ]
In spi_gpio_probe an SPI master is allocated via spi_alloc_master, but this controller should be released if devm_add_action_or_reset fails, otherwise memory leaks. In order to avoid leak spi_contriller_put must be called in case of failure for devm_add_action_or_reset.
--- drivers/spi/spi-gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-gpio.c +3 -1
@@ -371,8 +371,10 @@ static int spi_gpio_probe(struct platform_device *pdev)return -ENOMEM ; status =devm_add_action_or_reset (&pdev->dev, spi_gpio_put, master); -if (status) +if (status) { +spi_master_put (master);return status; + }if (of_id) status =spi_gpio_probe_dt (pdev, master);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/350 media: am437x-vpfe: Setting STD to current value is not an error
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit 13aa21cfe92ce9ebb51824029d89f19c33f81419 ]
VIDIOC_S_STD should not return an error if the value is identical to the current one.
This error was highlighted by the v4l2-compliance test.
--- drivers/media/platform/am437x/am437x-vpfe.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/platform/am437x/am437x-vpfe.c +4 -0
@@ -1830,6 +1830,10 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id)if (!(sdinfo->inputs[0 ].capabilities &V4L2_IN_CAP_STD ))return -ENODATA ; +/* if trying to set the same std then nothing to do */ +if (vpfe_standards[vpfe->std_index].std_id == std_id) +return 0 ; +/* If streaming is started, return error */ if (vb2_is_busy (&vpfe->buffer_queue)) {vpfe_err (vpfe,"%s device busy\n" , __func__);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 35/350 media: cedrus: fill in bus_info for media device
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit ae0688f659adb17ae6ae5710c886b20b5406e5c4 ]
Fixes this compliance warning:
$ v4l2-compliance -m0 v4l2-compliance SHA: b514d615166bdc0901a4c71261b87db31e89f464, 32 bits
Compliance test for cedrus device /dev/media0:
Media Driver Info:
Driver name : cedrus
Model : cedrus
Serial :
Bus info :
Media version : 5.3.0 Hardware revision: 0x00000000 (0)
Driver version : 5.3.0
Required ioctls:
warn: v4l2-test-media.cpp(51): empty bus_info
test MEDIA_IOC_DEVICE_INFO: OK
--- drivers/staging/media/sunxi/cedrus/cedrus.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/media/sunxi/cedrus/cedrus.c +2 -0
@@ -357,6 +357,8 @@ static int cedrus_probe(struct platform_device *pdev) dev->mdev.dev = &pdev->dev;strscpy (dev->mdev.model,CEDRUS_NAME ,sizeof (dev->mdev.model)); +strscpy (dev->mdev.bus_info,"platform:" CEDRUS_NAME , +sizeof (dev->mdev.bus_info));media_device_init (&dev->mdev); dev->mdev.ops = &cedrus_m2m_media_ops;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 36/350 media: seco-cec: Add a missing 'release_region()' in an error handling path
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit a9cc4cbcdfd378b65fd4e398800cfa14e3855042 ]
At the beginning of the probe function, we have a call to 'request_muxed_region(BRA_SMB_BASE_ADDR, 7, "CEC00001")()'
A corresponding 'release_region()' is performed in the remove function but is lacking in the error handling path.
Add it.
--- drivers/media/platform/seco-cec/seco-cec.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/seco-cec/seco-cec.c +1 -0
@@ -675,6 +675,7 @@ err_notifier: err_delete_adapter:cec_delete_adapter (secocec->cec_adap); err: +release_region (BRA_SMB_BASE_ADDR ,7 );dev_err (dev,"%s device probe failed\n" ,dev_name (dev));return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/350 media: vim2m: Fix abort issue
In reply to Sasha LevinFrom: Jernej Skrabec <[email protected]>
[ Upstream commit c362f77a243bfd1daec21b6c36491c061ee2f31b ]
Currently, if start streaming -> stop streaming -> start streaming sequence is executed, driver will end job prematurely, if ctx->translen is higher than 1, because "aborting" flag is still set from previous stop streaming command.
Fix that by clearing "aborting" flag in start streaming handler.
--- drivers/media/platform/vim2m.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/vim2m.c +3 -0
@@ -1073,6 +1073,9 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned int count)if (!q_data)return -EINVAL ; +if (V4L2_TYPE_IS_OUTPUT (q->type)) + ctx->aborting =0 ; + q_data->sequence =0 ;return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/350 media: vim2m: Fix BUG_ON in vim2m_device_release()
In reply to Sasha LevinFrom: Kefeng Wang <[email protected]>
[ Upstream commit 2455d417c03aa0cbafed04c46cbb354643238318 ]
If v4l2_m2m_init() fails, m2m_dev pointer will be set ERR_PTR(-ENOMEM), then kfree m2m_dev will trigger BUG_ON, see below, fix it by setting m2m_dev to NULL.
vim2m vim2m.0: Failed to init mem2mem device
------------[ cut here ]------------ kernel BUG at mm/slub.c:3944! invalid opcode: 0000 [#1] SMP PTI CPU: 11 PID: 9061 Comm: insmod Tainted: G E 5.2.0-rc2 #81 Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 RIP: 0010:kfree+0x11a/0x160 Call Trace: vim2m_device_release+0x3f/0x50 [vim2m] device_release+0x27/0x80 kobject_release+0x68/0x190 vim2m_probe+0x20f/0x280 [vim2m] platform_drv_probe+0x37/0x90 really_probe+0xef/0x3d0 driver_probe_device+0x110/0x120 device_driver_attach+0x4f/0x60 __driver_attach+0x9a/0x140 ? device_driver_attach+0x60/0x60 bus_for_each_dev+0x76/0xc0 ? klist_add_tail+0x57/0x70 bus_add_driver+0x141/0x210 driver_register+0x5b/0xe0 vim2m_init+0x29/0x1000 [vim2m] do_one_initcall+0x46/0x1f4 ? __slab_alloc+0x1c/0x30 ? kmem_cache_alloc_trace+0x167/0x1b0 do_init_module+0x5b/0x21f load_module+0x1add/0x1fb0 ? __do_sys_finit_module+0xe9/0x110 __do_sys_finit_module+0xe9/0x110 do_syscall_64+0x5b/0x1c0 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/media/platform/vim2m.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/vim2m.c +1 -0
@@ -1346,6 +1346,7 @@ static int vim2m_probe(struct platform_device *pdev)if (IS_ERR (dev->m2m_dev)) {v4l2_err (&dev->v4l2_dev,"Failed to init mem2mem device\n" ); ret =PTR_ERR (dev->m2m_dev); + dev->m2m_dev =NULL ; goto error_dev; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/350 media: max2175: Fix build error without CONFIG_REGMAP_I2C
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 36756fbff1e4a31d71d262ae6a04a20b38efa874 ]
If CONFIG_REGMAP_I2C is not set, building fails:
drivers/media/i2c/max2175.o: In function `max2175_probe':
max2175.c:(.text+0x1404): undefined reference to `__devm_regmap_init_i2c'
Select REGMAP_I2C to fix this.
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -1113,6 +1113,7 @@ comment "SDR tuner chips" config SDR_MAX2175 tristate "Maxim 2175 RF to Bits tuner" depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C + select REGMAP_I2C help Support for Maxim 2175 tuner. It is an advanced analog/digital radio receiver with RF-to-Bits front-end designed for SDR solutions.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/350 media: ov6650: Fix control handler not freed on init error
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit c404af950d14b71bfbf574a752b6c29d726baaba ]
Since commit afd9690c72c3 ("[media] ov6650: convert to the control framework"), if an error occurs during initialization of a control handler, resources possibly allocated to the handler are not freed before device initialiaton is aborted. Fix it.
--- drivers/media/i2c/ov6650.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/i2c/ov6650.c +8 -4
@@ -989,8 +989,10 @@ static int ov6650_probe(struct i2c_client *client, V4L2_CID_GAMMA, 0, 0xff, 1, 0x12); priv->subdev.ctrl_handler = &priv->hdl; -if (priv->hdl.error) -return priv->hdl.error; +if (priv->hdl.error) { + ret = priv->hdl.error; + goto ectlhdlfree; + }v4l2_ctrl_auto_cluster (2 , &priv->autogain,0 , true);v4l2_ctrl_auto_cluster (3 , &priv->autowb,0 , true);
@@ -1008,8 +1010,10 @@ static int ov6650_probe(struct i2c_client *client, priv->subdev.internal_ops = &ov6650_internal_ops; ret =v4l2_async_register_subdev (&priv->subdev); -if (ret) -v4l2_ctrl_handler_free (&priv->hdl); +if (!ret) +return 0 ; +ectlhdlfree: +v4l2_ctrl_handler_free (&priv->hdl);return ret; }
Signature · 1 line
2.20.1