5.13.3-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 10/266 drm/imx: Add 8 pixel alignment fix
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit 94dfec48fca756cef90263a03e81f24dae24a5c6 ]
Some standard resolutions like 1366x768 do not work properly with i.MX6 SoCs, since the horizontal resolution needs to be aligned to 8 pixels (so 1360x768 or 1368x768 would work).
This patch allocates framebuffers allocated to 8 pixels. The extra time required to send the extra pixels are removed from the blank time. In order to expose the correct display size to userspace, the stride is increased without increasing the width.
Without this patch systems with this display resolution hang indefinitely during boot up.
--- drivers/gpu/drm/imx/imx-drm-core.c | 19 ++++++++++++++++++- drivers/gpu/drm/imx/imx-ldb.c | 5 +++++ drivers/gpu/drm/imx/ipuv3-crtc.c | 11 ++++++++++- drivers/gpu/drm/imx/ipuv3-plane.c | 19 +++++++++++++++---- drivers/gpu/ipu-v3/ipu-dc.c | 5 +++++ drivers/gpu/ipu-v3/ipu-di.c | 7 +++++++ 6 files changed, 60 insertions(+), 6 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +18 -1
@@ -145,9 +145,26 @@ static const struct drm_ioctl_desc imx_drm_ioctls[] = {/* none so far */ }; +static int imx_drm_dumb_create (struct drm_file *file_priv, +struct drm_device *drm, +struct drm_mode_create_dumb *args) +{ +u32 width = args->width; +int ret; + + args->width =ALIGN (width,8 ); + + ret =drm_gem_cma_dumb_create (file_priv, drm, args); +if (ret) +return ret; + + args->width = width; +return ret; +} +static const struct drm_driver imx_drm_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC , -DRM_GEM_CMA_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (imx_drm_dumb_create), .ioctls = imx_drm_ioctls, .num_ioctls =ARRAY_SIZE (imx_drm_ioctls), .fops = &imx_drm_driver_fops,
drivers/gpu/drm/imx/imx-ldb.c +5 -0
@@ -274,6 +274,11 @@ imx_ldb_encoder_atomic_mode_set(struct drm_encoder *encoder, "%s: mode exceeds 85 MHz pixel clock\n", __func__); } +if (!IS_ALIGNED (mode->hdisplay,8 )) { +dev_warn (ldb->dev, +"%s: hdisplay does not align to 8 byte\n" , __func__); + } +if (dual) { serial_clk =3500UL * mode->clock;imx_ldb_set_clock (ldb, mux,0 , serial_clk, di_clk);
drivers/gpu/drm/imx/ipuv3-crtc.c +10 -1
@@ -305,10 +305,19 @@ static void ipu_crtc_mode_set_nofb(struct drm_crtc *crtc) sig_cfg.vsync_pin = imx_crtc_state->di_vsync_pin;drm_display_mode_to_videomode (mode, &sig_cfg.mode); +if (!IS_ALIGNED (sig_cfg.mode.hactive,8 )) { +unsigned int new_hactive =ALIGN (sig_cfg.mode.hactive,8 ); + +dev_warn (ipu_crtc->dev,"8-pixel align hactive %d -> %d\n" , + sig_cfg.mode.hactive, new_hactive); + + sig_cfg.mode.hfront_porch = new_hactive - sig_cfg.mode.hactive; + sig_cfg.mode.hactive = new_hactive; + }ipu_dc_init_sync (ipu_crtc->dc, ipu_crtc->di, mode->flags &DRM_MODE_FLAG_INTERLACE , - imx_crtc_state->bus_format, mode->hdisplay); + imx_crtc_state->bus_format, sig_cfg.mode.hactive);ipu_di_init_sync_panel (ipu_crtc->di, &sig_cfg); }
drivers/gpu/drm/imx/ipuv3-plane.c +15 -4
@@ -30,6 +30,11 @@ to_ipu_plane_state(struct drm_plane_state *p) return container_of(p, struct ipu_plane_state, base); } +static unsigned int ipu_src_rect_width (const struct drm_plane_state *state) +{ +return ALIGN (drm_rect_width (&state->src) >>16 ,8 ); +} +static inline struct ipu_plane *to_ipu_plane (struct drm_plane *p) { return container_of(p, struct ipu_plane, base);
@@ -441,6 +446,12 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,if (old_fb && fb->pitches[0 ] != old_fb->pitches[0 ]) crtc_state->mode_changed = true; +if (ALIGN (fb->width,8 ) * fb->format->cpp[0 ] > + fb->pitches[0 ] + fb->offsets[0 ]) { +dev_warn (dev,"pitch is not big enough for 8 pixels alignment" ); +return -EINVAL ; + } +switch (fb->format->format) {case DRM_FORMAT_YUV420 :case DRM_FORMAT_YVU420 :
@@ -616,7 +627,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,if (ipu_state->use_pre) { axi_id =ipu_chan_assign_axi_id (ipu_plane->dma);ipu_prg_channel_configure (ipu_plane->ipu_ch, axi_id, -drm_rect_width (&new_state->src) >>16 , +ipu_src_rect_width (new_state),drm_rect_height (&new_state->src) >>16 , fb->pitches[0 ], fb->format->format, fb->modifier, &eba);
@@ -649,9 +660,9 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,break ; } -ipu_dmfc_config_wait4eot (ipu_plane->dmfc,drm_rect_width (dst)); +ipu_dmfc_config_wait4eot (ipu_plane->dmfc,ALIGN (drm_rect_width (dst),8 )); - width =drm_rect_width (&new_state->src) >>16 ; + width =ipu_src_rect_width (new_state); height =drm_rect_height (&new_state->src) >>16 ; info =drm_format_info (fb->format->format); ipu_calculate_bursts(width, info->cpp[0], fb->pitches[0],
@@ -716,7 +727,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,ipu_cpmem_zero (ipu_plane->alpha_ch);ipu_cpmem_set_resolution (ipu_plane->alpha_ch, -drm_rect_width (&new_state->src) >>16 , +ipu_src_rect_width (new_state),drm_rect_height (&new_state->src) >>16 );ipu_cpmem_set_format_passthrough (ipu_plane->alpha_ch,8 );ipu_cpmem_set_high_priority (ipu_plane->alpha_ch);
drivers/gpu/ipu-v3/ipu-dc.c +5 -0
@@ -167,6 +167,11 @@ int ipu_dc_init_sync(struct ipu_dc *dc, struct ipu_di *di, bool interlaced, dc->di =ipu_di_get_num (di); +if (!IS_ALIGNED (width,8 )) { +dev_warn (priv->dev, +"%s: hactive does not align to 8 byte\n" , __func__); + } + map =ipu_bus_format_to_map (bus_format);/*
drivers/gpu/ipu-v3/ipu-di.c +7 -0
@@ -506,6 +506,13 @@ int ipu_di_adjust_videomode(struct ipu_di *di, struct videomode *mode) {u32 diff; +if (!IS_ALIGNED (mode->hactive,8 ) && + mode->hfront_porch <ALIGN (mode->hactive,8 ) - mode->hactive) { +dev_err (di->ipu->dev,"hactive %d is not aligned to 8 and front porch is too small to compensate\n" , + mode->hactive); +return -EINVAL ; + } +if (mode->vfront_porch >=2 )return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 12/266 drm/amdgpu: change the default timeout for kernel compute queues
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 67387dfe0f6630f2d4f412ce77debec23a49db7a ]
Change to 60s. This matches what we already do in virtualization. Infinite timeout can lead to deadlocks in the kernel.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +++----- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -5
@@ -3181,8 +3181,8 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)int ret =0 ;/* -* By default timeout for non compute jobs is 10000. -* And there is no timeout enforced on compute jobs. +* By default timeout for non compute jobs is 10000 +* and 60000 for compute jobs. * In SR-IOV or passthrough mode, timeout for compute * jobs are 60000 by default. */
@@ -3191,10 +3191,8 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)if (amdgpu_sriov_vf (adev)) adev->compute_timeout =amdgpu_sriov_is_pp_one_vf (adev) ?msecs_to_jiffies (60000 ) :msecs_to_jiffies (10000 ); -else if (amdgpu_passthrough (adev)) - adev->compute_timeout =msecs_to_jiffies (60000 );else - adev->compute_timeout =MAX_SCHEDULE_TIMEOUT ; + adev->compute_timeout =msecs_to_jiffies (60000 );if (strnlen (input,AMDGPU_MAX_TIMEOUT_PARAM_LENGTH )) { while ((timeout_setting = strsep(&input, ",")) &&
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -2
@@ -287,9 +287,9 @@ module_param_named(msi, amdgpu_msi, int, 0444);* for SDMA and Video. * * By default(with no lockup_timeout settings), the timeout for all non-compute(GFX, SDMA and Video) -* jobs is 10000. And there is no timeout enforced on compute jobs. +* jobs is 10000. The timeout for compute is 60000. */ -MODULE_PARM_DESC (lockup_timeout,"GPU lockup timeout in ms (default: for bare metal 10000 for non-compute jobs and infinity timeout for compute jobs; " +MODULE_PARM_DESC (lockup_timeout,"GPU lockup timeout in ms (default: for bare metal 10000 for non-compute jobs and 60000 for compute jobs; " "for passthrough or sriov, 10000 for all jobs." " 0: keep default value. negative: infinity timeout), " "format: for bare metal [Non-Compute] or [GFX,Compute,SDMA,Video]; "
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 1/266 drm/mxsfb: Dont select DRM_KMS_FB_HELPER
In reply to Greg Kroah-HartmanFrom: Thomas Zimmermann <[email protected]>
[ Upstream commit 13b29cc3a722c2c0bc9ab9f72f9047d55d08a2f9 ]
Selecting DRM_FBDEV_EMULATION will include the correct settings for fbdev emulation. Drivers should not override this.
--- drivers/gpu/drm/mxsfb/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/mxsfb/Kconfig +0 -1
@@ -10,7 +10,6 @@ config DRM_MXSFB depends on COMMON_CLK select DRM_MXS select DRM_KMS_HELPER - select DRM_KMS_FB_HELPER select DRM_KMS_CMA_HELPER select DRM_PANEL select DRM_PANEL_BRIDGE
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 11/266 net: pch_gbe: Use proper accessors to BE data in pch_ptp_match()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 443ef39b499cc9c6635f83238101f1bb923e9326 ]
Sparse is not happy about handling of strict types in pch_ptp_match():
.../pch_gbe_main.c:158:33: warning: incorrect type in argument 2 (different base types)
.../pch_gbe_main.c:158:33: expected unsigned short [usertype] uid_hi
.../pch_gbe_main.c:158:33: got restricted __be16 [usertype]
.../pch_gbe_main.c:158:45: warning: incorrect type in argument 3 (different base types)
.../pch_gbe_main.c:158:45: expected unsigned int [usertype] uid_lo
.../pch_gbe_main.c:158:45: got restricted __be32 [usertype]
.../pch_gbe_main.c:158:56: warning: incorrect type in argument 4 (different base types)
.../pch_gbe_main.c:158:56: expected unsigned short [usertype] seqid
.../pch_gbe_main.c:158:56: got restricted __be16 [usertype]
Fix that by switching to use proper accessors to BE data.
--- .../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +6 -13
@@ -108,7 +108,7 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid) {u8 *data = skb->data;unsigned int offset; -u16 *hi, *id; +u16 hi, id;u32 lo;if (ptp_classify_raw (skb) ==PTP_CLASS_NONE )
@@ -119,14 +119,11 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid)if (skb->len < offset +OFF_PTP_SEQUENCE_ID +sizeof (seqid))return 0 ; - hi = (u16 *)(data + offset +OFF_PTP_SOURCE_UUID ); - id = (u16 *)(data + offset +OFF_PTP_SEQUENCE_ID ); + hi =get_unaligned_be16 (data + offset +OFF_PTP_SOURCE_UUID +0 ); + lo =get_unaligned_be32 (data + offset +OFF_PTP_SOURCE_UUID +2 ); + id =get_unaligned_be16 (data + offset +OFF_PTP_SEQUENCE_ID ); -memcpy (&lo, &hi[1 ],sizeof (lo)); - -return (uid_hi == *hi && - uid_lo == lo && - seqid == *id); +return (uid_hi == hi && uid_lo == lo && seqid == id); } static void
@@ -136,7 +133,6 @@ pch_rx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb)struct pci_dev *pdev;u64 ns;u32 hi, lo, val; -u16 uid, seq;if (!adapter->hwts_rx_en)return ;
@@ -152,10 +148,7 @@ pch_rx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb) lo =pch_src_uuid_lo_read (pdev); hi =pch_src_uuid_hi_read (pdev); - uid = hi &0xffff ; - seq = (hi >>16 ) &0xffff ; - -if (!pch_ptp_match (skb,htons (uid),htonl (lo),htons (seq))) +if (!pch_ptp_match (skb, hi, lo, hi >>16 )) goto out; ns =pch_rx_snap_read (pdev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 13/266 drm/amd/display: Fix clock table filling logic
In reply to Greg Kroah-HartmanFrom: Ilya Bakoulin <[email protected]>
[ Upstream commit c31bef1cb1203b26f901a511a3246204cfaf8a57 ]
[Why]
Currently, the code that fills the clock table can miss filling information about some of the higher voltage states advertised by the SMU. This, in turn, may cause some of the higher pixel clock modes (e.g. 8k60) to fail validation.
[How]
Fill the table with one entry per DCFCLK level instead of one entry per FCLK level. This is needed because the maximum FCLK does not necessarily need maximum voltage, whereas DCFCLK values from SMU cover the full voltage range.
--- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 80 ++++++++++++------- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 33 +++++--- 2 files changed, 74 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +53 -27
@@ -834,46 +834,67 @@ static struct wm_table lpddr4_wm_table_rn = { }, } }; -static unsigned int find_socclk_for_voltage (struct dpm_clocks *clock_table,unsigned int voltage) + +static unsigned int find_max_fclk_for_voltage (struct dpm_clocks *clock_table, +unsigned int voltage) {int i; +uint32_t max_clk =0 ; -for (i =0 ; i <PP_SMU_NUM_SOCCLK_DPM_LEVELS ; i++) { -if (clock_table->SocClocks[i].Vol == voltage) -return clock_table->SocClocks[i].Freq; +for (i =0 ; i <PP_SMU_NUM_FCLK_DPM_LEVELS ; i++) { +if (clock_table->FClocks[i].Vol <= voltage) { + max_clk = clock_table->FClocks[i].Freq > max_clk ? + clock_table->FClocks[i].Freq : max_clk; + } } -ASSERT (0 ); -return 0 ; +return max_clk; } -static unsigned int find_dcfclk_for_voltage (struct dpm_clocks *clock_table,unsigned int voltage) + +static unsigned int find_max_memclk_for_voltage (struct dpm_clocks *clock_table, +unsigned int voltage) {int i; +uint32_t max_clk =0 ; -for (i =0 ; i <PP_SMU_NUM_DCFCLK_DPM_LEVELS ; i++) { -if (clock_table->DcfClocks[i].Vol == voltage) -return clock_table->DcfClocks[i].Freq; +for (i =0 ; i <PP_SMU_NUM_MEMCLK_DPM_LEVELS ; i++) { +if (clock_table->MemClocks[i].Vol <= voltage) { + max_clk = clock_table->MemClocks[i].Freq > max_clk ? + clock_table->MemClocks[i].Freq : max_clk; + } } -ASSERT (0 ); -return 0 ; +return max_clk; +} + +static unsigned int find_max_socclk_for_voltage (struct dpm_clocks *clock_table, +unsigned int voltage) +{ +int i; +uint32_t max_clk =0 ; + +for (i =0 ; i <PP_SMU_NUM_SOCCLK_DPM_LEVELS ; i++) { +if (clock_table->SocClocks[i].Vol <= voltage) { + max_clk = clock_table->SocClocks[i].Freq > max_clk ? + clock_table->SocClocks[i].Freq : max_clk; + } + } + +return max_clk; }static void rn_clk_mgr_helper_populate_bw_params (struct clk_bw_params *bw_params,struct dpm_clocks *clock_table,struct integrated_info *bios_info) {int i, j =0 ; +unsigned int volt; j =-1 ; -ASSERT (PP_SMU_NUM_FCLK_DPM_LEVELS <=MAX_NUM_DPM_LVL ); - -/* Find lowest DPM, FCLK is filled in reverse order*/ - -for (i =PP_SMU_NUM_FCLK_DPM_LEVELS -1 ; i >=0 ; i--) { -if (clock_table->FClocks[i].Freq !=0 && clock_table->FClocks[i].Vol !=0 ) { +/* Find max DPM */ +for (i =0 ; i <PP_SMU_NUM_DCFCLK_DPM_LEVELS ; ++i) { +if (clock_table->DcfClocks[i].Freq !=0 && + clock_table->DcfClocks[i].Vol !=0 ) j = i; -break ; - } }if (j ==-1 ) {
@@ -884,13 +905,18 @@ static void rn_clk_mgr_helper_populate_bw_params(struct clk_bw_params *bw_params bw_params->clk_table.num_entries = j +1 ; -for (i =0 ; i < bw_params->clk_table.num_entries; i++, j--) { - bw_params->clk_table.entries[i].fclk_mhz = clock_table->FClocks[j].Freq; - bw_params->clk_table.entries[i].memclk_mhz = clock_table->MemClocks[j].Freq; - bw_params->clk_table.entries[i].voltage = clock_table->FClocks[j].Vol; - bw_params->clk_table.entries[i].dcfclk_mhz =find_dcfclk_for_voltage (clock_table, clock_table->FClocks[j].Vol); - bw_params->clk_table.entries[i].socclk_mhz =find_socclk_for_voltage (clock_table, - bw_params->clk_table.entries[i].voltage); +for (i =0 ; i < bw_params->clk_table.num_entries; i++) { + volt = clock_table->DcfClocks[i].Vol; + + bw_params->clk_table.entries[i].voltage = volt; + bw_params->clk_table.entries[i].dcfclk_mhz = + clock_table->DcfClocks[i].Freq; + bw_params->clk_table.entries[i].fclk_mhz = +find_max_fclk_for_voltage (clock_table, volt); + bw_params->clk_table.entries[i].memclk_mhz = +find_max_memclk_for_voltage (clock_table, volt); + bw_params->clk_table.entries[i].socclk_mhz = +find_max_socclk_for_voltage (clock_table, volt); } bw_params->vram_type = bios_info->memory_type;
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +21 -12
@@ -1575,10 +1575,12 @@ static struct _vcs_dpi_voltage_scaling_st construct_low_pstate_lvl(struct clk_li low_pstate_lvl.phyclk_d18_mhz = dcn2_1_soc.clock_limits[high_voltage_lvl].phyclk_d18_mhz; low_pstate_lvl.phyclk_mhz = dcn2_1_soc.clock_limits[high_voltage_lvl].phyclk_mhz; -for (i = clk_table->num_entries; i >1 ; i--) - clk_table->entries[i] = clk_table->entries[i-1 ]; - clk_table->entries[1 ] = clk_table->entries[0 ]; - clk_table->num_entries++; +if (clk_table->num_entries <MAX_NUM_DPM_LVL ) { +for (i = clk_table->num_entries; i >1 ; i--) + clk_table->entries[i] = clk_table->entries[i-1 ]; + clk_table->entries[1 ] = clk_table->entries[0 ]; + clk_table->num_entries++; + }return low_pstate_lvl; }
@@ -1610,10 +1612,6 @@ static void update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param } } -/* clk_table[1] is reserved for min DF PState. skip here to fill in later. */ -if (i ==1 ) - k++; - clock_limits[k].state = k; clock_limits[k].dcfclk_mhz = clk_table->entries[i].dcfclk_mhz; clock_limits[k].fabricclk_mhz = clk_table->entries[i].fclk_mhz;
@@ -1630,14 +1628,25 @@ static void update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param k++; } -for (i =0 ; i < clk_table->num_entries +1 ; i++) - dcn2_1_soc.clock_limits[i] = clock_limits[i]; + +if (clk_table->num_entries >=MAX_NUM_DPM_LVL ) { +for (i =0 ; i < clk_table->num_entries +1 ; i++) + dcn2_1_soc.clock_limits[i] = clock_limits[i]; + }else { + dcn2_1_soc.clock_limits[0 ] = clock_limits[0 ]; +for (i =2 ; i < clk_table->num_entries +1 ; i++) { + dcn2_1_soc.clock_limits[i] = clock_limits[i -1 ]; + dcn2_1_soc.clock_limits[i].state = i; + } + } +if (clk_table->num_entries) { - dcn2_1_soc.num_states = clk_table->num_entries +1 ;/* fill in min DF PState */ dcn2_1_soc.clock_limits[1 ] =construct_low_pstate_lvl (clk_table, closest_clk_lvl); + dcn2_1_soc.num_states = clk_table->num_entries;/* duplicate last level */ - dcn2_1_soc.clock_limits[dcn2_1_soc.num_states] = dcn2_1_soc.clock_limits[dcn2_1_soc.num_states -1 ]; + dcn2_1_soc.clock_limits[dcn2_1_soc.num_states] = + dcn2_1_soc.clock_limits[dcn2_1_soc.num_states -1 ]; dcn2_1_soc.clock_limits[dcn2_1_soc.num_states].state = dcn2_1_soc.num_states; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 15/266 clk: renesas: rcar-usb2-clock-sel: Fix error handling in .probe()
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit a20a40a8bbc2cf4b29d7248ea31e974e9103dd7f ]
The error handling paths after pm_runtime_get_sync() have no refcount decrement, which leads to refcount leak.
--- drivers/clk/renesas/rcar-usb2-clock-sel.c | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
drivers/clk/renesas/rcar-usb2-clock-sel.c +15 -9
@@ -128,10 +128,8 @@ static int rcar_usb2_clock_sel_resume(struct device *dev)static int rcar_usb2_clock_sel_remove (struct platform_device *pdev) {struct device *dev = &pdev->dev; -struct usb2_clock_sel_priv *priv =platform_get_drvdata (pdev);of_clk_del_provider (dev->of_node); -clk_hw_unregister (&priv->hw);pm_runtime_put (dev);pm_runtime_disable (dev);
@@ -164,9 +162,6 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)if (IS_ERR (priv->rsts))return PTR_ERR (priv->rsts); -pm_runtime_enable (dev); -pm_runtime_get_sync (dev); - clk =devm_clk_get (dev,"usb_extal" );if (!IS_ERR (clk) && !clk_prepare_enable (clk)) { priv->extal = !!clk_get_rate (clk);
@@ -183,6 +178,8 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)return -ENOENT ; } +pm_runtime_enable (dev); +pm_runtime_get_sync (dev);platform_set_drvdata (pdev, priv);dev_set_drvdata (dev, priv);
@@ -190,11 +187,20 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev) init.ops = &usb2_clock_sel_clock_ops; priv->hw.init = &init; - clk =clk_register (NULL , &priv->hw); -if (IS_ERR (clk)) -return PTR_ERR (clk); + ret =devm_clk_hw_register (NULL , &priv->hw); +if (ret) + goto pm_put; + + ret =of_clk_add_hw_provider (np, of_clk_hw_simple_get, &priv->hw); +if (ret) + goto pm_put; + +return 0 ; -return of_clk_add_hw_provider (np, of_clk_hw_simple_get, &priv->hw); +pm_put: +pm_runtime_put (dev); +pm_runtime_disable (dev); +return ret; }static const struct dev_pm_ops rcar_usb2_clock_sel_pm_ops = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 14/266 drm/amd/display: fix use_max_lb flag for 420 pixel formats
In reply to Greg Kroah-HartmanFrom: Dmytro Laktyushkin <[email protected]>
[ Upstream commit 8809a7a4afe90ad9ffb42f72154d27e7c47551ae ]
Right now the flag simply selects memory config 0 when flag is true however 420 modes benefit more from memory config 3.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c +6 -3
@@ -496,10 +496,13 @@ static enum lb_memory_config dpp1_dscl_find_lb_memory_config(struct dcn10_dpp *dint vtaps_c = scl_data->taps.v_taps_c;int ceil_vratio =dc_fixpt_ceil (scl_data->ratios.vert);int ceil_vratio_c =dc_fixpt_ceil (scl_data->ratios.vert_c); -enum lb_memory_config mem_cfg =LB_MEMORY_CONFIG_0 ; -if (dpp->base.ctx->dc->debug.use_max_lb) -return mem_cfg; +if (dpp->base.ctx->dc->debug.use_max_lb) { +if (scl_data->format ==PIXEL_FORMAT_420BPP8 + || scl_data->format ==PIXEL_FORMAT_420BPP10 ) +return LB_MEMORY_CONFIG_3 ; +return LB_MEMORY_CONFIG_0 ; + } dpp->base.caps->dscl_calc_lb_num_partitions ( scl_data,LB_MEMORY_CONFIG_1 , &num_part_y, &num_part_c);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 16/266 MIPS: Loongson64: Fix build error secondary_kexec_args undeclared under !SMP
In reply to Greg Kroah-HartmanFrom: Youling Tang <[email protected]>
[ Upstream commit 6a73022ee3fdf7e60f2ba0a3a835dd421c05b5b5 ]
On the Loongson64 platform, if CONFIG_SMP is not set, the following build error will occur:arch/mips/loongson64/reset.c:133:2: error:'secondary_kexec_args' undeclared
Because the definition and declaration of secondary_kexec_args are in the CONFIG_SMP, the secondary_kexec_args variable should be used in CONFIG_SMP.
--- arch/mips/loongson64/reset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/mips/loongson64/reset.c +4 -1
@@ -126,11 +126,12 @@ static void loongson_kexec_shutdown(void)for_each_possible_cpu (cpu)if (!cpu_online (cpu))cpu_device_up (get_cpu_device (cpu)); + + secondary_kexec_args[0 ] =TO_UNCAC (0x3ff01000 );#endif kexec_args[0 ] = kexec_argc; kexec_args[1 ] = fw_arg1; kexec_args[2 ] = fw_arg2; - secondary_kexec_args[0 ] =TO_UNCAC (0x3ff01000 );memcpy ((void *)fw_arg1, kexec_argv,KEXEC_ARGV_SIZE );memcpy ((void *)fw_arg2, kexec_envp,KEXEC_ENVP_SIZE ); }
@@ -141,7 +142,9 @@ static void loongson_crash_shutdown(struct pt_regs *regs) kexec_args[0 ] = kdump_argc; kexec_args[1 ] = fw_arg1; kexec_args[2 ] = fw_arg2; +#ifdef CONFIG_SMP secondary_kexec_args[0 ] =TO_UNCAC (0x3ff01000 ); +#endif memcpy ((void *)fw_arg1, kdump_argv,KEXEC_ARGV_SIZE );memcpy ((void *)fw_arg2, kexec_envp,KEXEC_ENVP_SIZE ); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 17/266 hugetlb: clear huge pte during flush function on mips platform
In reply to Greg Kroah-HartmanFrom: Bibo Mao <[email protected]>
[ Upstream commit 33ae8f801ad8bec48e886d368739feb2816478f2 ]
If multiple threads are accessing the same huge page at the same time, hugetlb_cow will be called if one thread write the COW huge page. And function huge_ptep_clear_flush is called to notify other threads to clear the huge pte tlb entry. The other threads clear the huge pte tlb entry and reload it from page table, the reload huge pte entry may be old.
This patch fixes this issue on mips platform, and it clears huge pte entry before notifying other threads to flush current huge page entry, it is similar with other architectures.
--- arch/mips/include/asm/hugetlb.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/mips/include/asm/hugetlb.h +7 -1
@@ -46,7 +46,13 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,static inline void huge_ptep_clear_flush (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -flush_tlb_page (vma, addr &huge_page_mask (hstate_vma (vma))); +/* +* clear the huge pte entry firstly, so that the other smp threads will +* not get old pte entry after finishing flush_tlb_page and before +* setting new huge pte entry +*/ +huge_ptep_get_and_clear (vma->vm_mm, addr, ptep); +flush_tlb_page (vma, addr); }#define __HAVE_ARCH_HUGE_PTE_NONE
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 18/266 atm: iphase: fix possible use-after-free in ia_module_exit()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 1c72e6ab66b9598cac741ed397438a52065a8f1f ]
This module's remove path calls del_timer(). However, that function does not wait until the timer handler finishes. This means that the timer handler may still be running after the driver's remove function has finished, which would result in a use-after-free.
Fix by calling del_timer_sync(), which makes sure the timer handler has finished, and unable to re-schedule itself.
--- drivers/atm/iphase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/iphase.c +1 -1
@@ -3279,7 +3279,7 @@ static void __exit ia_module_exit(void) {pci_unregister_driver (&ia_driver); -del_timer (&ia_timer); +del_timer_sync (&ia_timer); }module_init (ia_module_init);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 19/266 mISDN: fix possible use-after-free in HFC_cleanup()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 009fc857c5f6fda81f2f7dd851b2d54193a8e733 ]
This module's remove path calls del_timer(). However, that function does not wait until the timer handler finishes. This means that the timer handler may still be running after the driver's remove function has finished, which would result in a use-after-free.
Fix by calling del_timer_sync(), which makes sure the timer handler has finished, and unable to re-schedule itself.
--- drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/mISDN/hfcpci.c +1 -1
@@ -2342,7 +2342,7 @@ static void __exitHFC_cleanup (void) {if (timer_pending (&hfc_tl)) -del_timer (&hfc_tl); +del_timer_sync (&hfc_tl);pci_unregister_driver (&hfc_driver); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 2/266 drm/zte: Dont select DRM_KMS_FB_HELPER
In reply to Greg Kroah-HartmanFrom: Thomas Zimmermann <[email protected]>
[ Upstream commit a50e74bec1d17e95275909660c6b43ffe11ebcf0 ]
Selecting DRM_FBDEV_EMULATION will include the correct settings for fbdev emulation. Drivers should not override this.
--- drivers/gpu/drm/zte/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/zte/Kconfig +0 -1
@@ -3,7 +3,6 @@ config DRM_ZTE tristate "DRM Support for ZTE SoCs" depends on DRM && ARCH_ZX select DRM_KMS_CMA_HELPER - select DRM_KMS_FB_HELPER select DRM_KMS_HELPER select SND_SOC_HDMI_CODEC if SND_SOC select VIDEOMODE_HELPERS
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 20/266 atm: nicstar: Fix possible use-after-free in nicstar_cleanup()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 34e7434ba4e97f4b85c1423a59b2922ba7dff2ea ]
This module's remove path calls del_timer(). However, that function does not wait until the timer handler finishes. This means that the timer handler may still be running after the driver's remove function has finished, which would result in a use-after-free.
Fix by calling del_timer_sync(), which makes sure the timer handler has finished, and unable to re-schedule itself.
--- drivers/atm/nicstar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/nicstar.c +1 -1
@@ -299,7 +299,7 @@ static void __exit nicstar_cleanup(void) {XPRINTK ("nicstar: nicstar_cleanup() called.\n" ); -del_timer (&ns_timer); +del_timer_sync (&ns_timer);pci_unregister_driver (&nicstar_driver);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 21/266 net: Treat __napi_schedule_irqoff() as __napi_schedule() on PREEMPT_RT
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 8380c81d5c4fced6f4397795a5ae65758272bbfd ]
__napi_schedule_irqoff() is an optimized version of __napi_schedule() which can be used where it is known that interrupts are disabled, e.g. in interrupt-handlers, spin_lock_irq() sections or hrtimer callbacks.
On PREEMPT_RT enabled kernels this assumptions is not true. Force- threaded interrupt handlers and spinlocks are not disabling interrupts and the NAPI hrtimer callback is forced into softirq context which runs with interrupts enabled as well.
Chasing all usage sites of __napi_schedule_irqoff() is a whack-a-mole game so make __napi_schedule_irqoff() invoke __napi_schedule() for PREEMPT_RT kernels.
The callers of ____napi_schedule() in the networking core have been audited and are correct on PREEMPT_RT kernels as well.
--- net/core/dev.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/core/dev.c +9 -2
@@ -6520,11 +6520,18 @@ EXPORT_SYMBOL(napi_schedule_prep);* __napi_schedule_irqoff - schedule for receive * @n: entry to schedule * -* Variant of __napi_schedule() assuming hard irqs are masked +* Variant of __napi_schedule() assuming hard irqs are masked. +* +* On PREEMPT_RT enabled kernels this maps to __napi_schedule() +* because the interrupt disabled assumption might not be true +* due to force-threaded interrupts and spinlock substitution. */ void __napi_schedule_irqoff (struct napi_struct *n) { -____napi_schedule (this_cpu_ptr (&softnet_data), n); +if (!IS_ENABLED (CONFIG_PREEMPT_RT )) +____napi_schedule (this_cpu_ptr (&softnet_data), n); +else +__napi_schedule (n); }EXPORT_SYMBOL (__napi_schedule_irqoff);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 22/266 drm/mediatek: Fix PM reference leak in mtk_crtc_ddp_hw_init()
In reply to Greg Kroah-HartmanFrom: Wang Li <[email protected]>
[ Upstream commit 69777e6ca396f0a7e1baff40fcad4a9d3d445b7a ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +1 -1
@@ -260,7 +260,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)drm_connector_list_iter_end (&conn_iter); } - ret =pm_runtime_get_sync (crtc->dev->dev); + ret =pm_runtime_resume_and_get (crtc->dev->dev);if (ret <0 ) {DRM_ERROR ("Failed to enable power domain: %d\n" , ret);return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 24/266 net: mdio: ipq8064: add regmap config to disable REGCACHE
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit b097bea10215315e8ee17f88b4c1bbb521b1878c ]
mdio drivers should not use REGCHACHE. Also disable locking since it's handled by the mdio users and regmap is always accessed atomically.
--- drivers/net/mdio/mdio-ipq8064.c | 34 +++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
drivers/net/mdio/mdio-ipq8064.c +24 -10
@@ -7,10 +7,9 @@#include <linux/delay.h> #include <linux/kernel.h> -#include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of_mdio.h> -#include <linux/phy.h> +#include <linux/of_address.h> #include <linux/platform_device.h> #include <linux/regmap.h>
@@ -96,14 +95,34 @@ ipq8064_mdio_write(struct mii_bus *bus, int phy_addr, int reg_offset, u16 data)return ipq8064_mdio_wait_busy (priv); } +static const struct regmap_config ipq8064_mdio_regmap_config = { + .reg_bits =32 , + .reg_stride =4 , + .val_bits =32 , + .can_multi_write = false, +/* the mdio lock is used by any user of this mdio driver */ + .disable_locking = true, + + .cache_type =REGCACHE_NONE , +}; +static int ipq8064_mdio_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct ipq8064_mdio *priv; +struct resource res;struct mii_bus *bus; +void __iomem *base;int ret; +if (of_address_to_resource (np,0 , &res)) +return -ENOMEM ; + + base =ioremap (res.start,resource_size (&res)); +if (!base) +return -ENOMEM ; + bus =devm_mdiobus_alloc_size (&pdev->dev,sizeof (*priv));if (!bus)return -ENOMEM ;
@@ -115,15 +134,10 @@ ipq8064_mdio_probe(struct platform_device *pdev) bus->parent = &pdev->dev; priv = bus->priv; - priv->base =device_node_to_regmap (np); -if (IS_ERR (priv->base)) { -if (priv->base ==ERR_PTR (-EPROBE_DEFER )) -return -EPROBE_DEFER ; - -dev_err (&pdev->dev,"error getting device regmap, error=%pe\n" , - priv->base); + priv->base =devm_regmap_init_mmio (&pdev->dev, base, + &ipq8064_mdio_regmap_config); +if (IS_ERR (priv->base))return PTR_ERR (priv->base); - } ret =of_mdiobus_register (bus, np);if (ret)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 3/266 drm/ast: Fixed CVE for DP501
In reply to Greg Kroah-HartmanFrom: KuoHsiang Chou <[email protected]>
[ Upstream commit ba4e0339a6a33e2ba341703ce14ae8ca203cb2f1 ]
[Bug][DP501]
If ASPEED P2A (PCI to AHB) bridge is disabled and disallowed for CVE_2019_6260 item3, and then the monitor's EDID is unable read through Parade DP501.
The reason is the DP501's FW is mapped to BMC addressing space rather than Host addressing space.
The resolution is that using "pci_iomap_range()" maps to DP501's FW that stored on the end of FB (Frame Buffer).
In this case, FrameBuffer reserves the last 2MB used for the image of DP501.
--- drivers/gpu/drm/ast/ast_dp501.c | 139 +++++++++++++++++++++++--------- drivers/gpu/drm/ast/ast_drv.h | 12 +++ drivers/gpu/drm/ast/ast_main.c | 11 ++- 3 files changed, 125 insertions(+), 37 deletions(-)
drivers/gpu/drm/ast/ast_dp501.c +103 -36
@@ -189,6 +189,9 @@ bool ast_backup_fw(struct drm_device *dev, u8 *addr, u32 size)u32 i, data;u32 boot_address; +if (ast->config_mode != ast_use_p2a) +return false; + data =ast_mindwm (ast,0x1e6e2100 ) &0x01 ;if (data) { boot_address =get_fw_base (ast);
@@ -207,6 +210,9 @@ static bool ast_launch_m68k(struct drm_device *dev)u8 *fw_addr =NULL ;u8 jreg; +if (ast->config_mode != ast_use_p2a) +return false; + data =ast_mindwm (ast,0x1e6e2100 ) &0x01 ;if (!data) {
@@ -271,25 +277,55 @@ u8 ast_get_dp501_max_clk(struct drm_device *dev)struct ast_private *ast =to_ast_private (dev);u32 boot_address, offset, data;u8 linkcap[4 ], linkrate, linklanes, maxclk =0xff ; +u32 *plinkcap; - boot_address =get_fw_base (ast); - -/* validate FW version */ - offset =0xf000 ; - data =ast_mindwm (ast, boot_address + offset); -if ((data &0xf0 ) !=0x10 )/* version: 1x */ -return maxclk; - -/* Read Link Capability */ - offset =0xf014 ; - *(u32 *)linkcap =ast_mindwm (ast, boot_address + offset); -if (linkcap[2 ] ==0 ) { - linkrate = linkcap[0 ]; - linklanes = linkcap[1 ]; - data = (linkrate ==0x0a ) ? (90 * linklanes) : (54 * linklanes); -if (data >0xff ) - data =0xff ; - maxclk = (u8 )data; +if (ast->config_mode == ast_use_p2a) { + boot_address =get_fw_base (ast); + +/* validate FW version */ + offset =AST_DP501_GBL_VERSION ; + data =ast_mindwm (ast, boot_address + offset); +if ((data &AST_DP501_FW_VERSION_MASK ) !=AST_DP501_FW_VERSION_1 )/* version: 1x */ +return maxclk; + +/* Read Link Capability */ + offset =AST_DP501_LINKRATE ; + plinkcap = (u32 *)linkcap; + *plinkcap =ast_mindwm (ast, boot_address + offset); +if (linkcap[2 ] ==0 ) { + linkrate = linkcap[0 ]; + linklanes = linkcap[1 ]; + data = (linkrate ==0x0a ) ? (90 * linklanes) : (54 * linklanes); +if (data >0xff ) + data =0xff ; + maxclk = (u8 )data; + } + }else { +if (!ast->dp501_fw_buf) +return AST_DP501_DEFAULT_DCLK ;/* 1024x768 as default */ + +/* dummy read */ + offset =0x0000 ; + data =readl (ast->dp501_fw_buf + offset); + +/* validate FW version */ + offset =AST_DP501_GBL_VERSION ; + data =readl (ast->dp501_fw_buf + offset); +if ((data &AST_DP501_FW_VERSION_MASK ) !=AST_DP501_FW_VERSION_1 )/* version: 1x */ +return maxclk; + +/* Read Link Capability */ + offset =AST_DP501_LINKRATE ; + plinkcap = (u32 *)linkcap; + *plinkcap =readl (ast->dp501_fw_buf + offset); +if (linkcap[2 ] ==0 ) { + linkrate = linkcap[0 ]; + linklanes = linkcap[1 ]; + data = (linkrate ==0x0a ) ? (90 * linklanes) : (54 * linklanes); +if (data >0xff ) + data =0xff ; + maxclk = (u8 )data; + } }return maxclk; }
@@ -298,26 +334,57 @@ bool ast_dp501_read_edid(struct drm_device *dev, u8 *ediddata) {struct ast_private *ast =to_ast_private (dev);u32 i, boot_address, offset, data; +u32 *pEDIDidx; - boot_address =get_fw_base (ast); - -/* validate FW version */ - offset =0xf000 ; - data =ast_mindwm (ast, boot_address + offset); -if ((data &0xf0 ) !=0x10 ) -return false; - -/* validate PnP Monitor */ - offset =0xf010 ; - data =ast_mindwm (ast, boot_address + offset); -if (!(data &0x01 )) -return false; +if (ast->config_mode == ast_use_p2a) { + boot_address =get_fw_base (ast); -/* Read EDID */ - offset =0xf020 ; -for (i =0 ; i <128 ; i +=4 ) { - data =ast_mindwm (ast, boot_address + offset + i); - *(u32 *)(ediddata + i) = data; +/* validate FW version */ + offset =AST_DP501_GBL_VERSION ; + data =ast_mindwm (ast, boot_address + offset); +if ((data &AST_DP501_FW_VERSION_MASK ) !=AST_DP501_FW_VERSION_1 ) +return false; + +/* validate PnP Monitor */ + offset =AST_DP501_PNPMONITOR ; + data =ast_mindwm (ast, boot_address + offset); +if (!(data &AST_DP501_PNP_CONNECTED )) +return false; + +/* Read EDID */ + offset =AST_DP501_EDID_DATA ; +for (i =0 ; i <128 ; i +=4 ) { + data =ast_mindwm (ast, boot_address + offset + i); + pEDIDidx = (u32 *)(ediddata + i); + *pEDIDidx = data; + } + }else { +if (!ast->dp501_fw_buf) +return false; + +/* dummy read */ + offset =0x0000 ; + data =readl (ast->dp501_fw_buf + offset); + +/* validate FW version */ + offset =AST_DP501_GBL_VERSION ; + data =readl (ast->dp501_fw_buf + offset); +if ((data &AST_DP501_FW_VERSION_MASK ) !=AST_DP501_FW_VERSION_1 ) +return false; + +/* validate PnP Monitor */ + offset =AST_DP501_PNPMONITOR ; + data =readl (ast->dp501_fw_buf + offset); +if (!(data &AST_DP501_PNP_CONNECTED )) +return false; + +/* Read EDID */ + offset =AST_DP501_EDID_DATA ; +for (i =0 ; i <128 ; i +=4 ) { + data =readl (ast->dp501_fw_buf + offset + i); + pEDIDidx = (u32 *)(ediddata + i); + *pEDIDidx = data; + } }return true;
drivers/gpu/drm/ast/ast_drv.h +12 -0
@@ -150,6 +150,7 @@ struct ast_private {void __iomem *regs;void __iomem *ioregs; +void __iomem *dp501_fw_buf;enum ast_chip chip;bool vga2_clone;
@@ -325,6 +326,17 @@ int ast_mode_config_init(struct ast_private *ast);#define AST_MM_ALIGN_SHIFT 4#define AST_MM_ALIGN_MASK ((1 << AST_MM_ALIGN_SHIFT) - 1) +#define AST_DP501_FW_VERSION_MASK GENMASK(7, 4) +#define AST_DP501_FW_VERSION_1 BIT(4) +#define AST_DP501_PNP_CONNECTED BIT(1) + +#define AST_DP501_DEFAULT_DCLK 65 + +#define AST_DP501_GBL_VERSION 0xf000 +#define AST_DP501_PNPMONITOR 0xf010 +#define AST_DP501_LINKRATE 0xf014 +#define AST_DP501_EDID_DATA 0xf020 +int ast_mm_init (struct ast_private *ast);/* ast post */
drivers/gpu/drm/ast/ast_main.c +10 -1
@@ -99,7 +99,7 @@ static void ast_detect_config_mode(struct drm_device *dev, u32 *scu_rev)if (!(jregd0 &0x80 ) || !(jregd1 &0x10 )) {/* Double check it's actually working */ data =ast_read32 (ast,0xf004 ); -if (data !=0xFFFFFFFF ) { +if ((data !=0xFFFFFFFF ) && (data !=0x00 )) {/* P2A works, grab silicon revision */ ast->config_mode = ast_use_p2a;
@@ -411,6 +411,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,return ast; dev = &ast->base; + dev->pdev = pdev;pci_set_drvdata (pdev, dev); ast->regs =pcim_iomap (pdev,1 ,0 );
@@ -450,6 +451,14 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,if (ret)return ERR_PTR (ret); +/* map reserved buffer */ + ast->dp501_fw_buf =NULL ; +if (dev->vram_mm->vram_size <pci_resource_len (dev->pdev,0 )) { + ast->dp501_fw_buf =pci_iomap_range (dev->pdev,0 , dev->vram_mm->vram_size,0 ); +if (!ast->dp501_fw_buf) +drm_info (dev,"failed to map reserved buffer!\n" ); + } + ret =ast_mode_config_init (ast);if (ret)return ERR_PTR (ret);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 23/266 drm/panfrost: devfreq: Disable devfreq when num_supplies > 1
In reply to Greg Kroah-HartmanFrom: Nicolas Boichat <[email protected]>
[ Upstream commit 09da3191827f2fd326205fb58881838e6ea36fb7 ]
GPUs with more than a single regulator (e.g. G72 on MT8183) will require platform-specific handling for devfreq, for 2 reasons:
1. The opp core (drivers/opp/core.c:_generic_set_opp_regulator) does not support multiple regulators, so we'll need custom handlers.
2. Generally, platforms with 2 regulators have platform-specific constraints on how the voltages should be set (e.g. minimum/maximum voltage difference between them), so we should not just create generic handlers that simply change the voltages without taking care of those constraints.
Disable devfreq for now on those GPUs.
--- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/panfrost/panfrost_devfreq.c +9 -0
@@ -92,6 +92,15 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)struct thermal_cooling_device *cooling;struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq; +if (pfdev->comp->num_supplies >1 ) { +/* +* GPUs with more than 1 supply require platform-specific handling: +* continue without devfreq +*/ +DRM_DEV_INFO (dev,"More than 1 supply is not supported yet\n" ); +return 0 ; + } + ret =devm_pm_opp_set_regulators (dev, pfdev->comp->supply_names, pfdev->comp->num_supplies);if (ret) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 4/266 drm/amd/display: fix HDCP reset sequence on reinitialize
In reply to Greg Kroah-HartmanFrom: Brandon Syu <[email protected]>
[ Upstream commit 99c248c41c2199bd34232ce8e729d18c4b343b64 ]
[why]
When setup is called after hdcp has already setup, it would cause to disable HDCP flow won’t execute.
[how]
Don't clean up hdcp content to be 0.
--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c +0 -1
@@ -260,7 +260,6 @@ enum mod_hdcp_status mod_hdcp_setup(struct mod_hdcp *hdcp,struct mod_hdcp_output output;enum mod_hdcp_status status =MOD_HDCP_STATUS_SUCCESS ; -memset (hdcp,0 ,sizeof (struct mod_hdcp ));memset (&output,0 ,sizeof (output)); hdcp->config = *config;HDCP_TOP_INTERFACE_TRACE (hdcp);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 5/266 drm/amd/display: Revert wait vblank on update dpp clock
In reply to Greg Kroah-HartmanFrom: Lewis Huang <[email protected]>
[ Upstream commit d5433a9f692f57c814286f8af2746c567ef79fc8 ]
[Why]
This change only fix dpp clock switch to lower case. New solution later can fix both case, which is "dc: skip program clock when allow seamless boot"
[How]
This reverts commit "dc: wait vblank when stream enabled and update dpp clock"
--- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 10 +--------- drivers/gpu/drm/amd/display/dc/core/dc.c | 13 ------------- drivers/gpu/drm/amd/display/dc/dc.h | 1 - 3 files changed, 1 insertion(+), 23 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +1 -9
@@ -128,7 +128,7 @@ void rn_update_clocks(struct clk_mgr *clk_mgr_base,struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base);struct dc_clocks *new_clocks = &context->bw_ctx.bw.dcn.clk;struct dc *dc = clk_mgr_base->ctx->dc; -int display_count, i; +int display_count;bool update_dppclk = false;bool update_dispclk = false;bool dpp_clock_lowered = false;
@@ -210,14 +210,6 @@ void rn_update_clocks(struct clk_mgr *clk_mgr_base, clk_mgr_base->clks.dppclk_khz, safe_to_lower); -for (i =0 ; i < context->stream_count; i++) { -if (context->streams[i]->signal ==SIGNAL_TYPE_EDP && - context->streams[i]->apply_seamless_boot_optimization) { -dc_wait_for_vblank (dc, context->streams[i]); -break ; - } - } - clk_mgr_base->clks.actual_dppclk_khz =rn_vbios_smu_set_dppclk (clk_mgr, clk_mgr_base->clks.dppclk_khz);
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -13
@@ -3219,19 +3219,6 @@ void dc_link_remove_remote_sink(struct dc_link *link, struct dc_sink *sink) } } -void dc_wait_for_vblank (struct dc *dc,struct dc_stream_state *stream) -{ -int i; - -for (i =0 ; i < dc->res_pool->pipe_count; i++) -if (dc->current_state->res_ctx.pipe_ctx[i].stream == stream) { -struct timing_generator *tg = - dc->current_state->res_ctx.pipe_ctx[i].stream_res.tg; - tg->funcs->wait_for_state (tg,CRTC_STATE_VBLANK ); -break ; - } -} -void get_clock_requirements_for_state (struct dc_state *state,struct AsicStateEx *info) { info->displayClock = (unsigned int )state->bw_ctx.bw.dcn.clk.dispclk_khz;
drivers/gpu/drm/amd/display/dc/dc.h +0 -1
@@ -719,7 +719,6 @@ void dc_init_callbacks(struct dc *dc,void dc_deinit_callbacks (struct dc *dc);void dc_destroy (struct dc **dc); -void dc_wait_for_vblank (struct dc *dc,struct dc_stream_state *stream);/******************************************************************************* * Surface Interfaces ******************************************************************************/
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 9/266 drm/bridge: nwl-dsi: Force a full modeset when crtc_state->active is changed to be true
In reply to Greg Kroah-HartmanFrom: Liu Ying <[email protected]>
[ Upstream commit 3afb2a28fa2404d11cce1956a003f2aaca4da421 ]
This patch replaces ->mode_fixup() with ->atomic_check() so that a full modeset can be requested from there when crtc_state->active is changed to be true(which implies only connector's DPMS is brought out of "Off" status, though not necessarily). Bridge functions are added or changed to accommodate the ->atomic_check() callback. That full modeset is needed by the up-coming patch which gets MIPI DSI controller and PHY ready in ->mode_set(), because it makes sure ->mode_set() and ->atomic_disable() are called in pairs.
--- drivers/gpu/drm/bridge/nwl-dsi.c | 61 ++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 22 deletions(-)
drivers/gpu/drm/bridge/nwl-dsi.c +39 -22
@@ -21,6 +21,7 @@#include <linux/sys_soc.h> #include <linux/time64.h> +#include <drm/drm_atomic_state_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h>
@@ -742,7 +743,9 @@ static int nwl_dsi_disable(struct nwl_dsi *dsi)return 0 ; } -static void nwl_dsi_bridge_disable (struct drm_bridge *bridge) +static void +nwl_dsi_bridge_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) {struct nwl_dsi *dsi =bridge_to_dsi (bridge);int ret;
@@ -803,17 +806,6 @@ static int nwl_dsi_get_dphy_params(struct nwl_dsi *dsi,return 0 ; } -static bool nwl_dsi_bridge_mode_fixup (struct drm_bridge *bridge, -const struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) -{ -/* At least LCDIF + NWL needs active high sync */ - adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ); - adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ); - -return true; -} - static enum drm_mode_status nwl_dsi_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info,
@@ -831,6 +823,24 @@ nwl_dsi_bridge_mode_valid(struct drm_bridge *bridge,return MODE_OK ; } +static int nwl_dsi_bridge_atomic_check (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state) +{ +struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; + +/* At least LCDIF + NWL needs active high sync */ + adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ); + adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ); + +/* Do a full modeset if crtc_state->active is changed to be true. */ +if (crtc_state->active_changed && crtc_state->active) + crtc_state->mode_changed = true; + +return 0 ; +} + static void nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode,
@@ -862,7 +872,9 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge,drm_mode_debug_printmodeline (adjusted_mode); } -static void nwl_dsi_bridge_pre_enable (struct drm_bridge *bridge) +static void +nwl_dsi_bridge_atomic_pre_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) {struct nwl_dsi *dsi =bridge_to_dsi (bridge);int ret;
@@ -897,7 +909,9 @@ static void nwl_dsi_bridge_pre_enable(struct drm_bridge *bridge) } } -static void nwl_dsi_bridge_enable (struct drm_bridge *bridge) +static void +nwl_dsi_bridge_atomic_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) {struct nwl_dsi *dsi =bridge_to_dsi (bridge);int ret;
@@ -942,14 +956,17 @@ static void nwl_dsi_bridge_detach(struct drm_bridge *bridge) }static const struct drm_bridge_funcs nwl_dsi_bridge_funcs = { - .pre_enable = nwl_dsi_bridge_pre_enable, - .enable = nwl_dsi_bridge_enable, - .disable = nwl_dsi_bridge_disable, - .mode_fixup = nwl_dsi_bridge_mode_fixup, - .mode_set = nwl_dsi_bridge_mode_set, - .mode_valid = nwl_dsi_bridge_mode_valid, - .attach = nwl_dsi_bridge_attach, - .detach = nwl_dsi_bridge_detach, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_check = nwl_dsi_bridge_atomic_check, + .atomic_pre_enable = nwl_dsi_bridge_atomic_pre_enable, + .atomic_enable = nwl_dsi_bridge_atomic_enable, + .atomic_disable = nwl_dsi_bridge_atomic_disable, + .mode_set = nwl_dsi_bridge_mode_set, + .mode_valid = nwl_dsi_bridge_mode_valid, + .attach = nwl_dsi_bridge_attach, + .detach = nwl_dsi_bridge_detach, };static int nwl_dsi_parse_dt (struct nwl_dsi *dsi)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 8/266 drm/vc4: fix argument ordering in vc4_crtc_get_margins()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e590c2b03a6143ba93ddad306bc9eaafa838c020 ]
Cppcheck complains that the declaration doesn't match the function definition. Obviously "left" should come before "right". The caller and the function implementation are done this way, it's just the declaration which is wrong so this doesn't affect runtime.
--- drivers/gpu/drm/vc4/vc4_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_drv.h +1 -1
@@ -825,7 +825,7 @@ void vc4_crtc_destroy_state(struct drm_crtc *crtc,void vc4_crtc_reset (struct drm_crtc *crtc);void vc4_crtc_handle_vblank (struct vc4_crtc *crtc);void vc4_crtc_get_margins (struct drm_crtc_state *state, -unsigned int *right,unsigned int *left, +unsigned int *left,unsigned int *right,unsigned int *top,unsigned int *bottom);/* vc4_debugfs.c */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 6/266 drm/amd/display: Fix BSOD with NULL check
In reply to Greg Kroah-HartmanFrom: Chris Park <[email protected]>
[ Upstream commit b2d4b9f72fb14c1e6e4f0128964a84539a72d831 ]
[Why]
CLK mgr is null for server settings.
[How]
Guard the function with NULL check.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -1
@@ -3274,7 +3274,7 @@ void dc_allow_idle_optimizations(struct dc *dc, bool allow)if (dc->debug.disable_idle_power_optimizations)return ; -if (dc->clk_mgr->funcs->is_smu_present) +if (dc->clk_mgr !=NULL && dc->clk_mgr->funcs->is_smu_present)if (!dc->clk_mgr->funcs->is_smu_present (dc->clk_mgr))return ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainercover 5.13.3-rc1 review
This is the start of the stable review cycle for the 5.13.3 release. There are 266 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.3-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.13.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.13.3-rc1
Chao Yu <[email protected]>
f2fs: fix to avoid racing on fsync_entry_slab by multi filesystem instances
Tetsuo Handa <[email protected]>
smackfs: restrict bytes count in smk_set_cipso()
Arnd Bergmann <[email protected]>
media: v4l2-core: explicitly clear ioctl input data
Pavel Skripkin <[email protected]>
jfs: fix GPF in diFree
Theodore Ts'o <[email protected]>
ext4: fix possible UAF when remounting r/o a mmp-protected file system
Thomas Zimmermann <[email protected]>
drm/ast: Remove reference to struct drm_device.pdev
Zou Wei <[email protected]>
pinctrl: mcp23s08: Fix missing unlock on error in mcp23s08_irq()
Mikulas Patocka <[email protected]>
dm writecache: write at least 4k when committing
Sven Schnelle <[email protected]>
s390/signal: switch to using vdso for sigreturn and syscall restart
Sven Schnelle <[email protected]>
s390/vdso: add minimal compat vdso
Sven Schnelle <[email protected]>
s390/vdso: rename VDSO64_LBASE to VDSO_LBASE
Sven Schnelle <[email protected]>
s390/vdso64: add sigreturn,rt_sigreturn and restart_syscall
Sven Schnelle <[email protected]>
s390/vdso: always enable vdso
Benjamin Drung <[email protected]>
media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K
Johan Hovold <[email protected]>
media: rtl28xxu: fix zero-length control request
Johan Hovold <[email protected]>
media: gspca/sunplus: fix zero-length control requests
Johan Hovold <[email protected]>
media: gspca/sq905: fix control-request direction
Bernhard Wimmer <[email protected]>
media: ccs: Fix the op_pll_multiplier address
Pavel Skripkin <[email protected]>
media: zr364xx: fix memory leak in zr364xx_start_readpipe
Johan Hovold <[email protected]>
media: dtv5100: fix control-request directions
Mauro Carvalho Chehab <[email protected]>
media: i2c: ccs-core: fix pm_runtime_get_sync() usage count
Arnd Bergmann <[email protected]>
media: subdev: disallow ioctl for saa6588/davinci
Pali Rohár <[email protected]>
PCI: aardvark: Implement workaround for the readback value of VEND_ID
Pali Rohár <[email protected]>
PCI: aardvark: Fix checking for PIO Non-posted Request
Konstantin Kharlamov <[email protected]>
PCI: Leave Apple Thunderbolt controllers on for s2idle or standby
Hou Tao <[email protected]>
dm btree remove: assign new_root only when removal succeeds
Mikulas Patocka <[email protected]>
dm writecache: flush origin device when writing and cache is full
Damien Le Moal <[email protected]>
dm zoned: check zone capacity
Sai Prakash Ranjan <[email protected]>
coresight: tmc-etf: Fix global-out-of-bounds in tmc_update_etf_buffer()
Jeremy Linton <[email protected]>
coresight: Propagate symlink failure
Lv Yunlong <[email protected]>
ipack/carriers/tpci200: Fix a double free in tpci200_pci_probe
Paul Burton <[email protected]>
tracing: Resize tgid_map to pid_max, not PID_MAX_DEFAULT
Paul Burton <[email protected]>
tracing: Simplify & fix saved_tgids logic
Jan Kara <[email protected]>
rq-qos: fix missed wake-ups in rq_qos_throttle try two
Yun Zhou <[email protected]>
seq_buf: Fix overflow in seq_buf_putmem_hex()
Kees Cook <[email protected]>
lkdtm: Enable DOUBLE_FAULT on all architectures
Ferry Toth <[email protected]>
extcon: intel-mrfld: Sync hardware and software state on init
Kees Cook <[email protected]>
selftests/lkdtm: Fix expected text for CR4 pinning
Kees Cook <[email protected]>
lkdtm/bugs: XFAIL UNALIGNED_LOAD_STORE_WRITE
Christophe JAILLET <[email protected]>
nvmem: core: add a missing of_node_put
Limeng <[email protected]>
mfd: syscon: Free the allocated name field of struct regmap_config
Linus Walleij <[email protected]>
power: supply: ab8500: Fix an old bug
Zhihao Cheng <[email protected]>
ubifs: Fix races between xattr_{set|get} and listxattr operations
Srinivas Pandruvada <[email protected]>
thermal/drivers/int340x/processor_thermal: Fix tcc setting
Varad Gautam <[email protected]>
xfrm: policy: Read seqcount outside of rcu-read side in xfrm_policy_lookup_bytype
Petr Pavlu <[email protected]>
ipmi/watchdog: Stop watchdog timer when the current action is 'none'
Nathan Chancellor <[email protected]>
qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute
Jesse Brandeburg <[email protected]>
i40e: fix PTP on 5Gb links
Brian Norris <[email protected]>
mwifiex: bring down link before deleting interface
Dmitry Osipenko <[email protected]>
ASoC: tegra: Set driver_name=tegra for all machine drivers
Russ Weight <[email protected]>
fpga: stratix10-soc: Add missing fpga_mgr_free() call
Samuel Holland <[email protected]>
clocksource/arm_arch_timer: Improve Allwinner A64 timer workaround
Thomas Gleixner <[email protected]>
cpu/hotplug: Cure the cpusets trainwreck
Zhenyu Ye <[email protected]>
arm64: tlb: fix the TTL value of tlb_get_level
Timo Sigurdsson <[email protected]>
ata: ahci_sunxi: Disable DIPM
Kees Cook <[email protected]>
docs: Makefile: Use CONFIG_SHELL not SHELL
Christian Löhle <[email protected]>
mmc: core: Allow UHS-I voltage switch for SDSC cards if supported
Wolfram Sang <[email protected]>
mmc: core: clear flags before allowing to retune
Al Cooper <[email protected]>
mmc: sdhci: Fix warning message when accessing RPMB in HS400 mode
Hans de Goede <[email protected]>
mmc: sdhci-acpi: Disable write protect detection on Toshiba Encore 2 WT8-B
Kees Cook <[email protected]>
drm/i915/display: Do not zero past infoframes.vsc
Paul Cercueil <[email protected]>
drm/ingenic: Switch IPU plane to type OVERLAY
Daniel Vetter <[email protected]>
drm/nouveau: Don't set allow_fb_modifiers explicitly
Daniel Vetter <[email protected]>
drm/arm/malidp: Always list modifiers
Daniel Vetter <[email protected]>
drm/msm/mdp4: Fix modifier support enabling
Daniel Vetter <[email protected]>
drm/tegra: Don't set allow_fb_modifiers explicitly
Paul Cercueil <[email protected]>
drm/ingenic: Fix pixclock rate for 24-bit serial panels
Harry Wentland <[email protected]>
drm/amd/display: Reject non-zero src_y and src_x for video planes
Maximilian Luz <[email protected]>
pinctrl/amd: Add device HID for new AMD GPIO controller
Guchun Chen <[email protected]>
drm/amd/display: fix incorrrect valid irq check
Thomas Hebb <[email protected]>
drm/rockchip: dsi: remove extra component_del() call
Lyude Paul <[email protected]>
drm/dp: Handle zeroed port counts in drm_dp_read_downstream_info()
Maxime Ripard <[email protected]>
drm/vc4: hdmi: Prevent clock unbalance
Maxime Ripard <[email protected]>
drm/vc4: crtc: Skip the TXP
Maxime Ripard <[email protected]>
drm/vc4: txp: Properly set the possible_crtcs mask
Tiezhu Yang <[email protected]>
drm/radeon: Call radeon_suspend_kms() in radeon_pci_shutdown() for Loongson64
Jing Xiangfeng <[email protected]>
drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create()
Evan Quan <[email protected]>
drm/amdgpu: fix the hang caused by PCIe link width switch
Evan Quan <[email protected]>
drm/amdgpu: fix NAK-G generation during PCI-e link width switch
Aaron Liu <[email protected]>
drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2)
Joseph Greathouse <[email protected]>
drm/amdgpu: Update NV SIMD-per-CU to 2
Alex Deucher <[email protected]>
drm/amdgpu: add new dimgrey cavefish DID
Haren Myneni <[email protected]>
powerpc/powernv/vas: Release reference to tgid during window close
Nathan Chancellor <[email protected]>
powerpc/barrier: Avoid collision with clang's __lwsync macro
Cédric Le Goater <[email protected]>
powerpc/xive: Fix error handling when allocating an IPI
Naveen N. Rao <[email protected]>
powerpc/bpf: Reject atomic ops in ppc32 JIT
Christophe Leroy <[email protected]>
powerpc/mm: Fix lockup on kernel exec fault
Aneesh Kumar K.V <[email protected]>
mm/mremap: hold the rmap lock in write mode when moving page table entries.
Paul Cercueil <[email protected]>
MIPS: MT extensions are not available on MIPS32r1
Vidya Sagar <[email protected]>
PCI: tegra194: Fix host initialization during resume
周琰杰 (Zhou Yanjie) <[email protected]>
MIPS: CI20: Reduce clocksource to 750 kHz.
Nick Desaulniers <[email protected]>
MIPS: set mips32r5 for virt extensions
zhanglianjie <[email protected]>
MIPS: loongsoon64: Reserve memory below starting pfn to prevent Oops
Marcelo Ricardo Leitner <[email protected]>
sctp: add size validation when walking chunks
Marcelo Ricardo Leitner <[email protected]>
sctp: validate from_addr_param return
gushengxian <[email protected]>
flow_offload: action should not be NULL when it is referenced
Rustam Kovhaev <[email protected]>
bpf: Fix false positive kmemleak report in bpf_ringbuf_area_alloc()
Odin Ugedal <[email protected]>
sched/fair: Ensure _sum and _avg values stay consistent
Tim Jiang <[email protected]>
Bluetooth: btusb: fix bt fiwmare downloading failure issue for qca btsoc.
Tim Jiang <[email protected]>
Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855.
Tedd Ho-Jeong An <[email protected]>
Bluetooth: mgmt: Fix the command returns garbage parameter value
Hilda Wu <[email protected]>
Bluetooth: btusb: Add support USB ALT 3 for WBS
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix invalid access on ECRED Connection response
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix invalid access if ECRED Reconfigure fails
Daniel Lenski <[email protected]>
Bluetooth: btusb: Add a new QCA_ROME device (0cf3:e500)
Kai-Heng Feng <[email protected]>
Bluetooth: Shutdown controller after workqueues are flushed or cancelled
Kiran K <[email protected]>
Bluetooth: Fix alt settings for incoming SCO with transparent coding format
Yu Liu <[email protected]>
Bluetooth: Fix the HCI to MGMT status conversion table
Thadeu Lima de Souza Cascardo <[email protected]>
Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails
mark-yw.chen <[email protected]>
Bluetooth: btusb: Fixed too many in-token issue for Mediatek Chip.
Gerd Rausch <[email protected]>
RDMA/cma: Fix rdma_resolve_route() memory leak
Jakub Kicinski <[email protected]>
net: ip: avoid OOM kills with large UDP sends over loopback
Martynas Pumputis <[email protected]>
net: retrieve netns cookie via getsocketopt
Sean Young <[email protected]>
media, bpf: Do not copy more entries than user space requested
Max Gurtovoy <[email protected]>
IB/isert: Align target max I/O size to initiator size
Ilan Peer <[email protected]>
mac80211: Properly WARN on HW scan before restart
Weilun Du <[email protected]>
mac80211_hwsim: add concurrent channels scanning support over virtio
Johannes Berg <[email protected]>
mac80211: consider per-CPU statistics if present
Ping-Ke Shih <[email protected]>
cfg80211: fix default HE tx bitrate mask in 2G band
Gustavo A. R. Silva <[email protected]>
wireless: wext-spy: Fix out-of-bounds warning
Íñigo Huguet <[email protected]>
sfc: error code if SRIOV cannot be disabled
Íñigo Huguet <[email protected]>
sfc: avoid double pci_remove of VFs
Ping-Ke Shih <[email protected]>
rtw88: add quirks to disable pci capabilities
Po-Hao Huang <[email protected]>
rtw88: 8822c: update RF parameter tables to v62
Johannes Berg <[email protected]>
iwlwifi: pcie: fix context info freeing
Johannes Berg <[email protected]>
iwlwifi: pcie: free IML DMA memory allocation
Shaul Triebitz <[email protected]>
iwlwifi: mvm: fix error print when session protection ends
Johannes Berg <[email protected]>
iwlwifi: mvm: apply RX diversity per PHY context
Johannes Berg <[email protected]>
iwlwifi: mvm: don't change band on bound PHY contexts
Xiao Yang <[email protected]>
RDMA/rxe: Don't overwrite errno from ib_umem_get()
Logush Oliver <[email protected]>
drm/amd/display: Fix edp_bootup_bl_level initialization issue
Longpeng(Mike) <[email protected]>
vsock: notify server to shutdown when client has pending signal
Zheyu Ma <[email protected]>
atm: nicstar: register the interrupt handler in the right place
Zheyu Ma <[email protected]>
atm: nicstar: use 'dma_free_coherent' instead of 'kfree'
Fugang Duan <[email protected]>
net: fec: add ndo_select_queue to fix TX bandwidth fluctuations
Joakim Zhang <[email protected]>
net: fec: add FEC_QUIRK_HAS_MULTI_QUEUES represents i.MX6SX ENET IP
Huang Pei <[email protected]>
MIPS: add PMD table accounting into MIPS'pmd_alloc_one
Pascal Terjan <[email protected]>
rtl8xxxu: Fix device info for RTL8192EU devices
Ryder Lee <[email protected]>
mt76: fix iv and CCMP header insertion
Ryder Lee <[email protected]>
mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode
Sean Wang <[email protected]>
mt76: connac: fix the maximum interval schedule scan can support
Lorenzo Bianconi <[email protected]>
mt76: connac: fix UC entry is being overwritten
Lorenzo Bianconi <[email protected]>
mt76: mt7921: enable hw offloading for wep keys
Lorenzo Bianconi <[email protected]>
mt76: mt7921: reset wfsys during hw probe
Sean Wang <[email protected]>
mt76: mt7921: fix reset under the deep sleep is enabled
Evelyn Tsai <[email protected]>
mt76: mt7915: fix tssi indication field of DBDC NICs
xinhui pan <[email protected]>
drm/amdkfd: Walk through list with dqm lock hold
Stanley.Yang <[email protected]>
drm/amdgpu: fix bad address translation for sienna_cichlid
Pavel Begunkov <[email protected]>
io_uring: fix false WARN_ONCE
Yang Yingliang <[email protected]>
net: sched: fix error return code in tcf_del_walker()
Yang Yingliang <[email protected]>
net: ipa: Add missing of_node_put() in ipa_firmware_load()
Jian Shen <[email protected]>
net: fix mistake path for netdev_features_strings
Felix Fietkau <[email protected]>
mt76: dma: use ieee80211_tx_status_ext to free packets when tx fails
Felix Fietkau <[email protected]>
mt76: mt7615: fix fixed-rate tx status reporting
Jacob Keller <[email protected]>
ice: mark PTYPE 2 as reserved
Jacob Keller <[email protected]>
ice: fix incorrect payload indicator on PTYPE
Pavel Skripkin <[email protected]>
ext4: fix memory leak in ext4_fill_super
Daniel Borkmann <[email protected]>
bpf: Fix up register-based shifts in interpreter to silence KUBSAN
George McCollister <[email protected]>
net: hsr: don't check sequence number if tag removal is offloaded
Amber Lin <[email protected]>
drm/amdkfd: Fix circular lock in nocpsch path
Wesley Chalmers <[email protected]>
drm/amd/display: Cover edge-case when changing DISPCLK WDIVIDER
Jonathan Kim <[email protected]>
drm/amdkfd: fix circular locking on get_wave_state
Zou Wei <[email protected]>
cw1200: add missing MODULE_DEVICE_TABLE
Lee Gibson <[email protected]>
wl1251: Fix possible buffer overflow in wl1251_cmd_scan
Vladimir Oltean <[email protected]>
net: phy: nxp-c45-tja11xx: enable MDIO write access to the master/slave registers
Tony Lindgren <[email protected]>
wlcore/wl12xx: Fix wl12xx get_mac error if device is in ELP
Mikulas Patocka <[email protected]>
dm writecache: commit just one block, not a full page
Steffen Klassert <[email protected]>
xfrm: Fix error reporting in xfrm_state_construct.
Lijun Pan <[email protected]>
ibmvnic: fix kernel build warnings in build_hdr_descs_arr
Mark Yacoub <[email protected]>
drm/amd/display: Verify Gamma & Degamma LUT sizes in amdgpu_dm_atomic_check
Heiner Kallweit <[email protected]>
r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM
Minchan Kim <[email protected]>
selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC
Yang Yingliang <[email protected]>
net: mido: mdio-mux-bcm-iproc: Use devm_platform_get_and_ioremap_resource()
Yang Yingliang <[email protected]>
fjes: check return value after calling platform_get_resource()
Nirmoy Das <[email protected]>
drm/amdkfd: use allowed domain for vmbo validation
Yang Yingliang <[email protected]>
net: sgi: ioc3-eth: check return value after calling platform_get_resource()
Amit Cohen <[email protected]>
selftests: Clean forgotten resources as part of cleanup()
Joakim Zhang <[email protected]>
net: phy: realtek: add delay to fix RXC generation issue
Aric Cyr <[email protected]>
drm/amd/display: Fix crash during MPO + ODM combine mode recalculation
Wesley Chalmers <[email protected]>
drm/amd/display: Fix off-by-one error in DML
Wesley Chalmers <[email protected]>
drm/amd/display: Set DISPCLK_MAX_ERRDET_CYCLES to 7
Vladimir Stempen <[email protected]>
drm/amd/display: Release MST resources on switch from MST to SST
Roman Li <[email protected]>
drm/amd/display: Update scaling settings on modeset
Ilya Bakoulin <[email protected]>
drm/amd/display: Revert "Fix clock table filling logic"
Nikola Cornij <[email protected]>
drm/amd/display: Fix DCN 3.01 DSCCLK validation
Yang Yingliang <[email protected]>
net: moxa: Use devm_platform_get_and_ioremap_resource()
Yang Yingliang <[email protected]>
net: micrel: check return value after calling platform_get_resource()
Yang Yingliang <[email protected]>
net: mvpp2: check return value after calling platform_get_resource()
Yang Yingliang <[email protected]>
net: bcmgenet: check return value after calling platform_get_resource()
Yang Yingliang <[email protected]>
net: mscc: ocelot: check return value after calling platform_get_resource()
Xianting Tian <[email protected]>
virtio_net: Remove BUG() to avoid machine dead
Paul M Stillwell Jr <[email protected]>
ice: fix clang warning regarding deadcode.DeadStores
Liwei Song <[email protected]>
ice: set the value of global config lock timeout longer
Radim Pavlik <[email protected]>
pinctrl: mcp23s08: fix race condition in irq handler
Horatiu Vultur <[email protected]>
net: bridge: mrp: Update ring transitions.
Damien Le Moal <[email protected]>
block: introduce BIO_ZONE_WRITE_LOCKED bio flag
Damien Le Moal <[email protected]>
dm: Fix dm_accept_partial_bio() relative to zone management commands
Mikulas Patocka <[email protected]>
dm writecache: don't split bios when overwriting contiguous cache content
Joe Thornber <[email protected]>
dm space maps: don't reset space map allocation cursor when committing
Jiapeng Chong <[email protected]>
RDMA/cxgb4: Fix missing error code in create_qp()
Andreas Roeseler <[email protected]>
icmp: fix lib conflict with trinity
Yuchung Cheng <[email protected]>
net: tcp better handling of reordering then loss cases
Yang Yingliang <[email protected]>
clk: tegra: tegra124-emc: Fix clock imbalance in emc_set_timing()
Jiansong Chen <[email protected]>
drm/amdgpu: remove unsafe optimization to drop preamble ib
Kees Cook <[email protected]>
drm/amd/display: Avoid HDCP over-read and corruption
Kevin Wang <[email protected]>
drm/amdgpu: fix sdma firmware version error in sriov
Shiwu Zhang <[email protected]>
drm/amdgpu: fix metadata_size for ubo ioctl queries
Paul Cercueil <[email protected]>
MIPS: ingenic: Select CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
Paul Cercueil <[email protected]>
MIPS: cpu-probe: Fix FPU detection on Ingenic JZ4760(B)
Willy Tarreau <[email protected]>
ipv6: use prandom_u32() for ID generation
Xie Yongji <[email protected]>
virtio-net: Add validation for used length
Yu Kuai <[email protected]>
drm: bridge: cdns-mhdp8546: Fix PM reference leak in
Dmitry Osipenko <[email protected]>
clk: tegra: Ensure that PLLU configuration is applied properly
Dmitry Osipenko <[email protected]>
clk: tegra: Fix refcounting of gate clocks
Thierry Reding <[email protected]>
drm/tegra: hub: Fix YUV support
Gioh Kim <[email protected]>
RDMA/rtrs: Change MAX_SESS_QUEUE_DEPTH
Vladimir Oltean <[email protected]>
net: stmmac: the XPCS obscures a potential "PHY not found" error
Alex Bee <[email protected]>
drm: rockchip: add missing registers for RK3066
Alex Bee <[email protected]>
drm: rockchip: add missing registers for RK3188
Eli Cohen <[email protected]>
net/mlx5: Fix lag port remapping logic
Huy Nguyen <[email protected]>
net/mlx5e: IPsec/rep_tc: Fix rep_tc_update_skb drops IPsec packet
Alex Deucher <[email protected]>
drm/amdgpu/swsmu/aldebaran: fix check in is_dpm_running
Dmytro Laktyushkin <[email protected]>
drm/amd/display: fix odm scaling
Kuninori Morimoto <[email protected]>
clk: renesas: r8a77995: Add ZA2 clock
Zou Wei <[email protected]>
drm/bridge: cdns: Fix PM reference leak in cdns_dsi_transfer()
Jesse Brandeburg <[email protected]>
igb: fix assignment on big endian machines
Jesse Brandeburg <[email protected]>
igb: handle vlan types with checker enabled
Jesse Brandeburg <[email protected]>
e100: handle eeprom as little endian
Zou Wei <[email protected]>
drm/vc4: hdmi: Fix PM reference leak in vc4_hdmi_encoder_pre_crtc_co()
Mateusz Kwiatkowski <[email protected]>
drm/vc4: Fix clock source for VEC PixelValve on BCM2711
Feifei Xu <[email protected]>
drm/amd/pm: fix return value in aldebaran_set_mp1_state()
YueHaibing <[email protected]>
net: xilinx_emaclite: Do not print real IOMEM pointer
Arturo Giusti <[email protected]>
udf: Fix NULL pointer dereference in udf_symlink function
Andrey Grodzovsky <[email protected]>
drm/sched: Avoid data corruptions
Andrey Grodzovsky <[email protected]>
drm/scheduler: Fix hang when sched_entity released
Bixuan Cui <[email protected]>
pinctrl: equilibrium: Add missing MODULE_DEVICE_TABLE
Wei Yongjun <[email protected]>
net: ethernet: ixp4xx: Fix return value check in ixp4xx_eth_probe()
Davide Caratti <[email protected]>
net/sched: cls_api: increase max_reclassify_loop
Vladimir Oltean <[email protected]>
net: mdio: provide shim implementation of devm_of_mdiobus_register
Xie Yongji <[email protected]>
drm/virtio: Fix double free on probe failure
Pavel Skripkin <[email protected]>
reiserfs: add check for invalid 1st journal block
Zou Wei <[email protected]>
drm/bridge: lt9611: Add missing MODULE_DEVICE_TABLE
Ansuel Smith <[email protected]>
net: mdio: ipq8064: add regmap config to disable REGCACHE
Nicolas Boichat <[email protected]>
drm/panfrost: devfreq: Disable devfreq when num_supplies > 1
Wang Li <[email protected]>
drm/mediatek: Fix PM reference leak in mtk_crtc_ddp_hw_init()
Sebastian Andrzej Siewior <[email protected]>
net: Treat __napi_schedule_irqoff() as __napi_schedule() on PREEMPT_RT
Zou Wei <[email protected]>
atm: nicstar: Fix possible use-after-free in nicstar_cleanup()
Zou Wei <[email protected]>
mISDN: fix possible use-after-free in HFC_cleanup()
Zou Wei <[email protected]>
atm: iphase: fix possible use-after-free in ia_module_exit()
Bibo Mao <[email protected]>
hugetlb: clear huge pte during flush function on mips platform
Youling Tang <[email protected]>
MIPS: Loongson64: Fix build error 'secondary_kexec_args' undeclared under !SMP
Dinghao Liu <[email protected]>
clk: renesas: rcar-usb2-clock-sel: Fix error handling in .probe()
Dmytro Laktyushkin <[email protected]>
drm/amd/display: fix use_max_lb flag for 420 pixel formats
Ilya Bakoulin <[email protected]>
drm/amd/display: Fix clock table filling logic
Alex Deucher <[email protected]>
drm/amdgpu: change the default timeout for kernel compute queues
Andy Shevchenko <[email protected]>
net: pch_gbe: Use proper accessors to BE data in pch_ptp_match()
Sebastian Reichel <[email protected]>
drm/imx: Add 8 pixel alignment fix
Liu Ying <[email protected]>
drm/bridge: nwl-dsi: Force a full modeset when crtc_state->active is changed to be true
Dan Carpenter <[email protected]>
drm/vc4: fix argument ordering in vc4_crtc_get_margins()
Jack Zhang <[email protected]>
drm/amd/amdgpu/sriov disable all ip hw status by default
Chris Park <[email protected]>
drm/amd/display: Fix BSOD with NULL check
Lewis Huang <[email protected]>
drm/amd/display: Revert wait vblank on update dpp clock
Brandon Syu <[email protected]>
drm/amd/display: fix HDCP reset sequence on reinitialize
KuoHsiang Chou <[email protected]>
drm/ast: Fixed CVE for DP501
Thomas Zimmermann <[email protected]>
drm/zte: Don't select DRM_KMS_FB_HELPER
Thomas Zimmermann <[email protected]>
drm/mxsfb: Don't select DRM_KMS_FB_HELPER
-------------
Diffstat:
Documentation/Makefile | 2 +- Makefile | 4 +- arch/alpha/include/uapi/asm/socket.h | 2 + arch/arm64/include/asm/tlb.h | 4 + arch/mips/Kconfig | 2 + arch/mips/boot/dts/ingenic/ci20.dts | 4 +- arch/mips/include/asm/cpu-features.h | 4 +- arch/mips/include/asm/hugetlb.h | 8 +- arch/mips/include/asm/mipsregs.h | 8 +- arch/mips/include/asm/pgalloc.h | 10 +- arch/mips/include/uapi/asm/socket.h | 2 + arch/mips/kernel/cpu-probe.c | 5 + arch/mips/loongson64/numa.c | 3 + arch/mips/loongson64/reset.c | 5 +- arch/parisc/include/uapi/asm/socket.h | 2 + arch/powerpc/include/asm/barrier.h | 2 + arch/powerpc/mm/fault.c | 4 +- arch/powerpc/net/bpf_jit_comp32.c | 14 +- arch/powerpc/platforms/powernv/vas-window.c | 9 +- arch/powerpc/sysdev/xive/common.c | 7 +- arch/s390/Kconfig | 1 + arch/s390/Makefile | 13 + arch/s390/include/asm/elf.h | 13 +- arch/s390/include/asm/vdso.h | 25 +- arch/s390/include/asm/vdso/gettimeofday.h | 1 - arch/s390/kernel/Makefile | 1 + arch/s390/kernel/compat_signal.c | 13 +- arch/s390/kernel/process.c | 6 + arch/s390/kernel/signal.c | 39 +- arch/s390/kernel/syscall.c | 4 + arch/s390/kernel/vdso.c | 63 +- arch/s390/kernel/vdso32/.gitignore | 2 + arch/s390/kernel/vdso32/Makefile | 75 ++ arch/s390/kernel/vdso32/gen_vdso_offsets.sh | 15 + arch/s390/kernel/vdso32/note.S | 13 + arch/s390/kernel/vdso32/vdso32.lds.S | 141 +++ arch/s390/kernel/vdso32/vdso32_wrapper.S | 15 + arch/s390/kernel/vdso32/vdso_user_wrapper.S | 21 + arch/s390/kernel/vdso64/Makefile | 8 + arch/s390/kernel/vdso64/gen_vdso_offsets.sh | 15 + arch/s390/kernel/vdso64/vdso64.lds.S | 5 +- arch/s390/kernel/vdso64/vdso_user_wrapper.S | 17 + arch/sparc/include/uapi/asm/socket.h | 2 + block/blk-rq-qos.c | 4 +- drivers/ata/ahci_sunxi.c | 2 +- drivers/atm/iphase.c | 2 +- drivers/atm/nicstar.c | 26 +- drivers/bluetooth/btusb.c | 36 +- drivers/char/ipmi/ipmi_watchdog.c | 22 +- drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 + drivers/clk/renesas/rcar-usb2-clock-sel.c | 24 +- drivers/clk/tegra/clk-periph-gate.c | 72 +- drivers/clk/tegra/clk-periph.c | 11 + drivers/clk/tegra/clk-pll.c | 9 +- drivers/clk/tegra/clk-tegra124-emc.c | 4 +- drivers/clocksource/arm_arch_timer.c | 2 +- drivers/extcon/extcon-intel-mrfld.c | 9 + drivers/firmware/qemu_fw_cfg.c | 8 +- drivers/fpga/stratix10-soc.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 41 + drivers/gpu/drm/amd/amdgpu/nv.c | 6 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +- drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 2 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 68 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 41 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 68 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 3 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 12 +- .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 573 ++++------- drivers/gpu/drm/amd/display/dc/dc.h | 1 - drivers/gpu/drm/amd/display/dc/dc_types.h | 5 - .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 21 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 14 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 78 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 13 + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 4 - drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 - .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 4 +- drivers/gpu/drm/amd/include/navi10_enum.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 9 +- drivers/gpu/drm/arm/malidp_planes.c | 9 +- drivers/gpu/drm/ast/ast_dp501.c | 139 ++- drivers/gpu/drm/ast/ast_drv.h | 12 + drivers/gpu/drm/ast/ast_main.c | 10 +- .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 +- drivers/gpu/drm/bridge/cdns-dsi.c | 2 +- drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + drivers/gpu/drm/bridge/nwl-dsi.c | 61 +- drivers/gpu/drm/drm_dp_helper.c | 7 + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 19 +- drivers/gpu/drm/imx/imx-ldb.c | 5 + drivers/gpu/drm/imx/ipuv3-crtc.c | 11 +- drivers/gpu/drm/imx/ipuv3-plane.c | 19 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 13 +- drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 - drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +- drivers/gpu/drm/mxsfb/Kconfig | 1 - drivers/gpu/drm/nouveau/nouveau_display.c | 1 - drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 + drivers/gpu/drm/radeon/radeon_display.c | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 8 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 4 - drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 21 +- drivers/gpu/drm/scheduler/sched_entity.c | 8 +- drivers/gpu/drm/scheduler/sched_main.c | 24 + drivers/gpu/drm/tegra/dc.c | 12 +- drivers/gpu/drm/tegra/dc.h | 7 + drivers/gpu/drm/tegra/drm.c | 2 - drivers/gpu/drm/tegra/hub.c | 52 +- drivers/gpu/drm/tegra/plane.c | 23 +- drivers/gpu/drm/tegra/plane.h | 3 +- drivers/gpu/drm/vc4/vc4_crtc.c | 5 +- drivers/gpu/drm/vc4/vc4_drv.h | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +- drivers/gpu/drm/vc4/vc4_txp.c | 2 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + drivers/gpu/drm/zte/Kconfig | 1 - drivers/gpu/ipu-v3/ipu-dc.c | 5 + drivers/gpu/ipu-v3/ipu-di.c | 7 + drivers/hwtracing/coresight/coresight-core.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/infiniband/core/cma.c | 3 +- drivers/infiniband/hw/cxgb4/qp.c | 1 + drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- drivers/infiniband/ulp/isert/ib_isert.c | 4 +- drivers/infiniband/ulp/isert/ib_isert.h | 3 - drivers/infiniband/ulp/rtrs/rtrs-pri.h | 13 +- drivers/ipack/carriers/tpci200.c | 5 +- drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- drivers/md/dm-writecache.c | 48 +- drivers/md/dm-zoned-metadata.c | 7 + drivers/md/dm.c | 8 +- drivers/md/persistent-data/dm-btree-remove.c | 3 +- drivers/md/persistent-data/dm-space-map-disk.c | 9 +- drivers/md/persistent-data/dm-space-map-metadata.c | 9 +- drivers/media/i2c/ccs/ccs-core.c | 32 +- drivers/media/i2c/ccs/ccs-limits.c | 4 + drivers/media/i2c/ccs/ccs-limits.h | 4 + drivers/media/i2c/ccs/ccs-regs.h | 6 +- drivers/media/i2c/saa6588.c | 4 +- drivers/media/pci/bt8xx/bttv-driver.c | 6 +- drivers/media/pci/saa7134/saa7134-video.c | 6 +- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/davinci/vpbe_venc.c | 6 +- drivers/media/rc/bpf-lirc.c | 3 +- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 +- drivers/media/usb/dvb-usb/dtv5100.c | 7 +- drivers/media/usb/gspca/sq905.c | 2 +- drivers/media/usb/gspca/sunplus.c | 8 +- drivers/media/usb/uvc/uvc_video.c | 27 + drivers/media/usb/zr364xx/zr364xx.c | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 2 + drivers/mfd/syscon.c | 2 +- drivers/misc/lkdtm/bugs.c | 3 + drivers/misc/lkdtm/core.c | 2 - drivers/mmc/core/core.c | 7 +- drivers/mmc/core/sd.c | 10 +- drivers/mmc/host/sdhci-acpi.c | 11 + drivers/mmc/host/sdhci.c | 4 + drivers/mmc/host/sdhci.h | 1 + drivers/net/dsa/ocelot/seville_vsc9953.c | 5 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 + drivers/net/ethernet/freescale/fec.h | 5 + drivers/net/ethernet/freescale/fec_main.c | 43 +- drivers/net/ethernet/ibm/ibmvnic.c | 3 +- drivers/net/ethernet/intel/e100.c | 12 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 8 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +- drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 4 +- drivers/net/ethernet/intel/ice/ice_type.h | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 9 +- drivers/net/ethernet/intel/igbvf/netdev.c | 4 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 19 +- drivers/net/ethernet/micrel/ks8842.c | 4 + drivers/net/ethernet/moxa/moxart_ether.c | 5 +- .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 19 +- drivers/net/ethernet/realtek/r8169_main.c | 1 - drivers/net/ethernet/sfc/ef10_sriov.c | 25 +- drivers/net/ethernet/sgi/ioc3-eth.c | 4 + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 21 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 5 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 +- drivers/net/fjes/fjes_main.c | 4 + drivers/net/ipa/ipa_main.c | 1 + drivers/net/mdio/mdio-ipq8064.c | 34 +- drivers/net/mdio/mdio-mux-bcm-iproc.c | 7 +- drivers/net/phy/nxp-c45-tja11xx.c | 6 + drivers/net/phy/realtek.c | 15 +- drivers/net/virtio_net.c | 22 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 15 +- .../net/wireless/intel/iwlwifi/mvm/time-event.c | 4 + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 28 +- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 15 +- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 3 + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 +- drivers/net/wireless/mac80211_hwsim.c | 48 +- drivers/net/wireless/marvell/mwifiex/main.c | 13 +- drivers/net/wireless/mediatek/mt76/dma.c | 18 +- drivers/net/wireless/mediatek/mt76/mt76.h | 16 + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 33 +- drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 12 - drivers/net/wireless/mediatek/mt76/mt7615/init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 74 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 42 - drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 8 +- drivers/net/wireless/mediatek/mt76/mt76_connac.h | 3 +- .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 10 +- .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 3 +- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 28 +- drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 18 +- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 11 +- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 6 +- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 29 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 30 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 23 +- drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 4 + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 50 +- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 22 +- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 54 +- drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 23 +- drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 3 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 11 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 59 +- drivers/net/wireless/realtek/rtw88/pci.c | 32 + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 1008 ++++++++++---------- drivers/net/wireless/st/cw1200/cw1200_sdio.c | 1 + drivers/net/wireless/ti/wl1251/cmd.c | 9 +- drivers/net/wireless/ti/wl12xx/main.c | 7 + drivers/nvmem/core.c | 9 +- drivers/pci/controller/dwc/pcie-tegra194.c | 2 + drivers/pci/controller/pci-aardvark.c | 13 +- drivers/pci/quirks.c | 11 + drivers/pinctrl/pinctrl-amd.c | 1 + drivers/pinctrl/pinctrl-equilibrium.c | 1 + drivers/pinctrl/pinctrl-mcp23s08.c | 10 +- drivers/power/supply/ab8500-chargalg.h | 2 +- .../int340x_thermal/processor_thermal_device.c | 20 +- fs/ext4/ext4.h | 4 + fs/ext4/mmp.c | 59 +- fs/ext4/super.c | 14 +- fs/f2fs/f2fs.h | 2 + fs/f2fs/recovery.c | 23 +- fs/f2fs/super.c | 8 +- fs/io-wq.c | 5 +- fs/jfs/inode.c | 3 +- fs/reiserfs/journal.c | 14 + fs/ubifs/super.c | 1 + fs/ubifs/ubifs.h | 2 + fs/ubifs/xattr.c | 44 +- fs/udf/namei.c | 4 + include/linux/blk_types.h | 1 + include/linux/netdev_features.h | 2 +- include/linux/of_mdio.h | 7 + include/linux/wait.h | 2 +- include/media/v4l2-subdev.h | 4 + include/net/flow_offload.h | 12 +- include/net/sctp/structs.h | 2 +- include/uapi/asm-generic/socket.h | 2 + include/uapi/linux/ethtool.h | 4 +- include/uapi/linux/icmp.h | 3 +- kernel/bpf/core.c | 61 +- kernel/bpf/ringbuf.c | 2 + kernel/cpu.c | 49 + kernel/sched/fair.c | 6 +- kernel/sched/wait.c | 9 +- kernel/trace/trace.c | 91 +- lib/seq_buf.c | 4 +- mm/mremap.c | 4 +- net/bluetooth/cmtp/core.c | 5 + net/bluetooth/hci_core.c | 16 +- net/bluetooth/hci_event.c | 6 +- net/bluetooth/l2cap_core.c | 8 +- net/bluetooth/mgmt.c | 5 + net/bridge/br_mrp.c | 6 +- net/core/dev.c | 11 +- net/core/sock.c | 7 + net/hsr/hsr_framereg.c | 3 +- net/ipv4/icmp.c | 2 +- net/ipv4/ip_output.c | 32 +- net/ipv4/tcp_input.c | 45 +- net/ipv6/ip6_output.c | 32 +- net/ipv6/output_core.c | 28 +- net/mac80211/main.c | 7 +- net/mac80211/sta_info.c | 11 +- net/sched/act_api.c | 3 +- net/sched/cls_api.c | 2 +- net/sctp/bind_addr.c | 19 +- net/sctp/input.c | 8 +- net/sctp/ipv6.c | 7 +- net/sctp/protocol.c | 7 +- net/sctp/sm_make_chunk.c | 29 +- net/vmw_vsock/af_vsock.c | 2 +- net/wireless/nl80211.c | 9 +- net/wireless/wext-spy.c | 14 +- net/xfrm/xfrm_policy.c | 21 +- net/xfrm/xfrm_user.c | 28 +- security/selinux/avc.c | 13 +- security/smack/smackfs.c | 2 + sound/soc/tegra/tegra_alc5632.c | 1 + sound/soc/tegra/tegra_max98090.c | 1 + sound/soc/tegra/tegra_rt5640.c | 1 + sound/soc/tegra/tegra_rt5677.c | 1 + sound/soc/tegra/tegra_sgtl5000.c | 1 + sound/soc/tegra/tegra_wm8753.c | 1 + sound/soc/tegra/tegra_wm8903.c | 1 + sound/soc/tegra/tegra_wm9712.c | 1 + sound/soc/tegra/trimslice.c | 1 + .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 3 + .../net/mlxsw/devlink_trap_l3_exceptions.sh | 3 + .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 2 + tools/testing/selftests/lkdtm/tests.txt | 2 +- .../selftests/net/forwarding/pedit_dsfield.sh | 2 + .../selftests/net/forwarding/pedit_l4port.sh | 2 + .../selftests/net/forwarding/skbedit_priority.sh | 2 + 339 files changed, 3656 insertions(+), 2144 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 7/266 drm/amd/amdgpu/sriov disable all ip hw status by default
From: Jack Zhang <[email protected]>
[ Upstream commit 95ea3dbc4e9548d35ab6fbf67675cef8c293e2f5 ]
Disable all ip's hw status to false before any hw_init. Only set it to true until its hw_init is executed.
The old 5.9 branch has this change but somehow the 5.11 kernrel does not have this fix.
Without this change, sriov tdr have gfx IB test fail.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -2856,7 +2856,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) AMD_IP_BLOCK_TYPE_IH, }; -for (i =0 ; i <ARRAY_SIZE (ip_order); i++) { +for (i =0 ; i < adev->num_ip_blocks; i++) {int j;struct amdgpu_ip_block *block;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 26/266 reiserfs: add check for invalid 1st journal block
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit a149127be52fa7eaf5b3681a0317a2bbb772d5a9 ]
syzbot reported divide error in reiserfs.
The problem was in incorrect journal 1st block.
Syzbot's reproducer manualy generated wrong superblock with incorrect 1st block. In journal_init() wasn't any checks about this particular case.
For example, if 1st journal block is before superblock 1st block, it can cause zeroing important superblock members in do_journal_end().
--- fs/reiserfs/journal.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/reiserfs/journal.c +14 -0
@@ -2758,6 +2758,20 @@ int journal_init(struct super_block *sb, const char *j_dev_name, goto free_and_return; } +/* +* Sanity check to see if journal first block is correct. +* If journal first block is invalid it can cause +* zeroing important superblock members. +*/ +if (!SB_ONDISK_JOURNAL_DEVICE (sb) && +SB_ONDISK_JOURNAL_1st_BLOCK (sb) <SB_JOURNAL_1st_RESERVED_BLOCK (sb)) { +reiserfs_warning (sb,"journal-1393" , +"journal 1st super block is invalid: 1st reserved block %d, but actual 1st block is %d" , +SB_JOURNAL_1st_RESERVED_BLOCK (sb), +SB_ONDISK_JOURNAL_1st_BLOCK (sb)); + goto free_and_return; + } +if (journal_init_dev (sb, journal, j_dev_name) !=0 ) {reiserfs_warning (sb,"sh-462" ,"unable to initialize journal device" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 35/266 net: xilinx_emaclite: Do not print real IOMEM pointer
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit d0d62baa7f505bd4c59cd169692ff07ec49dde37 ]
Printing kernel pointers is discouraged because they might leak kernel memory layout. This fixes smatch warning:
drivers/net/ethernet/xilinx/xilinx_emaclite.c:1191 xemaclite_of_probe() warn:
argument 4 to %08lX specifier is cast from pointer
--- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/xilinx/xilinx_emaclite.c +2 -3
@@ -1189,9 +1189,8 @@ static int xemaclite_of_probe(struct platform_device *ofdev) }dev_info (dev, -"Xilinx EmacLite at 0x%08lX mapped to 0x%08lX, irq=%d\n" , - (unsigned long __force )ndev->mem_start, - (unsigned long __force )lp->base_addr, ndev->irq); +"Xilinx EmacLite at 0x%08lX mapped to 0x%p, irq=%d\n" , + (unsigned long __force )ndev->mem_start, lp->base_addr, ndev->irq);return 0 ; error:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 36/266 drm/amd/pm: fix return value in aldebaran_set_mp1_state()
In reply to Greg Kroah-HartmanFrom: Feifei Xu <[email protected]>
[ Upstream commit 5051cb794ac5d92154e186d87cdc12cba613f4f6 ]
For default cases,we should return 0. Otherwise resume will abort because of the wrong return value.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1 -3
@@ -1779,10 +1779,8 @@ static int aldebaran_set_mp1_state(struct smu_context *smu,case PP_MP1_STATE_UNLOAD :return smu_cmn_set_mp1_state (smu, mp1_state);default : -return -EINVAL ; +return 0 ; } - -return 0 ; }static const struct pptable_funcs aldebaran_ppt_funcs = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 37/266 drm/vc4: Fix clock source for VEC PixelValve on BCM2711
In reply to Greg Kroah-HartmanFrom: Mateusz Kwiatkowski <[email protected]>
[ Upstream commit fc7a8abcee2225d6279ff785d33e24d70c738c6e ]
On the BCM2711 (Raspberry Pi 4), the VEC is actually connected to output 2 of pixelvalve3.
NOTE: This contradicts the Broadcom docs, but has been empirically tested and confirmed by Raspberry Pi firmware devs.
--- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_crtc.c +1 -1
@@ -1035,7 +1035,7 @@ static const struct vc4_pv_data bcm2711_pv3_data = { .fifo_depth = 64, .pixels_per_clock = 1, .encoder_types = { - [0] = VC4_ENCODER_TYPE_VEC, + [PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC, }, };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 38/266 drm/vc4: hdmi: Fix PM reference leak in vc4_hdmi_encoder_pre_crtc_co()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 5e4322a8b266bc9f5ee7ea4895f661c01dbd7cb3 ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +1 -1
@@ -745,7 +745,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,unsigned long pixel_rate, hsm_rate;int ret; - ret =pm_runtime_get_sync (&vc4_hdmi->pdev->dev); + ret =pm_runtime_resume_and_get (&vc4_hdmi->pdev->dev);if (ret <0 ) {DRM_ERROR ("Failed to retain power domain: %d\n" , ret);return ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 39/266 e100: handle eeprom as little endian
In reply to Greg Kroah-HartmanFrom: Jesse Brandeburg <[email protected]>
[ Upstream commit d4ef55288aa2e1b76033717242728ac98ddc4721 ]
Sparse tool was warning on some implicit conversions from little endian data read from the EEPROM on the e100 cards.
Fix these by being explicit about the conversions using le16_to_cpu().
--- drivers/net/ethernet/intel/e100.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/e100.c +6 -6
@@ -1395,7 +1395,7 @@ static int e100_phy_check_without_mii(struct nic *nic)u8 phy_type;int without_mii; - phy_type = (nic->eeprom[eeprom_phy_iface] >>8 ) &0x0f ; + phy_type = (le16_to_cpu (nic->eeprom[eeprom_phy_iface]) >>8 ) &0x0f ;switch (phy_type) {case NoSuchPhy:/* Non-MII PHY; UNTESTED! */
@@ -1515,7 +1515,7 @@ static int e100_phy_init(struct nic *nic)mdio_write (netdev, nic->mii.phy_id,MII_BMCR , bmcr); }else if ((nic->mac >= mac_82550_D102) || ((nic->flags & ich) && (mdio_read (netdev, nic->mii.phy_id,MII_TPISTATUS ) &0x8000 ) && - (nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) { + (le16_to_cpu (nic->eeprom[eeprom_cnfg_mdix]) & eeprom_mdix_enabled))) {/* enable/disable MDI/MDI-X auto-switching. */ mdio_write (netdev, nic->mii.phy_id,MII_NCONFIG , nic->mii.force_media ?0 :NCONFIG_AUTO_SWITCH );
@@ -2269,9 +2269,9 @@ static int e100_asf(struct nic *nic) {/* ASF can be enabled from eeprom */ return (nic->pdev->device >=0x1050 ) && (nic->pdev->device <=0x1057 ) && - (nic->eeprom[eeprom_config_asf] & eeprom_asf) && - !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) && - ((nic->eeprom[eeprom_smbus_addr] &0xFF ) !=0xFE ); + (le16_to_cpu (nic->eeprom[eeprom_config_asf]) & eeprom_asf) && + !(le16_to_cpu (nic->eeprom[eeprom_config_asf]) & eeprom_gcl) && + ((le16_to_cpu (nic->eeprom[eeprom_smbus_addr]) &0xFF ) !=0xFE ); }static int e100_up (struct nic *nic)
@@ -2926,7 +2926,7 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/* Wol magic packet can be enabled from eeprom */ if ((nic->mac >= mac_82558_D101_A4) && - (nic->eeprom[eeprom_id] & eeprom_id_wol)) { + (le16_to_cpu (nic->eeprom[eeprom_id]) & eeprom_id_wol)) { nic->flags |= wol_magic;device_set_wakeup_enable (&pdev->dev, true); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 40/266 igb: handle vlan types with checker enabled
In reply to Greg Kroah-HartmanFrom: Jesse Brandeburg <[email protected]>
[ Upstream commit c7cbfb028b95360403d579c47aaaeef1ff140964 ]
The sparse build (C=2) finds some issues with how the driver dealt with the (very difficult) hardware that in some generations uses little-endian, and in others uses big endian, for the VLAN field. The code as written picks __le16 as a type and for some hardware revisions we override it to __be16 as done in this patch. This impacted the VF driver as well so fix it there too.
Also change the vlan_tci assignment to override the sparse warning without changing functionality.
--- drivers/net/ethernet/intel/igb/igb_main.c | 5 +++-- drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +3 -2
@@ -2643,7 +2643,8 @@ static int igb_parse_cls_flower(struct igb_adapter *adapter, } input->filter.match_flags |=IGB_FILTER_FLAG_VLAN_TCI ; - input->filter.vlan_tci = match.key->vlan_priority; + input->filter.vlan_tci = + (__force __be16 )match.key->vlan_priority; } }
@@ -8592,7 +8593,7 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring,if (igb_test_staterr (rx_desc,E1000_RXDEXT_STATERR_LB ) &&test_bit (IGB_RING_FLAG_RX_LB_VLAN_BSWAP , &rx_ring->flags)) - vid =be16_to_cpu (rx_desc->wb.upper.vlan); + vid =be16_to_cpu ((__force __be16 )rx_desc->wb.upper.vlan);else vid =le16_to_cpu (rx_desc->wb.upper.vlan);
drivers/net/ethernet/intel/igbvf/netdev.c +2 -2
@@ -83,14 +83,14 @@ static int igbvf_desc_unused(struct igbvf_ring *ring)static void igbvf_receive_skb (struct igbvf_adapter *adapter,struct net_device *netdev,struct sk_buff *skb, -u32 status,u16 vlan) +u32 status,__le16 vlan) {u16 vid;if (status &E1000_RXD_STAT_VP ) {if ((adapter->flags &IGBVF_FLAG_RX_LB_VLAN_BSWAP ) && (status &E1000_RXDEXT_STATERR_LB )) - vid =be16_to_cpu (vlan) &E1000_RXD_SPC_VLAN_MASK ; + vid =be16_to_cpu ((__force __be16 )vlan) &E1000_RXD_SPC_VLAN_MASK ;else vid =le16_to_cpu (vlan) &E1000_RXD_SPC_VLAN_MASK ;if (test_bit (vid, adapter->active_vlans))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 43/266 clk: renesas: r8a77995: Add ZA2 clock
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit 790c06cc5df263cdaff748670cc65958c81b0951 ]
R-Car D3 ZA2 clock is from PLL0D3 or S0,
and it can be controlled by ZA2CKCR.
It is needed for R-Car Sound, but is not used so far. Using default settings is very enough at this point. This patch adds it by DEF_FIXED().
--- drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/renesas/r8a77995-cpg-mssr.c +1 -0
@@ -75,6 +75,7 @@ static const struct cpg_core_clk r8a77995_core_clks[] __initconst = {DEF_RATE (".oco" ,CLK_OCO ,8 *1000 *1000 ),/* Core Clock Outputs */ +DEF_FIXED ("za2" ,R8A77995_CLK_ZA2 ,CLK_PLL0D3 ,2 ,1 ),DEF_FIXED ("z2" ,R8A77995_CLK_Z2 ,CLK_PLL0D3 ,1 ,1 ),DEF_FIXED ("ztr" ,R8A77995_CLK_ZTR ,CLK_PLL1 ,6 ,1 ), DEF_FIXED("zt", R8A77995_CLK_ZT, CLK_PLL1, 4, 1),
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 41/266 igb: fix assignment on big endian machines
In reply to Greg Kroah-HartmanFrom: Jesse Brandeburg <[email protected]>
[ Upstream commit b514958dd1a3bd57638b0e63b8e5152b1960e6aa ]
The igb driver was trying hard to be sparse correct, but somehow ended up converting a variable into little endian order and then tries to OR something with it.
A much plainer way of doing things is to leave all variables and OR operations in CPU (non-endian) mode, and then convert to little endian only once, which is what this change does.
This probably fixes a bug that might have been seen only on big endian systems.
--- drivers/net/ethernet/intel/igb/igb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +2 -2
@@ -6276,12 +6276,12 @@ int igb_xmit_xdp_ring(struct igb_adapter *adapter, cmd_type |= len |IGB_TXD_DCMD ; tx_desc->read.cmd_type_len =cpu_to_le32 (cmd_type); - olinfo_status =cpu_to_le32 (len <<E1000_ADVTXD_PAYLEN_SHIFT ); + olinfo_status = len <<E1000_ADVTXD_PAYLEN_SHIFT ;/* 82575 requires a unique index per ring */ if (test_bit (IGB_RING_FLAG_TX_CTX_IDX , &tx_ring->flags)) olinfo_status |= tx_ring->reg_idx <<4 ; - tx_desc->read.olinfo_status = olinfo_status; + tx_desc->read.olinfo_status =cpu_to_le32 (olinfo_status);netdev_tx_sent_queue (txring_txq (tx_ring), tx_buffer->bytecount);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 42/266 drm/bridge: cdns: Fix PM reference leak in cdns_dsi_transfer()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 33f90f27e1c5ccd648d3e78a1c28be9ee8791cf1 ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/cdns-dsi.c +1 -1
@@ -1028,7 +1028,7 @@ static ssize_t cdns_dsi_transfer(struct mipi_dsi_host *host,struct mipi_dsi_packet packet;int ret, i, tx_len, rx_len; - ret =pm_runtime_get_sync (host->dev); + ret =pm_runtime_resume_and_get (host->dev);if (ret <0 )return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 45/266 drm/amdgpu/swsmu/aldebaran: fix check in is_dpm_running
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit dd1d82c04e111b5a864638ede8965db2fe6d8653 ]
If smu_cmn_get_enabled_mask() fails, return false to be consistent with other asics.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +4 -1
@@ -1290,10 +1290,13 @@ static int aldebaran_usr_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_static bool aldebaran_is_dpm_running (struct smu_context *smu) { -int ret =0 ; +int ret;uint32_t feature_mask[2 ];unsigned long feature_enabled; + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); +if (ret) +return false; feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | ((uint64_t )feature_mask[1 ] <<32 ));return !!(feature_enabled &SMC_DPM_FEATURE );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 27/266 drm/virtio: Fix double free on probe failure
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
[ Upstream commit cec7f1774605a5ef47c134af62afe7c75c30b0ee ]
The virtio_gpu_init() will free vgdev and vgdev->vbufs on failure. But such failure will be caught by virtio_gpu_probe() and then virtio_gpu_release() will be called to do some cleanup which will free vgdev and vgdev->vbufs again. So let's set dev->dev_private to NULL to avoid double free.
--- drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/virtio/virtgpu_kms.c +1 -0
@@ -234,6 +234,7 @@ err_scanouts: err_vbufs: vgdev->vdev->config->del_vqs (vgdev->vdev); err_vqs: + dev->dev_private =NULL ;kfree (vgdev);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 44/266 drm/amd/display: fix odm scaling
In reply to Greg Kroah-HartmanFrom: Dmytro Laktyushkin <[email protected]>
[ Upstream commit 6566cae7aef30da8833f1fa0eb854baf33b96676 ]
There are two issues with scaling calculations, odm recout calculation and matching viewport to actual recout.
This change fixes both issues. Odm recout calculation via special casing and viewport matching issue by reworking the viewport calcualtion to use scaling ratios and recout to derrive the required offset and size.
--- .../gpu/drm/amd/display/dc/core/dc_resource.c | 568 +++++++----------- drivers/gpu/drm/amd/display/dc/dc_types.h | 5 - .../drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 12 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 14 +- .../amd/display/dc/dml/display_mode_structs.h | 2 + .../drm/amd/display/dc/dml/display_mode_vba.c | 13 + .../gpu/drm/amd/display/dc/inc/hw/transform.h | 4 - 7 files changed, 232 insertions(+), 386 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +201 -367
@@ -695,124 +695,23 @@ static void calculate_split_count_and_index(struct pipe_ctx *pipe_ctx, int *spli } } -static void calculate_viewport (struct pipe_ctx *pipe_ctx) +/* +* This is a preliminary vp size calculation to allow us to check taps support. +* The result is completely overridden afterwards. +*/ +static void calculate_viewport_size (struct pipe_ctx *pipe_ctx) { -const struct dc_plane_state *plane_state = pipe_ctx->plane_state; -const struct dc_stream_state *stream = pipe_ctx->stream;struct scaler_data *data = &pipe_ctx->plane_res.scl_data; -struct rect surf_src = plane_state->src_rect; -struct rect clip, dest; -int vpc_div = (data->format ==PIXEL_FORMAT_420BPP8 - || data->format ==PIXEL_FORMAT_420BPP10 ) ?2 :1 ; -int split_count =0 ; -int split_idx =0 ; -bool orthogonal_rotation, flip_y_start, flip_x_start; - -calculate_split_count_and_index (pipe_ctx, &split_count, &split_idx); -if (stream->view_format ==VIEW_3D_FORMAT_SIDE_BY_SIDE || - stream->view_format ==VIEW_3D_FORMAT_TOP_AND_BOTTOM ) { - split_count =0 ; - split_idx =0 ; - } - -/* The actual clip is an intersection between stream -* source and surface clip -*/ - dest = plane_state->dst_rect; - clip.x = stream->src.x > plane_state->clip_rect.x ? - stream->src.x : plane_state->clip_rect.x; - - clip.width = stream->src.x + stream->src.width < - plane_state->clip_rect.x + plane_state->clip_rect.width ? - stream->src.x + stream->src.width - clip.x : - plane_state->clip_rect.x + plane_state->clip_rect.width - clip.x ; - - clip.y = stream->src.y > plane_state->clip_rect.y ? - stream->src.y : plane_state->clip_rect.y; - - clip.height = stream->src.y + stream->src.height < - plane_state->clip_rect.y + plane_state->clip_rect.height ? - stream->src.y + stream->src.height - clip.y : - plane_state->clip_rect.y + plane_state->clip_rect.height - clip.y ; - -/* -* Need to calculate how scan origin is shifted in vp space -* to correctly rotate clip and dst -*/ -get_vp_scan_direction ( - plane_state->rotation, - plane_state->horizontal_mirror, - &orthogonal_rotation, - &flip_y_start, - &flip_x_start); - -if (orthogonal_rotation) { -swap (clip.x, clip.y); -swap (clip.width, clip.height); -swap (dest.x, dest.y); -swap (dest.width, dest.height); - } -if (flip_x_start) { - clip.x = dest.x + dest.width - clip.x - clip.width; - dest.x =0 ; - } -if (flip_y_start) { - clip.y = dest.y + dest.height - clip.y - clip.height; - dest.y =0 ; - } - -/* offset = surf_src.ofs + (clip.ofs - surface->dst_rect.ofs) * scl_ratio -* num_pixels = clip.num_pix * scl_ratio -*/ - data->viewport.x = surf_src.x + (clip.x - dest.x) * surf_src.width / dest.width; - data->viewport.width = clip.width * surf_src.width / dest.width; - - data->viewport.y = surf_src.y + (clip.y - dest.y) * surf_src.height / dest.height; - data->viewport.height = clip.height * surf_src.height / dest.height; - -/* Handle split */ -if (split_count) { -/* extra pixels in the division remainder need to go to pipes after -* the extra pixel index minus one(epimo) defined here as: -*/ -int epimo =0 ; - -if (orthogonal_rotation) { -if (flip_y_start) - split_idx = split_count - split_idx; - - epimo = split_count - data->viewport.height % (split_count +1 ); - - data->viewport.y += (data->viewport.height / (split_count +1 )) * split_idx; -if (split_idx > epimo) - data->viewport.y += split_idx - epimo -1 ; - data->viewport.height = data->viewport.height / (split_count +1 ) + (split_idx > epimo ?1 :0 ); - }else { -if (flip_x_start) - split_idx = split_count - split_idx; - - epimo = split_count - data->viewport.width % (split_count +1 ); - - data->viewport.x += (data->viewport.width / (split_count +1 )) * split_idx; -if (split_idx > epimo) - data->viewport.x += split_idx - epimo -1 ; - data->viewport.width = data->viewport.width / (split_count +1 ) + (split_idx > epimo ?1 :0 ); - } + data->viewport.width =dc_fixpt_ceil (dc_fixpt_mul_int (data->ratios.horz, data->recout.width)); + data->viewport.height =dc_fixpt_ceil (dc_fixpt_mul_int (data->ratios.vert, data->recout.height)); + data->viewport_c.width =dc_fixpt_ceil (dc_fixpt_mul_int (data->ratios.horz_c, data->recout.width)); + data->viewport_c.height =dc_fixpt_ceil (dc_fixpt_mul_int (data->ratios.vert_c, data->recout.height)); +if (pipe_ctx->plane_state->rotation ==ROTATION_ANGLE_90 || + pipe_ctx->plane_state->rotation ==ROTATION_ANGLE_270 ) { +swap (data->viewport.width, data->viewport.height); +swap (data->viewport_c.width, data->viewport_c.height); } - -/* Round down, compensate in init */ - data->viewport_c.x = data->viewport.x / vpc_div; - data->viewport_c.y = data->viewport.y / vpc_div; - data->inits.h_c = (data->viewport.x % vpc_div) !=0 ? dc_fixpt_half : dc_fixpt_zero; - data->inits.v_c = (data->viewport.y % vpc_div) !=0 ? dc_fixpt_half : dc_fixpt_zero; - -/* Round up, assume original video size always even dimensions */ - data->viewport_c.width = (data->viewport.width + vpc_div -1 ) / vpc_div; - data->viewport_c.height = (data->viewport.height + vpc_div -1 ) / vpc_div; - - data->viewport_unadjusted = data->viewport; - data->viewport_c_unadjusted = data->viewport_c; }static void calculate_recout (struct pipe_ctx *pipe_ctx)
@@ -821,26 +720,21 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx)const struct dc_stream_state *stream = pipe_ctx->stream;struct scaler_data *data = &pipe_ctx->plane_res.scl_data;struct rect surf_clip = plane_state->clip_rect; -bool pri_split_tb = pipe_ctx->bottom_pipe && - pipe_ctx->bottom_pipe->plane_state == pipe_ctx->plane_state && - stream->view_format ==VIEW_3D_FORMAT_TOP_AND_BOTTOM ; -bool sec_split_tb = pipe_ctx->top_pipe && - pipe_ctx->top_pipe->plane_state == pipe_ctx->plane_state && - stream->view_format ==VIEW_3D_FORMAT_TOP_AND_BOTTOM ; -int split_count =0 ; -int split_idx =0 ; +bool split_tb = stream->view_format ==VIEW_3D_FORMAT_TOP_AND_BOTTOM ; +int split_count, split_idx;calculate_split_count_and_index (pipe_ctx, &split_count, &split_idx); +if (stream->view_format ==VIEW_3D_FORMAT_SIDE_BY_SIDE ) + split_idx =0 ;/* * Only the leftmost ODM pipe should be offset by a nonzero distance */ -if (!pipe_ctx->prev_odm_pipe) { +if (!pipe_ctx->prev_odm_pipe || split_idx == split_count) { data->recout.x = stream->dst.x;if (stream->src.x < surf_clip.x) data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width / stream->src.width; - }else data->recout.x =0 ;
@@ -861,26 +755,31 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx)if (data->recout.height + data->recout.y > stream->dst.y + stream->dst.height) data->recout.height = stream->dst.y + stream->dst.height - data->recout.y; -/* Handle h & v split, handle rotation using viewport */ -if (sec_split_tb) { - data->recout.y += data->recout.height /2 ; -/* Floor primary pipe, ceil 2ndary pipe */ - data->recout.height = (data->recout.height +1 ) /2 ; - }else if (pri_split_tb) +/* Handle h & v split */ +if (split_tb) { +ASSERT (data->recout.height %2 ==0 ); data->recout.height /=2 ; -else if (split_count) { -/* extra pixels in the division remainder need to go to pipes after -* the extra pixel index minus one(epimo) defined here as: -*/ -int epimo = split_count - data->recout.width % (split_count +1 ); - -/*no recout offset due to odm */ + }else if (split_count) {if (!pipe_ctx->next_odm_pipe && !pipe_ctx->prev_odm_pipe) { +/* extra pixels in the division remainder need to go to pipes after +* the extra pixel index minus one(epimo) defined here as: +*/ +int epimo = split_count - data->recout.width % (split_count +1 ); + data->recout.x += (data->recout.width / (split_count +1 )) * split_idx;if (split_idx > epimo) data->recout.x += split_idx - epimo -1 ; +ASSERT (stream->view_format !=VIEW_3D_FORMAT_SIDE_BY_SIDE || data->recout.width %2 ==0 ); + data->recout.width = data->recout.width / (split_count +1 ) + (split_idx > epimo ?1 :0 ); + }else { +/* odm */ +if (split_idx == split_count) { +/* rightmost pipe is the remainder recout */ + data->recout.width -= data->h_active * split_count - data->recout.x; + data->recout.x =0 ; + }else + data->recout.width = data->h_active - data->recout.x; } - data->recout.width = data->recout.width / (split_count +1 ) + (split_idx > epimo ?1 :0 ); } }
@@ -934,9 +833,15 @@ static void calculate_scaling_ratios(struct pipe_ctx *pipe_ctx) pipe_ctx->plane_res.scl_data.ratios.vert_c, 19); } -static inline void adjust_vp_and_init_for_seamless_clip( + +/* +* We completely calculate vp offset, size and inits here based entirely on scaling +* ratios and recout for pixel perfect pipe combine. +*/ +static void calculate_init_and_vp( bool flip_scan_dir, - int recout_skip, + int recout_offset_within_recout_full, + int recout_size, int src_size, int taps, struct fixed31_32 ratio,
@@ -944,91 +849,87 @@ static inline void adjust_vp_and_init_for_seamless_clip(int *vp_offset, int *vp_size) { -if (!flip_scan_dir) { -/* Adjust for viewport end clip-off */ -if ((*vp_offset + *vp_size) < src_size) { -int vp_clip = src_size - *vp_size - *vp_offset; -int int_part =dc_fixpt_floor (dc_fixpt_sub (*init, ratio)); - - int_part = int_part >0 ? int_part :0 ; - *vp_size += int_part < vp_clip ? int_part : vp_clip; - } - -/* Adjust for non-0 viewport offset */ -if (*vp_offset) { -int int_part; - - *init =dc_fixpt_add (*init,dc_fixpt_mul_int (ratio, recout_skip)); - int_part =dc_fixpt_floor (*init) - *vp_offset; -if (int_part < taps) { -int int_adj = *vp_offset >= (taps - int_part) ? - (taps - int_part) : *vp_offset; - *vp_offset -= int_adj; - *vp_size += int_adj; - int_part += int_adj; - }else if (int_part > taps) { - *vp_offset += int_part - taps; - *vp_size -= int_part - taps; - int_part = taps; - } - init->value &=0xffffffff ; - *init =dc_fixpt_add_int (*init, int_part); - } - }else { -/* Adjust for non-0 viewport offset */ -if (*vp_offset) { -int int_part =dc_fixpt_floor (dc_fixpt_sub (*init, ratio)); - - int_part = int_part >0 ? int_part :0 ; - *vp_size += int_part < *vp_offset ? int_part : *vp_offset; - *vp_offset -= int_part < *vp_offset ? int_part : *vp_offset; - } + struct fixed31_32 temp; +int int_part; -/* Adjust for viewport end clip-off */ -if ((*vp_offset + *vp_size) < src_size) { -int int_part; -int end_offset = src_size - *vp_offset - *vp_size; - -/* -* this is init if vp had no offset, keep in mind this is from the -* right side of vp due to scan direction -*/ - *init =dc_fixpt_add (*init,dc_fixpt_mul_int (ratio, recout_skip)); -/* -* this is the difference between first pixel of viewport available to read -* and init position, takning into account scan direction -*/ - int_part =dc_fixpt_floor (*init) - end_offset; -if (int_part < taps) { -int int_adj = end_offset >= (taps - int_part) ? - (taps - int_part) : end_offset; - *vp_size += int_adj; - int_part += int_adj; - }else if (int_part > taps) { - *vp_size += int_part - taps; - int_part = taps; - } - init->value &=0xffffffff ; - *init =dc_fixpt_add_int (*init, int_part); - } +/* +* First of the taps starts sampling pixel number <init_int_part> corresponding to recout +* pixel 1. Next recout pixel samples int part of <init + scaling ratio> and so on. +* All following calculations are based on this logic. +* +* Init calculated according to formula: +* init = (scaling_ratio + number_of_taps + 1) / 2 +* init_bot = init + scaling_ratio +* to get pixel perfect combine add the fraction from calculating vp offset +*/ + temp =dc_fixpt_mul_int (ratio, recout_offset_within_recout_full); + *vp_offset =dc_fixpt_floor (temp); + temp.value &=0xffffffff ; + *init =dc_fixpt_truncate (dc_fixpt_add (dc_fixpt_div_int ( +dc_fixpt_add_int (ratio, taps +1 ),2 ), temp),19 ); +/* +* If viewport has non 0 offset and there are more taps than covered by init then +* we should decrease the offset and increase init so we are never sampling +* outside of viewport. +*/ + int_part =dc_fixpt_floor (*init); +if (int_part < taps) { + int_part = taps - int_part; +if (int_part > *vp_offset) + int_part = *vp_offset; + *vp_offset -= int_part; + *init =dc_fixpt_add_int (*init, int_part); } +/* +* If taps are sampling outside of viewport at end of recout and there are more pixels +* available in the surface we should increase the viewport size, regardless set vp to +* only what is used. +*/ + temp =dc_fixpt_add (*init,dc_fixpt_mul_int (ratio, recout_size -1 )); + *vp_size =dc_fixpt_floor (temp); +if (*vp_size + *vp_offset > src_size) + *vp_size = src_size - *vp_offset; + +/* We did all the math assuming we are scanning same direction as display does, +* however mirror/rotation changes how vp scans vs how it is offset. If scan direction +* is flipped we simply need to calculate offset from the other side of plane. +* Note that outside of viewport all scaling hardware works in recout space. +*/ +if (flip_scan_dir) + *vp_offset = src_size - *vp_offset - *vp_size; } -static void calculate_inits_and_adj_vp (struct pipe_ctx *pipe_ctx) +static void calculate_inits_and_viewports (struct pipe_ctx *pipe_ctx) {const struct dc_plane_state *plane_state = pipe_ctx->plane_state;const struct dc_stream_state *stream = pipe_ctx->stream; -struct pipe_ctx *odm_pipe = pipe_ctx;struct scaler_data *data = &pipe_ctx->plane_res.scl_data; -struct rect src = pipe_ctx->plane_state->src_rect; -int recout_skip_h, recout_skip_v, surf_size_h, surf_size_v; +struct rect src = plane_state->src_rect;int vpc_div = (data->format ==PIXEL_FORMAT_420BPP8 - || data->format ==PIXEL_FORMAT_420BPP10 ) ?2 :1 ; + || data->format ==PIXEL_FORMAT_420BPP10 ) ?2 :1 ; +int split_count, split_idx, ro_lb, ro_tb, recout_full_x, recout_full_y;bool orthogonal_rotation, flip_vert_scan_dir, flip_horz_scan_dir; -int odm_idx =0 ; +calculate_split_count_and_index (pipe_ctx, &split_count, &split_idx);/* -* Need to calculate the scan direction for viewport to make adjustments +* recout full is what the recout would have been if we didnt clip +* the source plane at all. We only care about left(ro_lb) and top(ro_tb) +* offsets of recout within recout full because those are the directions +* we scan from and therefore the only ones that affect inits. +*/ + recout_full_x = stream->dst.x + (plane_state->dst_rect.x - stream->src.x) + * stream->dst.width / stream->src.width; + recout_full_y = stream->dst.y + (plane_state->dst_rect.y - stream->src.y) + * stream->dst.height / stream->src.height; +if (pipe_ctx->prev_odm_pipe && split_idx) + ro_lb = data->h_active * split_idx - recout_full_x; +else + ro_lb = data->recout.x - recout_full_x; + ro_tb = data->recout.y - recout_full_y; +ASSERT (ro_lb >=0 && ro_tb >=0 ); + +/* +* Work in recout rotation since that requires less transformations */ get_vp_scan_direction( plane_state->rotation,
@@ -1037,145 +938,62 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx) &flip_vert_scan_dir, &flip_horz_scan_dir); -/* Calculate src rect rotation adjusted to recout space */ - surf_size_h = src.x + src.width; - surf_size_v = src.y + src.height; -if (flip_horz_scan_dir) - src.x =0 ; -if (flip_vert_scan_dir) - src.y =0 ;if (orthogonal_rotation) { -swap (src.x, src.y);swap (src.width, src.height); +swap (flip_vert_scan_dir, flip_horz_scan_dir); } -/*modified recout_skip_h calculation due to odm having no recout offset*/ -while (odm_pipe->prev_odm_pipe) { - odm_idx++; - odm_pipe = odm_pipe->prev_odm_pipe; - } -/*odm_pipe is the leftmost pipe in the ODM group*/ - recout_skip_h = odm_idx * data->recout.width; - -/* Recout matching initial vp offset = recout_offset - (stream dst offset + -* ((surf dst offset - stream src offset) * 1/ stream scaling ratio) -* - (surf surf_src offset * 1/ full scl ratio)) -*/ - recout_skip_h += odm_pipe->plane_res.scl_data.recout.x - - (stream->dst.x + (plane_state->dst_rect.x - stream->src.x) - * stream->dst.width / stream->src.width - - src.x * plane_state->dst_rect.width / src.width - * stream->dst.width / stream->src.width); - - - recout_skip_v = data->recout.y - (stream->dst.y + (plane_state->dst_rect.y - stream->src.y) - * stream->dst.height / stream->src.height - - src.y * plane_state->dst_rect.height / src.height - * stream->dst.height / stream->src.height); -if (orthogonal_rotation) -swap (recout_skip_h, recout_skip_v); -/* -* Init calculated according to formula: -* init = (scaling_ratio + number_of_taps + 1) / 2 -* init_bot = init + scaling_ratio -* init_c = init + truncated_vp_c_offset(from calculate viewport) -*/ - data->inits.h =dc_fixpt_truncate (dc_fixpt_div_int ( -dc_fixpt_add_int (data->ratios.horz, data->taps.h_taps +1 ),2 ),19 ); - - data->inits.h_c =dc_fixpt_truncate (dc_fixpt_add (data->inits.h_c,dc_fixpt_div_int ( -dc_fixpt_add_int (data->ratios.horz_c, data->taps.h_taps_c +1 ),2 )),19 ); - - data->inits.v =dc_fixpt_truncate (dc_fixpt_div_int ( -dc_fixpt_add_int (data->ratios.vert, data->taps.v_taps +1 ),2 ),19 ); - - data->inits.v_c =dc_fixpt_truncate (dc_fixpt_add (data->inits.v_c,dc_fixpt_div_int ( -dc_fixpt_add_int (data->ratios.vert_c, data->taps.v_taps_c +1 ),2 )),19 ); - -/* -* Taps, inits and scaling ratios are in recout space need to rotate -* to viewport rotation before adjustment -*/ -adjust_vp_and_init_for_seamless_clip ( +calculate_init_and_vp ( flip_horz_scan_dir, - recout_skip_h, - surf_size_h, - orthogonal_rotation ? data->taps.v_taps : data->taps.h_taps, - orthogonal_rotation ? data->ratios.vert : data->ratios.horz, - orthogonal_rotation ? &data->inits.v : &data->inits.h, + ro_lb, + data->recout.width, + src.width, + data->taps.h_taps, + data->ratios.horz, + &data->inits.h, &data->viewport.x, &data->viewport.width); -adjust_vp_and_init_for_seamless_clip ( +calculate_init_and_vp ( flip_horz_scan_dir, - recout_skip_h, - surf_size_h / vpc_div, - orthogonal_rotation ? data->taps.v_taps_c : data->taps.h_taps_c, - orthogonal_rotation ? data->ratios.vert_c : data->ratios.horz_c, - orthogonal_rotation ? &data->inits.v_c : &data->inits.h_c, + ro_lb, + data->recout.width, + src.width / vpc_div, + data->taps.h_taps_c, + data->ratios.horz_c, + &data->inits.h_c, &data->viewport_c.x, &data->viewport_c.width); -adjust_vp_and_init_for_seamless_clip ( +calculate_init_and_vp ( flip_vert_scan_dir, - recout_skip_v, - surf_size_v, - orthogonal_rotation ? data->taps.h_taps : data->taps.v_taps, - orthogonal_rotation ? data->ratios.horz : data->ratios.vert, - orthogonal_rotation ? &data->inits.h : &data->inits.v, + ro_tb, + data->recout.height, + src.height, + data->taps.v_taps, + data->ratios.vert, + &data->inits.v, &data->viewport.y, &data->viewport.height); -adjust_vp_and_init_for_seamless_clip ( +calculate_init_and_vp ( flip_vert_scan_dir, - recout_skip_v, - surf_size_v / vpc_div, - orthogonal_rotation ? data->taps.h_taps_c : data->taps.v_taps_c, - orthogonal_rotation ? data->ratios.horz_c : data->ratios.vert_c, - orthogonal_rotation ? &data->inits.h_c : &data->inits.v_c, + ro_tb, + data->recout.height, + src.height / vpc_div, + data->taps.v_taps_c, + data->ratios.vert_c, + &data->inits.v_c, &data->viewport_c.y, &data->viewport_c.height); - -/* Interlaced inits based on final vert inits */ - data->inits.v_bot =dc_fixpt_add (data->inits.v, data->ratios.vert); - data->inits.v_c_bot =dc_fixpt_add (data->inits.v_c, data->ratios.vert_c); - -} - -/* -* When handling 270 rotation in mixed SLS mode, we have -* stream->timing.h_border_left that is non zero. If we are doing -* pipe-splitting, this h_border_left value gets added to recout.x and when it -* calls calculate_inits_and_adj_vp() and -* adjust_vp_and_init_for_seamless_clip(), it can cause viewport.height for a -* pipe to be incorrect. -* -* To fix this, instead of using stream->timing.h_border_left, we can use -* stream->dst.x to represent the border instead. So we will set h_border_left -* to 0 and shift the appropriate amount in stream->dst.x. We will then -* perform all calculations in resource_build_scaling_params() based on this -* and then restore the h_border_left and stream->dst.x to their original -* values. -* -* shift_border_left_to_dst() will shift the amount of h_border_left to -* stream->dst.x and set h_border_left to 0. restore_border_left_from_dst() -* will restore h_border_left and stream->dst.x back to their original values -* We also need to make sure pipe_ctx->plane_res.scl_data.h_active uses the -* original h_border_left value in its calculation. -*/ -static int shift_border_left_to_dst (struct pipe_ctx *pipe_ctx) -{ -int store_h_border_left = pipe_ctx->stream->timing.h_border_left; - -if (store_h_border_left) { - pipe_ctx->stream->timing.h_border_left =0 ; - pipe_ctx->stream->dst.x += store_h_border_left; +if (orthogonal_rotation) { +swap (data->viewport.x, data->viewport.y); +swap (data->viewport.width, data->viewport.height); +swap (data->viewport_c.x, data->viewport_c.y); +swap (data->viewport_c.width, data->viewport_c.height); } -return store_h_border_left; -} - -static void restore_border_left_from_dst (struct pipe_ctx *pipe_ctx, -int store_h_border_left) -{ - pipe_ctx->stream->dst.x -= store_h_border_left; - pipe_ctx->stream->timing.h_border_left = store_h_border_left; + data->viewport.x += src.x; + data->viewport.y += src.y; +ASSERT (src.x % vpc_div ==0 && src.y % vpc_div ==0 ); + data->viewport_c.x += src.x / vpc_div; + data->viewport_c.y += src.y / vpc_div; }bool resource_build_scaling_params (struct pipe_ctx *pipe_ctx)
@@ -1183,48 +1001,42 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)const struct dc_plane_state *plane_state = pipe_ctx->plane_state;struct dc_crtc_timing *timing = &pipe_ctx->stream->timing;bool res = false; -int store_h_border_left =shift_border_left_to_dst (pipe_ctx);DC_LOGGER_INIT (pipe_ctx->stream->ctx->logger); -/* Important: scaling ratio calculation requires pixel format, -* lb depth calculation requires recout and taps require scaling ratios. -* Inits require viewport, taps, ratios and recout of split pipe -*/ + pipe_ctx->plane_res.scl_data.format =convert_pixel_format_to_dalsurface ( pipe_ctx->plane_state->format); -calculate_scaling_ratios (pipe_ctx); - -calculate_viewport (pipe_ctx); +/* Timing borders are part of vactive that we are also supposed to skip in addition +* to any stream dst offset. Since dm logic assumes dst is in addressable +* space we need to add the the left and top borders to dst offsets temporarily. +* TODO: fix in DM, stream dst is supposed to be in vactive +*/ + pipe_ctx->stream->dst.x += timing->h_border_left; + pipe_ctx->stream->dst.y += timing->v_border_top; -if (pipe_ctx->plane_res.scl_data.viewport.height <MIN_VIEWPORT_SIZE || - pipe_ctx->plane_res.scl_data.viewport.width <MIN_VIEWPORT_SIZE ) { -if (store_h_border_left) { -restore_border_left_from_dst (pipe_ctx, - store_h_border_left); - } -return false; - } +/* Calculate H and V active size */ + pipe_ctx->plane_res.scl_data.h_active = timing->h_addressable + + timing->h_border_left + timing->h_border_right; + pipe_ctx->plane_res.scl_data.v_active = timing->v_addressable + + timing->v_border_top + timing->v_border_bottom; +if (pipe_ctx->next_odm_pipe || pipe_ctx->prev_odm_pipe) + pipe_ctx->plane_res.scl_data.h_active /=get_num_odm_splits (pipe_ctx) +1 ; +/* depends on h_active */ calculate_recout (pipe_ctx); +/* depends on pixel format */ +calculate_scaling_ratios (pipe_ctx); +/* depends on scaling ratios and recout, does not calculate offset yet */ +calculate_viewport_size (pipe_ctx); -/** +/* +* LB calculations depend on vp size, h/v_active and scaling ratios * Setting line buffer pixel depth to 24bpp yields banding * on certain displays, such as the Sharp 4k */ pipe_ctx->plane_res.scl_data.lb_params.depth =LB_PIXEL_DEPTH_30BPP ; pipe_ctx->plane_res.scl_data.lb_params.alpha_en = plane_state->per_pixel_alpha; - pipe_ctx->plane_res.scl_data.recout.x += timing->h_border_left; - pipe_ctx->plane_res.scl_data.recout.y += timing->v_border_top; - - pipe_ctx->plane_res.scl_data.h_active = timing->h_addressable + - store_h_border_left + timing->h_border_right; - pipe_ctx->plane_res.scl_data.v_active = timing->v_addressable + - timing->v_border_top + timing->v_border_bottom; -if (pipe_ctx->next_odm_pipe || pipe_ctx->prev_odm_pipe) - pipe_ctx->plane_res.scl_data.h_active /=get_num_odm_splits (pipe_ctx) +1 ; - -/* Taps calculations */ if (pipe_ctx->plane_res.xfm !=NULL ) res = pipe_ctx->plane_res.xfm->funcs->transform_get_optimal_number_of_taps ( pipe_ctx->plane_res.xfm, &pipe_ctx->plane_res.scl_data, &plane_state->scaling_quality);
@@ -1251,9 +1063,31 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) &plane_state->scaling_quality); } +/* +* Depends on recout, scaling ratios, h_active and taps +* May need to re-check lb size after this in some obscure scenario +*/ if (res) -/* May need to re-check lb size after this in some obscure scenario */ -calculate_inits_and_adj_vp (pipe_ctx); +calculate_inits_and_viewports (pipe_ctx); + +/* +* Handle side by side and top bottom 3d recout offsets after vp calculation +* since 3d is special and needs to calculate vp as if there is no recout offset +* This may break with rotation, good thing we aren't mixing hw rotation and 3d +*/ +if (pipe_ctx->top_pipe && pipe_ctx->top_pipe->plane_state == plane_state) { +ASSERT (plane_state->rotation ==ROTATION_ANGLE_0 || + (pipe_ctx->stream->view_format !=VIEW_3D_FORMAT_TOP_AND_BOTTOM && + pipe_ctx->stream->view_format !=VIEW_3D_FORMAT_SIDE_BY_SIDE )); +if (pipe_ctx->stream->view_format ==VIEW_3D_FORMAT_TOP_AND_BOTTOM ) + pipe_ctx->plane_res.scl_data.recout.y += pipe_ctx->plane_res.scl_data.recout.height; +else if (pipe_ctx->stream->view_format ==VIEW_3D_FORMAT_SIDE_BY_SIDE ) + pipe_ctx->plane_res.scl_data.recout.x += pipe_ctx->plane_res.scl_data.recout.width; + } + +if (pipe_ctx->plane_res.scl_data.viewport.height <MIN_VIEWPORT_SIZE || + pipe_ctx->plane_res.scl_data.viewport.width <MIN_VIEWPORT_SIZE ) + res = false; DC_LOG_SCALER("%s pipe %d:\nViewport: height:%d width:%d x:%d y:%d Recout: height:%d width:%d x:%d y:%d HACTIVE:%d VACTIVE:%d\n" "src_rect: height:%d width:%d x:%d y:%d dst_rect: height:%d width:%d x:%d y:%d clip_rect: height:%d width:%d x:%d y:%d\n",
@@ -1282,8 +1116,8 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) plane_state->clip_rect.x, plane_state->clip_rect.y); -if (store_h_border_left) -restore_border_left_from_dst (pipe_ctx, store_h_border_left); + pipe_ctx->stream->dst.x -= timing->h_border_left; + pipe_ctx->stream->dst.y -= timing->v_border_top;return res; }
drivers/gpu/drm/amd/display/dc/dc_types.h +0 -5
@@ -271,11 +271,6 @@ struct dc_edid_caps {struct dc_panel_patch panel_patch; }; -struct view { -uint32_t width; -uint32_t height; -}; -struct dc_mode_flags {/* note: part of refresh rate flag*/ uint32_t INTERLACE :1 ;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c +8 -4
@@ -631,8 +631,10 @@ static void dpp1_dscl_set_manual_ratio_init( SCL_V_INIT_INT, init_int);if (REG (SCL_VERT_FILTER_INIT_BOT )) { - init_frac =dc_fixpt_u0d19 (data->inits.v_bot) <<5 ; - init_int =dc_fixpt_floor (data->inits.v_bot); +struct fixed31_32 bot =dc_fixpt_add (data->inits.v, data->ratios.vert); + + init_frac =dc_fixpt_u0d19 (bot) <<5 ; + init_int =dc_fixpt_floor (bot);REG_SET_2 (SCL_VERT_FILTER_INIT_BOT ,0 ,SCL_V_INIT_FRAC_BOT , init_frac,SCL_V_INIT_INT_BOT , init_int);
@@ -645,8 +647,10 @@ static void dpp1_dscl_set_manual_ratio_init( SCL_V_INIT_INT_C, init_int);if (REG (SCL_VERT_FILTER_INIT_BOT_C )) { - init_frac =dc_fixpt_u0d19 (data->inits.v_c_bot) <<5 ; - init_int =dc_fixpt_floor (data->inits.v_c_bot); +struct fixed31_32 bot =dc_fixpt_add (data->inits.v_c, data->ratios.vert_c); + + init_frac =dc_fixpt_u0d19 (bot) <<5 ; + init_int =dc_fixpt_floor (bot);REG_SET_2 (SCL_VERT_FILTER_INIT_BOT_C ,0 ,SCL_V_INIT_FRAC_BOT_C , init_frac,SCL_V_INIT_INT_BOT_C , init_int);
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +8 -6
@@ -2289,12 +2289,14 @@ int dcn20_populate_dml_pipes_from_context( pipes[pipe_cnt].pipe.src.source_scan = pln->rotation ==ROTATION_ANGLE_90 || pln->rotation ==ROTATION_ANGLE_270 ? dm_vert : dm_horz; - pipes[pipe_cnt].pipe.src.viewport_y_y = scl->viewport_unadjusted.y; - pipes[pipe_cnt].pipe.src.viewport_y_c = scl->viewport_c_unadjusted.y; - pipes[pipe_cnt].pipe.src.viewport_width = scl->viewport_unadjusted.width; - pipes[pipe_cnt].pipe.src.viewport_width_c = scl->viewport_c_unadjusted.width; - pipes[pipe_cnt].pipe.src.viewport_height = scl->viewport_unadjusted.height; - pipes[pipe_cnt].pipe.src.viewport_height_c = scl->viewport_c_unadjusted.height; + pipes[pipe_cnt].pipe.src.viewport_y_y = scl->viewport.y; + pipes[pipe_cnt].pipe.src.viewport_y_c = scl->viewport_c.y; + pipes[pipe_cnt].pipe.src.viewport_width = scl->viewport.width; + pipes[pipe_cnt].pipe.src.viewport_width_c = scl->viewport_c.width; + pipes[pipe_cnt].pipe.src.viewport_height = scl->viewport.height; + pipes[pipe_cnt].pipe.src.viewport_height_c = scl->viewport_c.height; + pipes[pipe_cnt].pipe.src.viewport_width_max = pln->src_rect.width; + pipes[pipe_cnt].pipe.src.viewport_height_max = pln->src_rect.height; pipes[pipe_cnt].pipe.src.surface_width_y = pln->plane_size.surface_size.width; pipes[pipe_cnt].pipe.src.surface_height_y = pln->plane_size.surface_size.height; pipes[pipe_cnt].pipe.src.surface_width_c = pln->plane_size.chroma_size.width;
drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h +2 -0
@@ -253,6 +253,8 @@ struct _vcs_dpi_display_pipe_source_params_st {unsigned int viewport_y_c;unsigned int viewport_width_c;unsigned int viewport_height_c; +unsigned int viewport_width_max; +unsigned int viewport_height_max;unsigned int data_pitch;unsigned int data_pitch_c;unsigned int meta_pitch;
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +13 -0
@@ -630,6 +630,19 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) } } } +if (src->viewport_width_max) { +int hdiv_c = src->source_format >= dm_420_8 && src->source_format <= dm_422_10 ?2 :1 ; +int vdiv_c = src->source_format >= dm_420_8 && src->source_format <= dm_420_12 ?2 :1 ; + +if (mode_lib->vba.ViewportWidth[mode_lib->vba.NumberOfActivePlanes] > src->viewport_width_max) + mode_lib->vba.ViewportWidth[mode_lib->vba.NumberOfActivePlanes] = src->viewport_width_max; +if (mode_lib->vba.ViewportHeight[mode_lib->vba.NumberOfActivePlanes] > src->viewport_height_max) + mode_lib->vba.ViewportHeight[mode_lib->vba.NumberOfActivePlanes] = src->viewport_height_max; +if (mode_lib->vba.ViewportWidthChroma[mode_lib->vba.NumberOfActivePlanes] > src->viewport_width_max / hdiv_c) + mode_lib->vba.ViewportWidthChroma[mode_lib->vba.NumberOfActivePlanes] = src->viewport_width_max / hdiv_c; +if (mode_lib->vba.ViewportHeightChroma[mode_lib->vba.NumberOfActivePlanes] > src->viewport_height_max / vdiv_c) + mode_lib->vba.ViewportHeightChroma[mode_lib->vba.NumberOfActivePlanes] = src->viewport_height_max / vdiv_c; + }if (pipes[k].pipe.src.immediate_flip) { mode_lib->vba.ImmediateFlipSupport = true;
drivers/gpu/drm/amd/display/dc/inc/hw/transform.h +0 -4
@@ -162,9 +162,7 @@ struct scl_inits {struct fixed31_32 h;struct fixed31_32 h_c;struct fixed31_32 v; -struct fixed31_32 v_bot;struct fixed31_32 v_c; -struct fixed31_32 v_c_bot; };struct scaler_data {
@@ -173,8 +171,6 @@ struct scaler_data {struct scaling_taps taps;struct rect viewport;struct rect viewport_c; -struct rect viewport_unadjusted; -struct rect viewport_c_unadjusted;struct rect recout;struct scaling_ratios ratios;struct scl_inits inits;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 46/266 net/mlx5e: IPsec/rep_tc: Fix rep_tc_update_skb drops IPsec packet
In reply to Greg Kroah-HartmanFrom: Huy Nguyen <[email protected]>
[ Upstream commit c07274ab1ab2c38fb128e32643c22c89cb319384 ]
rep_tc copy REG_C1 to REG_B. IPsec crypto utilizes the whole REG_B register with BIT31 as IPsec marker. rep_tc_update_skb drops IPsec because it thought REG_B contains bad value.
In previous patch, BIT 31 of REG_C1 is reserved for IPsec. Skip the rep_tc_update_skb if BIT31 of REG_B is set.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +4 -2
@@ -1310,7 +1310,8 @@ static void mlx5e_handle_rx_cqe_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)if (rep->vlan &&skb_vlan_tag_present (skb))skb_vlan_pop (skb); -if (!mlx5e_rep_tc_update_skb (cqe, skb, &tc_priv)) { +if (unlikely (!mlx5_ipsec_is_rx_flow (cqe) && + !mlx5e_rep_tc_update_skb (cqe, skb, &tc_priv))) {dev_kfree_skb_any (skb); goto free_wqe; }
@@ -1367,7 +1368,8 @@ static void mlx5e_handle_rx_cqe_mpwrq_rep(struct mlx5e_rq *rq, struct mlx5_cqe64mlx5e_complete_rx_cqe (rq, cqe, cqe_bcnt, skb); -if (!mlx5e_rep_tc_update_skb (cqe, skb, &tc_priv)) { +if (unlikely (!mlx5_ipsec_is_rx_flow (cqe) && + !mlx5e_rep_tc_update_skb (cqe, skb, &tc_priv))) {dev_kfree_skb_any (skb); goto mpwrq_cqe_out; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 48/266 drm: rockchip: add missing registers for RK3188
In reply to Greg Kroah-HartmanFrom: Alex Bee <[email protected]>
[ Upstream commit ab64b448a175b8a5a4bd323b8f74758c2574482c ]
Add dither_up, dsp_lut_en and data_blank registers to enable their respective functionality for RK3188's VOP.
While at that also fix .dsp_blank register which is (only) set with BIT24 (same as RK3066)
--- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/rockchip/rockchip_vop_reg.c +4 -1
@@ -505,7 +505,10 @@ static const struct vop_common rk3188_common = { .dither_down_sel = VOP_REG(RK3188_DSP_CTRL0, 0x1, 27), .dither_down_en = VOP_REG(RK3188_DSP_CTRL0, 0x1, 11), .dither_down_mode = VOP_REG(RK3188_DSP_CTRL0, 0x1, 10), - .dsp_blank = VOP_REG(RK3188_DSP_CTRL1, 0x3, 24), + .dsp_blank = VOP_REG(RK3188_DSP_CTRL1, 0x1, 24), + .dither_up = VOP_REG(RK3188_DSP_CTRL0, 0x1, 9), + .dsp_lut_en = VOP_REG(RK3188_SYS_CTRL, 0x1, 28), + .data_blank = VOP_REG(RK3188_DSP_CTRL1, 0x1, 25), };static const struct vop_win_data rk3188_vop_win_data[] = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 47/266 net/mlx5: Fix lag port remapping logic
In reply to Greg Kroah-HartmanFrom: Eli Cohen <[email protected]>
[ Upstream commit 8613641063617c1dfc731b403b3ee4935ef15f87 ]
Fix the logic so that if both ports netdevices are enabled or disabled, use the trivial mapping without swapping.
If only one of the netdevice's tx is enabled, use it to remap traffic to that port.
--- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag.c +13 -6
@@ -118,17 +118,24 @@ static bool __mlx5_lag_is_sriov(struct mlx5_lag *ldev)static void mlx5_infer_tx_affinity_mapping (struct lag_tracker *tracker,u8 *port1,u8 *port2) { +bool p1en; +bool p2en; + + p1en = tracker->netdev_state[MLX5_LAG_P1 ].tx_enabled && + tracker->netdev_state[MLX5_LAG_P1 ].link_up; + + p2en = tracker->netdev_state[MLX5_LAG_P2 ].tx_enabled && + tracker->netdev_state[MLX5_LAG_P2 ].link_up; + *port1 =1 ; *port2 =2 ; -if (!tracker->netdev_state[MLX5_LAG_P1 ].tx_enabled || - !tracker->netdev_state[MLX5_LAG_P1 ].link_up) { - *port1 =2 ; +if ((!p1en && !p2en) || (p1en && p2en))return ; - } -if (!tracker->netdev_state[MLX5_LAG_P2 ].tx_enabled || - !tracker->netdev_state[MLX5_LAG_P2 ].link_up) +if (p1en) *port2 =1 ; +else + *port1 =2 ; } void mlx5_modify_lag(struct mlx5_lag *ldev,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 51/266 RDMA/rtrs: Change MAX_SESS_QUEUE_DEPTH
In reply to Greg Kroah-HartmanFrom: Gioh Kim <[email protected]>
[ Upstream commit 3a98ea7041b7d18ac356da64823c2ba2f8391b3e ]
Max IB immediate data size is 2^28 (MAX_IMM_PAYL_BITS) and the minimum chunk size is 4096 (2^12). Therefore the maximum sess_queue_depth is 65536 (2^16).
--- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-pri.h +8 -5
@@ -47,12 +47,15 @@ enum {MAX_PATHS_NUM =128 ,/* -* With the size of struct rtrs_permit allocated on the client, 4K -* is the maximum number of rtrs_permits we can allocate. This number is -* also used on the client to allocate the IU for the user connection -* to receive the RDMA addresses from the server. +* Max IB immediate data size is 2^28 (MAX_IMM_PAYL_BITS) +* and the minimum chunk size is 4096 (2^12). +* So the maximum sess_queue_depth is 65536 (2^16) in theory. +* But mempool_create, create_qp and ib_post_send fail with +* "cannot allocate memory" error if sess_queue_depth is too big. +* Therefore the pratical max value of sess_queue_depth is +* somewhere between 1 and 65536 and it depends on the system. */ -MAX_SESS_QUEUE_DEPTH =4096 , +MAX_SESS_QUEUE_DEPTH =65536 ,RTRS_HB_INTERVAL_MS =5000 , RTRS_HB_MISSED_MAX = 5,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 49/266 drm: rockchip: add missing registers for RK3066
In reply to Greg Kroah-HartmanFrom: Alex Bee <[email protected]>
[ Upstream commit 742203cd56d150eb7884eb45abb7d9dbc2bdbf04 ]
Add dither_up, dsp_lut_en and data_blank registers to enable their respective functionality for RK3066's VOP.
While at that also fix .rb_swap and .format registers for all windows, which have to be set though RK3066_SYS_CTRL1 register.
Also remove .scl from win1: Scaling is only supported on the primary plane.
--- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/rockchip/rockchip_vop_reg.c +9 -7
@@ -349,8 +349,8 @@ static const struct vop_win_phy rk3066_win0_data = { .nformats = ARRAY_SIZE(formats_win_full), .format_modifiers = format_modifiers_win_full, .enable = VOP_REG(RK3066_SYS_CTRL1, 0x1, 0), - .format = VOP_REG(RK3066_SYS_CTRL0, 0x7, 4), - .rb_swap = VOP_REG(RK3066_SYS_CTRL0, 0x1, 19), + .format = VOP_REG(RK3066_SYS_CTRL1, 0x7, 4), + .rb_swap = VOP_REG(RK3066_SYS_CTRL1, 0x1, 19), .act_info = VOP_REG(RK3066_WIN0_ACT_INFO, 0x1fff1fff, 0), .dsp_info = VOP_REG(RK3066_WIN0_DSP_INFO, 0x0fff0fff, 0), .dsp_st = VOP_REG(RK3066_WIN0_DSP_ST, 0x1fff1fff, 0),
@@ -361,13 +361,12 @@ static const struct vop_win_phy rk3066_win0_data = { };static const struct vop_win_phy rk3066_win1_data = { - .scl = &rk3066_win_scl, .data_formats = formats_win_full, .nformats =ARRAY_SIZE (formats_win_full), .format_modifiers = format_modifiers_win_full, .enable =VOP_REG (RK3066_SYS_CTRL1 ,0x1 ,1 ), - .format =VOP_REG (RK3066_SYS_CTRL0 ,0x7 ,7 ), - .rb_swap =VOP_REG (RK3066_SYS_CTRL0 ,0x1 ,23 ), + .format =VOP_REG (RK3066_SYS_CTRL1 ,0x7 ,7 ), + .rb_swap =VOP_REG (RK3066_SYS_CTRL1 ,0x1 ,23 ), .act_info =VOP_REG (RK3066_WIN1_ACT_INFO ,0x1fff1fff ,0 ), .dsp_info =VOP_REG (RK3066_WIN1_DSP_INFO ,0x0fff0fff ,0 ), .dsp_st =VOP_REG (RK3066_WIN1_DSP_ST ,0x1fff1fff ,0 ),
@@ -382,8 +381,8 @@ static const struct vop_win_phy rk3066_win2_data = { .nformats = ARRAY_SIZE(formats_win_lite), .format_modifiers = format_modifiers_win_lite, .enable = VOP_REG(RK3066_SYS_CTRL1, 0x1, 2), - .format = VOP_REG(RK3066_SYS_CTRL0, 0x7, 10), - .rb_swap = VOP_REG(RK3066_SYS_CTRL0, 0x1, 27), + .format = VOP_REG(RK3066_SYS_CTRL1, 0x7, 10), + .rb_swap = VOP_REG(RK3066_SYS_CTRL1, 0x1, 27), .dsp_info = VOP_REG(RK3066_WIN2_DSP_INFO, 0x0fff0fff, 0), .dsp_st = VOP_REG(RK3066_WIN2_DSP_ST, 0x1fff1fff, 0), .yrgb_mst = VOP_REG(RK3066_WIN2_MST, 0xffffffff, 0),
@@ -408,6 +407,9 @@ static const struct vop_common rk3066_common = { .dither_down_en = VOP_REG(RK3066_DSP_CTRL0, 0x1, 11), .dither_down_mode = VOP_REG(RK3066_DSP_CTRL0, 0x1, 10), .dsp_blank = VOP_REG(RK3066_DSP_CTRL1, 0x1, 24), + .dither_up = VOP_REG(RK3066_DSP_CTRL0, 0x1, 9), + .dsp_lut_en = VOP_REG(RK3066_SYS_CTRL1, 0x1, 31), + .data_blank = VOP_REG(RK3066_DSP_CTRL1, 0x1, 25), };static const struct vop_win_data rk3066_vop_win_data[] = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 50/266 net: stmmac: the XPCS obscures a potential "PHY not found" error
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 4751d2aa321f2828d8c5d2f7ce4ed18a01e47f46 ]
stmmac_mdio_register() has logic to search for PHYs on the MDIO bus and assign them IRQ lines, as well as to set priv->plat->phy_addr.
If no PHY is found, the "found" variable remains set to 0 and the function errors out.
After the introduction of commit f213bbe8a9d6 ("net: stmmac: Integrate it with DesignWare XPCS"), the "found" variable was immediately reused for searching for a PCS on the same MDIO bus.
This can result in 2 types of potential problems (none of them seems to be seen on the only Intel system that sets has_xpcs = true, otherwise it would have been reported):
1. If a PCS is found but a PHY is not, then the code happily exits with no error. One might say "yes, but this is not possible, because of_mdiobus_register will probe a PHY for all MDIO addresses, including for the XPCS, so if an XPCS exists, then a PHY certainly exists too". Well, that is not true, see intel_mgbe_common_data():
/* Ensure mdio bus scan skips intel serdes and pcs-xpcs */ plat->mdio_bus_data->phy_mask = 1 << INTEL_MGBE_ADHOC_ADDR; plat->mdio_bus_data->phy_mask |= 1 << INTEL_MGBE_XPCS_ADDR;
2. A PHY is found but an MDIO device with the XPCS PHY ID isn't, and in that case, the error message will be "No PHY found". Confusing.
--- .../net/ethernet/stmicro/stmmac/stmmac_mdio.c | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +15 -6
@@ -503,6 +503,12 @@ int stmmac_mdio_register(struct net_device *ndev) found =1 ; } +if (!found && !mdio_node) { +dev_warn (dev,"No PHY found\n" ); + err = -ENODEV ; + goto no_phy_found; + } +/* Try to probe the XPCS by scanning all addresses. */ if (priv->hw->xpcs) {struct mdio_xpcs_args *xpcs = &priv->hw->xpcs_args;
@@ -511,6 +517,7 @@ int stmmac_mdio_register(struct net_device *ndev) xpcs->bus = new_bus; + found =0 ;for (addr =0 ; addr < max_addr; addr++) { xpcs->addr = addr;
@@ -520,13 +527,12 @@ int stmmac_mdio_register(struct net_device *ndev)break ; } } - } -if (!found && !mdio_node) { -dev_warn (dev,"No PHY found\n" ); -mdiobus_unregister (new_bus); -mdiobus_free (new_bus); -return -ENODEV ; +if (!found && !mdio_node) { +dev_warn (dev,"No XPCS found\n" ); + err = -ENODEV ; + goto no_xpcs_found; + } } bus_register_done:
@@ -534,6 +540,9 @@ bus_register_done:return 0 ; +no_xpcs_found: +no_phy_found: +mdiobus_unregister (new_bus); bus_register_fail:mdiobus_free (new_bus);return err;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 52/266 drm/tegra: hub: Fix YUV support
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit e16efff4e5f490ce34a8c60d9ae7297dca5eb616 ]
The driver currently exposes several YUV formats but fails to properly program all the registers needed to display such formats. Add the right programming sequences so that overlay windows can be used to accelerate color format conversions in multimedia playback use-cases.
--- drivers/gpu/drm/tegra/dc.c | 2 +- drivers/gpu/drm/tegra/dc.h | 7 +++++ drivers/gpu/drm/tegra/hub.c | 52 +++++++++++++++++++++++++++++++---- drivers/gpu/drm/tegra/plane.c | 23 ++++++++++++++-- drivers/gpu/drm/tegra/plane.h | 3 +- 5 files changed, 78 insertions(+), 9 deletions(-)
drivers/gpu/drm/tegra/dc.c +1 -1
@@ -348,7 +348,7 @@ static void tegra_dc_setup_window(struct tegra_plane *plane,* For YUV planar modes, the number of bytes per pixel takes into * account only the luma component and therefore is 1. */ - yuv =tegra_plane_format_is_yuv (window->format, &planar); + yuv =tegra_plane_format_is_yuv (window->format, &planar,NULL );if (!yuv) bpp = window->bits_per_pixel /8 ;else
drivers/gpu/drm/tegra/dc.h +7 -0
@@ -696,6 +696,9 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc);#define DC_WINBUF_START_ADDR_HI 0x80d +#define DC_WINBUF_START_ADDR_HI_U 0x80f +#define DC_WINBUF_START_ADDR_HI_V 0x811 +#define DC_WINBUF_CDE_CONTROL 0x82f#define ENABLE_SURFACE (1 << 0)
@@ -720,6 +723,10 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc);#define DC_WIN_PLANAR_STORAGE 0x709#define PITCH (x) (((x) >> 6) & 0x1fff) +#define DC_WIN_PLANAR_STORAGE_UV 0x70a +#define PITCH_U (x) ((((x) >> 6) & 0x1fff) << 0) +#define PITCH_V (x) ((((x) >> 6) & 0x1fff) << 16) +#define DC_WIN_SET_PARAMS 0x70d#define CLAMP_BEFORE_BLEND (1 << 15)#define DEGAMMA_NONE (0 << 13)
drivers/gpu/drm/tegra/hub.c +47 -5
84 lines not on this page · raw message
drivers/gpu/drm/tegra/plane.c +21 -2
@@ -375,7 +375,20 @@ int tegra_plane_format(u32 fourcc, u32 *format, u32 *swap)return 0 ; } -bool tegra_plane_format_is_yuv (unsigned int format,bool *planar) +bool tegra_plane_format_is_indexed (unsigned int format) +{ +switch (format) { +case WIN_COLOR_DEPTH_P1 : +case WIN_COLOR_DEPTH_P2 : +case WIN_COLOR_DEPTH_P4 : +case WIN_COLOR_DEPTH_P8 : +return true; + } + +return false; +} + +bool tegra_plane_format_is_yuv (unsigned int format,bool *planar,unsigned int *bpc) {switch (format) {case WIN_COLOR_DEPTH_YCbCr422:
@@ -383,6 +396,9 @@ bool tegra_plane_format_is_yuv(unsigned int format, bool *planar)if (planar) *planar = false; +if (bpc) + *bpc =8 ; +return true;case WIN_COLOR_DEPTH_YCbCr420P:
@@ -396,6 +412,9 @@ bool tegra_plane_format_is_yuv(unsigned int format, bool *planar)if (planar) *planar = true; +if (bpc) + *bpc =8 ; +return true; }
@@ -421,7 +440,7 @@ static bool __drm_format_has_alpha(u32 format)static int tegra_plane_format_get_alpha (unsigned int opaque,unsigned int *alpha) { -if (tegra_plane_format_is_yuv (opaque,NULL )) { +if (tegra_plane_format_is_yuv (opaque,NULL ,NULL )) { *alpha = opaque;return 0 ; }
drivers/gpu/drm/tegra/plane.h +2 -1
@@ -74,7 +74,8 @@ int tegra_plane_state_add(struct tegra_plane *plane, struct drm_plane_state *state);int tegra_plane_format (u32 fourcc,u32 *format,u32 *swap); -bool tegra_plane_format_is_yuv (unsigned int format,bool *planar); +bool tegra_plane_format_is_indexed (unsigned int format); +bool tegra_plane_format_is_yuv (unsigned int format,bool *planar,unsigned int *bpc);int tegra_plane_setup_legacy_state (struct tegra_plane *tegra,struct tegra_plane_state *state);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 54/266 clk: tegra: Ensure that PLLU configuration is applied properly
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit a7196048cd5168096c2c4f44a3939d7a6dcd06b9 ]
The PLLU (USB) consists of the PLL configuration itself and configuration of the PLLU outputs. The PLLU programming is inconsistent on T30 vs T114, where T114 immediately bails out if PLLU is enabled and T30 re-enables a potentially already enabled PLL (left after bootloader) and then fully reprograms it, which could be unsafe to do. The correct way should be to skip enabling of the PLL if it's already enabled and then apply configuration to the outputs. This patch doesn't fix any known problems, it's a minor improvement.
--- drivers/clk/tegra/clk-pll.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/clk/tegra/clk-pll.c +4 -5
@@ -1131,7 +1131,8 @@ static int clk_pllu_enable(struct clk_hw *hw)if (pll->lock)spin_lock_irqsave (pll->lock, flags); -_clk_pll_enable (hw); +if (!clk_pll_is_enabled (hw)) +_clk_pll_enable (hw); ret =clk_pll_wait_for_lock (pll);if (ret <0 )
@@ -1748,15 +1749,13 @@ static int clk_pllu_tegra114_enable(struct clk_hw *hw)return -EINVAL ; } -if (clk_pll_is_enabled (hw)) -return 0 ; - input_rate =clk_hw_get_rate (__clk_get_hw (osc));if (pll->lock)spin_lock_irqsave (pll->lock, flags); -_clk_pll_enable (hw); +if (!clk_pll_is_enabled (hw)) +_clk_pll_enable (hw); ret =clk_pll_wait_for_lock (pll);if (ret <0 )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 53/266 clk: tegra: Fix refcounting of gate clocks
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit c592c8a28f5821e880ac6675781cd8a151b0737c ]
The refcounting of the gate clocks has a bug causing the enable_refcnt to underflow when unused clocks are disabled. This happens because clk provider erroneously bumps the refcount if clock is enabled at a boot time, which it shouldn't be doing, and it does this only for the gate clocks, while peripheral clocks are using the same gate ops and the peripheral clocks are missing the initial bump. Hence the refcount of the peripheral clocks is 0 when unused clocks are disabled and then the counter is decremented further by the gate ops, causing the integer underflow.
Fix this problem by removing the erroneous bump and by implementing the disable_unused() callback, which disables the unused gates properly.
The visible effect of the bug is such that the unused clocks are never gated if a loaded kernel module grabs the unused clocks and starts to use them. In practice this shouldn't cause any real problems for the drivers and boards supported by the kernel today.
--- drivers/clk/tegra/clk-periph-gate.c | 72 +++++++++++++++++++---------- drivers/clk/tegra/clk-periph.c | 11 +++++ 2 files changed, 58 insertions(+), 25 deletions(-)
drivers/clk/tegra/clk-periph-gate.c +47 -25
@@ -48,18 +48,9 @@ static int clk_periph_is_enabled(struct clk_hw *hw)return state; } -static int clk_periph_enable (struct clk_hw *hw) +static void clk_periph_enable_locked (struct clk_hw *hw) {struct tegra_clk_periph_gate *gate =to_clk_periph_gate (hw); -unsigned long flags =0 ; - -spin_lock_irqsave (&periph_ref_lock, flags); - - gate->enable_refcnt[gate->clk_num]++; -if (gate->enable_refcnt[gate->clk_num] >1 ) { -spin_unlock_irqrestore (&periph_ref_lock, flags); -return 0 ; - }write_enb_set (periph_clk_to_bit (gate), gate);udelay (2 );
@@ -78,6 +69,32 @@ static int clk_periph_enable(struct clk_hw *hw)udelay (1 );writel_relaxed (0 , gate->clk_base +LVL2_CLK_GATE_OVRE ); } +} + +static void clk_periph_disable_locked (struct clk_hw *hw) +{ +struct tegra_clk_periph_gate *gate =to_clk_periph_gate (hw); + +/* +* If peripheral is in the APB bus then read the APB bus to +* flush the write operation in apb bus. This will avoid the +* peripheral access after disabling clock +*/ +if (gate->flags &TEGRA_PERIPH_ON_APB ) +tegra_read_chipid (); + +write_enb_clr (periph_clk_to_bit (gate), gate); +} + +static int clk_periph_enable (struct clk_hw *hw) +{ +struct tegra_clk_periph_gate *gate =to_clk_periph_gate (hw); +unsigned long flags =0 ; + +spin_lock_irqsave (&periph_ref_lock, flags); + +if (!gate->enable_refcnt[gate->clk_num]++) +clk_periph_enable_locked (hw);spin_unlock_irqrestore (&periph_ref_lock, flags);
@@ -91,21 +108,28 @@ static void clk_periph_disable(struct clk_hw *hw)spin_lock_irqsave (&periph_ref_lock, flags); - gate->enable_refcnt[gate->clk_num]--; -if (gate->enable_refcnt[gate->clk_num] >0 ) { -spin_unlock_irqrestore (&periph_ref_lock, flags); -return ; - } +WARN_ON (!gate->enable_refcnt[gate->clk_num]); + +if (--gate->enable_refcnt[gate->clk_num] ==0 ) +clk_periph_disable_locked (hw); + +spin_unlock_irqrestore (&periph_ref_lock, flags); +} + +static void clk_periph_disable_unused (struct clk_hw *hw) +{ +struct tegra_clk_periph_gate *gate =to_clk_periph_gate (hw); +unsigned long flags =0 ; + +spin_lock_irqsave (&periph_ref_lock, flags);/* -* If peripheral is in the APB bus then read the APB bus to -* flush the write operation in apb bus. This will avoid the -* peripheral access after disabling clock +* Some clocks are duplicated and some of them are marked as critical, +* like fuse and fuse_burn for example, thus the enable_refcnt will +* be non-zero here if the "unused" duplicate is disabled by CCF. */ -if (gate->flags &TEGRA_PERIPH_ON_APB ) -tegra_read_chipid (); - -write_enb_clr (periph_clk_to_bit (gate), gate); +if (!gate->enable_refcnt[gate->clk_num]) +clk_periph_disable_locked (hw);spin_unlock_irqrestore (&periph_ref_lock, flags); }
@@ -114,6 +138,7 @@ const struct clk_ops tegra_clk_periph_gate_ops = { .is_enabled = clk_periph_is_enabled, .enable = clk_periph_enable, .disable = clk_periph_disable, + .disable_unused = clk_periph_disable_unused, }; struct clk *tegra_clk_register_periph_gate(const char *name,
@@ -148,9 +173,6 @@ struct clk *tegra_clk_register_periph_gate(const char *name, gate->enable_refcnt = enable_refcnt; gate->regs = pregs; -if (read_enb (gate) &periph_clk_to_bit (gate)) - enable_refcnt[clk_num]++; -/* Data in .init is copied by clk_register(), so stack variable OK */ gate->hw.init = &init;
drivers/clk/tegra/clk-periph.c +11 -0
@@ -100,6 +100,15 @@ static void clk_periph_disable(struct clk_hw *hw) gate_ops->disable (gate_hw); } +static void clk_periph_disable_unused (struct clk_hw *hw) +{ +struct tegra_clk_periph *periph =to_clk_periph (hw); +const struct clk_ops *gate_ops = periph->gate_ops; +struct clk_hw *gate_hw = &periph->gate.hw; + + gate_ops->disable_unused (gate_hw); +} +static void clk_periph_restore_context (struct clk_hw *hw) {struct tegra_clk_periph *periph =to_clk_periph (hw);
@@ -126,6 +135,7 @@ const struct clk_ops tegra_clk_periph_ops = { .is_enabled = clk_periph_is_enabled, .enable = clk_periph_enable, .disable = clk_periph_disable, + .disable_unused = clk_periph_disable_unused, .restore_context = clk_periph_restore_context, };
@@ -135,6 +145,7 @@ static const struct clk_ops tegra_clk_periph_nodiv_ops = { .is_enabled = clk_periph_is_enabled, .enable = clk_periph_enable, .disable = clk_periph_disable, + .disable_unused = clk_periph_disable_unused, .restore_context = clk_periph_restore_context, };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 28/266 net: mdio: provide shim implementation of devm_of_mdiobus_register
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 86544c3de6a2185409c5a3d02f674ea223a14217 ]
Similar to the way in which of_mdiobus_register() has a fallback to the non-DT based mdiobus_register() when CONFIG_OF is not set, we can create a shim for the device-managed devm_of_mdiobus_register() which calls devm_mdiobus_register() and discards the struct device_node *.
In particular, this solves a build issue with the qca8k DSA driver which uses devm_of_mdiobus_register and can be compiled without CONFIG_OF.
--- include/linux/of_mdio.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/linux/of_mdio.h +7 -0
@@ -72,6 +72,13 @@ static inline int of_mdiobus_register(struct mii_bus *mdio, struct device_node *return mdiobus_register (mdio); } +static inline int devm_of_mdiobus_register (struct device *dev, +struct mii_bus *mdio, +struct device_node *np) +{ +return devm_mdiobus_register (dev, mdio); +} +static inline struct mdio_device *of_mdio_find_device (struct device_node *np) {return NULL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 55/266 drm: bridge: cdns-mhdp8546: Fix PM reference leak in
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit f674555ee5444c8987dfea0922f1cf6bf0c12847 ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +2 -2
@@ -2369,9 +2369,9 @@ static int cdns_mhdp_probe(struct platform_device *pdev)clk_prepare_enable (clk);pm_runtime_enable (dev); - ret =pm_runtime_get_sync (dev); + ret =pm_runtime_resume_and_get (dev);if (ret <0 ) { -dev_err (dev,"pm_runtime_get_sync failed\n" ); +dev_err (dev,"pm_runtime_resume_and_get failed\n" );pm_runtime_disable (dev); goto clk_disable; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 56/266 virtio-net: Add validation for used length
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
[ Upstream commit ad993a95c508417acdeb15244109e009e50d8758 ]
This adds validation for used length (might come from an untrusted device) to avoid data corruption or loss.
--- drivers/net/virtio_net.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/net/virtio_net.c +13 -7
@@ -721,6 +721,12 @@ static struct sk_buff *receive_small(struct net_device *dev, len -= vi->hdr_len; stats->bytes += len; +if (unlikely (len >GOOD_PACKET_LEN )) { +pr_debug ("%s: rx error: len %u exceeds max size %d\n" , + dev->name, len,GOOD_PACKET_LEN ); + dev->stats.rx_length_errors++; + goto err_len; + }rcu_read_lock (); xdp_prog =rcu_dereference (rq->xdp_prog);if (xdp_prog) {
@@ -824,6 +830,7 @@ err: err_xdp:rcu_read_unlock (); stats->xdp_drops++; +err_len: stats->drops++;put_page (page); xdp_xmit:
@@ -877,6 +884,12 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, head_skb =NULL ; stats->bytes += len - vi->hdr_len; +if (unlikely (len > truesize)) { +pr_debug ("%s: rx error: len %u exceeds truesize %lu\n" , + dev->name, len, (unsigned long )ctx); + dev->stats.rx_length_errors++; + goto err_skb; + }rcu_read_lock (); xdp_prog =rcu_dereference (rq->xdp_prog);if (xdp_prog) {
@@ -1004,13 +1017,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, }rcu_read_unlock (); -if (unlikely (len > truesize)) { -pr_debug ("%s: rx error: len %u exceeds truesize %lu\n" , - dev->name, len, (unsigned long )ctx); - dev->stats.rx_length_errors++; - goto err_skb; - } - head_skb =page_to_skb (vi, rq, page, offset, len, truesize, !xdp_prog, metasize, headroom); curr_skb = head_skb;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 57/266 ipv6: use prandom_u32() for ID generation
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
[ Upstream commit 62f20e068ccc50d6ab66fdb72ba90da2b9418c99 ]
This is a complement to commit aa6dd211e4b1 ("inet: use bigger hash table for IP ID generation"), but focusing on some specific aspects of IPv6.
Contary to IPv4, IPv6 only uses packet IDs with fragments, and with a minimum MTU of 1280, it's much less easy to force a remote peer to produce many fragments to explore its ID sequence. In addition packet IDs are 32-bit in IPv6, which further complicates their analysis. On the other hand, it is often easier to choose among plenty of possible source addresses and partially work around the bigger hash table the commit above permits, which leaves IPv6 partially exposed to some possibilities of remote analysis at the risk of weakening some protocols like DNS if some IDs can be predicted with a good enough probability.
Given the wide range of permitted IDs, the risk of collision is extremely low so there's no need to rely on the positive increment algorithm that is shared with the IPv4 code via ip_idents_reserve(). We have a fast PRNG, so let's simply call prandom_u32() and be done with it.
Performance measurements at 10 Gbps couldn't show any difference with the previous code, even when using a single core, because due to the large fragments, we're limited to only ~930 kpps at 10 Gbps and the cost of the random generation is completely offset by other operations and by the network transfer time. In addition, this change removes the need to update a shared entry in the idents table so it may even end up being slightly faster on large scale systems where this matters.
The risk of at least one collision here is about 1/80 million among 10 IDs, 1/850k among 100 IDs, and still only 1/8.5k among 1000 IDs, which remains very low compared to IPv4 where all IDs are reused every 4 to 80ms on a 10 Gbps flow depending on packet sizes.
--- net/ipv6/output_core.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-)
net/ipv6/output_core.c +5 -23
@@ -15,29 +15,11 @@ static u32 __ipv6_select_ident(struct net *net,const struct in6_addr *dst, const struct in6_addr *src) { -const struct { -struct in6_addr dst; -struct in6_addr src; - }__aligned(SIPHASH_ALIGNMENT) combined = { - .dst = *dst, - .src = *src, - }; -u32 hash, id; - -/* Note the following code is not safe, but this is okay. */ -if (unlikely (siphash_key_is_zero (&net->ipv4.ip_id_key))) -get_random_bytes (&net->ipv4.ip_id_key, -sizeof (net->ipv4.ip_id_key)); - - hash =siphash (&combined,sizeof (combined), &net->ipv4.ip_id_key); - -/* Treat id of 0 as unset and if we get 0 back from ip_idents_reserve, -* set the hight order instead thus minimizing possible future -* collisions. -*/ - id =ip_idents_reserve (hash,1 ); -if (unlikely (!id)) - id =1 <<31 ; + u32 id; + +do { + id =prandom_u32 (); + }while (!id);return id; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 60/266 drm/amdgpu: fix metadata_size for ubo ioctl queries
In reply to Greg Kroah-HartmanFrom: Shiwu Zhang <[email protected]>
[ Upstream commit eba98523724be7ad3539f2c975de1527e0c99dd6 ]
Although the kfd_ioctl_get_dmabuf_info() still fail it will indicate the caller right metadat_size useful for the same kfd ioctl next time.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +3 -2
@@ -1246,6 +1246,9 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,BUG_ON (bo->tbo.type == ttm_bo_type_kernel); ubo =to_amdgpu_bo_user (bo); +if (metadata_size) + *metadata_size = ubo->metadata_size; +if (buffer) {if (buffer_size < ubo->metadata_size)return -EINVAL ;
@@ -1254,8 +1257,6 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,memcpy (buffer, ubo->metadata, ubo->metadata_size); } -if (metadata_size) - *metadata_size = ubo->metadata_size;if (flags) *flags = ubo->metadata_flags;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 62/266 drm/amd/display: Avoid HDCP over-read and corruption
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 06888d571b513cbfc0b41949948def6cb81021b2 ]
Instead of reading the desired 5 bytes of the actual target field, the code was reading 8. This could result in a corrupted value if the trailing 3 bytes were non-zero, so instead use an appropriately sized and zero-initialized bounce buffer, and read only 5 bytes before casting to u64.
--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c +3 -1
@@ -29,8 +29,10 @@ static inline enum mod_hdcp_status validate_bksv(struct mod_hdcp *hdcp) {uint64_t n =0 ;uint8_t count =0 ; +u8 bksv[sizeof (n)] = { }; -memcpy (&n, hdcp->auth.msg.hdcp1.bksv,sizeof (uint64_t )); +memcpy (bksv, hdcp->auth.msg.hdcp1.bksv,sizeof (hdcp->auth.msg.hdcp1.bksv)); + n = *(uint64_t *)bksv;while (n) { count++;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 59/266 MIPS: ingenic: Select CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit eb3849370ae32b571e1f9a63ba52c61adeaf88f7 ]
The clock driving the XBurst CPUs in Ingenic SoCs is integer divided from the main PLL. As such, it is possible to control the frequency of the CPU, either by changing the divider, or by changing the rate of the main PLL.
The XBurst CPUs also lack the CP0 timer; the TCU, a separate piece of hardware in the SoC, provides this functionality.
--- arch/mips/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/mips/Kconfig +2 -0
@@ -428,6 +428,8 @@ config MACH_INGENIC_SOC select MIPS_GENERIC select MACH_INGENIC select SYS_SUPPORTS_ZBOOT_UART16550 + select CPU_SUPPORTS_CPUFREQ + select MIPS_EXTERNAL_TIMER config LANTIQ bool "Lantiq based platforms"
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 58/266 MIPS: cpu-probe: Fix FPU detection on Ingenic JZ4760(B)
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit fc52f92a653215fbd6bc522ac5311857b335e589 ]
Ingenic JZ4760 and JZ4760B do have a FPU, but the config registers don't report it. Force the FPU detection in case the processor ID match the JZ4760(B) one.
--- arch/mips/kernel/cpu-probe.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/mips/kernel/cpu-probe.c +5 -0
@@ -1840,6 +1840,11 @@ static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu)*/ case PRID_COMP_INGENIC_D0 : c->isa_level &= ~MIPS_CPU_ISA_M32R2 ; + +/* FPU is not properly detected on JZ4760(B). */ +if (c->processor_id ==0x2ed0024f ) + c->options |=MIPS_CPU_FPU ; + fallthrough;/*
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 63/266 drm/amdgpu: remove unsafe optimization to drop preamble ib
In reply to Greg Kroah-HartmanFrom: Jiansong Chen <[email protected]>
[ Upstream commit 7d9c70d23550eb86a1bec1954ccaa8d6ec3a3328 ]
Take the situation with gfxoff, the optimization may cause corrupt CE ram contents. In addition emit_cntxcntl callback has similar optimization which firmware can handle properly even for power feature.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +1 -10
@@ -130,7 +130,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,struct amdgpu_device *adev = ring->adev;struct amdgpu_ib *ib = &ibs[0 ];struct dma_fence *tmp =NULL ; -bool skip_preamble, need_ctx_switch; +bool need_ctx_switch;unsigned patch_offset = ~0 ;struct amdgpu_vm *vm;uint64_t fence_ctx;
@@ -227,7 +227,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,if (need_ctx_switch) status |=AMDGPU_HAVE_CTX_SWITCH ; - skip_preamble = ring->current_ctx == fence_ctx;if (job && ring->funcs->emit_cntxcntl) { status |= job->preamble_status; status |= job->preemption_status;
@@ -245,14 +244,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,for (i =0 ; i < num_ibs; ++i) { ib = &ibs[i]; -/* drop preamble IBs if we don't have a context switch */ -if ((ib->flags &AMDGPU_IB_FLAG_PREAMBLE ) && - skip_preamble && - !(status &AMDGPU_PREAMBLE_IB_PRESENT_FIRST ) && - !amdgpu_mcbp && - !amdgpu_sriov_vf (adev))/* for SRIOV preemption, Preamble CE ib must be inserted anyway */ -continue ; -if (job && ring->funcs->emit_frame_cntl) {if (secure != !!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) {amdgpu_ring_emit_frame_cntl (ring, false, secure);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 61/266 drm/amdgpu: fix sdma firmware version error in sriov
In reply to Greg Kroah-HartmanFrom: Kevin Wang <[email protected]>
[ Upstream commit 2b8f731849800e3948763ccaff31cceac526789b ]
Re-adjust the function return order to avoid empty sdma version in the sriov environment. (read amdgpu_firmware_info)
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +3 -3
@@ -145,9 +145,6 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev)struct amdgpu_firmware_info *info =NULL ;const struct common_firmware_header *header =NULL ; -if (amdgpu_sriov_vf (adev) && (adev->asic_type ==CHIP_SIENNA_CICHLID )) -return 0 ; -DRM_DEBUG ("\n" );switch (adev->asic_type) {
@@ -182,6 +179,9 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev) (void *)&adev->sdma.instance[0 ], sizeof(struct amdgpu_sdma_instance)); +if (amdgpu_sriov_vf (adev) && (adev->asic_type ==CHIP_SIENNA_CICHLID )) +return 0 ; +DRM_DEBUG ("psp_load == '%s'\n" , adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ?"true" :"false" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 64/266 clk: tegra: tegra124-emc: Fix clock imbalance in emc_set_timing()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f13570e7e830ca4fbf4869015af8492b8918445e ]
After calling clk_prepare_enable(), clk_disable_unprepare() needs be called when prepare_timing_change() failed.
--- drivers/clk/tegra/clk-tegra124-emc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra124-emc.c +3 -1
@@ -249,8 +249,10 @@ static int emc_set_timing(struct tegra_clk_emc *tegra, div = timing->parent_rate / (timing->rate /2 ) -2 ; err = tegra->prepare_timing_change (emc, timing->rate); -if (err) +if (err) { +clk_disable_unprepare (timing->parent);return err; + }spin_lock_irqsave (tegra->lock, flags);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 29/266 net/sched: cls_api: increase max_reclassify_loop
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit 05ff8435e50569a0a6b95e5ceaea43696e8827ab ]
modern userspace applications, like OVN, can configure the TC datapath to "recirculate" packets several times. If more than 4 "recirculation" rules are configured, packets can be dropped by __tcf_classify(). Changing the maximum number of reclassifications (from 4 to 16) should be sufficient to prevent drops in most use cases, and guard against loops at the same time.
--- net/sched/cls_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/cls_api.c +1 -1
@@ -1531,7 +1531,7 @@ static inline int __tcf_classify(struct sk_buff *skb, u32 *last_executed_chain) {#ifdef CONFIG_NET_CLS_ACT -const int max_reclassify_loop =4 ; +const int max_reclassify_loop =16 ;const struct tcf_proto *first_tp;int limit =0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 65/266 net: tcp better handling of reordering then loss cases
In reply to Greg Kroah-HartmanFrom: Yuchung Cheng <[email protected]>
[ Upstream commit a29cb6914681a55667436a9eb7a42e28da8cf387 ]
This patch aims to improve the situation when reordering and loss are ocurring in the same flight of packets.
Previously the reordering would first induce a spurious recovery, then the subsequent ACK may undo the cwnd (based on the timestamps e.g.). However the current loss recovery does not proceed to invoke RACK to install a reordering timer. If some packets are also lost, this may lead to a long RTO-based recovery. An example is
https://groups.google.com/g/bbr-dev/c/OFHADvJbTEI
The solution is to after reverting the recovery, always invoke RACK to either mount the RACK timer to fast retransmit after the reordering window, or restarts the recovery if new loss is identified. Hence it is possible the sender may go from Recovery to Disorder/Open to Recovery again in one ACK.
--- net/ipv4/tcp_input.c | 45 +++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-)
net/ipv4/tcp_input.c +26 -19
@@ -2816,8 +2816,17 @@ static void tcp_process_loss(struct sock *sk, int flag, int num_dupack, *rexmit =REXMIT_LOST ; } +static bool tcp_force_fast_retransmit (struct sock *sk) +{ +struct tcp_sock *tp =tcp_sk (sk); + +return after (tcp_highest_sack_seq (tp), + tp->snd_una + tp->reordering * tp->mss_cache); +} +/* Undo during fast recovery after partial ACK. */ -static bool tcp_try_undo_partial (struct sock *sk,u32 prior_snd_una) +static bool tcp_try_undo_partial (struct sock *sk,u32 prior_snd_una, +bool *do_lost) {struct tcp_sock *tp =tcp_sk (sk);
@@ -2842,7 +2851,9 @@ static bool tcp_try_undo_partial(struct sock *sk, u32 prior_snd_una)tcp_undo_cwnd_reduction (sk, true);NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPPARTIALUNDO );tcp_try_keep_open (sk); -return true; + }else { +/* Partial ACK arrived. Force fast retransmit. */ + *do_lost =tcp_force_fast_retransmit (sk); }return false; }
@@ -2866,14 +2877,6 @@ static void tcp_identify_packet_loss(struct sock *sk, int *ack_flag) } } -static bool tcp_force_fast_retransmit (struct sock *sk) -{ -struct tcp_sock *tp =tcp_sk (sk); - -return after (tcp_highest_sack_seq (tp), - tp->snd_una + tp->reordering * tp->mss_cache); -} -/* Process an event, which can update packets-in-flight not trivially. * Main goal of this function is to calculate new estimate for left_out, * taking into account both packets sitting in receiver's buffer and
@@ -2943,17 +2946,21 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,if (!(flag &FLAG_SND_UNA_ADVANCED )) {if (tcp_is_reno (tp))tcp_add_reno_sack (sk, num_dupack, ece_ack); - }else { -if (tcp_try_undo_partial (sk, prior_snd_una)) -return ; -/* Partial ACK arrived. Force fast retransmit. */ - do_lost =tcp_force_fast_retransmit (sk); - } -if (tcp_try_undo_dsack (sk)) { -tcp_try_keep_open (sk); + }else if (tcp_try_undo_partial (sk, prior_snd_una, &do_lost))return ; - } + +if (tcp_try_undo_dsack (sk)) +tcp_try_keep_open (sk); +tcp_identify_packet_loss (sk, ack_flag); +if (icsk->icsk_ca_state != TCP_CA_Recovery) { +if (!tcp_time_to_recover (sk, flag)) +return ; +/* Undo reverts the recovery state. If loss is evident, +* starts a new recovery (e.g. reordering then loss); +*/ +tcp_enter_recovery (sk, ece_ack); + }break ;case TCP_CA_Loss:tcp_process_loss (sk, flag, num_dupack, rexmit);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 32/266 drm/scheduler: Fix hang when sched_entity released
In reply to Greg Kroah-HartmanFrom: Andrey Grodzovsky <[email protected]>
[ Upstream commit c61cdbdbffc169dc7f1e6fe94dfffaf574fe672a ]
Problem: If scheduler is already stopped by the time sched_entity is released and entity's job_queue not empty I encountred
a hang in drm_sched_entity_flush. This is because drm_sched_entity_is_idle never becomes false.
Fix: In drm_sched_fini detach all sched_entities from the scheduler's run queues. This will satisfy drm_sched_entity_is_idle. Also wakeup all those processes stuck in sched_entity flushing as the scheduler main thread which wakes them up is stopped by now.
v2:
Reverse order of drm_sched_rq_remove_entity and marking s_entity as stopped to prevent reinserion back to rq due to race.
v3:
Drop drm_sched_rq_remove_entity, only modify entity->stopped and check for it in drm_sched_entity_is_idle
--- drivers/gpu/drm/scheduler/sched_entity.c | 3 ++- drivers/gpu/drm/scheduler/sched_main.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-)
drivers/gpu/drm/scheduler/sched_entity.c +2 -1
@@ -116,7 +116,8 @@ static bool drm_sched_entity_is_idle(struct drm_sched_entity *entity)rmb ();/* for list_empty to work without lock */ if (list_empty (&entity->list) || -spsc_queue_count (&entity->job_queue) ==0 ) +spsc_queue_count (&entity->job_queue) ==0 || + entity->stopped)return true;return false;
drivers/gpu/drm/scheduler/sched_main.c +24 -0
@@ -888,9 +888,33 @@ EXPORT_SYMBOL(drm_sched_init);*/ void drm_sched_fini (struct drm_gpu_scheduler *sched) { +struct drm_sched_entity *s_entity; +int i; +if (sched->thread)kthread_stop (sched->thread); +for (i =DRM_SCHED_PRIORITY_COUNT -1 ; i >=DRM_SCHED_PRIORITY_MIN ; i--) { +struct drm_sched_rq *rq = &sched->sched_rq[i]; + +if (!rq) +continue ; + +spin_lock (&rq->lock); +list_for_each_entry (s_entity, &rq->entities, list) +/* +* Prevents reinsertion and marks job_queue as idle, +* it will removed from rq in drm_sched_entity_fini +* eventually +*/ + s_entity->stopped = true; +spin_unlock (&rq->lock); + + } + +/* Wakeup everyone stuck in drm_sched_entity_flush for this scheduler */ +wake_up_all (&sched->job_scheduled); +/* Confirm no work left behind accessing device structures */ cancel_delayed_work_sync (&sched->work_tdr);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 66/266 icmp: fix lib conflict with trinity
In reply to Greg Kroah-HartmanFrom: Andreas Roeseler <[email protected]>
[ Upstream commit e32ea44c7ae476f4c90e35ab0a29dc8ff082bc11 ]
Including <linux/in.h> and <netinet/in.h> in the dependencies breaks compilation of trinity due to multiple definitions. <linux/in.h> is only used in <linux/icmp.h> to provide the definition of the struct in_addr, but this can be substituted out by using the datatype __be32.
--- include/uapi/linux/icmp.h | 3 +-- net/ipv4/icmp.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
include/uapi/linux/icmp.h +1 -2
@@ -20,7 +20,6 @@#include <linux/types.h> #include <asm/byteorder.h> -#include <linux/in.h> #include <linux/if.h> #include <linux/in6.h>
@@ -154,7 +153,7 @@ struct icmp_ext_echo_iio {struct {struct icmp_ext_echo_ctype3_hdr ctype3_hdr;union { -struct in_addr ipv4_addr; +__be32 ipv4_addr;struct in6_addr ipv6_addr; } ip_addr; } addr;
net/ipv4/icmp.c +1 -1
@@ -1066,7 +1066,7 @@ static bool icmp_echo(struct sk_buff *skb)if (ident_len !=sizeof (iio->ident.addr.ctype3_hdr) +sizeof (struct in_addr )) goto send_mal_query; - dev =ip_dev_find (net, iio->ident.addr.ip_addr.ipv4_addr.s_addr); + dev =ip_dev_find (net, iio->ident.addr.ip_addr.ipv4_addr);break ;#if IS_ENABLED (CONFIG_IPV6 )case ICMP_AFI_IP6 :
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 67/266 RDMA/cxgb4: Fix missing error code in create_qp()
In reply to Greg Kroah-HartmanFrom: Jiapeng Chong <[email protected]>
[ Upstream commit aeb27bb76ad8197eb47890b1ff470d5faf8ec9a5 ]
The error code is missing in this code scenario so 0 will be returned. Add the error code '-EINVAL' to the return value 'ret'.
Eliminates the follow smatch warning:
drivers/infiniband/hw/cxgb4/qp.c:298 create_qp() warn: missing error code 'ret'.
--- drivers/infiniband/hw/cxgb4/qp.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/cxgb4/qp.c +1 -0
@@ -295,6 +295,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,if (user && (!wq->sq.bar2_pa || (need_rq && !wq->rq.bar2_pa))) {pr_warn ("%s: sqid %u or rqid %u not in BAR2 range\n" ,pci_name (rdev->lldi.pdev), wq->sq.qid, wq->rq.qid); + ret = -EINVAL ; goto free_dma; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 68/266 dm space maps: dont reset space map allocation cursor when committing
In reply to Greg Kroah-HartmanFrom: Joe Thornber <[email protected]>
[ Upstream commit 5faafc77f7de69147d1e818026b9a0cbf036a7b2 ]
Current commit code resets the place where the search for free blocks will begin back to the start of the metadata device. There are a couple of repercussions to this:
- The first allocation after the commit is likely to take longer than normal as it searches for a free block in an area that is likely to have very few free blocks (if any).
- Any free blocks it finds will have been recently freed. Reusing them means we have fewer old copies of the metadata to aid recovery from hardware error.
Fix these issues by leaving the cursor alone, only resetting when the search hits the end of the metadata device.
--- drivers/md/persistent-data/dm-space-map-disk.c | 9 ++++++++- drivers/md/persistent-data/dm-space-map-metadata.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-)
drivers/md/persistent-data/dm-space-map-disk.c +8 -1
@@ -171,6 +171,14 @@ static int sm_disk_new_block(struct dm_space_map *sm, dm_block_t *b)* Any block we allocate has to be free in both the old and current ll. */ r =sm_ll_find_common_free_block (&smd->old_ll, &smd->ll, smd->begin, smd->ll.nr_blocks, b); +if (r == -ENOSPC ) { +/* +* There's no free block between smd->begin and the end of the metadata device. +* We search before smd->begin in case something has been freed. +*/ + r =sm_ll_find_common_free_block (&smd->old_ll, &smd->ll,0 , smd->begin, b); + } +if (r)return r;
@@ -194,7 +202,6 @@ static int sm_disk_commit(struct dm_space_map *sm)return r;memcpy (&smd->old_ll, &smd->ll,sizeof (smd->old_ll)); - smd->begin =0 ; smd->nr_allocated_this_transaction =0 ;return 0 ;
drivers/md/persistent-data/dm-space-map-metadata.c +8 -1
@@ -452,6 +452,14 @@ static int sm_metadata_new_block_(struct dm_space_map *sm, dm_block_t *b)* Any block we allocate has to be free in both the old and current ll. */ r =sm_ll_find_common_free_block (&smm->old_ll, &smm->ll, smm->begin, smm->ll.nr_blocks, b); +if (r == -ENOSPC ) { +/* +* There's no free block between smm->begin and the end of the metadata device. +* We search before smm->begin in case something has been freed. +*/ + r =sm_ll_find_common_free_block (&smm->old_ll, &smm->ll,0 , smm->begin, b); + } +if (r)return r;
@@ -503,7 +511,6 @@ static int sm_metadata_commit(struct dm_space_map *sm)return r;memcpy (&smm->old_ll, &smm->ll,sizeof (smm->old_ll)); - smm->begin =0 ; smm->allocated_this_transaction =0 ;return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 30/266 net: ethernet: ixp4xx: Fix return value check in ixp4xx_eth_probe()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit 20e76d3d044d936998617f8acd7e77bebd9ca703 ]
In case of error, the function mdiobus_get_phy() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test.
--- drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/xscale/ixp4xx_eth.c +2 -2
@@ -1531,8 +1531,8 @@ static int ixp4xx_eth_probe(struct platform_device *pdev) phydev =of_phy_get_and_connect (ndev, np, ixp4xx_adjust_link); }else { phydev =mdiobus_get_phy (mdio_bus, plat->phy); -if (IS_ERR (phydev)) { - err =PTR_ERR (phydev); +if (!phydev) { + err = -ENODEV ;dev_err (dev,"could not connect phydev (%d)\n" , err); goto err_free_mem; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 31/266 pinctrl: equilibrium: Add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Bixuan Cui <[email protected]>
[ Upstream commit d7f444499d6faf9a6ae3b27ec094109528d2b9a7 ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/pinctrl/pinctrl-equilibrium.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/pinctrl-equilibrium.c +1 -0
@@ -939,6 +939,7 @@ static const struct of_device_id eqbr_pinctrl_dt_match[] = { { .compatible = "intel,lgm-io" }, {} }; +MODULE_DEVICE_TABLE (of, eqbr_pinctrl_dt_match);static struct platform_driver eqbr_pinctrl_driver = { .probe = eqbr_pinctrl_probe,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 33/266 drm/sched: Avoid data corruptions
In reply to Greg Kroah-HartmanFrom: Andrey Grodzovsky <[email protected]>
[ Upstream commit 0b10ab80695d61422337ede6ff496552d8ace99d ]
Wait for all dependencies of a job to complete before killing it to avoid data corruptions.
--- drivers/gpu/drm/scheduler/sched_entity.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/scheduler/sched_entity.c +5 -0
@@ -222,11 +222,16 @@ static void drm_sched_entity_kill_jobs_cb(struct dma_fence *f,static void drm_sched_entity_kill_jobs (struct drm_sched_entity *entity) {struct drm_sched_job *job; +struct dma_fence *f;int r;while ((job =to_drm_sched_job (spsc_queue_pop (&entity->job_queue)))) {struct drm_sched_fence *s_fence = job->s_fence; +/* Wait for all dependencies to avoid data corruptions */ +while ((f = job->sched->ops->dependency (job, entity))) +dma_fence_wait (f, false); +drm_sched_fence_scheduled (s_fence);dma_fence_set_error (&s_fence->finished, -ESRCH );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 34/266 udf: Fix NULL pointer dereference in udf_symlink function
In reply to Greg Kroah-HartmanFrom: Arturo Giusti <[email protected]>
[ Upstream commit fa236c2b2d4436d9f19ee4e5d5924e90ffd7bb43 ]
In function udf_symlink, epos.bh is assigned with the value returned by udf_tgetblk. The function udf_tgetblk is defined in udf/misc.c and returns the value of sb_getblk function that could be NULL. Then, epos.bh is used without any check, causing a possible NULL pointer dereference when sb_getblk fails.
This fix adds a check to validate the value of epos.bh.
--- fs/udf/namei.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/udf/namei.c +4 -0
@@ -934,6 +934,10 @@ static int udf_symlink(struct user_namespace *mnt_userns, struct inode *dir, iinfo->i_location.partitionReferenceNum, 0); epos.bh =udf_tgetblk (sb, block); +if (unlikely (!epos.bh)) { + err = -ENOMEM ; + goto out_no_entry; + }lock_buffer (epos.bh);memset (epos.bh->b_data,0x00 , bsize);set_buffer_uptodate (epos.bh);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 25/266 drm/bridge: lt9611: Add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 8d0b1fe81e18eb66a2d4406386760795fe0d77d9 ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/lontium-lt9611.c +1 -0
@@ -1215,6 +1215,7 @@ static struct i2c_device_id lt9611_id[] = { { "lontium,lt9611", 0 }, {} }; +MODULE_DEVICE_TABLE (i2c, lt9611_id);static const struct of_device_id lt9611_match_table[] = { { .compatible = "lontium,lt9611" },
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 79/266 net: mvpp2: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0bb51a3a385790a4be20085494cf78f70dadf646 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +4 -0
@@ -7387,6 +7387,10 @@ static int mvpp2_probe(struct platform_device *pdev)return PTR_ERR (priv->lms_base); }else { res =platform_get_resource (pdev,IORESOURCE_MEM ,1 ); +if (!res) { +dev_err (&pdev->dev,"Invalid resource\n" ); +return -EINVAL ; + }if (has_acpi_companion (&pdev->dev)) {/* In case the MDIO memory region is declared in * the ACPI, it can already appear as 'in-use'
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 70/266 dm: Fix dm_accept_partial_bio() relative to zone management commands
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 6842d264aa5205da338b6dcc6acfa2a6732558f1 ]
Fix dm_accept_partial_bio() to actually check that zone management commands are not passed as explained in the function documentation comment. Also, since a zone append operation cannot be split, add REQ_OP_ZONE_APPEND as a forbidden command.
White lines are added around the group of BUG_ON() calls to make the code more legible.
--- drivers/md/dm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/md/dm.c +6 -2
@@ -1237,8 +1237,8 @@ static int dm_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff,/* * A target may call dm_accept_partial_bio only from the map routine. It is -* allowed for all bio types except REQ_PREFLUSH, REQ_OP_ZONE_RESET, -* REQ_OP_ZONE_OPEN, REQ_OP_ZONE_CLOSE and REQ_OP_ZONE_FINISH. +* allowed for all bio types except REQ_PREFLUSH, REQ_OP_ZONE_* zone management +* operations and REQ_OP_ZONE_APPEND (zone append writes). * * dm_accept_partial_bio informs the dm that the target only wants to process * additional n_sectors sectors of the bio and the rest of the data should be
@@ -1268,9 +1268,13 @@ void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors) { struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone);unsigned bi_size = bio->bi_iter.bi_size >>SECTOR_SHIFT ; +BUG_ON (bio->bi_opf &REQ_PREFLUSH ); +BUG_ON (op_is_zone_mgmt (bio_op (bio))); +BUG_ON (bio_op (bio) ==REQ_OP_ZONE_APPEND );BUG_ON (bi_size > *tio->len_ptr);BUG_ON (n_sectors > bi_size); + *tio->len_ptr -= bi_size - n_sectors; bio->bi_iter.bi_size = n_sectors <<SECTOR_SHIFT ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 81/266 net: moxa: Use devm_platform_get_and_ioremap_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 35cba15a504bf4f585bb9d78f47b22b28a1a06b2 ]
Use devm_platform_get_and_ioremap_resource() to simplify code and avoid a null-ptr-deref by checking 'res' in it.
--- drivers/net/ethernet/moxa/moxart_ether.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/moxa/moxart_ether.c +2 -3
@@ -481,13 +481,12 @@ static int moxart_mac_probe(struct platform_device *pdev) priv->ndev = ndev; priv->pdev = pdev; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - ndev->base_addr = res->start; - priv->base =devm_ioremap_resource (p_dev, res); + priv->base =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (priv->base)) { ret =PTR_ERR (priv->base); goto init_fail; } + ndev->base_addr = res->start;spin_lock_init (&priv->txlock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 82/266 drm/amd/display: Fix DCN 3.01 DSCCLK validation
In reply to Greg Kroah-HartmanFrom: Nikola Cornij <[email protected]>
[ Upstream commit 346cf627fb27c0fea63a041cedbaa4f31784e504 ]
[why]
DSCCLK validation is not necessary because DSCCLK is derrived from DISPCLK, therefore if DISPCLK validation passes, DSCCLK is valid, too. Doing DSCLK validation in addition to DISPCLK leads to modes being wrongly rejected when DSCCLK was incorrectly set outside of DML.
[how]
Remove DSCCLK validation because it's implicitly validated under DISPCLK
--- .../dc/dml/dcn30/display_mode_vba_30.c | 64 ++++++------------- 1 file changed, 21 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +21 -43
@@ -64,6 +64,7 @@ typedef struct {#define BPP_INVALID 0#define BPP_BLENDED_PIPE 0xffffffff#define DCN30_MAX_DSC_IMAGE_WIDTH 5184 +#define DCN30_MAX_FMT_420_BUFFER_WIDTH 4096static void DisplayPipeConfiguration (struct display_mode_lib *mode_lib); static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerformanceCalculation(
@@ -3987,19 +3988,30 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l }else if (v->PlaneRequiredDISPCLKWithoutODMCombine > v->MaxDispclkRoundedDownToDFSGranularity) { v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine2To1; - }else if (v->DSCEnabled[k] && (v->HActive[k] >DCN30_MAX_DSC_IMAGE_WIDTH )) { - v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; - v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine2To1; }else { v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithoutODMCombine; -/*420 format workaround*/ -if (v->HActive[k] >4096 && v->OutputFormat[k] == dm_420) { + } +if (v->DSCEnabled[k] && v->HActive[k] >DCN30_MAX_DSC_IMAGE_WIDTH + && v->ODMCombineEnablePerState[i][k] != dm_odm_combine_mode_4to1) { +if (v->HActive[k] /2 >DCN30_MAX_DSC_IMAGE_WIDTH ) { + v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_4to1; + v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine4To1; + }else { + v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; + v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine2To1; + } + } +if (v->OutputFormat[k] == dm_420 && v->HActive[k] >DCN30_MAX_FMT_420_BUFFER_WIDTH + && v->ODMCombineEnablePerState[i][k] != dm_odm_combine_mode_4to1) { +if (v->HActive[k] /2 >DCN30_MAX_FMT_420_BUFFER_WIDTH ) { + v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_4to1; + v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine4To1; + }else { v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine2To1; } } -if (v->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_4to1) { v->MPCCombine[i][j][k] = false; v->NoOfDPP[i][j][k] =4 ;
@@ -4281,42 +4293,8 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (i =0 ; i < v->soc.num_states; i++) { - v->DSCCLKRequiredMoreThanSupported[i] = false; -for (k =0 ; k <= v->NumberOfActivePlanes -1 ; k++) { -if (v->BlendingAndTiming[k] == k) { -if (v->Output[k] == dm_dp || v->Output[k] == dm_edp) { -if (v->OutputFormat[k] == dm_420) { - v->DSCFormatFactor =2 ; - }else if (v->OutputFormat[k] == dm_444) { - v->DSCFormatFactor =1 ; - }else if (v->OutputFormat[k] == dm_n422) { - v->DSCFormatFactor =2 ; - }else { - v->DSCFormatFactor =1 ; - } -if (v->RequiresDSC[i][k] == true) { -if (v->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_4to1) { -if (v->PixelClockBackEnd[k] /12.0 / v->DSCFormatFactor - > (1.0 - v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ) * v->MaxDSCCLK[i]) { - v->DSCCLKRequiredMoreThanSupported[i] = true; - } - }else if (v->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_2to1) { -if (v->PixelClockBackEnd[k] /6.0 / v->DSCFormatFactor - > (1.0 - v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ) * v->MaxDSCCLK[i]) { - v->DSCCLKRequiredMoreThanSupported[i] = true; - } - }else { -if (v->PixelClockBackEnd[k] /3.0 / v->DSCFormatFactor - > (1.0 - v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ) * v->MaxDSCCLK[i]) { - v->DSCCLKRequiredMoreThanSupported[i] = true; - } - } - } - } - } - } - } +/* Skip dscclk validation: as long as dispclk is supported, dscclk is also implicitly supported */ +for (i =0 ; i < v->soc.num_states; i++) { v->NotEnoughDSCUnits[i] = false; v->TotalDSCUnitsRequired =0.0 ;
@@ -5319,7 +5297,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lfor (j =0 ; j <2 ; j++) {if (v->ScaleRatioAndTapsSupport ==1 && v->SourceFormatPixelAndScanSupport ==1 && v->ViewportSizeSupport[i][j] ==1 && v->DIOSupport[i] ==1 && v->ODMCombine4To1SupportCheckOK[i] ==1 - && v->NotEnoughDSCUnits[i] ==0 && v->DSCCLKRequiredMoreThanSupported[i] ==0 + && v->NotEnoughDSCUnits[i] ==0 && v->DTBCLKRequiredMoreThanSupported[i] ==0 && v->ROBSupport[i][j] ==1 && v->DISPCLK_DPPCLK_Support[i][j] ==1 && v->TotalAvailablePipesSupport[i][j] ==1 && EnoughWritebackUnits == 1 && WritebackModeSupport == 1
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 80/266 net: micrel: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 20f1932e2282c58cb5ac59517585206cf5b385ae ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/ethernet/micrel/ks8842.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/micrel/ks8842.c +4 -0
@@ -1135,6 +1135,10 @@ static int ks8842_probe(struct platform_device *pdev)unsigned i; iomem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!iomem) { +dev_err (&pdev->dev,"Invalid resource\n" ); +return -EINVAL ; + }if (!request_mem_region (iomem->start,resource_size (iomem),DRV_NAME )) goto err_mem_region;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 85/266 drm/amd/display: Release MST resources on switch from MST to SST
In reply to Greg Kroah-HartmanFrom: Vladimir Stempen <[email protected]>
[ Upstream commit 3f8518b60c10aa96f3efa38a967a0b4eb9211ac0 ]
[why]
When OS overrides training link training parameters for MST device to SST mode, MST resources are not released and leak of the resource may result crash and incorrect MST discovery during following hot plugs.
[how]
Retaining sink object to be reused by SST link and releasing MST resources.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +2 -0
@@ -1784,6 +1784,8 @@ static void set_dp_mst_mode(struct dc_link *link, bool mst_enable) link->type = dc_connection_single; link->local_sink = link->remote_sinks[0 ]; link->local_sink->sink_signal =SIGNAL_TYPE_DISPLAY_PORT ; +dc_sink_retain (link->local_sink); +dm_helpers_dp_mst_stop_top_mgr (link->ctx, link); }else if (mst_enable == true && link->type == dc_connection_single && link->remote_sinks[0 ] !=NULL ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 86/266 drm/amd/display: Set DISPCLK_MAX_ERRDET_CYCLES to 7
In reply to Greg Kroah-HartmanFrom: Wesley Chalmers <[email protected]>
[ Upstream commit 3577e1678772ce3ede92af3a75b44a4b76f9b4ad ]
[WHY]DISPCLK_MAX_ERRDET_CYCLES must be 7 to prevent connection loss when changing DENTIST_DISPCLK_WDIVIDER from 126 to 127 and back.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +1 -1
@@ -243,7 +243,7 @@ void dcn20_dccg_init(struct dce_hwseq *hws)REG_WRITE (MILLISECOND_TIME_BASE_DIV ,0x1186a0 );/* This value is dependent on the hardware pipeline delay so set once per SOC */ -REG_WRITE (DISPCLK_FREQ_CHANGE_CNTL ,0x801003c ); +REG_WRITE (DISPCLK_FREQ_CHANGE_CNTL ,0xe01003c ); } void dcn20_disable_vga(
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 83/266 drm/amd/display: Revert "Fix clock table filling logic"
In reply to Greg Kroah-HartmanFrom: Ilya Bakoulin <[email protected]>
[ Upstream commit ae88357c7966ec2a52cb1e70fd42f74a40c9dfcb ]
[Why]
This change was found to break some high-refresh modes. Reverting to unblock mainline.
--- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 78 +++++++------------ .../drm/amd/display/dc/dcn21/dcn21_resource.c | 33 +++----- 2 files changed, 39 insertions(+), 72 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +27 -51
@@ -835,66 +835,47 @@ static struct wm_table lpddr4_wm_table_rn = { } }; -static unsigned int find_max_fclk_for_voltage (struct dpm_clocks *clock_table, -unsigned int voltage) +static unsigned int find_socclk_for_voltage (struct dpm_clocks *clock_table,unsigned int voltage) {int i; -uint32_t max_clk =0 ; -for (i =0 ; i <PP_SMU_NUM_FCLK_DPM_LEVELS ; i++) { -if (clock_table->FClocks[i].Vol <= voltage) { - max_clk = clock_table->FClocks[i].Freq > max_clk ? - clock_table->FClocks[i].Freq : max_clk; - } - } - -return max_clk; -} - -static unsigned int find_max_memclk_for_voltage (struct dpm_clocks *clock_table, -unsigned int voltage) -{ -int i; -uint32_t max_clk =0 ; - -for (i =0 ; i <PP_SMU_NUM_MEMCLK_DPM_LEVELS ; i++) { -if (clock_table->MemClocks[i].Vol <= voltage) { - max_clk = clock_table->MemClocks[i].Freq > max_clk ? - clock_table->MemClocks[i].Freq : max_clk; - } +for (i =0 ; i <PP_SMU_NUM_SOCCLK_DPM_LEVELS ; i++) { +if (clock_table->SocClocks[i].Vol == voltage) +return clock_table->SocClocks[i].Freq; } -return max_clk; +ASSERT (0 ); +return 0 ; } -static unsigned int find_max_socclk_for_voltage (struct dpm_clocks *clock_table, -unsigned int voltage) +static unsigned int find_dcfclk_for_voltage (struct dpm_clocks *clock_table,unsigned int voltage) {int i; -uint32_t max_clk =0 ; -for (i =0 ; i <PP_SMU_NUM_SOCCLK_DPM_LEVELS ; i++) { -if (clock_table->SocClocks[i].Vol <= voltage) { - max_clk = clock_table->SocClocks[i].Freq > max_clk ? - clock_table->SocClocks[i].Freq : max_clk; - } +for (i =0 ; i <PP_SMU_NUM_DCFCLK_DPM_LEVELS ; i++) { +if (clock_table->DcfClocks[i].Vol == voltage) +return clock_table->DcfClocks[i].Freq; } -return max_clk; +ASSERT (0 ); +return 0 ; }static void rn_clk_mgr_helper_populate_bw_params (struct clk_bw_params *bw_params,struct dpm_clocks *clock_table,struct integrated_info *bios_info) {int i, j =0 ; -unsigned int volt; j =-1 ; -/* Find max DPM */ -for (i =0 ; i <PP_SMU_NUM_DCFCLK_DPM_LEVELS ; ++i) { -if (clock_table->DcfClocks[i].Freq !=0 && - clock_table->DcfClocks[i].Vol !=0 ) +ASSERT (PP_SMU_NUM_FCLK_DPM_LEVELS <=MAX_NUM_DPM_LVL ); + +/* Find lowest DPM, FCLK is filled in reverse order*/ + +for (i =PP_SMU_NUM_FCLK_DPM_LEVELS -1 ; i >=0 ; i--) { +if (clock_table->FClocks[i].Freq !=0 && clock_table->FClocks[i].Vol !=0 ) { j = i; +break ; + } }if (j ==-1 ) {
@@ -905,18 +886,13 @@ static void rn_clk_mgr_helper_populate_bw_params(struct clk_bw_params *bw_params bw_params->clk_table.num_entries = j +1 ; -for (i =0 ; i < bw_params->clk_table.num_entries; i++) { - volt = clock_table->DcfClocks[i].Vol; - - bw_params->clk_table.entries[i].voltage = volt; - bw_params->clk_table.entries[i].dcfclk_mhz = - clock_table->DcfClocks[i].Freq; - bw_params->clk_table.entries[i].fclk_mhz = -find_max_fclk_for_voltage (clock_table, volt); - bw_params->clk_table.entries[i].memclk_mhz = -find_max_memclk_for_voltage (clock_table, volt); - bw_params->clk_table.entries[i].socclk_mhz = -find_max_socclk_for_voltage (clock_table, volt); +for (i =0 ; i < bw_params->clk_table.num_entries; i++, j--) { + bw_params->clk_table.entries[i].fclk_mhz = clock_table->FClocks[j].Freq; + bw_params->clk_table.entries[i].memclk_mhz = clock_table->MemClocks[j].Freq; + bw_params->clk_table.entries[i].voltage = clock_table->FClocks[j].Vol; + bw_params->clk_table.entries[i].dcfclk_mhz =find_dcfclk_for_voltage (clock_table, clock_table->FClocks[j].Vol); + bw_params->clk_table.entries[i].socclk_mhz =find_socclk_for_voltage (clock_table, + bw_params->clk_table.entries[i].voltage); } bw_params->vram_type = bios_info->memory_type;
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +12 -21
@@ -1575,12 +1575,10 @@ static struct _vcs_dpi_voltage_scaling_st construct_low_pstate_lvl(struct clk_li low_pstate_lvl.phyclk_d18_mhz = dcn2_1_soc.clock_limits[high_voltage_lvl].phyclk_d18_mhz; low_pstate_lvl.phyclk_mhz = dcn2_1_soc.clock_limits[high_voltage_lvl].phyclk_mhz; -if (clk_table->num_entries <MAX_NUM_DPM_LVL ) { -for (i = clk_table->num_entries; i >1 ; i--) - clk_table->entries[i] = clk_table->entries[i-1 ]; - clk_table->entries[1 ] = clk_table->entries[0 ]; - clk_table->num_entries++; - } +for (i = clk_table->num_entries; i >1 ; i--) + clk_table->entries[i] = clk_table->entries[i-1 ]; + clk_table->entries[1 ] = clk_table->entries[0 ]; + clk_table->num_entries++;return low_pstate_lvl; }
@@ -1612,6 +1610,10 @@ static void update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param } } +/* clk_table[1] is reserved for min DF PState. skip here to fill in later. */ +if (i ==1 ) + k++; + clock_limits[k].state = k; clock_limits[k].dcfclk_mhz = clk_table->entries[i].dcfclk_mhz; clock_limits[k].fabricclk_mhz = clk_table->entries[i].fclk_mhz;
@@ -1628,25 +1630,14 @@ static void update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param k++; } - -if (clk_table->num_entries >=MAX_NUM_DPM_LVL ) { -for (i =0 ; i < clk_table->num_entries +1 ; i++) - dcn2_1_soc.clock_limits[i] = clock_limits[i]; - }else { - dcn2_1_soc.clock_limits[0 ] = clock_limits[0 ]; -for (i =2 ; i < clk_table->num_entries +1 ; i++) { - dcn2_1_soc.clock_limits[i] = clock_limits[i -1 ]; - dcn2_1_soc.clock_limits[i].state = i; - } - } - +for (i =0 ; i < clk_table->num_entries +1 ; i++) + dcn2_1_soc.clock_limits[i] = clock_limits[i];if (clk_table->num_entries) { + dcn2_1_soc.num_states = clk_table->num_entries +1 ;/* fill in min DF PState */ dcn2_1_soc.clock_limits[1 ] =construct_low_pstate_lvl (clk_table, closest_clk_lvl); - dcn2_1_soc.num_states = clk_table->num_entries;/* duplicate last level */ - dcn2_1_soc.clock_limits[dcn2_1_soc.num_states] = - dcn2_1_soc.clock_limits[dcn2_1_soc.num_states -1 ]; + dcn2_1_soc.clock_limits[dcn2_1_soc.num_states] = dcn2_1_soc.clock_limits[dcn2_1_soc.num_states -1 ]; dcn2_1_soc.clock_limits[dcn2_1_soc.num_states].state = dcn2_1_soc.num_states; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 84/266 drm/amd/display: Update scaling settings on modeset
In reply to Greg Kroah-HartmanFrom: Roman Li <[email protected]>
[ Upstream commit c521fc316d12fb9ea7b7680e301d673bceda922e ]
[Why]
We update scaling settings when scaling mode has been changed. However when changing mode from native resolution the scaling mode previously set gets ignored.
[How]
Perform scaling settings update on modeset.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
@@ -9481,7 +9481,8 @@ skip_modeset:BUG_ON (dm_new_crtc_state->stream ==NULL );/* Scaling or underscan settings */ -if (is_scaling_state_different (dm_old_conn_state, dm_new_conn_state)) +if (is_scaling_state_different (dm_old_conn_state, dm_new_conn_state) || +drm_atomic_crtc_needs_modeset (new_crtc_state))update_stream_scaling_settings ( &new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 87/266 drm/amd/display: Fix off-by-one error in DML
In reply to Greg Kroah-HartmanFrom: Wesley Chalmers <[email protected]>
[ Upstream commit e4e3678260e9734f6f41b4325aac0b171833a618 ]
[WHY]
For DCN30 and later, there is no data in DML arrays indexed by state at index num_states.
--- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +7 -7
@@ -2053,7 +2053,7 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman v->DISPCLKWithoutRamping, v->DISPCLKDPPCLKVCOSpeed); v->MaxDispclkRoundedToDFSGranularity =RoundToDFSGranularityDown ( - v->soc.clock_limits[mode_lib->soc.num_states].dispclk_mhz, + v->soc.clock_limits[mode_lib->soc.num_states -1 ].dispclk_mhz, v->DISPCLKDPPCLKVCOSpeed);if (v->DISPCLKWithoutRampingRoundedToDFSGranularity > v->MaxDispclkRoundedToDFSGranularity) {
@@ -3958,20 +3958,20 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lfor (k =0 ; k <= v->NumberOfActivePlanes -1 ; k++) { v->PlaneRequiredDISPCLKWithoutODMCombine = v->PixelClock[k] * (1.0 + v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ) * (1.0 + v->DISPCLKRampingMargin /100.0 ); -if ((v->PlaneRequiredDISPCLKWithoutODMCombine >= v->MaxDispclk[i] && v->MaxDispclk[i] == v->MaxDispclk[mode_lib->soc.num_states] - && v->MaxDppclk[i] == v->MaxDppclk[mode_lib->soc.num_states])) { +if ((v->PlaneRequiredDISPCLKWithoutODMCombine >= v->MaxDispclk[i] && v->MaxDispclk[i] == v->MaxDispclk[mode_lib->soc.num_states -1 ] + && v->MaxDppclk[i] == v->MaxDppclk[mode_lib->soc.num_states -1 ])) { v->PlaneRequiredDISPCLKWithoutODMCombine = v->PixelClock[k] * (1 + v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ); } v->PlaneRequiredDISPCLKWithODMCombine2To1 = v->PixelClock[k] /2 * (1 + v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ) * (1 + v->DISPCLKRampingMargin /100.0 ); -if ((v->PlaneRequiredDISPCLKWithODMCombine2To1 >= v->MaxDispclk[i] && v->MaxDispclk[i] == v->MaxDispclk[mode_lib->soc.num_states] - && v->MaxDppclk[i] == v->MaxDppclk[mode_lib->soc.num_states])) { +if ((v->PlaneRequiredDISPCLKWithODMCombine2To1 >= v->MaxDispclk[i] && v->MaxDispclk[i] == v->MaxDispclk[mode_lib->soc.num_states -1 ] + && v->MaxDppclk[i] == v->MaxDppclk[mode_lib->soc.num_states -1 ])) { v->PlaneRequiredDISPCLKWithODMCombine2To1 = v->PixelClock[k] /2 * (1 + v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ); } v->PlaneRequiredDISPCLKWithODMCombine4To1 = v->PixelClock[k] /4 * (1 + v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ) * (1 + v->DISPCLKRampingMargin /100.0 ); -if ((v->PlaneRequiredDISPCLKWithODMCombine4To1 >= v->MaxDispclk[i] && v->MaxDispclk[i] == v->MaxDispclk[mode_lib->soc.num_states] - && v->MaxDppclk[i] == v->MaxDppclk[mode_lib->soc.num_states])) { +if ((v->PlaneRequiredDISPCLKWithODMCombine4To1 >= v->MaxDispclk[i] && v->MaxDispclk[i] == v->MaxDispclk[mode_lib->soc.num_states -1 ] + && v->MaxDppclk[i] == v->MaxDppclk[mode_lib->soc.num_states -1 ])) { v->PlaneRequiredDISPCLKWithODMCombine4To1 = v->PixelClock[k] /4 * (1 + v->DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 88/266 drm/amd/display: Fix crash during MPO + ODM combine mode recalculation
In reply to Greg Kroah-HartmanFrom: Aric Cyr <[email protected]>
[ Upstream commit 665f28507a2a3d8d72ed9afa9a2b9b17fd43add1 ]
[Why]
When calculating recout width for an MPO plane on a mode that's using ODM combine, driver can calculate a negative value, resulting in a crash.
[How]
For negative widths, use zero such that validation will prune the configuration correctly and disallow MPO.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +5 -0
@@ -776,6 +776,11 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx)if (split_idx == split_count) {/* rightmost pipe is the remainder recout */ data->recout.width -= data->h_active * split_count - data->recout.x; + +/* ODM combine cases with MPO we can get negative widths */ +if (data->recout.width <0 ) + data->recout.width =0 ; + data->recout.x =0 ; }else data->recout.width = data->h_active - data->recout.x;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 71/266 block: introduce BIO_ZONE_WRITE_LOCKED bio flag
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 9ffbbb435d8f566a0924ce4b5dc7fc1bceb6dbf8 ]
Introduce the BIO flag BIO_ZONE_WRITE_LOCKED to indicate that a BIO owns the write lock of the zone it is targeting. This is the counterpart of the struct request flag RQF_ZONE_WRITE_LOCKED.
This new BIO flag is reserved for now for zone write locking control for device mapper targets exposing a zoned block device. Since in this case, the lock flag must not be propagated to the struct request that will be used to process the BIO, a BIO private flag is used rather than changing the RQF_ZONE_WRITE_LOCKED request flag into a common REQ_XXX flag that could be used for both BIO and request. This avoids conflicts down the stack with the block IO scheduler zone write locking (in mq-deadline).
--- include/linux/blk_types.h | 1 + 1 file changed, 1 insertion(+)
include/linux/blk_types.h +1 -0
@@ -304,6 +304,7 @@ enum {BIO_CGROUP_ACCT ,/* has been accounted to a cgroup */ BIO_TRACKED ,/* set if bio goes through the rq_qos path */ BIO_REMAPPED , +BIO_ZONE_WRITE_LOCKED ,/* Owns a zoned device zone write lock */ BIO_FLAG_LAST };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 90/266 selftests: Clean forgotten resources as part of cleanup()
In reply to Greg Kroah-HartmanFrom: Amit Cohen <[email protected]>
[ Upstream commit e67dfb8d15deb33c425d0b0ee22f2e5eef54c162 ]
Several tests do not set some ports down as part of their cleanup(), resulting in IPv6 link-local addresses and associated routes not being deleted.
These leaks were found using a BPF tool that monitors ASIC resources.
Solve this by setting the ports down at the end of the tests.
--- .../selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh | 3 +++ .../selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh | 3 +++ tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 2 ++ tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 2 ++ tools/testing/selftests/net/forwarding/pedit_l4port.sh | 2 ++ tools/testing/selftests/net/forwarding/skbedit_priority.sh | 2 ++ 6 files changed, 14 insertions(+)
tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh +3 -0
@@ -109,6 +109,9 @@ router_destroy() __addr_add_del $rp1 del 192.0.2.2/24 2001:db8:1::2/64 tc qdisc del dev $rp2 clsact + + ip link set dev $rp2 down + ip link set dev $rp1 down } setup_prepare()
tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh +3 -0
@@ -111,6 +111,9 @@ router_destroy() __addr_add_del $rp1 del 192.0.2.2/24 2001:db8:1::2/64 tc qdisc del dev $rp2 clsact + + ip link set dev $rp2 down + ip link set dev $rp1 down } setup_prepare()
tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh +2 -0
@@ -93,7 +93,9 @@ switch_destroy() lldptool -T -i $swp1 -V APP -d $(dscp_map 10) >/dev/null lldpad_app_wait_del + ip link set dev $swp2 down ip link set dev $swp2 nomaster + ip link set dev $swp1 down ip link set dev $swp1 nomaster ip link del dev br1 }
tools/testing/selftests/net/forwarding/pedit_dsfield.sh +2 -0
@@ -75,7 +75,9 @@ switch_destroy() tc qdisc del dev $swp2 clsact tc qdisc del dev $swp1 clsact + ip link set dev $swp2 down ip link set dev $swp2 nomaster + ip link set dev $swp1 down ip link set dev $swp1 nomaster ip link del dev br1 }
tools/testing/selftests/net/forwarding/pedit_l4port.sh +2 -0
@@ -71,7 +71,9 @@ switch_destroy() tc qdisc del dev $swp2 clsact tc qdisc del dev $swp1 clsact + ip link set dev $swp2 down ip link set dev $swp2 nomaster + ip link set dev $swp1 down ip link set dev $swp1 nomaster ip link del dev br1 }
tools/testing/selftests/net/forwarding/skbedit_priority.sh +2 -0
@@ -72,7 +72,9 @@ switch_destroy() tc qdisc del dev $swp2 clsact tc qdisc del dev $swp1 clsact + ip link set dev $swp2 down ip link set dev $swp2 nomaster + ip link set dev $swp1 down ip link set dev $swp1 nomaster ip link del dev br1 }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 89/266 net: phy: realtek: add delay to fix RXC generation issue
In reply to Greg Kroah-HartmanFrom: Joakim Zhang <[email protected]>
[ Upstream commit 6813cc8cfdaf401476e1a007cec8ae338cefa573 ]
PHY will delay about 11.5ms to generate RXC clock when switching from power down to normal operation. Read/write registers would also cause RXC become unstable and stop for a while during this process. Realtek engineer suggests 15ms or more delay can workaround this issue.
--- drivers/net/phy/realtek.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/phy/realtek.c +14 -1
@@ -357,6 +357,19 @@ static int rtl8211f_config_init(struct phy_device *phydev)return 0 ; } +static int rtl821x_resume (struct phy_device *phydev) +{ +int ret; + + ret =genphy_resume (phydev); +if (ret <0 ) +return ret; + +msleep (20 ); + +return 0 ; +} +static int rtl8211e_config_init (struct phy_device *phydev) {int ret =0 , oldpage;
@@ -852,7 +865,7 @@ static struct phy_driver realtek_drvs[] = { .config_intr = &rtl8211f_config_intr, .handle_interrupt = rtl8211f_handle_interrupt, .suspend = genphy_suspend, - .resume = genphy_resume, + .resume = rtl821x_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, }, {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 92/266 drm/amdkfd: use allowed domain for vmbo validation
In reply to Greg Kroah-HartmanFrom: Nirmoy Das <[email protected]>
[ Upstream commit bc05716d4fdd065013633602c5960a2bf1511b9c ]
Fixes handling when page tables are in system memory.
v3: remove struct amdgpu_vm_parser.
v2: remove unwanted variable.
change amdgpu_amdkfd_validate instead of amdgpu_amdkfd_bo_validate.
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -17
@@ -50,12 +50,6 @@ static struct {spinlock_t mem_limit_lock; } kfd_mem_limit; -/* Struct used for amdgpu_amdkfd_bo_validate */ -struct amdgpu_vm_parser { -uint32_t domain; -bool wait; -}; -static const char *const domain_bit_to_string[] = {"CPU" ,"GTT" ,
@@ -346,11 +340,9 @@ validate_fail:return ret; } -static int amdgpu_amdkfd_validate (void *param,struct amdgpu_bo *bo) +static int amdgpu_amdkfd_validate_vm_bo (void *_unused,struct amdgpu_bo *bo) { -struct amdgpu_vm_parser *p = param; - -return amdgpu_amdkfd_bo_validate (bo, p->domain, p->wait); +return amdgpu_amdkfd_bo_validate (bo, bo->allowed_domains, false); }/* vm_validate_pt_pd_bos - Validate page table and directory BOs
@@ -364,20 +356,15 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) {struct amdgpu_bo *pd = vm->root.base.bo;struct amdgpu_device *adev =amdgpu_ttm_adev (pd->tbo.bdev); -struct amdgpu_vm_parser param;int ret; - param.domain =AMDGPU_GEM_DOMAIN_VRAM ; - param.wait = false; - - ret =amdgpu_vm_validate_pt_bos (adev, vm, amdgpu_amdkfd_validate, - ¶m); + ret =amdgpu_vm_validate_pt_bos (adev, vm, amdgpu_amdkfd_validate_vm_bo,NULL );if (ret) {pr_err ("failed to validate PT BOs\n" );return ret; } - ret =amdgpu_amdkfd_validate (¶m, pd); + ret =amdgpu_amdkfd_validate_vm_bo (NULL , pd);if (ret) {pr_err ("failed to validate PD\n" );return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 91/266 net: sgi: ioc3-eth: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit db8f7be1e1d64fbf113a456ef94534fbf5e9a9af ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/ethernet/sgi/ioc3-eth.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/sgi/ioc3-eth.c +4 -0
@@ -835,6 +835,10 @@ static int ioc3eth_probe(struct platform_device *pdev)int err; regs =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!regs) { +dev_err (&pdev->dev,"Invalid resource\n" ); +return -EINVAL ; + }/* get mac addr from one wire prom */ if (ioc3eth_get_mac_addr (regs, mac_addr))return -EPROBE_DEFER ;/* not available yet */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 94/266 net: mido: mdio-mux-bcm-iproc: Use devm_platform_get_and_ioremap_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 8a55a73433e763c8aec4a3e8df5c28c821fc44b9 ]
Use devm_platform_get_and_ioremap_resource() to simplify code and avoid a null-ptr-deref by checking 'res' in it.
--- drivers/net/mdio/mdio-mux-bcm-iproc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/mdio/mdio-mux-bcm-iproc.c +3 -4
@@ -187,7 +187,9 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)return -ENOMEM ; md->dev = &pdev->dev; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + md->base =devm_platform_get_and_ioremap_resource (pdev,0 , &res); +if (IS_ERR (md->base)) +return PTR_ERR (md->base);if (res->start &0xfff ) {/* For backward compatibility in case the * base address is specified with an offset.
@@ -196,9 +198,6 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) res->start &= ~0xfff ; res->end = res->start +MDIO_REG_ADDR_SPACE_SIZE -1 ; } - md->base =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (md->base)) -return PTR_ERR (md->base); md->mii_bus =devm_mdiobus_alloc (&pdev->dev);if (!md->mii_bus) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 95/266 selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC
In reply to Greg Kroah-HartmanFrom: Minchan Kim <[email protected]>
[ Upstream commit 648f2c6100cfa18e7dfe43bc0b9c3b73560d623c ]
In the field, we have seen lots of allocation failure from the call path below.
06-03 13:29:12.999 1010315 31557 31557 W Binder : 31542_2: page allocation failure: order:0, mode:0x800(GFP_NOWAIT), nodemask=(null),cpuset=background,mems_allowed=0
...
...
06-03 13:29:12.999 1010315 31557 31557 W Call trace:
06-03 13:29:12.999 1010315 31557 31557 W : dump_backtrace.cfi_jt+0x0/0x8 06-03 13:29:12.999 1010315 31557 31557 W : dump_stack+0xc8/0x14c 06-03 13:29:12.999 1010315 31557 31557 W : warn_alloc+0x158/0x1c8 06-03 13:29:12.999 1010315 31557 31557 W : __alloc_pages_slowpath+0x9d8/0xb80 06-03 13:29:12.999 1010315 31557 31557 W : __alloc_pages_nodemask+0x1c4/0x430 06-03 13:29:12.999 1010315 31557 31557 W : allocate_slab+0xb4/0x390 06-03 13:29:12.999 1010315 31557 31557 W : ___slab_alloc+0x12c/0x3a4 06-03 13:29:12.999 1010315 31557 31557 W : kmem_cache_alloc+0x358/0x5e4 06-03 13:29:12.999 1010315 31557 31557 W : avc_alloc_node+0x30/0x184 06-03 13:29:12.999 1010315 31557 31557 W : avc_update_node+0x54/0x4f0 06-03 13:29:12.999 1010315 31557 31557 W : avc_has_extended_perms+0x1a4/0x460 06-03 13:29:12.999 1010315 31557 31557 W : selinux_file_ioctl+0x320/0x3d0 06-03 13:29:12.999 1010315 31557 31557 W : __arm64_sys_ioctl+0xec/0x1fc 06-03 13:29:12.999 1010315 31557 31557 W : el0_svc_common+0xc0/0x24c 06-03 13:29:12.999 1010315 31557 31557 W : el0_svc+0x28/0x88 06-03 13:29:12.999 1010315 31557 31557 W : el0_sync_handler+0x8c/0xf0 06-03 13:29:12.999 1010315 31557 31557 W : el0_sync+0x1a4/0x1c0 .. .. 06-03 13:29:12.999 1010315 31557 31557 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010315 31557 31557 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010315 31557 31557 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:12.999 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:12.999 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:12.999 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 10230 30892 30892 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 10230 30892 30892 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 10230 30892 30892 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 10230 30892 30892 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 10230 30892 30892 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0
Based on [1], selinux is tolerate for failure of memory allocation. Then, use __GFP_NOWARN together.
[1] 476accbe2f6e ("selinux: use GFP_NOWAIT in the AVC kmem_caches")
--- security/selinux/avc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
security/selinux/avc.c +7 -6
@@ -297,26 +297,27 @@ static struct avc_xperms_decision_nodestruct avc_xperms_decision_node *xpd_node;struct extended_perms_decision *xpd; - xpd_node =kmem_cache_zalloc (avc_xperms_decision_cachep,GFP_NOWAIT ); + xpd_node =kmem_cache_zalloc (avc_xperms_decision_cachep, +GFP_NOWAIT | __GFP_NOWARN);if (!xpd_node)return NULL ; xpd = &xpd_node->xpd;if (which &XPERMS_ALLOWED ) { xpd->allowed =kmem_cache_zalloc (avc_xperms_data_cachep, -GFP_NOWAIT ); +GFP_NOWAIT | __GFP_NOWARN);if (!xpd->allowed) goto error; }if (which &XPERMS_AUDITALLOW ) { xpd->auditallow =kmem_cache_zalloc (avc_xperms_data_cachep, -GFP_NOWAIT ); +GFP_NOWAIT | __GFP_NOWARN);if (!xpd->auditallow) goto error; }if (which &XPERMS_DONTAUDIT ) { xpd->dontaudit =kmem_cache_zalloc (avc_xperms_data_cachep, -GFP_NOWAIT ); +GFP_NOWAIT | __GFP_NOWARN);if (!xpd->dontaudit) goto error; }
@@ -344,7 +345,7 @@ static struct avc_xperms_node *avc_xperms_alloc(void) {struct avc_xperms_node *xp_node; - xp_node =kmem_cache_zalloc (avc_xperms_cachep,GFP_NOWAIT ); + xp_node =kmem_cache_zalloc (avc_xperms_cachep,GFP_NOWAIT | __GFP_NOWARN);if (!xp_node)return xp_node;INIT_LIST_HEAD (&xp_node->xpd_head);
@@ -500,7 +501,7 @@ static struct avc_node *avc_alloc_node(struct selinux_avc *avc) {struct avc_node *node; - node =kmem_cache_zalloc (avc_node_cachep,GFP_NOWAIT ); + node =kmem_cache_zalloc (avc_node_cachep,GFP_NOWAIT | __GFP_NOWARN);if (!node) goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 93/266 fjes: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f18c11812c949553d2b2481ecaa274dd51bed1e7 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/fjes/fjes_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/fjes/fjes_main.c +4 -0
@@ -1262,6 +1262,10 @@ static int fjes_probe(struct platform_device *plat_dev) adapter->interrupt_watch_enable = false; res =platform_get_resource (plat_dev,IORESOURCE_MEM ,0 ); +if (!res) { + err = -EINVAL ; + goto err_free_control_wq; + } hw->hw_res.start = res->start; hw->hw_res.size =resource_size (res); hw->hw_res.irq =platform_get_irq (plat_dev,0 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 97/266 drm/amd/display: Verify Gamma & Degamma LUT sizes in amdgpu_dm_atomic_check
In reply to Greg Kroah-HartmanFrom: Mark Yacoub <[email protected]>
[ Upstream commit 03fc4cf45d30533d54f0f4ebc02aacfa12f52ce2 ]
For each CRTC state, check the size of Gamma and Degamma LUTs so unexpected and larger sizes wouldn't slip through.
TEST: IGT:kms_color::pipe-invalid-gamma-lut-sizes
v2: fix assignments in if clauses, Mark's email.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 41 ++++++++++++++++--- 3 files changed, 40 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -0
@@ -10049,6 +10049,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, dm_old_crtc_state->dsc_force_changed == false)continue ; + ret =amdgpu_dm_verify_lut_sizes (new_crtc_state); +if (ret) + goto fail; +if (!new_crtc_state->enable)continue ;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +1 -0
@@ -591,6 +591,7 @@ void amdgpu_dm_trigger_timing_sync(struct drm_device *dev);#define MAX_COLOR_LEGACY_LUT_ENTRIES 256void amdgpu_dm_init_color_mod (void ); +int amdgpu_dm_verify_lut_sizes (const struct drm_crtc_state *crtc_state);int amdgpu_dm_update_crtc_color_mgmt (struct dm_crtc_state *crtc);int amdgpu_dm_update_plane_color_mgmt (struct dm_crtc_state *crtc,struct dc_plane_state *dc_plane_state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +35 -6
55 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 96/266 r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit 1ee8856de82faec9bc8bd0f2308a7f27e30ba207 ]
It has been reported that on RTL8106e the link-up interrupt may be significantly delayed if the user enables ASPM L1. Per default ASPM is disabled. The change leaves L1 enabled on the PCIe link (thus still allowing to reach higher package power saving states), but the NIC won't actively trigger it.
--- drivers/net/ethernet/realtek/r8169_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +0 -1
@@ -3510,7 +3510,6 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp)rtl_eri_write (tp,0x1b0 ,ERIAR_MASK_0011 ,0x0000 );rtl_pcie_state_l2l3_disable (tp); -rtl_hw_aspm_clkreq_enable (tp, true); }DECLARE_RTL_COND (rtl_mac_ocp_e00e_cond)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 98/266 ibmvnic: fix kernel build warnings in build_hdr_descs_arr
In reply to Greg Kroah-HartmanFrom: Lijun Pan <[email protected]>
[ Upstream commit 73214a690c50a134bd364e1a4430e0e7ac81a8d8 ]
Fix the following kernel build warnings:drivers/net/ethernet/ibm/ibmvnic.c:1516: warning: Function parameter or member 'skb' not described in 'build_hdr_descs_arr' drivers/net/ethernet/ibm/ibmvnic.c:1516: warning: Function parameter or member 'indir_arr' not described in 'build_hdr_descs_arr' drivers/net/ethernet/ibm/ibmvnic.c:1516: warning: Excess function parameter 'txbuff' description in 'build_hdr_descs_arr'
--- drivers/net/ethernet/ibm/ibmvnic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +2 -1
@@ -1554,7 +1554,8 @@ static int create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len,/** * build_hdr_descs_arr - build a header descriptor array -* @txbuff: tx buffer +* @skb: tx socket buffer +* @indir_arr: indirect array * @num_entries: number of descriptors to be sent * @hdr_field: bit field determining which headers will be sent *
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 99/266 xfrm: Fix error reporting in xfrm_state_construct.
In reply to Greg Kroah-HartmanFrom: Steffen Klassert <[email protected]>
[ Upstream commit 6fd06963fa74197103cdbb4b494763127b3f2f34 ]
When memory allocation for XFRMA_ENCAP or XFRMA_COADDR fails, the error will not be reported because the -ENOMEM assignment to the err variable is overwritten before. Fix this by moving these two in front of the function so that memory allocation failures will be reported.
--- net/xfrm/xfrm_user.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
net/xfrm/xfrm_user.c +14 -14
@@ -580,6 +580,20 @@ static struct xfrm_state *xfrm_state_construct(struct net *net,copy_from_user_state (x, p); +if (attrs[XFRMA_ENCAP ]) { + x->encap =kmemdup (nla_data (attrs[XFRMA_ENCAP ]), +sizeof (*x->encap),GFP_KERNEL ); +if (x->encap ==NULL ) + goto error; + } + +if (attrs[XFRMA_COADDR ]) { + x->coaddr =kmemdup (nla_data (attrs[XFRMA_COADDR ]), +sizeof (*x->coaddr),GFP_KERNEL ); +if (x->coaddr ==NULL ) + goto error; + } +if (attrs[XFRMA_SA_EXTRA_FLAGS ]) x->props.extra_flags =nla_get_u32 (attrs[XFRMA_SA_EXTRA_FLAGS ]);
@@ -600,23 +614,9 @@ static struct xfrm_state *xfrm_state_construct(struct net *net, attrs[XFRMA_ALG_COMP]))) goto error; -if (attrs[XFRMA_ENCAP ]) { - x->encap =kmemdup (nla_data (attrs[XFRMA_ENCAP ]), -sizeof (*x->encap),GFP_KERNEL ); -if (x->encap ==NULL ) - goto error; - } -if (attrs[XFRMA_TFCPAD ]) x->tfcpad =nla_get_u32 (attrs[XFRMA_TFCPAD ]); -if (attrs[XFRMA_COADDR ]) { - x->coaddr =kmemdup (nla_data (attrs[XFRMA_COADDR ]), -sizeof (*x->coaddr),GFP_KERNEL ); -if (x->coaddr ==NULL ) - goto error; - } -xfrm_mark_get (attrs, &x->mark);xfrm_smark_init (attrs, &x->props.smark);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 72/266 net: bridge: mrp: Update ring transitions.
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
[ Upstream commit fcb34635854a5a5814227628867ea914a9805384 ]
According to the standard IEC 62439-2, the number of transitions needs to be counted for each transition 'between' ring state open and ring state closed and not from open state to closed state.
Therefore fix this for both ring and interconnect ring.
--- net/bridge/br_mrp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/bridge/br_mrp.c +2 -4
@@ -627,8 +627,7 @@ int br_mrp_set_ring_state(struct net_bridge *br,if (!mrp)return -EINVAL ; -if (mrp->ring_state ==BR_MRP_RING_STATE_CLOSED && - state->ring_state !=BR_MRP_RING_STATE_CLOSED ) +if (mrp->ring_state != state->ring_state) mrp->ring_transitions++; mrp->ring_state = state->ring_state;
@@ -715,8 +714,7 @@ int br_mrp_set_in_state(struct net_bridge *br, struct br_mrp_in_state *state)if (!mrp)return -EINVAL ; -if (mrp->in_state ==BR_MRP_IN_STATE_CLOSED && - state->in_state !=BR_MRP_IN_STATE_CLOSED ) +if (mrp->in_state != state->in_state) mrp->in_transitions++; mrp->in_state = state->in_state;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 101/266 wlcore/wl12xx: Fix wl12xx get_mac error if device is in ELP
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 11ef6bc846dcdce838f0b00c5f6a562c57e5d43b ]
At least on wl12xx, reading the MAC after boot can fail with a warning at drivers/net/wireless/ti/wlcore/sdio.c:78 wl12xx_sdio_raw_read. The failed call comes from wl12xx_get_mac() that wlcore_nvs_cb() calls after request_firmware_work_func().
After the error, no wireless interface is created. Reloading the wl12xx module makes the interface work.
Turns out the wlan controller can be in a low-power ELP state after the boot from the bootloader or kexec, and needs to be woken up first.
Let's wake the hardware and add a sleep after that similar to wl12xx_pre_boot() is already doing.
Note that a similar issue could exist for wl18xx, but I have not seen it so far. And a search for wl18xx_get_mac and wl12xx_sdio_raw_read did not produce similar errors.
--- drivers/net/wireless/ti/wl12xx/main.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/ti/wl12xx/main.c +7 -0
@@ -1503,6 +1503,13 @@ static int wl12xx_get_fuse_mac(struct wl1271 *wl)u32 mac1, mac2;int ret; +/* Device may be in ELP from the bootloader or kexec */ + ret =wlcore_write32 (wl,WL12XX_WELP_ARM_COMMAND ,WELP_ARM_COMMAND_VAL ); +if (ret <0 ) + goto out; + +usleep_range (500000 ,700000 ); + ret =wlcore_set_partition (wl, &wl->ptable[PART_DRPW ]);if (ret <0 ) goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 102/266 net: phy: nxp-c45-tja11xx: enable MDIO write access to the master/slave registers
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 0b5f0f29b118910c89fe249cdfbc11b400a86a18 ]
The SJA1110 switch integrates TJA1103 PHYs, but in SJA1110 switch rev B silicon, there is a bug in that the registers for selecting the 100base-T1 autoneg master/slave roles are not writable.
To enable write access to the master/slave registers, these additional PHY writes are necessary during initialization.
The issue has been corrected in later SJA1110 silicon versions and is not present in the standalone PHY variants, but applying the workaround unconditionally in the driver should not do any harm.
--- drivers/net/phy/nxp-c45-tja11xx.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/phy/nxp-c45-tja11xx.c +6 -0
@@ -546,6 +546,12 @@ static int nxp_c45_config_init(struct phy_device *phydev)return ret; } +/* Bug workaround for SJA1110 rev B: enable write access +* to MDIO_MMD_PMAPMD +*/ +phy_write_mmd (phydev,MDIO_MMD_VEND1 ,0x01F8 ,1 ); +phy_write_mmd (phydev,MDIO_MMD_VEND1 ,0x01F9 ,2 ); +phy_set_bits_mmd (phydev,MDIO_MMD_VEND1 ,VEND1_PHY_CONFIG ,PHY_CONFIG_AUTO );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 103/266 wl1251: Fix possible buffer overflow in wl1251_cmd_scan
In reply to Greg Kroah-HartmanFrom: Lee Gibson <[email protected]>
[ Upstream commit d10a87a3535cce2b890897914f5d0d83df669c63 ]
Function wl1251_cmd_scan calls memcpy without checking the length. Harden by checking the length is within the maximum allowed size.
--- drivers/net/wireless/ti/wl1251/cmd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/ti/wl1251/cmd.c +6 -3
@@ -454,9 +454,12 @@ int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len, cmd->channels[i].channel = channels[i]->hw_value; } - cmd->params.ssid_len = ssid_len; -if (ssid) -memcpy (cmd->params.ssid, ssid, ssid_len); +if (ssid) { +int len =clamp_val (ssid_len,0 ,IEEE80211_MAX_SSID_LEN ); + + cmd->params.ssid_len = len; +memcpy (cmd->params.ssid, ssid, len); + } ret =wl1251_cmd_send (wl,CMD_SCAN , cmd,sizeof (*cmd));if (ret <0 ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 100/266 dm writecache: commit just one block, not a full page
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
[ Upstream commit 991bd8d7bc78966b4dc427b53a144f276bffcd52 ]
Some architectures have pages larger than 4k and committing a full page causes needless overhead.
Fix this by writing a single block when committing the superblock.
--- drivers/md/dm-writecache.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/md/dm-writecache.c +1 -5
@@ -532,11 +532,7 @@ static void ssd_commit_superblock(struct dm_writecache *wc) region.bdev = wc->ssd_dev->bdev; region.sector =0 ; - region.count =PAGE_SIZE >>SECTOR_SHIFT ; - -if (unlikely (region.sector + region.count > wc->metadata_sectors)) - region.count = wc->metadata_sectors - region.sector; - + region.count = wc->block_size >>SECTOR_SHIFT ; region.sector += wc->start_sector; req.bi_op =REQ_OP_WRITE ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 104/266 cw1200: add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit dd778f89225cd258e8f0fed2b7256124982c8bb5 ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/net/wireless/st/cw1200/cw1200_sdio.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/st/cw1200/cw1200_sdio.c +1 -0
@@ -53,6 +53,7 @@ static const struct sdio_device_id cw1200_sdio_ids[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_STE, SDIO_DEVICE_ID_STE_CW1200) }, { /* end: all zeroes */ }, }; +MODULE_DEVICE_TABLE (sdio, cw1200_sdio_ids);/* hwbus_ops implemetation */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 105/266 drm/amdkfd: fix circular locking on get_wave_state
In reply to Greg Kroah-HartmanFrom: Jonathan Kim <[email protected]>
[ Upstream commit 63f6e01237257e7226efc5087f3f0b525d320f54 ]
get_wave_state acquires the mmap_lock on copy_to_user but so do mmu_notifiers. mmu_notifiers allows dqm locking so do get_wave_state outside the dqm_lock to prevent circular locking.
v2: squash in unused variable removal.
--- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +13 -15
@@ -1674,29 +1674,27 @@ static int get_wave_state(struct device_queue_manager *dqm, u32 *save_area_used_size) {struct mqd_manager *mqd_mgr; -int r;dqm_lock (dqm); -if (q->properties.type !=KFD_QUEUE_TYPE_COMPUTE || - q->properties.is_active || !q->device->cwsr_enabled) { - r = -EINVAL ; - goto dqm_unlock; - } - mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_CP ]; -if (!mqd_mgr->get_wave_state) { - r = -EINVAL ; - goto dqm_unlock; +if (q->properties.type !=KFD_QUEUE_TYPE_COMPUTE || + q->properties.is_active || !q->device->cwsr_enabled || + !mqd_mgr->get_wave_state) { +dqm_unlock (dqm); +return -EINVAL ; } - r = mqd_mgr->get_wave_state (mqd_mgr, q->mqd, ctl_stack, - ctl_stack_used_size, save_area_used_size); - -dqm_unlock:dqm_unlock (dqm); -return r; + +/* +* get_wave_state is outside the dqm lock to prevent circular locking +* and the queue should be protected against destruction by the process +* lock. +*/ +return mqd_mgr->get_wave_state (mqd_mgr, q->mqd, ctl_stack, + ctl_stack_used_size, save_area_used_size); } static int process_termination_cpsch(struct device_queue_manager *dqm,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 106/266 drm/amd/display: Cover edge-case when changing DISPCLK WDIVIDER
In reply to Greg Kroah-HartmanFrom: Wesley Chalmers <[email protected]>
[ Upstream commit 78ebca321999699f30ea19029726d1a3908b395f ]
[WHY]
When changing the DISPCLK_WDIVIDER value from 126 to 127, the change in clock rate is too great for the FIFOs to handle. This can cause visible corruption during clock change.
HW has handed down this register sequence to fix the issue.
[HOW]
The sequence, from HW:
a. 127 -> 126
Read DIG_FIFO_CAL_AVERAGE_LEVEL
FIFO level N = DIG_FIFO_CAL_AVERAGE_LEVEL / 4
Set DCCG_FIFO_ERRDET_OVR_EN = 1
Write 1 to OTGx_DROP_PIXEL for (N-4) times
Set DCCG_FIFO_ERRDET_OVR_EN = 0
Write DENTIST_DISPCLK_RDIVIDER = 126
Because of frequency stepping, sequence a can be executed to change the divider from 127 to any other divider value.
b. 126 -> 127
Read DIG_FIFO_CAL_AVERAGE_LEVEL
FIFO level N = DIG_FIFO_CAL_AVERAGE_LEVEL / 4
Set DCCG_FIFO_ERRDET_OVR_EN = 1
Write 1 to OTGx_ADD_PIXEL for (12-N) times
Set DCCG_FIFO_ERRDET_OVR_EN = 0
Write DENTIST_DISPCLK_RDIVIDER = 127
Because of frequency stepping, divider must first be set from any other divider value to 126 before executing sequence b.
--- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 68 ++++++++++++++++++- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 3 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- 3 files changed, 69 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +65 -3
@@ -123,7 +123,7 @@ void dcn20_update_clocks_update_dpp_dto(struct clk_mgr_internal *clk_mgr, } } -void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr) +void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr,struct dc_state *context) {int dpp_divider =DENTIST_DIVIDER_RANGE_SCALE_FACTOR * clk_mgr->base.dentist_vco_freq_khz / clk_mgr->base.clks.dppclk_khz;
@@ -132,6 +132,68 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr)uint32_t dppclk_wdivider =dentist_get_did_from_divider (dpp_divider);uint32_t dispclk_wdivider =dentist_get_did_from_divider (disp_divider); +uint32_t current_dispclk_wdivider; +uint32_t i; + +REG_GET (DENTIST_DISPCLK_CNTL , +DENTIST_DISPCLK_WDIVIDER , ¤t_dispclk_wdivider); + +/* When changing divider to or from 127, some extra programming is required to prevent corruption */ +if (current_dispclk_wdivider ==127 && dispclk_wdivider !=127 ) { +for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) { +struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; +uint32_t fifo_level; +struct dccg *dccg = clk_mgr->base.ctx->dc->res_pool->dccg; +struct stream_encoder *stream_enc = pipe_ctx->stream_res.stream_enc; +int32_t N ; +int32_t j; + +if (!pipe_ctx->stream) +continue ; +/* Virtual encoders don't have this function */ +if (!stream_enc->funcs->get_fifo_cal_average_level) +continue ; + fifo_level = stream_enc->funcs->get_fifo_cal_average_level ( + stream_enc); +N = fifo_level /4 ; + dccg->funcs->set_fifo_errdet_ovr_en ( + dccg, + true); +for (j =0 ; j <N -4 ; j++) + dccg->funcs->otg_drop_pixel ( + dccg, + pipe_ctx->stream_res.tg->inst); + dccg->funcs->set_fifo_errdet_ovr_en ( + dccg, + false); + } + }else if (dispclk_wdivider ==127 && current_dispclk_wdivider !=127 ) { +REG_UPDATE (DENTIST_DISPCLK_CNTL , +DENTIST_DISPCLK_WDIVIDER ,126 ); +REG_WAIT (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_CHG_DONE ,1 ,50 ,100 ); +for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) { +struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; +struct dccg *dccg = clk_mgr->base.ctx->dc->res_pool->dccg; +struct stream_encoder *stream_enc = pipe_ctx->stream_res.stream_enc; +uint32_t fifo_level; +int32_t N ; +int32_t j; + +if (!pipe_ctx->stream) +continue ; +/* Virtual encoders don't have this function */ +if (!stream_enc->funcs->get_fifo_cal_average_level) +continue ; + fifo_level = stream_enc->funcs->get_fifo_cal_average_level ( + stream_enc); +N = fifo_level /4 ; + dccg->funcs->set_fifo_errdet_ovr_en (dccg, true); +for (j =0 ; j <12 -N ; j++) + dccg->funcs->otg_add_pixel (dccg, + pipe_ctx->stream_res.tg->inst); + dccg->funcs->set_fifo_errdet_ovr_en (dccg, false); + } + }REG_UPDATE (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_WDIVIDER , dispclk_wdivider);
@@ -251,11 +313,11 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base,if (dpp_clock_lowered) {// if clock is being lowered, increase DTO before lowering refclk dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower); -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context); }else {// if clock is being raised, increase refclk before lowering DTO if (update_dppclk || update_dispclk) -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context);// always update dtos unless clock is lowered and not safe to lower dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower); }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h +2 -1
@@ -50,7 +50,8 @@ void dcn2_get_clock(struct clk_mgr *clk_mgr,enum dc_clock_type clock_type, struct dc_clock_config *clock_cfg); -void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr); +void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr, +struct dc_state *context);void dcn2_read_clocks_from_hw_dentist (struct clk_mgr *clk_mgr_base);
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +2 -2
@@ -334,11 +334,11 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,if (dpp_clock_lowered) {/* if clock is being lowered, increase DTO before lowering refclk */ dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower); -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context); }else {/* if clock is being raised, increase refclk before lowering DTO */ if (update_dppclk || update_dispclk) -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context);/* There is a check inside dcn20_update_clocks_update_dpp_dto which ensures * that we do not lower dto when it is not safe to lower. We do not need to * compare the current and new dppclk before calling this function.*/
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 107/266 drm/amdkfd: Fix circular lock in nocpsch path
In reply to Greg Kroah-HartmanFrom: Amber Lin <[email protected]>
[ Upstream commit a7b2451d31cfa2e8aeccf3b35612ce33f02371fc ]
Calling free_mqd inside of destroy_queue_nocpsch_locked can cause a circular lock. destroy_queue_nocpsch_locked is called under a DQM lock, which is taken in MMU notifiers, potentially in FS reclaim context. Taking another lock, which is BO reservation lock from free_mqd, while causing an FS reclaim inside the DQM lock creates a problematic circular lock dependency. Therefore move free_mqd out of destroy_queue_nocpsch_locked and call it after unlocking DQM.
--- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +13 -5
@@ -486,9 +486,6 @@ static int destroy_queue_nocpsch_locked(struct device_queue_manager *dqm,if (retval == -ETIME ) qpd->reset_wavefronts = true; - - mqd_mgr->free_mqd (mqd_mgr, q->mqd, q->mqd_mem_obj); -list_del (&q->list);if (list_empty (&qpd->queues_list)) {if (qpd->reset_wavefronts) {
@@ -523,6 +520,8 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm,int retval;uint64_t sdma_val =0 ;struct kfd_process_device *pdd =qpd_to_pdd (qpd); +struct mqd_manager *mqd_mgr = + dqm->mqd_mgrs[get_mqd_type_from_queue_type (q->properties.type)];/* Get the SDMA queue stats */ if ((q->properties.type == KFD_QUEUE_TYPE_SDMA) ||
@@ -540,6 +539,8 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm, pdd->sdma_past_activity_counter += sdma_val;dqm_unlock (dqm); + mqd_mgr->free_mqd (mqd_mgr, q->mqd, q->mqd_mem_obj); +return retval; }
@@ -1629,7 +1630,7 @@ out:static int process_termination_nocpsch (struct device_queue_manager *dqm,struct qcm_process_device *qpd) { -struct queue *q, *next; +struct queue *q;struct device_process_node *cur, *next_dpn;int retval =0 ;bool found = false;
@@ -1637,12 +1638,19 @@ static int process_termination_nocpsch(struct device_queue_manager *dqm,dqm_lock (dqm);/* Clear all user mode queues */ -list_for_each_entry_safe (q, next, &qpd->queues_list, list) { +while (!list_empty (&qpd->queues_list)) { +struct mqd_manager *mqd_mgr;int ret; + q = list_first_entry(&qpd->queues_list, struct queue, list); + mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type ( + q->properties.type)]; ret =destroy_queue_nocpsch_locked (dqm, qpd, q);if (ret) retval = ret; +dqm_unlock (dqm); + mqd_mgr->free_mqd (mqd_mgr, q->mqd, q->mqd_mem_obj); +dqm_lock (dqm); }/* Unregister process */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 73/266 pinctrl: mcp23s08: fix race condition in irq handler
In reply to Greg Kroah-HartmanFrom: Radim Pavlik <[email protected]>
[ Upstream commit 897120d41e7afd9da435cb00041a142aeeb53c07 ]
Checking value of MCP_INTF in mcp23s08_irq suggests that the handler may be called even when there is no interrupt pending.
But the actual interrupt could happened between reading MCP_INTF and MCP_GPIO. In this situation we got nothing from MCP_INTF, but the event gets acknowledged on the expander by reading MCP_GPIO. This leads to losing events.
Fix the problem by not reading any register until we see something in MCP_INTF.
The error was reproduced and fix tested on MCP23017.
--- drivers/pinctrl/pinctrl-mcp23s08.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pinctrl/pinctrl-mcp23s08.c +5 -5
@@ -351,6 +351,11 @@ static irqreturn_t mcp23s08_irq(int irq, void *data)if (mcp_read (mcp,MCP_INTF , &intf)) goto unlock; +if (intf ==0 ) { +/* There is no interrupt pending */ +return IRQ_HANDLED ; + } +if (mcp_read (mcp,MCP_INTCAP , &intcap)) goto unlock;
@@ -368,11 +373,6 @@ static irqreturn_t mcp23s08_irq(int irq, void *data) mcp->cached_gpio = gpio;mutex_unlock (&mcp->lock); -if (intf ==0 ) { -/* There is no interrupt pending */ -return IRQ_HANDLED ; - } -dev_dbg (mcp->chip.parent,"intcap 0x%04X intf 0x%04X gpio_orig 0x%04X gpio 0x%04X\n" , intcap, intf, gpio_orig, gpio);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 108/266 net: hsr: dont check sequence number if tag removal is offloaded
In reply to Greg Kroah-HartmanFrom: George McCollister <[email protected]>
[ Upstream commit c2ae34a7deaff463ecafb7db627b77faaca8e159 ]
Don't check the sequence number when deciding when to update time_in in the node table if tag removal is offloaded since the sequence number is part of the tag. This fixes a problem where the times in the node table wouldn't update when 0 appeared to be before or equal to seq_out when tag removal was offloaded.
--- net/hsr/hsr_framereg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/hsr/hsr_framereg.c +2 -1
@@ -397,7 +397,8 @@ void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,* ensures entries of restarted nodes gets pruned so that they can * re-register and resume communications. */ -if (seq_nr_before (sequence_nr, node->seq_out[port->type])) +if (!(port->dev->features &NETIF_F_HW_HSR_TAG_RM ) && +seq_nr_before (sequence_nr, node->seq_out[port->type]))return ; node->time_in[port->type] = jiffies;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 109/266 bpf: Fix up register-based shifts in interpreter to silence KUBSAN
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
[ Upstream commit 28131e9d933339a92f78e7ab6429f4aaaa07061c ]
syzbot reported a shift-out-of-bounds that KUBSAN observed in the interpreter:
[...]
UBSAN: shift-out-of-bounds in kernel/bpf/core.c:1420:2 shift exponent 255 is too large for 64-bit type 'long long unsigned int' CPU: 1 PID: 11097 Comm: syz-executor.4 Not tainted 5.12.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:79 [inline] dump_stack+0x141/0x1d7 lib/dump_stack.c:120 ubsan_epilogue+0xb/0x5a lib/ubsan.c:148 __ubsan_handle_shift_out_of_bounds.cold+0xb1/0x181 lib/ubsan.c:327 ___bpf_prog_run.cold+0x19/0x56c kernel/bpf/core.c:1420 __bpf_prog_run32+0x8f/0xd0 kernel/bpf/core.c:1735 bpf_dispatcher_nop_func include/linux/bpf.h:644 [inline] bpf_prog_run_pin_on_cpu include/linux/filter.h:624 [inline] bpf_prog_run_clear_cb include/linux/filter.h:755 [inline] run_filter+0x1a1/0x470 net/packet/af_packet.c:2031 packet_rcv+0x313/0x13e0 net/packet/af_packet.c:2104 dev_queue_xmit_nit+0x7c2/0xa90 net/core/dev.c:2387 xmit_one net/core/dev.c:3588 [inline] dev_hard_start_xmit+0xad/0x920 net/core/dev.c:3609 __dev_queue_xmit+0x2121/0x2e00 net/core/dev.c:4182 __bpf_tx_skb net/core/filter.c:2116 [inline] __bpf_redirect_no_mac net/core/filter.c:2141 [inline] __bpf_redirect+0x548/0xc80 net/core/filter.c:2164 ____bpf_clone_redirect net/core/filter.c:2448 [inline] bpf_clone_redirect+0x2ae/0x420 net/core/filter.c:2420 ___bpf_prog_run+0x34e1/0x77d0 kernel/bpf/core.c:1523 __bpf_prog_run512+0x99/0xe0 kernel/bpf/core.c:1737 bpf_dispatcher_nop_func include/linux/bpf.h:644 [inline] bpf_test_run+0x3ed/0xc50 net/bpf/test_run.c:50 bpf_prog_test_run_skb+0xabc/0x1c50 net/bpf/test_run.c:582 bpf_prog_test_run kernel/bpf/syscall.c:3127 [inline] __do_sys_bpf+0x1ea9/0x4f00 kernel/bpf/syscall.c:4406 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xae [...]
Generally speaking, KUBSAN reports from the kernel should be fixed. However, in case of BPF, this particular report caused concerns since the large shift is not wrong from BPF point of view, just undefined. In the verifier, K-based shifts that are >= {64,32} (depending on the bitwidth of the instruction) are already rejected. The register-based cases were not given their content might not be known at verification time. Ideas such as verifier instruction rewrite with an additional AND instruction for the source register were brought up, but regularly rejected due to the additional runtime overhead they incur.
As Edward Cree rightly put it:
Shifts by more than insn bitness are legal in the BPF ISA; they are implementation-defined behaviour [of the underlying architecture], rather than UB, and have been made legal for performance reasons. Each of the JIT backends compiles the BPF shift operations to machine instructions which produce implementation-defined results in such a case; the resulting contents of the register may be arbitrary but program behaviour as a whole remains defined.
Guard checks in the fast path (i.e. affecting JITted code) will thus not be accepted.
The case of division by zero is not truly analogous here, as division instructions on many of the JIT-targeted architectures will raise a machine exception / fault on division by zero, whereas (to the best of my knowledge) none will do so on an out-of-bounds shift.
Given the KUBSAN report only affects the BPF interpreter, but not JITs, one solution is to add the ANDs with 63 or 31 into ___bpf_prog_run(). That would make the shifts defined, and thus shuts up KUBSAN, and the compiler would optimize out the AND on any CPU that interprets the shift amounts modulo the width anyway (e.g., confirmed from disassembly that on x86-64 and arm64 the generated interpreter code is the same before and after this fix).
The BPF interpreter is slow path, and most likely compiled out anyway as distros select BPF_JIT_ALWAYS_ON to avoid speculative execution of BPF instructions by the interpreter. Given the main argument was to avoid sacrificing performance, the fact that the AND is optimized away from compiler for mainstream archs helps as well as a solution moving forward. Also add a comment on LSH/RSH/ARSH translation for JIT authors to provide guidance when they see the ___bpf_prog_run() interpreter code and use it as a model for a new JIT backend.
--- kernel/bpf/core.c | 61 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 18 deletions(-)
kernel/bpf/core.c +43 -18
@@ -1392,29 +1392,54 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn) select_insn: goto *jumptable[insn->code]; - /* ALU */ -#define ALU(OPCODE, OP) \ - ALU64_##OPCODE##_X: \ - DST = DST OP SRC; \ - CONT; \ - ALU_##OPCODE##_X: \ - DST = (u32) DST OP (u32) SRC; \ - CONT; \ - ALU64_##OPCODE##_K: \ - DST = DST OP IMM; \ - CONT; \ - ALU_##OPCODE##_K: \ - DST = (u32) DST OP (u32) IMM; \ + /* Explicitly mask the register-based shift amounts with 63 or 31 + * to avoid undefined behavior. Normally this won't affect the + * generated code, for example, in case of native 64 bit archs such + * as x86-64 or arm64, the compiler is optimizing the AND away for + * the interpreter. In case of JITs, each of the JIT backends compiles + * the BPF shift operations to machine instructions which produce + * implementation-defined results in such a case; the resulting + * contents of the register may be arbitrary, but program behaviour + * as a whole remains defined. In other words, in case of JIT backends, + * the AND must /not/ be added to the emitted LSH/RSH/ARSH translation. + */ + /* ALU (shifts) */ +#define SHT(OPCODE, OP) \ + ALU64_##OPCODE##_X: \ + DST = DST OP (SRC & 63); \ + CONT; \ + ALU_##OPCODE##_X: \ + DST = (u32) DST OP ((u32) SRC & 31); \ + CONT; \ + ALU64_##OPCODE##_K: \ + DST = DST OP IMM; \ + CONT; \ + ALU_##OPCODE##_K: \ + DST = (u32) DST OP (u32) IMM; \ + CONT; + /* ALU (rest) */ +#define ALU(OPCODE, OP) \ + ALU64_##OPCODE##_X: \ + DST = DST OP SRC; \ + CONT; \ + ALU_##OPCODE##_X: \ + DST = (u32) DST OP (u32) SRC; \ + CONT; \ + ALU64_##OPCODE##_K: \ + DST = DST OP IMM; \ + CONT; \ + ALU_##OPCODE##_K: \ + DST = (u32) DST OP (u32) IMM; \ CONT; - ALU(ADD, +) ALU(SUB, -) ALU(AND, &) ALU(OR, |) - ALU(LSH, <<) - ALU(RSH, >>) ALU(XOR, ^) ALU(MUL, *) + SHT(LSH, <<) + SHT(RSH, >>) +#undef SHT #undef ALU ALU_NEG: DST = (u32) -DST;
@@ -1439,13 +1464,13 @@ select_insn: insn++;CONT ; ALU_ARSH_X: -DST = (u64) (u32) (((s32 )DST ) >>SRC ); +DST = (u64) (u32) (((s32 )DST ) >> (SRC &31 ));CONT ; ALU_ARSH_K:DST = (u64) (u32) (((s32 )DST ) >>IMM );CONT ; ALU64_ARSH_X: - (*(s64 *) &DST ) >>=SRC ; + (*(s64 *) &DST ) >>= (SRC &63 );CONT ; ALU64_ARSH_K: (*(s64 *) &DST ) >>=IMM ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 110/266 ext4: fix memory leak in ext4_fill_super
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 618f003199c6188e01472b03cdbba227f1dc5f24 ]
static int kthread(void *_create) will return -ENOMEM or -EINTR in case of internal failure or kthread_stop() call happens before threadfn call.
To prevent fancy error checking and make code more straightforward we moved all cleanup code out of kmmpd threadfn.
Also, dropped struct mmpd_data at all. Now struct super_block is a threadfn data and struct buffer_head embedded into struct ext4_sb_info.
--- fs/ext4/ext4.h | 4 ++++ fs/ext4/mmp.c | 28 +++++++++++++--------------- fs/ext4/super.c | 10 ++++------ 3 files changed, 21 insertions(+), 21 deletions(-)
fs/ext4/ext4.h +4 -0
@@ -1488,6 +1488,7 @@ struct ext4_sb_info {struct kobject s_kobj;struct completion s_kobj_unregister;struct super_block *s_sb; +struct buffer_head *s_mmp_bh;/* Journaling */ struct journal_s *s_journal;
@@ -3720,6 +3721,9 @@ extern struct ext4_io_end_vec *ext4_last_io_end_vec(ext4_io_end_t *io_end);/* mmp.c */ extern int ext4_multi_mount_protect (struct super_block *,ext4_fsblk_t ); +/* mmp.c */ +extern void ext4_stop_mmpd (struct ext4_sb_info *sbi); +/* verity.c */ extern const struct fsverity_operations ext4_verityops;
fs/ext4/mmp.c +13 -15
@@ -127,9 +127,9 @@ void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,*/ static int kmmpd (void *data) { -struct super_block *sb = ((struct mmpd_data *) data)->sb; -struct buffer_head *bh = ((struct mmpd_data *) data)->bh; +struct super_block *sb = (struct super_block *) data;struct ext4_super_block *es =EXT4_SB (sb)->s_es; +struct buffer_head *bh =EXT4_SB (sb)->s_mmp_bh;struct mmp_struct *mmp;ext4_fsblk_t mmp_block;u32 seq =0 ;
@@ -245,12 +245,18 @@ static int kmmpd(void *data) retval =write_mmp_block (sb, bh); exit_thread: -EXT4_SB (sb)->s_mmp_tsk =NULL ; -kfree (data); -brelse (bh);return retval; } +void ext4_stop_mmpd (struct ext4_sb_info *sbi) +{ +if (sbi->s_mmp_tsk) { +kthread_stop (sbi->s_mmp_tsk); +brelse (sbi->s_mmp_bh); + sbi->s_mmp_tsk =NULL ; + } +} +/* * Get a random new sequence number but make sure it is not greater than * EXT4_MMP_SEQ_MAX.
@@ -275,7 +281,6 @@ int ext4_multi_mount_protect(struct super_block *sb,struct ext4_super_block *es =EXT4_SB (sb)->s_es;struct buffer_head *bh =NULL ;struct mmp_struct *mmp =NULL ; -struct mmpd_data *mmpd_data;u32 seq;unsigned int mmp_check_interval =le16_to_cpu (es->s_mmp_update_interval);unsigned int wait_time =0 ;
@@ -364,24 +369,17 @@ skip: goto failed; } - mmpd_data =kmalloc (sizeof (*mmpd_data),GFP_KERNEL ); -if (!mmpd_data) { -ext4_warning (sb,"not enough memory for mmpd_data" ); - goto failed; - } - mmpd_data->sb = sb; - mmpd_data->bh = bh; +EXT4_SB (sb)->s_mmp_bh = bh;/* * Start a kernel thread to update the MMP block periodically. */ -EXT4_SB (sb)->s_mmp_tsk =kthread_run (kmmpd, mmpd_data,"kmmpd-%.*s" , +EXT4_SB (sb)->s_mmp_tsk =kthread_run (kmmpd, sb,"kmmpd-%.*s" , (int )sizeof (mmp->mmp_bdevname),bdevname (bh->b_bdev, mmp->mmp_bdevname));if (IS_ERR (EXT4_SB (sb)->s_mmp_tsk)) {EXT4_SB (sb)->s_mmp_tsk =NULL ; -kfree (mmpd_data);ext4_warning (sb,"Unable to create kmmpd thread for %s." , sb->s_id); goto failed;
fs/ext4/super.c +4 -6
@@ -1245,8 +1245,8 @@ static void ext4_put_super(struct super_block *sb)ext4_xattr_destroy_cache (sbi->s_ea_block_cache); sbi->s_ea_block_cache =NULL ; -if (sbi->s_mmp_tsk) -kthread_stop (sbi->s_mmp_tsk); +ext4_stop_mmpd (sbi); +brelse (sbi->s_sbh); sb->s_fs_info =NULL ;/*
@@ -5194,8 +5194,7 @@ failed_mount3a: failed_mount3:flush_work (&sbi->s_error_work);del_timer_sync (&sbi->s_err_report); -if (sbi->s_mmp_tsk) -kthread_stop (sbi->s_mmp_tsk); +ext4_stop_mmpd (sbi); failed_mount2:rcu_read_lock (); group_desc =rcu_dereference (sbi->s_group_desc);
@@ -5997,8 +5996,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)*/ ext4_mark_recovery_complete (sb, es); } -if (sbi->s_mmp_tsk) -kthread_stop (sbi->s_mmp_tsk); +ext4_stop_mmpd (sbi); }else {/* Make sure we can mount this feature set readwrite */ if (ext4_has_feature_readonly(sb) ||
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 111/266 ice: fix incorrect payload indicator on PTYPE
In reply to Greg Kroah-HartmanFrom: Jacob Keller <[email protected]>
[ Upstream commit 638a0c8c8861cb8a3b54203e632ea5dcc23d8ca5 ]
The entry for PTYPE 90 indicates that the payload is layer 3. This does not match the specification in the datasheet which indicates the packet is a MAC, IPv6, UDP packet, with a payload in layer 4.
Fix the lookup table to match the data sheet.
--- drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h +1 -1
@@ -744,7 +744,7 @@ static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = {/* Non Tunneled IPv6 */ ICE_PTT (88 ,IP ,IPV6 ,FRG ,NONE ,NONE ,NOF ,NONE ,PAY3 ),ICE_PTT (89 ,IP ,IPV6 ,NOF ,NONE ,NONE ,NOF ,NONE ,PAY3 ), -ICE_PTT (90 ,IP ,IPV6 ,NOF ,NONE ,NONE ,NOF ,UDP ,PAY3 ), +ICE_PTT (90 ,IP ,IPV6 ,NOF ,NONE ,NONE ,NOF ,UDP ,PAY4 ),ICE_PTT_UNUSED_ENTRY (91 ),ICE_PTT (92 ,IP ,IPV6 ,NOF ,NONE ,NONE ,NOF ,TCP ,PAY4 ), ICE_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 112/266 ice: mark PTYPE 2 as reserved
In reply to Greg Kroah-HartmanFrom: Jacob Keller <[email protected]>
[ Upstream commit 0c526d440f76676733cb470b454db9d5507a3a50 ]
The entry for PTYPE 2 in the ice_ptype_lkup table incorrectly states that this is an L2 packet with no payload. According to the datasheet, this PTYPE is actually unused and reserved.
Fix the lookup entry to indicate this is an unused entry that is reserved.
--- drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h +1 -1
@@ -630,7 +630,7 @@ static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = {/* L2 Packet types */ ICE_PTT_UNUSED_ENTRY (0 ),ICE_PTT (1 ,L2 ,NONE ,NOF ,NONE ,NONE ,NOF ,NONE ,PAY2 ), -ICE_PTT (2 ,L2 ,NONE ,NOF ,NONE ,NONE ,NOF ,NONE ,NONE ), +ICE_PTT_UNUSED_ENTRY (2 ),ICE_PTT_UNUSED_ENTRY (3 ),ICE_PTT_UNUSED_ENTRY (4 ), ICE_PTT_UNUSED_ENTRY(5),
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 113/266 mt76: mt7615: fix fixed-rate tx status reporting
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit ec8f1a90d006f7cedcf86ef19fd034a406a213d6 ]
Rely on the txs fixed-rate bit instead of info->control.rates
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +4 -6
@@ -1235,22 +1235,20 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,int first_idx =0 , last_idx;int i, idx, count;bool fixed_rate, ack_timeout; -bool probe, ampdu, cck = false; +bool ampdu, cck = false;bool rs_idx;u32 rate_set_tsf;u32 final_rate, final_rate_flags, final_nss, txs; - fixed_rate = info->status.rates[0 ].count; - probe = !!(info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ); - txs =le32_to_cpu (txs_data[1 ]); - ampdu = !fixed_rate && (txs &MT_TXS1_AMPDU ); + ampdu = txs &MT_TXS1_AMPDU ; txs =le32_to_cpu (txs_data[3 ]); count =FIELD_GET (MT_TXS3_TX_COUNT , txs); last_idx =FIELD_GET (MT_TXS3_LAST_TX_RATE , txs); txs =le32_to_cpu (txs_data[0 ]); + fixed_rate = txs &MT_TXS0_FIXED_RATE ; final_rate =FIELD_GET (MT_TXS0_TX_RATE , txs); ack_timeout = txs &MT_TXS0_ACK_TIMEOUT ;
@@ -1272,7 +1270,7 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta, first_idx =max_t (int,0 , last_idx - (count -1 ) /MT7615_RATE_RETRY ); -if (fixed_rate && !probe) { +if (fixed_rate) { info->status.rates[0 ].count = count; i =0 ; goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 74/266 ice: set the value of global config lock timeout longer
In reply to Greg Kroah-HartmanFrom: Liwei Song <[email protected]>
[ Upstream commit fb3612840d4f587a0af9511a11d7989d1fa48206 ]
It may need hold Global Config Lock a longer time when download DDP package file, extend the timeout value to 5000ms to ensure that download can be finished before other AQ command got time to run, this will fix the issue below when probe the device, 5000ms is a test value that work with both Backplane and BreakoutCable NVM image:
ice 0000:f4:00.0: VSI 12 failed lan queue config, error ICE_ERR_CFG ice 0000:f4:00.0: Failed to delete VSI 12 in FW - error: ICE_ERR_AQ_TIMEOUT ice 0000:f4:00.0: probe failed due to setup PF switch: -12
ice: probe of 0000:f4:00.0 failed with error -12
--- drivers/net/ethernet/intel/ice/ice_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_type.h +1 -1
@@ -63,7 +63,7 @@ enum ice_aq_res_ids {/* FW update timeout definitions are in milliseconds */ #define ICE_NVM_TIMEOUT 180000#define ICE_CHANGE_LOCK_TIMEOUT 1000 -#define ICE_GLOBAL_CFG_LOCK_TIMEOUT 3000 +#define ICE_GLOBAL_CFG_LOCK_TIMEOUT 5000enum ice_aq_res_access_type {ICE_RES_READ =1 ,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 75/266 ice: fix clang warning regarding deadcode.DeadStores
In reply to Greg Kroah-HartmanFrom: Paul M Stillwell Jr <[email protected]>
[ Upstream commit 7e94090ae13e1ae5fe8bd3a9cd08136260bb7039 ]
clang generates deadcode.DeadStores warnings when a variable is used to read a value, but then that value isn't used later in the code. Fix this warning.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +1 -5
@@ -3462,13 +3462,9 @@ static int ice_get_rc_coalesce(struct ethtool_coalesce *ec, enum ice_container_type c_type, struct ice_ring_container *rc) { - struct ice_pf *pf; - if (!rc->ring) return -EINVAL; - pf = rc->ring->vsi->back; -switch (c_type) {case ICE_RX_CONTAINER : ec->use_adaptive_rx_coalesce =ITR_IS_DYNAMIC (rc);
@@ -3480,7 +3476,7 @@ ice_get_rc_coalesce(struct ethtool_coalesce *ec, enum ice_container_type c_type, ec->tx_coalesce_usecs = rc->itr_setting;break ;default : -dev_dbg (ice_pf_to_dev (pf),"Invalid c_type %d\n" , c_type); +dev_dbg (ice_pf_to_dev (rc->ring->vsi->back),"Invalid c_type %d\n" , c_type);return -EINVAL ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 76/266 virtio_net: Remove BUG() to avoid machine dead
In reply to Greg Kroah-HartmanFrom: Xianting Tian <[email protected]>
[ Upstream commit 85eb1389458d134bdb75dad502cc026c3753a619 ]
We should not directly BUG() when there is hdr error, it is better to output a print when such error happens. Currently, the caller of xmit_skb() already did it.
--- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/virtio_net.c +1 -1
@@ -1625,7 +1625,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)if (virtio_net_hdr_from_skb (skb, &hdr->hdr,virtio_is_little_endian (vi->vdev), false,0 )) -BUG (); +return -EPROTO ;if (vi->mergeable_rx_bufs) hdr->num_buffers =0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 114/266 mt76: dma: use ieee80211_tx_status_ext to free packets when tx fails
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 94e4f5794627a80ce036c35b32a9900daeb31be3 ]
Fixes AQL issues on full queues, especially with 802.3 encap offload
--- drivers/net/wireless/mediatek/mt76/dma.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +12 -6
@@ -349,6 +349,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, struct sk_buff *skb, struct mt76_wcid *wcid, struct ieee80211_sta *sta) { + struct ieee80211_tx_status status = { + .sta = sta, + };struct mt76_tx_info tx_info = { .skb = skb, };
@@ -360,11 +363,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,u8 *txwi; t =mt76_get_txwi (dev); -if (!t) { - hw =mt76_tx_status_get_hw (dev, skb); -ieee80211_free_txskb (hw, skb); -return -ENOMEM ; - } +if (!t) + goto free_skb; + txwi =mt76_get_txwi_ptr (dev, t); skb->prev = skb->next =NULL ;
@@ -427,8 +428,13 @@ free: }#endif -dev_kfree_skb (tx_info.skb);mt76_put_txwi (dev, t); + +free_skb: + status.skb = tx_info.skb; + hw =mt76_tx_status_get_hw (dev, tx_info.skb); +ieee80211_tx_status_ext (hw, &status); +return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 77/266 net: mscc: ocelot: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f1fe19c2cb3fdc92a614cf330ced1613f8f1a681 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/dsa/ocelot/seville_vsc9953.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/dsa/ocelot/seville_vsc9953.c +5 -0
@@ -1206,6 +1206,11 @@ static int seville_probe(struct platform_device *pdev) felix->info = &seville_info_vsc9953; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { + err = -EINVAL ; +dev_err (&pdev->dev,"Invalid resource\n" ); + goto err_alloc_felix; + } felix->switch_base = res->start; ds =kzalloc (sizeof (struct dsa_switch ),GFP_KERNEL );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 78/266 net: bcmgenet: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 74325bf0104573c6dfce42837139aeef3f34be76 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/broadcom/genet/bcmmii.c +4 -0
@@ -423,6 +423,10 @@ static int bcmgenet_mii_register(struct bcmgenet_priv *priv)int id, ret; pres =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!pres) { +dev_err (&pdev->dev,"Invalid resource\n" ); +return -EINVAL ; + }memset (&res,0 ,sizeof (res));memset (&ppd,0 ,sizeof (ppd));
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 69/266 dm writecache: dont split bios when overwriting contiguous cache content
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
[ Upstream commit ee50cc19d80e9b9a8283d1fb517a778faf2f6899 ]
If dm-writecache overwrites existing cached data, it splits the incoming bio into many block-sized bios. The I/O scheduler does merge these bios into one large request but this needless splitting and merging causes performance degradation.
Fix this by avoiding bio splitting if the cache target area that is being overwritten is contiguous.
--- drivers/md/dm-writecache.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-)
drivers/md/dm-writecache.c +30 -8
@@ -1360,14 +1360,18 @@ read_next_block: }else { do { bool found_entry = false; + bool search_used = false; if (writecache_has_error(wc)) goto unlock_error; e = writecache_find_entry(wc, bio->bi_iter.bi_sector, 0); if (e) { - if (!writecache_entry_is_committed(wc, e)) + if (!writecache_entry_is_committed(wc, e)) { + search_used = true; goto bio_copy; + } if (!WC_MODE_PMEM(wc) && !e->write_in_progress) { wc->overwrote_committed = true; + search_used = true; goto bio_copy; } found_entry = true;
@@ -1404,13 +1408,31 @@ bio_copy:sector_t current_cache_sec = start_cache_sec + (bio_size >>SECTOR_SHIFT );while (bio_size < bio->bi_iter.bi_size) { -struct wc_entry *f =writecache_pop_from_freelist (wc, current_cache_sec); -if (!f) -break ; -write_original_sector_seq_count (wc, f, bio->bi_iter.bi_sector + - (bio_size >>SECTOR_SHIFT ), wc->seq_count); -writecache_insert_entry (wc, f); - wc->uncommitted_blocks++; +if (!search_used) { +struct wc_entry *f =writecache_pop_from_freelist (wc, current_cache_sec); +if (!f) +break ; +write_original_sector_seq_count (wc, f, bio->bi_iter.bi_sector + + (bio_size >>SECTOR_SHIFT ), wc->seq_count); +writecache_insert_entry (wc, f); + wc->uncommitted_blocks++; + }else { +struct wc_entry *f; +struct rb_node *next =rb_next (&e->rb_node); +if (!next) +break ; + f = container_of(next, struct wc_entry, rb_node); +if (f != e +1 ) +break ; +if (read_original_sector (wc, f) != +read_original_sector (wc, e) + (wc->block_size >>SECTOR_SHIFT )) +break ; +if (unlikely (f->write_in_progress)) +break ; +if (writecache_entry_is_committed (wc, f)) + wc->overwrote_committed = true; + e = f; + } bio_size += wc->block_size; current_cache_sec += wc->block_size >>SECTOR_SHIFT ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 116/266 net: ipa: Add missing of_node_put() in ipa_firmware_load()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b244163f2c45c12053cb0291c955f892e79ed8a9 ]
This node pointer is returned by of_parse_phandle() with refcount incremented in this function. of_node_put() on it before exiting this function.
--- drivers/net/ipa/ipa_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ipa/ipa_main.c +1 -0
@@ -529,6 +529,7 @@ static int ipa_firmware_load(struct device *dev) } ret =of_address_to_resource (node,0 , &res); +of_node_put (node);if (ret) {dev_err (dev,"error %d getting \"memory-region\" resource\n" , ret);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 131/266 net: fec: add FEC_QUIRK_HAS_MULTI_QUEUES represents i.MX6SX ENET IP
In reply to Greg Kroah-HartmanFrom: Joakim Zhang <[email protected]>
[ Upstream commit 471ff4455d61c9929ae912328859921708e1eafc ]
Frieder Schrempf reported a TX throuthput issue [1], it happens quite often that the measured bandwidth in TX direction drops from its expected/nominal value to something like ~50% (for 100M) or ~67% (for 1G) connections.
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
The issue becomes clear after digging into it, Net core would select queues when transmitting packets. Since FEC have not impletemented ndo_select_queue callback yet, so it will call netdev_pick_tx to select queues randomly.
For i.MX6SX ENET IP with AVB support, driver default enables this feature. According to the setting of QOS/RCMRn/DMAnCFG registers, AVB configured to Credit-based scheme, 50% bandwidth of each queue 1&2.
With below tests let me think more:
1) With FEC_QUIRK_HAS_AVB quirk, can reproduce TX bandwidth fluctuations issue.
2) Without FEC_QUIRK_HAS_AVB quirk, can't reproduce TX bandwidth fluctuations issue.
The related difference with or w/o FEC_QUIRK_HAS_AVB quirk is that, whether we program FTYPE field of TxBD or not. As I describe above, AVB feature is enabled by default. With FEC_QUIRK_HAS_AVB quirk, frames in queue 0 marked as non-AVB, and frames in queue 1&2 marked as AVB Class A&B. It's unreasonable if frames in queue 1&2 are not required to be time-sensitive. So when Net core select tx queues ramdomly, Credit-based scheme would work and lead to TX bandwidth fluctuated. On the other hand, w/o FEC_QUIRK_HAS_AVB quirk, frames in queue 1&2 are all marked as non-AVB, so Credit-based scheme would not work.
Till now, how can we fix this TX throughput issue? Yes, please remove FEC_QUIRK_HAS_AVB quirk if you suffer it from time-nonsensitive networking. However, this quirk is used to indicate i.MX6SX, other setting depends on it. So this patch adds a new quirk FEC_QUIRK_HAS_MULTI_QUEUES to represent i.MX6SX, it is safe for us remove FEC_QUIRK_HAS_AVB quirk now.
FEC_QUIRK_HAS_AVB quirk is set by default in the driver, and users may not know much about driver details, they would waste effort to find the root cause, that is not we want. The following patch is a implementation to fix it and users don't need to modify the driver.
--- drivers/net/ethernet/freescale/fec.h | 5 +++++ drivers/net/ethernet/freescale/fec_main.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/fec.h +5 -0
@@ -467,6 +467,11 @@ struct bufdesc_ex {*/ #define FEC_QUIRK_NO_HARD_RESET (1 << 18) +/* i.MX6SX ENET IP supports multiple queues (3 queues), use this quirk to +* represents this ENET IP. +*/ +#define FEC_QUIRK_HAS_MULTI_QUEUES (1 << 19) +struct bufdesc_prop {int qid;/* Address of Rx and Tx buffers */
drivers/net/ethernet/freescale/fec_main.c +6 -5
@@ -122,7 +122,7 @@ static const struct fec_devinfo fec_imx6x_info = {FEC_QUIRK_HAS_VLAN |FEC_QUIRK_HAS_AVB |FEC_QUIRK_ERR007885 |FEC_QUIRK_BUG_CAPTURE |FEC_QUIRK_HAS_RACC |FEC_QUIRK_HAS_COALESCE | - FEC_QUIRK_CLEAR_SETUP_MII, + FEC_QUIRK_CLEAR_SETUP_MII | FEC_QUIRK_HAS_MULTI_QUEUES, }; static const struct fec_devinfo fec_imx6ul_info = {
@@ -421,6 +421,7 @@ fec_enet_txq_submit_frag_skb(struct fec_enet_priv_tx_q *txq, estatus |=FEC_TX_BD_FTYPE (txq->bd.qid);if (skb->ip_summed ==CHECKSUM_PARTIAL ) estatus |=BD_ENET_TX_PINS |BD_ENET_TX_IINS ; + ebdp->cbd_bdu =0 ; ebdp->cbd_esc =cpu_to_fec32 (estatus); }
@@ -954,7 +955,7 @@ fec_restart(struct net_device *ndev)* For i.MX6SX SOC, enet use AXI bus, we use disable MAC * instead of reset MAC itself. */ -if (fep->quirks &FEC_QUIRK_HAS_AVB || +if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES || ((fep->quirks &FEC_QUIRK_NO_HARD_RESET ) && fep->link)) {writel (0 , fep->hwp +FEC_ECNTRL ); }else {
@@ -1165,7 +1166,7 @@ fec_stop(struct net_device *ndev)* instead of reset MAC itself. */ if (!(fep->wol_flag &FEC_WOL_FLAG_SLEEP_ON )) { -if (fep->quirks &FEC_QUIRK_HAS_AVB ) { +if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES ) {writel (0 , fep->hwp +FEC_ECNTRL ); }else {writel (1 , fep->hwp +FEC_ECNTRL );
@@ -2570,7 +2571,7 @@ static void fec_enet_itr_coal_set(struct net_device *ndev)writel (tx_itr, fep->hwp +FEC_TXIC0 );writel (rx_itr, fep->hwp +FEC_RXIC0 ); -if (fep->quirks &FEC_QUIRK_HAS_AVB ) { +if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES ) {writel (tx_itr, fep->hwp +FEC_TXIC1 );writel (rx_itr, fep->hwp +FEC_RXIC1 );writel (tx_itr, fep->hwp +FEC_TXIC2 );
@@ -3371,7 +3372,7 @@ static int fec_enet_init(struct net_device *ndev) fep->csum_flags |=FLAG_RX_CSUM_ENABLED ; } -if (fep->quirks &FEC_QUIRK_HAS_AVB ) { +if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES ) { fep->tx_align =0 ; fep->rx_align =0x3f ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 128/266 mt76: fix iv and CCMP header insertion
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit c368362c36d3d4cedbc9a1c9caa95960912cc429 ]
The iv from RXD is only for TKIP_RSC/CCMP_PN/GCMP_PN, and it needs a check for CCMP header insertion. Move mt76_cipher_type to mt76.h to reduce duplicated code.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 16 +++++ .../net/wireless/mediatek/mt76/mt7603/mac.c | 33 +++++++--- .../net/wireless/mediatek/mt76/mt7603/regs.h | 12 ---- .../net/wireless/mediatek/mt76/mt7615/mac.c | 64 +++++++++++++++---- .../net/wireless/mediatek/mt76/mt7615/mac.h | 42 ------------ .../net/wireless/mediatek/mt76/mt76x02_mac.c | 28 ++++---- .../net/wireless/mediatek/mt76/mt76x02_regs.h | 18 +++--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 29 ++++++--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 30 ++++----- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 23 ++++--- .../net/wireless/mediatek/mt76/mt7921/mac.c | 29 ++++++--- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 30 ++++----- .../net/wireless/mediatek/mt76/mt7921/mcu.h | 23 ++++--- 13 files changed, 208 insertions(+), 169 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +16 -0
@@ -87,6 +87,22 @@ enum mt76_rxq_id {__MT_RXQ_MAX }; +enum mt76_cipher_type { +MT_CIPHER_NONE , +MT_CIPHER_WEP40 , +MT_CIPHER_TKIP , +MT_CIPHER_TKIP_NO_MIC , +MT_CIPHER_AES_CCMP , +MT_CIPHER_WEP104 , +MT_CIPHER_BIP_CMAC_128 , +MT_CIPHER_WEP128 , +MT_CIPHER_WAPI , +MT_CIPHER_CCMP_CCX , +MT_CIPHER_CCMP_256 , +MT_CIPHER_GCMP , +MT_CIPHER_GCMP_256 , +}; +struct mt76_queue_buf {dma_addr_t addr;u16 len;
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +23 -10
@@ -550,14 +550,27 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)u8 *data = (u8 *)rxd;if (status->flag &RX_FLAG_DECRYPTED ) { - status->iv[0 ] = data[5 ]; - status->iv[1 ] = data[4 ]; - status->iv[2 ] = data[3 ]; - status->iv[3 ] = data[2 ]; - status->iv[4 ] = data[1 ]; - status->iv[5 ] = data[0 ]; - - insert_ccmp_hdr =FIELD_GET (MT_RXD2_NORMAL_FRAG , rxd2); +switch (FIELD_GET (MT_RXD2_NORMAL_SEC_MODE , rxd2)) { +case MT_CIPHER_AES_CCMP : +case MT_CIPHER_CCMP_CCX : +case MT_CIPHER_CCMP_256 : + insert_ccmp_hdr = +FIELD_GET (MT_RXD2_NORMAL_FRAG , rxd2); + fallthrough; +case MT_CIPHER_TKIP : +case MT_CIPHER_TKIP_NO_MIC : +case MT_CIPHER_GCMP : +case MT_CIPHER_GCMP_256 : + status->iv[0 ] = data[5 ]; + status->iv[1 ] = data[4 ]; + status->iv[2 ] = data[3 ]; + status->iv[3 ] = data[2 ]; + status->iv[4 ] = data[1 ]; + status->iv[5 ] = data[0 ]; +break ; +default : +break ; + } } rxd +=4 ;
@@ -831,7 +844,7 @@ void mt7603_wtbl_set_rates(struct mt7603_dev *dev, struct mt7603_sta *sta, sta->wcid.tx_info |=MT_WCID_TX_INFO_SET ; } -static enum mt7603_cipher_type +static enum mt76_cipher_type mt7603_mac_get_key_info (struct ieee80211_key_conf *key,u8 *key_data) {memset (key_data,0 ,32 );
@@ -863,7 +876,7 @@ mt7603_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)int mt7603_wtbl_set_key (struct mt7603_dev *dev,int wcid,struct ieee80211_key_conf *key) { -enum mt7603_cipher_type cipher; +enum mt76_cipher_type cipher;u32 addr =mt7603_wtbl3_addr (wcid);u8 key_data[32 ];int key_len =sizeof (key_data);
drivers/net/wireless/mediatek/mt76/mt7603/regs.h +0 -12
@@ -765,16 +765,4 @@ enum {#define MT_WTBL1_OR (MT_WTBL1_BASE + 0x2300)#define MT_WTBL1_OR_PSM_WRITE BIT(31) -enum mt7603_cipher_type { -MT_CIPHER_NONE , -MT_CIPHER_WEP40 , -MT_CIPHER_TKIP , -MT_CIPHER_TKIP_NO_MIC , -MT_CIPHER_AES_CCMP , -MT_CIPHER_WEP104 , -MT_CIPHER_BIP_CMAC_128 , -MT_CIPHER_WEP128 , -MT_CIPHER_WAPI , -}; -#endif
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +52 -12
100 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mac.h +0 -42
48 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +14 -14
@@ -34,24 +34,24 @@ mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data) {memset (key_data,0 ,32 );if (!key) -return MT_CIPHER_NONE ; +return MT76X02_CIPHER_NONE ;if (key->keylen >32 ) -return MT_CIPHER_NONE ; +return MT76X02_CIPHER_NONE ;memcpy (key_data, key->key, key->keylen);switch (key->cipher) {case WLAN_CIPHER_SUITE_WEP40 : -return MT_CIPHER_WEP40 ; +return MT76X02_CIPHER_WEP40 ;case WLAN_CIPHER_SUITE_WEP104 : -return MT_CIPHER_WEP104 ; +return MT76X02_CIPHER_WEP104 ;case WLAN_CIPHER_SUITE_TKIP : -return MT_CIPHER_TKIP ; +return MT76X02_CIPHER_TKIP ;case WLAN_CIPHER_SUITE_CCMP : -return MT_CIPHER_AES_CCMP ; +return MT76X02_CIPHER_AES_CCMP ;default : -return MT_CIPHER_NONE ; +return MT76X02_CIPHER_NONE ; } }
@@ -63,7 +63,7 @@ int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,u32 val; cipher =mt76x02_mac_get_key_info (key, key_data); -if (cipher ==MT_CIPHER_NONE && key) +if (cipher ==MT76X02_CIPHER_NONE && key)return -EOPNOTSUPP ; val =mt76_rr (dev,MT_SKEY_MODE (vif_idx));
@@ -91,10 +91,10 @@ void mt76x02_mac_wcid_sync_pn(struct mt76x02_dev *dev, u8 idx, eiv =mt76_rr (dev,MT_WCID_IV (idx) +4 ); pn = (u64 )eiv <<16 ; -if (cipher ==MT_CIPHER_TKIP ) { +if (cipher ==MT76X02_CIPHER_TKIP ) { pn |= (iv >>16 ) &0xff ; pn |= (iv &0xff ) <<8 ; - }else if (cipher >=MT_CIPHER_AES_CCMP ) { + }else if (cipher >=MT76X02_CIPHER_AES_CCMP ) { pn |= iv &0xffff ; }else {return ;
@@ -112,7 +112,7 @@ int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,u64 pn; cipher =mt76x02_mac_get_key_info (key, key_data); -if (cipher ==MT_CIPHER_NONE && key) +if (cipher ==MT76X02_CIPHER_NONE && key)return -EOPNOTSUPP ;mt76_wr_copy (dev,MT_WCID_KEY (idx), key_data,sizeof (key_data));
@@ -126,16 +126,16 @@ int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx, pn =atomic64_read (&key->tx_pn); iv_data[3 ] = key->keyidx <<6 ; -if (cipher >=MT_CIPHER_TKIP ) { +if (cipher >=MT76X02_CIPHER_TKIP ) { iv_data[3 ] |=0x20 ;put_unaligned_le32 (pn >>16 , &iv_data[4 ]); } -if (cipher ==MT_CIPHER_TKIP ) { +if (cipher ==MT76X02_CIPHER_TKIP ) { iv_data[0 ] = (pn >>8 ) &0xff ; iv_data[1 ] = (iv_data[0 ] |0x20 ) &0x7f ; iv_data[2 ] = pn &0xff ; - }else if (cipher >=MT_CIPHER_AES_CCMP ) { + }else if (cipher >=MT76X02_CIPHER_AES_CCMP ) {put_unaligned_le16 ((pn &0xffff ), &iv_data[0 ]); } }
drivers/net/wireless/mediatek/mt76/mt76x02_regs.h +9 -9
@@ -692,15 +692,15 @@ struct mt76_wcid_key { } __packed __aligned(4);enum mt76x02_cipher_type { -MT_CIPHER_NONE , -MT_CIPHER_WEP40 , -MT_CIPHER_WEP104 , -MT_CIPHER_TKIP , -MT_CIPHER_AES_CCMP , -MT_CIPHER_CKIP40 , -MT_CIPHER_CKIP104 , -MT_CIPHER_CKIP128 , -MT_CIPHER_WAPI , +MT76X02_CIPHER_NONE , +MT76X02_CIPHER_WEP40 , +MT76X02_CIPHER_WEP104 , +MT76X02_CIPHER_TKIP , +MT76X02_CIPHER_AES_CCMP , +MT76X02_CIPHER_CKIP40 , +MT76X02_CIPHER_CKIP104 , +MT76X02_CIPHER_CKIP128 , +MT76X02_CIPHER_WAPI , };#endif
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +21 -8
@@ -412,14 +412,27 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)u8 *data = (u8 *)rxd;if (status->flag &RX_FLAG_DECRYPTED ) { - status->iv[0 ] = data[5 ]; - status->iv[1 ] = data[4 ]; - status->iv[2 ] = data[3 ]; - status->iv[3 ] = data[2 ]; - status->iv[4 ] = data[1 ]; - status->iv[5 ] = data[0 ]; - - insert_ccmp_hdr =FIELD_GET (MT_RXD2_NORMAL_FRAG , rxd2); +switch (FIELD_GET (MT_RXD1_NORMAL_SEC_MODE , rxd1)) { +case MT_CIPHER_AES_CCMP : +case MT_CIPHER_CCMP_CCX : +case MT_CIPHER_CCMP_256 : + insert_ccmp_hdr = +FIELD_GET (MT_RXD2_NORMAL_FRAG , rxd2); + fallthrough; +case MT_CIPHER_TKIP : +case MT_CIPHER_TKIP_NO_MIC : +case MT_CIPHER_GCMP : +case MT_CIPHER_GCMP_256 : + status->iv[0 ] = data[5 ]; + status->iv[1 ] = data[4 ]; + status->iv[2 ] = data[3 ]; + status->iv[3 ] = data[2 ]; + status->iv[4 ] = data[1 ]; + status->iv[5 ] = data[0 ]; +break ; +default : +break ; + } } rxd +=4 ;if ((u8 *)rxd - skb->data >= skb->len)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +15 -15
@@ -88,28 +88,28 @@ struct mt7915_fw_region {#define HE_PHY (p, c) u8_get_bits(c, IEEE80211_HE_PHY_##p)#define HE_MAC (m, c) u8_get_bits(c, IEEE80211_HE_MAC_##m) -static enum mt7915_cipher_type +static enum mcu_cipher_type mt7915_mcu_get_cipher (int cipher) {switch (cipher) {case WLAN_CIPHER_SUITE_WEP40 : -return MT_CIPHER_WEP40 ; +return MCU_CIPHER_WEP40 ;case WLAN_CIPHER_SUITE_WEP104 : -return MT_CIPHER_WEP104 ; +return MCU_CIPHER_WEP104 ;case WLAN_CIPHER_SUITE_TKIP : -return MT_CIPHER_TKIP ; +return MCU_CIPHER_TKIP ;case WLAN_CIPHER_SUITE_AES_CMAC : -return MT_CIPHER_BIP_CMAC_128 ; +return MCU_CIPHER_BIP_CMAC_128 ;case WLAN_CIPHER_SUITE_CCMP : -return MT_CIPHER_AES_CCMP ; +return MCU_CIPHER_AES_CCMP ;case WLAN_CIPHER_SUITE_CCMP_256 : -return MT_CIPHER_CCMP_256 ; +return MCU_CIPHER_CCMP_256 ;case WLAN_CIPHER_SUITE_GCMP : -return MT_CIPHER_GCMP ; +return MCU_CIPHER_GCMP ;case WLAN_CIPHER_SUITE_GCMP_256 : -return MT_CIPHER_GCMP_256 ; +return MCU_CIPHER_GCMP_256 ;case WLAN_CIPHER_SUITE_SMS4 : -return MT_CIPHER_WAPI ; +return MCU_CIPHER_WAPI ;default :return MT_CIPHER_NONE ; }
@@ -1072,14 +1072,14 @@ mt7915_mcu_sta_key_tlv(struct mt7915_sta *msta, struct sk_buff *skb, sec_key = &sec->key[0 ]; sec_key->cipher_len =sizeof (*sec_key); -if (cipher ==MT_CIPHER_BIP_CMAC_128 ) { - sec_key->cipher_id =MT_CIPHER_AES_CCMP ; +if (cipher ==MCU_CIPHER_BIP_CMAC_128 ) { + sec_key->cipher_id =MCU_CIPHER_AES_CCMP ; sec_key->key_id = bip->keyidx; sec_key->key_len =16 ;memcpy (sec_key->key, bip->key,16 ); sec_key = &sec->key[1 ]; - sec_key->cipher_id =MT_CIPHER_BIP_CMAC_128 ; + sec_key->cipher_id =MCU_CIPHER_BIP_CMAC_128 ; sec_key->cipher_len =sizeof (*sec_key); sec_key->key_len =16 ;memcpy (sec_key->key, key->key,16 );
@@ -1091,14 +1091,14 @@ mt7915_mcu_sta_key_tlv(struct mt7915_sta *msta, struct sk_buff *skb, sec_key->key_len = key->keylen;memcpy (sec_key->key, key->key, key->keylen); -if (cipher ==MT_CIPHER_TKIP ) { +if (cipher ==MCU_CIPHER_TKIP ) {/* Rx/Tx MIC keys are swapped */ memcpy (sec_key->key +16 , key->key +24 ,8 );memcpy (sec_key->key +24 , key->key +16 ,8 ); }/* store key_conf for BIP batch update */ -if (cipher ==MT_CIPHER_AES_CCMP ) { +if (cipher ==MCU_CIPHER_AES_CCMP ) {memcpy (bip->key, key->key, key->keylen); bip->keyidx = key->keyidx; }
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +11 -12
@@ -1034,18 +1034,17 @@ enum {STA_REC_MAX_NUM }; -enum mt7915_cipher_type { -MT_CIPHER_NONE , -MT_CIPHER_WEP40 , -MT_CIPHER_WEP104 , -MT_CIPHER_WEP128 , -MT_CIPHER_TKIP , -MT_CIPHER_AES_CCMP , -MT_CIPHER_CCMP_256 , -MT_CIPHER_GCMP , -MT_CIPHER_GCMP_256 , -MT_CIPHER_WAPI , -MT_CIPHER_BIP_CMAC_128 , +enum mcu_cipher_type { +MCU_CIPHER_WEP40 =1 , +MCU_CIPHER_WEP104 , +MCU_CIPHER_WEP128 , +MCU_CIPHER_TKIP , +MCU_CIPHER_AES_CCMP , +MCU_CIPHER_CCMP_256 , +MCU_CIPHER_GCMP , +MCU_CIPHER_GCMP_256 , +MCU_CIPHER_WAPI , +MCU_CIPHER_BIP_CMAC_128 , };enum {
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +21 -8
@@ -386,14 +386,27 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)u8 *data = (u8 *)rxd;if (status->flag &RX_FLAG_DECRYPTED ) { - status->iv[0 ] = data[5 ]; - status->iv[1 ] = data[4 ]; - status->iv[2 ] = data[3 ]; - status->iv[3 ] = data[2 ]; - status->iv[4 ] = data[1 ]; - status->iv[5 ] = data[0 ]; - - insert_ccmp_hdr =FIELD_GET (MT_RXD2_NORMAL_FRAG , rxd2); +switch (FIELD_GET (MT_RXD1_NORMAL_SEC_MODE , rxd1)) { +case MT_CIPHER_AES_CCMP : +case MT_CIPHER_CCMP_CCX : +case MT_CIPHER_CCMP_256 : + insert_ccmp_hdr = +FIELD_GET (MT_RXD2_NORMAL_FRAG , rxd2); + fallthrough; +case MT_CIPHER_TKIP : +case MT_CIPHER_TKIP_NO_MIC : +case MT_CIPHER_GCMP : +case MT_CIPHER_GCMP_256 : + status->iv[0 ] = data[5 ]; + status->iv[1 ] = data[4 ]; + status->iv[2 ] = data[3 ]; + status->iv[3 ] = data[2 ]; + status->iv[4 ] = data[1 ]; + status->iv[5 ] = data[0 ]; +break ; +default : +break ; + } } rxd +=4 ;if ((u8 *)rxd - skb->data >= skb->len)
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +15 -15
@@ -88,28 +88,28 @@ struct mt7921_fw_region {#define to_wcid_lo (id) FIELD_GET(GENMASK(7, 0), (u16)id)#define to_wcid_hi (id) FIELD_GET(GENMASK(9, 8), (u16)id) -static enum mt7921_cipher_type +static enum mcu_cipher_type mt7921_mcu_get_cipher (int cipher) {switch (cipher) {case WLAN_CIPHER_SUITE_WEP40 : -return MT_CIPHER_WEP40 ; +return MCU_CIPHER_WEP40 ;case WLAN_CIPHER_SUITE_WEP104 : -return MT_CIPHER_WEP104 ; +return MCU_CIPHER_WEP104 ;case WLAN_CIPHER_SUITE_TKIP : -return MT_CIPHER_TKIP ; +return MCU_CIPHER_TKIP ;case WLAN_CIPHER_SUITE_AES_CMAC : -return MT_CIPHER_BIP_CMAC_128 ; +return MCU_CIPHER_BIP_CMAC_128 ;case WLAN_CIPHER_SUITE_CCMP : -return MT_CIPHER_AES_CCMP ; +return MCU_CIPHER_AES_CCMP ;case WLAN_CIPHER_SUITE_CCMP_256 : -return MT_CIPHER_CCMP_256 ; +return MCU_CIPHER_CCMP_256 ;case WLAN_CIPHER_SUITE_GCMP : -return MT_CIPHER_GCMP ; +return MCU_CIPHER_GCMP ;case WLAN_CIPHER_SUITE_GCMP_256 : -return MT_CIPHER_GCMP_256 ; +return MCU_CIPHER_GCMP_256 ;case WLAN_CIPHER_SUITE_SMS4 : -return MT_CIPHER_WAPI ; +return MCU_CIPHER_WAPI ;default :return MT_CIPHER_NONE ; }
@@ -615,14 +615,14 @@ mt7921_mcu_sta_key_tlv(struct mt7921_sta *msta, struct sk_buff *skb, sec_key = &sec->key[0 ]; sec_key->cipher_len =sizeof (*sec_key); -if (cipher ==MT_CIPHER_BIP_CMAC_128 ) { - sec_key->cipher_id =MT_CIPHER_AES_CCMP ; +if (cipher ==MCU_CIPHER_BIP_CMAC_128 ) { + sec_key->cipher_id =MCU_CIPHER_AES_CCMP ; sec_key->key_id = bip->keyidx; sec_key->key_len =16 ;memcpy (sec_key->key, bip->key,16 ); sec_key = &sec->key[1 ]; - sec_key->cipher_id =MT_CIPHER_BIP_CMAC_128 ; + sec_key->cipher_id =MCU_CIPHER_BIP_CMAC_128 ; sec_key->cipher_len =sizeof (*sec_key); sec_key->key_len =16 ;memcpy (sec_key->key, key->key,16 );
@@ -634,14 +634,14 @@ mt7921_mcu_sta_key_tlv(struct mt7921_sta *msta, struct sk_buff *skb, sec_key->key_len = key->keylen;memcpy (sec_key->key, key->key, key->keylen); -if (cipher ==MT_CIPHER_TKIP ) { +if (cipher ==MCU_CIPHER_TKIP ) {/* Rx/Tx MIC keys are swapped */ memcpy (sec_key->key +16 , key->key +24 ,8 );memcpy (sec_key->key +24 , key->key +16 ,8 ); }/* store key_conf for BIP batch update */ -if (cipher ==MT_CIPHER_AES_CCMP ) { +if (cipher ==MCU_CIPHER_AES_CCMP ) {memcpy (bip->key, key->key, key->keylen); bip->keyidx = key->keyidx; }
drivers/net/wireless/mediatek/mt76/mt7921/mcu.h +11 -12
@@ -197,18 +197,17 @@ struct sta_rec_sec {struct sec_key key[2 ]; } __packed; -enum mt7921_cipher_type { -MT_CIPHER_NONE , -MT_CIPHER_WEP40 , -MT_CIPHER_WEP104 , -MT_CIPHER_WEP128 , -MT_CIPHER_TKIP , -MT_CIPHER_AES_CCMP , -MT_CIPHER_CCMP_256 , -MT_CIPHER_GCMP , -MT_CIPHER_GCMP_256 , -MT_CIPHER_WAPI , -MT_CIPHER_BIP_CMAC_128 , +enum mcu_cipher_type { +MCU_CIPHER_WEP40 =1 , +MCU_CIPHER_WEP104 , +MCU_CIPHER_WEP128 , +MCU_CIPHER_TKIP , +MCU_CIPHER_AES_CCMP , +MCU_CIPHER_CCMP_256 , +MCU_CIPHER_GCMP , +MCU_CIPHER_GCMP_256 , +MCU_CIPHER_WAPI , +MCU_CIPHER_BIP_CMAC_128 , };enum {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 130/266 MIPS: add PMD table accounting into MIPSpmd_alloc_one
In reply to Greg Kroah-HartmanFrom: Huang Pei <[email protected]>
[ Upstream commit ed914d48b6a1040d1039d371b56273d422c0081e ]
This fixes Page Table accounting bug.
MIPS is the ONLY arch just defining __HAVE_ARCH_PMD_ALLOC_ONE alone. Since commit b2b29d6d011944 (mm: account PMD tables like PTE tables), "pmd_free" in asm-generic with PMD table accounting and "pmd_alloc_one" in MIPS without PMD table accounting causes PageTable accounting number negative, which read by global_zone_page_state(), always returns 0.
--- arch/mips/include/asm/pgalloc.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/mips/include/asm/pgalloc.h +7 -3
@@ -59,11 +59,15 @@ do { \static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long address) { -pmd_t *pmd; +pmd_t *pmd =NULL ; +struct page *pg; - pmd = (pmd_t *)__get_free_pages (GFP_KERNEL ,PMD_ORDER ); -if (pmd) + pg =alloc_pages (GFP_KERNEL | __GFP_ACCOUNT,PMD_ORDER ); +if (pg) { +pgtable_pmd_page_ctor (pg); + pmd = (pmd_t *)page_address (pg);pmd_init ((unsigned long )pmd, (unsigned long )invalid_pte_table); + }return pmd; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 125/266 mt76: connac: fix UC entry is being overwritten
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 82453b1cbf9ef166364c12b5464251f16bac5f51 ]
Fix UC entry is being overwritten by BC entry
--- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 8 +++++--- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 10 ++++++---- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 1 + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 1 + 4 files changed, 13 insertions(+), 7 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +5 -3
@@ -1123,12 +1123,14 @@ mt7615_mcu_sta_rx_ba(struct mt7615_dev *dev,static int __mt7615_mcu_add_sta (struct mt76_phy *phy,struct ieee80211_vif *vif, -struct ieee80211_sta *sta,bool enable,int cmd) +struct ieee80211_sta *sta,bool enable,int cmd, +bool offload_fw) {struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;struct mt76_sta_cmd_info info = { .sta = sta, .vif = vif, + .offload_fw = offload_fw, .enable = enable, .cmd = cmd, };
@@ -1142,7 +1144,7 @@ mt7615_mcu_add_sta(struct mt7615_phy *phy, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool enable) {return __mt7615_mcu_add_sta (phy->mt76, vif, sta, enable, -MCU_EXT_CMD_STA_REC_UPDATE ); +MCU_EXT_CMD_STA_REC_UPDATE , false); }static const struct mt7615_mcu_ops sta_update_ops = {
@@ -1283,7 +1285,7 @@ mt7615_mcu_uni_add_sta(struct mt7615_phy *phy, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool enable) {return __mt7615_mcu_add_sta (phy->mt76, vif, sta, enable, -MCU_UNI_CMD_STA_REC_UPDATE ); +MCU_UNI_CMD_STA_REC_UPDATE , true); } static int
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +6 -4
@@ -841,10 +841,12 @@ int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,if (IS_ERR (skb))return PTR_ERR (skb); -mt76_connac_mcu_sta_basic_tlv (skb, info->vif, info->sta, info->enable); -if (info->enable && info->sta) -mt76_connac_mcu_sta_tlv (phy, skb, info->sta, info->vif, - info->rcpi); +if (info->sta || !info->offload_fw) +mt76_connac_mcu_sta_basic_tlv (skb, info->vif, info->sta, + info->enable); +if (info->sta && info->enable) +mt76_connac_mcu_sta_tlv (phy, skb, info->sta, + info->vif, info->rcpi); sta_wtbl =mt76_connac_mcu_add_tlv (skb,STA_REC_WTBL ,sizeof (struct tlv ));
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -0
@@ -899,6 +899,7 @@ struct mt76_sta_cmd_info {struct ieee80211_vif *vif; +bool offload_fw;bool enable;int cmd;u8 rcpi;
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +1 -0
@@ -1289,6 +1289,7 @@ int mt7921_mcu_sta_add(struct mt7921_dev *dev, struct ieee80211_sta *sta, .vif = vif, .enable = enable, .cmd = MCU_UNI_CMD_STA_REC_UPDATE, + .offload_fw = true, .rcpi = to_rcpi(rssi), };struct mt7921_sta *msta;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 126/266 mt76: connac: fix the maximum interval schedule scan can support
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit abded041a07467c2f3dfe10afd9ea10572c63cc9 ]
Maximum interval (in seconds) for schedule scan plan supported by the offload firmware can be U16_MAX.
--- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76_connac.h | 3 ++- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/init.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +1 -1
@@ -362,7 +362,7 @@ mt7615_init_wiphy(struct ieee80211_hw *hw) wiphy->reg_notifier = mt7615_regd_notifier; wiphy->max_sched_scan_plan_interval = -MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL ; +MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL ; wiphy->max_sched_scan_ie_len =IEEE80211_MAX_DATA_LEN ; wiphy->max_scan_ie_len =MT76_CONNAC_SCAN_IE_LEN ; wiphy->max_sched_scan_ssids =MT76_CONNAC_MAX_SCHED_SCAN_SSID ;
drivers/net/wireless/mediatek/mt76/mt76_connac.h +2 -1
@@ -7,7 +7,8 @@#include "mt76.h" #define MT76_CONNAC_SCAN_IE_LEN 600 -#define MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL 10 +#define MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL 10 +#define MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL U16_MAX#define MT76_CONNAC_MAX_SCHED_SCAN_SSID 10#define MT76_CONNAC_MAX_SCAN_MATCH 16
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -1
@@ -770,7 +770,7 @@ struct mt76_connac_sched_scan_req {u8 intervals_num;u8 scan_func;/* MT7663: BIT(0) eable random mac address */ struct mt76_connac_mcu_scan_channel channels[64 ]; -__le16 intervals[MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL ]; +__le16 intervals[MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL ]; union { struct { u8 random_mac[ETH_ALEN];
drivers/net/wireless/mediatek/mt76/mt7921/init.c +1 -1
@@ -93,7 +93,7 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) wiphy->max_scan_ie_len =MT76_CONNAC_SCAN_IE_LEN ; wiphy->max_scan_ssids =4 ; wiphy->max_sched_scan_plan_interval = -MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL ; +MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL ; wiphy->max_sched_scan_ie_len =IEEE80211_MAX_DATA_LEN ; wiphy->max_sched_scan_ssids =MT76_CONNAC_MAX_SCHED_SCAN_SSID ; wiphy->max_match_sets =MT76_CONNAC_MAX_SCAN_MATCH ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 127/266 mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit 2707ff4dd7b1479dbd44ebb3c74788084cc95245 ]
The value of station mode is always 0.
Fixed: 00b2e16e0063 ("mt76: mt7915: add TxBF capabilities")
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +3 -3
@@ -480,6 +480,9 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,if (nss <2 )return ; +/* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */ + elem->phy_cap_info[7 ] |=min_t (int, nss -1 ,2 ) <<3 ; +if (vif !=NL80211_IFTYPE_AP )return ;
@@ -493,9 +496,6 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap, c =IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB ; elem->phy_cap_info[6 ] |= c; - -/* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */ - elem->phy_cap_info[7 ] |=min_t (int, nss -1 ,2 ) <<3 ; } static void
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 129/266 rtl8xxxu: Fix device info for RTL8192EU devices
In reply to Greg Kroah-HartmanFrom: Pascal Terjan <[email protected]>
[ Upstream commit c240b044edefa3c3af4014a4030e017dd95b59a1 ]
Based on 2001:3319 and 2357:0109 which I used to test the fix and 0bda:818b and 2357:0108 for which I found efuse dumps online.
== 2357:0109 ==
=== Before ===
Vendor: Realtek
Product: \x03802.11n NI
Serial:
=== After ===
Vendor: Realtek
Product: 802.11n NIC
Serial not available.
== 2001:3319 ==
=== Before ===
Vendor: Realtek
Product: Wireless N
Serial: no USB Adap
=== After ===
Vendor: Realtek
Product: Wireless N Nano USB Adapter
Serial not available.
--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 11 +--- .../realtek/rtl8xxxu/rtl8xxxu_8192e.c | 59 +++++++++++++++++-- 2 files changed, 56 insertions(+), 14 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +3 -8
@@ -853,15 +853,10 @@ struct rtl8192eu_efuse {u8 usb_optional_function;u8 res9[2 ];u8 mac_addr[ETH_ALEN ];/* 0xd7 */ -u8 res10[2 ]; -u8 vendor_name[7 ]; -u8 res11[2 ]; -u8 device_name[0x0b ];/* 0xe8 */ -u8 res12[2 ]; -u8 serial[0x0b ];/* 0xf5 */ -u8 res13[0x30 ]; +u8 device_info[80 ]; +u8 res11[3 ];u8 unknown[0x0d ];/* 0x130 */ -u8 res14[0xc3 ]; +u8 res12[0xc3 ]; };struct rtl8xxxu_reg8val {
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +53 -6
74 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 133/266 atm: nicstar: use dma_free_coherent instead of kfree
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 6a1e5a4af17e440dd82a58a2c5f40ff17a82b722 ]
When 'nicstar_init_one' fails, 'ns_init_card_error' will be executed for error handling, but the correct memory free function should be used, otherwise it will cause an error. Since 'card->rsq.org' and 'card->tsq.org' are allocated using 'dma_alloc_coherent' function, they should be freed using 'dma_free_coherent'.
Fix this by using 'dma_free_coherent' instead of 'kfree'
This log reveals it:
[ 3.440294] kernel BUG at mm/slub.c:4206! [ 3.441059] invalid opcode: 0000 [#1] PREEMPT SMP PTI [ 3.441430] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.12.4-g70e7f0549188-dirty #141 [ 3.441986] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [ 3.442780] RIP: 0010:kfree+0x26a/0x300 [ 3.443065] Code: e8 3a c3 b9 ff e9 d6 fd ff ff 49 8b 45 00 31 db a9 00 00 01 00 75 4d 49 8b 45 00 a9 00 00 01 00 75 0a 49 8b 45 08 a8 01 75 02 <0f> 0b 89 d9 b8 00 10 00 00 be 06 00 00 00 48 d3 e0 f7 d8 48 63 d0 [ 3.443396] RSP: 0000:ffffc90000017b70 EFLAGS: 00010246 [ 3.443396] RAX: dead000000000100 RBX: 0000000000000000 RCX: 0000000000000000 [ 3.443396] RDX: 0000000000000000 RSI: ffffffff85d3df94 RDI: ffffffff85df38e6 [ 3.443396] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000001 [ 3.443396] R10: 0000000000000000 R11: 0000000000000001 R12: ffff888107dc0000 [ 3.443396] R13: ffffea00001f0100 R14: ffff888101a8bf00 R15: ffff888107dc0160 [ 3.443396] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) knlGS:0000000000000000 [ 3.443396] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.443396] CR2: 0000000000000000 CR3: 000000000642e000 CR4: 00000000000006e0 [ 3.443396] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3.443396] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3.443396] Call Trace: [ 3.443396] ns_init_card_error+0x12c/0x220 [ 3.443396] nicstar_init_one+0x10d2/0x1130 [ 3.443396] local_pci_probe+0x4a/0xb0 [ 3.443396] pci_device_probe+0x126/0x1d0 [ 3.443396] ? pci_device_remove+0x100/0x100 [ 3.443396] really_probe+0x27e/0x650 [ 3.443396] driver_probe_device+0x84/0x1d0 [ 3.443396] ? mutex_lock_nested+0x16/0x20 [ 3.443396] device_driver_attach+0x63/0x70 [ 3.443396] __driver_attach+0x117/0x1a0 [ 3.443396] ? device_driver_attach+0x70/0x70 [ 3.443396] bus_for_each_dev+0xb6/0x110 [ 3.443396] ? rdinit_setup+0x40/0x40 [ 3.443396] driver_attach+0x22/0x30 [ 3.443396] bus_add_driver+0x1e6/0x2a0 [ 3.443396] driver_register+0xa4/0x180 [ 3.443396] __pci_register_driver+0x77/0x80 [ 3.443396] ? uPD98402_module_init+0xd/0xd [ 3.443396] nicstar_init+0x1f/0x75 [ 3.443396] do_one_initcall+0x7a/0x3d0 [ 3.443396] ? rdinit_setup+0x40/0x40 [ 3.443396] ? rcu_read_lock_sched_held+0x4a/0x70 [ 3.443396] kernel_init_freeable+0x2a7/0x2f9 [ 3.443396] ? rest_init+0x2c0/0x2c0 [ 3.443396] kernel_init+0x13/0x180 [ 3.443396] ? rest_init+0x2c0/0x2c0 [ 3.443396] ? rest_init+0x2c0/0x2c0 [ 3.443396] ret_from_fork+0x1f/0x30 [ 3.443396] Modules linked in: [ 3.443396] Dumping ftrace buffer: [ 3.443396] (ftrace buffer empty) [ 3.458593] ---[ end trace 3c6f8f0d8ef59bcd ]--- [ 3.458922] RIP: 0010:kfree+0x26a/0x300 [ 3.459198] Code: e8 3a c3 b9 ff e9 d6 fd ff ff 49 8b 45 00 31 db a9 00 00 01 00 75 4d 49 8b 45 00 a9 00 00 01 00 75 0a 49 8b 45 08 a8 01 75 02 <0f> 0b 89 d9 b8 00 10 00 00 be 06 00 00 00 48 d3 e0 f7 d8 48 63 d0 [ 3.460499] RSP: 0000:ffffc90000017b70 EFLAGS: 00010246 [ 3.460870] RAX: dead000000000100 RBX: 0000000000000000 RCX: 0000000000000000 [ 3.461371] RDX: 0000000000000000 RSI: ffffffff85d3df94 RDI: ffffffff85df38e6 [ 3.461873] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000001 [ 3.462372] R10: 0000000000000000 R11: 0000000000000001 R12: ffff888107dc0000 [ 3.462871] R13: ffffea00001f0100 R14: ffff888101a8bf00 R15: ffff888107dc0160 [ 3.463368] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) knlGS:0000000000000000 [ 3.463949] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.464356] CR2: 0000000000000000 CR3: 000000000642e000 CR4: 00000000000006e0 [ 3.464856] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3.465356] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3.465860] Kernel panic - not syncing: Fatal exception [ 3.466370] Dumping ftrace buffer: [ 3.466616] (ftrace buffer empty) [ 3.466871] Kernel Offset: disabled [ 3.467122] Rebooting in 1 seconds..
--- drivers/atm/nicstar.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/atm/nicstar.c +4 -2
@@ -839,10 +839,12 @@ static void ns_init_card_error(ns_dev *card, int error)dev_kfree_skb_any (hb); }if (error >=12 ) { -kfree (card->rsq.org); +dma_free_coherent (&card->pcidev->dev,NS_RSQSIZE +NS_RSQ_ALIGNMENT , + card->rsq.org, card->rsq.dma); }if (error >=11 ) { -kfree (card->tsq.org); +dma_free_coherent (&card->pcidev->dev,NS_TSQSIZE +NS_TSQ_ALIGNMENT , + card->tsq.org, card->tsq.dma); }if (error >=10 ) {free_irq (card->pcidev->irq, card);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 134/266 atm: nicstar: register the interrupt handler in the right place
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 70b639dc41ad499384e41e106fce72e36805c9f2 ]
Because the error handling is sequential, the application of resources should be carried out in the order of error handling, so the operation of registering the interrupt handler should be put in front, so as not to free the unregistered interrupt handler during error handling.
This log reveals it:
[ 3.438724] Trying to free already-free IRQ 23 [ 3.439060] WARNING: CPU: 5 PID: 1 at kernel/irq/manage.c:1825 free_irq+0xfb/0x480 [ 3.440039] Modules linked in: [ 3.440257] CPU: 5 PID: 1 Comm: swapper/0 Not tainted 5.12.4-g70e7f0549188-dirty #142 [ 3.440793] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [ 3.441561] RIP: 0010:free_irq+0xfb/0x480 [ 3.441845] Code: 6e 08 74 6f 4d 89 f4 e8 c3 78 09 00 4d 8b 74 24 18 4d 85 f6 75 e3 e8 b4 78 09 00 8b 75 c8 48 c7 c7 a0 ac d5 85 e8 95 d7 f5 ff <0f> 0b 48 8b 75 c0 4c 89 ff e8 87 c5 90 03 48 8b 43 40 4c 8b a0 80 [ 3.443121] RSP: 0000:ffffc90000017b50 EFLAGS: 00010086 [ 3.443483] RAX: 0000000000000000 RBX: ffff888107c6f000 RCX: 0000000000000000 [ 3.443972] RDX: 0000000000000000 RSI: ffffffff8123f301 RDI: 00000000ffffffff [ 3.444462] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000003 [ 3.444950] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000 [ 3.444994] R13: ffff888107dc0000 R14: ffff888104f6bf00 R15: ffff888107c6f0a8 [ 3.444994] FS: 0000000000000000(0000) GS:ffff88817bd40000(0000) knlGS:0000000000000000 [ 3.444994] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.444994] CR2: 0000000000000000 CR3: 000000000642e000 CR4: 00000000000006e0 [ 3.444994] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3.444994] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3.444994] Call Trace: [ 3.444994] ns_init_card_error+0x18e/0x250 [ 3.444994] nicstar_init_one+0x10d2/0x1130 [ 3.444994] local_pci_probe+0x4a/0xb0 [ 3.444994] pci_device_probe+0x126/0x1d0 [ 3.444994] ? pci_device_remove+0x100/0x100 [ 3.444994] really_probe+0x27e/0x650 [ 3.444994] driver_probe_device+0x84/0x1d0 [ 3.444994] ? mutex_lock_nested+0x16/0x20 [ 3.444994] device_driver_attach+0x63/0x70 [ 3.444994] __driver_attach+0x117/0x1a0 [ 3.444994] ? device_driver_attach+0x70/0x70 [ 3.444994] bus_for_each_dev+0xb6/0x110 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] driver_attach+0x22/0x30 [ 3.444994] bus_add_driver+0x1e6/0x2a0 [ 3.444994] driver_register+0xa4/0x180 [ 3.444994] __pci_register_driver+0x77/0x80 [ 3.444994] ? uPD98402_module_init+0xd/0xd [ 3.444994] nicstar_init+0x1f/0x75 [ 3.444994] do_one_initcall+0x7a/0x3d0 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] ? rcu_read_lock_sched_held+0x4a/0x70 [ 3.444994] kernel_init_freeable+0x2a7/0x2f9 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] kernel_init+0x13/0x180 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ret_from_fork+0x1f/0x30 [ 3.444994] Kernel panic - not syncing: panic_on_warn set ... [ 3.444994] CPU: 5 PID: 1 Comm: swapper/0 Not tainted 5.12.4-g70e7f0549188-dirty #142 [ 3.444994] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [ 3.444994] Call Trace: [ 3.444994] dump_stack+0xba/0xf5 [ 3.444994] ? free_irq+0xfb/0x480 [ 3.444994] panic+0x155/0x3ed [ 3.444994] ? __warn+0xed/0x150 [ 3.444994] ? free_irq+0xfb/0x480 [ 3.444994] __warn+0x103/0x150 [ 3.444994] ? free_irq+0xfb/0x480 [ 3.444994] report_bug+0x119/0x1c0 [ 3.444994] handle_bug+0x3b/0x80 [ 3.444994] exc_invalid_op+0x18/0x70 [ 3.444994] asm_exc_invalid_op+0x12/0x20 [ 3.444994] RIP: 0010:free_irq+0xfb/0x480 [ 3.444994] Code: 6e 08 74 6f 4d 89 f4 e8 c3 78 09 00 4d 8b 74 24 18 4d 85 f6 75 e3 e8 b4 78 09 00 8b 75 c8 48 c7 c7 a0 ac d5 85 e8 95 d7 f5 ff <0f> 0b 48 8b 75 c0 4c 89 ff e8 87 c5 90 03 48 8b 43 40 4c 8b a0 80 [ 3.444994] RSP: 0000:ffffc90000017b50 EFLAGS: 00010086 [ 3.444994] RAX: 0000000000000000 RBX: ffff888107c6f000 RCX: 0000000000000000 [ 3.444994] RDX: 0000000000000000 RSI: ffffffff8123f301 RDI: 00000000ffffffff [ 3.444994] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000003 [ 3.444994] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000 [ 3.444994] R13: ffff888107dc0000 R14: ffff888104f6bf00 R15: ffff888107c6f0a8 [ 3.444994] ? vprintk_func+0x71/0x110 [ 3.444994] ns_init_card_error+0x18e/0x250 [ 3.444994] nicstar_init_one+0x10d2/0x1130 [ 3.444994] local_pci_probe+0x4a/0xb0 [ 3.444994] pci_device_probe+0x126/0x1d0 [ 3.444994] ? pci_device_remove+0x100/0x100 [ 3.444994] really_probe+0x27e/0x650 [ 3.444994] driver_probe_device+0x84/0x1d0 [ 3.444994] ? mutex_lock_nested+0x16/0x20 [ 3.444994] device_driver_attach+0x63/0x70 [ 3.444994] __driver_attach+0x117/0x1a0 [ 3.444994] ? device_driver_attach+0x70/0x70 [ 3.444994] bus_for_each_dev+0xb6/0x110 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] driver_attach+0x22/0x30 [ 3.444994] bus_add_driver+0x1e6/0x2a0 [ 3.444994] driver_register+0xa4/0x180 [ 3.444994] __pci_register_driver+0x77/0x80 [ 3.444994] ? uPD98402_module_init+0xd/0xd [ 3.444994] nicstar_init+0x1f/0x75 [ 3.444994] do_one_initcall+0x7a/0x3d0 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] ? rcu_read_lock_sched_held+0x4a/0x70 [ 3.444994] kernel_init_freeable+0x2a7/0x2f9 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] kernel_init+0x13/0x180 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ret_from_fork+0x1f/0x30 [ 3.444994] Dumping ftrace buffer: [ 3.444994] (ftrace buffer empty) [ 3.444994] Kernel Offset: disabled [ 3.444994] Rebooting in 1 seconds..
--- drivers/atm/nicstar.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/atm/nicstar.c +9 -9
@@ -527,6 +527,15 @@ static int ns_init_card(int i, struct pci_dev *pcidev)/* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */ writel (0x00000000 , card->membase +VPM ); + card->intcnt =0 ; +if (request_irq + (pcidev->irq, &ns_irq_handler,IRQF_SHARED ,"nicstar" , card) !=0 ) { +pr_err ("nicstar%d: can't allocate IRQ %d.\n" , i, pcidev->irq); + error =9 ; +ns_init_card_error (card, error); +return error; + } +/* Initialize TSQ */ card->tsq.org = dma_alloc_coherent(&card->pcidev->dev, NS_TSQSIZE + NS_TSQ_ALIGNMENT,
@@ -753,15 +762,6 @@ static int ns_init_card(int i, struct pci_dev *pcidev) card->efbie =1 ; - card->intcnt =0 ; -if (request_irq - (pcidev->irq, &ns_irq_handler,IRQF_SHARED ,"nicstar" , card) !=0 ) { -printk ("nicstar%d: can't allocate IRQ %d.\n" , i, pcidev->irq); - error =9 ; -ns_init_card_error (card, error); -return error; - } -/* Register device */ card->atmdev =atm_dev_register ("nicstar" , &card->pcidev->dev, &atm_ops,-1 ,NULL );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 117/266 net: sched: fix error return code in tcf_del_walker()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 55d96f72e8ddc0a294e0b9c94016edbb699537e1 ]
When nla_put_u32() fails, 'ret' could be 0, it should return error code in tcf_del_walker().
--- net/sched/act_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sched/act_api.c +2 -1
@@ -381,7 +381,8 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb, }mutex_unlock (&idrinfo->lock); -if (nla_put_u32 (skb,TCA_FCNT , n_i)) + ret =nla_put_u32 (skb,TCA_FCNT , n_i); +if (ret) goto nla_put_failure;nla_nest_end (skb, nest);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 135/266 vsock: notify server to shutdown when client has pending signal
In reply to Greg Kroah-HartmanFrom: Longpeng(Mike) <[email protected]>
[ Upstream commit c7ff9cff70601ea19245d997bb977344663434c7 ]
The client's sk_state will be set to TCP_ESTABLISHED if the server replay the client's connect request.
However, if the client has pending signal, its sk_state will be set to TCP_CLOSE without notify the server, so the server will hold the corrupt connection.
client server
1. sk_state=TCP_SYN_SENT |
2. call ->connect() |
3. wait reply |
| 4. sk_state=TCP_ESTABLISHED
| 5. insert to connected list
| 6. reply to the client
7. sk_state=TCP_ESTABLISHED |
8. insert to connected list |
9. *signal pending* <--------------------- the user kill client
10. sk_state=TCP_CLOSE |
client is exiting... |
11. call ->release() |
virtio_transport_close
if (!(sk->sk_state == TCP_ESTABLISHED ||
sk->sk_state == TCP_CLOSING))
return true; *return at here, the server cannot notice the connection is corrupt*So the client should notify the peer in this case.
--- net/vmw_vsock/af_vsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/vmw_vsock/af_vsock.c +1 -1
@@ -1369,7 +1369,7 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr,if (signal_pending (current)) { err =sock_intr_errno (timeout); - sk->sk_state =TCP_CLOSE ; + sk->sk_state = sk->sk_state ==TCP_ESTABLISHED ?TCP_CLOSING :TCP_CLOSE ; sock->state =SS_UNCONNECTED ;vsock_transport_cancel_pkt (vsk); goto out_wait;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 132/266 net: fec: add ndo_select_queue to fix TX bandwidth fluctuations
In reply to Greg Kroah-HartmanFrom: Fugang Duan <[email protected]>
[ Upstream commit 52c4a1a85f4b346c39c896c0168f4a843b3385ff ]
As we know that AVB is enabled by default, and the ENET IP design is queue 0 for best effort, queue 1&2 for AVB Class A&B. Bandwidth of each queue 1&2 set in driver is 50%, TX bandwidth fluctuated when selecting tx queues randomly with FEC_QUIRK_HAS_AVB quirk available.
This patch adds ndo_select_queue callback to select queues for transmitting to fix this issue. It will always return queue 0 if this is not a vlan packet, and return queue 1 or 2 based on priority of vlan packet.
You may complain that in fact we only use single queue for trasmitting if we are not targeted to VLAN. Yes, but seems we have no choice, since AVB is enabled when the driver probed, we can't switch this feature dynamicly. After compare multiple queues to single queue, TX throughput almost no improvement.
One way we can implemet is to configure the driver to multiple queues with Round-robin scheme by default. Then add ndo_setup_tc callback to enable/disable AVB feature for users. Unfortunately, ENET AVB IP seems not follow the standard 802.1Qav spec. We only can program DMAnCFG[IDLE_SLOPE] field to calculate bandwidth fraction. And idle slope is restricted to certain valus (a total of 19). It's far away from CBS QDisc implemented in Linux TC framework. If you strongly suggest to do this, I think we only can support limited numbers of bandwidth and reject others, but it's really urgly and wried.
With this patch, VLAN tagged packets route to queue 0/1/2 based on vlan priority; VLAN untagged packets route to queue 0.
--- drivers/net/ethernet/freescale/fec_main.c | 32 +++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/net/ethernet/freescale/fec_main.c +32 -0
@@ -76,6 +76,8 @@ static void fec_enet_itr_coal_init(struct net_device *ndev);#define DRIVER_NAME "fec" +static const u16 fec_enet_vlan_pri_to_queue[8 ] = {0 ,0 ,1 ,1 ,1 ,2 ,2 ,2 }; +/* Pause frame feild and FIFO threshold */ #define FEC_ENET_FCE (1 << 5)#define FEC_ENET_RSEM_V 0x84
@@ -3240,10 +3242,40 @@ static int fec_set_features(struct net_device *netdev,return 0 ; } +static u16 fec_enet_get_raw_vlan_tci (struct sk_buff *skb) +{ +struct vlan_ethhdr *vhdr; +unsigned short vlan_TCI =0 ; + +if (skb->protocol ==htons (ETH_P_ALL )) { + vhdr = (struct vlan_ethhdr *)(skb->data); + vlan_TCI =ntohs (vhdr->h_vlan_TCI); + } + +return vlan_TCI; +} + +static u16 fec_enet_select_queue (struct net_device *ndev,struct sk_buff *skb, +struct net_device *sb_dev) +{ +struct fec_enet_private *fep =netdev_priv (ndev); +u16 vlan_tag; + +if (!(fep->quirks &FEC_QUIRK_HAS_AVB )) +return netdev_pick_tx (ndev, skb,NULL ); + + vlan_tag =fec_enet_get_raw_vlan_tci (skb); +if (!vlan_tag) +return vlan_tag; + +return fec_enet_vlan_pri_to_queue[vlan_tag >>13 ]; +} +static const struct net_device_ops fec_netdev_ops = { .ndo_open = fec_enet_open, .ndo_stop = fec_enet_close, .ndo_start_xmit = fec_enet_start_xmit, + .ndo_select_queue = fec_enet_select_queue, .ndo_set_rx_mode = set_multicast_list, .ndo_validate_addr = eth_validate_addr, .ndo_tx_timeout = fec_timeout,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 136/266 drm/amd/display: Fix edp_bootup_bl_level initialization issue
In reply to Greg Kroah-HartmanFrom: Logush Oliver <[email protected]>
[ Upstream commit eeb90e26ed05dd44553d557057bf35f08f853af8 ]
[why]
Updating the file to fix the missing line
--- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +1 -1
@@ -2131,7 +2131,7 @@ static enum bp_result get_integrated_info_v2_1( info_v2_1->edp1_info.edp_pwr_down_bloff_to_vary_bloff; info->edp1_info.edp_panel_bpc = info_v2_1->edp1_info.edp_panel_bpc; - info->edp1_info.edp_bootup_bl_level = + info->edp1_info.edp_bootup_bl_level = info_v2_1->edp1_info.edp_bootup_bl_level; info->edp2_info.edp_backlight_pwm_hz =le16_to_cpu (info_v2_1->edp2_info.edp_backlight_pwm_hz);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 137/266 RDMA/rxe: Dont overwrite errno from ib_umem_get()
In reply to Greg Kroah-HartmanFrom: Xiao Yang <[email protected]>
[ Upstream commit 20ec0a6d6016aa28b9b3299be18baef1a0f91cd2 ]
rxe_mr_init_user() always returns the fixed -EINVAL when ib_umem_get() fails so it's hard for user to know which actual error happens in ib_umem_get(). For example, ib_umem_get() will return -EOPNOTSUPP when trying to pin pages on a DAX file.
Return actual error as mlx4/mlx5 does.
--- drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
@@ -135,7 +135,7 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,if (IS_ERR (umem)) {pr_warn ("err %d from rxe_umem_get\n" , (int )PTR_ERR (umem)); - err = -EINVAL ; + err =PTR_ERR (umem); goto err1; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 138/266 iwlwifi: mvm: dont change band on bound PHY contexts
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 8835a64f74c46baebfc946cd5a2c861b866ebcee ]
When we have a P2P Device active, we attempt to only change the PHY context it uses when we get a new remain-on-channel, if the P2P Device is the only user of the PHY context.
This is fine if we're switching within a band, but if we're switching bands then the switch implies a removal and re-add of the PHY context, which isn't permitted by the firmware while it's bound to an interface.
Fix the code to skip the unbind/release/... cycle only if the band doesn't change (or we have old devices that can switch the band on the fly as well.)
--- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +18 -6
@@ -3800,6 +3800,7 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif);struct cfg80211_chan_def chandef;struct iwl_mvm_phy_ctxt *phy_ctxt; +bool band_change_removal;int ret, i; IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel->hw_value,
@@ -3880,19 +3881,30 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,cfg80211_chandef_create (&chandef, channel,NL80211_CHAN_NO_HT );/* -* Change the PHY context configuration as it is currently referenced -* only by the P2P Device MAC +* Check if the remain-on-channel is on a different band and that +* requires context removal, see iwl_mvm_phy_ctxt_changed(). If +* so, we'll need to release and then re-configure here, since we +* must not remove a PHY context that's part of a binding. */ -if (mvmvif->phy_ctxt->ref ==1 ) { + band_change_removal = +fw_has_capa (&mvm->fw->ucode_capa, +IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT ) && + mvmvif->phy_ctxt->channel->band != chandef.chan->band; + +if (mvmvif->phy_ctxt->ref ==1 && !band_change_removal) { +/* +* Change the PHY context configuration as it is currently +* referenced only by the P2P Device MAC (and we can modify it) +*/ ret =iwl_mvm_phy_ctxt_changed (mvm, mvmvif->phy_ctxt, &chandef,1 ,1 );if (ret) goto out_unlock; }else {/* -* The PHY context is shared with other MACs. Need to remove the -* P2P Device from the binding, allocate an new PHY context and -* create a new binding +* The PHY context is shared with other MACs (or we're trying to +* switch bands), so remove the P2P Device from the binding, +* allocate an new PHY context and create a new binding. */ phy_ctxt =iwl_mvm_get_free_phy_ctxt (mvm);if (!phy_ctxt) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 139/266 iwlwifi: mvm: apply RX diversity per PHY context
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit a171399fd687a7d2fa56a10c9a2d7084a647677d ]
SMPS requests may differ per interfaces due to e.g. Bluetooth only interfering on 2.4 GHz, so if that's the case we should, in the case of multiple PHY contexts, still allow RX diversity on PHY context that have no interfaces with SMPS requests.
Fix the code to pass through the PHY context in question and skip interfaces with non-matching PHY context while iterating.
--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +- .../net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 15 ++++++---- .../net/wireless/intel/iwlwifi/mvm/utils.c | 28 ++++++++++++++----- 3 files changed, 32 insertions(+), 14 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +2 -1
@@ -1827,7 +1827,8 @@ int iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,void iwl_mvm_update_smps (struct iwl_mvm *mvm,struct ieee80211_vif *vif,enum iwl_mvm_smps_type_request req_type,enum ieee80211_smps_mode smps_request); -bool iwl_mvm_rx_diversity_allowed (struct iwl_mvm *mvm); +bool iwl_mvm_rx_diversity_allowed (struct iwl_mvm *mvm, +struct iwl_mvm_phy_ctxt *ctxt);/* Low latency */ int iwl_mvm_update_low_latency(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +9 -6
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2020 Intel Corporation +* Copyright (C) 2012-2014, 2018-2021 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2017 Intel Deutschland GmbH */
@@ -76,6 +76,7 @@ static void iwl_mvm_phy_ctxt_cmd_hdr(struct iwl_mvm_phy_ctxt *ctxt, }static void iwl_mvm_phy_ctxt_set_rxchain (struct iwl_mvm *mvm, +struct iwl_mvm_phy_ctxt *ctxt,__le32 *rxchain_info,u8 chains_static,u8 chains_dynamic)
@@ -93,7 +94,7 @@ static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm,* between the two antennas is sufficiently different to impact * performance. */ -if (active_cnt ==1 &&iwl_mvm_rx_diversity_allowed (mvm)) { +if (active_cnt ==1 &&iwl_mvm_rx_diversity_allowed (mvm, ctxt)) { idle_cnt =2 ; active_cnt =2 ; }
@@ -113,6 +114,7 @@ static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm,* Add the phy configuration to the PHY context command */ static void iwl_mvm_phy_ctxt_cmd_data_v1 (struct iwl_mvm *mvm, +struct iwl_mvm_phy_ctxt *ctxt,struct iwl_phy_context_cmd_v1 *cmd,struct cfg80211_chan_def *chandef,u8 chains_static,u8 chains_dynamic)
@@ -123,7 +125,7 @@ static void iwl_mvm_phy_ctxt_cmd_data_v1(struct iwl_mvm *mvm,/* Set the channel info data */ iwl_mvm_set_chan_info_chandef (mvm, &cmd->ci, chandef); -iwl_mvm_phy_ctxt_set_rxchain (mvm, &tail->rxchain_info, +iwl_mvm_phy_ctxt_set_rxchain (mvm, ctxt, &tail->rxchain_info, chains_static, chains_dynamic); tail->txchain_info =cpu_to_le32 (iwl_mvm_get_valid_tx_ant (mvm));
@@ -133,6 +135,7 @@ static void iwl_mvm_phy_ctxt_cmd_data_v1(struct iwl_mvm *mvm,* Add the phy configuration to the PHY context command */ static void iwl_mvm_phy_ctxt_cmd_data (struct iwl_mvm *mvm, +struct iwl_mvm_phy_ctxt *ctxt,struct iwl_phy_context_cmd *cmd,struct cfg80211_chan_def *chandef,u8 chains_static,u8 chains_dynamic)
@@ -143,7 +146,7 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,/* Set the channel info data */ iwl_mvm_set_chan_info_chandef (mvm, &cmd->ci, chandef); -iwl_mvm_phy_ctxt_set_rxchain (mvm, &cmd->rxchain_info, +iwl_mvm_phy_ctxt_set_rxchain (mvm, ctxt, &cmd->rxchain_info, chains_static, chains_dynamic); }
@@ -170,7 +173,7 @@ static int iwl_mvm_phy_ctxt_apply(struct iwl_mvm *mvm,iwl_mvm_phy_ctxt_cmd_hdr (ctxt, &cmd, action);/* Set the command data */ -iwl_mvm_phy_ctxt_cmd_data (mvm, &cmd, chandef, +iwl_mvm_phy_ctxt_cmd_data (mvm, ctxt, &cmd, chandef, chains_static, chains_dynamic);
@@ -186,7 +189,7 @@ static int iwl_mvm_phy_ctxt_apply(struct iwl_mvm *mvm, action);/* Set the command data */ -iwl_mvm_phy_ctxt_cmd_data_v1 (mvm, &cmd, chandef, +iwl_mvm_phy_ctxt_cmd_data_v1 (mvm, ctxt, &cmd, chandef, chains_static, chains_dynamic); ret = iwl_mvm_send_cmd_pdu(mvm, PHY_CONTEXT_CMD,
drivers/net/wireless/intel/iwlwifi/mvm/utils.c +21 -7
@@ -683,23 +683,37 @@ void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm) mvm->accu_radio_stats.on_time_scan += mvm->radio_stats.on_time_scan; } +struct iwl_mvm_diversity_iter_data { +struct iwl_mvm_phy_ctxt *ctxt; +bool result; +}; +static void iwl_mvm_diversity_iter (void *_data,u8 *mac,struct ieee80211_vif *vif) {struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif); -bool *result = _data; +struct iwl_mvm_diversity_iter_data *data = _data;int i; +if (mvmvif->phy_ctxt != data->ctxt) +return ; +for (i =0 ; i <NUM_IWL_MVM_SMPS_REQ ; i++) {if (mvmvif->smps_requests[i] ==IEEE80211_SMPS_STATIC || - mvmvif->smps_requests[i] ==IEEE80211_SMPS_DYNAMIC ) - *result = false; + mvmvif->smps_requests[i] ==IEEE80211_SMPS_DYNAMIC ) { + data->result = false; +break ; + } } } -bool iwl_mvm_rx_diversity_allowed (struct iwl_mvm *mvm) +bool iwl_mvm_rx_diversity_allowed (struct iwl_mvm *mvm, +struct iwl_mvm_phy_ctxt *ctxt) { -bool result = true; +struct iwl_mvm_diversity_iter_data data = { + .ctxt = ctxt, + .result = true, + };lockdep_assert_held (&mvm->mutex);
@@ -711,9 +725,9 @@ bool iwl_mvm_rx_diversity_allowed(struct iwl_mvm *mvm)ieee80211_iterate_active_interfaces_atomic ( mvm->hw,IEEE80211_IFACE_ITER_NORMAL , - iwl_mvm_diversity_iter, &result); + iwl_mvm_diversity_iter, &data); -return result; +return data.result; } void iwl_mvm_send_low_latency_cmd(struct iwl_mvm *mvm,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 140/266 iwlwifi: mvm: fix error print when session protection ends
In reply to Greg Kroah-HartmanFrom: Shaul Triebitz <[email protected]>
[ Upstream commit 976ac0af7ba2c5424bc305b926c0807d96fdcc83 ]
When the session protection ends and the Driver is not associated or a beacon was not heard, the Driver prints "No beacons heard...".
That's confusing for the case where not associated. Change the print when not associated to "Not associated...".
--- drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c +4 -0
@@ -310,6 +310,8 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,* and know the dtim period. */ iwl_mvm_te_check_disconnect (mvm, te_data->vif, + !te_data->vif->bss_conf.assoc ? +"Not associated and the time event is over already..." :"No beacon heard and the time event is over already..." );break ;default :
@@ -808,6 +810,8 @@ void iwl_mvm_rx_session_protect_notif(struct iwl_mvm *mvm,* and know the dtim period. */ iwl_mvm_te_check_disconnect (mvm, vif, + !vif->bss_conf.assoc ? +"Not associated and the session protection is over already..." :"No beacon heard and the session protection is over already..." );spin_lock_bh (&mvm->time_event_lock);iwl_mvm_te_clear_data (mvm, te_data);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 141/266 iwlwifi: pcie: free IML DMA memory allocation
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 310f60f53a86eba680d9bc20a371e13b06a5f903 ]
In the case of gen3 devices with image loader (IML) support, we were leaking the IML DMA allocation and never freeing it. Fix that.
--- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 15 ++++++++++----- .../net/wireless/intel/iwlwifi/pcie/internal.h | 3 +++ 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c +10 -5
@@ -79,7 +79,6 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,struct iwl_prph_scratch *prph_scratch;struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl;struct iwl_prph_info *prph_info; -void *iml_img;u32 control_flags =0 ;int ret; int cmdq_size = max_t(u32, IWL_CMD_QUEUE_SIZE,
@@ -187,14 +186,15 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, trans_pcie->prph_scratch = prph_scratch;/* Allocate IML */ - iml_img =dma_alloc_coherent (trans->dev, trans->iml_len, - &trans_pcie->iml_dma_addr,GFP_KERNEL ); -if (!iml_img) { + trans_pcie->iml =dma_alloc_coherent (trans->dev, trans->iml_len, + &trans_pcie->iml_dma_addr, +GFP_KERNEL ); +if (!trans_pcie->iml) { ret = -ENOMEM ; goto err_free_ctxt_info; } -memcpy (iml_img, trans->iml, trans->iml_len); +memcpy (trans_pcie->iml, trans->iml, trans->iml_len);iwl_enable_fw_load_int_ctx_info (trans);
@@ -243,6 +243,11 @@ void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans) trans_pcie->ctxt_info_dma_addr =0 ; trans_pcie->ctxt_info_gen3 =NULL ; +dma_free_coherent (trans->dev, trans->iml_len, trans_pcie->iml, + trans_pcie->iml_dma_addr); + trans_pcie->iml_dma_addr =0 ; + trans_pcie->iml =NULL ; +iwl_pcie_ctxt_info_free_fw_img (trans); dma_free_coherent(trans->dev, sizeof(*trans_pcie->prph_scratch),
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +3 -0
@@ -279,6 +279,8 @@ struct cont_rec {* Context information addresses will be taken from here. * This is driver's local copy for keeping track of size and * count for allocating and freeing the memory. +* @iml: image loader image virtual address +* @iml_dma_addr: image loader image DMA address * @trans: pointer to the generic transport area * @scd_base_addr: scheduler sram base address in SRAM * @kw: keep warm address
@@ -329,6 +331,7 @@ struct iwl_trans_pcie { };struct iwl_prph_info *prph_info;struct iwl_prph_scratch *prph_scratch; +void *iml;dma_addr_t ctxt_info_dma_addr;dma_addr_t prph_info_dma_addr;dma_addr_t prph_scratch_dma_addr;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 142/266 iwlwifi: pcie: fix context info freeing
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 26d18c75a7496c4c52b0b6789e713dc76ebfbc87 ]
After firmware alive, iwl_trans_pcie_gen2_fw_alive() is called to free the context info. However, on gen3 that will then free the context info with the wrong size.
Since we free this allocation later, let it stick around until the device is stopped for now, freeing some of it earlier is a separate change.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c +2 -1
@@ -254,7 +254,8 @@ void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans, u32 scd_addr)/* now that we got alive we can free the fw image & the context info. * paging memory cannot be freed included since FW will still use it */ -iwl_pcie_ctxt_info_free (trans); +if (trans->trans_cfg->device_family <IWL_DEVICE_FAMILY_AX210 ) +iwl_pcie_ctxt_info_free (trans);/* * Re-enable all the interrupts, including the RF-Kill one, now that
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 204/266 drm/nouveau: Dont set allow_fb_modifiers explicitly
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
commit cee93c028288b9af02919f3bd8593ba61d1e610d upstream.
Since
commit 890880ddfdbe256083170866e49c87618b706ac7
Author: Paul Kocialkowski <[email protected]> Date: Fri Jan 4 09:56:10 2019 +0100
drm: Auto-set allow_fb_modifiers when given modifiers at plane init
this is done automatically as part of plane init, if drivers set the modifier list correctly. Which is the case here.
Note that this fixes an inconsistency: We've set the cap everywhere, but only nv50+ supports modifiers. Hence cc stable, but not further back then the patch from Paul.
--- drivers/gpu/drm/nouveau/nouveau_display.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_display.c +0 -1
@@ -697,7 +697,6 @@ nouveau_display_create(struct drm_device dev->mode_config.preferred_depth =24 ; dev->mode_config.prefer_shadow =1 ; - dev->mode_config.allow_fb_modifiers = true;if (drm->client.device.info.chipset <0x11 ) dev->mode_config.async_page_flip = false;
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau