media: ov6650: Fix control handler not freed on init error
Subsystems (41)
Sasha Levin
maintainerPATCH 40/350 media: ov6650: Fix control handler not freed on init error
From: 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
Sasha Levin
maintainerPATCH 41/350 media: i2c: ov2659: fix s_stream return value
From: Benoit Parrot <[email protected]>
[ Upstream commit 85c4043f1d403c222d481dfc91846227d66663fb ]
In ov2659_s_stream() return value for invoked function should be checked and propagated.
--- drivers/media/i2c/ov2659.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/media/i2c/ov2659.c +9 -5
@@ -1201,11 +1201,15 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on) goto unlock; } -ov2659_set_pixel_clock (ov2659); -ov2659_set_frame_size (ov2659); -ov2659_set_format (ov2659); -ov2659_set_streaming (ov2659,1 ); - ov2659->streaming = on; + ret =ov2659_set_pixel_clock (ov2659); +if (!ret) + ret =ov2659_set_frame_size (ov2659); +if (!ret) + ret =ov2659_set_format (ov2659); +if (!ret) { +ov2659_set_streaming (ov2659,1 ); + ov2659->streaming = on; + } unlock:mutex_unlock (&ov2659->lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 42/350 media: ov6650: Fix crop rectangle alignment not passed back
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 7b188d6ba27a131e7934a51a14ece331c0491f18 ]
Commit 4f996594ceaf ("[media] v4l2: make vidioc_s_crop const") introduced a writable copy of constified user requested crop rectangle in order to be able to perform hardware alignments on it. Later on, commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") replaced s_crop() video operation using that const argument with set_selection() pad operation which had a corresponding argument not constified, however the original behavior of the driver was not restored. Since that time, any hardware alignment applied on a user requested crop rectangle is not passed back to the user calling .set_selection() as it should be.
Fix the issue by dropping the copy and replacing all references to it with references to the crop rectangle embedded in the user argument.
--- drivers/media/i2c/ov6650.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/media/i2c/ov6650.c +15 -16
@@ -465,38 +465,37 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_rect rect = sel->r;int ret;if (sel->which !=V4L2_SUBDEV_FORMAT_ACTIVE || sel->target !=V4L2_SEL_TGT_CROP )return -EINVAL ; -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 ); +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 ); - ret =ov6650_reg_write (client,REG_HSTRT , rect.left >>1 ); + ret =ov6650_reg_write (client,REG_HSTRT , sel->r.left >>1 );if (!ret) { - priv->rect.left = rect.left; + priv->rect.left = sel->r.left; ret =ov6650_reg_write (client,REG_HSTOP , - (rect.left + rect.width) >>1 ); + (sel->r.left + sel->r.width) >>1 ); }if (!ret) { - priv->rect.width = rect.width; - ret =ov6650_reg_write (client,REG_VSTRT , rect.top >>1 ); + priv->rect.width = sel->r.width; + ret =ov6650_reg_write (client,REG_VSTRT , sel->r.top >>1 ); }if (!ret) { - priv->rect.top = rect.top; + priv->rect.top = sel->r.top; ret =ov6650_reg_write (client,REG_VSTOP , - (rect.top + rect.height) >>1 ); + (sel->r.top + sel->r.height) >>1 ); }if (!ret) - priv->rect.height = rect.height; + priv->rect.height = sel->r.height;return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 43/350 media: i2c: ov2659: Fix missing 720p register config
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit 9d669fbfca20e6035ead814e55d9ef1a6b500540 ]
The initial registers sequence is only loaded at probe time. Afterward only the resolution and format specific register are modified. Care must be taken to make sure registers modified by one resolution setting are reverted back when another resolution is programmed.
This was not done properly for the 720p case.
--- drivers/media/i2c/ov2659.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/ov2659.c +4 -0
@@ -419,10 +419,14 @@ static struct sensor_register ov2659_720p[] = { { REG_TIMING_YINC, 0x11 }, { REG_TIMING_VERT_FORMAT, 0x80 }, { REG_TIMING_HORIZ_FORMAT, 0x00 }, + { 0x370a, 0x12 }, { 0x3a03, 0xe8 }, { 0x3a09, 0x6f }, { 0x3a0b, 0x5d }, { 0x3a15, 0x9a }, + { REG_VFIFO_READ_START_H, 0x00 }, + { REG_VFIFO_READ_START_L, 0x80 }, + { REG_ISP_CTRL02, 0x00 }, { REG_NULL, 0x00 }, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 44/350 media: ov6650: Fix stored frame format not in sync with hardware
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 3143b459de4cdcce67b36827476c966e93c1cf01 ]
The driver stores frame format settings supposed to be in line with hardware state in a device private structure. Since the driver initial submission, those settings are updated before they are actually applied on hardware. If an error occurs on device update, the stored settings my not reflect hardware state anymore and consecutive calls to .get_fmt() may return incorrect information. That in turn may affect ability of a bridge device to use correct DMA transfer settings if such incorrect informmation on active frame format returned by .get_fmt() is used.
Assuming a failed device update means its state hasn't changed, update frame format related settings stored in the device private structure only after they are successfully applied so the stored values always reflect hardware state as closely as possible.
--- drivers/media/i2c/ov6650.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/i2c/ov6650.c +6 -3
@@ -609,7 +609,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)dev_err (&client->dev,"Pixel format not handled: 0x%x\n" , code);return -EINVAL ; } - priv->code = code;if (code ==MEDIA_BUS_FMT_Y8_1X8 || code ==MEDIA_BUS_FMT_SBGGR8_1X8 ) {
@@ -635,7 +634,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)dev_dbg (&client->dev,"max resolution: CIF\n" ); coma_mask |=COMA_QCIF ; } - priv->half_scale = half_scale; clkrc = CLKRC_12MHz; mclk =12000000 ;
@@ -653,8 +651,13 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) ret =ov6650_reg_rmw (client,REG_COMA , coma_set, coma_mask);if (!ret) ret =ov6650_reg_write (client,REG_CLKRC , clkrc); -if (!ret) +if (!ret) { + priv->half_scale = half_scale; + ret =ov6650_reg_rmw (client,REG_COML , coml_set, coml_mask); + } +if (!ret) + priv->code = code;if (!ret) { mf->colorspace = priv->colorspace;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 45/350 media: ov6650: Fix stored crop rectangle not in sync with hardware
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 1463b371aff0682c70141f7521db13cc4bbf3016 ]
The driver stores crop rectangle settings supposed to be in line with hardware state in a device private structure. Since the driver initial submission, crop rectangle width and height settings are not updated correctly when rectangle offset settings are applied on hardware. If an error occurs while the device is updated, the stored settings my no longer reflect hardware state and consecutive calls to .get_selection() as well as .get/set_fmt() may return incorrect information. That in turn may affect ability of a bridge device to use correct DMA transfer settings if such incorrect informamtion on active frame format returned by .get/set_fmt() is used.
Assuming a failed update of the device means its actual settings haven't changed, update crop rectangle width and height settings stored in the device private structure correctly while the rectangle offset is successfully applied on hardware so the stored values always reflect actual hardware state to the extent possible.
--- drivers/media/i2c/ov6650.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/i2c/ov6650.c +2 -0
@@ -481,6 +481,7 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, ret =ov6650_reg_write (client,REG_HSTRT , sel->r.left >>1 );if (!ret) { + priv->rect.width += priv->rect.left - sel->r.left; priv->rect.left = sel->r.left; ret =ov6650_reg_write (client,REG_HSTOP , (sel->r.left + sel->r.width) >>1 );
@@ -490,6 +491,7 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, ret =ov6650_reg_write (client,REG_VSTRT , sel->r.top >>1 ); }if (!ret) { + priv->rect.height += priv->rect.top - sel->r.top; priv->rect.top = sel->r.top; ret =ov6650_reg_write (client,REG_VSTOP , (sel->r.top + sel->r.height) >>1 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 46/350 tools/power/cpupower: Fix initializer override in hsw_ext_cstates
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 7e5705c635ecfccde559ebbbe1eaf05b5cc60529 ]
When building cpupower with clang, the following warning appears:
utils/idle_monitor/hsw_ext_idle.c:42:16: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.desc = N_("Processor Package C2"),
^~~~~~~~~~~~~~~~~~~~~~
./utils/helpers/helpers.h:25:33: note: expanded from macro 'N_'
#define N_(String) gettext_noop(String)
^~~~~~
./utils/helpers/helpers.h:23:30: note: expanded from macro
'gettext_noop'
#define gettext_noop(String) String
^~~~~~
utils/idle_monitor/hsw_ext_idle.c:41:16: note: previous initialization
is here
.desc = N_("Processor Package C9"),
^~~~~~~~~~~~~~~~~~~~~~
./utils/helpers/helpers.h:25:33: note: expanded from macro 'N_'
#define N_(String) gettext_noop(String)
^~~~~~
./utils/helpers/helpers.h:23:30: note: expanded from macro
'gettext_noop'
#define gettext_noop(String) String
^~~~~~1 warning generated.
This appears to be a copy and paste or merge mistake because the name and id fields both have PC9 in them, not PC2. Remove the second assignment to fix the warning.
--- tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 1 - 1 file changed, 1 deletion(-)
tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c +0 -1
@@ -39,7 +39,6 @@ static cstate_t hsw_ext_cstates[HSW_EXT_CSTATE_COUNT] = { { .name = "PC9", .desc = N_("Processor Package C9"), - .desc = N_("Processor Package C2"), .id = PC9, .range = RANGE_PACKAGE, .get_count_percent = hsw_ext_get_count_percent,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 47/350 media: venus: core: Fix msm8996 frequency table
In reply to Sasha LevinFrom: Loic Poulain <[email protected]>
[ Upstream commit c690435ed07901737e5c007a65ec59f53b33eb71 ]
In downstream driver, there are two frequency tables defined, one for the encoder and one for the decoder:
/* Encoders /
<972000 490000000 0x55555555>, / 4k UHD @ 30 /
<489600 320000000 0x55555555>, / 1080p @ 60 /
<244800 150000000 0x55555555>, / 1080p @ 30 /
<108000 75000000 0x55555555>, / 720p @ 30 */
/* Decoders /
<1944000 490000000 0xffffffff>, / 4k UHD @ 60 /
< 972000 320000000 0xffffffff>, / 4k UHD @ 30 /
< 489600 150000000 0xffffffff>, / 1080p @ 60 /
< 244800 75000000 0xffffffff>; / 1080p @ 30 */
It shows that encoder always needs a higher clock than decoder.
In current venus driver, the unified frequency table is aligned with the downstream decoder table which causes performance issues in encoding scenarios. Fix that by aligning frequency table on worst case (encoding).
--- drivers/media/platform/qcom/venus/core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/media/platform/qcom/venus/core.c +5 -4
@@ -427,10 +427,11 @@ static const struct venus_resources msm8916_res = { };static const struct freq_tbl msm8996_freq_table[] = { - {1944000 ,490000000 },/* 4k UHD @ 60 */ - {972000 ,320000000 },/* 4k UHD @ 30 */ - {489600 ,150000000 },/* 1080p @ 60 */ - {244800 ,75000000 },/* 1080p @ 30 */ + {1944000 ,520000000 },/* 4k UHD @ 60 (decode only) */ + {972000 ,520000000 },/* 4k UHD @ 30 */ + {489600 ,346666667 },/* 1080p @ 60 */ + {244800 ,150000000 },/* 1080p @ 30 */ + {108000 ,75000000 },/* 720p @ 30 */ };static const struct reg_val msm8996_reg_preset[] = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 48/350 ath10k: fix offchannel tx failure when no ath10k_mac_tx_frm_has_freq
In reply to Sasha LevinFrom: Ben Greear <[email protected]>
[ Upstream commit cc6df017e55764ffef9819dd9554053182535ffd ]
Offchannel management frames were failing:
[18099.253732] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18102.293686] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18105.333653] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18108.373712] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18111.413687] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e36c0 [18114.453726] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3f00 [18117.493773] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e36c0 [18120.533631] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3f00
This bug appears to have been added between 4.0 (which works for us), and 4.4, which does not work.
I think this is because the tx-offchannel logic gets in a loop when ath10k_mac_tx_frm_has_freq(ar) is false, so pkt is never actually sent to the firmware for transmit.
This patch fixes the problem on 4.9 for me, and now HS20 clients can work again with my firmware.
Antonio: tested with 10.4-3.5.3-00057 on QCA4019 and QCA9888
--- drivers/net/wireless/ath/ath10k/mac.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +11 -11
@@ -3708,7 +3708,7 @@ static int ath10k_mac_tx(struct ath10k *ar,struct ieee80211_vif *vif, enum ath10k_hw_txrx_mode txmode, enum ath10k_mac_tx_path txpath, - struct sk_buff *skb) + struct sk_buff *skb, bool noque_offchan) { struct ieee80211_hw *hw = ar->hw;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);
@@ -3738,10 +3738,10 @@ static int ath10k_mac_tx(struct ath10k *ar, } } -if (info->flags &IEEE80211_TX_CTL_TX_OFFCHAN ) { +if (!noque_offchan && info->flags &IEEE80211_TX_CTL_TX_OFFCHAN ) {if (!ath10k_mac_tx_frm_has_freq (ar)) { -ath10k_dbg (ar,ATH10K_DBG_MAC ,"queued offchannel skb %pK\n" , - skb); +ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac queued offchannel skb %pK len %d\n" , + skb, skb->len);skb_queue_tail (&ar->offchan_tx_queue, skb);ieee80211_queue_work (hw, &ar->offchan_tx_work);
@@ -3803,8 +3803,8 @@ void ath10k_offchan_tx_work(struct work_struct *work)mutex_lock (&ar->conf_mutex); -ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac offchannel skb %pK\n" , - skb); +ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac offchannel skb %pK len %d\n" , + skb, skb->len); hdr = (struct ieee80211_hdr *)skb->data; peer_addr =ieee80211_get_DA (hdr);
@@ -3850,7 +3850,7 @@ void ath10k_offchan_tx_work(struct work_struct *work) txmode =ath10k_mac_tx_h_get_txmode (ar, vif, sta, skb); txpath =ath10k_mac_tx_h_get_txpath (ar, skb, txmode); - ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb); + ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb, true);if (ret) {ath10k_warn (ar,"failed to transmit offchannel frame: %d\n" , ret);
@@ -3860,8 +3860,8 @@ void ath10k_offchan_tx_work(struct work_struct *work) time_left =wait_for_completion_timeout (&ar->offchan_tx_completed,3 *HZ );if (time_left ==0 ) -ath10k_warn (ar,"timed out waiting for offchannel skb %pK\n" , - skb); +ath10k_warn (ar,"timed out waiting for offchannel skb %pK, len: %d\n" , + skb, skb->len);if (!peer && tmp_peer_created) { ret =ath10k_peer_delete (ar, vdev_id, peer_addr);
@@ -4097,7 +4097,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,spin_unlock_bh (&ar->htt.tx_lock); } - ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb); + ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb, false);if (unlikely (ret)) {ath10k_warn (ar,"failed to push frame: %d\n" , ret);
@@ -4378,7 +4378,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,spin_unlock_bh (&ar->htt.tx_lock); } - ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb); + ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb, false);if (ret) {ath10k_warn (ar,"failed to transmit frame: %d\n" , ret);if (is_htt) {
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 49/350 media: vimc: Fix gpf in rmmod path when stream is active
In reply to Sasha LevinFrom: Shuah Khan <[email protected]>
[ Upstream commit d7fb5c361c2a2666d20e044206e1756bc8e87df2 ]
If vimc module is removed while streaming is in progress, sensor subdev unregister runs into general protection fault when it tries to unregister media entities. This is a common subdev problem related to releasing pads from v4l2_device_unregister_subdev() before calling unregister. Unregister references pads during unregistering subdev.
The sd release handler is the right place for releasing all sd resources including pads. The release handlers currently release all resources except the pads.
Fix v4l2_device_unregister_subdev() not release pads and release pads from the sd_int_op release handlers.
kernel: [ 4136.715839] general protection fault: 0000 [#1] SMP PTI
kernel: [ 4136.715847] CPU: 2 PID: 1972 Comm: bash Not tainted 5.3.0-rc2+ #4
kernel: [ 4136.715850] Hardware name: Dell Inc. OptiPlex 790/0HY9JP, BIOS A18 09/24/2013
kernel: [ 4136.715858] RIP: 0010:media_gobj_destroy.part.16+0x1f/0x60
kernel: [ 4136.715863] Code: ff 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 55 48 89 fe 48 89 e5 53 48 89 fb 48 c7 c7 00 7f cf b0 e8 24 fa ff ff 48 8b 03 <48> 83 80 a0 00 00 00 01 48 8b 43 18 48 8b 53 10 48 89 42 08 48 89
kernel: [ 4136.715866] RSP: 0018:ffff9b2248fe3cb0 EFLAGS: 00010246
kernel: [ 4136.715870] RAX: bcf2bfbfa0d63c2f RBX: ffff88c3eb37e9c0 RCX: 00000000802a0018
kernel: [ 4136.715873] RDX: ffff88c3e4f6a078 RSI: ffff88c3eb37e9c0 RDI: ffffffffb0cf7f00
kernel: [ 4136.715876] RBP: ffff9b2248fe3cb8 R08: 0000000001000002 R09: ffffffffb0492b00
kernel: [ 4136.715879] R10: ffff9b2248fe3c28 R11: 0000000000000001 R12: 0000000000000038
kernel: [ 4136.715881] R13: ffffffffc09a1628 R14: ffff88c3e4f6a028 R15: fffffffffffffff2
kernel: [ 4136.715885] FS: 00007f8389647740(0000) GS:ffff88c465500000(0000) knlGS:0000000000000000
kernel: [ 4136.715888] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: [ 4136.715891] CR2: 000055d008f80fd8 CR3: 00000001996ec005 CR4: 00000000000606e0
kernel: [ 4136.715894] Call Trace:
kernel: [ 4136.715903] media_gobj_destroy+0x14/0x20
kernel: [ 4136.715908] __media_device_unregister_entity+0xb3/0xe0
kernel: [ 4136.715915] media_device_unregister_entity+0x30/0x40
kernel: [ 4136.715920] v4l2_device_unregister_subdev+0xa8/0xe0
kernel: [ 4136.715928] vimc_ent_sd_unregister+0x1e/0x30 [vimc]
kernel: [ 4136.715933] vimc_sen_rm+0x16/0x20 [vimc]
kernel: [ 4136.715938] vimc_remove+0x3e/0xa0 [vimc]
kernel: [ 4136.715945] platform_drv_remove+0x25/0x50
kernel: [ 4136.715951] device_release_driver_internal+0xe0/0x1b0
kernel: [ 4136.715956] device_driver_detach+0x14/0x20
kernel: [ 4136.715960] unbind_store+0xd1/0x130
kernel: [ 4136.715965] drv_attr_store+0x27/0x40
kernel: [ 4136.715971] sysfs_kf_write+0x48/0x60
kernel: [ 4136.715976] kernfs_fop_write+0x128/0x1b0
kernel: [ 4136.715982] __vfs_write+0x1b/0x40
kernel: [ 4136.715987] vfs_write+0xc3/0x1d0
kernel: [ 4136.715993] ksys_write+0xaa/0xe0
kernel: [ 4136.715999] __x64_sys_write+0x1a/0x20
kernel: [ 4136.716005] do_syscall_64+0x5a/0x130
kernel: [ 4136.716010] entry_SYSCALL_64_after_hwframe+0x4
--- drivers/media/platform/vimc/vimc-common.c | 3 +-- drivers/media/platform/vimc/vimc-debayer.c | 1 + drivers/media/platform/vimc/vimc-scaler.c | 1 + drivers/media/platform/vimc/vimc-sensor.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/vimc/vimc-common.c +1 -2
@@ -375,7 +375,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved, {int ret; -/* Allocate the pads */ +/* Allocate the pads. Should be released from the sd_int_op release */ ved->pads =vimc_pads_init (num_pads, pads_flag);if (IS_ERR (ved->pads))return PTR_ERR (ved->pads);
@@ -424,7 +424,6 @@ EXPORT_SYMBOL_GPL(vimc_ent_sd_register);void vimc_ent_sd_unregister (struct vimc_ent_device *ved,struct v4l2_subdev *sd) {media_entity_cleanup (ved->ent); -vimc_pads_cleanup (ved->pads);v4l2_device_unregister_subdev (sd); }EXPORT_SYMBOL_GPL (vimc_ent_sd_unregister);
drivers/media/platform/vimc/vimc-debayer.c +1 -0
@@ -484,6 +484,7 @@ static void vimc_deb_release(struct v4l2_subdev *sd)struct vimc_deb_device *vdeb = container_of(sd, struct vimc_deb_device, sd); +vimc_pads_cleanup (vdeb->ved.pads);kfree (vdeb); }
drivers/media/platform/vimc/vimc-scaler.c +1 -0
@@ -343,6 +343,7 @@ static void vimc_sca_release(struct v4l2_subdev *sd)struct vimc_sca_device *vsca = container_of(sd, struct vimc_sca_device, sd); +vimc_pads_cleanup (vsca->ved.pads);kfree (vsca); }
drivers/media/platform/vimc/vimc-sensor.c +1 -0
@@ -297,6 +297,7 @@ static void vimc_sen_release(struct v4l2_subdev *sd)v4l2_ctrl_handler_free (&vsen->hdl);tpg_free (&vsen->tpg); +vimc_pads_cleanup (vsen->ved.pads);kfree (vsen); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 50/350 drm/amd/display: Set number of pipes to 1 if the second pipe was disabled
In reply to Sasha LevinFrom: Nikola Cornij <[email protected]>
[ Upstream commit 2fef0faa1cdc5d41ce3ef83f7b8f7e7ecb02d700 ]
[why]
Some ODM-related register settings are inconsistently updated by VBIOS, causing the state in DC to be invalid, which would then end up crashing in certain use-cases (such as disable/enable device).
[how]
Check the enabled status of the second pipe when determining the number of OPTC sources. If the second pipe is disabled, set the number of sources to 1 regardless of other settings (that may not be updated correctly).
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +4 -0
@@ -287,6 +287,10 @@ void optc2_get_optc_source(struct timing_generator *optc, *num_of_src_opp =2 ; else *num_of_src_opp =1 ; + +/* Work around VBIOS not updating OPTC_NUM_OF_INPUT_SEGMENT */ +if (*src_opp_id_1 ==0xf ) + *num_of_src_opp =1 ; } void optc2_set_dwb_source(struct timing_generator *optc,
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 51/350 pinctrl: devicetree: Avoid taking direct reference to device name string
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit be4c60b563edee3712d392aaeb0943a768df7023 ]
When populating the pinctrl mapping table entries for a device, the 'dev_name' field for each entry is initialised to point directly at the string returned by 'dev_name()' for the device and subsequently used by 'create_pinctrl()' when looking up the mappings for the device being probed.
This is unreliable in the presence of calls to 'dev_set_name()', which may reallocate the device name string leaving the pinctrl mappings with a dangling reference. This then leads to a use-after-free every time the name is dereferenced by a device probe:
| BUG: KASAN: invalid-access in strcmp+0x20/0x64 | Read of size 1 at addr 13ffffc153494b00 by task modprobe/590 | Pointer tag: [13], memory tag: [fe] | | Call trace: | __kasan_report+0x16c/0x1dc | kasan_report+0x10/0x18 | check_memory_region | __hwasan_load1_noabort+0x4c/0x54 | strcmp+0x20/0x64 | create_pinctrl+0x18c/0x7f4 | pinctrl_get+0x90/0x114 | devm_pinctrl_get+0x44/0x98 | pinctrl_bind_pins+0x5c/0x450 | really_probe+0x1c8/0x9a4 | driver_probe_device+0x120/0x1d8
Follow the example of sysfs, and duplicate the device name string before stashing it away in the pinctrl mapping entries.
--- drivers/pinctrl/devicetree.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/pinctrl/devicetree.c +20 -5
@@ -29,6 +29,13 @@ struct pinctrl_dt_map {static void dt_free_map (struct pinctrl_dev *pctldev,struct pinctrl_map *map,unsigned num_maps) { +int i; + +for (i =0 ; i < num_maps; ++i) { +kfree_const (map[i].dev_name); + map[i].dev_name =NULL ; + } +if (pctldev) {const struct pinctrl_ops *ops = pctldev->desc->pctlops;if (ops->dt_free_map)
@@ -63,7 +70,13 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,/* Initialize common mapping table entry fields */ for (i =0 ; i < num_maps; i++) { - map[i].dev_name =dev_name (p->dev); +const char *devname; + + devname =kstrdup_const (dev_name (p->dev),GFP_KERNEL ); +if (!devname) + goto err_free_map; + + map[i].dev_name = devname; map[i].name = statename;if (pctldev) map[i].ctrl_dev_name =dev_name (pctldev->dev);
@@ -71,10 +84,8 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,/* Remember the converted mapping table entries */ dt_map =kzalloc (sizeof (*dt_map),GFP_KERNEL ); -if (!dt_map) { -dt_free_map (pctldev, map, num_maps); -return -ENOMEM ; - } +if (!dt_map) + goto err_free_map; dt_map->pctldev = pctldev; dt_map->map = map;
@@ -82,6 +93,10 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,list_add_tail (&dt_map->node, &p->dt_maps);return pinctrl_register_map (map, num_maps, false); + +err_free_map: +dt_free_map (pctldev, map, num_maps); +return -ENOMEM ; }struct pinctrl_dev *of_pinctrl_get (struct device_node *np)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 52/350 drm/sun4i: dsi: Fix TCON DRQ set bits
In reply to Sasha LevinFrom: Jagan Teki <[email protected]>
[ Upstream commit 7ac6269968826f9cad61b501bb613cc5cadb7229 ]
The LCD timing definitions between Linux DRM vs Allwinner are different, below diagram shows this clear differences.
Active Front Sync Back
Region Porch Porch
<-----------------------><----------------><--------------><-------------->
//////////////////////|
////////////////////// |
////////////////////// |.................. ................
________________<----- [hv]display ----->
<------------- [hv]sync_start ------------> <--------------------- [hv]sync_end ----------------------> <-------------------------------- [hv]total ------------------------------>
<----- lcd_[xy] --------> <- lcd_[hv]spw ->
<---------- lcd_[hv]bp --------->
<-------------------------------- lcd_[hv]t ------------------------------>
The DSI driver misinterpreted the hbp term from the BSP code to refer only to the backporch, when in fact it was backporch + sync. Thus the driver incorrectly used the horizontal front porch plus sync in its calculation of the DRQ set bit value, when it should not have included the sync timing.
Including additional sync timings leads to flip_done timed out as:
WARNING: CPU: 0 PID: 31 at drivers/gpu/drm/drm_atomic_helper.c:1429 drm_atomic_helper_wait_for_vblanks.part.1+0x298/0x2a0 [CRTC:46:crtc-0] vblank wait timed out Modules linked in: CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted 5.1.0-next-20190514-00026-g01f0c75b902d-dirty #13 Hardware name: Allwinner sun8i Family Workqueue: events deferred_probe_work_func [<c010ed54>] (unwind_backtrace) from [<c010b76c>] (show_stack+0x10/0x14) [<c010b76c>] (show_stack) from [<c0688c70>] (dump_stack+0x84/0x98) [<c0688c70>] (dump_stack) from [<c011d9e4>] (__warn+0xfc/0x114) [<c011d9e4>] (__warn) from [<c011da40>] (warn_slowpath_fmt+0x44/0x68) [<c011da40>] (warn_slowpath_fmt) from [<c040cd50>] (drm_atomic_helper_wait_for_vblanks.part.1+0x298/0x2a0) [<c040cd50>] (drm_atomic_helper_wait_for_vblanks.part.1) from [<c040e694>] (drm_atomic_helper_commit_tail_rpm+0x5c/0x6c) [<c040e694>] (drm_atomic_helper_commit_tail_rpm) from [<c040e4dc>] (commit_tail+0x40/0x6c) [<c040e4dc>] (commit_tail) from [<c040e5cc>] (drm_atomic_helper_commit+0xbc/0x128) [<c040e5cc>] (drm_atomic_helper_commit) from [<c0411b64>] (restore_fbdev_mode_atomic+0x1cc/0x1dc) [<c0411b64>] (restore_fbdev_mode_atomic) from [<c04156f8>] (drm_fb_helper_restore_fbdev_mode_unlocked+0x54/0xa0) [<c04156f8>] (drm_fb_helper_restore_fbdev_mode_unlocked) from [<c0415774>] (drm_fb_helper_set_par+0x30/0x54) [<c0415774>] (drm_fb_helper_set_par) from [<c03ad450>] (fbcon_init+0x560/0x5ac) [<c03ad450>] (fbcon_init) from [<c03eb8a0>] (visual_init+0xbc/0x104) [<c03eb8a0>] (visual_init) from [<c03ed1b8>] (do_bind_con_driver+0x1b0/0x390) [<c03ed1b8>] (do_bind_con_driver) from [<c03ed780>] (do_take_over_console+0x13c/0x1c4) [<c03ed780>] (do_take_over_console) from [<c03ad800>] (do_fbcon_takeover+0x74/0xcc) [<c03ad800>] (do_fbcon_takeover) from [<c013c9c8>] (notifier_call_chain+0x44/0x84) [<c013c9c8>] (notifier_call_chain) from [<c013cd20>] (__blocking_notifier_call_chain+0x48/0x60) [<c013cd20>] (__blocking_notifier_call_chain) from [<c013cd50>] (blocking_notifier_call_chain+0x18/0x20) [<c013cd50>] (blocking_notifier_call_chain) from [<c03a6e44>] (register_framebuffer+0x1e0/0x2f8) [<c03a6e44>] (register_framebuffer) from [<c04153c0>] (__drm_fb_helper_initial_config_and_unlock+0x2fc/0x50c) [<c04153c0>] (__drm_fb_helper_initial_config_and_unlock) from [<c04158c8>] (drm_fbdev_client_hotplug+0xe8/0x1b8) [<c04158c8>] (drm_fbdev_client_hotplug) from [<c0415a20>] (drm_fbdev_generic_setup+0x88/0x118) [<c0415a20>] (drm_fbdev_generic_setup) from [<c043f060>] (sun4i_drv_bind+0x128/0x160) [<c043f060>] (sun4i_drv_bind) from [<c044b598>] (try_to_bring_up_master+0x164/0x1a0) [<c044b598>] (try_to_bring_up_master) from [<c044b668>] (__component_add+0x94/0x140) [<c044b668>] (__component_add) from [<c0445e1c>] (sun6i_dsi_probe+0x144/0x234) [<c0445e1c>] (sun6i_dsi_probe) from [<c0452ef4>] (platform_drv_probe+0x48/0x9c) [<c0452ef4>] (platform_drv_probe) from [<c04512cc>] (really_probe+0x1dc/0x2c8) [<c04512cc>] (really_probe) from [<c0451518>] (driver_probe_device+0x60/0x160) [<c0451518>] (driver_probe_device) from [<c044f7a4>] (bus_for_each_drv+0x74/0xb8) [<c044f7a4>] (bus_for_each_drv) from [<c045107c>] (__device_attach+0xd0/0x13c) [<c045107c>] (__device_attach) from [<c0450474>] (bus_probe_device+0x84/0x8c) [<c0450474>] (bus_probe_device) from [<c0450900>] (deferred_probe_work_func+0x64/0x90) [<c0450900>] (deferred_probe_work_func) from [<c0135970>] (process_one_work+0x204/0x420) [<c0135970>] (process_one_work) from [<c013690c>] (worker_thread+0x274/0x5a0) [<c013690c>] (worker_thread) from [<c013b3d8>] (kthread+0x11c/0x14c) [<c013b3d8>] (kthread) from [<c01010e8>] (ret_from_fork+0x14/0x2c) Exception stack(0xde539fb0 to 0xde539ff8) 9fa0: 00000000 00000000 00000000 00000000 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace b57eb1e5c64c6b8b ]---
random: fast init done
[drm:drm_atomic_helper_wait_for_dependencies] *ERROR* [CRTC:46:crtc-0] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] *ERROR* [CONNECTOR:48:DSI-1] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] *ERROR* [PLANE:30:plane-0] flip_done timed out
With the terms(as described in above diagram) fixed, the panel displays correctly without any timeouts.
--- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +2 -2
@@ -437,9 +437,9 @@ static void sun6i_dsi_setup_burst(struct sun6i_dsi *dsi, SUN6I_DSI_BURST_LINE_SYNC_POINT(SUN6I_DSI_SYNC_POINT)); val =SUN6I_DSI_TCON_DRQ_ENABLE_MODE ; - }else if ((mode->hsync_end - mode->hdisplay) >20 ) { + }else if ((mode->hsync_start - mode->hdisplay) >20 ) {/* Maaaaaagic */ -u16 drq = (mode->hsync_end - mode->hdisplay) -20 ; +u16 drq = (mode->hsync_start - mode->hdisplay) -20 ; drq *=mipi_dsi_pixel_format_to_bpp (device->format); drq /=32 ;
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 53/350 drm/amdkfd: fix a potential NULL pointer dereference (v2)
In reply to Sasha LevinFrom: Allen Pais <[email protected]>
[ Upstream commit 81de29d842ccb776c0f77aa3e2b11b07fff0c0e2 ]
alloc_workqueue is not checked for errors and as a result, a potential NULL dereference could occur.
v2 (Felix Kuehling):
* Fix compile error (kfifo_free instead of fifo_free)
* Return proper error code
--- drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c +5 -0
@@ -62,6 +62,11 @@ int kfd_interrupt_init(struct kfd_dev *kfd) } kfd->ih_wq =alloc_workqueue ("KFD IH" ,WQ_HIGHPRI ,1 ); +if (unlikely (!kfd->ih_wq)) { +kfifo_free (&kfd->ih_fifo); +dev_err (kfd_chardev (),"Failed to allocate KFD IH workqueue\n" ); +return -ENOMEM ; + }spin_lock_init (&kfd->interrupt_lock);INIT_WORK (&kfd->interrupt_work, interrupt_wq);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 54/350 x86/math-emu: Check __copy_from_user() result
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit e6b44ce1925a8329a937c57f0d60ba0d9bb5d226 ]
The new __must_check annotation on __copy_from_user() successfully identified some code that has lacked the check since at least linux-2.1.73:
arch/x86/math-emu/reg_ld_str.c:88:2: error: ignoring return value of \
function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result] __copy_from_user(sti_ptr, s, 10);
^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ arch/x86/math-emu/reg_ld_str.c:1129:2: error: ignoring return value of \
function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result] __copy_from_user(register_base + offset, s, other); ^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/x86/math-emu/reg_ld_str.c:1131:3: error: ignoring return value of \
function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result] __copy_from_user(register_base, s + other, offset);
^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In addition, the get_user()/put_user() helpers do not enforce a return value check, but actually still require one. These have been missing for even longer.
Change the internal wrappers around get_user()/put_user() to force a signal and add a corresponding wrapper around __copy_from_user() to check all such cases.
[ bp: Break long lines. ]
--- arch/x86/math-emu/fpu_system.h | 6 ++++-- arch/x86/math-emu/reg_ld_str.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/math-emu/fpu_system.h +4 -2
@@ -107,6 +107,8 @@ static inline bool seg_writable(struct desc_struct *d)#define FPU_access_ok (y,z) if ( !access_ok(y,z) ) \ math_abort(FPU_info,SIGSEGV)#define FPU_abort math_abort(FPU_info, SIGSEGV) +#define FPU_copy_from_user (to, from, n) \ + do { if (copy_from_user(to, from, n)) FPU_abort; } while (0)#undef FPU_IGNORE_CODE_SEGV#ifdef FPU_IGNORE_CODE_SEGV
@@ -122,7 +124,7 @@ static inline bool seg_writable(struct desc_struct *d)#define FPU_code_access_ok (z) FPU_access_ok((void __user *)FPU_EIP,z)#endif -#define FPU_get_user (x,y) get_user((x),(y)) -#define FPU_put_user (x,y) put_user((x),(y)) +#define FPU_get_user (x,y) do { if (get_user((x),(y))) FPU_abort; } while (0) +#define FPU_put_user (x,y) do { if (put_user((x),(y))) FPU_abort; } while (0)#endif
arch/x86/math-emu/reg_ld_str.c +3 -3
@@ -85,7 +85,7 @@ int FPU_load_extended(long double __user *s, int stnr)RE_ENTRANT_CHECK_OFF ;FPU_access_ok (s,10 ); -__copy_from_user (sti_ptr, s,10 ); +FPU_copy_from_user (sti_ptr, s,10 );RE_ENTRANT_CHECK_ON ;return FPU_tagof (sti_ptr);
@@ -1126,9 +1126,9 @@ void frstor(fpu_addr_modes addr_modes, u_char __user *data_address)/* Copy all registers in stack order. */ RE_ENTRANT_CHECK_OFF ;FPU_access_ok (s,80 ); -__copy_from_user (register_base + offset, s, other); +FPU_copy_from_user (register_base + offset, s, other);if (offset) -__copy_from_user (register_base, s + other, offset); +FPU_copy_from_user (register_base, s + other, offset);RE_ENTRANT_CHECK_ON ;for (i =0 ; i <8 ; i++) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 55/350 drm/amd/powerplay: A workaround to GPU RESET on APU
In reply to Sasha LevinFrom: chen gong <[email protected]>
[ Upstream commit 068ad870bbd8f4f2c5b2fd4977a4f3330c9988f4 ]
Changes to function "smu_suspend" in amdgpu_smu.c is a workaround.
We should get real information about if baco is enabled or not, while we always consider APU SMU feature as enabled in current code.
I know APU do not support baco mode for GPU reset, so I use "adev->flags" to skip function "smu_feature_is_enabled".
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4 -1
@@ -1344,7 +1344,10 @@ static int smu_suspend(void *handle)int ret;struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct smu_context *smu = &adev->smu; -bool baco_feature_is_enabled =smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ); +bool baco_feature_is_enabled = false; + +if (!(adev->flags &AMD_IS_APU )) + baco_feature_is_enabled =smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ); ret =smu_system_features_control (smu, false);if (ret)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 56/350 selftests/bpf: Correct path to include msg + path
In reply to Sasha LevinFrom: Ivan Khoronzhuk <[email protected]>
[ Upstream commit c588146378962786ddeec817f7736a53298a7b01 ]
The "path" buf is supposed to contain path + printf msg up to 24 bytes. It will be cut anyway, but compiler generates truncation warns like:
" samples/bpf/../../tools/testing/selftests/bpf/cgroup_helpers.c: In function ‘setup_cgroup_environment’:samples/bpf/../../tools/testing/selftests/bpf/cgroup_helpers.c:52:34:
warning: ‘/cgroup.controllers’ directive output may be truncated writing 19 bytes into a region of size between 1 and 4097 [-Wformat-truncation=]
snprintf(path, sizeof(path), "%s/cgroup.controllers", cgroup_path); ^~~~~~~~~~~~~~~~~~~
samples/bpf/../../tools/testing/selftests/bpf/cgroup_helpers.c:52:2:
note: ‘snprintf’ output between 20 and 4116 bytes into a destination of size 4097snprintf(path, sizeof(path), "%s/cgroup.controllers", cgroup_path); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ samples/bpf/../../tools/testing/selftests/bpf/cgroup_helpers.c:72:34:
warning: ‘/cgroup.subtree_control’ directive output may be truncated writing 23 bytes into a region of size between 1 and 4097 [-Wformat-truncation=]
snprintf(path, sizeof(path), "%s/cgroup.subtree_control",
^~~~~~~~~~~~~~~~~~~~~~~
cgroup_path); samples/bpf/../../tools/testing/selftests/bpf/cgroup_helpers.c:72:2:
note: ‘snprintf’ output between 24 and 4120 bytes into a destination of size 4097snprintf(path, sizeof(path), "%s/cgroup.subtree_control", cgroup_path);
"
In order to avoid warns, lets decrease buf size for cgroup workdir on 24 bytes with assumption to include also "/cgroup.subtree_control" to the address. The cut will never happen anyway.
--- tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/cgroup_helpers.c +1 -1
@@ -98,7 +98,7 @@ int enable_all_controllers(char *cgroup_path)*/ int setup_cgroup_environment (void ) { -char cgroup_workdir[PATH_MAX +1 ]; +char cgroup_workdir[PATH_MAX -24 ];format_cgroup_path (cgroup_workdir,"" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 57/350 drm/amd/display: set minimum abm backlight level
In reply to Sasha LevinFrom: Anthony Koo <[email protected]>
[ Upstream commit 2ad0cdf9e2e9e079af34af681863fa638f2ee212 ]
[Why]
A lot of the time, the backlight characteristic curve maps min backlight to a non-zero value.
But there are cases where we want the curve to intersect at 0. In this scenario even if OS never asks to set 0% backlight, the ABM reduction can result in backlight being lowered close to 0. This particularly can cause problems in some LED drivers, and in general just looks like backlight is completely off.
[How]
Add default cap to disallow backlight from dropping below 1% even after ABM reduction is applied.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++ .../amd/display/modules/power/power_helpers.c | 77 +++++++++++-------- .../amd/display/modules/power/power_helpers.h | 1 + 3 files changed, 49 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -0
@@ -940,6 +940,11 @@ static int dm_late_init(void *handle) params.backlight_lut_array_size =16 ; params.backlight_lut_array = linear_lut; +/* Min backlight level after ABM reduction, Don't allow below 1% +* 0xFFFF x 0.01 = 0x28F +*/ + params.min_abm_backlight =0x28F ; +/* todo will enable for navi10 */ if (adev->asic_type <=CHIP_RAVEN ) { ret =dmcu_load_iram (dmcu, params);
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +43 -34
121 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/power/power_helpers.h +1 -0
@@ -38,6 +38,7 @@ struct dmcu_iram_parameters {unsigned int backlight_lut_array_size;unsigned int backlight_ramping_reduction;unsigned int backlight_ramping_start; +unsigned int min_abm_backlight;unsigned int set; };
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 58/350 media: venus: Fix occasionally failures to suspend
In reply to Sasha LevinFrom: Stanimir Varbanov <[email protected]>
[ Upstream commit 8dbebb2bd01e6f36e9a215dcde99ace70408f2c8 ]
Failure to suspend (venus_suspend_3xx) happens when the system is fresh booted and loading venus driver. This happens once and after reload the venus driver modules the problem disrepair.
Fix the failure by skipping the check for WFI and IDLE bits if PC_READY is on in control status register.
--- drivers/media/platform/qcom/venus/hfi_venus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/qcom/venus/hfi_venus.c +6 -0
@@ -1472,6 +1472,7 @@ static int venus_suspend_3xx(struct venus_core *core) {struct venus_hfi_device *hdev =to_hfi_priv (core);struct device *dev = core->dev; +u32 ctrl_status;bool val;int ret;
@@ -1487,6 +1488,10 @@ static int venus_suspend_3xx(struct venus_core *core)return -EINVAL ; } + ctrl_status =venus_readl (hdev,CPU_CS_SCIACMDARG0 ); +if (ctrl_status &CPU_CS_SCIACMDARG0_PC_READY ) + goto power_off; +/* * Power collapse sequence for Venus 3xx and 4xx versions: * 1. Check for ARM9 and video core to be idle by checking WFI bit
@@ -1511,6 +1516,7 @@ static int venus_suspend_3xx(struct venus_core *core)if (ret)return ret; +power_off:mutex_lock (&hdev->lock); ret =venus_power_off (hdev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 59/350 rtw88: fix NSS of hw_cap
In reply to Sasha LevinFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit 4f5bb7ff8b8d4bafd91243fc969ed240e67aa1ca ]
8822C is a 2x2 11ac chip, and then NSS must be less or equal to 2. However, current nss of hw cap is 3, likes
hw cap: hci=0x0f, bw=0x07, ptcl=0x03, ant_num=7, nss=3
This commit adds constraint to make sure NSS <= rf_path_num, and result looks like
hw cap: hci=0x0f, bw=0x07, ptcl=0x03, ant_num=7, nss=2
--- drivers/net/wireless/realtek/rtw88/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/main.c +2 -1
@@ -1020,7 +1020,8 @@ static int rtw_dump_hw_feature(struct rtw_dev *rtwdev)rtw_hw_config_rf_ant_num (rtwdev, efuse->hw_cap.ant_num); -if (efuse->hw_cap.nss ==EFUSE_HW_CAP_IGNORE ) +if (efuse->hw_cap.nss ==EFUSE_HW_CAP_IGNORE || + efuse->hw_cap.nss > rtwdev->hal.rf_path_num) efuse->hw_cap.nss = rtwdev->hal.rf_path_num; rtw_dbg(rtwdev, RTW_DBG_EFUSE,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 60/350 drm/amd/display: fix struct init in update_bounding_box
In reply to Sasha LevinFrom: Raul E Rangel <[email protected]>
[ Upstream commit 960b6f4f2d2e96d5f7ffe2854e0040b46cafbd36 ]
dcn20_resource.c:2636:9: error: missing braces around initializer [-Werror=missing-braces]
struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES] = {0};
^--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +3 -1
@@ -3041,7 +3041,7 @@ static void cap_soc_clocks(static void update_bounding_box (struct dc *dc,struct _vcs_dpi_soc_bounding_box_st *bb,struct pp_smu_nv_clock_table *max_clocks,unsigned int *uclk_states,unsigned int num_states) { -struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES ] = {0 }; +struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES ];int i;int num_calculated_states =0 ;int min_dcfclk =0 ;
@@ -3049,6 +3049,8 @@ static void update_bounding_box(struct dc *dc, struct _vcs_dpi_soc_bounding_box_if (num_states ==0 )return ; +memset (calculated_states,0 ,sizeof (calculated_states)); +if (dc->bb_overrides.min_dcfclk_mhz >0 ) min_dcfclk = dc->bb_overrides.min_dcfclk_mhz;else
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 61/350 usb: renesas_usbhs: add suspend event support in gadget mode
In reply to Sasha LevinFrom: Veeraiyan Chidambaram <[email protected]>
[ Upstream commit 39abcc84846bbc0538f13c190b6a9c7e36890cd2 ]
When R-Car Gen3 USB 2.0 is in Gadget mode, if host is detached an interrupt will be generated and Suspended state bit is set in interrupt status register. Interrupt handler will call driver->suspend(composite_suspend) if suspended state bit is set. composite_suspend will call ffs_func_suspend which will post FUNCTIONFS_SUSPEND and will be consumed by user space application via /dev/ep0.
To be able to detect host detach, extend the DVSQ_MASK to cover the Suspended bit of the DVSQ[2:0] bitfield from the Interrupt Status Register 0 (INTSTS0) register and perform appropriate action in the DVST interrupt handler (usbhsg_irq_dev_state).
Without this commit, disconnection of the phone from R-Car-H3 ES2.0 Salvator-X CN9 port is not recognized and reverse role switch does not happen. If phone is connected again it does not enumerate.
With this commit, disconnection will be recognized and reverse role switch will happen by a user space application. If phone is connected again it will enumerate properly and will become visible in the output of 'lsusb'.
--- drivers/usb/renesas_usbhs/common.h | 3 ++- drivers/usb/renesas_usbhs/mod_gadget.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/usb/renesas_usbhs/common.h +2 -1
@@ -161,11 +161,12 @@ struct usbhs_priv;#define VBSTS (1 << 7)/* VBUS_0 and VBUSIN_0 Input Status */ #define VALID (1 << 3)/* USB Request Receive */ -#define DVSQ_MASK (0x3 << 4)/* Device State */ +#define DVSQ_MASK (0x7 << 4)/* Device State */ #define POWER_STATE (0 << 4)#define DEFAULT_STATE (1 << 4)#define ADDRESS_STATE (2 << 4)#define CONFIGURATION_STATE (3 << 4) +#define SUSPENDED_STATE (4 << 4)#define CTSQ_MASK (0x7)/* Control Transfer Stage */ #define IDLE_SETUP_STAGE 0/* Idle stage or setup stage */
drivers/usb/renesas_usbhs/mod_gadget.c +9 -3
@@ -457,12 +457,18 @@ static int usbhsg_irq_dev_state(struct usbhs_priv *priv, {struct usbhsg_gpriv *gpriv =usbhsg_priv_to_gpriv (priv);struct device *dev =usbhsg_gpriv_to_dev (gpriv); +int state =usbhs_status_get_device_state (irq_state); gpriv->gadget.speed =usbhs_bus_get_speed (priv); -dev_dbg (dev,"state = %x : speed : %d\n" , -usbhs_status_get_device_state (irq_state), - gpriv->gadget.speed); +dev_dbg (dev,"state = %x : speed : %d\n" , state, gpriv->gadget.speed); + +if (gpriv->gadget.speed !=USB_SPEED_UNKNOWN && + (state &SUSPENDED_STATE )) { +if (gpriv->driver && gpriv->driver->suspend) + gpriv->driver->suspend (&gpriv->gadget); +usb_gadget_set_state (&gpriv->gadget,USB_STATE_SUSPENDED ); + }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 62/350 crypto: aegis128-neon - use Clang compatible cflags for ARM
In reply to Sasha LevinFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 2eb2d198bd6cd0083a5363ce66272fb34a19928f ]
The next version of Clang will start policing compiler command line options, and will reject combinations of -march and -mfpu that it thinks are incompatible.
This results in errors like
clang-10: warning: ignoring extension 'crypto' because the 'armv7-a' architecture does not support it [-Winvalid-command-line-argument] /tmp/aegis128-neon-inner-5ee428.s: Assembler messages:
/tmp/aegis128-neon-inner-5ee428.s:73: Error: selected
processor does not support `aese.8 q2,q14' in ARM mode
when buiding the SIMD aegis128 code for 32-bit ARM, given that the 'armv7-a' -march argument is considered to be compatible with the ARM crypto extensions. Instead, we should use armv8-a, which does allow the crypto extensions to be enabled.
--- crypto/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/Makefile +1 -1
@@ -93,7 +93,7 @@ obj-$(CONFIG_CRYPTO_AEGIS128) += aegis128.o aegis128-y := aegis128-core.o ifeq ($(ARCH),arm) -CFLAGS_aegis128-neon-inner.o += -ffreestanding -march=armv7-a -mfloat-abi=softfp +CFLAGS_aegis128-neon-inner.o += -ffreestanding -march=armv8-a -mfloat-abi=softfp CFLAGS_aegis128-neon-inner.o += -mfpu=crypto-neon-fp-armv8 aegis128-$(CONFIG_CRYPTO_AEGIS128_SIMD) += aegis128-neon.o aegis128-neon-inner.o endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 63/350 hwrng: omap3-rom - Call clk_disable_unprepare() on exit only if not idled
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit eaecce12f5f0d2c35d278e41e1bc4522393861ab ]
When unloading omap3-rom-rng, we'll get the following:
WARNING: CPU: 0 PID: 100 at drivers/clk/clk.c:948 clk_core_disable
This is because the clock may be already disabled by omap3_rom_rng_idle(). Let's fix the issue by checking for rng_idle on exit.
--- drivers/char/hw_random/omap3-rom-rng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/hw_random/omap3-rom-rng.c +2 -1
@@ -121,7 +121,8 @@ static int omap3_rom_rng_remove(struct platform_device *pdev) {cancel_delayed_work_sync (&idle_work);hwrng_unregister (&omap3_rom_rng_ops); -clk_disable_unprepare (rng_clk); +if (!rng_idle) +clk_disable_unprepare (rng_clk);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 64/350 regulator: max8907: Fix the usage of uninitialized variable in max8907_regulator_probe()
In reply to Sasha LevinFrom: Yizhuo <[email protected]>
[ Upstream commit 472b39c3d1bba0616eb0e9a8fa3ad0f56927c7d7 ]
Inside function max8907_regulator_probe(), variable val could be uninitialized if regmap_read() fails. However, val is used later in the if statement to decide the content written to "pmic", which is potentially unsafe.
--- drivers/regulator/max8907-regulator.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/regulator/max8907-regulator.c +12 -3
@@ -296,7 +296,10 @@ static int max8907_regulator_probe(struct platform_device *pdev)memcpy (pmic->desc, max8907_regulators,sizeof (pmic->desc));/* Backwards compatibility with MAX8907B; SD1 uses different voltages */ -regmap_read (max8907->regmap_gen,MAX8907_REG_II2RR , &val); + ret =regmap_read (max8907->regmap_gen,MAX8907_REG_II2RR , &val); +if (ret) +return ret; +if ((val &MAX8907_II2RR_VERSION_MASK ) ==MAX8907_II2RR_VERSION_REV_B ) { pmic->desc[MAX8907_SD1 ].min_uV =637500 ;
@@ -333,14 +336,20 @@ static int max8907_regulator_probe(struct platform_device *pdev) }if (pmic->desc[i].ops == &max8907_ldo_ops) { -regmap_read (config.regmap, pmic->desc[i].enable_reg, + ret =regmap_read (config.regmap, pmic->desc[i].enable_reg, &val); +if (ret) +return ret; +if ((val &MAX8907_MASK_LDO_SEQ ) !=MAX8907_MASK_LDO_SEQ ) pmic->desc[i].ops = &max8907_ldo_hwctl_ops; }else if (pmic->desc[i].ops == &max8907_out5v_ops) { -regmap_read (config.regmap, pmic->desc[i].enable_reg, + ret =regmap_read (config.regmap, pmic->desc[i].enable_reg, &val); +if (ret) +return ret; +if ((val & (MAX8907_MASK_OUT5V_VINEN |MAX8907_MASK_OUT5V_ENSRC )) !=MAX8907_MASK_OUT5V_ENSRC )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 65/350 tools/memory-model: Fix data race detection for unordered store and load
In reply to Sasha LevinFrom: Alan Stern <[email protected]>
[ Upstream commit daebf24a8e8c6064cba3a330db9fe9376a137d2c ]
Currently the Linux Kernel Memory Model gives an incorrect response for the following litmus test:
C plain-WWC
{}
P0(int *x)
{
WRITE_ONCE(*x, 2);
}P1(int *x, int *y)
{
int r1;
int r2;
int r3;
r1 = READ_ONCE(*x);
if (r1 == 2) {
smp_rmb();
r2 = *x;
}
smp_rmb();
r3 = READ_ONCE(*x);
WRITE_ONCE(*y, r3 - 1);
}P2(int *x, int *y)
{
int r4;
r4 = READ_ONCE(*y);
if (r4 > 0)
WRITE_ONCE(*x, 1);
}exists (x=2 /\ 1:r2=2 /\ 2:r4=1)
The memory model says that the plain read of *x in P1 races with the WRITE_ONCE(*x) in P2.
The problem is that we have a write W and a read R related by neither fre or rfe, but rather W ->coe W' ->rfe R, where W' is an intermediate write (the WRITE_ONCE() in P0). In this situation there is no particular ordering between W and R, so either a wr-vis link from W to R or an rw-xbstar link from R to W would prove that the accesses aren't concurrent.
But the LKMM only looks for a wr-vis link, which is equivalent to assuming that W must execute before R. This is not necessarily true on non-multicopy-atomic systems, as the WWC pattern demonstrates.
This patch changes the LKMM to accept either a wr-vis or a reverse rw-xbstar link as a proof of non-concurrency.
--- tools/memory-model/linux-kernel.cat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/memory-model/linux-kernel.cat +1 -1
@@ -197,7 +197,7 @@ empty (wr-incoh | rw-incoh | ww-incoh) as plain-coherence (* Actual races *) let ww-nonrace = ww-vis & ((Marked * W) | rw-xbstar) & ((W * Marked) | wr-vis) let ww-race = (pre-race & co) \ ww-nonrace -let wr-race = (pre-race & (co? ; rf)) \ wr-vis +let wr-race = (pre-race & (co? ; rf)) \ wr-vis \ rw-xbstar^-1 let rw-race = (pre-race & fr) \ rw-xbstar flag ~empty (ww-race | wr-race | rw-race) as data-race
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 66/350 media: flexcop-usb: fix NULL-ptr deref in flexcop_usb_transfer_init()
In reply to Sasha LevinFrom: Yang Yingliang <[email protected]>
[ Upstream commit 649cd16c438f51d4cd777e71ca1f47f6e0c5e65d ]
If usb_set_interface() failed, iface->cur_altsetting will not be assigned and it will be used in flexcop_usb_transfer_init() It may lead a NULL pointer dereference.
Check usb_set_interface() return value in flexcop_usb_init() and return failed to avoid using this NULL pointer.
--- drivers/media/usb/b2c2/flexcop-usb.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/usb/b2c2/flexcop-usb.c +7 -1
@@ -504,7 +504,13 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)static int flexcop_usb_init (struct flexcop_usb *fc_usb) {/* use the alternate setting with the larges buffer */ -usb_set_interface (fc_usb->udev,0 ,1 ); +int ret =usb_set_interface (fc_usb->udev,0 ,1 ); + +if (ret) { +err ("set interface failed." ); +return ret; + } +switch (fc_usb->udev->speed) {case USB_SPEED_LOW :err ("cannot handle USB speed because it is too slow." );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 67/350 media: cec-funcs.h: add status_req checks
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 9b211f9c5a0b67afc435b86f75d78273b97db1c5 ]
The CEC_MSG_GIVE_DECK_STATUS and CEC_MSG_GIVE_TUNER_DEVICE_STATUS commands both have a status_req argument: ON, OFF, ONCE. If ON or ONCE, then the follower will reply with a STATUS message. Either once or whenever the status changes (status_req == ON).
If status_req == OFF, then it will stop sending continuous status updates, but the follower will *not* send a STATUS message in that case.
This means that if status_req == OFF, then msg->reply should be 0 as well since no reply is expected in that case.
--- include/uapi/linux/cec-funcs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/uapi/linux/cec-funcs.h +4 -2
@@ -923,7 +923,8 @@ static inline void cec_msg_give_deck_status(struct cec_msg *msg, msg->len =3 ; msg->msg[1 ] =CEC_MSG_GIVE_DECK_STATUS ; msg->msg[2 ] = status_req; - msg->reply = reply ?CEC_MSG_DECK_STATUS :0 ; + msg->reply = (reply && status_req !=CEC_OP_STATUS_REQ_OFF ) ? +CEC_MSG_DECK_STATUS :0 ; } static inline void cec_ops_give_deck_status(const struct cec_msg *msg,
@@ -1027,7 +1028,8 @@ static inline void cec_msg_give_tuner_device_status(struct cec_msg *msg, msg->len =3 ; msg->msg[1 ] =CEC_MSG_GIVE_TUNER_DEVICE_STATUS ; msg->msg[2 ] = status_req; - msg->reply = reply ?CEC_MSG_TUNER_DEVICE_STATUS :0 ; + msg->reply = (reply && status_req !=CEC_OP_STATUS_REQ_OFF ) ? +CEC_MSG_TUNER_DEVICE_STATUS :0 ; } static inline void cec_ops_give_tuner_device_status(const struct cec_msg *msg,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 68/350 media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup
In reply to Sasha LevinFrom: Neil Armstrong <[email protected]>
[ Upstream commit 3e84a18a259e1df35e5b549ab92ec3baf82ff010 ]
When probed after the HDMI notifier, calling cec_notifier_cec_adap_register() calls the enable() adapter callback, but the HW is not yet set up.
Moving cec_notifier_cec_adap_register() right before cec_register_adapter() fixes the following crash:
Ignoring spurious kernel translation fault at virtual address 0000000000000008 [...]
Hardware name: Khadas VIM (DT) [...] pc : __do_kernel_fault+0xdc/0x120 lr : __do_kernel_fault+0xdc/0x120 [...] Call trace: __do_kernel_fault+0xdc/0x120 do_page_fault+0x180/0x458 do_translation_fault+0x64/0x70 do_mem_abort+0x3c/0x98 el1_da+0x20/0x94 meson_ao_cec_adap_enable+0x30/0x218 [ao_cec] __cec_s_phys_addr+0x184/0x270 cec_s_phys_addr+0x44/0x60 cec_notifier_cec_adap_register+0x68/0x90 meson_ao_cec_probe+0xb0/0x288 [ao_cec]
[...]
el0_svc_compat+0x8/0x10
--- drivers/media/platform/meson/ao-cec-g12a.c | 36 +++++++++++----------- drivers/media/platform/meson/ao-cec.c | 30 +++++++++--------- 2 files changed, 33 insertions(+), 33 deletions(-)
drivers/media/platform/meson/ao-cec-g12a.c +18 -18
@@ -662,34 +662,27 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev)if (IS_ERR (ao_cec->adap))return PTR_ERR (ao_cec->adap); - ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , - ao_cec->adap); -if (!ao_cec->notify) { - ret = -ENOMEM ; - goto out_probe_adapter; - } - ao_cec->adap->owner =THIS_MODULE ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (base)) { ret =PTR_ERR (base); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->regmap =devm_regmap_init_mmio (&pdev->dev, base, &meson_ao_cec_g12a_regmap_conf);if (IS_ERR (ao_cec->regmap)) { ret =PTR_ERR (ao_cec->regmap); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->regmap_cec =devm_regmap_init (&pdev->dev,NULL , ao_cec, &meson_ao_cec_g12a_cec_regmap_conf);if (IS_ERR (ao_cec->regmap_cec)) { ret =PTR_ERR (ao_cec->regmap_cec); - goto out_probe_notify; + goto out_probe_adapter; } irq =platform_get_irq (pdev,0 );
@@ -699,45 +692,52 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev) 0, NULL, ao_cec);if (ret) {dev_err (&pdev->dev,"irq request failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->oscin =devm_clk_get (&pdev->dev,"oscin" );if (IS_ERR (ao_cec->oscin)) {dev_err (&pdev->dev,"oscin clock request failed\n" ); ret =PTR_ERR (ao_cec->oscin); - goto out_probe_notify; + goto out_probe_adapter; } ret =meson_ao_cec_g12a_setup_clk (ao_cec);if (ret) - goto out_probe_notify; + goto out_probe_adapter; ret =clk_prepare_enable (ao_cec->core);if (ret) {dev_err (&pdev->dev,"core clock enable failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; }device_reset_optional (&pdev->dev);platform_set_drvdata (pdev, ao_cec); + ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , + ao_cec->adap); +if (!ao_cec->notify) { + ret = -ENOMEM ; + goto out_probe_core_clk; + } + ret =cec_register_adapter (ao_cec->adap, &pdev->dev);if (ret <0 ) - goto out_probe_core_clk; + goto out_probe_notify;/* Setup Hardware */ regmap_write (ao_cec->regmap,CECB_GEN_CNTL_REG ,CECB_GEN_CNTL_RESET );return 0 ; -out_probe_core_clk: -clk_disable_unprepare (ao_cec->core); - out_probe_notify:cec_notifier_cec_adap_unregister (ao_cec->notify); +out_probe_core_clk: +clk_disable_unprepare (ao_cec->core); + out_probe_adapter:cec_delete_adapter (ao_cec->adap);
drivers/media/platform/meson/ao-cec.c +15 -15
@@ -624,20 +624,13 @@ static int meson_ao_cec_probe(struct platform_device *pdev)if (IS_ERR (ao_cec->adap))return PTR_ERR (ao_cec->adap); - ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , - ao_cec->adap); -if (!ao_cec->notify) { - ret = -ENOMEM ; - goto out_probe_adapter; - } - ao_cec->adap->owner =THIS_MODULE ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ao_cec->base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (ao_cec->base)) { ret =PTR_ERR (ao_cec->base); - goto out_probe_notify; + goto out_probe_adapter; } irq =platform_get_irq (pdev,0 );
@@ -647,20 +640,20 @@ static int meson_ao_cec_probe(struct platform_device *pdev) 0, NULL, ao_cec);if (ret) {dev_err (&pdev->dev,"irq request failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->core =devm_clk_get (&pdev->dev,"core" );if (IS_ERR (ao_cec->core)) {dev_err (&pdev->dev,"core clock request failed\n" ); ret =PTR_ERR (ao_cec->core); - goto out_probe_notify; + goto out_probe_adapter; } ret =clk_prepare_enable (ao_cec->core);if (ret) {dev_err (&pdev->dev,"core clock enable failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; } ret =clk_set_rate (ao_cec->core,CEC_CLK_RATE );
@@ -674,9 +667,16 @@ static int meson_ao_cec_probe(struct platform_device *pdev) ao_cec->pdev = pdev;platform_set_drvdata (pdev, ao_cec); + ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , + ao_cec->adap); +if (!ao_cec->notify) { + ret = -ENOMEM ; + goto out_probe_clk; + } + ret =cec_register_adapter (ao_cec->adap, &pdev->dev);if (ret <0 ) - goto out_probe_clk; + goto out_probe_notify;/* Setup Hardware */ writel_relaxed(CEC_GEN_CNTL_RESET,
@@ -684,12 +684,12 @@ static int meson_ao_cec_probe(struct platform_device *pdev)return 0 ; -out_probe_clk: -clk_disable_unprepare (ao_cec->core); - out_probe_notify:cec_notifier_cec_adap_unregister (ao_cec->notify); +out_probe_clk: +clk_disable_unprepare (ao_cec->core); + out_probe_adapter:cec_delete_adapter (ao_cec->adap);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 69/350 drm/bridge: dw-hdmi: Refuse DDC/CI transfers on the internal I2C controller
In reply to Sasha LevinFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit bee447e224b2645911c5d06e35dc90d8433fcef6 ]
The DDC/CI protocol involves sending a multi-byte request to the display via I2C, which is typically followed by a multi-byte response. The internal I2C controller only allows single byte reads/writes or reads of 8 sequential bytes, hence DDC/CI is not supported when the internal I2C controller is used. The I2C transfers complete without errors, however the data in the response is garbage. Abort transfers to/from slave address 0x37 (DDC) with -EOPNOTSUPP, to make it evident that the communication is failing.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +10 -0
@@ -36,6 +36,7 @@#include "dw-hdmi-cec.h" #include "dw-hdmi.h" +#define DDC_CI_ADDR 0x37#define DDC_SEGMENT_ADDR 0x30#define HDMI_EDID_LEN 512
@@ -398,6 +399,15 @@ static int dw_hdmi_i2c_xfer(struct i2c_adapter *adap,u8 addr = msgs[0 ].addr;int i, ret =0 ; +if (addr ==DDC_CI_ADDR ) +/* +* The internal I2C controller does not support the multi-byte +* read and write operations needed for DDC/CI. +* TOFIX: Blacklist the DDC/CI address until we filter out +* unsupported I2C operations. +*/ +return -EOPNOTSUPP ; +dev_dbg (hdmi->dev,"xfer: num: %d, addr: %#x\n" , num, addr);for (i =0 ; i < num; i++) {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 70/350 samples: pktgen: fix proc_cmd command result check logic
In reply to Sasha LevinFrom: "Daniel T. Lee" <[email protected]>
[ Upstream commit 3cad8f911575191fb3b81d8ed0e061e30f922223 ]
Currently, proc_cmd is used to dispatch command to 'pg_ctrl', 'pg_thread', 'pg_set'. proc_cmd is designed to check command result with grep the "Result:", but this might fail since this string is only shown in 'pg_thread' and 'pg_set'.
This commit fixes this logic by grep-ing the "Result:" string only when the command is not for 'pg_ctrl'.
For clarity of an execution flow, 'errexit' flag has been set.
To cleanup pktgen on exit, trap has been added for EXIT signal.
--- samples/pktgen/functions.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
samples/pktgen/functions.sh +11 -6
@@ -5,6 +5,8 @@ # Author: Jesper Dangaaard Brouer # License: GPL +set -o errexit + ## -- General shell logging cmds -- function err() { local exitcode=$1
@@ -58,6 +60,7 @@ function pg_set() { function proc_cmd() { local result local proc_file=$1 + local status=0 # after shift, the remaining args are contained in $@ shift local proc_ctrl=${PROC_DIR}/$proc_file
@@ -73,13 +76,13 @@ function proc_cmd() { echo "cmd: $@ > $proc_ctrl" fi # Quoting of "$@" is important for space expansion - echo "$@" > "$proc_ctrl" - local status=$? + echo "$@" > "$proc_ctrl" || status=$? - result=$(grep "Result: OK:" $proc_ctrl) - # Due to pgctrl, cannot use exit code $? from grep - if [[ "$result" == "" ]]; then - grep "Result:" $proc_ctrl >&2 + if [[ "$proc_file" != "pgctrl" ]]; then + result=$(grep "Result: OK:" $proc_ctrl) || true + if [[ "$result" == "" ]]; then + grep "Result:" $proc_ctrl >&2 + fi fi if (( $status != 0 )); then err 5 "Write error($status) occurred cmd: \"$@ > $proc_ctrl\""
@@ -105,6 +108,8 @@ function pgset() { fi } +[[ $EUID -eq 0 ]] && trap 'pg_ctrl "reset"' EXIT + ## -- General shell tricks -- function root_check_run_with_sudo() {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 71/350 block: Fix writeback throttling W=1 compiler warnings
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 1d200e9d6f635ae894993a7d0f1b9e0b6e522e3b ]
Fix the following compiler warnings:
In file included from ./include/linux/bitmap.h:9,
from ./include/linux/cpumask.h:12,
from ./arch/x86/include/asm/cpumask.h:5,
from ./arch/x86/include/asm/msr.h:11,
from ./arch/x86/include/asm/processor.h:21,
from ./arch/x86/include/asm/cpufeature.h:5,
from ./arch/x86/include/asm/thread_info.h:53,
from ./include/linux/thread_info.h:38,
from ./arch/x86/include/asm/preempt.h:7,
from ./include/linux/preempt.h:78,
from ./include/linux/spinlock.h:51,
from ./include/linux/mmzone.h:8,
from ./include/linux/gfp.h:6,
from ./include/linux/mm.h:10,
from ./include/linux/bvec.h:13,
from ./include/linux/blk_types.h:10,
from block/blk-wbt.c:23:
In function 'strncpy',
inlined from 'perf_trace_wbt_stat' at ./include/trace/events/wbt.h:15:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'perf_trace_wbt_lat' at ./include/trace/events/wbt.h:58:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'perf_trace_wbt_step' at ./include/trace/events/wbt.h:87:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'perf_trace_wbt_timer' at ./include/trace/events/wbt.h:126:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_stat' at ./include/trace/events/wbt.h:15:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_lat' at ./include/trace/events/wbt.h:58:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_timer' at ./include/trace/events/wbt.h:126:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_step' at ./include/trace/events/wbt.h:87:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- include/trace/events/wbt.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
include/trace/events/wbt.h +8 -4
@@ -33,7 +33,8 @@ TRACE_EVENT(wbt_stat, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->rmean = stat[0 ].mean; __entry->rmin = stat[0 ].min; __entry->rmax = stat[0 ].max;
@@ -67,7 +68,8 @@ TRACE_EVENT(wbt_lat, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->lat =div_u64 (lat,1000 ); ),
@@ -103,7 +105,8 @@ TRACE_EVENT(wbt_step, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->msg = msg; __entry->step = step; __entry->window =div_u64 (window,1000 );
@@ -138,7 +141,8 @@ TRACE_EVENT(wbt_timer, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->status = status; __entry->step = step; __entry->inflight = inflight;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 72/350 MIPS: syscall: Emit Loongson3 sync workarounds within asm
In reply to Sasha LevinFrom: Paul Burton <[email protected]>
[ Upstream commit e84957e6ae043bb83ad6ae7e949a1ce97b6bbfef ]
Generate the sync instructions required to workaround Loongson3 LL/SC errata within inline asm blocks, which feels a little safer than doing it from C where strictly speaking the compiler would be well within its rights to insert a memory access between the separate asm statements we previously had, containing sync & ll instructions respectively.
--- arch/mips/kernel/syscall.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/kernel/syscall.c +2 -1
@@ -37,6 +37,7 @@#include <asm/signal.h> #include <asm/sim.h> #include <asm/shmparam.h> +#include <asm/sync.h> #include <asm/sysmips.h> #include <asm/switch_to.h>
@@ -133,12 +134,12 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) [efault] "i" (-EFAULT) : "memory"); }else if (cpu_has_llsc) { -loongson_llsc_mb (); __asm__ __volatile__ (" .set push \n" " .set " MIPS_ISA_ARCH_LEVEL " \n" " li %[err], 0 \n" "1: \n" + " " __SYNC(full, loongson3_war) " \n" user_ll("%[old]", "(%[addr])")" move %[tmp], %[new] \n" "2: \n"
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 73/350 drm/amdkfd: Fix MQD size calculation
In reply to Sasha LevinFrom: Oak Zeng <[email protected]>
[ Upstream commit 40a9592a26608e16f7545a068ea4165e1869f629 ]
On device initialization, a chunk of GTT memory is pre-allocated for HIQ and all SDMA queues mqd. The size of this allocation was wrong. The correct sdma engine number should be PCIe-optimized SDMA engine number plus xgmi SDMA engine number.
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -1
@@ -1676,7 +1676,8 @@ static int allocate_hiq_sdma_mqd(struct device_queue_manager *dqm)struct kfd_dev *dev = dqm->dev;struct kfd_mem_obj *mem_obj = &dqm->hiq_sdma_mqd;uint32_t size = dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA ]->mqd_size * - dev->device_info->num_sdma_engines * + (dev->device_info->num_sdma_engines + + dev->device_info->num_xgmi_sdma_engines) * dev->device_info->num_sdma_queues_per_engine + dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ ]->mqd_size;
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 74/350 iio: proximity: sx9500: fix iio_triggered_buffer_{predisable,postenable} positions
In reply to Sasha LevinFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit 3cfd6464fe23deb45bb688df66184b3f32fefc16 ]
The iio_triggered_buffer_predisable() should be called last, to detach the poll func after the devices has been suspended.
This change re-organizes things a bit so that the postenable & predisable are symmetrical. It also converts the preenable() to a postenable().
Not stable material as there is no known problem with the current code, it's just not consistent with the form we would like all the IIO drivers to adopt so as to allow subsystem wide changes.
--- drivers/iio/proximity/sx9500.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/iio/proximity/sx9500.c +11 -5
@@ -675,11 +675,15 @@ static irqreturn_t sx9500_trigger_handler(int irq, void *private)return IRQ_HANDLED ; } -static int sx9500_buffer_preenable (struct iio_dev *indio_dev) +static int sx9500_buffer_postenable (struct iio_dev *indio_dev) {struct sx9500_data *data =iio_priv (indio_dev);int ret =0 , i; + ret =iio_triggered_buffer_postenable (indio_dev); +if (ret) +return ret; +mutex_lock (&data->mutex);for (i =0 ; i <SX9500_NUM_CHANNELS ; i++)
@@ -696,6 +700,9 @@ static int sx9500_buffer_preenable(struct iio_dev *indio_dev)mutex_unlock (&data->mutex); +if (ret) +iio_triggered_buffer_predisable (indio_dev); +return ret; }
@@ -704,8 +711,6 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev)struct sx9500_data *data =iio_priv (indio_dev);int ret =0 , i; -iio_triggered_buffer_predisable (indio_dev); -mutex_lock (&data->mutex);for (i =0 ; i <SX9500_NUM_CHANNELS ; i++)
@@ -722,12 +727,13 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev)mutex_unlock (&data->mutex); +iio_triggered_buffer_predisable (indio_dev); +return ret; }static const struct iio_buffer_setup_ops sx9500_buffer_setup_ops = { - .preenable = sx9500_buffer_preenable, - .postenable = iio_triggered_buffer_postenable, + .postenable = sx9500_buffer_postenable, .predisable = sx9500_buffer_predisable, };
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 074/350] iio: proximity: sx9500: fix iio_triggered_buffer_{predisable,postenable} positions
Quoted 7 lines · On Tue, 10 Dec 2019 16:02:59 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
3cfd6464fe23deb45bb688df66184b3f32fefc16]The
iio_triggered_buffer_predisable()should be called last, to detach the poll func after the devices has been suspended.
Quoted 6 lines
This change re-organizes things a bit so that the postenable & predisable are symmetrical. It also converts the
preenable()to apostenable().Not stable material as there is no known problem with the current code, it's just not consistent with the form we would like all the IIO drivers to adopt so as to allow subsystem wide changes.
See comment.
Jonathan
Quoted 64 lines
Signed-off-by Alexandru Ardelean <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/iio/proximity/sx9500.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)drivers/iio/proximity/sx9500.c +11
-5@@ -675,11 +675,15 @@ static irqreturn_t sx9500_trigger_handler(int irq, void *private)return IRQ_HANDLED ; } -static int sx9500_buffer_preenable (struct iio_dev *indio_dev) +static int sx9500_buffer_postenable (struct iio_dev *indio_dev) {struct sx9500_data *data =iio_priv (indio_dev);int ret =0 , i; + ret =iio_triggered_buffer_postenable (indio_dev); +if (ret) +return ret; +mutex_lock (&data->mutex);for (i =0 ; i <SX9500_NUM_CHANNELS ; i++)@@ -696,6 +700,9 @@ static int sx9500_buffer_preenable(struct iio_dev *indio_dev)mutex_unlock (&data->mutex); +if (ret) +iio_triggered_buffer_predisable (indio_dev); +return ret; }@@ -704,8 +711,6 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev)struct sx9500_data *data =iio_priv (indio_dev);int ret =0 , i; -iio_triggered_buffer_predisable (indio_dev); -mutex_lock (&data->mutex);for (i =0 ; i <SX9500_NUM_CHANNELS ; i++)@@ -722,12 +727,13 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev)mutex_unlock (&data->mutex); +iio_triggered_buffer_predisable (indio_dev); +return ret; }static const struct iio_buffer_setup_ops sx9500_buffer_setup_ops = { - .preenable = sx9500_buffer_preenable, - .postenable = iio_triggered_buffer_postenable, + .postenable = sx9500_buffer_postenable, .predisable = sx9500_buffer_predisable, };
Sasha Levin
maintainerPATCH 75/350 MIPS: futex: Emit Loongson3 sync workarounds within asm
In reply to Sasha LevinFrom: Paul Burton <[email protected]>
[ Upstream commit 3c1d3f0979721a39dd2980c97466127ce65aa130 ]
Generate the sync instructions required to workaround Loongson3 LL/SC errata within inline asm blocks, which feels a little safer than doing it from C where strictly speaking the compiler would be well within its rights to insert a memory access between the separate asm statements we previously had, containing sync & ll instructions respectively.
--- arch/mips/include/asm/barrier.h | 13 +++++++------ arch/mips/include/asm/futex.h | 15 +++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-)
arch/mips/include/asm/barrier.h +7 -6
@@ -218,13 +218,14 @@* ordering will be done by smp_llsc_mb() and friends. */ #if defined(CONFIG_WEAK_REORDERING_BEYOND_LLSC ) && defined(CONFIG_SMP ) -#define __WEAK_LLSC_MB " sync \n" -#define smp_llsc_mb () __asm__ __volatile__(__WEAK_LLSC_MB : : :"memory") -#define __LLSC_CLOBBER +# define __WEAK_LLSC_MB sync +# define smp_llsc_mb () \ + __asm__ __volatile__(__stringify(__WEAK_LLSC_MB) : : :"memory") +# define __LLSC_CLOBBER#else -#define __WEAK_LLSC_MB " \n" -#define smp_llsc_mb () do { } while (0) -#define __LLSC_CLOBBER "memory" +# define __WEAK_LLSC_MB +# define smp_llsc_mb () do { } while (0) +# define __LLSC_CLOBBER "memory"#endif #ifdef CONFIG_CPU_CAVIUM_OCTEON
arch/mips/include/asm/futex.h +7 -8
@@ -16,6 +16,7 @@#include <asm/barrier.h> #include <asm/compiler.h> #include <asm/errno.h> +#include <asm/sync.h> #include <asm/war.h> #define __futex_atomic_op (insn, ret, oldval, uaddr, oparg) \
@@ -32,7 +33,7 @@" .set arch=r4000 \n" \"2: sc $1, %2 \n" \" beqzl $1, 1b \n" \ - __WEAK_LLSC_MB \ + __stringify(__WEAK_LLSC_MB) \"3: \n" \" .insn \n" \" .set pop \n" \
@@ -50,19 +51,19 @@ "i" (-EFAULT) \ : "memory"); \ } else if (cpu_has_llsc) { \ - loongson_llsc_mb(); \ __asm__ __volatile__( \ " .set push \n" \ " .set noat \n" \ " .set push \n" \ " .set "MIPS_ISA_ARCH_LEVEL" \n" \ + " " __SYNC(full, loongson3_war) " \n" \ "1: "user_ll("%1", "%4")" # __futex_atomic_op\n" \ " .set pop \n" \ " " insn " \n" \ " .set "MIPS_ISA_ARCH_LEVEL" \n" \ "2: "user_sc("$1", "%2")" \n" \ " beqz $1, 1b \n" \ - __WEAK_LLSC_MB \ + __stringify(__WEAK_LLSC_MB) \"3: \n" \" .insn \n" \" .set pop \n" \
@@ -147,7 +148,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr," .set arch=r4000 \n" "2: sc $1, %2 \n" " beqzl $1, 1b \n" - __WEAK_LLSC_MB + __stringify(__WEAK_LLSC_MB)"3: \n" " .insn \n" " .set pop \n"
@@ -164,13 +165,13 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, "i" (-EFAULT) : "memory"); }else if (cpu_has_llsc) { -loongson_llsc_mb (); __asm__ __volatile__("# futex_atomic_cmpxchg_inatomic \n" " .set push \n" " .set noat \n" " .set push \n" " .set " MIPS_ISA_ARCH_LEVEL " \n" + " " __SYNC(full, loongson3_war) " \n" "1: "user_ll("%1", "%3")" \n"" bne %1, %z4, 3f \n" " .set pop \n"
@@ -178,8 +179,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr," .set " MIPS_ISA_ARCH_LEVEL " \n" "2: "user_sc("$1", "%2")" \n"" beqz $1, 1b \n" - __WEAK_LLSC_MB -"3: \n" + "3: " __SYNC_ELSE(full, loongson3_war, __WEAK_LLSC_MB) "\n"" .insn \n" " .set pop \n" " .section .fixup,\"ax\" \n"
@@ -194,7 +194,6 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, : GCC_OFF_SMALL_ASM() (*uaddr), "Jr" (oldval), "Jr" (newval), "i" (-EFAULT) : "memory"); -loongson_llsc_mb (); }else return -ENOSYS ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 76/350 staging/octeon: Use stubs for MIPS && !CAVIUM_OCTEON_SOC
In reply to Sasha LevinFrom: Paul Burton <[email protected]>
[ Upstream commit 17a29fea086ba18b000d28439bd5cb4f2b0a527b ]
When building for a non-Cavium MIPS system with COMPILE_TEST=y, the Octeon ethernet driver hits a number of issues due to use of macros provided only for CONFIG_CAVIUM_OCTEON_SOC=y configurations. For example:
drivers/staging/octeon/ethernet-rx.c:190:6: error:
'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared (first use in this function)
drivers/staging/octeon/ethernet-rx.c:472:25: error:
'OCTEON_IRQ_WORKQ0' undeclared (first use in this function)
These come from various asm/ headers that a non-Octeon build will be using a non-Octeon version of.
Fix this by using the octeon-stubs.h header for non-Cavium MIPS builds, and only using the real asm/octeon/ headers when building a Cavium Octeon kernel configuration.
This requires that octeon-stubs.h doesn't redefine XKPHYS_TO_PHYS, which is defined for MIPS by asm/addrspace.h which is pulled in by many other common asm/ headers.
--- drivers/staging/octeon/octeon-ethernet.h | 2 +- drivers/staging/octeon/octeon-stubs.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/staging/octeon/octeon-ethernet.h +1 -1
@@ -14,7 +14,7 @@#include <linux/of.h> #include <linux/phy.h> -#ifdef CONFIG_MIPS +#ifdef CONFIG_CAVIUM_OCTEON_SOC #include <asm/octeon/octeon.h>
drivers/staging/octeon/octeon-stubs.h +4 -1
@@ -1,5 +1,8 @@#define CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE 512 -#define XKPHYS_TO_PHYS (p) (p) + +#ifndef XKPHYS_TO_PHYS +# define XKPHYS_TO_PHYS (p) (p) +#endif #define OCTEON_IRQ_WORKQ0 0#define OCTEON_IRQ_RML 0
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerRe: [PATCH AUTOSEL 5.4 076/350] staging/octeon: Use stubs for MIPS && !CAVIUM_OCTEON_SOC
Quoted 32 lines · Sasha Levin
From: Paul Burton <[email protected]>
[ Upstream commit
17a29fea086ba18b000d28439bd5cb4f2b0a527b]When building for a non-Cavium MIPS system with COMPILE_TEST=y, the Octeon ethernet driver hits a number of issues due to use of macros provided only for
CONFIG_CAVIUM_OCTEON_SOC=yconfigurations. For example:
drivers/staging/octeon/ethernet-rx.c:190:6: error:
'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared (first use in this function)
drivers/staging/octeon/ethernet-rx.c:472:25: error:
'OCTEON_IRQ_WORKQ0' undeclared (first use in this function)These come from various asm/ headers that a non-Octeon build will be using a non-Octeon version of.
Fix this by using the
octeon-stubs.hheader for non-Cavium MIPS builds, and only using the real asm/octeon/ headers when building a Cavium Octeon kernel configuration.This requires that
octeon-stubs.hdoesn't redefineXKPHYS_TO_PHYS, which is defined for MIPS byasm/addrspace.hwhich is pulled in by many other common asm/ headers.Signed-off-by Paul Burton <[email protected]>Reported-by Geert Uytterhoeven <[email protected]>Fixes 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS")Cc Matthew Wilcox (Oracle) <[email protected]>Cc David S. Miller <[email protected]>
Quoted 7 lines
Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/staging/octeon/octeon-ethernet.h | 2 +- drivers/staging/octeon/octeon-stubs.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
I think this broke the build for 5.5-rc1, so no, please do not include this. This driver is about to be deleted (see the discussion on the staging mailing list for details), so this patch can be dropped.
thanks,
greg k-h
Sasha Levin
maintainerPATCH 77/350 mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit d10dcb615c8e29d403a24d35f8310a7a53e3050c ]
In mwifiex_pcie_init_evt_ring, a new skb is allocated which should be released if mwifiex_map_pci_memory() fails. The release for skb and card->evtbd_ring_vbase is added.
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/pcie.c +4 -1
@@ -687,8 +687,11 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)skb_put (skb,MAX_EVENT_SIZE );if (mwifiex_map_pci_memory (adapter, skb,MAX_EVENT_SIZE , -PCI_DMA_FROMDEVICE )) +PCI_DMA_FROMDEVICE )) { +kfree_skb (skb); +kfree (card->evtbd_ring_vbase);return -1 ; + } buf_pa =MWIFIEX_SKB_DMA_ADDR (skb);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 78/350 drm/drm_vblank: Change EINVAL by the correct errno
In reply to Sasha LevinFrom: Rodrigo Siqueira <[email protected]>
[ Upstream commit aed6105b28b10613f16c0bfe97525fe5a23338df ]
For historical reasons, the function drm_wait_vblank_ioctl always return -EINVAL if something gets wrong. This scenario limits the flexibility for the userspace to make detailed verification of any problem and take some action. In particular, the validation of “if (!dev->irq_enabled)” in the drm_wait_vblank_ioctl is responsible for checking if the driver support vblank or not. If the driver does not support VBlank, the function drm_wait_vblank_ioctl returns EINVAL, which does not represent the real issue; this patch changes this behavior by return EOPNOTSUPP. Additionally, drm_crtc_get_sequence_ioctl and drm_crtc_queue_sequence_ioctl, also returns EINVAL if vblank is not supported; this patch also changes the return value to EOPNOTSUPP in these functions. Lastly, these functions are invoked by libdrm, which is used by many compositors; because of this, it is important to check if this change breaks any compositor. In this sense, the following projects were examined:
* Drm-hwcomposer
* Kwin
* Sway
* Wlroots
* Wayland
* Weston
* Mutter
* Xorg (67 different drivers)
For each repository the verification happened in three steps:
* Update the main branch
* Look for any occurrence of "drmCrtcQueueSequence", "drmCrtcGetSequence", and "drmWaitVBlank" with the command git grep -n "STRING".
* Look in the git history of the project with the command git log -S<STRING>
None of the above projects validate the use of EINVAL when using drmWaitVBlank(), which make safe, at least for these projects, to change the return values. On the other hand, mesa and xserver project uses drmCrtcQueueSequence() and drmCrtcGetSequence(); this change is harmless for both projects.
Change since V5 (Pekka Paalanen):
- Check if the change also affects Mutter
Change since V4 (Daniel):
- Also return EOPNOTSUPP in drm_crtc_[get|queue]_sequence_ioctl
Change since V3:
- Return EINVAL for _DRM_VBLANK_SIGNAL (Daniel)
Change since V2:
Daniel Vetter and Chris Wilson
- Replace ENOTTY by EOPNOTSUPP
- Return EINVAL if the parameters are wrong
--- drivers/gpu/drm/drm_vblank.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_vblank.c +3 -3
@@ -1581,7 +1581,7 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,unsigned int flags, pipe, high_pipe;if (!dev->irq_enabled) -return -EINVAL ; +return -EOPNOTSUPP ;if (vblwait->request.type & _DRM_VBLANK_SIGNAL)return -EINVAL ;
@@ -1838,7 +1838,7 @@ int drm_crtc_get_sequence_ioctl(struct drm_device *dev, void *data,return -EOPNOTSUPP ;if (!dev->irq_enabled) -return -EINVAL ; +return -EOPNOTSUPP ; crtc =drm_crtc_find (dev, file_priv, get_seq->crtc_id);if (!crtc)
@@ -1896,7 +1896,7 @@ int drm_crtc_queue_sequence_ioctl(struct drm_device *dev, void *data,return -EOPNOTSUPP ;if (!dev->irq_enabled) -return -EINVAL ; +return -EOPNOTSUPP ; crtc =drm_crtc_find (dev, file_priv, queue_seq->crtc_id);if (!crtc)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 79/350 selftests/bpf: Fix btf_dump padding test case
In reply to Sasha LevinFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 76790c7c66ccc8695afc75e73f54c0ca86267ed2 ]
Existing padding test case for btf_dump has a good test that was supposed to test padding generation at the end of a struct, but its expected output was specified incorrectly. Fix this.
--- .../testing/selftests/bpf/progs/btf_dump_test_case_padding.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c +4 -1
@@ -62,6 +62,10 @@ struct padded_a_lot {* long: 64; * long: 64; * int b; +* long: 32; +* long: 64; +* long: 64; +* long: 64; *}; * */
@@ -95,7 +99,6 @@ struct zone_padding {struct zone {int a;short b; - short: 16;struct zone_padding __pad__; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 80/350 libbpf: Fix struct end padding in btf_dump
In reply to Sasha LevinFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit b4099769f3321a8d258a47a8b4b9d278dad28a73 ]
Fix a case where explicit padding at the end of a struct is necessary due to non-standart alignment requirements of fields (which BTF doesn't capture explicitly).
--- tools/lib/bpf/btf_dump.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/lib/bpf/btf_dump.c +7 -1
@@ -876,7 +876,6 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,__u16 vlen =btf_vlen (t); packed = is_struct ?btf_is_struct_packed (d->btf, id, t) :0 ; - align = packed ?1 :btf_align_of (d->btf, id); btf_dump_printf(d, "%s%s%s {", is_struct ? "struct" : "union",
@@ -906,6 +905,13 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,btf_dump_printf (d,";" ); } +/* pad at the end, if necessary */ +if (is_struct) { + align = packed ?1 :btf_align_of (d->btf, id); +btf_dump_emit_bit_padding (d, off, t->size *8 ,0 , align, + lvl +1 ); + } +if (vlen)btf_dump_printf (d,"\n" );btf_dump_printf (d,"%s}" ,pfx (lvl));
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 81/350 libbpf: Fix passing uninitialized bytes to setsockopt
In reply to Sasha LevinFrom: Ilya Maximets <[email protected]>
[ Upstream commit 25bfef430e960e695403b5d9c8dcc11b9f5d62be ]
'struct xdp_umem_reg' has 4 bytes of padding at the end that makes valgrind complain about passing uninitialized stack memory to the syscall:
Syscall param socketcall.setsockopt() points to uninitialised byte(s)
at 0x4E7AB7E: setsockopt (in /usr/lib64/libc-2.29.so)
by 0x4BDE035: xsk_umem__create@@LIBBPF_0.0.4 (xsk.c:172)
Uninitialised value was created by a stack allocation
at 0x4BDDEBA: xsk_umem__create@@LIBBPF_0.0.4 (xsk.c:140)Padding bytes appeared after introducing of a new 'flags' field. memset() is required to clear them.
--- tools/lib/bpf/xsk.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/xsk.c +1 -0
@@ -163,6 +163,7 @@ int xsk_umem__create_v0_0_4(struct xsk_umem **umem_ptr, void *umem_area, umem->umem_area = umem_area;xsk_set_umem_config (&umem->config, usr_config); +memset (&mr,0 ,sizeof (mr)); mr.addr = (uintptr_t )umem_area; mr.len = size; mr.chunk_size = umem->config.frame_size;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 82/350 net/smc: increase device refcount for added link group
In reply to Sasha LevinFrom: Ursula Braun <[email protected]>
[ Upstream commit b3cb53c05f20c5b4026a36a7bbd3010d1f3e0a55 ]
SMCD link groups belong to certain ISM-devices and SMCR link group links belong to certain IB-devices. Increase the refcount for these devices, as long as corresponding link groups exist.
--- net/smc/smc_core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/smc/smc_core.c +7 -2
@@ -231,10 +231,12 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) lgr->conns_all =RB_ROOT ;if (ini->is_smcd) {/* SMC-D specific settings */ +get_device (&ini->ism_dev->dev); lgr->peer_gid = ini->ism_gid; lgr->smcd = ini->ism_dev; }else {/* SMC-R specific settings */ +get_device (&ini->ib_dev->ibdev->dev); lgr->role = smc->listen_smc ?SMC_SERV :SMC_CLNT ;memcpy (lgr->peer_systemid, ini->ib_lcl->id_for_peer,SMC_SYSTEMID_LEN );
@@ -433,10 +435,13 @@ static void smc_lgr_free_bufs(struct smc_link_group *lgr)static void smc_lgr_free (struct smc_link_group *lgr) {smc_lgr_free_bufs (lgr); -if (lgr->is_smcd) +if (lgr->is_smcd) {smc_ism_put_vlan (lgr->smcd, lgr->vlan_id); -else +put_device (&lgr->smcd->dev); + }else {smc_link_clear (&lgr->lnk[SMC_SINGLE_LINK ]); +put_device (&lgr->lnk[SMC_SINGLE_LINK ].smcibdev->ibdev->dev); + }kfree (lgr); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 83/350 team: call RCU read lock when walking the port_list
In reply to Sasha LevinFrom: Hangbin Liu <[email protected]>
[ Upstream commit c17e26ddc79596230834345be80fcad6c619e9ec ]
Before reading the team port list, we need to acquire the RCU read lock. Also change list_for_each_entry() to list_for_each_entry_rcu().
v2:
repost the patch to net-next and remove fixes flag as this is a cosmetic change.
--- drivers/net/team/team.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/team/team.c +4 -1
@@ -2074,7 +2074,8 @@ static int team_ethtool_get_link_ksettings(struct net_device *dev, cmd->base.duplex =DUPLEX_UNKNOWN ; cmd->base.port =PORT_OTHER ; -list_for_each_entry (port, &team->port_list, list) { +rcu_read_lock (); +list_for_each_entry_rcu (port, &team->port_list, list) {if (team_port_txable (port)) {if (port->state.speed !=SPEED_UNKNOWN ) speed += port->state.speed;
@@ -2083,6 +2084,8 @@ static int team_ethtool_get_link_ksettings(struct net_device *dev, cmd->base.duplex = port->state.duplex; } } +rcu_read_unlock (); + cmd->base.speed = speed ? :SPEED_UNKNOWN ;return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 84/350 media: cx88: Fix some error handling path in 'cx8800_initdev()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit e1444e9b0424c70def6352580762d660af50e03f ]
A call to 'pci_disable_device()' is missing in the error handling path. In some cases, a call to 'free_irq()' may also be missing.
Reorder the error handling path, add some new labels and fix the 2 issues mentionned above.
This way, the error handling path in more in line with 'cx8800_finidev()' (i.e. the remove function)
--- drivers/media/pci/cx88/cx88-video.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/media/pci/cx88/cx88-video.c +7 -4
@@ -1277,7 +1277,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, core =cx88_core_get (dev->pci);if (!core) { err = -EINVAL ; - goto fail_free; + goto fail_disable; } dev->core = core;
@@ -1323,7 +1323,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, cc->step, cc->default_value);if (!vc) { err = core->audio_hdl.error; - goto fail_core; + goto fail_irq; } vc->priv = (void *)cc; }
@@ -1337,7 +1337,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, cc->step, cc->default_value);if (!vc) { err = core->video_hdl.error; - goto fail_core; + goto fail_irq; } vc->priv = (void *)cc;if (vc->id ==V4L2_CID_CHROMA_AGC )
@@ -1509,11 +1509,14 @@ static int cx8800_initdev(struct pci_dev *pci_dev, fail_unreg:cx8800_unregister_video (dev); -free_irq (pci_dev->irq, dev);mutex_unlock (&core->lock); +fail_irq: +free_irq (pci_dev->irq, dev); fail_core: core->v4ldev =NULL ;cx88_core_put (core, dev->pci); +fail_disable: +pci_disable_device (pci_dev); fail_free:kfree (dev);return err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 85/350 crypto: inside-secure - Fix a maybe-uninitialized warning
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 74e6bd472b6d9e80ec9972989d8991736fe46c51 ]
A previous fixup avoided an unused variable warning but replaced it with a slightly scarier warning:
drivers/crypto/inside-secure/safexcel.c:1100:6: error: variable 'irq' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
This is harmless as it is impossible to get into this case, but the compiler has no way of knowing that. Add an explicit error handling case to make it obvious to both compilers and humans reading the source.
--- drivers/crypto/inside-secure/safexcel.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/inside-secure/safexcel.c +2 -0
@@ -1120,6 +1120,8 @@ static int safexcel_request_ring_irq(void *pdev, int irqid, irq_name, irq);return irq; } + }else { +return -ENXIO ; } ret = devm_request_threaded_irq(dev, irq, handler,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 86/350 crypto: aegis128/simd - build 32-bit ARM for v8 architecture explicitly
In reply to Sasha LevinFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 830536770f968ab33ece123b317e252c269098db ]
Now that the Clang compiler has taken it upon itself to police the compiler command line, and reject combinations for arguments it views as incompatible, the AEGIS128 no longer builds correctly, and errors out like this:
clang-10: warning: ignoring extension 'crypto' because the 'armv7-a' architecture does not support it [-Winvalid-command-line-argument]
So let's switch to armv8-a instead, which matches the crypto-neon-fp-armv8 FPU profile we specify. Since neither were actually supported by GCC versions before 4.8, let's tighten the Kconfig dependencies as well so we won't run into errors when building with an ancient compiler.
--- crypto/Kconfig | 1 + 1 file changed, 1 insertion(+)
crypto/Kconfig +1 -0
@@ -309,6 +309,7 @@ config CRYPTO_AEGIS128 config CRYPTO_AEGIS128_SIMD bool "Support SIMD acceleration for AEGIS-128" depends on CRYPTO_AEGIS128 && ((ARM || ARM64) && KERNEL_MODE_NEON) + depends on !ARM || CC_IS_CLANG || GCC_VERSION >= 40800 default y config CRYPTO_AEGIS128_AESNI_SSE2
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 87/350 misc: fastrpc: fix memory leak from miscdev->name
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 2d10d2d170723e9278282458a6704552dcb77eac ]
Fix a memory leak in miscdev->name by using devm_variant
Orignally reported by kmemleak:
[<ffffff80088b74d8>] kmemleak_alloc+0x50/0x84
[<ffffff80081e015c>] __kmalloc_track_caller+0xe8/0x168
[<ffffff8008371ab0>] kvasprintf+0x78/0x100
[<ffffff8008371c6c>] kasprintf+0x50/0x74
[<ffffff8008507f2c>] fastrpc_rpmsg_probe+0xd8/0x20c
[<ffffff80086b63b4>] rpmsg_dev_probe+0xa8/0x148
[<ffffff80084de50c>] really_probe+0x208/0x248
[<ffffff80084de2dc>] driver_probe_device+0x98/0xc0
[<ffffff80084dec6c>] __device_attach_driver+0x9c/0xac
[<ffffff80084dca8c>] bus_for_each_drv+0x60/0x8c
[<ffffff80084de64c>] __device_attach+0x8c/0x100
[<ffffff80084de6e0>] device_initial_probe+0x20/0x28
[<ffffff80084dcbd0>] bus_probe_device+0x34/0x7c
[<ffffff80084da32c>] device_add+0x420/0x498
[<ffffff80084da680>] device_register+0x24/0x2c--- drivers/misc/fastrpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/fastrpc.c +2 -2
@@ -1430,8 +1430,8 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)return -ENOMEM ; data->miscdev.minor =MISC_DYNAMIC_MINOR ; - data->miscdev.name =kasprintf (GFP_KERNEL ,"fastrpc-%s" , - domains[domain_id]); + data->miscdev.name =devm_kasprintf (rdev,GFP_KERNEL ,"fastrpc-%s" , + domains[domain_id]); data->miscdev.fops = &fastrpc_fops; err =misc_register (&data->miscdev);if (err)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 88/350 ASoC: SOF: enable sync_write in hdac_bus
In reply to Sasha LevinFrom: Kai Vehmanen <[email protected]>
[ Upstream commit f3416e7144f5d4ba0fc5dcef6ebfff891266c46a ]
Align SOF HDA implementation with snd-hda-intel driver and enable sync_write flag for all supported Intel platforms in SOF. When set, a sync is issued after each verb write.
Sync after write has helped to overcome intermittent delays in system resume flow on Intel Coffee Lake systems, and most recently probe errors related to the HDMI codec on Ice Lake systems.
Matches the snd-hda-intel driver change done in commit 2756d9143aa5 ("ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips").
--- sound/soc/sof/intel/hda.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/sof/intel/hda.c +1 -0
@@ -268,6 +268,7 @@ static int hda_init(struct snd_sof_dev *sdev) bus->use_posbuf =1 ; bus->bdl_pos_adj =0 ; + bus->sync_write =1 ;mutex_init (&hbus->prepare_mutex); hbus->pci = pci;
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 89/350 media: ti-vpe: vpe: Fix Motion Vector vpdma stride
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit 102af9b9922f658f705a4b0deaccabac409131bf ]
commit 3dc2046ca78b ("[media] media: ti-vpe: vpe: allow use of user specified stride") and commit da4414eaed15 ("[media] media: ti-vpe: vpdma:
add support for user specified stride") resulted in the Motion Vector stride to be the same as the image stride.
This caused memory corruption in the output image as mentioned in commit 00db969964c8 ("[media] media: ti-vpe: vpe: Fix line stride for output motion vector").
--- drivers/media/platform/ti-vpe/vpe.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/media/platform/ti-vpe/vpe.c +13 -5
@@ -1013,11 +1013,14 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port)dma_addr_t dma_addr;u32 flags =0 ;u32 offset =0 ; +u32 stride;if (port ==VPE_PORT_MV_OUT ) { vpdma_fmt = &vpdma_misc_fmts[VPDMA_DATA_FMT_MV ]; dma_addr = ctx->mv_buf_dma[mv_buf_selector]; q_data = &ctx->q_data[Q_DATA_SRC ]; + stride =ALIGN ((q_data->width * vpdma_fmt->depth) >>3 , +VPDMA_STRIDE_ALIGN ); }else {/* to incorporate interleaved formats */ int plane = fmt->coplanar ? p_data->vb_part :0 ;
@@ -1044,6 +1047,7 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port) }/* Apply the offset */ dma_addr += offset; + stride = q_data->bytesperline[VPE_LUMA ]; }if (q_data->flags &Q_DATA_FRAME_1D )
@@ -1055,7 +1059,7 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port) MAX_W, MAX_H);vpdma_add_out_dtd (&ctx->desc_list, q_data->width, - q_data->bytesperline[VPE_LUMA ], &q_data->c_rect, + stride, &q_data->c_rect, vpdma_fmt, dma_addr,MAX_OUT_WIDTH_REG1 ,MAX_OUT_HEIGHT_REG1 , p_data->channel, flags); }
@@ -1074,10 +1078,13 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)dma_addr_t dma_addr;u32 flags =0 ;u32 offset =0 ; +u32 stride;if (port ==VPE_PORT_MV_IN ) { vpdma_fmt = &vpdma_misc_fmts[VPDMA_DATA_FMT_MV ]; dma_addr = ctx->mv_buf_dma[mv_buf_selector]; + stride =ALIGN ((q_data->width * vpdma_fmt->depth) >>3 , +VPDMA_STRIDE_ALIGN ); }else {/* to incorporate interleaved formats */ int plane = fmt->coplanar ? p_data->vb_part :0 ;
@@ -1104,6 +1111,7 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port) }/* Apply the offset */ dma_addr += offset; + stride = q_data->bytesperline[VPE_LUMA ];if (q_data->flags &Q_DATA_INTERLACED_SEQ_TB ) {/*
@@ -1139,10 +1147,10 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)if (p_data->vb_part && fmt->fourcc ==V4L2_PIX_FMT_NV12 ) frame_height /=2 ; -vpdma_add_in_dtd (&ctx->desc_list, q_data->width, - q_data->bytesperline[VPE_LUMA ], &q_data->c_rect, - vpdma_fmt, dma_addr, p_data->channel, field, flags, frame_width, - frame_height,0 ,0 ); +vpdma_add_in_dtd (&ctx->desc_list, q_data->width, stride, + &q_data->c_rect, vpdma_fmt, dma_addr, + p_data->channel, field, flags, frame_width, + frame_height,0 ,0 ); }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 90/350 media: ti-vpe: vpe: fix a v4l2-compliance warning about invalid pixel format
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit 06bec72b250b2cb3ba96fa45c2b8e0fb83745517 ]
v4l2-compliance warns with this message:
warn: v4l2-test-formats.cpp(717): \
TRY_FMT cannot handle an invalid pixelformat.
warn: v4l2-test-formats.cpp(718): \
This may or may not be a problem. For more information see:
warn: v4l2-test-formats.cpp(719): \
http://www.mail-archive.com/[email protected]/msg56550.html
...
test VIDIOC_TRY_FMT: FAIL
We need to make sure that the returns a valid pixel format in all instance. Based on the v4l2 framework convention drivers must return a valid pixel format when the requested pixel format is either invalid or not supported.
--- drivers/media/platform/ti-vpe/vpe.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/media/platform/ti-vpe/vpe.c +9 -4
@@ -338,20 +338,25 @@ enum { };/* find our format description corresponding to the passed v4l2_format */ -static struct vpe_fmt *find_format (struct v4l2_format *f) +static struct vpe_fmt *__find_format (u32 fourcc) {struct vpe_fmt *fmt;unsigned int k;for (k =0 ; k <ARRAY_SIZE (vpe_formats); k++) { fmt = &vpe_formats[k]; -if (fmt->fourcc == f->fmt.pix.pixelformat) +if (fmt->fourcc == fourcc)return fmt; }return NULL ; } +static struct vpe_fmt *find_format (struct v4l2_format *f) +{ +return __find_format (f->fmt.pix.pixelformat); +} +/* * there is one vpe_dev structure in the driver, it is shared by * all instances.
@@ -1574,9 +1579,9 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,unsigned int stride =0 ;if (!fmt || !(fmt->types & type)) { -vpe_err (ctx->dev,"Fourcc format (0x%08x) invalid.\n" , +vpe_dbg (ctx->dev,"Fourcc format (0x%08x) invalid.\n" , pix->pixelformat); -return -EINVAL ; + fmt =__find_format (V4L2_PIX_FMT_YUYV ); } if (pix->field != V4L2_FIELD_NONE && pix->field != V4L2_FIELD_ALTERNATE
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 91/350 media: ti-vpe: vpe: fix a v4l2-compliance failure about frame sequence number
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit 2444846c0dbfa4ead21b621e4300ec32c90fbf38 ]
v4l2-compliance fails with this message:
fail: v4l2-test-buffers.cpp(294): \ (int)g_sequence() < seq.last_seq + 1 fail: v4l2-test-buffers.cpp(740): \ buf.check(m2m_q, last_m2m_seq)
fail: v4l2-test-buffers.cpp(974): \
captureBufs(node, q, m2m_q, frame_count, true)
test MMAP: FAIL
The driver is failing to update the source frame sequence number in the vb2 buffer object. Only the destination frame sequence was being updated.
This is only a reporting issue if the user space app actually cares about the frame sequence number. But it is fixed nonetheless.
--- drivers/media/platform/ti-vpe/vpe.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/ti-vpe/vpe.c +1 -0
@@ -1417,6 +1417,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data) d_vb->timecode = s_vb->timecode; d_vb->sequence = ctx->sequence; + s_vb->sequence = ctx->sequence; d_q_data = &ctx->q_data[Q_DATA_DST ];if (d_q_data->flags &Q_IS_INTERLACED ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 92/350 media: ti-vpe: vpe: Make sure YUYV is set as default format
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit e20b248051ca0f90d84b4d9378e4780bc31f16c6 ]
v4l2-compliance fails with this message:
fail: v4l2-test-formats.cpp(672): \ Video Capture Multiplanar: TRY_FMT(G_FMT) != G_FMT fail: v4l2-test-formats.cpp(672): \ Video Output Multiplanar: TRY_FMT(G_FMT) != G_FMT ...
test VIDIOC_TRY_FMT: FAIL
The default pixel format was setup as pointing to a specific offset in the vpe_formats table assuming it was pointing to the V4L2_PIX_FMT_YUYV entry. This became false after the addition on the NV21 format (see above commid-id)
So instead of hard-coding an offset which might change over time we need to use a lookup helper instead so we know the default will always be what we intended.
--- drivers/media/platform/ti-vpe/vpe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/ti-vpe/vpe.c +1 -1
@@ -2288,7 +2288,7 @@ static int vpe_open(struct file *file)v4l2_ctrl_handler_setup (hdl); s_q_data = &ctx->q_data[Q_DATA_SRC ]; - s_q_data->fmt = &vpe_formats[2 ]; + s_q_data->fmt =__find_format (V4L2_PIX_FMT_YUYV ); s_q_data->width =1920 ; s_q_data->height =1080 ; s_q_data->nplanes =1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 93/350 media: ti-vpe: vpe: fix a v4l2-compliance failure causing a kernel panic
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit a37980ac5be29b83da67bf7d571c6bd9f90f8e45 ]
v4l2-compliance fails with this message:
warn: v4l2-test-formats.cpp(717): \
TRY_FMT cannot handle an invalid pixelformat.
test VIDIOC_TRY_FMT: FAIL
This causes the following kernel panic:
Unable to handle kernel paging request at virtual address 56595561 pgd = ecd80e00 *pgd=00000000 Internal error: Oops: 205 [#1] PREEMPT SMP ARM ... CPU: 0 PID: 930 Comm: v4l2-compliance Not tainted \ 4.14.62-01715-gc8cd67f49a19 #1 Hardware name: Generic DRA72X (Flattened Device Tree)
task: ece44d80 task.stack: ecc6e000
PC is at __vpe_try_fmt+0x18c/0x2a8 [ti_vpe]
LR is at 0x8
Because the driver fails to properly check the 'num_planes' values for proper ranges it ends up accessing out of bound data causing the kernel panic.
Since this driver only handle single or dual plane pixel format, make sure the provided value does not exceed 2 planes.
--- drivers/media/platform/ti-vpe/vpe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/ti-vpe/vpe.c +1 -1
@@ -1629,7 +1629,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f, &pix->height,MIN_H ,MAX_H ,H_ALIGN , S_ALIGN); -if (!pix->num_planes) +if (!pix->num_planes || pix->num_planes >2 ) pix->num_planes = fmt->coplanar ?2 :1 ;else if (pix->num_planes >1 && !fmt->coplanar) pix->num_planes =1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 94/350 media: ti-vpe: vpe: ensure buffers are cleaned up properly in abort cases
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit cf6acb73b050e98b5cc435fae0e8ae0157520410 ]
v4l2-compliance fails with this message:
fail: v4l2-test-buffers.cpp(691): ret == 0
fail: v4l2-test-buffers.cpp(974): captureBufs(node, q, m2m_q,frame_count, true)
test MMAP: FAIL
This caused the following Kernel Warning:
WARNING: CPU: 0 PID: 961 at drivers/media/v4l2-core/videobuf2-core.c:1658 __vb2_queue_cancel+0x174/0x1d8 ... CPU: 0 PID: 961 Comm: v4l2-compliance Not tainted 4.14.62-01720-g20ecd717e87a #6 Hardware name: Generic DRA72X (Flattened Device Tree) Backtrace: [<c020b5bc>] (dump_backtrace) from [<c020b8a0>] (show_stack+0x18/0x1c) r7:00000009 r6:60070013 r5:00000000 r4:c1053824 [<c020b888>] (show_stack) from [<c09232e8>] (dump_stack+0x90/0xa4) [<c0923258>] (dump_stack) from [<c022b740>] (__warn+0xec/0x104) r7:00000009 r6:c0c0ad50 r5:00000000 r4:00000000 [<c022b654>] (__warn) from [<c022b810>] (warn_slowpath_null+0x28/0x30) r9:00000008 r8:00000000 r7:eced4808 r6:edbc9bac r5:eced4844
r4:eced4808
[<c022b7e8>] (warn_slowpath_null) from [<c0726f48>] (__vb2_queue_cancel+0x174/0x1d8)
[<c0726dd4>] (__vb2_queue_cancel) from [<c0727648>] (vb2_core_queue_release+0x20/0x40)
r10:ecc7bd70 r9:00000008 r8:00000000 r7:edb73010 r6:edbc9bac
r5:eced4844
r4:eced4808 r3:00000004
[<c0727628>] (vb2_core_queue_release) from [<c0729528>] (vb2_queue_release+0x10/0x14)
r5:edbc9810 r4:eced4800
[<c0729518>] (vb2_queue_release) from [<c0724d08>] (v4l2_m2m_ctx_release+0x1c/0x30)
[<c0724cec>] (v4l2_m2m_ctx_release) from [<bf0e8f28>] (vpe_release+0x74/0xb0 [ti_vpe])
r5:edbc9810 r4:ed67a400
[<bf0e8eb4>] (vpe_release [ti_vpe]) from [<c070fccc>] (v4l2_release+0x3c/0x80)
r7:edb73010 r6:ed176aa0 r5:edbc9868 r4:ed5119c0
[<c070fc90>] (v4l2_release) from [<c033cf1c>] (__fput+0x8c/0x1dc)
r5:ecc7bd70 r4:ed5119c0
[<c033ce90>] (__fput) from [<c033d0cc>] (____fput+0x10/0x14)
r10:00000000 r9:ed5119c0 r8:ece392d0 r7:c1059544 r6:ece38d80
r5:ece392b4
r4:00000000
[<c033d0bc>] (____fput) from [<c0246e00>] (task_work_run+0x98/0xb8) [<c0246d68>] (task_work_run) from [<c022f1d8>] (do_exit+0x170/0xa80)
r9:ece351fc r8:00000000 r7:ecde3f58 r6:ffffe000 r5:ece351c0
r4:ece38d80
[<c022f068>] (do_exit) from [<c022fb6c>] (do_group_exit+0x48/0xc4)
r7:000000f8
[<c022fb24>] (do_group_exit) from [<c022fc00>] (__wake_up_parent+0x0/0x28)
r7:000000f8 r6:b6c6a798 r5:00000001 r4:00000001
[<c022fbe8>] (SyS_exit_group) from [<c0207c80>] (ret_fast_syscall+0x0/0x4c)
These warnings are caused by buffers which not properly cleaned up/release during an abort use case.
In the abort cases the VPDMA desc buffers would still be mapped and the in-flight VB2 buffers would not be released properly causing a kernel warning from being generated by the videobuf2-core level.
--- drivers/media/platform/ti-vpe/vpe.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/media/platform/ti-vpe/vpe.c +9 -3
@@ -1404,9 +1404,6 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)/* the previous dst mv buffer becomes the next src mv buffer */ ctx->src_mv_buf_selector = !ctx->src_mv_buf_selector; -if (ctx->aborting) - goto finished; - s_vb = ctx->src_vbs[0 ]; d_vb = ctx->dst_vb;
@@ -1471,6 +1468,9 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data) ctx->src_vbs[0 ] =NULL ; ctx->dst_vb =NULL ; +if (ctx->aborting) + goto finished; + ctx->bufs_completed++;if (ctx->bufs_completed < ctx->bufs_per_job &&job_ready (ctx)) {device_run (ctx);
@@ -2366,6 +2366,12 @@ static int vpe_release(struct file *file)mutex_lock (&dev->dev_mutex);free_mv_buffers (ctx); + +vpdma_unmap_desc_buf (dev->vpdma, &ctx->desc_list.buf); +vpdma_unmap_desc_buf (dev->vpdma, &ctx->mmr_adb); +vpdma_unmap_desc_buf (dev->vpdma, &ctx->sc_coeff_h); +vpdma_unmap_desc_buf (dev->vpdma, &ctx->sc_coeff_v); +vpdma_free_desc_list (&ctx->desc_list);vpdma_free_desc_buf (&ctx->mmr_adb);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 95/350 drm/amd/display: Properly round nominal frequency for SPD
In reply to Sasha LevinFrom: Aric Cyr <[email protected]>
[ Upstream commit c59802313e84bede954235b3a5dd0dd5325f49c5 ]
[Why]
Some displays rely on the SPD verticle frequency maximum value. Must round the calculated refresh rate to the nearest integer.
[How]
Round the nominal calculated refresh rate to the nearest whole integer.
--- .../gpu/drm/amd/display/modules/freesync/freesync.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +8 -5
@@ -743,6 +743,10 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, nominal_field_rate_in_uhz =mod_freesync_calc_nominal_field_rate (stream); +/* Rounded to the nearest Hz */ + nominal_field_rate_in_uhz =1000000ULL * +div_u64 (nominal_field_rate_in_uhz +500000 ,1000000 ); + min_refresh_in_uhz = in_config->min_refresh_in_uhz; max_refresh_in_uhz = in_config->max_refresh_in_uhz;
@@ -996,14 +1000,13 @@ unsigned long long mod_freesync_calc_nominal_field_rate( const struct dc_stream_state *stream) {unsigned long long nominal_field_rate_in_uhz =0 ; +unsigned int total = stream->timing.h_total * stream->timing.v_total; -/* Calculate nominal field rate for stream */ +/* Calculate nominal field rate for stream, rounded up to nearest integer */ nominal_field_rate_in_uhz = stream->timing.pix_clk_100hz /10 ; nominal_field_rate_in_uhz *=1000ULL *1000ULL *1000ULL ; - nominal_field_rate_in_uhz =div_u64 (nominal_field_rate_in_uhz, - stream->timing.h_total); - nominal_field_rate_in_uhz =div_u64 (nominal_field_rate_in_uhz, - stream->timing.v_total); + + nominal_field_rate_in_uhz =div_u64 (nominal_field_rate_in_uhz, total);return nominal_field_rate_in_uhz; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 96/350 drm/amd/display: wait for set pipe mcp command completion
In reply to Sasha LevinFrom: Josip Pavic <[email protected]>
[ Upstream commit 15caeabc5787c15babad7ee444afe9c26df1c8b3 ]
[Why]
When the driver sends a pipe set command to the DMCU FW, it does not wait for the command to complete. This can lead to unpredictable behavior if, for example, the driver were to request a pipe disable to the FW via MCP, then power down some hardware before the firmware has completed processing the command.
[How]
Wait for the DMCU FW to finish processing set pipe commands
--- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dce/dce_abm.c +3 -0
@@ -77,6 +77,9 @@ static bool dce_abm_set_pipe(struct abm *abm, uint32_t controller_id)/* notifyDMCUMsg */ REG_UPDATE (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,1 ); +REG_WAIT (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,0 , +1 ,80000 ); +return true; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 97/350 media: ti-vpe: vpe: fix a v4l2-compliance failure about invalid sizeimage
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit 0bac73adea4df8d34048b38f6ff24dc3e73e90b6 ]
v4l2-compliance fails with this message:
fail: v4l2-test-formats.cpp(463): !pfmt.sizeimage
fail: v4l2-test-formats.cpp(736): \ Video Capture Multiplanar is valid, \ but TRY_FMT failed to return a format
test VIDIOC_TRY_FMT: FAIL
This failure is causd by the driver failing to handle out range 'bytesperline' values from user space applications.
VPDMA hardware is limited to 64k line stride (16 bytes aligned, so 65520 bytes). So make sure the provided or calculated 'bytesperline' is smaller than the maximum value.
--- drivers/media/platform/ti-vpe/vpdma.h | 1 + drivers/media/platform/ti-vpe/vpe.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/media/platform/ti-vpe/vpdma.h +1 -0
@@ -57,6 +57,7 @@ struct vpdma_data_format {* line stride of source and dest * buffers should be 16 byte aligned */ +#define VPDMA_MAX_STRIDE 65520/* Max line stride 16 byte aligned */ #define VPDMA_DTD_DESC_SIZE 32/* 8 words */ #define VPDMA_CFD_CTD_DESC_SIZE 16/* 4 words */
drivers/media/platform/ti-vpe/vpe.c +4 -0
@@ -1668,6 +1668,10 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,if (stride > plane_fmt->bytesperline) plane_fmt->bytesperline = stride; + plane_fmt->bytesperline =clamp_t (u32, plane_fmt->bytesperline, + stride, +VPDMA_MAX_STRIDE ); + plane_fmt->bytesperline =ALIGN (plane_fmt->bytesperline,VPDMA_STRIDE_ALIGN );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 98/350 drm/amd/display: add new active dongle to existent w/a
In reply to Sasha LevinFrom: Vitaly Prosyak <[email protected]>
[ Upstream commit 566b4252fe9da9582dde008c5e9c3eb7c136e348 ]
[Why & How]
Dongle 0x00E04C power down all internal circuits including AUX communication preventing reading DPCD table. Encoder will skip DP RX power down on disable output to keep receiver powered all the time.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1 + drivers/gpu/drm/amd/display/include/ddc_service_types.h | 2 ++ 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -0
@@ -2691,6 +2691,7 @@ static void dp_wa_power_up_0010FA(struct dc_link *link, uint8_t *dpcd_data,* keep receiver powered all the time.*/ case DP_BRANCH_DEVICE_ID_0010FA :case DP_BRANCH_DEVICE_ID_0080E1 : +case DP_BRANCH_DEVICE_ID_00E04C : link->wa_flags.dp_keep_receiver_powered = true;break ;
drivers/gpu/drm/amd/display/include/ddc_service_types.h +2 -0
@@ -31,6 +31,8 @@#define DP_BRANCH_DEVICE_ID_0022B9 0x0022B9#define DP_BRANCH_DEVICE_ID_00001A 0x00001A#define DP_BRANCH_DEVICE_ID_0080E1 0x0080e1 +#define DP_BRANCH_DEVICE_ID_90CC24 0x90CC24 +#define DP_BRANCH_DEVICE_ID_00E04C 0x00E04Cenum ddc_result {DDC_RESULT_UNKNOWN =0 ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 99/350 syscalls/x86: Use the correct function type in SYSCALL_DEFINE0
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 8661d769ab77c675b5eb6c3351a372b9fbc1bf40 ]
Although a syscall defined using SYSCALL_DEFINE0 doesn't accept parameters, use the correct function type to avoid type mismatches with Control-Flow Integrity (CFI) checking.
--- arch/x86/include/asm/syscall_wrapper.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +12 -11
@@ -48,12 +48,13 @@* To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias * named __ia32_sys_*() */ -#define SYSCALL_DEFINE0 (sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname); \ - asmlinkage long __x64_sys_##sname(void) + +#define SYSCALL_DEFINE0 (sname) \ + SYSCALL_METADATA(_##sname, 0); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ + ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ + SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused)#define COND_SYSCALL (name) \ cond_syscall(__x64_sys_##name); \
@@ -181,11 +182,11 @@* macros to work correctly. */ #ifndef SYSCALL_DEFINE0 -#define SYSCALL_DEFINE0 (sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - asmlinkage long __x64_sys_##sname(void) +#define SYSCALL_DEFINE0 (sname) \ + SYSCALL_METADATA(_##sname, 0); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ + ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused)#endif #ifndef COND_SYSCALL
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 100/350 drm/amd/display: Fix dongle_caps containing stale information.
In reply to Sasha LevinFrom: David Galiffi <[email protected]>
[ Upstream commit dd998291dbe92106d8c4a7581c409b356928d711 ]
[WHY]
During detection:
function: get_active_converter_info populates link->dpcd_caps.dongle_caps only when dpcd_rev >= DPCD_REV_11 and DWN_STRM_PORTX_TYPE is DOWN_STREAM_DETAILED_HDMI or DOWN_STREAM_DETAILED_DP_PLUS_PLUS. Otherwise, it is not cleared, and stale information remains.
During mode validation:
function: dp_active_dongle_validate_timing reads link->dpcd_caps.dongle_caps->dongle_type to determine the maximum pixel clock to support. This information is now stale and no longer valid.
[HOW]dp_active_dongle_validate_timing should be usinglink->dpcd_caps->dongle_type instead.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -2219,7 +2219,7 @@ static bool dp_active_dongle_validate_timing(break ; } -if (dongle_caps->dongle_type !=DISPLAY_DONGLE_DP_HDMI_CONVERTER || +if (dpcd_caps->dongle_type !=DISPLAY_DONGLE_DP_HDMI_CONVERTER || dongle_caps->extendedCapValid == false)return true;
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -0
@@ -2545,6 +2545,7 @@ static void get_active_converter_info( uint8_t data, struct dc_link *link) { union dp_downstream_port_present ds_port = { .byte = data }; +memset (&link->dpcd_caps.dongle_caps,0 ,sizeof (link->dpcd_caps.dongle_caps));/* decode converter info*/ if (!ds_port.fields.PORT_PRESENT) {
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 101/350 extcon: sm5502: Reset registers during initialization
In reply to Sasha LevinFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 6942635032cfd3e003e980d2dfa4e6323a3ce145 ]
On some devices (e.g. Samsung Galaxy A5 (2015)), the bootloader seems to keep interrupts enabled for SM5502 when booting Linux. Changing the cable state (i.e. plugging in a cable) - until the driver is loaded - will therefore produce an interrupt that is never read.
In this situation, the cable state will be stuck forever on the initial state because SM5502 stops sending interrupts. This can be avoided by clearing those pending interrupts after the driver has been loaded.
One way to do this is to reset all registers to default state by writing to SM5502_REG_RESET. This ensures that we start from a clean state, with all interrupts disabled.
--- drivers/extcon/extcon-sm5502.c | 4 ++++ drivers/extcon/extcon-sm5502.h | 2 ++ 2 files changed, 6 insertions(+)
drivers/extcon/extcon-sm5502.c +4 -0
@@ -65,6 +65,10 @@ struct sm5502_muic_info {/* Default value of SM5502 register to bring up MUIC device. */ static struct reg_data sm5502_reg_data[] = { { + .reg =SM5502_REG_RESET , + .val =SM5502_REG_RESET_MASK , + .invert = true, + }, { .reg =SM5502_REG_CONTROL , .val =SM5502_REG_CONTROL_MASK_INT_MASK , .invert = false,
drivers/extcon/extcon-sm5502.h +2 -0
@@ -237,6 +237,8 @@ enum sm5502_reg {#define DM_DP_SWITCH_UART ((DM_DP_CON_SWITCH_UART <<SM5502_REG_MANUAL_SW1_DP_SHIFT) \ | (DM_DP_CON_SWITCH_UART <<SM5502_REG_MANUAL_SW1_DM_SHIFT)) +#define SM5502_REG_RESET_MASK (0x1) +/* SM5502 Interrupts */ enum sm5502_irq {/* INT1 */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 102/350 drm/amd/display: Program DWB watermarks from correct state
In reply to Sasha LevinFrom: Julian Parkin <[email protected]>
[ Upstream commit edb922b022c0c94805c4ffad202b3edff83d76f0 ]
[Why]
When diags adds a DWB via a stream update, we calculate MMHUBBUB paramaters, but dc->current_state has not yet been updated when the DWB programming happens. This leads to overflow on high bandwidth tests since the incorrect MMHUBBUB arbitration parameters are programmed.
[How]
Pass the updated context down to the (enable|update)_writeback functions so that they can use the correct watermarks when programming MMHUBBUB.
--- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 5 +++-- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +2 -2
@@ -423,10 +423,10 @@ bool dc_stream_add_writeback(struct dc *dc,if (dwb->funcs->is_enabled (dwb)) {/* writeback pipe already enabled, only need to update */ - dc->hwss.update_writeback (dc, stream_status, wb_info); + dc->hwss.update_writeback (dc, stream_status, wb_info, dc->current_state); }else {/* Enable writeback pipe from scratch*/ - dc->hwss.enable_writeback (dc, stream_status, wb_info); + dc->hwss.enable_writeback (dc, stream_status, wb_info, dc->current_state); } }
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +3 -2
@@ -1337,7 +1337,8 @@ bool dcn20_update_bandwidth(static void dcn20_enable_writeback (struct dc *dc,const struct dc_stream_status *stream_status, -struct dc_writeback_info *wb_info) +struct dc_writeback_info *wb_info, +struct dc_state *context) {struct dwbc *dwb;struct mcif_wb *mcif_wb;
@@ -1354,7 +1355,7 @@ static void dcn20_enable_writeback( optc->funcs->set_dwb_source (optc, wb_info->dwb_pipe_inst);/* set MCIF_WB buffer and arbitration configuration */ mcif_wb->funcs->config_mcif_buf (mcif_wb, &wb_info->mcif_buf_params, wb_info->dwb_params.dest_height); - mcif_wb->funcs->config_mcif_arb (mcif_wb, &dc->current_state->bw_ctx.bw.dcn.bw_writeback.mcif_wb_arb[wb_info->dwb_pipe_inst]); + mcif_wb->funcs->config_mcif_arb (mcif_wb, &context->bw_ctx.bw.dcn.bw_writeback.mcif_wb_arb[wb_info->dwb_pipe_inst]);/* Enable MCIF_WB */ mcif_wb->funcs->enable_mcif (mcif_wb);/* Enable DWB */
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +4 -2
@@ -321,10 +321,12 @@ struct hw_sequencer_funcs { struct dc_state *context);void (*update_writeback)(struct dc *dc,const struct dc_stream_status *stream_status, -struct dc_writeback_info *wb_info); +struct dc_writeback_info *wb_info, +struct dc_state *context);void (*enable_writeback)(struct dc *dc,const struct dc_stream_status *stream_status, -struct dc_writeback_info *wb_info); +struct dc_writeback_info *wb_info, +struct dc_state *context);void (*disable_writeback)(struct dc *dc,unsigned int dwb_pipe_inst);#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 103/350 syscalls/x86: Use COMPAT_SYSCALL_DEFINE0 for IA32 (rt_)sigreturn
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 00198a6eaf66609de5e4de9163bb42c7ca9dd7b7 ]
Use COMPAT_SYSCALL_DEFINE0 to define (rt_)sigreturn() syscalls to replace sys32_sigreturn() and sys32_rt_sigreturn(). This fixes indirect call mismatches with Control-Flow Integrity (CFI) checking.
--- arch/x86/entry/syscalls/syscall_32.tbl | 4 ++-- arch/x86/ia32/ia32_signal.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
arch/x86/entry/syscalls/syscall_32.tbl +2 -2
@@ -130,7 +130,7 @@ 116 i386 sysinfo sys_sysinfo __ia32_compat_sys_sysinfo 117 i386 ipc sys_ipc __ia32_compat_sys_ipc 118 i386 fsync sys_fsync __ia32_sys_fsync -119 i386 sigreturn sys_sigreturn sys32_sigreturn +119 i386 sigreturn sys_sigreturn __ia32_compat_sys_sigreturn 120 i386 clone sys_clone __ia32_compat_sys_x86_clone 121 i386 setdomainname sys_setdomainname __ia32_sys_setdomainname 122 i386 uname sys_newuname __ia32_sys_newuname
@@ -184,7 +184,7 @@ 170 i386 setresgid sys_setresgid16 __ia32_sys_setresgid16 171 i386 getresgid sys_getresgid16 __ia32_sys_getresgid16 172 i386 prctl sys_prctl __ia32_sys_prctl -173 i386 rt_sigreturn sys_rt_sigreturn sys32_rt_sigreturn +173 i386 rt_sigreturn sys_rt_sigreturn __ia32_compat_sys_rt_sigreturn 174 i386 rt_sigaction sys_rt_sigaction __ia32_compat_sys_rt_sigaction 175 i386 rt_sigprocmask sys_rt_sigprocmask __ia32_compat_sys_rt_sigprocmask 176 i386 rt_sigpending sys_rt_sigpending __ia32_compat_sys_rt_sigpending
arch/x86/ia32/ia32_signal.c +3 -2
@@ -21,6 +21,7 @@#include <linux/personality.h> #include <linux/compat.h> #include <linux/binfmts.h> +#include <linux/syscalls.h> #include <asm/ucontext.h> #include <linux/uaccess.h> #include <asm/fpu/internal.h>
@@ -118,7 +119,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,return err; } -asmlinkage long sys32_sigreturn (void ) +COMPAT_SYSCALL_DEFINE0 (sigreturn) {struct pt_regs *regs =current_pt_regs ();struct sigframe_ia32 __user *frame = (struct sigframe_ia32 __user *)(regs->sp-8 );
@@ -144,7 +145,7 @@ asmlinkage long sys32_sigreturn(void)return 0 ; } -asmlinkage long sys32_rt_sigreturn (void ) +COMPAT_SYSCALL_DEFINE0 (rt_sigreturn) {struct pt_regs *regs =current_pt_regs ();struct rt_sigframe_ia32 __user *frame;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 104/350 x86/mm: Use the correct function type for native_set_fixmap()
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit f53e2cd0b8ab7d9e390414470bdbd830f660133f ]
We call native_set_fixmap indirectly through the function pointer struct pv_mmu_ops::set_fixmap, which expects the first parameter to be 'unsigned' instead of 'enum fixed_addresses'. This patch changes the function type for native_set_fixmap to match the pointer, which fixes indirect call mismatches with Control-Flow Integrity (CFI) checking.
--- arch/x86/include/asm/fixmap.h | 2 +- arch/x86/mm/pgtable.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/fixmap.h +1 -1
@@ -156,7 +156,7 @@ extern pte_t *kmap_pte;extern pte_t *pkmap_page_table;void __native_set_fixmap (enum fixed_addresses idx,pte_t pte); -void native_set_fixmap (enum fixed_addresses idx, +void native_set_fixmap (unsigned /* enum fixed_addresses */ idx,phys_addr_t phys,pgprot_t flags);#ifndef CONFIG_PARAVIRT_XXL
arch/x86/mm/pgtable.c +2 -2
@@ -643,8 +643,8 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte) fixmaps_set++; } -void native_set_fixmap (enum fixed_addresses idx,phys_addr_t phys, -pgprot_t flags) +void native_set_fixmap (unsigned /* enum fixed_addresses */ idx, +phys_addr_t phys,pgprot_t flags) {/* Sanitize 'prot' against any unsupported bits: */ pgprot_val (flags) &= __default_kernel_pte_mask;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 105/350 iio: chemical: atlas-ph-sensor: fix iio_triggered_buffer_predisable() position
In reply to Sasha LevinFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit 0c8a6e72f3c04bfe92a64e5e0791bfe006aabe08 ]
The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
The iio_triggered_buffer_predisable() should be called last, to detach the poll func after the devices has been suspended.
The position of iio_triggered_buffer_postenable() is correct.
Note this is not stable material. It's a fix in the logical model rather fixing an actual bug. These are being tidied up throughout the subsystem to allow more substantial rework that was blocked by variations in how things were done.
--- drivers/iio/chemical/atlas-ph-sensor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/chemical/atlas-ph-sensor.c +4 -4
@@ -323,16 +323,16 @@ static int atlas_buffer_predisable(struct iio_dev *indio_dev)struct atlas_data *data =iio_priv (indio_dev);int ret; - ret =iio_triggered_buffer_predisable (indio_dev); + ret =atlas_set_interrupt (data, false);if (ret)return ret; - ret =atlas_set_interrupt (data, false); +pm_runtime_mark_last_busy (&data->client->dev); + ret =pm_runtime_put_autosuspend (&data->client->dev);if (ret)return ret; -pm_runtime_mark_last_busy (&data->client->dev); -return pm_runtime_put_autosuspend (&data->client->dev); +return iio_triggered_buffer_predisable (indio_dev); }static const struct iio_trigger_ops atlas_interrupt_trigger_ops = {
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 105/350] iio: chemical: atlas-ph-sensor: fix iio_triggered_buffer_predisable() position
Quoted 10 lines · On Tue, 10 Dec 2019 16:03:30 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
0c8a6e72f3c04bfe92a64e5e0791bfe006aabe08]The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
The
iio_triggered_buffer_predisable()should be called last, to detach the poll func after the devices has been suspended.
Quoted 6 lines
The position of
iio_triggered_buffer_postenable()is correct.Note this is not stable material. It's a fix in the logical model rather fixing an actual bug. These are being tidied up throughout the subsystem to allow more substantial rework that was blocked by variations in how things were done.
See comment. This is not what I would consider stable material.
Quoted 34 lines
Signed-off-by Alexandru Ardelean <[email protected]>Acked-by Matt Ranostay <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/iio/chemical/atlas-ph-sensor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/iio/chemical/atlas-ph-sensor.c +4
-4@@ -323,16 +323,16 @@ static int atlas_buffer_predisable(struct iio_dev *indio_dev)struct atlas_data *data =iio_priv (indio_dev);int ret; - ret =iio_triggered_buffer_predisable (indio_dev); + ret =atlas_set_interrupt (data, false);if (ret)return ret; - ret =atlas_set_interrupt (data, false); +pm_runtime_mark_last_busy (&data->client->dev); + ret =pm_runtime_put_autosuspend (&data->client->dev);if (ret)return ret; -pm_runtime_mark_last_busy (&data->client->dev); -return pm_runtime_put_autosuspend (&data->client->dev); +return iio_triggered_buffer_predisable (indio_dev); }static const struct iio_trigger_ops atlas_interrupt_trigger_ops = {
Re: [PATCH AUTOSEL 5.4 105/350] iio: chemical: atlas-ph-sensor: fix iio_triggered_buffer_predisable() position
Quoted 14 lines · Jonathan Cameron
Quoted 10 lines · On Tue, 10 Dec 2019 16:03:30 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
0c8a6e72f3c04bfe92a64e5e0791bfe006aabe08]The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
The
iio_triggered_buffer_predisable()should be called last, to detach the poll func after the devices has been suspended.
Quoted 9 lines
Quoted 6 lines
The position of
iio_triggered_buffer_postenable()is correct.Note this is not stable material. It's a fix in the logical model rather fixing an actual bug. These are being tidied up throughout the subsystem to allow more substantial rework that was blocked by variations in how things were done.
See comment. This is not what I would consider stable material.
Outside of the comment, which really isn't probably enough to avoid the autoselection script from detecting it (could be "stable" in the message alone selects it :) ),
is there any way to signal that a patch is "NOT for stable trees"? Probably don't want to clutter up the commit messages of course.
- Matt
Quoted 35 lines
Quoted 34 lines
Signed-off-by Alexandru Ardelean <[email protected]>Acked-by Matt Ranostay <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/iio/chemical/atlas-ph-sensor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/iio/chemical/atlas-ph-sensor.c +4
-4@@ -323,16 +323,16 @@ static int atlas_buffer_predisable(struct iio_dev *indio_dev)struct atlas_data *data =iio_priv (indio_dev);int ret; - ret =iio_triggered_buffer_predisable (indio_dev); + ret =atlas_set_interrupt (data, false);if (ret)return ret; - ret =atlas_set_interrupt (data, false); +pm_runtime_mark_last_busy (&data->client->dev); + ret =pm_runtime_put_autosuspend (&data->client->dev);if (ret)return ret; -pm_runtime_mark_last_busy (&data->client->dev); -return pm_runtime_put_autosuspend (&data->client->dev); +return iio_triggered_buffer_predisable (indio_dev); }static const struct iio_trigger_ops atlas_interrupt_trigger_ops = {
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.4 105/350] iio: chemical: atlas-ph-sensor: fix iio_triggered_buffer_predisable() position
Quoted 23 lines · Matt Ranostay
Quoted 21 lines · Jonathan Cameron
Quoted 16 lines · On Tue, 10 Dec 2019 16:03:30 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
0c8a6e72f3c04bfe92a64e5e0791bfe006aabe08]The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
The
iio_triggered_buffer_predisable()should be called last, to detach the poll func after the devices has been suspended.The position of
iio_triggered_buffer_postenable()is correct.Note this is not stable material. It's a fix in the logical model rather fixing an actual bug. These are being tidied up throughout the subsystem to allow more substantial rework that was blocked by variations in how things were done.
Quoted 8 lines
Quoted 2 lines
See comment. This is not what I would consider stable material.
Outside of the comment, which really isn't probably enough to avoid the autoselection script from detecting it (could be "stable" in the message alone selects it :) ),
is there any way to signal that a patch is "NOT for stable trees"? Probably don't want to clutter up the commit messages of course.
That commit message should have been enough, I'll add some more filtering to catch instances like that.
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 106/350 ath10k: Correct error handling of dma_map_single()
In reply to Sasha LevinFrom: Bjorn Andersson <[email protected]>
[ Upstream commit d43810b2c1808ac865aa1a2a2c291644bf95345c ]
The return value of dma_map_single() should be checked for errors using dma_mapping_error() and the skb has been dequeued so it needs to be freed.
This was found when enabling CONFIG_DMA_API_DEBUG and it warned about the missing dma_mapping_error() call.
--- drivers/net/wireless/ath/ath10k/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/mac.c +3 -1
@@ -3903,8 +3903,10 @@ void ath10k_mgmt_over_wmi_tx_work(struct work_struct *work) ar->running_fw->fw_file.fw_features)) { paddr =dma_map_single (ar->dev, skb->data, skb->len,DMA_TO_DEVICE ); -if (!paddr) +if (dma_mapping_error (ar->dev, paddr)) { +ieee80211_free_txskb (ar->hw, skb);continue ; + } ret =ath10k_wmi_mgmt_tx_send (ar, skb, paddr);if (ret) { ath10k_warn(ar, "failed to transmit management frame by ref via WMI: %d\n",
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 107/350 rtw88: coex: Set 4 slot mode for A2DP
In reply to Sasha LevinFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit 12078aae453556a88fb46777b7cc5fc97f867b7c ]
With shallow buffer size, certain BT devices have active A2DP flow control to fill buffer frequently. If the slot is not at BT side, data can't be sent successfully to BT devices, and will cause audio glitch.
To resolve this issue, this commit splits TUs into 4-slots instead of 2-slot for all of the A2DP related coexistence strategies. That makes BT have higher opportunity to fill the A2DP buffer in time, and the audio quality could be more stable and smooth.
--- drivers/net/wireless/realtek/rtw88/coex.c | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
drivers/net/wireless/realtek/rtw88/coex.c +15 -9
@@ -1308,6 +1308,7 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev)struct rtw_chip_info *chip = rtwdev->chip;bool wl_hi_pri = false;u8 table_case, tdma_case; +u32 slot_type =0 ;if (coex_stat->wl_linkscan_proc || coex_stat->wl_hi_pri_task1 || coex_stat->wl_hi_pri_task2)
@@ -1318,14 +1319,16 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev)if (wl_hi_pri) { table_case =15 ;if (coex_stat->bt_a2dp_exist && - !coex_stat->bt_pan_exist) + !coex_stat->bt_pan_exist) { + slot_type =TDMA_4SLOT ; tdma_case =11 ; -else if (coex_stat->wl_hi_pri_task1) + }else if (coex_stat->wl_hi_pri_task1) { tdma_case =6 ; -else if (!coex_stat->bt_page) + }else if (!coex_stat->bt_page) { tdma_case =8 ; -else + }else { tdma_case =9 ; + } }else if (coex_stat->wl_connected) { table_case =10 ; tdma_case =10 ;
@@ -1361,7 +1364,7 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev)rtw_coex_set_ant_path (rtwdev, false,COEX_SET_ANT_2G );rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_rx[0 ]);rtw_coex_table (rtwdev, table_case); -rtw_coex_tdma (rtwdev, false, tdma_case); +rtw_coex_tdma (rtwdev, false, tdma_case | slot_type); }static void rtw_coex_action_bt_hfp (struct rtw_dev *rtwdev)
@@ -1475,13 +1478,13 @@ static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev)if (efuse->share_ant) {/* Shared-Ant */ + slot_type =TDMA_4SLOT ; +if (coex_stat->wl_gl_busy && coex_stat->wl_noisy_level ==0 ) table_case =10 ;else table_case =9 ; - slot_type =TDMA_4SLOT ; -if (coex_stat->wl_gl_busy) tdma_case =13 ;else
@@ -1585,13 +1588,14 @@ static void rtw_coex_action_bt_a2dp_hid(struct rtw_dev *rtwdev)if (efuse->share_ant) {/* Shared-Ant */ + slot_type =TDMA_4SLOT ; +if (coex_stat->bt_ble_exist) table_case =26 ;else table_case =9 ;if (coex_stat->wl_gl_busy) { - slot_type =TDMA_4SLOT ; tdma_case =13 ; }else { tdma_case =14 ;
@@ -1794,10 +1798,12 @@ static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev)struct rtw_efuse *efuse = &rtwdev->efuse;struct rtw_chip_info *chip = rtwdev->chip;u8 table_case, tdma_case; +u32 slot_type =0 ;if (efuse->share_ant) {/* Shared-Ant */ if (coex_stat->bt_a2dp_exist) { + slot_type =TDMA_4SLOT ; table_case =9 ; tdma_case =11 ; }else {
@@ -1818,7 +1824,7 @@ static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev)rtw_coex_set_ant_path (rtwdev, true,COEX_SET_ANT_2G );rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_rx[0 ]);rtw_coex_table (rtwdev, table_case); -rtw_coex_tdma (rtwdev, false, tdma_case); +rtw_coex_tdma (rtwdev, false, tdma_case | slot_type); }static void rtw_coex_action_wl_not_connected (struct rtw_dev *rtwdev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 108/350 drm/bridge: dw-hdmi: Restore audio when setting a mode
In reply to Sasha LevinFrom: Daniel Kurtz <[email protected]>
[ Upstream commit fadfee3f9d8f114435a8a3e9f83a227600d89de7 ]
When setting a new display mode, dw_hdmi_setup() calls dw_hdmi_enable_video_path(), which disables all hdmi clocks, including the audio clock.
We should only (re-)enable the audio clock if audio was already enabled when setting the new mode.
Without this patch, on RK3288, there will be HDMI audio on some monitors if i2s was played to headphone when the monitor was plugged. ACER H277HU and ASUS PB278 are two of the monitors showing this issue.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1 -1
@@ -2033,7 +2033,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)/* HDMI Initialization Step E - Configure audio */ hdmi_clk_regenerator_update_pixel_clock (hdmi); -hdmi_enable_audio_clk (hdmi, true); +hdmi_enable_audio_clk (hdmi, hdmi->audio_enable); }/* not for DVI mode */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 109/350 perf test: Report failure for mmap events
In reply to Sasha LevinFrom: Leo Yan <[email protected]>
[ Upstream commit 6add129c5d9210ada25217abc130df0b7096ee02 ]
When fail to mmap events in task exit case, it misses to set 'err' to -1; thus the testing will not report failure for it.
This patch sets 'err' to -1 when fails to mmap events, thus Perf tool can report correct result.
--- tools/perf/tests/task-exit.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/tests/task-exit.c +1 -0
@@ -110,6 +110,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unusedif (evlist__mmap (evlist,128 ) <0 ) {pr_debug ("failed to mmap events: %d (%s)\n" , errno,str_error_r (errno, sbuf,sizeof (sbuf))); + err =-1 ; goto out_delete_evlist; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 110/350 perf report: Add warning when libunwind not compiled in
In reply to Sasha LevinFrom: Jin Yao <[email protected]>
[ Upstream commit 800d3f561659b5436f8c57e7c26dd1f6928b5615 ]
We received a user report that call-graph DWARF mode was enabled in 'perf record' but 'perf report' didn't unwind the callstack correctly. The reason was, libunwind was not compiled in.
We can use 'perf -vv' to check the compiled libraries but it would be valuable to report a warning to user directly (especially valuable for a perf newbie).
The warning is:
Warning:
Please install libunwind development packages during the perf build.
Both TUI and stdio are supported.
--- tools/perf/builtin-report.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/builtin-report.c +7 -0
@@ -399,6 +399,13 @@ static int report__setup_sample_type(struct report *rep) PERF_SAMPLE_BRANCH_ANY)) rep->nonany_branch_mode = true; +#ifndef HAVE_LIBUNWIND_SUPPORT +if (dwarf_callchain_users) { +ui__warning ("Please install libunwind development packages " +"during the perf build.\n" ); + } +#endif +return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 111/350 perf test: Avoid infinite loop for task exit case
In reply to Sasha LevinFrom: Leo Yan <[email protected]>
[ Upstream commit 791ce9c48c79210d2ffcdbe69421e7783b32921f ]
When executing the task exit testing case, perf gets stuck in an endless loop this case and doesn't return back on Arm64 Juno board.
After digging into this issue, since Juno board has Arm's big.LITTLE CPUs, thus the PMUs are not compatible between the big CPUs and little CPUs. This leads to a PMU event that cannot be enabled properly when the traced task is migrated from one variant's CPU to another variant. Finally, the test case runs into infinite loop for cannot read out any event data after return from polling.
Eventually, we need to work out formal solution to allow PMU events can be freely migrated from one CPU variant to another, but this is a difficult task and a different topic. This patch tries to fix the Perf test case to avoid infinite loop, when the testing detects 1000 times retrying for reading empty events, it will directly bail out and return failure. This allows the Perf tool can continue its other test cases.
--- tools/perf/tests/task-exit.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/tests/task-exit.c +8 -0
@@ -53,6 +53,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unusedstruct perf_cpu_map *cpus;struct perf_thread_map *threads;struct mmap *md; +int retry_count =0 ;signal (SIGCHLD , sig_handler);
@@ -132,6 +133,13 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused out_init:if (!exited || !nr_exit) {evlist__poll (evlist,-1 ); + +if (retry_count++ >1000 ) { +pr_debug ("Failed after retrying 1000 times\n" ); + err =-1 ; + goto out_free_maps; + } + goto retry; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 112/350 perf vendor events arm64: Fix Hisi hip08 DDRC PMU eventname
In reply to Sasha LevinFrom: John Garry <[email protected]>
[ Upstream commit 84b0975f4853ba32d2d9b3c19ffa2b947f023fb3 ]
The "EventName" for the DDRC precharge command event is incorrect, so fix it.
--- .../perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json +1 -1
@@ -15,7 +15,7 @@ }, { "EventCode": "0x04", - "EventName": "uncore_hisi_ddrc.flux_wr", + "EventName": "uncore_hisi_ddrc.pre_cmd", "BriefDescription": "DDRC precharge commands", "PublicDescription": "DDRC precharge commands", "Unit": "hisi_sccl,ddrc",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 113/350 perf trace: Filter own pid to avoid a feedback look in 'perf trace record -a'
In reply to Sasha LevinFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 7fbfe22cf4cfe01a88704dd76ca65d108039d297 ]
When doing a system wide 'perf trace record' we need, just like in 'perf trace' live mode, to filter out perf trace's own pid, so set up a tracepoint filter for the raw_syscalls tracepoints right after adding them to the argv array that is set up to then call cmd_record().
--- tools/perf/builtin-trace.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
tools/perf/builtin-trace.c +16 -8
@@ -2576,21 +2576,23 @@ static int trace__record(struct trace *trace, int argc, const char **argv)"-m" ,"1024" , "-c", "1", }; - +pid_t pid =getpid (); +char *filter =asprintf__tp_filter_pids (1 , &pid);const char *const sc_args[] = {"-e" , };unsigned int sc_args_nr =ARRAY_SIZE (sc_args);const char *const majpf_args[] = {"-e" ,"major-faults" };unsigned int majpf_args_nr =ARRAY_SIZE (majpf_args);const char *const minpf_args[] = {"-e" ,"minor-faults" };unsigned int minpf_args_nr =ARRAY_SIZE (minpf_args); +int err =-1 ; -/* +1 is for the event string below */ - rec_argc =ARRAY_SIZE (record_args) + sc_args_nr +1 + +/* +3 is for the event string below and the pid filter */ + rec_argc =ARRAY_SIZE (record_args) + sc_args_nr +3 + majpf_args_nr + minpf_args_nr + argc; rec_argv =calloc (rec_argc +1 ,sizeof (char *)); -if (rec_argv ==NULL ) -return -ENOMEM ; +if (rec_argv ==NULL || filter ==NULL ) + goto out_free; j =0 ;for (i =0 ; i <ARRAY_SIZE (record_args); i++)
@@ -2607,11 +2609,13 @@ static int trace__record(struct trace *trace, int argc, const char **argv) rec_argv[j++] ="syscalls:sys_enter,syscalls:sys_exit" ; else {pr_err ("Neither raw_syscalls nor syscalls events exist.\n" ); -free (rec_argv); -return -1 ; + goto out_free; } } + rec_argv[j++] ="--filter" ; + rec_argv[j++] = filter; +if (trace->trace_pgfaults &TRACE_PFMAJ )for (i =0 ; i < majpf_args_nr; i++) rec_argv[j++] = majpf_args[i];
@@ -2623,7 +2627,11 @@ static int trace__record(struct trace *trace, int argc, const char **argv)for (i =0 ; i < (unsigned int )argc; i++) rec_argv[j++] = argv[i]; -return cmd_record (j, rec_argv); + err =cmd_record (j, rec_argv); +out_free: +free (filter); +free (rec_argv); +return err; }static size_t trace__fprintf_thread_summary (struct trace *trace,FILE *fp);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 114/350 usb: usbfs: Suppress problematic bind and unbind uevents.
In reply to Sasha LevinFrom: Ingo Rohloff <[email protected]>
[ Upstream commit abb0b3d96a1f9407dd66831ae33985a386d4200d ]
commit 1455cf8dbfd0 ("driver core: emit uevents when device is bound to a driver") added bind and unbind uevents when a driver is bound or unbound to a physical device.
For USB devices which are handled via the generic usbfs layer (via libusb for example), this is problematic:
Each time a user space program calls
ioctl(usb_fd, USBDEVFS_CLAIMINTERFACE, &usb_intf_nr);
and then later
ioctl(usb_fd, USBDEVFS_RELEASEINTERFACE, &usb_intf_nr);
The kernel will now produce a bind or unbind event, which does not really contain any useful information.
This allows a user space program to run a DoS attack against programs which listen to uevents (in particular systemd/eudev/upowerd):
A malicious user space program just has to call in a tight loop
ioctl(usb_fd, USBDEVFS_CLAIMINTERFACE, &usb_intf_nr); ioctl(usb_fd, USBDEVFS_RELEASEINTERFACE, &usb_intf_nr);
With this loop the malicious user space program floods the kernel and all programs listening to uevents with tons of bind and unbind events.
This patch suppresses uevents for ioctls USBDEVFS_CLAIMINTERFACE and USBDEVFS_RELEASEINTERFACE.
--- drivers/usb/core/devio.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/usb/core/devio.c +14 -1
@@ -764,8 +764,15 @@ static int claimintf(struct usb_dev_state *ps, unsigned int ifnum) intf =usb_ifnum_to_if (dev, ifnum);if (!intf) err = -ENOENT ; -else +else { +unsigned int old_suppress; + +/* suppress uevents while claiming interface */ + old_suppress =dev_get_uevent_suppress (&intf->dev); +dev_set_uevent_suppress (&intf->dev,1 ); err =usb_driver_claim_interface (&usbfs_driver, intf, ps); +dev_set_uevent_suppress (&intf->dev, old_suppress); + }if (err ==0 )set_bit (ifnum, &ps->ifclaimed);return err;
@@ -785,7 +792,13 @@ static int releaseintf(struct usb_dev_state *ps, unsigned int ifnum)if (!intf) err = -ENOENT ;else if (test_and_clear_bit (ifnum, &ps->ifclaimed)) { +unsigned int old_suppress; + +/* suppress uevents while releasing interface */ + old_suppress =dev_get_uevent_suppress (&intf->dev); +dev_set_uevent_suppress (&intf->dev,1 );usb_driver_release_interface (&usbfs_driver, intf); +dev_set_uevent_suppress (&intf->dev, old_suppress); err =0 ; }return err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 115/350 drm/amd/powerplay: avoid disabling ECC if RAS is enabled for VEGA20
In reply to Sasha LevinFrom: Le Ma <[email protected]>
[ Upstream commit df9331e561dab0a451cbd6a679ee88a95f306fd6 ]
Program THM_BACO_CNTL.SOC_DOMAIN_IDLE=1 will tell VBIOS to disable ECC when BACO exit. This can save BACO exit time by PSP on none-ECC SKU. Drop the setting for ECC supported SKU.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c +7 -5
@@ -29,7 +29,7 @@#include "vega20_baco.h" #include "vega20_smumgr.h" - +#include "amdgpu_ras.h" static const struct soc15_baco_cmd_entry clean_baco_tbl[] = {
@@ -74,6 +74,7 @@ int vega20_baco_get_state(struct pp_hwmgr *hwmgr, enum BACO_STATE *state)int vega20_baco_set_state (struct pp_hwmgr *hwmgr,enum BACO_STATE state) {struct amdgpu_device *adev = (struct amdgpu_device *)(hwmgr->adev); +struct amdgpu_ras *ras =amdgpu_ras_get_context (adev);enum BACO_STATE cur_state;uint32_t data;
@@ -84,10 +85,11 @@ int vega20_baco_set_state(struct pp_hwmgr *hwmgr, enum BACO_STATE state)return 0 ;if (state ==BACO_STATE_IN ) { - data =RREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL); - data |=0x80000000 ; -WREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL, data); - +if (!ras || !ras->supported) { + data =RREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL); + data |=0x80000000 ; +WREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL, data); + }if (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnterBaco,0 ))return -EINVAL ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 116/350 iio: adc: max1027: Reset the device at probe time
In reply to Sasha LevinFrom: Miquel Raynal <[email protected]>
[ Upstream commit db033831b4f5589f9fcbadb837614a7c4eac0308 ]
All the registers are configured by the driver, let's reset the chip at probe time, avoiding any conflict with a possible earlier configuration.
--- drivers/iio/adc/max1027.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iio/adc/max1027.c +8 -0
@@ -458,6 +458,14 @@ static int max1027_probe(struct spi_device *spi)return ret; } +/* Internal reset */ + st->reg =MAX1027_RST_REG ; + ret =spi_write (st->spi, &st->reg,1 ); +if (ret <0 ) { +dev_err (&indio_dev->dev,"Failed to reset the ADC\n" ); +return ret; + } +/* Disable averaging */ st->reg =MAX1027_AVG_REG ; ret =spi_write (st->spi, &st->reg,1 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 117/350 iio: dac: ad7303: replace mlock with own lock
In reply to Sasha LevinFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit c991bf9b650f39481cf3c1137092d4754a2c75de ]
This change replaces indio_dev's mlock with the driver's own lock. The lock is mostly needed to protect state when changing the dac_cache info. The lock has been extended to ad7303_read_raw(), to make sure that the cache is updated if an SPI-write is already in progress.
--- drivers/iio/dac/ad7303.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/iio/dac/ad7303.c +9 -4
@@ -41,6 +41,7 @@ struct ad7303_state {struct regulator *vdd_reg;struct regulator *vref_reg; +struct mutex lock;/* * DMA (thus cache coherency maintenance) requires the * transfer buffers to live in their own cache lines.
@@ -79,7 +80,7 @@ static ssize_t ad7303_write_dac_powerdown(struct iio_dev *indio_dev,if (ret)return ret; -mutex_lock (&indio_dev->mlock); +mutex_lock (&st->lock);if (pwr_down) st->config |=AD7303_CFG_POWER_DOWN (chan->channel);
@@ -90,7 +91,7 @@ static ssize_t ad7303_write_dac_powerdown(struct iio_dev *indio_dev,* mode, so just write one of the DAC channels again */ ad7303_write (st, chan->channel, st->dac_cache[chan->channel]); -mutex_unlock (&indio_dev->mlock); +mutex_unlock (&st->lock);return len; }
@@ -116,7 +117,9 @@ static int ad7303_read_raw(struct iio_dev *indio_dev,switch (info) {case IIO_CHAN_INFO_RAW : +mutex_lock (&st->lock); *val = st->dac_cache[chan->channel]; +mutex_unlock (&st->lock);return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : vref_uv =ad7303_get_vref (st, chan);
@@ -144,11 +147,11 @@ static int ad7303_write_raw(struct iio_dev *indio_dev,if (val >= (1 << chan->scan_type.realbits) || val <0 )return -EINVAL ; -mutex_lock (&indio_dev->mlock); +mutex_lock (&st->lock); ret =ad7303_write (st, chan->address, val);if (ret ==0 ) st->dac_cache[chan->channel] = val; -mutex_unlock (&indio_dev->mlock); +mutex_unlock (&st->lock);break ;default : ret = -EINVAL ;
@@ -211,6 +214,8 @@ static int ad7303_probe(struct spi_device *spi) st->spi = spi; +mutex_init (&st->lock); + st->vdd_reg =devm_regulator_get (&spi->dev,"Vdd" );if (IS_ERR (st->vdd_reg))return PTR_ERR (st->vdd_reg);
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 117/350] iio: dac: ad7303: replace mlock with own lock
Quoted 8 lines · On Tue, 10 Dec 2019 16:03:42 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
c991bf9b650f39481cf3c1137092d4754a2c75de]This change replaces indio_dev's mlock with the driver's own lock. The lock is mostly needed to protect state when changing the
dac_cacheinfo. The lock has been extended toad7303_read_raw(), to make sure that the cache is updated if an SPI-write is already in progress.
This is not a fix. It's undoing some slightly nasty layer violations that we are trying to drive out of IIO, but as far as I know there is no actual bug with what was there before.
I won't do any harm though other than adding noise.
Jonathan
Quoted 71 lines
Signed-off-by Alexandru Ardelean <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/iio/dac/ad7303.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/iio/dac/ad7303.c +9
-4@@ -41,6 +41,7 @@ struct ad7303_state {struct regulator *vdd_reg;struct regulator *vref_reg; +struct mutex lock;/* * DMA (thus cache coherency maintenance) requires the * transfer buffers to live in their own cache lines. @@ -79,7 +80,7 @@ static ssize_t ad7303_write_dac_powerdown(struct iio_dev *indio_dev,if (ret)return ret; -mutex_lock (&indio_dev->mlock); +mutex_lock (&st->lock);if (pwr_down) st->config |=AD7303_CFG_POWER_DOWN (chan->channel);@@ -90,7 +91,7 @@ static ssize_t ad7303_write_dac_powerdown(struct iio_dev *indio_dev,* mode, so just write one of the DAC channels again */ ad7303_write (st, chan->channel, st->dac_cache[chan->channel]); -mutex_unlock (&indio_dev->mlock); +mutex_unlock (&st->lock);return len; }@@ -116,7 +117,9 @@ static int ad7303_read_raw(struct iio_dev *indio_dev,switch (info) {case IIO_CHAN_INFO_RAW : +mutex_lock (&st->lock); *val = st->dac_cache[chan->channel]; +mutex_unlock (&st->lock);return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : vref_uv =ad7303_get_vref (st, chan);@@ -144,11 +147,11 @@ static int ad7303_write_raw(struct iio_dev *indio_dev,if (val >= (1 << chan->scan_type.realbits) || val <0 )return -EINVAL ; -mutex_lock (&indio_dev->mlock); +mutex_lock (&st->lock); ret =ad7303_write (st, chan->address, val);if (ret ==0 ) st->dac_cache[chan->channel] = val; -mutex_unlock (&indio_dev->mlock); +mutex_unlock (&st->lock);break ;default : ret = -EINVAL ;@@ -211,6 +214,8 @@ static int ad7303_probe(struct spi_device *spi) st->spi = spi; +mutex_init (&st->lock); + st->vdd_reg =devm_regulator_get (&spi->dev,"Vdd" );if (IS_ERR (st->vdd_reg))return PTR_ERR (st->vdd_reg);
Sasha Levin
maintainerPATCH 118/350 Bluetooth: btusb: avoid unused function warning
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 42d22098127d6384f789107f59caae87d7520fc4 ]
The btusb_rtl_cmd_timeout() function is used inside of an ifdef, leading to a warning when this part is hidden from the compiler:
drivers/bluetooth/btusb.c:530:13: error: unused function 'btusb_rtl_cmd_timeout' [-Werror,-Wunused-function]
Use an IS_ENABLED() check instead so the compiler can see the code and then discard it silently.
--- drivers/bluetooth/btusb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/bluetooth/btusb.c +2 -3
@@ -3807,8 +3807,8 @@ static int btusb_probe(struct usb_interface *intf,btusb_check_needs_reset_resume (intf); } -#ifdef CONFIG_BT_HCIBTUSB_RTL -if (id->driver_info &BTUSB_REALTEK ) { +if (IS_ENABLED (CONFIG_BT_HCIBTUSB_RTL ) && + (id->driver_info &BTUSB_REALTEK )) { hdev->setup = btrtl_setup_realtek; hdev->shutdown = btrtl_shutdown_realtek; hdev->cmd_timeout = btusb_rtl_cmd_timeout;
@@ -3819,7 +3819,6 @@ static int btusb_probe(struct usb_interface *intf,*/ set_bit (BTUSB_WAKEUP_DISABLE , &data->flags); } -#endif if (id->driver_info &BTUSB_AMP ) {/* AMP controllers do not support SCO packets */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 119/350 Bluetooth: missed cpu_to_le16 conversion in hci_init4_req
In reply to Sasha LevinFrom: "Ben Dooks (Codethink)" <[email protected]>
[ Upstream commit 727ea61a5028f8ac96f75ab34cb1b56e63fd9227 ]
It looks like in hci_init4_req() the request is being initialised from cpu-endian data but the packet is specified to be little-endian. This causes an warning from sparse due to __le16 to u16 conversion.
Fix this by using cpu_to_le16() on the two fields in the packet.
net/bluetooth/hci_core.c:845:27: warning: incorrect type in assignment (different base types)net/bluetooth/hci_core.c:845:27: expected restricted __le16 [usertype] tx_lennet/bluetooth/hci_core.c:845:27: got unsigned short [usertype] le_max_tx_lennet/bluetooth/hci_core.c:846:28: warning: incorrect type in assignment (different base types)net/bluetooth/hci_core.c:846:28: expected restricted __le16 [usertype] tx_timenet/bluetooth/hci_core.c:846:28: got unsigned short [usertype] le_max_tx_time
--- net/bluetooth/hci_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bluetooth/hci_core.c +2 -2
@@ -842,8 +842,8 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt)if (hdev->le_features[0 ] &HCI_LE_DATA_LEN_EXT ) {struct hci_cp_le_write_def_data_len cp; - cp.tx_len = hdev->le_max_tx_len; - cp.tx_time = hdev->le_max_tx_time; + cp.tx_len =cpu_to_le16 (hdev->le_max_tx_len); + cp.tx_time =cpu_to_le16 (hdev->le_max_tx_time);hci_req_add (req,HCI_OP_LE_WRITE_DEF_DATA_LEN ,sizeof (cp), &cp); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 120/350 Bluetooth: Workaround directed advertising bug in Broadcom controllers
In reply to Sasha LevinFrom: Szymon Janc <[email protected]>
[ Upstream commit 4c371bb95cf06ded80df0e6139fdd77cee1d9a94 ]
It appears that some Broadcom controllers (eg BCM20702A0) reject LE Set Advertising Parameters command if advertising intervals provided are not within range for undirected and low duty directed advertising.
Workaround this bug by populating min and max intervals with 'valid' values.
< HCI Command: LE Set Advertising Parameters (0x08|0x0006) plen 15
Min advertising interval: 0.000 msec (0x0000)
Max advertising interval: 0.000 msec (0x0000)
Type: Connectable directed - ADV_DIRECT_IND (high duty cycle) (0x01)
Own address type: Public (0x00)
Direct address type: Random (0x01)
Direct address: E2:F0:7B:9F:DC:F4 (Static)
Channel map: 37, 38, 39 (0x07)
Filter policy: Allow Scan Request from Any, Allow Connect Request from Any (0x00)Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 4
LE Set Advertising Parameters (0x08|0x0006) ncmd 1
Status: Invalid HCI Command Parameters (0x12)--- net/bluetooth/hci_conn.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/bluetooth/hci_conn.c +8 -0
@@ -934,6 +934,14 @@ static void hci_req_directed_advertising(struct hci_request *req,return ;memset (&cp,0 ,sizeof (cp)); + +/* Some controllers might reject command if intervals are not +* within range for undirected advertising. +* BCM20702A0 is known to be affected by this. +*/ + cp.min_interval =cpu_to_le16 (0x0020 ); + cp.max_interval =cpu_to_le16 (0x0020 ); + cp.type =LE_ADV_DIRECT_IND ; cp.own_address_type = own_addr_type; cp.direct_addr_type = conn->dst_type;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 121/350 Bluetooth: hci_core: fix init for HCI_USER_CHANNEL
In reply to Sasha LevinFrom: Mattijs Korpershoek <[email protected]>
[ Upstream commit eb8c101e28496888a0dcfe16ab86a1bee369e820 ]
During the setup() stage, HCI device drivers expect the chip to acknowledge its setup() completion via vendor specific frames.
If userspace opens() such HCI device in HCI_USER_CHANNEL [1] mode, the vendor specific frames are never tranmitted to the driver, as they are filtered in hci_rx_work().
Allow HCI devices which operate in HCI_USER_CHANNEL mode to receive frames if the HCI device is is HCI_INIT state.
[1] https://www.spinics.net/lists/linux-bluetooth/msg37345.html
--- net/bluetooth/hci_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/bluetooth/hci_core.c +8 -1
@@ -4440,7 +4440,14 @@ static void hci_rx_work(struct work_struct *work)hci_send_to_sock (hdev, skb); } -if (hci_dev_test_flag (hdev,HCI_USER_CHANNEL )) { +/* If the device has been opened in HCI_USER_CHANNEL, +* the userspace has exclusive access to device. +* When device is HCI_INIT, we still need to process +* the data packets to the driver in order +* to complete its setup(). +*/ +if (hci_dev_test_flag (hdev,HCI_USER_CHANNEL ) && + !test_bit (HCI_INIT , &hdev->flags)) {kfree_skb (skb);continue ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 122/350 selftests: Fix O= and KBUILD_OUTPUT handling for relative paths
In reply to Sasha LevinFrom: Shuah Khan <[email protected]>
[ Upstream commit 303e6218ecec475d5bc3e5922dec770ee5baf107 ]
Fix O= and KBUILD_OUTPUT handling for relative paths.
export KBUILD_OUTPUT=../kselftest_size
make TARGETS=size kselftest-all
or
make O=../kselftest_size TARGETS=size kselftest-all
In both of these cases, targets get built in ../kselftest_size which is a one level up from the size test directory.
make[1]: Entering directory '/mnt/data/lkml/kselftest_size'
make --no-builtin-rules INSTALL_HDR_PATH=$BUILD/usr \
ARCH=x86 -C ../../.. headers_install INSTALL ../kselftest_size/usr/include
gcc -static -ffreestanding -nostartfiles -s get_size.c -o ../kselftest_size/size/get_size/usr/bin/ld: cannot open output file ../kselftest_size/size/get_size: No such file or directory
collect2: error: ld returned 1 exit status
make[3]: *** [../lib.mk:138: ../kselftest_size/size/get_size] Error 1
make[2]: *** [Makefile:143: all] Error 2
make[1]: *** [/mnt/data/lkml/linux_5.4/Makefile:1221: kselftest-all] Error 2 make[1]: Leaving directory '/mnt/data/lkml/kselftest_size'
make: *** [Makefile:179: sub-make] Error 2
Use abs_objtree exported by the main Makefile.
--- tools/testing/selftests/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/Makefile +3 -2
@@ -86,10 +86,10 @@ override LDFLAGS = endif ifneq ($(O),) - BUILD := $(O) + BUILD := $(abs_objtree) else ifneq ($(KBUILD_OUTPUT),) - BUILD := $(KBUILD_OUTPUT)/kselftest + BUILD := $(abs_objtree)/kselftest else BUILD := $(shell pwd) DEFAULT_INSTALL_HDR_PATH := 1
@@ -102,6 +102,7 @@ include $(top_srcdir)/scripts/subarch.include ARCH ?= $(SUBARCH) export KSFT_KHDR_INSTALL_DONE := 1 export BUILD +#$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD)) # build and run gpio when output directory is the src dir. # gpio has dependency on tools/gpio and builds tools/gpio
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 123/350 bpf/stackmap: Fix deadlock with rq_lock in bpf_get_stack()
In reply to Sasha LevinFrom: Song Liu <[email protected]>
[ Upstream commit eac9153f2b584c702cea02c1f1a57d85aa9aea42 ]
bpf stackmap with build-id lookup (BPF_F_STACK_BUILD_ID) can trigger A-A deadlock on rq_lock():
rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [...] Call Trace: try_to_wake_up+0x1ad/0x590 wake_up_q+0x54/0x80 rwsem_wake+0x8a/0xb0 bpf_get_stack+0x13c/0x150 bpf_prog_fbdaf42eded9fe46_on_event+0x5e3/0x1000 bpf_overflow_handler+0x60/0x100 __perf_event_overflow+0x4f/0xf0 perf_swevent_overflow+0x99/0xc0 ___perf_sw_event+0xe7/0x120 __schedule+0x47d/0x620 schedule+0x29/0x90 futex_wait_queue_me+0xb9/0x110 futex_wait+0x139/0x230 do_futex+0x2ac/0xa50 __x64_sys_futex+0x13c/0x180 do_syscall_64+0x42/0x100 entry_SYSCALL_64_after_hwframe+0x44/0xa9
This can be reproduced by:
1. Start a multi-thread program that does parallel mmap() and malloc();
2. taskset the program to 2 CPUs;
3. Attach bpf program to trace_sched_switch and gather stackmap with build-id, e.g. with trace.py from bcc tools:
trace.py -U -p <pid> -s <some-bin,some-lib> t:sched:sched_switch
A sample reproducer is attached at the end.
This could also trigger deadlock with other locks that are nested with rq_lock.
Fix this by checking whether irqs are disabled. Since rq_lock and all other nested locks are irq safe, it is safe to do up_read() when irqs are not disable. If the irqs are disabled, postpone up_read() in irq_work.
Reproducer:
============================ 8< ============================
char *filename;
void *worker(void *p)
{
void *ptr;
int fd;
char *pptr;
fd = open(filename, O_RDONLY);
if (fd < 0)
return NULL;
while (1) {
struct timespec ts = {0, 1000 + rand() % 2000};
ptr = mmap(NULL, 4096 * 64, PROT_READ, MAP_PRIVATE, fd, 0);
usleep(1);
if (ptr == MAP_FAILED) {
printf("failed to mmap\n");
break;
}
munmap(ptr, 4096 * 64);
usleep(1);
pptr = malloc(1);
usleep(1);
pptr[0] = 1;
usleep(1);
free(pptr);
usleep(1);
nanosleep(&ts, NULL);
}
close(fd);
return NULL;
}int main(int argc, char *argv[])
{
void *ptr;
int i;
pthread_t threads[THREAD_COUNT];
if (argc < 2)
return 0;
filename = argv[1];
for (i = 0; i < THREAD_COUNT; i++) {
if (pthread_create(threads + i, NULL, worker, NULL)) {
fprintf(stderr, "Error creating thread\n");
return 0;
}
}
for (i = 0; i < THREAD_COUNT; i++)
pthread_join(threads[i], NULL);
return 0;
}============================ 8< ============================
--- kernel/bpf/stackmap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/bpf/stackmap.c +4 -3
@@ -287,7 +287,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,bool irq_work_busy = false;struct stack_map_irq_work *work =NULL ; -if (in_nmi ()) { +if (irqs_disabled ()) { work =this_cpu_ptr (&up_read_work);if (work->irq_work.flags &IRQ_WORK_BUSY )/* cannot queue more up_read, fallback */
@@ -295,8 +295,9 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, }/* -* We cannot do up_read() in nmi context. To do build_id lookup -* in nmi context, we need to run up_read() in irq_work. We use +* We cannot do up_read() when the irq is disabled, because of +* risk to deadlock with rq_lock. To do build_id lookup when the +* irqs are disabled, we need to run up_read() in irq_work. We use * a percpu variable to do the irq_work. If the irq_work is * already used by another lookup, we fall back to report ips. *
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 124/350 x86/mce: Lower throttling MCE messages' priority to warning
In reply to Sasha LevinFrom: Benjamin Berg <[email protected]>
[ Upstream commit 9c3bafaa1fd88e4dd2dba3735a1f1abb0f2c7bb7 ]
On modern CPUs it is quite normal that the temperature limits are reached and the CPU is throttled. In fact, often the thermal design is not sufficient to cool the CPU at full load and limits can quickly be reached when a burst in load happens. This will even happen with technologies like RAPL limitting the long term power consumption of the package.
Also, these limits are "softer", as Srinivas explains:
"CPU temperature doesn't have to hit max(TjMax) to get these warnings. OEMs ha[ve] an ability to program a threshold where a thermal interrupt can be generated. In some systems the offset is 20C+ (Read only value).
In recent systems, there is another offset on top of it which can be programmed by OS, once some agent can adjust power limits dynamically. By default this is set to low by the firmware, which I guess the prime motivation of Benjamin to submit the patch."
So these messages do not usually indicate a hardware issue (e.g. insufficient cooling). Log them as warnings to avoid confusion about their severity.
[ bp: Massage commit mesage. ]
--- arch/x86/kernel/cpu/mce/therm_throt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/mce/therm_throt.c +1 -1
@@ -188,7 +188,7 @@ static void therm_throt_process(bool new_event, int event, int level)/* if we just entered the thermal event */ if (new_event) {if (event ==THERMAL_THROTTLING_EVENT ) -pr_crit ("CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\n" , +pr_warn ("CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\n" , this_cpu, level ==CORE_LEVEL ?"Core" :"Package" , state->count);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 125/350 drm/amd/display: enable hostvm based on roimmu active for dcn2.1
In reply to Sasha LevinFrom: Dmytro Laktyushkin <[email protected]>
[ Upstream commit 48d92e8eda3d9b61978377e7539bfc5958e850cf ]
Enabling hostvm when ROIMMU is not active seems to break GPUVM. This fixes the issue by not enabling hostvm if ROIMMU is not activated.
--- .../drm/amd/display/dc/dcn21/dcn21_hubbub.c | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +25 -15
@@ -22,6 +22,7 @@* Authors: AMD * */ +#include <linux/delay.h> #include "dm_services.h" #include "dcn20/dcn20_hubbub.h" #include "dcn21_hubbub.h"
@@ -71,30 +72,39 @@ static uint32_t convert_and_clamp(void dcn21_dchvm_init (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub1 =TO_DCN20_HUBBUB (hubbub); +uint32_t riommu_active; +int i;//Init DCHVM block REG_UPDATE (DCHVM_CTRL0 ,HOSTVM_INIT_REQ ,1 );//Poll until RIOMMU_ACTIVE = 1 -//TODO: Figure out interval us and retry count -REG_WAIT (DCHVM_RIOMMU_STAT0 ,RIOMMU_ACTIVE ,1 ,5 ,100 ); +for (i =0 ; i <100 ; i++) { +REG_GET (DCHVM_RIOMMU_STAT0 ,RIOMMU_ACTIVE , &riommu_active); -//Reflect the power status of DCHUBBUB -REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_POWERSTATUS ,1 ); +if (riommu_active) +break ; +else +udelay (5 ); + } + +if (riommu_active) { +//Reflect the power status of DCHUBBUB +REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_POWERSTATUS ,1 ); -//Start rIOMMU prefetching -REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_PREFETCH_REQ ,1 ); +//Start rIOMMU prefetching +REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_PREFETCH_REQ ,1 ); -// Enable dynamic clock gating -REG_UPDATE_4 (DCHVM_CLK_CTRL , -HVM_DISPCLK_R_GATE_DIS ,0 , -HVM_DISPCLK_G_GATE_DIS ,0 , -HVM_DCFCLK_R_GATE_DIS ,0 , -HVM_DCFCLK_G_GATE_DIS ,0 ); +// Enable dynamic clock gating +REG_UPDATE_4 (DCHVM_CLK_CTRL , +HVM_DISPCLK_R_GATE_DIS ,0 , +HVM_DISPCLK_G_GATE_DIS ,0 , +HVM_DCFCLK_R_GATE_DIS ,0 , +HVM_DCFCLK_G_GATE_DIS ,0 ); -//Poll until HOSTVM_PREFETCH_DONE = 1 -//TODO: Figure out interval us and retry count -REG_WAIT (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE ,1 ,5 ,100 ); +//Poll until HOSTVM_PREFETCH_DONE = 1 +REG_WAIT (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE ,1 ,5 ,100 ); + } } static int hubbub21_init_dchub(struct hubbub *hubbub,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 126/350 drm/amd/display: fix header for RN clk mgr
In reply to Sasha LevinFrom: joseph gravenor <[email protected]>
[ Upstream commit cd83fa1ea9b9431cf1d57ac4179a11bc4393a5b6 ]
[why]
Should always MP0_BASE for any register definition from MP per-IP header files. I belive the reason the linux version of MP1_BASE works is The 0th element of the 0th table of that is identical to the corrisponding value of MP0_BASE in the renoir offset header file. The reason we should only use MP0_BASE is There is only one set of per-IP headers MP that includes all register definitions related to SMU IP block. This IP includes MP0, MP1, MP2 and an ecryption engine that can be used only by MP0. As a result all register definitions from MP file should be based only on MP0_BASE data.
[How]
Change MP1_BASE to MP0_BASE
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +1 -1
@@ -33,7 +33,7 @@#include "mp/mp_12_0_0_sh_mask.h" #define REG (reg_name) \ - (MP1_BASE.instance[0].segment[mm ## reg_name ## _BASE_IDX] + mm ## reg_name) + (MP0_BASE.instance[0].segment[mm ## reg_name ## _BASE_IDX] + mm ## reg_name)#define FN (reg_name, field) \ FD(reg_name##__##field)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 127/350 drm/amdgpu: fix amdgpu trace event print string format error
In reply to Sasha LevinFrom: Kevin Wang <[email protected]>
[ Upstream commit 2c2fdb8bca290c439e383cfb6857b0c65e528964 ]
the trace event print string format error.
(use integer type to handle string)
before:
amdgpu_test_kev-1556 [002] 138.508781: amdgpu_cs_ioctl:
sched_job=8, timeline=gfx_0.0.0, context=177, seqno=1, ring_name=ffff94d01c207bf0, num_ibs=2
after:
amdgpu_test_kev-1506 [004] 370.703783: amdgpu_cs_ioctl:
sched_job=12, timeline=gfx_0.0.0, context=234, seqno=2, ring_name=gfx_0.0.0, num_ibs=1
change trace event list:
1.amdgpu_cs_ioctl
2.amdgpu_sched_run_job
3.amdgpu_ib_pipe_sync
--- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +9 -9
@@ -170,7 +170,7 @@ TRACE_EVENT(amdgpu_cs_ioctl, __field(unsigned int, context) __field(unsigned int, seqno) __field(struct dma_fence *, fence) - __field(char *, ring_name) + __string(ring, to_amdgpu_ring(job->base.sched)->name) __field(u32, num_ibs) ),
@@ -179,12 +179,12 @@ TRACE_EVENT(amdgpu_cs_ioctl,__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)) __entry->context = job->base.s_fence->finished.context; __entry->seqno = job->base.s_fence->finished.seqno; - __entry->ring_name =to_amdgpu_ring (job->base.sched)->name; +__assign_str (ring,to_amdgpu_ring (job->base.sched)->name) __entry->num_ibs = job->num_ibs; ),TP_printk ("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u" , __entry->sched_job_id,__get_str (timeline), __entry->context, - __entry->seqno, __entry->ring_name, __entry->num_ibs) + __entry->seqno,__get_str (ring), __entry->num_ibs) ); TRACE_EVENT(amdgpu_sched_run_job,
@@ -195,7 +195,7 @@ TRACE_EVENT(amdgpu_sched_run_job, __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) __field(unsigned int, context) __field(unsigned int, seqno) - __field(char *, ring_name) + __string(ring, to_amdgpu_ring(job->base.sched)->name) __field(u32, num_ibs) ),
@@ -204,12 +204,12 @@ TRACE_EVENT(amdgpu_sched_run_job,__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)) __entry->context = job->base.s_fence->finished.context; __entry->seqno = job->base.s_fence->finished.seqno; - __entry->ring_name =to_amdgpu_ring (job->base.sched)->name; +__assign_str (ring,to_amdgpu_ring (job->base.sched)->name) __entry->num_ibs = job->num_ibs; ),TP_printk ("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u" , __entry->sched_job_id,__get_str (timeline), __entry->context, - __entry->seqno, __entry->ring_name, __entry->num_ibs) + __entry->seqno,__get_str (ring), __entry->num_ibs) );
@@ -468,7 +468,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence),TP_ARGS (sched_job, fence),TP_STRUCT__entry ( - __field(const char *,name) + __string(ring, sched_job->base.sched->name);__field (uint64_t ,id ) __field(struct dma_fence *, fence) __field(uint64_t, ctx)
@@ -476,14 +476,14 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, ),TP_fast_assign ( - __entry->name = sched_job->base.sched->name; +__assign_str (ring, sched_job->base.sched->name) __entry->id = sched_job->base.id; __entry->fence = fence; __entry->ctx = fence->context; __entry->seqno = fence->seqno; ),TP_printk ("job ring=%s, id=%llu, need pipe sync to fence=%p, context=%llu, seq=%u" , - __entry->name, __entry->id, +__get_str (ring), __entry->id, __entry->fence, __entry->ctx, __entry->seqno) );
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 128/350 spi: pxa2xx: Set controller->max_transfer_size in dma mode
In reply to Sasha LevinFrom: Daniel Vetter <[email protected]>
[ Upstream commit b2662a164f9dc48da8822e56600686d639056282 ]
In DMA mode we have a maximum transfer size, past that the driver falls back to PIO (see the check at the top of pxa2xx_spi_transfer_one). Falling back to PIO for big transfers defeats the point of a dma engine, hence set the max transfer size to inform spi clients that they need to do something smarter.
This was uncovered by the drm_mipi_dbi spi panel code, which does large spi transfers, but stopped splitting them after:
commit e143364b4c1774f68e923a5a0bb0fca28ac25888
Author: Noralf Trønnes <[email protected]> Date: Fri Jul 19 17:59:10 2019 +0200
drm/tinydrm: Remove tinydrm_spi_max_transfer_size()
After this commit the code relied on the spi core to split transfers into max dma-able blocks, which also papered over the PIO fallback issue.
Fix this by setting the overall max transfer size to the DMA limit, but only when the controller runs in DMA mode.
--- drivers/spi/spi-pxa2xx.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/spi/spi-pxa2xx.c +7 -0
@@ -1602,6 +1602,11 @@ static int pxa2xx_spi_fw_translate_cs(struct spi_controller *controller,return cs; } +static size_t pxa2xx_spi_max_dma_transfer_size (struct spi_device *spi) +{ +return MAX_DMA_LEN ; +} +static int pxa2xx_spi_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -1707,6 +1712,8 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) }else { controller->can_dma = pxa2xx_spi_can_dma; controller->max_dma_len =MAX_DMA_LEN ; + controller->max_transfer_size = + pxa2xx_spi_max_dma_transfer_size; } }
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Brown
maintainerRe: [PATCH AUTOSEL 5.4 128/350] spi: pxa2xx: Set controller->max_transfer_size in dma mode
Quoted 9 lines · Sasha Levin
From: Daniel Vetter <[email protected]>
[ Upstream commit
b2662a164f9dc48da8822e56600686d639056282]In DMA mode we have a maximum transfer size, past that the driver falls back to PIO (see the check at the top of
pxa2xx_spi_transfer_one). Falling back to PIO for big transfers defeats the point of a dma engine, hence set the max transfer size to inform spi clients that they need to do something smarter.
This won't fix anything by itself, this asks other code to change how it behaves which may or may not work in older kernels.
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.4 128/350] spi: pxa2xx: Set controller->max_transfer_size in dma mode
Quoted 5 lines · Mark Brown
Quoted 4 lines · Sasha Levin
From: Daniel Vetter <[email protected]>
[ Upstream commit
b2662a164f9dc48da8822e56600686d639056282]
Quoted 8 lines
Quoted 5 lines
In DMA mode we have a maximum transfer size, past that the driver falls back to PIO (see the check at the top of
pxa2xx_spi_transfer_one). Falling back to PIO for big transfers defeats the point of a dma engine, hence set the max transfer size to inform spi clients that they need to do something smarter.This won't fix anything by itself, this asks other code to change how it behaves which may or may not work in older kernels.
I'll drop it then, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 129/350 staging: iio: ad9834: add a check for devm_clk_get
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit a96de139301385e5992768c0f60240ddfbb33325 ]
ad9834_probe misses a check for devm_clk_get and may cause problems. Add a check like what ad9832 does to fix it.
--- drivers/staging/iio/frequency/ad9834.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/iio/frequency/ad9834.c +4 -0
@@ -417,6 +417,10 @@ static int ad9834_probe(struct spi_device *spi) st =iio_priv (indio_dev);mutex_init (&st->lock); st->mclk =devm_clk_get (&spi->dev,NULL ); +if (IS_ERR (st->mclk)) { + ret =PTR_ERR (st->mclk); + goto error_disable_reg; + } ret =clk_prepare_enable (st->mclk);if (ret) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 130/350 power: supply: cpcap-battery: Check voltage before orderly_poweroff
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 639c1524da3b273d20c42ff2387d08eb4b12e903 ]
We can get the low voltage interrupt trigger sometimes way too early, maybe because of CPU load spikes. This causes orderly_poweroff() be called too easily.
Let's check the voltage before orderly_poweroff in case it was not yet a permanent condition. We will be getting more interrupts anyways if the condition persists.
Let's also show the measured voltages for low battery and battery empty warnings since we have them.
--- drivers/power/supply/cpcap-battery.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/power/supply/cpcap-battery.c +5 -3
@@ -562,12 +562,14 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)switch (d->action) {case CPCAP_BATTERY_IRQ_ACTION_BATTERY_LOW :if (latest->current_ua >=0 ) -dev_warn (ddata->dev,"Battery low at 3.3V!\n" ); +dev_warn (ddata->dev,"Battery low at %imV!\n" , + latest->voltage /1000 );break ;case CPCAP_BATTERY_IRQ_ACTION_POWEROFF : -if (latest->current_ua >=0 ) { +if (latest->current_ua >=0 && latest->voltage <=3200000 ) {dev_emerg (ddata->dev, -"Battery empty at 3.1V, powering off\n" ); +"Battery empty at %imV, powering off\n" , + latest->voltage /1000 );orderly_poweroff (true); }break ;
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 130/350] power: supply: cpcap-battery: Check voltage before orderly_poweroff
Quoted 8 lines · Sasha Levin
From: Tony Lindgren <[email protected]>
[ Upstream commit
639c1524da3b273d20c42ff2387d08eb4b12e903]We can get the low voltage interrupt trigger sometimes way too early, maybe because of CPU load spikes. This causes
orderly_poweroff()be called too easily.
Quoted 6 lines
Let's check the voltage before
orderly_poweroffin case it was not yet a permanent condition. We will be getting more interrupts anyways if the condition persists.Let's also show the measured voltages for low battery and battery empty warnings since we have them.
This is a tweak of power management parameters, not a fix for serious bug.
Plus, it needs a lot of testing it did not get, yet.
Please drop from stable.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Sasha Levin
maintainerPATCH 131/350 perf tests: Disable bp_signal testing for arm64
In reply to Sasha LevinFrom: Leo Yan <[email protected]>
[ Upstream commit 6a5f3d94cb69a185b921cb92c39888dc31009acb ]
As there are several discussions for enabling perf breakpoint signal testing on arm64 platform: arm64 needs to rely on single-step to execute the breakpointed instruction and then reinstall the breakpoint exception handler. But if we hook the breakpoint with a signal, the signal handler will do the stepping rather than the breakpointed instruction, this causes infinite loops as below:
Kernel space | Userspace
---------------------------------|--------------------------------
| __test_function() -> hit
| breakpoint
breakpoint_handler() |
`-> user_enable_single_step() |
do_signal() |
| sig_handler() -> Step one
| instruction and
| trap to kernel
single_step_handler() |
`-> reinstall_suspended_bps() |
| __test_function() -> hit
| breakpoint again and
| repeat up flow infinitelyAs Will Deacon mentioned [1]: "that we require the overflow handler to do the stepping on arm/arm64, which is relied upon by GDB/ptrace. The hw_breakpoint code is a complete disaster so my preference would be to rip out the perf part and just implement something directly in ptrace, but it's a pretty horrible job". Though Will commented this on arm architecture, but the comment also can apply on arm64 architecture.
For complete information, I searched online and found a few years back, Wang Nan sent one patch 'arm64: Store breakpoint single step state into pstate' [2]; the patch tried to resolve this issue by avoiding single stepping in signal handler and defer to enable the signal stepping when return to __test_function(). The fixing was not merged due to the concern for missing to handle different usage cases.
Based on the info, the most feasible way is to skip Perf breakpoint signal testing for arm64 and this could avoid the duplicate investigation efforts when people see the failure. This patch skips this case on arm64 platform, which is same with arm architecture.
[1] https://lkml.org/lkml/2018/11/15/205
[2] https://lkml.org/lkml/2015/12/23/477
--- tools/perf/tests/bp_signal.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
tools/perf/tests/bp_signal.c +6 -9
@@ -49,14 +49,6 @@ asm ("__test_function:\n" "incq (%rdi)\n" "ret\n"); -#elif defined (__aarch64__) -extern void __test_function (volatile long *ptr); -asm ( -".globl __test_function\n" -"__test_function:\n" -"str x30, [x0]\n" -"ret\n" ); -#else static void __test_function (volatile long *ptr) {
@@ -302,10 +294,15 @@ bool test__bp_signal_is_supported(void)* stepping into the SIGIO handler and getting stuck on the * breakpointed instruction. * +* Since arm64 has the same issue with arm for the single-step +* handling, this case also gets suck on the breakpointed +* instruction. +* * Just disable the test for these architectures until these * issues are resolved. */ -#if defined(__powerpc__) || defined(__s390x__) || defined(__arm__) +#if defined(__powerpc__) || defined(__s390x__) || defined(__arm__) || \ + defined(__aarch64__)return false;#else return true;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 132/350 selftests/bpf: Make a copy of subtest name
In reply to Sasha LevinFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit f90415e9600c5227131531c0ed11514a2d3bbe62 ]
test_progs never created a copy of subtest name, rather just stored pointer to whatever string test provided. This is bad as that string might be freed or modified by the end of subtest. Fix this by creating a copy of given subtest name when subtest starts.
--- tools/testing/selftests/bpf/test_progs.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/test_progs.c +12 -5
@@ -20,7 +20,7 @@ struct prog_test_def {bool tested;bool need_cgroup_cleanup; -const char *subtest_name; +char *subtest_name;int subtest_num;/* store counts before subtest started */
@@ -81,16 +81,17 @@ void test__end_subtest()fprintf (env.stdout,"#%d/%d %s:%s\n" , test->test_num, test->subtest_num, test->subtest_name, sub_error_cnt ?"FAIL" :"OK" ); + +free (test->subtest_name); + test->subtest_name =NULL ; }bool test__start_subtest (const char *name) {struct prog_test_def *test = env.test; -if (test->subtest_name) { +if (test->subtest_name)test__end_subtest (); - test->subtest_name =NULL ; - } test->subtest_num++;
@@ -104,7 +105,13 @@ bool test__start_subtest(const char *name)if (!should_run (&env.subtest_selector, test->subtest_num, name))return false; - test->subtest_name = name; + test->subtest_name =strdup (name); +if (!test->subtest_name) { +fprintf (env.stderr, +"Subtest #%d: failed to copy subtest name!\n" , + test->subtest_num); +return false; + } env.test->old_error_cnt = env.test->error_cnt;return true;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 133/350 Bluetooth: hci_bcm: Fix RTS handling during startup
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit 3347a80965b38f096b1d6f995c00c9c9e53d4b8b ]
The RPi 4 uses the hardware handshake lines for CYW43455, but the chip doesn't react to HCI requests during DT probe. The reason is the inproper handling of the RTS line during startup. According to the startup signaling sequence in the CYW43455 datasheet, the hosts RTS line must be driven after BT_REG_ON and BT_HOST_WAKE.
--- drivers/bluetooth/hci_bcm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/hci_bcm.c +2 -0
@@ -445,9 +445,11 @@ static int bcm_open(struct hci_uart *hu) out:if (bcm->dev) { +hci_uart_set_flow_control (hu, true); hu->init_speed = bcm->dev->init_speed; hu->oper_speed = bcm->dev->oper_speed; err =bcm_gpio_set_power (bcm->dev, true); +hci_uart_set_flow_control (hu, false);if (err) goto err_unset_hu; }
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 133/350] Bluetooth: hci_bcm: Fix RTS handling during startup
Hi,
Quoted 23 lines · Sasha Levin
From: Stefan Wahren <[email protected]>
[ Upstream commit
3347a80965b38f096b1d6f995c00c9c9e53d4b8b]The RPi 4 uses the hardware handshake lines for CYW43455, but the chip doesn't react to HCI requests during DT probe. The reason is the inproper handling of the RTS line during startup. According to the startup signaling sequence in the CYW43455 datasheet, the hosts RTS line must be driven after
BT_REG_ONandBT_HOST_WAKE.Signed-off-by Stefan Wahren <[email protected]>Signed-off-by Marcel Holtmann <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/bluetooth/hci_bcm.c | 2 ++ 1 file changed, 2 insertions(+)drivers/bluetooth/hci_bcm.c +0
-0@@ -445,9 +445,11 @@ static int bcm_open(struct hci_uart *hu)
drivers/bluetooth/hci_bcm.c static int bcm_open(struct hci_uart *hu) · line 455
Quoted 10 lines
drivers/bluetooth/hci_bcm.c +2
-0out:if (bcm->dev) { +hci_uart_set_flow_control (hu, true); hu->init_speed = bcm->dev->init_speed; hu->oper_speed = bcm->dev->oper_speed; err =bcm_gpio_set_power (bcm->dev, true); +hci_uart_set_flow_control (hu, false);if (err) goto err_unset_hu; }
This causes bluetooth breakage (degraded bluetooth performance, due to failure to switch to higher baudrate) for Orange Pi 3 board:
[ 3.839134] Bluetooth: hci0: command 0xfc18 tx timeout [ 11.999136] Bluetooth: hci0: BCM: failed to write update baudrate (-110) [ 12.004613] Bluetooth: hci0: Failed to set baudrate [ 12.123187] Bluetooth: hci0: BCM: chip id 130 [ 12.128398] Bluetooth: hci0: BCM: features 0x0f [ 12.154686] Bluetooth: hci0: BCM4345C5 [ 12.157165] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0000 [ 15.343684] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0038
I suggest not pushing this to stable.
regards,
Ondrej
Quoted 2 lines
2.20.1
Re: [PATCH AUTOSEL 5.4 133/350] Bluetooth: hci_bcm: Fix RTS handling during startup
Quoted 49 lines · Ondřej Jirman
Hi,
Quoted 23 lines · Sasha Levin
From: Stefan Wahren <[email protected]>
[ Upstream commit
3347a80965b38f096b1d6f995c00c9c9e53d4b8b]The RPi 4 uses the hardware handshake lines for CYW43455, but the chip doesn't react to HCI requests during DT probe. The reason is the inproper handling of the RTS line during startup. According to the startup signaling sequence in the CYW43455 datasheet, the hosts RTS line must be driven after
BT_REG_ONandBT_HOST_WAKE.Signed-off-by Stefan Wahren <[email protected]>Signed-off-by Marcel Holtmann <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/bluetooth/hci_bcm.c | 2 ++ 1 file changed, 2 insertions(+)drivers/bluetooth/hci_bcm.c +0
-0@@ -445,9 +445,11 @@ static int bcm_open(struct hci_uart *hu)drivers/bluetooth/hci_bcm.c static int bcm_open(struct hci_uart *hu) · line 455
Quoted 10 lines
drivers/bluetooth/hci_bcm.c +2
-0out:if (bcm->dev) { +hci_uart_set_flow_control (hu, true); hu->init_speed = bcm->dev->init_speed; hu->oper_speed = bcm->dev->oper_speed; err =bcm_gpio_set_power (bcm->dev, true); +hci_uart_set_flow_control (hu, false);if (err) goto err_unset_hu; }This causes bluetooth breakage (degraded bluetooth performance, due to failure to switch to higher baudrate) for Orange Pi 3 board:
[ 3.839134] Bluetooth: hci0: command 0xfc18 tx timeout [ 11.999136] Bluetooth: hci0: BCM: failed to write update baudrate (-110) [ 12.004613] Bluetooth: hci0: Failed to set baudrate [ 12.123187] Bluetooth: hci0: BCM: chip id 130 [ 12.128398] Bluetooth: hci0: BCM: features 0x0f [ 12.154686] Bluetooth: hci0: BCM4345C5 [ 12.157165] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0000 [ 15.343684] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0038
Quoted 1 line
I suggest not pushing this to stable.
Is it being fixed in Linus's tree?
thanks,
greg k-h
Re: [PATCH AUTOSEL 5.4 133/350] Bluetooth: hci_bcm: Fix RTS handling during startup
Quoted 50 lines · Greg KH
Quoted 49 lines · Ondřej Jirman
Hi,
Quoted 23 lines · Sasha Levin
From: Stefan Wahren <[email protected]>
[ Upstream commit
3347a80965b38f096b1d6f995c00c9c9e53d4b8b]The RPi 4 uses the hardware handshake lines for CYW43455, but the chip doesn't react to HCI requests during DT probe. The reason is the inproper handling of the RTS line during startup. According to the startup signaling sequence in the CYW43455 datasheet, the hosts RTS line must be driven after
BT_REG_ONandBT_HOST_WAKE.Signed-off-by Stefan Wahren <[email protected]>Signed-off-by Marcel Holtmann <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/bluetooth/hci_bcm.c | 2 ++ 1 file changed, 2 insertions(+)drivers/bluetooth/hci_bcm.c +0
-0@@ -445,9 +445,11 @@ static int bcm_open(struct hci_uart *hu)drivers/bluetooth/hci_bcm.c static int bcm_open(struct hci_uart *hu) · line 455
Quoted 10 lines
drivers/bluetooth/hci_bcm.c +2
-0out:if (bcm->dev) { +hci_uart_set_flow_control (hu, true); hu->init_speed = bcm->dev->init_speed; hu->oper_speed = bcm->dev->oper_speed; err =bcm_gpio_set_power (bcm->dev, true); +hci_uart_set_flow_control (hu, false);if (err) goto err_unset_hu; }This causes bluetooth breakage (degraded bluetooth performance, due to failure to switch to higher baudrate) for Orange Pi 3 board:
[ 3.839134] Bluetooth: hci0: command 0xfc18 tx timeout [ 11.999136] Bluetooth: hci0: BCM: failed to write update baudrate (-110) [ 12.004613] Bluetooth: hci0: Failed to set baudrate [ 12.123187] Bluetooth: hci0: BCM: chip id 130 [ 12.128398] Bluetooth: hci0: BCM: features 0x0f [ 12.154686] Bluetooth: hci0: BCM4345C5 [ 12.157165] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0000 [ 15.343684] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0038
Quoted 3 lines
Quoted 1 line
I suggest not pushing this to stable.
Is it being fixed in Linus's tree?
No. This patch broke it there as well, and no response yet from the author.
regards,
o.
Quoted 3 lines
thanks,
greg k-h
Re: [PATCH AUTOSEL 5.4 133/350] Bluetooth: hci_bcm: Fix RTS handling during startup
In reply to Greg KHAm 16.12.19 um 14:27 schrieb Greg KH:
Quoted 49 lines · Ondřej Jirman
Quoted 48 lines
Hi,
Quoted 23 lines · Sasha Levin
From: Stefan Wahren <[email protected]>
[ Upstream commit
3347a80965b38f096b1d6f995c00c9c9e53d4b8b]The RPi 4 uses the hardware handshake lines for CYW43455, but the chip doesn't react to HCI requests during DT probe. The reason is the inproper handling of the RTS line during startup. According to the startup signaling sequence in the CYW43455 datasheet, the hosts RTS line must be driven after
BT_REG_ONandBT_HOST_WAKE.Signed-off-by Stefan Wahren <[email protected]>Signed-off-by Marcel Holtmann <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/bluetooth/hci_bcm.c | 2 ++ 1 file changed, 2 insertions(+)drivers/bluetooth/hci_bcm.c +0
-0@@ -445,9 +445,11 @@ static int bcm_open(struct hci_uart *hu)drivers/bluetooth/hci_bcm.c static int bcm_open(struct hci_uart *hu) · line 455
Quoted 10 lines
drivers/bluetooth/hci_bcm.c +2
-0out:if (bcm->dev) { +hci_uart_set_flow_control (hu, true); hu->init_speed = bcm->dev->init_speed; hu->oper_speed = bcm->dev->oper_speed; err =bcm_gpio_set_power (bcm->dev, true); +hci_uart_set_flow_control (hu, false);if (err) goto err_unset_hu; }This causes bluetooth breakage (degraded bluetooth performance, due to failure to switch to higher baudrate) for Orange Pi 3 board:
[ 3.839134] Bluetooth: hci0: command 0xfc18 tx timeout [ 11.999136] Bluetooth: hci0: BCM: failed to write update baudrate (-110) [ 12.004613] Bluetooth: hci0: Failed to set baudrate [ 12.123187] Bluetooth: hci0: BCM: chip id 130 [ 12.128398] Bluetooth: hci0: BCM: features 0x0f [ 12.154686] Bluetooth: hci0: BCM4345C5 [ 12.157165] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0000 [ 15.343684] Bluetooth: hci0: BCM4345C5 (003.006.006) build 0038
Quoted 2 lines
Quoted 1 line
I suggest not pushing this to stable.
Is it being fixed in Linus's tree?
No, because this mail was the first bug report.
But i agree with Ondřej to not push it into stable.
Stefan
Quoted 4 lines
thanks,
greg k-h
Sasha Levin
maintainerPATCH 134/350 net: hns3: log and clear hardware error after reset complete
In reply to Sasha LevinFrom: Jian Shen <[email protected]>
[ Upstream commit 4fdd0bca6152aa201898454e63cbb255a18ae6e9 ]
When device is resetting, the CMDQ service may be stopped until reset completed. If a new RAS error occurs at this moment, it will no be able to clear the RAS source. This patch fixes it by clear the RAS source after reset complete.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +3 -0
@@ -9443,6 +9443,9 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev)return ret; } +/* Log and clear the hw errors those already occurred */ +hclge_handle_all_hns_hw_errors (ae_dev); +/* Re-enable the hw error interrupts because * the interrupts get disabled on global reset. */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 135/350 RDMA/hns: Fix wrong parameters when initial mtt of srq->idx_que
In reply to Sasha LevinFrom: Weihang Li <[email protected]>
[ Upstream commit e8a07de57ea4ca7c2d604871c52826e66899fc70 ]
The parameters npages used to initial mtt of srq->idx_que shouldn't be same with srq's. And page_shift should be calculated from idx_buf_pg_sz. This patch fixes above issues and use field named npage and page_shift in hns_roce_buf instead of two temporary variables to let us use them anywhere.
--- drivers/infiniband/hw/hns/hns_roce_srq.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/infiniband/hw/hns/hns_roce_srq.c +14 -10
@@ -180,8 +180,7 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata, {struct hns_roce_dev *hr_dev =to_hr_dev (srq->ibsrq.device);struct hns_roce_ib_create_srq ucmd; -u32 page_shift; -u32 npages; +struct hns_roce_buf *buf;int ret;if (ib_copy_from_udata (&ucmd, udata,sizeof (ucmd)))
@@ -191,11 +190,13 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata,if (IS_ERR (srq->umem))return PTR_ERR (srq->umem); - npages = (ib_umem_page_count (srq->umem) + - (1 << hr_dev->caps.srqwqe_buf_pg_sz) -1 ) / - (1 << hr_dev->caps.srqwqe_buf_pg_sz); - page_shift =PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz; - ret =hns_roce_mtt_init (hr_dev, npages, page_shift, &srq->mtt); + buf = &srq->buf; + buf->npages = (ib_umem_page_count (srq->umem) + + (1 << hr_dev->caps.srqwqe_buf_pg_sz) -1 ) / + (1 << hr_dev->caps.srqwqe_buf_pg_sz); + buf->page_shift =PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz; + ret =hns_roce_mtt_init (hr_dev, buf->npages, buf->page_shift, + &srq->mtt);if (ret) goto err_user_buf;
@@ -212,9 +213,12 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata, goto err_user_srq_mtt; } - ret =hns_roce_mtt_init (hr_dev,ib_umem_page_count (srq->idx_que.umem), -PAGE_SHIFT , &srq->idx_que.mtt); - + buf = &srq->idx_que.idx_buf; + buf->npages =DIV_ROUND_UP (ib_umem_page_count (srq->idx_que.umem), +1 << hr_dev->caps.idx_buf_pg_sz); + buf->page_shift =PAGE_SHIFT + hr_dev->caps.idx_buf_pg_sz; + ret =hns_roce_mtt_init (hr_dev, buf->npages, buf->page_shift, + &srq->idx_que.mtt);if (ret) {dev_err (hr_dev->dev,"hns_roce_mtt_init error for idx que\n" ); goto err_user_idx_mtt;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 136/350 drm/gma500: fix memory disclosures due to uninitialized bytes
In reply to Sasha LevinFrom: Kangjie Lu <[email protected]>
[ Upstream commit ec3b7b6eb8c90b52f61adff11b6db7a8db34de19 ]
"clock" may be copied to "best_clock". Initializing best_clock is not sufficient. The fix initializes clock as well to avoid memory disclosures and informaiton leaks.
--- drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/gma500/oaktrail_crtc.c +2 -0
@@ -129,6 +129,7 @@ static bool mrst_sdvo_find_best_pll(const struct gma_limit_t *limit,s32 freq_error, min_error =100000 ;memset (best_clock,0 ,sizeof (*best_clock)); +memset (&clock,0 ,sizeof (clock));for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) { for (clock.n = limit->n.min; clock.n <= limit->n.max;
@@ -185,6 +186,7 @@ static bool mrst_lvds_find_best_pll(const struct gma_limit_t *limit,int err = target;memset (best_clock,0 ,sizeof (*best_clock)); +memset (&clock,0 ,sizeof (clock));for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) { for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 137/350 iio: pressure: zpa2326: fix iio_triggered_buffer_postenable position
In reply to Sasha LevinFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit fe2392c67db9730d46f11fc4fadfa7bffa8843fa ]
The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
The iio_triggered_buffer_postenable() should be called before (to attach the poll func) and then the
The iio_triggered_buffer_predisable() function is hooked directly without anything, which is probably fine, as the postenable() version seems to also do some reset/wake-up of the device.
This will mean it will be easier when removing it; i.e. it just gets removed.
--- drivers/iio/pressure/zpa2326.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/iio/pressure/zpa2326.c +9 -7
@@ -1243,6 +1243,11 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)const struct zpa2326_private *priv =iio_priv (indio_dev);int err; +/* Plug our own trigger event handler. */ + err =iio_triggered_buffer_postenable (indio_dev); +if (err) + goto err; +if (!priv->waken) {/* * We were already power supplied. Just clear hardware FIFO to
@@ -1250,7 +1255,7 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)*/ err =zpa2326_clear_fifo (indio_dev,0 );if (err) - goto err; + goto err_buffer_predisable; }if (!iio_trigger_using_own (indio_dev) && priv->waken) {
@@ -1260,16 +1265,13 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)*/ err =zpa2326_config_oneshot (indio_dev, priv->irq);if (err) - goto err; + goto err_buffer_predisable; } -/* Plug our own trigger event handler. */ - err =iio_triggered_buffer_postenable (indio_dev); -if (err) - goto err; -return 0 ; +err_buffer_predisable: +iio_triggered_buffer_predisable (indio_dev); err:zpa2326_err (indio_dev,"failed to enable buffering (%d)" , err);
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 137/350] iio: pressure: zpa2326: fix iio_triggered_buffer_postenable position
Quoted 7 lines · On Tue, 10 Dec 2019 16:04:02 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
fe2392c67db9730d46f11fc4fadfa7bffa8843fa]The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions.
Quoted 8 lines
The
iio_triggered_buffer_postenable()should be called before (to attach the poll func) and then theThe
iio_triggered_buffer_predisable()function is hooked directly without anything, which is probably fine, as thepostenable()version seems to also do some reset/wake-up of the device.
This will mean it will be easier when removing it; i.e. it just gets removed.
Ah. I should have added a note to this one as well. This is more general rework, that is a fix in the sense of bringing things towards a standard way of doing things rather than 'fixing' a known bug.
Alex, for any more of these, lets not have fix in the title (though they sort of do 'fix' things).
Thanks,
Jonathan
Quoted 53 lines
Signed-off-by Alexandru Ardelean <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/iio/pressure/zpa2326.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/iio/pressure/zpa2326.c +9
-7@@ -1243,6 +1243,11 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)const struct zpa2326_private *priv =iio_priv (indio_dev);int err; +/* Plug our own trigger event handler. */ + err =iio_triggered_buffer_postenable (indio_dev); +if (err) + goto err; +if (!priv->waken) {/* * We were already power supplied. Just clear hardware FIFO to @@ -1250,7 +1255,7 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)*/ err =zpa2326_clear_fifo (indio_dev,0 );if (err) - goto err; + goto err_buffer_predisable; }if (!iio_trigger_using_own (indio_dev) && priv->waken) {@@ -1260,16 +1265,13 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)*/ err =zpa2326_config_oneshot (indio_dev, priv->irq);if (err) - goto err; + goto err_buffer_predisable; } -/* Plug our own trigger event handler. */ - err =iio_triggered_buffer_postenable (indio_dev); -if (err) - goto err; -return 0 ; +err_buffer_predisable: +iio_triggered_buffer_predisable (indio_dev); err:zpa2326_err (indio_dev,"failed to enable buffering (%d)" , err);
Re: [PATCH AUTOSEL 5.4 137/350] iio: pressure: zpa2326: fix iio_triggered_buffer_postenable position
Quoted 25 lines · Jonathan Cameron
[External]
Quoted 12 lines · On Tue, 10 Dec 2019 16:04:02 -0500 Sasha Levin <[email protected]> wrote:
From: Alexandru Ardelean <[email protected]>
[ Upstream commit
fe2392c67db9730d46f11fc4fadfa7bffa8843fa]The iio_triggered_buffer_{predisable,postenable} functions attach/detach
the poll functions.The
iio_triggered_buffer_postenable()should be called before (to attach
the poll func) and then theQuoted 7 lines
The
iio_triggered_buffer_predisable()function is hooked directly without
anything, which is probably fine, as thepostenable()version seems to also
do some reset/wake-up of the device.
This will mean it will be easier when removing it; i.e. it just gets removed.
Quoted 7 lines
Ah. I should have added a note to this one as well. This is more general rework, that is a fix in the sense of bringing things towards a standard way of doing things rather than 'fixing' a known bug.
Alex, for any more of these, lets not have fix in the title (though they sort of do 'fix' things).
Ack.
I don't think there are many drivers left though.
But will keep this in mind.
Thanks
Alex
Quoted 61 lines
Thanks,
Jonathan
Quoted 57 lines
Signed-off-by Alexandru Ardelean <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/iio/pressure/zpa2326.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/iio/pressure/zpa2326.c +5
-0@@ -1243,6 +1243,11 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)const struct zpa2326_private *priv =iio_priv (indio_dev);int err; +/* Plug our own trigger event handler. */ + err =iio_triggered_buffer_postenable (indio_dev); +if (err) + goto err; +if (!priv->waken) {/* * We were already power supplied. Just clear hardware FIFO
todrivers/iio/pressure/zpa2326.c +1
-1@@ -1250,7 +1255,7 @@ static int zpa2326_postenable_buffer(structiio_dev *indio_dev) */ err =zpa2326_clear_fifo (indio_dev,0 );if (err) - goto err; + goto err_buffer_predisable; }drivers/iio/pressure/zpa2326.c +3
-6if (!iio_trigger_using_own (indio_dev) && priv->waken) {@@ -1260,16 +1265,13 @@ static int zpa2326_postenable_buffer(structiio_dev *indio_dev) */ err =zpa2326_config_oneshot (indio_dev, priv->irq);if (err) - goto err; + goto err_buffer_predisable; } -/* Plug our own trigger event handler. */ - err =iio_triggered_buffer_postenable (indio_dev); -if (err) - goto err; -return 0 ; +err_buffer_predisable: +iio_triggered_buffer_predisable (indio_dev); err:zpa2326_err (indio_dev,"failed to enable buffering (%d)" , err);
Sasha Levin
maintainerPATCH 138/350 ASoC: soc-pcm: fixup dpcm_prune_paths() loop continue
In reply to Sasha LevinFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit bed646dc3f7bcec91178c278deaf969cce0700a8 ]
dpcm_prune_paths() is checking widget at 2 parts.
(A) is for CPU, (B) is for Codec.
If we focus to (A) part, continue at (a) is for (1) loop. But, if we focus to (B) part, continue at (b) is for (2) loop, not for (1). This is bug.
This patch fixup this issue.
static int dpcm_prune_paths(...)
{
...
(1) for_each_dpcm_be(fe, stream, dpcm) {
... ^ widget = dai_get_widget(...);
|
(A) if (widget && widget_in_list(...))
| (a) continue;
v
^ (2) for_each_rtd_codec_dai(...) {
| widget = dai_get_widget(...);
(B)
| if (widget && widget_in_list(...))
v (b) continue; } ...
--- sound/soc/soc-pcm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +5 -1
@@ -1385,6 +1385,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,struct snd_soc_dapm_widget *widget;struct snd_soc_dai *dai;int prune =0 ; +int do_prune;/* Destroy any old FE <--> BE connections */ for_each_dpcm_be (fe, stream, dpcm) {
@@ -1398,13 +1399,16 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,continue ;/* is there a valid CODEC DAI widget for this BE */ + do_prune =1 ;for_each_rtd_codec_dai (dpcm->be, i, dai) { widget =dai_get_widget (dai, stream);/* prune the BE if it's no longer in our active list */ if (widget &&widget_in_list (list, widget)) -continue ; + do_prune =0 ; } +if (!do_prune) +continue ; dev_dbg(fe->dev, "ASoC: pruning %s BE %s for %s\n", stream ? "capture" : "playback",
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 139/350 rtl8xxxu: fix RTL8723BU connection failure issue after warm reboot
In reply to Sasha LevinFrom: Chris Chiu <[email protected]>
[ Upstream commit 0eeb91ade90ce06d2fa1e2fcb55e3316b64c203c ]
The RTL8723BU has problems connecting to AP after each warm reboot. Sometimes it returns no scan result, and in most cases, it fails the authentication for unknown reason. However, it works totally fine after cold reboot.
Compare the value of register SYS_CR and SYS_CLK_MAC_CLK_ENABLE for cold reboot and warm reboot, the registers imply that the MAC is already powered and thus some procedures are skipped during driver initialization. Double checked the vendor driver, it reads the SYS_CR and SYS_CLK_MAC_CLK_ENABLE also but doesn't skip any during initialization based on them. This commit only tells the RTL8723BU to do full initialization without checking MAC status.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +++ 3 files changed, 5 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +1 -0
@@ -1341,6 +1341,7 @@ struct rtl8xxxu_fileops { u8 has_s0s1:1; u8 has_tx_report:1; u8 gen2_thermal_meter:1; + u8 needs_full_init:1;u32 adda_1t_init;u32 adda_1t_path_on;u32 adda_2t_path_on_a;
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +1 -0
@@ -1670,6 +1670,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops = { .has_s0s1 = 1, .has_tx_report = 1, .gen2_thermal_meter = 1, + .needs_full_init = 1, .adda_1t_init = 0x01c00014, .adda_1t_path_on = 0x01c00014, .adda_2t_path_on_a = 0x01c00014,
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +3 -0
@@ -3902,6 +3902,9 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)else macpower = true; +if (fops->needs_full_init) + macpower = false; + ret = fops->power_on (priv);if (ret <0 ) {dev_warn (dev,"%s: Failed power on\n" , __func__);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 140/350 RDMA/siw: Fix SQ/RQ drain logic
In reply to Sasha LevinFrom: Bernard Metzler <[email protected]>
[ Upstream commit cf049bb31f7101d9672eaf97ade4fdd5171ddf26 ]
Storage ULPs (e.g. iSER & NVMeOF) use ib_drain_qp() to drain QP/CQ. Current SIW's own drain routines do not properly wait until all SQ/RQ elements are completed and reaped from the CQ. This may cause touch after free issues. New logic relies on generic __ib_drain_sq()/__ib_drain_rq() posting a final work request, which SIW immediately flushes to CQ.
--- drivers/infiniband/sw/siw/siw_main.c | 20 ---- drivers/infiniband/sw/siw/siw_verbs.c | 144 ++++++++++++++++++++++---- 2 files changed, 122 insertions(+), 42 deletions(-)
drivers/infiniband/sw/siw/siw_main.c +0 -20
@@ -248,24 +248,6 @@ static struct ib_qp *siw_get_base_qp(struct ib_device *base_dev, int id)return NULL ; } -static void siw_verbs_sq_flush (struct ib_qp *base_qp) -{ -struct siw_qp *qp =to_siw_qp (base_qp); - -down_write (&qp->state_lock); -siw_sq_flush (qp); -up_write (&qp->state_lock); -} - -static void siw_verbs_rq_flush (struct ib_qp *base_qp) -{ -struct siw_qp *qp =to_siw_qp (base_qp); - -down_write (&qp->state_lock); -siw_rq_flush (qp); -up_write (&qp->state_lock); -} -static const struct ib_device_ops siw_device_ops = { .owner =THIS_MODULE , .uverbs_abi_ver =SIW_ABI_VERSION ,
@@ -284,8 +266,6 @@ static const struct ib_device_ops siw_device_ops = { .destroy_cq = siw_destroy_cq, .destroy_qp = siw_destroy_qp, .destroy_srq = siw_destroy_srq, - .drain_rq = siw_verbs_rq_flush, - .drain_sq = siw_verbs_sq_flush, .get_dma_mr = siw_get_dma_mr, .get_port_immutable = siw_get_port_immutable, .iw_accept = siw_accept,
drivers/infiniband/sw/siw/siw_verbs.c +122 -22
178 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 141/350 ipmi: Don't allow device module unload when in use
In reply to Sasha LevinFrom: Corey Minyard <[email protected]>
[ Upstream commit cbb79863fc3175ed5ac506465948b02a893a8235 ]
If something has the IPMI driver open, don't allow the device module to be unloaded. Before it would unload and the user would get errors on use.
This change is made on user request, and it makes it consistent with the I2C driver, which has the same behavior.
It does change things a little bit with respect to kernel users. If the ACPI or IPMI watchdog (or any other kernel user) has created a user, then the device module cannot be unloaded. Before it could be unloaded,
This does not affect hot-plug. If the device goes away (it's on something removable that is removed or is hot-removed via sysfs) then it still behaves as it did before.
--- drivers/char/ipmi/ipmi_msghandler.c | 23 ++++++++++++++++------- include/linux/ipmi_smi.h | 12 ++++++++---- 2 files changed, 24 insertions(+), 11 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +16 -7
@@ -448,6 +448,8 @@ enum ipmi_stat_indexes {#define IPMI_IPMB_NUM_SEQ 64struct ipmi_smi { +struct module *owner; +/* What interface number are we? */ int intf_num;
@@ -1220,6 +1222,11 @@ int ipmi_create_user(unsigned int if_num,if (rv) goto out_kfree; +if (!try_module_get (intf->owner)) { + rv = -ENODEV ; + goto out_kfree; + } +/* Note that each existing user holds a refcount to the interface. */ kref_get (&intf->refcount);
@@ -1349,6 +1356,7 @@ static void _ipmi_destroy_user(struct ipmi_user *user) }kref_put (&intf->refcount, intf_free); +module_put (intf->owner); }int ipmi_destroy_user (struct ipmi_user *user)
@@ -2459,7 +2467,7 @@ static int __get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc)* been recently fetched, this will just use the cached data. Otherwise * it will run a new fetch. * -* Except for the first time this is called (in ipmi_register_smi()), +* Except for the first time this is called (in ipmi_add_smi()), * this will always return good data; */ static int __bmc_get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc,
@@ -3377,10 +3385,11 @@ static void redo_bmc_reg(struct work_struct *work)kref_put (&intf->refcount, intf_free); } -int ipmi_register_smi (const struct ipmi_smi_handlers *handlers, -void *send_info, -struct device *si_dev, -unsigned char slave_addr) +int ipmi_add_smi (struct module *owner, +const struct ipmi_smi_handlers *handlers, +void *send_info, +struct device *si_dev, +unsigned char slave_addr) {int i, j;int rv;
@@ -3406,7 +3415,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,return rv; } - + intf->owner = owner; intf->bmc = &intf->tmp_bmc;INIT_LIST_HEAD (&intf->bmc->intfs);mutex_init (&intf->bmc->dyn_mutex);
@@ -3514,7 +3523,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,return rv; } -EXPORT_SYMBOL (ipmi_register_smi); +EXPORT_SYMBOL (ipmi_add_smi); static void deliver_smi_err_response(struct ipmi_smi *intf, struct ipmi_smi_msg *msg,
include/linux/ipmi_smi.h +8 -4
@@ -224,10 +224,14 @@ static inline int ipmi_demangle_device_id(uint8_t netfn, uint8_t cmd,* is called, and the lower layer must get the interface from that * call. */ -int ipmi_register_smi (const struct ipmi_smi_handlers *handlers, -void *send_info, -struct device *dev, -unsigned char slave_addr); +int ipmi_add_smi (struct module *owner, +const struct ipmi_smi_handlers *handlers, +void *send_info, +struct device *dev, +unsigned char slave_addr); + +#define ipmi_register_smi (handlers, send_info, dev, slave_addr) \ + ipmi_add_smi(THIS_MODULE, handlers, send_info, dev, slave_addr)/* * Remove a low-level interface from the IPMI driver. This will
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 142/350 x86/ioapic: Prevent inconsistent state when moving an interrupt
In reply to Sasha LevinFrom: Thomas Gleixner <[email protected]>
[ Upstream commit df4393424af3fbdcd5c404077176082a8ce459c4 ]
There is an issue with threaded interrupts which are marked ONESHOT and using the fasteoi handler:
if (IS_ONESHOT())
mask_irq();
....
cond_unmask_eoi_irq()
chip->irq_eoi();
if (setaffinity_pending) {
mask_ioapic();
...
move_affinity();
unmask_ioapic();
}So if setaffinity is pending the interrupt will be moved and then unconditionally unmasked at the ioapic level, which is wrong in two aspects:
1) It should be kept masked up to the point where the threaded handler finished.
2) The physical chip state and the software masked state are inconsistent
Guard both the mask and the unmask with a check for the software masked state. If the line is marked masked then the ioapic line is also masked, so both mask_ioapic() and unmask_ioapic() can be skipped safely.
--- arch/x86/kernel/apic/io_apic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/io_apic.c +6 -3
@@ -1727,9 +1727,10 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)static inline bool ioapic_irqd_mask (struct irq_data *data) { -/* If we are moving the irq we need to mask it */ +/* If we are moving the IRQ we need to mask it */ if (unlikely (irqd_is_setaffinity_pending (data))) { -mask_ioapic_irq (data); +if (!irqd_irq_masked (data)) +mask_ioapic_irq (data);return true; }return false;
@@ -1766,7 +1767,9 @@ static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)*/ if (!io_apic_level_ack_pending (data->chip_data))irq_move_masked_irq (data); - unmask_ioapic_irq(data); +/* If the IRQ is masked in the core, leave it: */ +if (!irqd_irq_masked (data)) + unmask_ioapic_irq(data); } }#else
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 143/350 drm/nouveau: Resume hotplug interrupts earlier
In reply to Sasha LevinFrom: Lyude Paul <[email protected]>
[ Upstream commit ac0de16a38a9ec7026ca96132e3883c564497068 ]
Currently, we enable hotplug detection only after we re-enable the display. However, this is too late if we're planning on sending sideband messages during the resume process - which we'll need to do in order to reprobe the topology on resume.
So, enable hotplug events before reinitializing the display.
--- drivers/gpu/drm/nouveau/nouveau_display.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/gpu/drm/nouveau/nouveau_display.c +11 -8
@@ -407,6 +407,17 @@ nouveau_display_init(struct drm_device *dev, bool resume, bool runtime)struct drm_connector_list_iter conn_iter;int ret; +/* +* Enable hotplug interrupts (done as early as possible, since we need +* them for MST) +*/ +drm_connector_list_iter_begin (dev, &conn_iter); +nouveau_for_each_non_mst_connector_iter (connector, &conn_iter) { +struct nouveau_connector *conn =nouveau_connector (connector); +nvif_notify_get (&conn->hpd); + } +drm_connector_list_iter_end (&conn_iter); + ret = disp->init (dev, resume, runtime);if (ret)return ret;
@@ -416,14 +427,6 @@ nouveau_display_init(struct drm_device *dev, bool resume, bool runtime)*/ drm_kms_helper_poll_enable (dev); -/* enable hotplug interrupts */ -drm_connector_list_iter_begin (dev, &conn_iter); -nouveau_for_each_non_mst_connector_iter (connector, &conn_iter) { -struct nouveau_connector *conn =nouveau_connector (connector); -nvif_notify_get (&conn->hpd); - } -drm_connector_list_iter_end (&conn_iter); -return ret; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH AUTOSEL 5.4 143/350] drm/nouveau: Resume hotplug interrupts earlier
huh? Not sure how this got put in the stable queue, but this probably should be dropped. this was prepatory work for some MST functionality that got added recently, not a fix.
Quoted 65 lines · Sasha Levin
From: Lyude Paul <[email protected]>
[ Upstream commit
ac0de16a38a9ec7026ca96132e3883c564497068]Currently, we enable hotplug detection only after we re-enable the display. However, this is too late if we're planning on sending sideband messages during the resume process - which we'll need to do in order to reprobe the topology on resume.
So, enable hotplug events before reinitializing the display.
Cc Juston Li <[email protected]>Cc Imre Deak <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Harry Wentland <[email protected]>Cc Daniel Vetter <[email protected]>Reviewed-by Sean Paul <[email protected]>Signed-off-by Lyude Paul <[email protected]>Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]Signed-off-by Sasha Levin <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_display.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)drivers/gpu/drm/nouveau/nouveau_display.c +11
-0@@ -407,6 +407,17 @@ nouveau_display_init(struct drm_device *dev, bool resume, bool runtime)struct drm_connector_list_iter conn_iter;int ret; +/* +* Enable hotplug interrupts (done as early as possible, since we need +* them for MST) +*/ +drm_connector_list_iter_begin (dev, &conn_iter); +nouveau_for_each_non_mst_connector_iter (connector, &conn_iter) { +struct nouveau_connector *conn =nouveau_connector (connector); +nvif_notify_get (&conn->hpd); + } +drm_connector_list_iter_end (&conn_iter); + ret = disp->init (dev, resume, runtime);if (ret)drivers/gpu/drm/nouveau/nouveau_display.c +0
-8return ret;@@ -416,14 +427,6 @@ nouveau_display_init(struct drm_device *dev, boolresume, bool runtime) */ drm_kms_helper_poll_enable (dev); -/* enable hotplug interrupts */ -drm_connector_list_iter_begin (dev, &conn_iter); -nouveau_for_each_non_mst_connector_iter (connector, &conn_iter) { -struct nouveau_connector *conn =nouveau_connector (connector); -nvif_notify_get (&conn->hpd); - } -drm_connector_list_iter_end (&conn_iter); -return ret; }
Signature · 2 lines
Cheers, Lyude Paul
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.4 143/350] drm/nouveau: Resume hotplug interrupts earlier
Quoted 3 lines · Lyude Paul
huh? Not sure how this got put in the stable queue, but this probably should be dropped. this was prepatory work for some MST functionality that got added recently, not a fix.
Dropped, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 144/350 media: cedrus: Fix undefined shift with a SHIFT_AND_MASK_BITS macro
In reply to Sasha LevinFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 06eff2150d4db991ca236f3d05a9dc0101475aea ]
We need to shift and mask values at different occasions to fill up cedrus registers. This was done using macros that don't explicitly treat arguments as unsigned, leading to possibly undefined behavior.
Introduce the SHIFT_AND_MASK_BITS macro and use it where possible. In cases where it doesn't apply as-is, explicitly cast to unsigned instead.
This macro should be moved to include/linux/bits.h eventually.
--- .../staging/media/sunxi/cedrus/cedrus_regs.h | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/staging/media/sunxi/cedrus/cedrus_regs.h +17 -14
@@ -10,6 +10,9 @@#ifndef _CEDRUS_REGS_H_#define _CEDRUS_REGS_H_ +#define SHIFT_AND_MASK_BITS (v, h, l) \ + (((unsigned long)(v) << (l)) & GENMASK(h, l)) +/* * Common acronyms and contractions used in register descriptions: * * VLD : Variable-Length Decoder
@@ -37,8 +40,8 @@#define VE_PRIMARY_CHROMA_BUF_LEN 0xc4#define VE_PRIMARY_FB_LINE_STRIDE 0xc8 -#define VE_PRIMARY_FB_LINE_STRIDE_CHROMA (s) (((s) << 16) & GENMASK(31, 16)) -#define VE_PRIMARY_FB_LINE_STRIDE_LUMA (s) (((s) << 0) & GENMASK(15, 0)) +#define VE_PRIMARY_FB_LINE_STRIDE_CHROMA (s) SHIFT_AND_MASK_BITS(s, 31, 16) +#define VE_PRIMARY_FB_LINE_STRIDE_LUMA (s) SHIFT_AND_MASK_BITS(s, 15, 0)#define VE_CHROMA_BUF_LEN 0xe8
@@ -46,7 +49,7 @@#define VE_SECONDARY_OUT_FMT_EXT (0x01 << 30)#define VE_SECONDARY_OUT_FMT_YU12 (0x02 << 30)#define VE_SECONDARY_OUT_FMT_YV12 (0x03 << 30) -#define VE_CHROMA_BUF_LEN_SDRT (l) ((l) & GENMASK(27, 0)) +#define VE_CHROMA_BUF_LEN_SDRT (l) SHIFT_AND_MASK_BITS(l, 27, 0)#define VE_PRIMARY_OUT_FMT 0xec
@@ -69,15 +72,15 @@#define VE_DEC_MPEG_MP12HDR (VE_ENGINE_DEC_MPEG + 0x00) -#define VE_DEC_MPEG_MP12HDR_SLICE_TYPE (t) (((t) << 28) & GENMASK(30, 28)) +#define VE_DEC_MPEG_MP12HDR_SLICE_TYPE (t) SHIFT_AND_MASK_BITS(t, 30, 28)#define VE_DEC_MPEG_MP12HDR_F_CODE_SHIFT (x, y) (24 - 4 * (y) - 8 * (x))#define VE_DEC_MPEG_MP12HDR_F_CODE (__x, __y, __v) \ - (((__v) & GENMASK(3, 0)) << VE_DEC_MPEG_MP12HDR_F_CODE_SHIFT(__x, __y)) + (((unsigned long)(__v) & GENMASK(3, 0)) << VE_DEC_MPEG_MP12HDR_F_CODE_SHIFT(__x, __y))#define VE_DEC_MPEG_MP12HDR_INTRA_DC_PRECISION (p) \ - (((p) << 10) & GENMASK(11, 10)) + SHIFT_AND_MASK_BITS(p, 11, 10)#define VE_DEC_MPEG_MP12HDR_INTRA_PICTURE_STRUCTURE (s) \ - (((s) << 8) & GENMASK(9, 8)) + SHIFT_AND_MASK_BITS(s, 9, 8)#define VE_DEC_MPEG_MP12HDR_TOP_FIELD_FIRST (v) \ ((v) ? BIT(7) : 0)#define VE_DEC_MPEG_MP12HDR_FRAME_PRED_FRAME_DCT (v) \
@@ -98,19 +101,19 @@#define VE_DEC_MPEG_PICCODEDSIZE (VE_ENGINE_DEC_MPEG + 0x08)#define VE_DEC_MPEG_PICCODEDSIZE_WIDTH (w) \ - ((DIV_ROUND_UP((w), 16) << 8) & GENMASK(15, 8)) + SHIFT_AND_MASK_BITS(DIV_ROUND_UP((w), 16), 15, 8)#define VE_DEC_MPEG_PICCODEDSIZE_HEIGHT (h) \ - ((DIV_ROUND_UP((h), 16) << 0) & GENMASK(7, 0)) + SHIFT_AND_MASK_BITS(DIV_ROUND_UP((h), 16), 7, 0)#define VE_DEC_MPEG_PICBOUNDSIZE (VE_ENGINE_DEC_MPEG + 0x0c) -#define VE_DEC_MPEG_PICBOUNDSIZE_WIDTH (w) (((w) << 16) & GENMASK(27, 16)) -#define VE_DEC_MPEG_PICBOUNDSIZE_HEIGHT (h) (((h) << 0) & GENMASK(11, 0)) +#define VE_DEC_MPEG_PICBOUNDSIZE_WIDTH (w) SHIFT_AND_MASK_BITS(w, 27, 16) +#define VE_DEC_MPEG_PICBOUNDSIZE_HEIGHT (h) SHIFT_AND_MASK_BITS(h, 11, 0)#define VE_DEC_MPEG_MBADDR (VE_ENGINE_DEC_MPEG + 0x10) -#define VE_DEC_MPEG_MBADDR_X (w) (((w) << 8) & GENMASK(15, 8)) -#define VE_DEC_MPEG_MBADDR_Y (h) (((h) << 0) & GENMASK(7, 0)) +#define VE_DEC_MPEG_MBADDR_X (w) SHIFT_AND_MASK_BITS(w, 15, 8) +#define VE_DEC_MPEG_MBADDR_Y (h) SHIFT_AND_MASK_BITS(h, 7, 0)#define VE_DEC_MPEG_CTRL (VE_ENGINE_DEC_MPEG + 0x14)
@@ -225,7 +228,7 @@#define VE_DEC_MPEG_IQMINPUT_FLAG_INTRA (0x01 << 14)#define VE_DEC_MPEG_IQMINPUT_FLAG_NON_INTRA (0x00 << 14)#define VE_DEC_MPEG_IQMINPUT_WEIGHT (i, v) \ - (((v) & GENMASK(7, 0)) | (((i) << 8) & GENMASK(13, 8))) + (SHIFT_AND_MASK_BITS(i, 13, 8) | SHIFT_AND_MASK_BITS(v, 7, 0))#define VE_DEC_MPEG_ERROR (VE_ENGINE_DEC_MPEG + 0xc4)#define VE_DEC_MPEG_CRTMBADDR (VE_ENGINE_DEC_MPEG + 0xc8)
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 145/350 media: aspeed: set hsync and vsync polarities to normal before starting mode detection
In reply to Sasha LevinFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit 5b3f3c41c5c791c1c22cd91655e7ef4b2a1dff7c ]
Sometimes it detects a weird resolution such as 1024x287 when the actual resolution is 1024x768. To resolve such an issue, this commit adds clearing for hsync and vsync polarity register bits at the beginning of the first mode detection. This is recommended in the datasheet.
--- drivers/media/platform/aspeed-video.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/aspeed-video.c +2 -0
@@ -741,6 +741,8 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) }set_bit (VIDEO_RES_DETECT , &video->flags); +aspeed_video_update (video,VE_CTRL , +VE_CTRL_VSYNC_POL |VE_CTRL_HSYNC_POL ,0 );aspeed_video_enable_mode_detect (video); rc = wait_event_interruptible_timeout(video->wait,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 146/350 drm/nouveau: Don't grab runtime PM refs for HPD IRQs
In reply to Sasha LevinFrom: Lyude Paul <[email protected]>
[ Upstream commit 09e530657e1c982d3dbc5e4302bf9207950c3d0a ]
In order for suspend/resume reprobing to work, we need to be able to perform sideband communications during suspend/resume, along with runtime PM suspend/resume. In order to do so, we also need to make sure that nouveau doesn't bother grabbing a runtime PM reference to do so, since otherwise we'll start deadlocking runtime PM again.
Note that we weren't able to do this before, because of the DP MST helpers processing UP requests from topologies in the same context as drm_dp_mst_hpd_irq() which would have caused us to open ourselves up to receiving hotplug events and deadlocking with runtime suspend/resume. Now that those requests are handled asynchronously, this change should be completely safe.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 33 +++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +17 -16
@@ -1131,6 +1131,16 @@ nouveau_connector_hotplug(struct nvif_notify *notify)const char *name = connector->name;struct nouveau_encoder *nv_encoder;int ret; +bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG ); + +if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) { +NV_DEBUG (drm,"service %s\n" , name); +drm_dp_cec_irq (&nv_connector->aux); +if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) +nv50_mstm_service (nv_encoder->dp.mstm); + +return NVIF_NOTIFY_KEEP ; + } ret =pm_runtime_get (drm->dev->dev);if (ret ==0 ) {
@@ -1151,25 +1161,16 @@ nouveau_connector_hotplug(struct nvif_notify *notify)return NVIF_NOTIFY_DROP ; } -if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) { -NV_DEBUG (drm,"service %s\n" , name); -drm_dp_cec_irq (&nv_connector->aux); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) -nv50_mstm_service (nv_encoder->dp.mstm); - }else { -bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG ); - +if (!plugged) +drm_dp_cec_unset_edid (&nv_connector->aux); +NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); +if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) {if (!plugged) -drm_dp_cec_unset_edid (&nv_connector->aux); -NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) { -if (!plugged) -nv50_mstm_remove (nv_encoder->dp.mstm); - } - -drm_helper_hpd_irq_event (connector->dev); +nv50_mstm_remove (nv_encoder->dp.mstm); } +drm_helper_hpd_irq_event (connector->dev); +pm_runtime_mark_last_busy (drm->dev->dev);pm_runtime_put_autosuspend (drm->dev->dev);return NVIF_NOTIFY_KEEP ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 147/350 media: ov6650: Fix stored frame interval not in sync with hardware
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 57822068dd120386b98891cb151dc20107b63ba7 ]
The driver stores a frame interval value supposed to be in line with hardware state in a device private structure. Since the driver initial submission, the respective field of the structure has never been initialised on device probe. Moreover, if updated from .s_frame_interval(), a new value is stored before it is applied on hardware. If an error occurs during device update, the stored value may no longer reflect hardware state and consecutive calls to .g_frame_interval() may return incorrect information.
Assuming a failed update of the device means its actual state hasn't changed, update the frame interval field of the device private structure with a new value only after it is successfully applied on hardware so it always reflects actual hardware state to the extent possible. Also, initialise the field with hardware default frame interval on device probe.
--- drivers/media/i2c/ov6650.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/media/i2c/ov6650.c +12 -9
@@ -130,6 +130,7 @@#define CLKRC_24MHz 0xc0#define CLKRC_DIV_MASK 0x3f#define GET_CLKRC_DIV (x) (((x) & CLKRC_DIV_MASK) + 1) +#define DEF_CLKRC 0x00#define COMA_RESET BIT(7)#define COMA_QCIF BIT(5)
@@ -758,19 +759,17 @@ static int ov6650_s_frame_interval(struct v4l2_subdev *sd,else if (div >GET_CLKRC_DIV (CLKRC_DIV_MASK )) div =GET_CLKRC_DIV (CLKRC_DIV_MASK ); -/* -* Keep result to be used as tpf limit -* for subsequent clock divider calculations -*/ - priv->tpf.numerator = div; - priv->tpf.denominator =FRAME_RATE_MAX ; + tpf->numerator = div; + tpf->denominator =FRAME_RATE_MAX ; - clkrc =to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max); + clkrc =to_clkrc (tpf, priv->pclk_limit, priv->pclk_max); ret =ov6650_reg_rmw (client,REG_CLKRC , clkrc,CLKRC_DIV_MASK );if (!ret) { - tpf->numerator =GET_CLKRC_DIV (clkrc); - tpf->denominator =FRAME_RATE_MAX ; + priv->tpf.numerator =GET_CLKRC_DIV (clkrc); + priv->tpf.denominator =FRAME_RATE_MAX ; + + *tpf = priv->tpf; }return ret;
@@ -1011,6 +1010,10 @@ static int ov6650_probe(struct i2c_client *client, priv->code =MEDIA_BUS_FMT_YUYV8_2X8 ; priv->colorspace =V4L2_COLORSPACE_JPEG ; +/* Hardware default frame interval */ + priv->tpf.numerator =GET_CLKRC_DIV (DEF_CLKRC ); + priv->tpf.denominator =FRAME_RATE_MAX ; + priv->subdev.internal_ops = &ov6650_internal_ops; ret =v4l2_async_register_subdev (&priv->subdev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 148/350 media: ad5820: Define entity function
In reply to Sasha LevinFrom: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit 801ef7c4919efba6b96b5aed1e72844ca69e26d3 ]
Without this patch, media_device_register_entity throws a warning:
dev_warn(mdev->dev,
"Entity type for entity %s was not initialized!\n", entity->name);
--- drivers/media/i2c/ad5820.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/ad5820.c +1 -0
@@ -309,6 +309,7 @@ static int ad5820_probe(struct i2c_client *client,v4l2_i2c_subdev_init (&coil->subdev, client, &ad5820_ops); coil->subdev.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; coil->subdev.internal_ops = &ad5820_internal_ops; + coil->subdev.entity.function =MEDIA_ENT_F_LENS ;strscpy (coil->subdev.name,"ad5820 focus" ,sizeof (coil->subdev.name)); ret =media_entity_pads_init (&coil->subdev.entity,0 ,NULL );
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 5.4 148/350] media: ad5820: Define entity function
Quoted 9 lines · Sasha Levin
From: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit
801ef7c4919efba6b96b5aed1e72844ca69e26d3]Without this patch,
media_device_register_entitythrows a warning:dev_warn(mdev->dev,
"Entity type for entity %s was not initialized!\n", entity->name);
This fixes warning, not a serious bug. Thus it is against stable rules.
Please either update the rules to the real rules in use, or stop pushing such pages to stable.
Best regards,
Pavel
Quoted 13 lines
index
925c171e77976..7a49651f4d1f2100644drivers/media/i2c/ad5820.c +1
-0@@ -309,6 +309,7 @@ static int ad5820_probe(struct i2c_client *client,v4l2_i2c_subdev_init (&coil->subdev, client, &ad5820_ops); coil->subdev.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; coil->subdev.internal_ops = &ad5820_internal_ops; + coil->subdev.entity.function =MEDIA_ENT_F_LENS ;strscpy (coil->subdev.name,"ad5820 focus" ,sizeof (coil->subdev.name)); ret =media_entity_pads_init (&coil->subdev.entity,0 ,NULL );Signature · 1 line
2.20.1
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH AUTOSEL 5.4 148/350] media: ad5820: Define entity function
Quoted 5 lines · Pavel Machek
Quoted 4 lines · Sasha Levin
From: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit
801ef7c4919efba6b96b5aed1e72844ca69e26d3]
Quoted 8 lines
Quoted 5 lines
Without this patch,
media_device_register_entitythrows a warning:dev_warn(mdev->dev,
"Entity type for entity %s was not initialized!\n", entity->name);This fixes warning, not a serious bug. Thus it is against stable rules.
That's a good enough fix for a real issue. We take patches in stable for this all the time.
thanks,
greg k-h
Re: [PATCH AUTOSEL 5.4 148/350] media: ad5820: Define entity function
Quoted 12 lines · Pavel Machek
Quoted 11 lines · Sasha Levin
Quoted 9 lines
From: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit
801ef7c4919efba6b96b5aed1e72844ca69e26d3]Without this patch,
media_device_register_entitythrows a warning:dev_warn(mdev->dev,
"Entity type for entity %s was not initialized!\n", entity->name);
Quoted 5 lines
Quoted 2 lines
This fixes warning, not a serious bug. Thus it is against stable rules.
That's a good enough fix for a real issue. We take patches in stable for this all the time.
I know you do this all the time...
But that's not what the documentation says you should be doing!
- It must fix a problem that causes a build error (but not for things marked CONFIG_BROKEN), an oops, a hang, data corruption, a real security issue, or some "oh, that's not good" issue. In short, something
critical.
I'd prefer you to act as the documentation says you would, but even just fixing the documentation would be improvement over current situation.
Thanks,
Pavel
Sasha Levin
maintainerPATCH 149/350 media: ov5640: Make 2592x1944 mode only available at 15 fps
In reply to Sasha LevinFrom: Benoit Parrot <[email protected]>
[ Upstream commit 981e445454531c9d5ac5d3fa8c0f1bd55262d001 ]
The sensor data sheet clearly state that 2592x1944 only works at 15 fps make sure we don't try to miss configure the pll out of acceptable range.
--- drivers/media/i2c/ov5640.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/ov5640.c +5 -0
@@ -1611,6 +1611,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, !(mode->hact == 640 && mode->vact == 480))return NULL ; +/* 2592x1944 only works at 15fps max */ +if ((mode->hact ==2592 && mode->vact ==1944 ) && + fr >OV5640_15_FPS ) +return NULL ; +return mode; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 150/350 media: st-mipid02: add a check for devm_gpiod_get_optional
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 61c03b631b74a38ab53753f3ee971a55886d4843 ]
mipid02_probe misses a check for devm_gpiod_get_optional and may miss the failure.
Add a check to fix the problem.
--- drivers/media/i2c/st-mipid02.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/st-mipid02.c +5 -0
@@ -971,6 +971,11 @@ static int mipid02_probe(struct i2c_client *client) bridge->reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH ); +if (IS_ERR (bridge->reset_gpio)) { +dev_err (dev,"failed to get reset GPIO\n" ); +return PTR_ERR (bridge->reset_gpio); + } + ret =mipid02_get_regulators (bridge);if (ret) {dev_err (dev,"failed to get regulators %d" , ret);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 151/350 media: imx7-mipi-csis: Add a check for devm_regulator_get
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit a0219deefe9ee5006a28d48522f76b217d198c51 ]
devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.
--- drivers/staging/media/imx/imx7-mipi-csis.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -1
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)static int mipi_csis_phy_init (struct csi_state *state) { state->mipi_phy_regulator =devm_regulator_get (state->dev,"phy" ); +if (IS_ERR (state->mipi_phy_regulator)) +return PTR_ERR (state->mipi_phy_regulator);return regulator_set_voltage (state->mipi_phy_regulator,1000000 ,1000000 );
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)return ret; } -mipi_csis_phy_init (state); + ret =mipi_csis_phy_init (state); +if (ret <0 ) +return ret; +mipi_csis_phy_reset (state); mem_res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
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 152/350 media: aspeed: clear garbage interrupts
In reply to Sasha LevinFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit 65d270acb2d662c3346793663ac3a759eb4491b8 ]
CAPTURE_COMPLETE and FRAME_COMPLETE interrupts come even when these are disabled in the VE_INTERRUPT_CTRL register and eventually this behavior causes disabling irq itself like below:
[10055.108784] irq 23: nobody cared (try booting with the "irqpoll" option) [10055.115525] CPU: 0 PID: 331 Comm: swampd Tainted: G W 5.3.0-4fde000-dirty-d683e2e #1 [10055.124565] Hardware name: Generic DT based system [10055.129355] Backtrace: [10055.131854] [<80107d7c>] (dump_backtrace) from [<80107fb0>] (show_stack+0x20/0x24) [10055.139431] r7:00000017 r6:00000001 r5:00000000 r4:9d51dc00 [10055.145120] [<80107f90>] (show_stack) from [<8074bf50>] (dump_stack+0x20/0x28) [10055.152361] [<8074bf30>] (dump_stack) from [<80150ffc>] (__report_bad_irq+0x40/0xc0) [10055.160109] [<80150fbc>] (__report_bad_irq) from [<80150f2c>] (note_interrupt+0x23c/0x294) [10055.168374] r9:015b6e60 r8:00000000 r7:00000017 r6:00000001 r5:00000000 r4:9d51dc00 [10055.176136] [<80150cf0>] (note_interrupt) from [<8014df1c>] (handle_irq_event_percpu+0x88/0x98) [10055.184835] r10:7eff7910 r9:015b6e60 r8:00000000 r7:9d417600 r6:00000001 r5:00000002 [10055.192657] r4:9d51dc00 r3:00000000 [10055.196248] [<8014de94>] (handle_irq_event_percpu) from [<8014df64>] (handle_irq_event+0x38/0x4c) [10055.205113] r5:80b56d50 r4:9d51dc00 [10055.208697] [<8014df2c>] (handle_irq_event) from [<80151f1c>] (handle_level_irq+0xbc/0x12c) [10055.217037] r5:80b56d50 r4:9d51dc00 [10055.220623] [<80151e60>] (handle_level_irq) from [<8014d4b8>] (generic_handle_irq+0x30/0x44) [10055.229052] r5:80b56d50 r4:00000017 [10055.232648] [<8014d488>] (generic_handle_irq) from [<8014d524>] (__handle_domain_irq+0x58/0xb4) [10055.241356] [<8014d4cc>] (__handle_domain_irq) from [<801021e4>] (avic_handle_irq+0x68/0x70) [10055.249797] r9:015b6e60 r8:00c5387d r7:00c5387d r6:ffffffff r5:9dd33fb0 r4:9d402380 [10055.257539] [<8010217c>] (avic_handle_irq) from [<80101e34>] (__irq_usr+0x54/0x80) [10055.265105] Exception stack(0x9dd33fb0 to 0x9dd33ff8) [10055.270152] 3fa0: 015d0530 00000000 00000000 015d0538 [10055.278328] 3fc0: 015d0530 015b6e60 00000000 00000000 0052c5d0 015b6e60 7eff7910 7eff7918 [10055.286496] 3fe0: 76ce5614 7eff7908 0050e2f4 76a3a08c 20000010 ffffffff [10055.293104] r5:20000010 r4:76a3a08c [10055.296673] handlers: [10055.298967] [<79f218a5>] irq_default_primary_handler threaded [<1de88514>] aspeed_video_irq [10055.307344] Disabling IRQ #23
To fix this issue, this commit makes the interrupt handler clear these garbage interrupts. This driver enables and uses only COMP_COMPLETE interrupt instead for frame handling.
--- drivers/media/platform/aspeed-video.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/media/platform/aspeed-video.c +10 -0
@@ -606,6 +606,16 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)aspeed_video_start_frame (video); } +/* +* CAPTURE_COMPLETE and FRAME_COMPLETE interrupts come even when these +* are disabled in the VE_INTERRUPT_CTRL register so clear them to +* prevent unnecessary interrupt calls. +*/ +if (sts &VE_INTERRUPT_CAPTURE_COMPLETE ) + sts &= ~VE_INTERRUPT_CAPTURE_COMPLETE ; +if (sts &VE_INTERRUPT_FRAME_COMPLETE ) + sts &= ~VE_INTERRUPT_FRAME_COMPLETE ; +return sts ?IRQ_NONE :IRQ_HANDLED ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 153/350 media: smiapp: Register sensor after enabling runtime PM on the device
In reply to Sasha LevinFrom: Sakari Ailus <[email protected]>
[ Upstream commit 90c9e4a4dba9f4de331372e745fb1991c1faa598 ]
Earlier it was possible that the parts of the driver that assumed runtime PM was enabled were being called before runtime PM was enabled in the driver's probe function. So enable runtime PM before registering the sub-device.
--- drivers/media/i2c/smiapp/smiapp-core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +8 -4
@@ -3101,19 +3101,23 @@ static int smiapp_probe(struct i2c_client *client)if (rval <0 ) goto out_media_entity_cleanup; - rval =v4l2_async_register_subdev_sensor_common (&sensor->src->sd); -if (rval <0 ) - goto out_media_entity_cleanup; -pm_runtime_set_active (&client->dev);pm_runtime_get_noresume (&client->dev);pm_runtime_enable (&client->dev); + + rval =v4l2_async_register_subdev_sensor_common (&sensor->src->sd); +if (rval <0 ) + goto out_disable_runtime_pm; +pm_runtime_set_autosuspend_delay (&client->dev,1000 );pm_runtime_use_autosuspend (&client->dev);pm_runtime_put_autosuspend (&client->dev);return 0 ; +out_disable_runtime_pm: +pm_runtime_disable (&client->dev); + out_media_entity_cleanup:media_entity_cleanup (&sensor->src->sd.entity);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 154/350 md: no longer compare spare disk superblock events in super_load
In reply to Sasha LevinFrom: Yufen Yu <[email protected]>
[ Upstream commit 6a5cb53aaa4ef515ddeffa04ce18b771121127b4 ]
We have a test case as follow:
mdadm -CR /dev/md1 -l 1 -n 4 /dev/sd[a-d] \ --assume-clean --bitmap=internal
mdadm -S /dev/md1
mdadm -A /dev/md1 /dev/sd[b-c] --run --force
mdadm --zero /dev/sda mdadm /dev/md1 -a /dev/sda
echo offline > /sys/block/sdc/device/state
echo offline > /sys/block/sdb/device/state
sleep 5
mdadm -S /dev/md1
echo running > /sys/block/sdb/device/state echo running > /sys/block/sdc/device/state mdadm -A /dev/md1 /dev/sd[a-c] --run --force
When we readd /dev/sda to the array, it started to do recovery. After offline the other two disks in md1, the recovery have been interrupted and superblock update info cannot be written to the offline disks. While the spare disk (/dev/sda) can continue to update superblock info.
After stopping the array and assemble it, we found the array run fail, with the follow kernel message:
[ 172.986064] md: kicking non-fresh sdb from array! [ 173.004210] md: kicking non-fresh sdc from array! [ 173.022383] md/raid1:md1: active with 0 out of 4 mirrors [ 173.022406] md1: failed to create bitmap (-5) [ 173.023466] md: md1 stopped.
Since both sdb and sdc have the value of 'sb->events' smaller than that in sda, they have been kicked from the array. However, the only remained disk sda is in 'spare' state before stop and it cannot be added to conf->mirrors[] array. In the end, raid array assemble and run fail.
In fact, we can use the older disk sdb or sdc to assemble the array. That means we should not choose the 'spare' disk as the fresh disk in analyze_sbs().
To fix the problem, we do not compare superblock events when it is a spare disk, as same as validate_super.
--- drivers/md/md.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-)
drivers/md/md.c +51 -6
@@ -1149,7 +1149,15 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor rdev->desc_nr = sb->this_disk.number;if (!refdev) { - ret =1 ; +/* +* Insist on good event counter while assembling, except +* for spares (which don't need an event count) +*/ +if (sb->disks[rdev->desc_nr].state & ( + (1 <<MD_DISK_SYNC ) | (1 <<MD_DISK_ACTIVE ))) + ret =1 ; +else + ret =0 ; }else {__u64 ev1, ev2;mdp_super_t *refsb =page_address (refdev->sb_page);
@@ -1165,7 +1173,14 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor } ev1 =md_event (sb); ev2 =md_event (refsb); -if (ev1 > ev2) + +/* +* Insist on good event counter while assembling, except +* for spares (which don't need an event count) +*/ +if (sb->disks[rdev->desc_nr].state & ( + (1 <<MD_DISK_SYNC ) | (1 <<MD_DISK_ACTIVE )) && + (ev1 > ev2)) ret =1 ;else ret =0 ;
@@ -1525,6 +1540,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_sector_t sectors;char b[BDEVNAME_SIZE ], b2[BDEVNAME_SIZE ];int bmask; +__u64 role;/* * Calculate the position of the superblock in 512byte sectors.
@@ -1658,8 +1674,20 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ sb->level != 0)return -EINVAL ; + role =le16_to_cpu (sb->dev_roles[rdev->desc_nr]); +if (!refdev) { - ret =1 ; +/* +* Insist of good event counter while assembling, except for +* spares (which don't need an event count) +*/ +if (rdev->desc_nr >=0 && + rdev->desc_nr <le32_to_cpu (sb->max_dev) && + (role <MD_DISK_ROLE_MAX || + role ==MD_DISK_ROLE_JOURNAL )) + ret =1 ; +else + ret =0 ; }else {__u64 ev1, ev2;struct mdp_superblock_1 *refsb =page_address (refdev->sb_page);
@@ -1676,7 +1704,14 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ ev1 =le64_to_cpu (sb->events); ev2 =le64_to_cpu (refsb->events); -if (ev1 > ev2) +/* +* Insist of good event counter while assembling, except for +* spares (which don't need an event count) +*/ +if (rdev->desc_nr >=0 && + rdev->desc_nr <le32_to_cpu (sb->max_dev) && + (role <MD_DISK_ROLE_MAX || + role ==MD_DISK_ROLE_JOURNAL ) && ev1 > ev2) ret =1 ;else ret =0 ;
@@ -3597,7 +3632,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe* Check a full RAID array for plausibility */ -static void analyze_sbs (struct mddev *mddev) +static int analyze_sbs (struct mddev *mddev) {int i;struct md_rdev *rdev, *freshest, *tmp;
@@ -3618,6 +3653,12 @@ static void analyze_sbs(struct mddev *mddev)md_kick_rdev_from_array (rdev); } +/* Cannot find a valid fresh disk */ +if (!freshest) { +pr_warn ("md: cannot find a valid disk\n" ); +return -EINVAL ; + } + super_types[mddev->major_version].validate_super (mddev, freshest);
@@ -3652,6 +3693,8 @@ static void analyze_sbs(struct mddev *mddev)clear_bit (In_sync, &rdev->flags); } } + +return 0 ; }/* Read a fixed-point number.
@@ -5570,7 +5613,9 @@ int md_run(struct mddev *mddev)if (!mddev->raid_disks) {if (!mddev->persistent)return -EINVAL ; -analyze_sbs (mddev); + err =analyze_sbs (mddev); +if (err) +return -EINVAL ; }if (mddev->level !=LEVEL_NONE )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 155/350 staging: wilc1000: potential corruption in wilc_parse_join_bss_param()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d59dc92f1bccd5acde793aebdbb4f7121cf3f9af ]
The "rates_len" value needs to be capped so that the memcpy() doesn't copy beyond the end of the array.
--- drivers/staging/wilc1000/wilc_hif.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/wilc1000/wilc_hif.c +2 -0
@@ -473,6 +473,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, rates_ie =cfg80211_find_ie (WLAN_EID_SUPP_RATES , ies->data, ies->len);if (rates_ie) { rates_len = rates_ie[1 ]; +if (rates_len >WILC_MAX_RATES_SUPPORTED ) + rates_len =WILC_MAX_RATES_SUPPORTED ; param->supp_rates[0 ] = rates_len;memcpy (¶m->supp_rates[1 ], rates_ie +2 , rates_len); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 156/350 md/bitmap: avoid race window between md_bitmap_resize and bitmap_file_clear_bit
In reply to Sasha LevinFrom: Guoqing Jiang <[email protected]>
[ Upstream commit fadcbd2901a0f7c8721f3bdb69eac95c272dc8ed ]
We need to move "spin_lock_irq(&bitmap->counts.lock)" before unmap previous storage, otherwise panic like belows could happen as follows.
[ 902.353802] sdl: detected capacity change from 1077936128 to 3221225472 [ 902.616948] general protection fault: 0000 [#1] SMP [snip] [ 902.618588] CPU: 12 PID: 33698 Comm: md0_raid1 Tainted: G O 4.14.144-1-pserver #4.14.144-1.1~deb10 [ 902.618870] Hardware name: Supermicro SBA-7142G-T4/BHQGE, BIOS 3.00 10/24/2012 [ 902.619120] task: ffff9ae1860fc600 task.stack: ffffb52e4c704000 [ 902.619301] RIP: 0010:bitmap_file_clear_bit+0x90/0xd0 [md_mod] [ 902.619464] RSP: 0018:ffffb52e4c707d28 EFLAGS: 00010087 [ 902.619626] RAX: ffe8008b0d061000 RBX: ffff9ad078c87300 RCX: 0000000000000000 [ 902.619792] RDX: ffff9ad986341868 RSI: 0000000000000803 RDI: ffff9ad078c87300 [ 902.619986] RBP: ffff9ad0ed7a8000 R08: 0000000000000000 R09: 0000000000000000 [ 902.620154] R10: ffffb52e4c707ec0 R11: ffff9ad987d1ed44 R12: ffff9ad0ed7a8360 [ 902.620320] R13: 0000000000000003 R14: 0000000000060000 R15: 0000000000000800 [ 902.620487] FS: 0000000000000000(0000) GS:ffff9ad987d00000(0000) knlGS:0000000000000000 [ 902.620738] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 902.620901] CR2: 000055ff12aecec0 CR3: 0000001005207000 CR4: 00000000000406e0 [ 902.621068] Call Trace: [ 902.621256] bitmap_daemon_work+0x2dd/0x360 [md_mod] [ 902.621429] ? find_pers+0x70/0x70 [md_mod] [ 902.621597] md_check_recovery+0x51/0x540 [md_mod] [ 902.621762] raid1d+0x5c/0xeb0 [raid1] [ 902.621939] ? try_to_del_timer_sync+0x4d/0x80 [ 902.622102] ? del_timer_sync+0x35/0x40 [ 902.622265] ? schedule_timeout+0x177/0x360 [ 902.622453] ? call_timer_fn+0x130/0x130 [ 902.622623] ? find_pers+0x70/0x70 [md_mod] [ 902.622794] ? md_thread+0x94/0x150 [md_mod] [ 902.622959] md_thread+0x94/0x150 [md_mod] [ 902.623121] ? wait_woken+0x80/0x80 [ 902.623280] kthread+0x119/0x130 [ 902.623437] ? kthread_create_on_node+0x60/0x60 [ 902.623600] ret_from_fork+0x22/0x40 [ 902.624225] RIP: bitmap_file_clear_bit+0x90/0xd0 [md_mod] RSP: ffffb52e4c707d28
Because mdadm was running on another cpu to do resize, so bitmap_resize was called to replace bitmap as below shows.
PID: 38801 TASK: ffff9ad074a90e00 CPU: 0 COMMAND: "mdadm"
[exception RIP: queued_spin_lock_slowpath+56]
[snip]
-- <NMI exception stack> --
#5 [ffffb52e60f17c58] queued_spin_lock_slowpath at ffffffff9c0b27b8 #6 [ffffb52e60f17c58] bitmap_resize at ffffffffc0399877 [md_mod] #7 [ffffb52e60f17d30] raid1_resize at ffffffffc0285bf9 [raid1] #8 [ffffb52e60f17d50] update_size at ffffffffc038a31a [md_mod] #9 [ffffb52e60f17d70] md_ioctl at ffffffffc0395ca4 [md_mod]
And the procedure to keep resize bitmap safe is allocate new storage space, then quiesce, copy bits, replace bitmap, and re-start.
However the daemon (bitmap_daemon_work) could happen even the array is quiesced, which means when bitmap_file_clear_bit is triggered by raid1d, then it thinks it should be fine to access store->filemap since counts->lock is held, but resize could change the storage without the protection of the lock.
--- drivers/md/md-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/md-bitmap.c +1 -1
@@ -2139,6 +2139,7 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,memcpy (page_address (store.sb_page),page_address (bitmap->storage.sb_page),sizeof (bitmap_super_t)); +spin_lock_irq (&bitmap->counts.lock);md_bitmap_file_unmap (&bitmap->storage); bitmap->storage = store;
@@ -2154,7 +2155,6 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks, blocks =min (old_counts.chunks << old_counts.chunkshift, chunks << chunkshift); -spin_lock_irq (&bitmap->counts.lock);/* For cluster raid, need to pre-allocate bitmap */ if (mddev_is_clustered (bitmap->mddev)) {unsigned long page;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 157/350 drm: Don't free jobs in wait_event_interruptible()
In reply to Sasha LevinFrom: Steven Price <[email protected]>
[ Upstream commit 588b9828f0744ca13555c4a35cd0251ac8ad8ad2 ]
drm_sched_cleanup_jobs() attempts to free finished jobs, however because it is called as the condition of wait_event_interruptible() it must not sleep. Unfortunately some free callbacks (notably for Panfrost) do sleep.
Instead let's rename drm_sched_cleanup_jobs() to drm_sched_get_cleanup_job() and simply return a job for processing if there is one. The caller can then call the free_job() callback outside the wait_event_interruptible() where sleeping is possible before re-checking and returning to sleep if necessary.
--- drivers/gpu/drm/scheduler/sched_main.c | 43 ++++++++++++++------------ 1 file changed, 24 insertions(+), 19 deletions(-)
drivers/gpu/drm/scheduler/sched_main.c +24 -19
@@ -632,43 +632,41 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb) }/** -* drm_sched_cleanup_jobs - destroy finished jobs +* drm_sched_get_cleanup_job - fetch the next finished job to be destroyed * * @sched: scheduler instance * -* Remove all finished jobs from the mirror list and destroy them. +* Returns the next finished job from the mirror list (if there is one) +* ready for it to be destroyed. */ -static void drm_sched_cleanup_jobs (struct drm_gpu_scheduler *sched) +static struct drm_sched_job * +drm_sched_get_cleanup_job (struct drm_gpu_scheduler *sched) { +struct drm_sched_job *job;unsigned long flags;/* Don't destroy jobs while the timeout worker is running */ if (sched->timeout !=MAX_SCHEDULE_TIMEOUT && !cancel_delayed_work (&sched->work_tdr)) -return ; - +return NULL ; -while (!list_empty (&sched->ring_mirror_list)) { -struct drm_sched_job *job; +spin_lock_irqsave (&sched->job_list_lock, flags); - job =list_first_entry (&sched->ring_mirror_list, + job =list_first_entry_or_null (&sched->ring_mirror_list, struct drm_sched_job, node); -if (!dma_fence_is_signaled (&job->s_fence->finished)) -break ; -spin_lock_irqsave (&sched->job_list_lock, flags); +if (job &&dma_fence_is_signaled (&job->s_fence->finished)) {/* remove job from ring_mirror_list */ list_del_init (&job->node); -spin_unlock_irqrestore (&sched->job_list_lock, flags); - - sched->ops->free_job (job); + }else { + job =NULL ; +/* queue timeout for next job */ +drm_sched_start_timeout (sched); } -/* queue timeout for next job */ -spin_lock_irqsave (&sched->job_list_lock, flags); -drm_sched_start_timeout (sched);spin_unlock_irqrestore (&sched->job_list_lock, flags); +return job; }/**
@@ -708,12 +706,19 @@ static int drm_sched_main(void *param)struct drm_sched_fence *s_fence;struct drm_sched_job *sched_job;struct dma_fence *fence; +struct drm_sched_job *cleanup_job =NULL ;wait_event_interruptible (sched->wake_up_worker, - (drm_sched_cleanup_jobs (sched), + (cleanup_job =drm_sched_get_cleanup_job (sched)) || (!drm_sched_blocked (sched) && (entity =drm_sched_select_entity (sched))) || -kthread_should_stop ())); +kthread_should_stop ()); + +if (cleanup_job) { + sched->ops->free_job (cleanup_job); +/* queue timeout for next job */ +drm_sched_start_timeout (sched); + }if (!entity)continue ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 158/350 EDAC/amd64: Set grain per DIMM
In reply to Sasha LevinFrom: Yazen Ghannam <[email protected]>
[ Upstream commit 466503d6b1b33be46ab87c6090f0ade6c6011cbc ]
The following commit introduced a warning on error reports without a non-zero grain value.
3724ace582d9 ("EDAC/mc: Fix grain_bits calculation")
The amd64_edac_mod module does not provide a value, so the warning will be given on the first reported memory error.
Set the grain per DIMM to cacheline size (64 bytes). This is the current recommendation.
--- drivers/edac/amd64_edac.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/edac/amd64_edac.c +2 -0
@@ -2936,6 +2936,7 @@ static int init_csrows_df(struct mem_ctl_info *mci) dimm->mtype = pvt->dram_type; dimm->edac_mode = edac_mode; dimm->dtype = dev_type; + dimm->grain =64 ; } }
@@ -3012,6 +3013,7 @@ static int init_csrows(struct mem_ctl_info *mci) dimm = csrow->channels[j]->dimm; dimm->mtype = pvt->dram_type; dimm->edac_mode = edac_mode; + dimm->grain =64 ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 159/350 arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
In reply to Sasha LevinFrom: Yunfeng Ye <[email protected]>
[ Upstream commit bfcef4ab1d7ee8921bc322109b1692036cc6cbe0 ]
In cases like suspend-to-disk and suspend-to-ram, a large number of CPU cores need to be shut down. At present, the CPU hotplug operation is serialised, and the CPU cores can only be shut down one by one. In this process, if PSCI affinity_info() does not return LEVEL_OFF quickly, cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores need to be shut down, it will take a long time.
Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So change the wait interval from 10 ms to max 1 ms and use usleep_range() instead of msleep() for more accurate timer.
In addition, reducing the time interval will increase the messages output, so remove the "Retry ..." message, instead, track time and output to the the sucessful message.
--- arch/arm64/kernel/psci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
arch/arm64/kernel/psci.c +9 -6
@@ -81,7 +81,8 @@ static void cpu_psci_cpu_die(unsigned int cpu)static int cpu_psci_cpu_kill (unsigned int cpu) { -int err, i; +int err; +unsigned long start, end;if (!psci_ops.affinity_info)return 0 ;
@@ -91,16 +92,18 @@ static int cpu_psci_cpu_kill(unsigned int cpu)* while it is dying. So, try again a few times. */ -for (i =0 ; i <10 ; i++) { + start = jiffies; + end = start +msecs_to_jiffies (100 ); +do { err = psci_ops.affinity_info (cpu_logical_map (cpu),0 );if (err ==PSCI_0_2_AFFINITY_LEVEL_OFF ) { -pr_info ("CPU%d killed.\n" , cpu); +pr_info ("CPU%d killed (polled %d ms)\n" , cpu, +jiffies_to_msecs (jiffies - start));return 0 ; } -msleep (10 ); -pr_info ("Retrying again to check for CPU kill\n" ); - } +usleep_range (100 ,1000 ); + }while (time_before (jiffies, end));pr_warn ("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n" , cpu, err);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 160/350 drm/amd/display: setting the DIG_MODE to the correct value.
In reply to Sasha LevinFrom: Zhan liu <[email protected]>
[ Upstream commit 967a3b85bac91c55eff740e61bf270c2732f48b2 ]
[Why]
This patch is for fixing Navi14 HDMI display pink screen issue.
[How]
Call stream->link->link_enc->funcs->setup twice. This is setting the DIG_MODE to the correct value after having been overridden by the call to transmitter control.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +9 -0
@@ -2769,6 +2769,15 @@ void core_link_enable_stream( CONTROLLER_DP_TEST_PATTERN_VIDEOMODE, COLOR_DEPTH_UNDEFINED); +/* This second call is needed to reconfigure the DIG +* as a workaround for the incorrect value being applied +* from transmitter control. +*/ +if (!dc_is_virtual_signal (pipe_ctx->stream->signal)) + stream->link->link_enc->funcs->setup ( + stream->link->link_enc, + pipe_ctx->stream->signal); +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT if (pipe_ctx->stream->timing.flags.DSC) { if (dc_is_dp_signal(pipe_ctx->stream->signal) ||
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 161/350 i40e: initialize ITRN registers with correct values
In reply to Sasha LevinFrom: Nicholas Nunley <[email protected]>
[ Upstream commit 998e5166e604fd37afe94352f7b8c2d816b11049 ]
Since commit 92418fb14750 ("i40e/i40evf: Use usec value instead of reg value for ITR defines") the driver tracks the interrupt throttling intervals in single usec units, although the actual ITRN/ITR0 registers are programmed in 2 usec units. Most register programming flows in the driver correctly handle the conversion, although it is currently not applied when the registers are initialized to their default values. Most of the time this doesn't present a problem since the default values are usually immediately overwritten through the standard adaptive throttling mechanism, or updated manually by the user, but if adaptive throttling is disabled and the interval values are left alone then the incorrect value will persist.
Since the intended default interval of 50 usecs (vs. 100 usecs as programmed) performs better for most traffic workloads, this can lead to performance regressions.
This patch adds the correct conversion when writing the initial values to the ITRN registers.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -5
@@ -3534,14 +3534,14 @@ static void i40e_vsi_configure_msix(struct i40e_vsi *vsi) q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_RX_ITR , vector -1 ), - q_vector->rx.target_itr); + q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_TX_ITR , vector -1 ), - q_vector->tx.target_itr); + q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr; wr32(hw, I40E_PFINT_RATEN(vector - 1),
@@ -3646,11 +3646,11 @@ static void i40e_configure_msi_and_legacy(struct i40e_vsi *vsi)/* set the ITR configuration */ q_vector->rx.next_update = jiffies +1 ; q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr;i40e_enable_misc_int_causes (pf);
@@ -11396,7 +11396,7 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf)/* associate no queues to the misc vector */ wr32 (hw,I40E_PFINT_LNKLST0 ,I40E_QUEUE_END_OF_LIST ); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K ); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K >>1 );i40e_flush (hw);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 162/350 drm/amd/display: correctly populate dpp refclk in fpga
In reply to Sasha LevinFrom: Anthony Koo <[email protected]>
[ Upstream commit 952f6c4b5d72d40f93f3deb61239290b357d434e ]
[Why]
In diags environment we are not programming the DPP DTO correctly.
[How]
Populate the dpp refclk in dccg so it can be used to correctly program DPP DTO.
--- .../drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +8 -2
@@ -320,6 +320,8 @@ void dcn2_update_clocks_fpga(struct clk_mgr *clk_mgr, struct dc_state *context, bool safe_to_lower) { +struct clk_mgr_internal *clk_mgr_int =TO_CLK_MGR_INTERNAL (clk_mgr); +struct dc_clocks *new_clocks = &context->bw_ctx.bw.dcn.clk;/* Min fclk = 1.2GHz since all the extra scemi logic seems to run off of it */ int fclk_adj = new_clocks->fclk_khz >1200000 ? new_clocks->fclk_khz :1200000 ;
@@ -357,14 +359,18 @@ void dcn2_update_clocks_fpga(struct clk_mgr *clk_mgr, clk_mgr->clks.dispclk_khz = new_clocks->dispclk_khz; } -/* Both fclk and dppclk ref are run on the same scemi clock so we -* need to keep the same value for both +/* Both fclk and ref_dppclk run on the same scemi clock. +* So take the higher value since the DPP DTO is typically programmed +* such that max dppclk is 1:1 with ref_dppclk. */ if (clk_mgr->clks.fclk_khz > clk_mgr->clks.dppclk_khz) clk_mgr->clks.dppclk_khz = clk_mgr->clks.fclk_khz;if (clk_mgr->clks.dppclk_khz > clk_mgr->clks.fclk_khz) clk_mgr->clks.fclk_khz = clk_mgr->clks.dppclk_khz; +// Both fclk and ref_dppclk run on the same scemi clock. + clk_mgr_int->dccg->ref_dppclk = clk_mgr->clks.fclk_khz; +dm_set_dcn_clocks (clk_mgr->ctx, &clk_mgr->clks); }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 163/350 i40e: Wrong 'Advertised FEC modes' after set FEC to AUTO
In reply to Sasha LevinFrom: Jaroslaw Gawin <[email protected]>
[ Upstream commit e42b7e9cefca9dd008cbafffca97285cf264f72d ]
Fix display of parameters "Configured FEC encodings:" and "Advertised FEC modes:" in ethtool. Implemented by setting proper FEC bits in ?advertising? bitmask of link_modes struct and ?fec? bitmask in ethtool_fecparam struct. Without this patch wrong FEC settings can be shown.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 13 ++++++-- .../net/ethernet/intel/i40e/i40e_ethtool.c | 32 +++++++++---------- 2 files changed, 26 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +10 -3
@@ -2571,9 +2571,16 @@ noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw)if (status)return status; - hw->phy.link_info.req_fec_info = - abilities.fec_cfg_curr_mod_ext_info & - (I40E_AQ_REQUEST_FEC_KR |I40E_AQ_REQUEST_FEC_RS ); +if (abilities.fec_cfg_curr_mod_ext_info & +I40E_AQ_ENABLE_FEC_AUTO ) + hw->phy.link_info.req_fec_info = + (I40E_AQ_REQUEST_FEC_KR | +I40E_AQ_REQUEST_FEC_RS ); +else + hw->phy.link_info.req_fec_info = + abilities.fec_cfg_curr_mod_ext_info & + (I40E_AQ_REQUEST_FEC_KR | +I40E_AQ_REQUEST_FEC_RS );memcpy (hw->phy.link_info.module_type, &abilities.module_type,sizeof (hw->phy.link_info.module_type));
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +16 -16
@@ -722,7 +722,14 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info,ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS );ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER ); -if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) { +if ((I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) && + (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info)) { +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_NONE ); +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_BASER ); +ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); + }else if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) {ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); }else if (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info) { ethtool_link_ksettings_add_link_mode(ks, advertising,
@@ -730,12 +737,6 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info, }else {ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_NONE ); -if (I40E_AQ_SET_FEC_AUTO & req_fec_info) { -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_BASER ); - } } }
@@ -1437,6 +1438,7 @@ static int i40e_get_fec_param(struct net_device *netdev,struct i40e_hw *hw = &pf->hw;i40e_status status =0 ;int err =0 ; +u8 fec_cfg;/* Get the current phy config */ memset (&abilities,0 ,sizeof (abilities));
@@ -1448,18 +1450,16 @@ static int i40e_get_fec_param(struct net_device *netdev, } fecparam->fec =0 ; -if (abilities.fec_cfg_curr_mod_ext_info &I40E_AQ_SET_FEC_AUTO ) + fec_cfg = abilities.fec_cfg_curr_mod_ext_info; +if (fec_cfg &I40E_AQ_SET_FEC_AUTO ) fecparam->fec |=ETHTOOL_FEC_AUTO ; -if ((abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_REQUEST_RS ) || - (abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_ABILITY_RS )) +else if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_RS | +I40E_AQ_SET_FEC_ABILITY_RS )) fecparam->fec |=ETHTOOL_FEC_RS ; -if ((abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_REQUEST_KR ) || - (abilities.fec_cfg_curr_mod_ext_info &I40E_AQ_SET_FEC_ABILITY_KR )) +else if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_KR | +I40E_AQ_SET_FEC_ABILITY_KR )) fecparam->fec |=ETHTOOL_FEC_BASER ; -if (abilities.fec_cfg_curr_mod_ext_info ==0 ) +if (fec_cfg ==0 ) fecparam->fec |=ETHTOOL_FEC_OFF ;if (hw->phy.link_info.fec_info &I40E_AQ_CONFIG_FEC_KR_ENA )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 164/350 net: phy: dp83867: enable robust auto-mdix
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 5a7f08c2abb0efc9d17aff2fc75d6d3b85e622e4 ]
The link detection timeouts can be observed (or link might not be detected at all) when dp83867 PHY is configured in manual mode (speed/duplex).
CFG3[9] Robust Auto-MDIX option allows to significantly improve link detection in case dp83867 is configured in manual mode and reduce link detection time.
As per DM: "If link partners are configured to operational modes that are not supported by normal Auto MDI/MDIX mode (like Auto-Neg versus Force 100Base-TX or Force 100Base-TX versus Force 100Base-TX), this Robust Auto MDI/MDIX mode allows MDI/MDIX resolution and prevents deadlock."
Hence, enable this option by default as there are no known reasons not to do so.
--- drivers/net/phy/dp83867.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/phy/dp83867.c +10 -5
@@ -95,6 +95,10 @@#define DP83867_IO_MUX_CFG_CLK_O_SEL_MASK (0x1f << 8)#define DP83867_IO_MUX_CFG_CLK_O_SEL_SHIFT 8 +/* CFG3 bits */ +#define DP83867_CFG3_INT_OE BIT(7) +#define DP83867_CFG3_ROBUST_AUTO_MDIX BIT(9) +/* CFG4 bits */ #define DP83867_CFG4_PORT_MIRROR_EN BIT(0)
@@ -410,12 +414,13 @@ static int dp83867_config_init(struct phy_device *phydev)phy_write_mmd (phydev,DP83867_DEVADDR ,DP83867_SGMIICTL , val); } + val =phy_read (phydev,DP83867_CFG3 );/* Enable Interrupt output INT_OE in CFG3 register */ -if (phy_interrupt_is_valid (phydev)) { - val =phy_read (phydev,DP83867_CFG3 ); - val |=BIT (7 ); -phy_write (phydev,DP83867_CFG3 , val); - } +if (phy_interrupt_is_valid (phydev)) + val |=DP83867_CFG3_INT_OE ; + + val |=DP83867_CFG3_ROBUST_AUTO_MDIX ; +phy_write (phydev,DP83867_CFG3 , val);if (dp83867->port_mirroring !=DP83867_PORT_MIRROING_KEEP )dp83867_config_port_mirroring (phydev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 165/350 drm/tegra: sor: Use correct SOR index on Tegra210
In reply to Sasha LevinFrom: Thierry Reding <[email protected]>
[ Upstream commit 24e64f86da40e68c5f58af08796110f147b12193 ]
The device tree bindings for the Tegra210 SOR don't require the controller instance to be defined, since the instance can be derived from the compatible string. The index is never used on Tegra210, so we got away with it not getting set. However, subsequent patches will change that, so make sure the proper index is used.
--- drivers/gpu/drm/tegra/sor.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/tegra/sor.c +5 -0
@@ -3200,6 +3200,11 @@ static int tegra_sor_parse_dt(struct tegra_sor *sor)* earlier */ sor->pad =TEGRA_IO_PAD_HDMI_DP0 + sor->index; + }else { +if (sor->soc->supports_edp) + sor->index =0 ; +else + sor->index =1 ; } err =of_property_read_u32_array (np,"nvidia,xbar-cfg" , xbar_cfg,5 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 166/350 regulator: core: Release coupled_rdevs on regulator_init_coupling() error
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 26c2c997aa1a6c5522f6619910ba025e53e69763 ]
This patch fixes memory leak which should happen if regulator's coupling fails to initialize.
--- drivers/regulator/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
@@ -5198,6 +5198,7 @@ regulator_register(const struct regulator_desc *regulator_desc,regulator_remove_coupling (rdev);mutex_unlock (®ulator_list_mutex); wash: +kfree (rdev->coupling_desc.coupled_rdevs);kfree (rdev->constraints);mutex_lock (®ulator_list_mutex);regulator_ena_gpio_free (rdev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 167/350 ubsan, x86: Annotate and allow __ubsan_handle_shift_out_of_bounds() in uaccess regions
In reply to Sasha LevinFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 9a50dcaf0416a43e1fe411dc61a99c8333c90119 ]
The new check_zeroed_user() function uses variable shifts inside of a user_access_begin()/user_access_end() section and that results in GCC emitting __ubsan_handle_shift_out_of_bounds() calls, even though through value range analysis it would be able to see that the UB in question is impossible.
Annotate and whitelist this UBSAN function; continued use of user_access_begin()/user_access_end() will undoubtedly result in further uses of function.
--- lib/ubsan.c | 5 ++++- tools/objtool/check.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
lib/ubsan.c +4 -1
@@ -374,9 +374,10 @@ void __ubsan_handle_shift_out_of_bounds(struct shift_out_of_bounds_data *data,struct type_descriptor *lhs_type = data->lhs_type;char rhs_str[VALUE_LENGTH ];char lhs_str[VALUE_LENGTH ]; +unsigned long ua_flags =user_access_save ();if (suppress_report (&data->location)) -return ; + goto out;ubsan_prologue (&data->location, &flags);
@@ -402,6 +403,8 @@ void __ubsan_handle_shift_out_of_bounds(struct shift_out_of_bounds_data *data, lhs_type->type_name);ubsan_epilogue (&flags); +out: +user_access_restore (ua_flags); }EXPORT_SYMBOL (__ubsan_handle_shift_out_of_bounds);
tools/objtool/check.c +1 -0
@@ -482,6 +482,7 @@ static const char *uaccess_safe_builtin[] = {"ubsan_type_mismatch_common" ,"__ubsan_handle_type_mismatch" ,"__ubsan_handle_type_mismatch_v1" , +"__ubsan_handle_shift_out_of_bounds" ,/* misc */ "csum_partial_copy_generic" , "__memcpy_mcsafe",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 168/350 spi: sprd: adi: Add missing lock protection when rebooting
In reply to Sasha LevinFrom: Lingling Xu <[email protected]>
[ Upstream commit 91ea1d70607e374b014b4b9bea771ce661f9f64b ]
When rebooting the system, we should lock the watchdog after configuration to make sure the watchdog can reboot the system successfully.
--- drivers/spi/spi-sprd-adi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-sprd-adi.c +3 -0
@@ -393,6 +393,9 @@ static int sprd_adi_restart_handler(struct notifier_block *this, val |=BIT_WDG_RUN |BIT_WDG_RST ;sprd_adi_write (sadi, sadi->slave_pbase +REG_WDG_CTRL , val); +/* Lock the watchdog */ +sprd_adi_write (sadi, sadi->slave_pbase +REG_WDG_LOCK , ~WDG_UNLOCK_KEY ); +mdelay (1000 );dev_emerg (sadi->dev,"Unable to restart system\n" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 169/350 ACPI: button: Add DMI quirk for Medion Akoya E2215T
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 932e1ba486117de2fcea3df27ad8218ad6c11470 ]
The Medion Akoya E2215T's ACPI _LID implementation is quite broken:
1. For notifications it uses an ActiveLow Edge GpioInt, rather then an ActiveBoth one, meaning that the device is only notified when the lid is closed, not when it is opened.
2. Matching with this its _LID method simply always returns 0 (closed)
In order for the Linux LID code to work properly with this implementation, the lid_init_state selection needs to be set to ACPI_BUTTON_LID_INIT_OPEN.
This commit adds a DMI quirk for this.
--- drivers/acpi/button.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/acpi/button.c +11 -0
@@ -78,6 +78,17 @@ static const struct dmi_system_id lid_blacklst[] = { DMI_MATCH(DMI_BIOS_VERSION, "BYT70A.YNCHENG.WIN.007"), }, }, + { + /* + * Medion Akoya E2215T, notification of the LID device only + * happens on close, not on open and _LID always returns closed. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), + DMI_MATCH(DMI_PRODUCT_NAME, "E2215T MD60198"), + }, + .driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN, + }, {} };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 170/350 ALSA: hda - Fix pending unsol events at shutdown
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ]
This is an alternative fix attemp for the issue reported in the commit caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was reverted later due to regressions. Instead of tweaking the hardware disablement order and the enforced irq flushing, do calling cancel_work_sync() of the unsol work early enough, and explicitly ignore the unsol events during the shutdown by checking the bus->shutdown flag.
--- sound/pci/hda/hda_bind.c | 4 ++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 7 insertions(+)
sound/pci/hda/hda_bind.c +4 -0
@@ -43,6 +43,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) { struct hda_codec *codec = container_of(dev, struct hda_codec, core); +/* ignore unsol events during shutdown */ +if (codec->bus->shutdown) +return ; +if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event (codec, ev); }
sound/pci/hda/hda_intel.c +3 -0
@@ -1382,8 +1382,11 @@ static int azx_free(struct azx *chip)static int azx_dev_disconnect (struct snd_device *device) {struct azx *chip = device->device_data; +struct hdac_bus *bus =azx_bus (chip); chip->bus.shutdown =1 ; +cancel_work_sync (&bus->unsol_work); +return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 171/350 RDMA/qedr: Fix memory leak in user qp and mr
In reply to Sasha LevinFrom: Michal Kalderon <[email protected]>
[ Upstream commit 24e412c1e00ebfe73619e6b88cbc26c2c7d41b85 ]
User QPs pbl's weren't freed properly.
MR pbls weren't freed properly.
--- drivers/infiniband/hw/qedr/verbs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +10 -2
@@ -1577,6 +1577,14 @@ static void qedr_cleanup_user(struct qedr_dev *dev, struct qedr_qp *qp)ib_umem_release (qp->urq.umem); qp->urq.umem =NULL ; + +if (rdma_protocol_roce (&dev->ibdev,1 )) { +qedr_free_pbl (dev, &qp->usq.pbl_info, qp->usq.pbl_tbl); +qedr_free_pbl (dev, &qp->urq.pbl_info, qp->urq.pbl_tbl); + }else { +kfree (qp->usq.pbl_tbl); +kfree (qp->urq.pbl_tbl); + } } static int qedr_create_user_qp(struct qedr_dev *dev,
@@ -2673,8 +2681,8 @@ int qedr_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) dev->ops->rdma_free_tid (dev->rdma_ctx, mr->hw_mr.itid); -if ((mr->type !=QEDR_MR_DMA ) && (mr->type !=QEDR_MR_FRMR )) -qedr_free_pbl (dev, &mr->info.pbl_info, mr->info.pbl_table); +if (mr->type !=QEDR_MR_DMA ) +free_mr_info (dev, &mr->info);/* it could be user registered memory. */ ib_umem_release (mr->umem);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 172/350 RDMA/hns: Fix memory leak on 'context' on error return path
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 994195e1537074f56df216a9309f6e366cb35b67 ]
Currently, the error return path when the call to function dev->dfx->query_cqc_info fails will leak object 'context'. Fix this by making the error return path via 'err' return return codes rather than -EMSGSIZE, set ret appropriately for all error return paths and for the memory leak now return via 'err' rather than just returning without freeing context.
Addresses-Coverity: ("Resource leak")
--- drivers/infiniband/hw/hns/hns_roce_restrack.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_restrack.c +7 -3
@@ -98,11 +98,15 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg, goto err; table_attr =nla_nest_start (msg,RDMA_NLDEV_ATTR_DRIVER ); -if (!table_attr) +if (!table_attr) { + ret = -EMSGSIZE ; goto err; + } -if (hns_roce_fill_cq (msg, context)) +if (hns_roce_fill_cq (msg, context)) { + ret = -EMSGSIZE ; goto err_cancel_table; + }nla_nest_end (msg, table_attr);kfree (context);
@@ -113,7 +117,7 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg,nla_nest_cancel (msg, table_attr); err:kfree (context); -return -EMSGSIZE ; +return ret; } int hns_roce_fill_res_entry(struct sk_buff *msg,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 173/350 RDMA/qedr: Fix srqs xarray initialization
In reply to Sasha LevinFrom: Michal Kalderon <[email protected]>
[ Upstream commit 73ab512f720298aabe23b34110e3f6a8545b0ba5 ]
There was a missing initialization for the srqs xarray. SRQs xarray can also be called from irq context when searching for an element and uses the xa_XXX_irq apis, therefore should be initialized with IRQ flags.
--- drivers/infiniband/hw/qedr/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/qedr/main.c +1 -0
@@ -357,6 +357,7 @@ static int qedr_alloc_resources(struct qedr_dev *dev)return -ENOMEM ;spin_lock_init (&dev->sgid_lock); +xa_init_flags (&dev->srqs,XA_FLAGS_LOCK_IRQ );if (IS_IWARP (dev)) {xa_init_flags (&dev->qps,XA_FLAGS_LOCK_IRQ );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 174/350 RDMA/core: Set DMA parameters correctly
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit c9121262d57b8a3be4f08073546436ba0128ca6a ]
The dma_set_max_seg_size() call in setup_dma_device() does not have any effect since device->dev.dma_parms is NULL. Fix this by initializing device->dev.dma_parms first.
--- drivers/infiniband/core/device.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/infiniband/core/device.c +14 -2
@@ -1199,9 +1199,21 @@ static void setup_dma_device(struct ib_device *device)WARN_ON_ONCE (!parent); device->dma_device = parent; } -/* Setup default max segment size for all IB devices */ -dma_set_max_seg_size (device->dma_device,SZ_2G ); +if (!device->dev.dma_parms) { +if (parent) { +/* +* The caller did not provide DMA parameters, so +* 'parent' probably represents a PCI device. The PCI +* core sets the maximum segment size to 64 +* KB. Increase this parameter to 2 GB. +*/ + device->dev.dma_parms = parent->dma_parms; +dma_set_max_seg_size (device->dma_device,SZ_2G ); + }else { +WARN_ON_ONCE (true); + } + } }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 175/350 staging: wilc1000: check if device is initialzied before changing vif
In reply to Sasha LevinFrom: Adham Abozaeid <[email protected]>
[ Upstream commit 6df6f3849bb8f317bf2d52711aacea4292237ede ]
When killing hostapd, the interface is closed which deinitializes the device, then change virtual interface is called.
This change checks if the device is initialized before sending the interface change command to the device
--- .../staging/wilc1000/wilc_wfi_cfgoperations.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +12 -6
@@ -1419,8 +1419,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,if (vif->iftype ==WILC_AP_MODE || vif->iftype ==WILC_GO_MODE )wilc_wfi_deinit_mon_interface (wl, true); vif->iftype =WILC_STATION_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_STATION_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_STATION_MODE , vif->idx);memset (priv->assoc_stainfo.sta_associated_bss,0 ,WILC_MAX_NUM_STA *ETH_ALEN );
@@ -1432,8 +1434,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, priv->wdev.iftype = type; vif->monitor_flag =0 ; vif->iftype =WILC_CLIENT_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_STATION_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_STATION_MODE , vif->idx);break ;case NL80211_IFTYPE_AP :
@@ -1450,8 +1454,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, dev->ieee80211_ptr->iftype = type; priv->wdev.iftype = type; vif->iftype =WILC_GO_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_AP_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_AP_MODE , vif->idx);break ;default :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 176/350 gpu: host1x: Allocate gather copy for host1x
In reply to Sasha LevinFrom: Thierry Reding <[email protected]>
[ Upstream commit b78e70c04c149299bd210759d7c7af7c86b89ca8 ]
Currently when the gather buffers are copied, they are copied to a buffer that is allocated for the host1x client that wants to execute the command streams in the buffers. However, the gather buffers will be read by the host1x device, which causes SMMU faults if the DMA API is backed by an IOMMU.
Fix this by allocating the gather buffer copy for the host1x device, which makes sure that it will be mapped into the host1x's IOVA space if the DMA API is backed by an IOMMU.
--- drivers/gpu/host1x/job.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/host1x/job.c +6 -5
@@ -436,7 +436,8 @@ static int validate(struct host1x_firewall *fw, struct host1x_job_gather *g)return err; } -static inline int copy_gathers (struct host1x_job *job,struct device *dev) +static inline int copy_gathers (struct device *host,struct host1x_job *job, +struct device *dev) {struct host1x_firewall fw;size_t size =0 ;
@@ -459,12 +460,12 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev)* Try a non-blocking allocation from a higher priority pools first, * as awaiting for the allocation here is a major performance hit. */ - job->gather_copy_mapped =dma_alloc_wc (dev, size, &job->gather_copy, + job->gather_copy_mapped =dma_alloc_wc (host, size, &job->gather_copy,GFP_NOWAIT );/* the higher priority allocation failed, try the generic-blocking */ if (!job->gather_copy_mapped) - job->gather_copy_mapped =dma_alloc_wc (dev, size, + job->gather_copy_mapped =dma_alloc_wc (host, size, &job->gather_copy,GFP_KERNEL );if (!job->gather_copy_mapped)
@@ -512,7 +513,7 @@ int host1x_job_pin(struct host1x_job *job, struct device *dev) goto out;if (IS_ENABLED (CONFIG_TEGRA_HOST1X_FIREWALL )) { - err =copy_gathers (job, dev); + err =copy_gathers (host->dev, job, dev);if (err) goto out; }
@@ -573,7 +574,7 @@ void host1x_job_unpin(struct host1x_job *job) job->num_unpins =0 ;if (job->gather_copy_size) -dma_free_wc (job->channel->dev, job->gather_copy_size, +dma_free_wc (host->dev, job->gather_copy_size, job->gather_copy_mapped, job->gather_copy); }EXPORT_SYMBOL (host1x_job_unpin);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 177/350 regulator: fixed: add off-on-delay
In reply to Sasha LevinFrom: Peng Fan <[email protected]>
[ Upstream commit f7907e57aea2adcd0b57ebcca410e125412ab680 ]
Depends on board design, the gpio controlling regulator may connects with a big capacitance. When need off, it takes some time to let the regulator to be truly off. If not add enough delay, the regulator might have always been on, so introduce off-on-delay to handle such case.
--- drivers/regulator/fixed.c | 2 ++ include/linux/regulator/fixed.h | 1 + 2 files changed, 3 insertions(+)
drivers/regulator/fixed.c +2 -0
@@ -123,6 +123,7 @@ of_get_fixed_voltage_config(struct device *dev, config->enabled_at_boot = true;of_property_read_u32 (np,"startup-delay-us" , &config->startup_delay); +of_property_read_u32 (np,"off-on-delay-us" , &config->off_on_delay);if (of_find_property (np,"vin-supply" ,NULL )) config->input_supply ="vin" ;
@@ -189,6 +190,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) } drvdata->desc.enable_time = config->startup_delay; + drvdata->desc.off_on_delay = config->off_on_delay;if (config->input_supply) { drvdata->desc.supply_name = devm_kstrdup(&pdev->dev,
include/linux/regulator/fixed.h +1 -0
@@ -36,6 +36,7 @@ struct fixed_voltage_config {const char *input_supply;int microvolts;unsigned startup_delay; +unsigned int off_on_delay; unsigned enabled_at_boot:1;struct regulator_init_data *init_data; };
Signature · 1 line
2.20.1
Mark Brown
maintainerRe: [PATCH AUTOSEL 5.4 177/350] regulator: fixed: add off-on-delay
Quoted 9 lines · Sasha Levin
From: Peng Fan <[email protected]>
[ Upstream commit
f7907e57aea2adcd0b57ebcca410e125412ab680]Depends on board design, the gpio controlling regulator may connects with a big capacitance. When need off, it takes some time to let the regulator to be truly off. If not add enough delay, the regulator might have always been on, so introduce off-on-delay to handle such case.
This is clearly adding a new feature and doesn't include the matching DT binding addition for that new feature.
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.4 177/350] regulator: fixed: add off-on-delay
Quoted 5 lines · Mark Brown
Quoted 4 lines · Sasha Levin
From: Peng Fan <[email protected]>
[ Upstream commit
f7907e57aea2adcd0b57ebcca410e125412ab680]
Quoted 8 lines
Quoted 5 lines
Depends on board design, the gpio controlling regulator may connects with a big capacitance. When need off, it takes some time to let the regulator to be truly off. If not add enough delay, the regulator might have always been on, so introduce off-on-delay to handle such case.
This is clearly adding a new feature and doesn't include the matching DT binding addition for that new feature.
This new "feature" fixes a bug, no? Should we take the DT bindings as well?
Signature · 2 lines
Thanks, Sasha
Mark Brown
maintainerRe: [PATCH AUTOSEL 5.4 177/350] regulator: fixed: add off-on-delay
Quoted 9 lines · Sasha Levin
Quoted 7 lines · Mark Brown
Quoted 5 lines · Sasha Levin
Depends on board design, the gpio controlling regulator may connects with a big capacitance. When need off, it takes some time to let the regulator to be truly off. If not add enough delay, the regulator might have always been on, so introduce off-on-delay to handle such case.
Quoted 5 lines
Quoted 2 lines
This is clearly adding a new feature and doesn't include the matching DT binding addition for that new feature.
This new "feature" fixes a bug, no? Should we take the DT bindings as well?
This new feature enables support for new hardware which would not otherwise be supported if someone also updates the DT for the system. Most features are on some level a bugfix for the lack of whatever the feature is, this is on a similar level to adding a new device driver (some device drivers are about as complex!). It's a good change but it doesn't seem to fit into what stable is supposed to be doing.
If you are backporting features that need new DT bindings then yes, you should be backporting the bindings as well but that's a pretty good indication that it's adding a feature.
Sasha Levin
maintainerPATCH 178/350 net: dsa: LAN9303: select REGMAP when LAN9303 enable
In reply to Sasha LevinFrom: Mao Wenan <[email protected]>
[ Upstream commit b6989d248a2d13f02895bae1a9321b3bbccc0283 ]
When NET_DSA_SMSC_LAN9303=y and NET_DSA_SMSC_LAN9303_MDIO=y, below errors can be seen:drivers/net/dsa/lan9303_mdio.c:87:23: error: REGMAP_ENDIAN_LITTLE undeclared here (not in a function)
.reg_format_endian = REGMAP_ENDIAN_LITTLE,drivers/net/dsa/lan9303_mdio.c:93:3: error: const struct regmap_config has no member named reg_read
.reg_read = lan9303_mdio_read,
It should select REGMAP in config NET_DSA_SMSC_LAN9303.
--- drivers/net/dsa/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/dsa/Kconfig +1 -0
@@ -77,6 +77,7 @@ config NET_DSA_REALTEK_SMI config NET_DSA_SMSC_LAN9303 tristate select NET_DSA_TAG_LAN9303 + select REGMAP ---help--- This enables support for the SMSC/Microchip LAN9303 3 port ethernet switch chips.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 179/350 ALSA: hda/hdmi - implement mst_no_extra_pcms flag
In reply to Sasha LevinFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 2a2edfbbfee47947dd05f5860c66c0e80ee5e09d ]
To support the DP-MST multiple streams via single connector feature, the HDMI driver was extended with the concept of backup PCMs. See commit 9152085defb6 ("ALSA: hda - add DP MST audio support").
This implementation works fine with snd_hda_intel.c as PCM topology is fully managed within the single driver.
When the HDA codec driver is used from ASoC components, the concept of backup PCMs no longer fits. For ASoC topologies, the physical HDMI converters are presented as backend DAIs and these should match with hardware capabilities. The ASoC topology may define arbitrary PCMs (i.e. frontend DAIs) and have processing elements before eventual routing to the HDMI BE DAIs. With backup PCMs, the link between FE and BE DAIs would become dynamic and change when monitors are (un)plugged. This would lead to modifying the topology every time hotplug events happen, which is not currently possible in ASoC and there does not seem to be any obvious benefits from this design.
To overcome above problems and enable the HDMI driver to be used from ASoC, this patch adds a new mode (mst_no_extra_pcms flags) to patch_hdmi.c. In this mode, the codec driver does not assume the backup PCMs to be created.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -254,6 +254,7 @@ struct hda_codec { unsigned int force_pin_prefix:1; /* Add location prefix */ unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ + unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */#ifdef CONFIG_PM unsigned long power_on_acct;
sound/pci/hda/patch_hdmi.c +14 -5
@@ -2075,15 +2075,24 @@ static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx)static int generic_hdmi_build_pcms (struct hda_codec *codec) {struct hdmi_spec *spec = codec->spec; -int idx; +int idx, pcm_num;/* * for non-mst mode, pcm number is the same as before -* for DP MST mode, pcm number is (nid number + dev_num - 1) -* dev_num is the device entry number in a pin -* +* for DP MST mode without extra PCM, pcm number is same +* for DP MST mode with extra PCMs, pcm number is +* (nid number + dev_num - 1) +* dev_num is the device entry number in a pin */ -for (idx =0 ; idx < spec->num_nids + spec->dev_num -1 ; idx++) { + +if (codec->mst_no_extra_pcms) + pcm_num = spec->num_nids; +else + pcm_num = spec->num_nids + spec->dev_num -1 ; + +codec_dbg (codec,"hdmi: pcm_num set to %d\n" , pcm_num); + +for (idx =0 ; idx < pcm_num; idx++) {struct hda_pcm *info;struct hda_pcm_stream *pstr;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 180/350 phy: renesas: phy-rcar-gen2: Fix the array off by one warning
In reply to Sasha LevinFrom: Biju Das <[email protected]>
[ Upstream commit c9baab38fe0e28762d0d67611cbe2aef0fb3fc72 ]
Fix the below smatch warning by adding variable check rather than the hardcoded value.
warn: array off by one? 'data->select_value[channel_num]'
--- drivers/phy/renesas/phy-rcar-gen2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/phy/renesas/phy-rcar-gen2.c +4 -1
@@ -71,6 +71,7 @@ struct rcar_gen2_phy_driver {struct rcar_gen2_phy_data {const struct phy_ops *gen2_phy_ops;const u32 (*select_value)[PHYS_PER_CHANNEL ]; +const u32 num_channels; };static int rcar_gen2_phy_init (struct phy *p)
@@ -271,11 +272,13 @@ static const u32 usb20_select_value[][PHYS_PER_CHANNEL] = {static const struct rcar_gen2_phy_data rcar_gen2_usb_phy_data = { .gen2_phy_ops = &rcar_gen2_phy_ops, .select_value = pci_select_value, + .num_channels =ARRAY_SIZE (pci_select_value), };static const struct rcar_gen2_phy_data rz_g1c_usb_phy_data = { .gen2_phy_ops = &rz_g1c_phy_ops, .select_value = usb20_select_value, + .num_channels =ARRAY_SIZE (usb20_select_value), };static const struct of_device_id rcar_gen2_phy_match_table[] = {
@@ -389,7 +392,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) channel->selected_phy =-1 ; error =of_property_read_u32 (np,"reg" , &channel_num); -if (error || channel_num >2 ) { +if (error || channel_num >= data->num_channels) {dev_err (dev,"Invalid \"reg\" property\n" );of_node_put (np);return error;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 181/350 phy: qcom-usb-hs: Fix extcon double register after power cycle
In reply to Sasha LevinFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 64f86b9978449ff05bfa6c64b4c5439e21e9c80b ]
Commit f0b5c2c96370 ("phy: qcom-usb-hs: Replace the extcon API") switched from extcon_register_notifier() to the resource-managed API, i.e. devm_extcon_register_notifier().
This is problematic in this case, because the extcon notifier is dynamically registered/unregistered whenever the PHY is powered on/off. The resource-managed API does not unregister the notifier until the driver is removed, so as soon as the PHY is power cycled, attempting to register the notifier again results in:
double register detected WARNING: CPU: 1 PID: 182 at kernel/notifier.c:26 notifier_chain_register+0x74/0xa0 Call trace: ... extcon_register_notifier+0x74/0xb8 devm_extcon_register_notifier+0x54/0xb8 qcom_usb_hs_phy_power_on+0x1fc/0x208 ...
... and USB stops working after plugging the cable out and in another time.
The easiest way to fix this is to make a partial revert of commit f0b5c2c96370 ("phy: qcom-usb-hs: Replace the extcon API") and avoid using the resource-managed API in this case.
--- drivers/phy/qualcomm/phy-qcom-usb-hs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-usb-hs.c +5 -2
@@ -158,8 +158,8 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy)/* setup initial state */ qcom_usb_hs_phy_vbus_notifier (&uphy->vbus_notify, state, uphy->vbus_edev); - ret =devm_extcon_register_notifier (&ulpi->dev, uphy->vbus_edev, -EXTCON_USB , &uphy->vbus_notify); + ret =extcon_register_notifier (uphy->vbus_edev,EXTCON_USB , + &uphy->vbus_notify);if (ret) goto err_ulpi; }
@@ -180,6 +180,9 @@ static int qcom_usb_hs_phy_power_off(struct phy *phy) {struct qcom_usb_hs_phy *uphy =phy_get_drvdata (phy); +if (uphy->vbus_edev) +extcon_unregister_notifier (uphy->vbus_edev,EXTCON_USB , + &uphy->vbus_notify);regulator_disable (uphy->v3p3);regulator_disable (uphy->v1p8);clk_disable_unprepare (uphy->sleep_clk);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 182/350 s390/time: ensure get_clock_monotonic() returns monotonic values
In reply to Sasha LevinFrom: Heiko Carstens <[email protected]>
[ Upstream commit 011620688a71f2f1fe9901dbc2479a7c01053196 ]
The current implementation of get_clock_monotonic() leaves it up to the caller to call the function with preemption disabled. The only core kernel caller (sched_clock) however does not disable preemption.
In order to make sure that all callers of this function see monotonic values handle disabling preemption within the function itself.
--- arch/s390/include/asm/timex.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/s390/include/asm/timex.h +10 -6
@@ -10,8 +10,9 @@#ifndef _ASM_S390_TIMEX_H#define _ASM_S390_TIMEX_H -#include <asm/lowcore.h> +#include <linux/preempt.h> #include <linux/time64.h> +#include <asm/lowcore.h> /* The value of the TOD clock for 1.1.1970. */ #define TOD_UNIX_EPOCH 0x7d91048bca000000ULL
@@ -186,15 +187,18 @@ extern unsigned char tod_clock_base[16] __aligned(8);/** * get_clock_monotonic - returns current time in clock rate units * -* The caller must ensure that preemption is disabled. * The clock and tod_clock_base get changed via stop_machine. -* Therefore preemption must be disabled when calling this -* function, otherwise the returned value is not guaranteed to -* be monotonic. +* Therefore preemption must be disabled, otherwise the returned +* value is not guaranteed to be monotonic. */ static inline unsigned long long get_tod_clock_monotonic (void ) { -return get_tod_clock () - *(unsigned long long *) &tod_clock_base[1 ]; +unsigned long long tod; + +preempt_disable (); + tod =get_tod_clock () - *(unsigned long long *) &tod_clock_base[1 ]; +preempt_enable (); +return tod; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 183/350 s390: add error handling to perf_callchain_kernel
In reply to Sasha LevinFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit effb83ccc83a97dbbe5214f4c443522719f05f3a ]
perf_callchain_kernel stops neither when it encounters a garbage address, nor when it runs out of space. Fix both issues using x86 version as an inspiration.
--- arch/s390/kernel/perf_event.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/kernel/perf_event.c +6 -2
@@ -224,9 +224,13 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) {struct unwind_state state; +unsigned long addr; -unwind_for_each_frame (&state, current, regs,0 ) -perf_callchain_store (entry, state.ip); +unwind_for_each_frame (&state, current, regs,0 ) { + addr =unwind_get_return_address (&state); +if (!addr ||perf_callchain_store (entry, addr)) +return ; + } }/* Perf definitions for PMU event attributes in sysfs */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 184/350 s390/mm: add mm_pxd_folded() checks to pxd_free()
In reply to Sasha LevinFrom: Gerald Schaefer <[email protected]>
[ Upstream commit 2416cefc504ba8ae9b17e3e6b40afc72708f96be ]
Unlike pxd_free_tlb(), the pxd_free() functions do not check for folded page tables. This is not an issue so far, as those functions will actually never be called, since no code will reach them when page tables are folded.
In order to avoid future issues, and to make the s390 code more similar to other architectures, add mm_pxd_folded() checks, similar to how it is done in pxd_free_tlb().
This was found by testing a patch from from Anshuman Khandual, which is currently discussed on LKML ("mm/debug: Add tests validating architecture page table helpers").
--- arch/s390/include/asm/pgalloc.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
arch/s390/include/asm/pgalloc.h +14 -2
@@ -56,7 +56,12 @@ static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long address)crst_table_init (table, _REGION2_ENTRY_EMPTY);return (p4d_t *) table; } -#define p4d_free (mm, p4d) crst_table_free(mm, (unsigned long *) p4d) + +static inline void p4d_free (struct mm_struct *mm,p4d_t *p4d) +{ +if (!mm_p4d_folded (mm)) +crst_table_free (mm, (unsigned long *) p4d); +}static inline pud_t *pud_alloc_one (struct mm_struct *mm,unsigned long address) {
@@ -65,7 +70,12 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)crst_table_init (table, _REGION3_ENTRY_EMPTY);return (pud_t *) table; } -#define pud_free (mm, pud) crst_table_free(mm, (unsigned long *) pud) + +static inline void pud_free (struct mm_struct *mm,pud_t *pud) +{ +if (!mm_pud_folded (mm)) +crst_table_free (mm, (unsigned long *) pud); +}static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long vmaddr) {
@@ -83,6 +93,8 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)static inline void pmd_free (struct mm_struct *mm,pmd_t *pmd) { +if (mm_pmd_folded (mm)) +return ;pgtable_pmd_page_dtor (virt_to_page (pmd));crst_table_free (mm, (unsigned long *) pmd); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 185/350 net: hns3: add struct netdev_queue debug info for TX timeout
In reply to Sasha LevinFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 647522a5ef6401dcdb8ec417421e43fb21910167 ]
When there is a TX timeout, we can tell if the driver or stack has stopped the queue by looking at state field, and when has the last packet transmited by looking at trans_start field.
So this patch prints these two field in thehns3_get_tx_timeo_queue_info().
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +3 -0
@@ -1692,6 +1692,9 @@ static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev) time_after(jiffies, (trans_start + ndev->watchdog_timeo))) { timeout_queue = i; +netdev_info (ndev,"queue state: 0x%lx, delta msecs: %u\n" , + q->state, +jiffies_to_msecs (jiffies - trans_start));break ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 186/350 libata: Ensure ata_port probe has completed before detach
In reply to Sasha LevinFrom: John Garry <[email protected]>
[ Upstream commit 130f4caf145c3562108b245a576db30b916199d2 ]
With CONFIG_DEBUG_TEST_DRIVER_REMOVE set, we may find the following WARN:
[ 23.452574] ------------[ cut here ]------------ [ 23.457190] WARNING: CPU: 59 PID: 1 at drivers/ata/libata-core.c:6676 ata_host_detach+0x15c/0x168 [ 23.466047] Modules linked in: [ 23.469092] CPU: 59 PID: 1 Comm: swapper/0 Not tainted 5.4.0-rc1-00010-g5b83fd27752b-dirty #296 [ 23.477776] Hardware name: Huawei D06 /D06, BIOS Hisilicon D06 UEFI RC0 - V1.16.01 03/15/2019 [ 23.486286] pstate: a0c00009 (NzCv daif +PAN +UAO) [ 23.491065] pc : ata_host_detach+0x15c/0x168 [ 23.495322] lr : ata_host_detach+0x88/0x168 [ 23.499491] sp : ffff800011cabb50 [ 23.502792] x29: ffff800011cabb50 x28: 0000000000000007 [ 23.508091] x27: ffff80001137f068 x26: ffff8000112c0c28 [ 23.513390] x25: 0000000000003848 x24: ffff0023ea185300 [ 23.518689] x23: 0000000000000001 x22: 00000000000014c0 [ 23.523987] x21: 0000000000013740 x20: ffff0023bdc20000 [ 23.529286] x19: 0000000000000000 x18: 0000000000000004 [ 23.534584] x17: 0000000000000001 x16: 00000000000000f0 [ 23.539883] x15: ffff0023eac13790 x14: ffff0023eb76c408 [ 23.545181] x13: 0000000000000000 x12: ffff0023eac13790 [ 23.550480] x11: ffff0023eb76c228 x10: 0000000000000000 [ 23.555779] x9 : ffff0023eac13798 x8 : 0000000040000000 [ 23.561077] x7 : 0000000000000002 x6 : 0000000000000001 [ 23.566376] x5 : 0000000000000002 x4 : 0000000000000000 [ 23.571674] x3 : ffff0023bf08a0bc x2 : 0000000000000000 [ 23.576972] x1 : 3099674201f72700 x0 : 0000000000400284 [ 23.582272] Call trace: [ 23.584706] ata_host_detach+0x15c/0x168 [ 23.588616] ata_pci_remove_one+0x10/0x18 [ 23.592615] ahci_remove_one+0x20/0x40 [ 23.596356] pci_device_remove+0x3c/0xe0 [ 23.600267] really_probe+0xdc/0x3e0 [ 23.603830] driver_probe_device+0x58/0x100 [ 23.608000] device_driver_attach+0x6c/0x90 [ 23.612169] __driver_attach+0x84/0xc8 [ 23.615908] bus_for_each_dev+0x74/0xc8 [ 23.619730] driver_attach+0x20/0x28 [ 23.623292] bus_add_driver+0x148/0x1f0 [ 23.627115] driver_register+0x60/0x110 [ 23.630938] __pci_register_driver+0x40/0x48 [ 23.635199] ahci_pci_driver_init+0x20/0x28 [ 23.639372] do_one_initcall+0x5c/0x1b0 [ 23.643199] kernel_init_freeable+0x1a4/0x24c [ 23.647546] kernel_init+0x10/0x108 [ 23.651023] ret_from_fork+0x10/0x18 [ 23.654590] ---[ end trace 634a14b675b71c13 ]---
With KASAN also enabled, we may also get many use-after-free reports.
The issue is that when CONFIG_DEBUG_TEST_DRIVER_REMOVE is set, we may attempt to detach the ata_port before it has been probed.
This is because the ata_ports are async probed, meaning that there is no guarantee that the ata_port has probed prior to detach. When the ata_port does probe in this scenario, we get all sorts of issues as the detach may have already happened.
Fix by ensuring synchronisation with async_synchronize_full(). We could alternatively use the cookie returned from the ata_port probe async_schedule() call, but that means managing the cookie, so more complicated.
--- drivers/ata/libata-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/libata-core.c +3 -0
@@ -6708,6 +6708,9 @@ void ata_host_detach(struct ata_host *host) {int i; +/* Ensure ata_port probe has completed */ +async_synchronize_full (); +for (i =0 ; i < host->n_ports; i++)ata_port_detach (host->ports[i]);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 187/350 loop: fix no-unmap write-zeroes request behavior
In reply to Sasha LevinFrom: "Darrick J. Wong" <[email protected]>
[ Upstream commit efcfec579f6139528c9e6925eca2bc4a36da65c6 ]
Currently, if the loop device receives a WRITE_ZEROES request, it asks the underlying filesystem to punch out the range. This behavior is correct if unmapping is allowed. However, a NOUNMAP request means that the caller doesn't want us to free the storage backing the range, so punching out the range is incorrect behavior.
To satisfy a NOUNMAP | WRITE_ZEROES request, loop should ask the underlying filesystem to FALLOC_FL_ZERO_RANGE, which is (according to the fallocate documentation) required to ensure that the entire range is backed by real storage, which suffices for our purposes.
--- drivers/block/loop.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/block/loop.c +18 -8
@@ -417,18 +417,20 @@ static int lo_read_transfer(struct loop_device *lo, struct request *rq,return ret; } -static int lo_discard (struct loop_device *lo,struct request *rq,loff_t pos) +static int lo_fallocate (struct loop_device *lo,struct request *rq,loff_t pos, +int mode) {/* -* We use punch hole to reclaim the free space used by the -* image a.k.a. discard. However we do not support discard if -* encryption is enabled, because it may give an attacker -* useful information. +* We use fallocate to manipulate the space mappings used by the image +* a.k.a. discard/zerorange. However we do not support this if +* encryption is enabled, because it may give an attacker useful +* information. */ struct file *file = lo->lo_backing_file; -int mode =FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE ;int ret; + mode |=FALLOC_FL_KEEP_SIZE ; +if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { ret = -EOPNOTSUPP ; goto out;
@@ -596,9 +598,17 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)switch (req_op (rq)) {case REQ_OP_FLUSH :return lo_req_flush (lo, rq); -case REQ_OP_DISCARD :case REQ_OP_WRITE_ZEROES : -return lo_discard (lo, rq, pos); +/* +* If the caller doesn't want deallocation, call zeroout to +* write zeroes the range. Otherwise, punch them out. +*/ +return lo_fallocate (lo, rq, pos, + (rq->cmd_flags &REQ_NOUNMAP ) ? +FALLOC_FL_ZERO_RANGE : +FALLOC_FL_PUNCH_HOLE ); +case REQ_OP_DISCARD : +return lo_fallocate (lo, rq, pos,FALLOC_FL_PUNCH_HOLE );case REQ_OP_WRITE :if (lo->transfer)return lo_write_transfer (lo, rq, pos);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 188/350 ata: sata_mv, avoid trigerrable BUG_ON
In reply to Sasha LevinFrom: Jiri Slaby <[email protected]>
[ Upstream commit e9f691d899188679746eeb96e6cb520459eda9b4 ]
There are several reports that the BUG_ON on unsupported command in mv_qc_prep can be triggered under some circumstances:
https://bugzilla.suse.com/show_bug.cgi?id=1110252
https://serverfault.com/questions/888897/raid-problems-after-power-outage
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1652185
https://bugs.centos.org/view.php?id=14998
Let sata_mv handle the failure gracefully: warn about that incl. the failed command number and return an AC_ERR_INVALID error. We can do that now thanks to the previous patch.
Remove also the long-standing FIXME.
[v2] use %.2x as commands are defined as hexa.
--- drivers/ata/sata_mv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/ata/sata_mv.c +3 -5
@@ -2098,12 +2098,10 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)* non-NCQ mode are: [RW] STREAM DMA and W DMA FUA EXT, none * of which are defined/used by Linux. If we get here, this * driver needs work. -* -* FIXME: modify libata to give qc_prep a return value and -* return error here. */ -BUG_ON (tf->command); -break ; +ata_port_err (ap,"%s: unsupported command: %.2x\n" , __func__, + tf->command); +return AC_ERR_INVALID ; }mv_crqb_pack_cmd (cw++, tf->nsect,ATA_REG_NSECT ,0 );mv_crqb_pack_cmd (cw++, tf->hob_lbal,ATA_REG_LBAL ,0 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 189/350 net/mlx5e: Verify that rule has at least one fwd/drop action
In reply to Sasha LevinFrom: Vlad Buslov <[email protected]>
[ Upstream commit ae2741e2b6ce2bf1b656b1152c4ef147ff35b096 ]
Currently, mlx5 tc layer doesn't verify that rule has at least one forward or drop action which leads to following firmware syndrome when user tries to offload such action:
[ 1824.860501] mlx5_core 0000:81:00.0: mlx5_cmd_check:753:(pid 29458): SET_FLOW_TABLE_ENTRY(0x936) op_mod(0x0) failed, status bad parameter(0x3), syndrome (0x144b7a)
Add check at the end of parse_tc_fdb_actions() that verifies that resulting attribute has action fwd or drop flag set.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +6 -0
@@ -3443,6 +3443,12 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, attr->action |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; } +if (!(attr->action & + (MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |MLX5_FLOW_CONTEXT_ACTION_DROP ))) { +NL_SET_ERR_MSG (extack,"Rule must have at least one forward/drop action" ); +return -EOPNOTSUPP ; + } +if (attr->split_count >0 && !mlx5_esw_has_fwd_fdb (priv->mdev)) {NL_SET_ERR_MSG_MOD (extack,"current firmware doesn't support split rule for port mirroring" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 190/350 pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 884caadad128efad8e00c1cdc3177bc8912ee8ec ]
The definitions for bit field [19:18] of the Peripheral Function Select Register 3 were accidentally copied from bit field [20], leading to duplicates for the TCLK1_B function, and missing TCLK0, CAN_CLK_B, and ET0_ETXD4 functions.
Fix this by adding the missing GPIO_FN_CAN_CLK_B and GPIO_FN_ET0_ETXD4 enum values, and correcting the functions.
--- arch/sh/include/cpu-sh4/cpu/sh7734.h | 2 +- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/sh/include/cpu-sh4/cpu/sh7734.h +1 -1
@@ -134,7 +134,7 @@ enum {GPIO_FN_EX_WAIT1 ,GPIO_FN_SD1_DAT0_A ,GPIO_FN_DREQ2 ,GPIO_FN_CAN1_TX_C ,GPIO_FN_ET0_LINK_C ,GPIO_FN_ET0_ETXD5_A ,GPIO_FN_EX_WAIT0 ,GPIO_FN_TCLK1_B , -GPIO_FN_RD_WR ,GPIO_FN_TCLK0 , +GPIO_FN_RD_WR ,GPIO_FN_TCLK0 ,GPIO_FN_CAN_CLK_B ,GPIO_FN_ET0_ETXD4 ,GPIO_FN_EX_CS5 ,GPIO_FN_SD1_CMD_A ,GPIO_FN_ATADIR ,GPIO_FN_QSSL_B ,GPIO_FN_ET0_ETXD3_A , GPIO_FN_EX_CS4, GPIO_FN_SD1_WP_A, GPIO_FN_ATAWR, GPIO_FN_QMI_QIO1_B,
drivers/pinctrl/sh-pfc/pfc-sh7734.c +2 -2
@@ -1450,7 +1450,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {GPIO_FN (ET0_ETXD2_A ),GPIO_FN (EX_CS5 ),GPIO_FN (SD1_CMD_A ),GPIO_FN (ATADIR ),GPIO_FN (QSSL_B ),GPIO_FN (ET0_ETXD3_A ), -GPIO_FN (RD_WR ),GPIO_FN (TCLK1_B ), +GPIO_FN (RD_WR ),GPIO_FN (TCLK0 ),GPIO_FN (CAN_CLK_B ),GPIO_FN (ET0_ETXD4 ),GPIO_FN (EX_WAIT0 ),GPIO_FN (TCLK1_B ),GPIO_FN (EX_WAIT1 ),GPIO_FN (SD1_DAT0_A ),GPIO_FN (DREQ2 ), GPIO_FN(CAN1_TX_C), GPIO_FN(ET0_LINK_C), GPIO_FN(ET0_ETXD5_A),
@@ -1949,7 +1949,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {/* IP3_20 [1] */ FN_EX_WAIT0 ,FN_TCLK1_B ,/* IP3_19_18 [2] */ -FN_RD_WR ,FN_TCLK1_B ,0 ,0 , +FN_RD_WR ,FN_TCLK0 ,FN_CAN_CLK_B ,FN_ET0_ETXD4 ,/* IP3_17_15 [3] */ FN_EX_CS5 ,FN_SD1_CMD_A ,FN_ATADIR ,FN_QSSL_B , FN_ET0_ETXD3_A, 0, 0, 0,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 191/350 ALSA: bebob: expand sleep just after breaking connections for protocol version 1
In reply to Sasha LevinFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit d3eabe939aee3ffd5b133766a932629a9746298c ]
As long as I investigated, some devices with BeBoB protocol version 1 can be freezed during several hundreds milliseconds after breaking connections. When accessing during the freezed time, any transaction is corrupted. In the worst case, the device is going to reboot.
I can see this issue in:
* Roland FA-66
* M-Audio FireWire Solo
This commit expands sleep just after breaking connections to avoid the freezed time as much as possible. I note that the freeze/reboot behaviour is similar to below models:
* Focusrite Saffire Pro 10 I/O
* Focusrite Saffire Pro 26 I/O
The above models certainly reboot after breaking connections.
--- sound/firewire/bebob/bebob_stream.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
sound/firewire/bebob/bebob_stream.c +6 -5
@@ -415,15 +415,16 @@ static int make_both_connections(struct snd_bebob *bebob)return 0 ; } -static void -break_both_connections (struct snd_bebob *bebob) +static void break_both_connections (struct snd_bebob *bebob) {cmp_connection_break (&bebob->in_conn);cmp_connection_break (&bebob->out_conn); -/* These models seems to be in transition state for a longer time. */ -if (bebob->maudio_special_quirk !=NULL ) -msleep (200 ); +// These models seem to be in transition state for a longer time. When +// accessing in the state, any transactions is corrupted. In the worst +// case, the device is going to reboot. +if (bebob->version <2 ) +msleep (600 ); } static int
Signature · 1 line
2.20.1