6.7.2-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 292/641 drm/amd/display: Use drm_connector in create_stream_for_sink
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harry Wentland <[email protected]>
[ Upstream commit 3e094a2875260543ca74838decc0c995d3765096 ]
[WHAT]
We need to use this function for both amdgpu_dm_connectors and drm_writeback_connectors. Modify it to operate on a drm_connector as a common base.
Stable-dep-of: dbf5d3d02987 ("drm/amd/display: Check writeback connectors in create_validate_stream_for_sink")
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 65 +++++++++++-------- 1 file changed, 37 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +37 -28
@@ -5527,6 +5527,7 @@ static void fill_stream_properties_from_drm_display_mode( && stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420; else if (drm_mode_is_420_also(info, mode_in) + && aconnector && aconnector->force_yuv420_output) timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420; else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR444)
@@ -5562,7 +5563,7 @@ static void fill_stream_properties_from_drm_display_mode( timing_out->hdmi_vic = hv_frame.vic; } -if (is_freesync_video_mode (mode_in, aconnector)) { +if (aconnector &&is_freesync_video_mode (mode_in, aconnector)) { timing_out->h_addressable = mode_in->hdisplay; timing_out->h_total = mode_in->htotal; timing_out->h_sync_width = mode_in->hsync_end - mode_in->hsync_start;
@@ -6039,14 +6040,14 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, }static struct dc_stream_state * -create_stream_for_sink (struct amdgpu_dm_connector *aconnector, +create_stream_for_sink (struct drm_connector *connector,const struct drm_display_mode *drm_mode,const struct dm_connector_state *dm_state,const struct dc_stream_state *old_stream,int requested_bpc) { +struct amdgpu_dm_connector *aconnector =NULL ;struct drm_display_mode *preferred_mode =NULL ; -struct drm_connector *drm_connector;const struct drm_connector_state *con_state = &dm_state->base;struct dc_stream_state *stream =NULL ;struct drm_display_mode mode;
@@ -6065,20 +6066,22 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,drm_mode_init (&mode, drm_mode);memset (&saved_mode,0 ,sizeof (saved_mode)); -if (aconnector ==NULL ) { -DRM_ERROR ("aconnector is NULL!\n" ); +if (connector ==NULL ) { +DRM_ERROR ("connector is NULL!\n" );return stream; } - drm_connector = &aconnector->base; - -if (!aconnector->dc_sink) { - sink =create_fake_sink (aconnector); -if (!sink) -return stream; - }else { - sink = aconnector->dc_sink; -dc_sink_retain (sink); +if (connector->connector_type !=DRM_MODE_CONNECTOR_WRITEBACK ) { + aconnector =NULL ; + aconnector =to_amdgpu_dm_connector (connector); +if (!aconnector->dc_sink) { + sink =create_fake_sink (aconnector); +if (!sink) +return stream; + }else { + sink = aconnector->dc_sink; +dc_sink_retain (sink); + } } stream =dc_create_stream_for_sink (sink);
@@ -6088,12 +6091,13 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, goto finish; } +/* We leave this NULL for writeback connectors */ stream->dm_stream_context = aconnector; stream->timing.flags.LTE_340MCSC_SCRAMBLE = - drm_connector->display_info.hdmi.scdc.scrambling.low_rates; + connector->display_info.hdmi.scdc.scrambling.low_rates; -list_for_each_entry (preferred_mode, &aconnector->base.modes, head) { +list_for_each_entry (preferred_mode, &connector->modes, head) {/* Search for preferred mode */ if (preferred_mode->type &DRM_MODE_TYPE_PREFERRED ) { native_mode_found = true;
@@ -6102,7 +6106,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, }if (!native_mode_found) preferred_mode =list_first_entry_or_null ( - &aconnector->base.modes, + &connector->modes, struct drm_display_mode, head);
@@ -6116,7 +6120,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,* and the modelist may not be filled in time. */ DRM_DEBUG_DRIVER ("No preferred mode found\n" ); - }else { + }else if (aconnector) { recalculate_timing =is_freesync_video_mode (&mode, aconnector);if (recalculate_timing) { freesync_mode =get_highest_refresh_rate_mode (aconnector, false);
@@ -6139,13 +6143,17 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,*/ if (!scale || mode_refresh != preferred_refresh)fill_stream_properties_from_drm_display_mode ( - stream, &mode, &aconnector->base, con_state,NULL , + stream, &mode, connector, con_state,NULL , requested_bpc);else fill_stream_properties_from_drm_display_mode ( - stream, &mode, &aconnector->base, con_state, old_stream, + stream, &mode, connector, con_state, old_stream, requested_bpc); +/* The rest isn't needed for writeback connectors */ +if (!aconnector) + goto finish; +if (aconnector->timing_changed) { drm_dbg(aconnector->base.dev, "overriding timing for automated test, bpc %d, changing to %d\n",
@@ -6163,7 +6171,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,fill_audio_info ( &stream->audio_info, - drm_connector, + connector, sink);update_stream_signal (stream, sink);
@@ -6633,7 +6641,7 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,enum dc_status dc_result =DC_OK ; do { - stream = create_stream_for_sink(aconnector, drm_mode, + stream = create_stream_for_sink(connector, drm_mode, dm_state, old_stream, requested_bpc); if (stream == NULL) {
@@ -9365,15 +9373,16 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, dm_new_crtc_state =to_dm_crtc_state (new_crtc_state); acrtc =to_amdgpu_crtc (crtc); connector =amdgpu_dm_find_first_crtc_matching_connector (state, crtc); - aconnector =to_amdgpu_dm_connector (connector); +if (connector && connector->connector_type !=DRM_MODE_CONNECTOR_WRITEBACK ) + aconnector =to_amdgpu_dm_connector (connector);/* TODO This hack should go away */ -if (aconnector && enable) { +if (connector && enable) {/* Make sure fake sink is created in plug-in scenario */ drm_new_conn_state =drm_atomic_get_new_connector_state (state, - &aconnector->base); + connector); drm_old_conn_state =drm_atomic_get_old_connector_state (state, - &aconnector->base); + connector);if (IS_ERR (drm_new_conn_state)) { ret =PTR_ERR_OR_ZERO (drm_new_conn_state);
@@ -9520,7 +9529,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,* added MST connectors not found in existing crtc_state in the chained mode * TODO: need to dig out the root cause of that */ -if (!aconnector) +if (!connector) goto skip_modeset;if (modereset_required (new_crtc_state))
@@ -9563,7 +9572,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,* We want to do dc stream updates that do not require a * full modeset below. */ -if (!(enable && aconnector && new_crtc_state->active)) +if (!(enable && connector && new_crtc_state->active))return 0 ;/* * Given above conditions, the dc state cannot be NULL because:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 293/641 drm/amd/display: Check writeback connectors in create_validate_stream_for_sink
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Hung <[email protected]>
[ Upstream commit dbf5d3d02987faa0eec3710dd687cd912362d7b5 ]
[WHY & HOW]
This is to check connector type to avoid
unhandled null pointer for writeback connectors.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -1
@@ -6649,6 +6649,9 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,break ; } +if (aconnector->base.connector_type ==DRM_MODE_CONNECTOR_WRITEBACK ) +return stream; + dc_result =dc_validate_stream (adev->dm.dc, stream);if (dc_result ==DC_OK && stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) dc_result =dm_dp_mst_is_port_support_mode (aconnector, stream);
@@ -9373,7 +9376,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, dm_new_crtc_state =to_dm_crtc_state (new_crtc_state); acrtc =to_amdgpu_crtc (crtc); connector =amdgpu_dm_find_first_crtc_matching_connector (state, crtc); -if (connector && connector->connector_type !=DRM_MODE_CONNECTOR_WRITEBACK ) +if (connector) aconnector =to_amdgpu_dm_connector (connector);/* TODO This hack should go away */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 294/641 drm/radeon: check the alloc_workqueue return value in radeon_crtc_init()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yingliang <[email protected]>
[ Upstream commit 7a2464fac80d42f6f8819fed97a553e9c2f43310 ]
check the alloc_workqueue return value in radeon_crtc_init() to avoid null-ptr-deref.
--- drivers/gpu/drm/radeon/radeon_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_display.c +6 -1
@@ -687,11 +687,16 @@ static void radeon_crtc_init(struct drm_device *dev, int index)if (radeon_crtc ==NULL )return ; + radeon_crtc->flip_queue =alloc_workqueue ("radeon-crtc" ,WQ_HIGHPRI ,0 ); +if (!radeon_crtc->flip_queue) { +kfree (radeon_crtc); +return ; + } +drm_crtc_init (dev, &radeon_crtc->base, &radeon_crtc_funcs);drm_mode_crtc_set_gamma_size (&radeon_crtc->base,256 ); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue =alloc_workqueue ("radeon-crtc" ,WQ_HIGHPRI ,0 ); rdev->mode_info.crtcs[index] = radeon_crtc;if (rdev->family >=CHIP_BONAIRE ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 295/641 drm/radeon/dpm: fix a memleak in sumo_parse_power_table
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 0737df9ed0997f5b8addd6e2b9699a8c6edba2e4 ]
The rdev->pm.dpm.ps allocated by kcalloc should be freed in every following error-handling path. However, in the error-handling of rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed, resulting in a memleak in this function.
--- drivers/gpu/drm/radeon/sumo_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/sumo_dpm.c +3 -1
@@ -1493,8 +1493,10 @@ static int sumo_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) +if (!rdev->pm.power_state[i].clock_info) { +kfree (rdev->pm.dpm.ps);return -EINVAL ; + } ps =kzalloc (sizeof (struct sumo_ps ),GFP_KERNEL );if (ps ==NULL ) {kfree (rdev->pm.dpm.ps);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 296/641 drm/radeon/trinity_dpm: fix a memleak in trinity_parse_power_table
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 28c28d7f77c06ac2c0b8f9c82bc04eba22912b3b ]
The rdev->pm.dpm.ps allocated by kcalloc should be freed in every following error-handling path. However, in the error-handling of rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed, resulting in a memleak in this function.
--- drivers/gpu/drm/radeon/trinity_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/trinity_dpm.c +3 -1
@@ -1726,8 +1726,10 @@ static int trinity_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) +if (!rdev->pm.power_state[i].clock_info) { +kfree (rdev->pm.dpm.ps);return -EINVAL ; + } ps =kzalloc (sizeof (struct sumo_ps ),GFP_KERNEL );if (ps ==NULL ) {kfree (rdev->pm.dpm.ps);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 297/641 drm/bridge: cdns-mhdp8546: Fix use of uninitialized variable
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 155d6fb61270dd297f128731cd155080deee8f3a ]
'ret' could be uninitialized at the end of the function, although it's not clear if that can happen in practice.
--- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c +2 -1
@@ -403,7 +403,8 @@ static int _cdns_mhdp_hdcp_disable(struct cdns_mhdp_device *mhdp)static int _cdns_mhdp_hdcp_enable (struct cdns_mhdp_device *mhdp,u8 content_type) { -int ret, tries =3 ; +int ret = -EINVAL ; +int tries =3 ;u32 i;for (i =0 ; i < tries; i++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 298/641 drm/bridge: tc358767: Fix return value on error case
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 32bd29b619638256c5b75fb021d6d9f12fc4a984 ]
If the hpd_pin is invalid, the driver returns 'ret'. But 'ret' contains 0, instead of an error value.
Return -EINVAL instead.
--- drivers/gpu/drm/bridge/tc358767.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -2273,7 +2273,7 @@ static int tc_probe(struct i2c_client *client) }else {if (tc->hpd_pin <0 || tc->hpd_pin >1 ) {dev_err (dev,"failed to parse HPD number\n" ); -return ret; +return -EINVAL ; } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 299/641 media: cx231xx: fix a memleak in cx231xx_init_isoc
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 5d3c8990e2bbf929cb211563dadd70708f42e4e6 ]
The dma_q->p_left_data alloced by kzalloc should be freed in all the following error handling paths. However, it hasn't been freed in the allocation error paths of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer.
On the other hand, the dma_q->p_left_data did be freed in the error-handling paths after that of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer, by calling cx231xx_uninit_isoc(dev). So the same free operation should be done in error-handling paths of those two allocation.
--- drivers/media/usb/cx231xx/cx231xx-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/usb/cx231xx/cx231xx-core.c +2 -0
@@ -1023,6 +1023,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,if (!dev->video_mode.isoc_ctl.urb) {dev_err (dev->dev,"cannot alloc memory for usb buffers\n" ); +kfree (dma_q->p_left_data);return -ENOMEM ; }
@@ -1032,6 +1033,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,dev_err (dev->dev,"cannot allocate memory for usbtransfer\n" );kfree (dev->video_mode.isoc_ctl.urb); +kfree (dma_q->p_left_data);return -ENOMEM ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 300/641 ASoC: SOF: Intel: pci-mtl: fix ARL-S definitions
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit a00be6dc9bb80796244196033aa5eb258b6af47a ]
The initial copy/paste from MTL was incorrect, the hardware is different and requires different descriptors along with a dedicated firmware binary.
--- sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/intel/mtl.c | 28 ++++++++++++++++++++++++++++ sound/soc/sof/intel/pci-mtl.c | 12 ++++++------ 3 files changed, 35 insertions(+), 6 deletions(-)
sound/soc/sof/intel/hda.h +1 -0
@@ -882,6 +882,7 @@ extern const struct sof_intel_dsp_desc ehl_chip_info;extern const struct sof_intel_dsp_desc jsl_chip_info;extern const struct sof_intel_dsp_desc adls_chip_info;extern const struct sof_intel_dsp_desc mtl_chip_info; +extern const struct sof_intel_dsp_desc arl_s_chip_info;extern const struct sof_intel_dsp_desc lnl_chip_info;/* Probes support */
sound/soc/sof/intel/mtl.c +28 -0
@@ -746,3 +746,31 @@ const struct sof_intel_dsp_desc mtl_chip_info = { .hw_ip_version = SOF_INTEL_ACE_1_0, };EXPORT_SYMBOL_NS (mtl_chip_info,SND_SOC_SOF_INTEL_HDA_COMMON ); + +const struct sof_intel_dsp_desc arl_s_chip_info = { + .cores_num =2 , + .init_core_mask =BIT (0 ), + .host_managed_cores_mask =BIT (0 ), + .ipc_req =MTL_DSP_REG_HFIPCXIDR , + .ipc_req_mask =MTL_DSP_REG_HFIPCXIDR_BUSY , + .ipc_ack =MTL_DSP_REG_HFIPCXIDA , + .ipc_ack_mask =MTL_DSP_REG_HFIPCXIDA_DONE , + .ipc_ctl =MTL_DSP_REG_HFIPCXCTL , + .rom_status_reg =MTL_DSP_ROM_STS , + .rom_init_timeout =300 , + .ssp_count =MTL_SSP_COUNT , + .ssp_base_offset =CNL_SSP_BASE_OFFSET , + .sdw_shim_base =SDW_SHIM_BASE_ACE , + .sdw_alh_base =SDW_ALH_BASE_ACE , + .d0i3_offset =MTL_HDA_VS_D0I3C , + .read_sdw_lcount = hda_sdw_check_lcount_common, + .enable_sdw_irq = mtl_enable_sdw_irq, + .check_sdw_irq = mtl_dsp_check_sdw_irq, + .check_sdw_wakeen_irq = hda_sdw_check_wakeen_irq_common, + .check_ipc_irq = mtl_dsp_check_ipc_irq, + .cl_init = mtl_dsp_cl_init, + .power_down_dsp = mtl_power_down_dsp, + .disable_interrupts = mtl_dsp_disable_interrupts, + .hw_ip_version =SOF_INTEL_ACE_1_0 , +}; +EXPORT_SYMBOL_NS (arl_s_chip_info,SND_SOC_SOF_INTEL_HDA_COMMON );
sound/soc/sof/intel/pci-mtl.c +6 -6
@@ -50,7 +50,7 @@ static const struct sof_dev_desc mtl_desc = { .ops_free = hda_ops_free, }; -static const struct sof_dev_desc arl_desc = { +static const struct sof_dev_desc arl_s_desc = { .use_acpi_target_states = true, .machines = snd_soc_acpi_intel_arl_machines, .alt_machines = snd_soc_acpi_intel_arl_sdw_machines,
@@ -58,21 +58,21 @@ static const struct sof_dev_desc arl_desc = { .resindex_pcicfg_base = -1, .resindex_imr_base = -1, .irqindex_host_ipc = -1, - .chip_info = &mtl_chip_info, + .chip_info = &arl_s_chip_info, .ipc_supported_mask = BIT(SOF_IPC_TYPE_4), .ipc_default = SOF_IPC_TYPE_4, .dspless_mode_supported = true, /* Only supported for HDaudio */ .default_fw_path = { - [SOF_IPC_TYPE_4] = "intel/sof-ipc4/arl", + [SOF_IPC_TYPE_4] = "intel/sof-ipc4/arl-s", }, .default_lib_path = { - [SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/arl", + [SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/arl-s", }, .default_tplg_path = { [SOF_IPC_TYPE_4] = "intel/sof-ace-tplg", }, .default_fw_filename = { - [SOF_IPC_TYPE_4] = "sof-arl.ri", + [SOF_IPC_TYPE_4] = "sof-arl-s.ri", }, .nocodec_tplg_filename = "sof-arl-nocodec.tplg", .ops = &sof_mtl_ops,
@@ -83,7 +83,7 @@ static const struct sof_dev_desc arl_desc = {/* PCI IDs */ static const struct pci_device_id sof_pci_ids[] = { {PCI_DEVICE_DATA (INTEL ,HDA_MTL , &mtl_desc) }, - {PCI_DEVICE_DATA (INTEL ,HDA_ARL_S , &arl_desc) }, + {PCI_DEVICE_DATA (INTEL ,HDA_ARL_S , &arl_s_desc) }, {0 , } };MODULE_DEVICE_TABLE (pci, sof_pci_ids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 301/641 RDMA/hns: Fix memory leak in free_mr_init()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengchang Tang <[email protected]>
[ Upstream commit 288f535951aa81ed674f5e5477ab11b9d9351b8c ]
When a reserved QP fails to be created, the memory of the remaining created reserved QPs is leaked.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4 -0
@@ -2698,6 +2698,10 @@ static int free_mr_alloc_res(struct hns_roce_dev *hr_dev)return 0 ; create_failed_qp: +for (i--; i >=0 ; i--) { +hns_roce_v2_destroy_qp (&free_mr->rsv_qp[i]->ibqp,NULL ); +kfree (free_mr->rsv_qp[i]); + }hns_roce_destroy_cq (cq,NULL );kfree (cq);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 302/641 clk: qcom: gpucc-sm8150: Update the gpu_cc_pll1 config
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 6ebd9a4f8b8d2b35cf965a04849c4ba763722f13 ]
Update the test_ctl_hi_val and test_ctl_hi1_val of gpu_cc_pll1 as per latest HW recommendation.
--- drivers/clk/qcom/gpucc-sm8150.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/qcom/gpucc-sm8150.c +2 -2
@@ -37,8 +37,8 @@ static struct alpha_pll_config gpu_cc_pll1_config = { .config_ctl_hi_val = 0x00002267, .config_ctl_hi1_val = 0x00000024, .test_ctl_val = 0x00000000, - .test_ctl_hi_val = 0x00000002, - .test_ctl_hi1_val = 0x00000000, + .test_ctl_hi_val = 0x00000000, + .test_ctl_hi1_val = 0x00000020, .user_ctl_val = 0x00000000, .user_ctl_hi_val = 0x00000805, .user_ctl_hi1_val = 0x000000d0,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 303/641 f2fs: Restrict max filesize for 16K f2fs
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Rosenberg <[email protected]>
[ Upstream commit a6a010f5def544af3efcfe21683905a712b60536 ]
Blocks are tracked by u32, so the max permitted filesize is (U32_MAX + 1) * BLOCK_SIZE. Additionally, in order to support crypto data unit sizes of 4K with a 16K block with IV_INO_LBLK_{32,64}, we must further restrict max filesize to (U32_MAX + 1) * 4096. This does not affect 4K blocksize f2fs as the natural limit for files are well below that.
--- fs/f2fs/super.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/f2fs/super.c +8 -0
@@ -3364,6 +3364,14 @@ loff_t max_file_blocks(struct inode *inode) leaf_count *=NIDS_PER_BLOCK ; result += leaf_count; +/* +* For compatibility with FSCRYPT_POLICY_FLAG_IV_INO_LBLK_{64,32} with +* a 4K crypto data unit, we must restrict the max filesize to what can +* fit within U32_MAX + 1 data units. +*/ + + result =min (result, (((loff_t )U32_MAX +1 ) *4096 ) >>F2FS_BLKSIZE_BITS ); +return result; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 304/641 media: bttv: start_streaming should return a proper error code
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 0d75bb6ae127f5e3fd0e2239714908fd2038193d ]
The start_streaming callback returned 0 or 1 instead of a proper error code. Fix that.
--- drivers/media/pci/bt8xx/bttv-driver.c | 6 ++---- drivers/media/pci/bt8xx/bttv-vbi.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-)
drivers/media/pci/bt8xx/bttv-driver.c +2 -4
@@ -1536,13 +1536,11 @@ static void buf_cleanup(struct vb2_buffer *vb)static int start_streaming (struct vb2_queue *q,unsigned int count) { -int ret =1 ;int seqnr =0 ;struct bttv_buffer *buf;struct bttv *btv =vb2_get_drv_priv (q); - ret =check_alloc_btres_lock (btv,RESOURCE_VIDEO_STREAM ); -if (ret ==0 ) { +if (!check_alloc_btres_lock (btv,RESOURCE_VIDEO_STREAM )) {if (btv->field_count) seqnr++;while (!list_empty (&btv->capture)) {
@@ -1553,7 +1551,7 @@ static int start_streaming(struct vb2_queue *q, unsigned int count)vb2_buffer_done (&buf->vbuf.vb2_buf,VB2_BUF_STATE_QUEUED ); } -return !ret; +return -EBUSY ; }if (!vb2_is_streaming (&btv->vbiq)) {init_irqreg (btv);
drivers/media/pci/bt8xx/bttv-vbi.c +3 -5
@@ -123,14 +123,12 @@ static void buf_cleanup_vbi(struct vb2_buffer *vb)static int start_streaming_vbi (struct vb2_queue *q,unsigned int count) { -int ret;int seqnr =0 ;struct bttv_buffer *buf;struct bttv *btv =vb2_get_drv_priv (q); btv->framedrop =0 ; - ret =check_alloc_btres_lock (btv,RESOURCE_VBI ); -if (ret ==0 ) { +if (!check_alloc_btres_lock (btv,RESOURCE_VBI )) {if (btv->field_count) seqnr++;while (!list_empty (&btv->vcapture)) {
@@ -141,13 +139,13 @@ static int start_streaming_vbi(struct vb2_queue *q, unsigned int count)vb2_buffer_done (&buf->vbuf.vb2_buf,VB2_BUF_STATE_QUEUED ); } -return !ret; +return -EBUSY ; }if (!vb2_is_streaming (&btv->capq)) {init_irqreg (btv); btv->field_count =0 ; } -return !ret; +return 0 ; }static void stop_streaming_vbi (struct vb2_queue *q)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 305/641 media: bttv: add back vbi hack
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 3f1faa154a4316b1b585a25394697504b3c24e98 ]
The old (now removed) videobuf framework had an optional vbi hack where the sequence number of the frame counter was copied in the last 4 bytes of the buffer. This hack was active only for the read() interface (so not for streaming I/O), and it was enabled by bttv. This allowed applications that used read() for the VBI data to match it with the corresponding video frame.
When bttv was converted to vb2 this hack was forgotten, but some old applications rely on this.
So add this back, but this time in the bttv driver rather than in the vb2 framework.
--- drivers/media/pci/bt8xx/bttv-driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/media/pci/bt8xx/bttv-driver.c +21 -0
@@ -2772,6 +2772,27 @@ bttv_irq_wakeup_vbi(struct bttv *btv, struct bttv_buffer *wakeup,return ; wakeup->vbuf.vb2_buf.timestamp =ktime_get_ns (); wakeup->vbuf.sequence = btv->field_count >>1 ; + +/* +* Ugly hack for backwards compatibility. +* Some applications expect that the last 4 bytes of +* the VBI data contains the sequence number. +* +* This makes it possible to associate the VBI data +* with the video frame if you use read() to get the +* VBI data. +*/ +if (vb2_fileio_is_active (wakeup->vbuf.vb2_buf.vb2_queue)) { +u32 *vaddr =vb2_plane_vaddr (&wakeup->vbuf.vb2_buf,0 ); +unsigned long size = +vb2_get_plane_payload (&wakeup->vbuf.vb2_buf,0 ) /4 ; + +if (vaddr && size) { + vaddr += size -1 ; + *vaddr = wakeup->vbuf.sequence; + } + } +vb2_buffer_done (&wakeup->vbuf.vb2_buf, state);if (btv->field_count ==0 )btor (BT848_INT_VSYNC ,BT848_INT_MASK );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 306/641 media: videobuf2: request more buffers for vb2_read
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 350ab13e1382f2afcc2285041a1e75b80d771c2c ]
The vb2 read support requests 1 buffer, leaving it to the driver to increase this number to something that works.
Unfortunately, drivers do not deal with this reliably, and in fact this caused problems for the bttv driver and reading from /dev/vbiX, causing every other VBI frame to be all 0.
Instead, request as the number of buffers whatever is the maximum of 2 and q->min_buffers_needed+1.
In order to start streaming you need at least q->min_buffers_needed queued buffers, so add 1 buffer for processing. And if that field is 0, then choose 2 (again, one buffer is being filled while the other one is being processed).
This certainly makes more sense than requesting just 1 buffer, and the VBI bttv support is now working again.
It turns out that the old videobuf1 behavior of bttv was to allocate 8 (video) and 4 (vbi) buffers when used with read(). After the vb2 conversion that changed to 2 for both. With this patch it is 3, which is really all you need.
--- drivers/media/common/videobuf2/videobuf2-core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/media/common/videobuf2/videobuf2-core.c +7 -2
@@ -2648,9 +2648,14 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read)return -EBUSY ;/* -* Start with count 1, driver can increase it in queue_setup() +* Start with q->min_buffers_needed + 1, driver can increase it in +* queue_setup() +* +* 'min_buffers_needed' buffers need to be queued up before you +* can start streaming, plus 1 for userspace (or in this case, +* kernelspace) processing. */ - count =1 ; + count =max (2 , q->min_buffers_needed +1 ); dprintk(q, 3, "setting up file io: mode %s, count %d, read_once %d, write_immediately %d\n", (read) ? "read" : "write", count, q->fileio_read_once,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 307/641 media: imx-mipi-csis: Fix clock handling in remove()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 5705b0e0eb550ff834125a46a4ef99b62093d83d ]
The driver always calls mipi_csis_runtime_suspend() and mipi_csis_clk_disable() in remove(). This causes multiple WARNs from the kernel, as the clocks get disabled too many times.
Fix the remove() to call mipi_csis_runtime_suspend() and mipi_csis_clk_disable() in a way that reverses what is done in probe().
--- drivers/media/platform/nxp/imx-mipi-csis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/nxp/imx-mipi-csis.c +3 -1
@@ -1502,8 +1502,10 @@ static void mipi_csis_remove(struct platform_device *pdev)v4l2_async_nf_cleanup (&csis->notifier);v4l2_async_unregister_subdev (&csis->sd); +if (!pm_runtime_enabled (&pdev->dev)) +mipi_csis_runtime_suspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); -mipi_csis_runtime_suspend (&pdev->dev);mipi_csis_clk_disable (csis);v4l2_subdev_cleanup (&csis->sd);media_entity_cleanup (&csis->sd.entity);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 308/641 media: imx-mipi-csis: Drop extra clock enable at probe()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit fb387fcb5cdd0384ba04a5d15a3605e2dccdab2a ]
The driver always enables the clocks at probe() and disables them only at remove(). It is not clear why the driver does this, as it supports runtime PM, and enables and disables the clocks in the runtime resume and suspend callbacks. Also, in the case runtime PM is not available, the driver calls the resume and suspend callbacks manually from probe() and remove().
Drop the unnecessary clock enable, thus enabling the clocks only when actually needed.
--- drivers/media/platform/nxp/imx-mipi-csis.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/media/platform/nxp/imx-mipi-csis.c +2 -11
@@ -1435,24 +1435,18 @@ static int mipi_csis_probe(struct platform_device *pdev)/* Reset PHY and enable the clocks. */ mipi_csis_phy_reset (csis); - ret =mipi_csis_clk_enable (csis); -if (ret <0 ) { -dev_err (csis->dev,"failed to enable clocks: %d\n" , ret); -return ret; - } -/* Now that the hardware is initialized, request the interrupt. */ ret =devm_request_irq (dev, irq, mipi_csis_irq_handler,0 ,dev_name (dev), csis);if (ret) {dev_err (dev,"Interrupt request failed\n" ); - goto err_disable_clock; +return ret; }/* Initialize and register the subdev. */ ret =mipi_csis_subdev_init (csis);if (ret <0 ) - goto err_disable_clock; +return ret;platform_set_drvdata (pdev, &csis->sd);
@@ -1486,8 +1480,6 @@ static int mipi_csis_probe(struct platform_device *pdev)v4l2_async_nf_unregister (&csis->notifier);v4l2_async_nf_cleanup (&csis->notifier);v4l2_async_unregister_subdev (&csis->sd); -err_disable_clock: -mipi_csis_clk_disable (csis);return ret; }
@@ -1506,7 +1498,6 @@ static void mipi_csis_remove(struct platform_device *pdev)mipi_csis_runtime_suspend (&pdev->dev);pm_runtime_disable (&pdev->dev); -mipi_csis_clk_disable (csis);v4l2_subdev_cleanup (&csis->sd);media_entity_cleanup (&csis->sd.entity);pm_runtime_set_suspended (&pdev->dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 309/641 media: dt-bindings: media: rkisp1: Fix the port description for the parallel interface
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mehdi Djait <[email protected]>
[ Upstream commit 25bf28b25a2afa1864b7143259443160d9163ea0 ]
The bus-type belongs to the endpoint's properties and should therefore be moved.
--- .../devicetree/bindings/media/rockchip-isp1.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/media/rockchip-isp1.yaml +6 -5
@@ -90,15 +90,16 @@ properties: description: connection point for input on the parallel interface properties: - bus-type: - enum: [5, 6] - endpoint: $ref: video-interfaces.yaml# unevaluatedProperties: false - required: - - bus-type + properties: + bus-type: + enum: [5, 6] + + required: + - bus-type anyOf: - required:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 310/641 media: rkisp1: Fix media device memory leak
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 452f604a4683654f4d9472b3126d8da61d748443 ]
Add missing calls to media_device_cleanup() to fix memory leak.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +5 -1
@@ -582,7 +582,7 @@ static int rkisp1_probe(struct platform_device *pdev) ret =v4l2_device_register (rkisp1->dev, &rkisp1->v4l2_dev);if (ret) - goto err_pm_runtime_disable; + goto err_media_dev_cleanup; ret =media_device_register (&rkisp1->media_dev);if (ret) {
@@ -617,6 +617,8 @@ static int rkisp1_probe(struct platform_device *pdev)media_device_unregister (&rkisp1->media_dev); err_unreg_v4l2_dev:v4l2_device_unregister (&rkisp1->v4l2_dev); +err_media_dev_cleanup: +media_device_cleanup (&rkisp1->media_dev); err_pm_runtime_disable:pm_runtime_disable (&pdev->dev);return ret;
@@ -637,6 +639,8 @@ static void rkisp1_remove(struct platform_device *pdev)media_device_unregister (&rkisp1->media_dev);v4l2_device_unregister (&rkisp1->v4l2_dev); +media_device_cleanup (&rkisp1->media_dev); +pm_runtime_disable (&pdev->dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 311/641 media: rkisp1: Fix memory leaks in rkisp1_isp_unregister()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 688f3af3c354adc19b78d352c8c7b2006f993f2d ]
Add missing call to v4l2_subdev_cleanup() to fix memory leak.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +1 -0
@@ -933,6 +933,7 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)return ;v4l2_device_unregister_subdev (&isp->sd); +v4l2_subdev_cleanup (&isp->sd);media_entity_cleanup (&isp->sd.entity); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 312/641 drm/msm/adreno: Fix A680 chip id
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit 3e6688fd96966b6c275e95c39aa367bc0a490ccd ]
The only A680 referenced from DeviceTree is patch level 1, which since commit '90b593ce1c9e ("drm/msm/adreno: Switch to chip-id for identifying GPU")' isn't a known chip id.
Correct the chip id to allow the A680 to be recognized again.
Patchwork: https://patchwork.freedesktop.org/patch/569839/
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -1
@@ -464,7 +464,7 @@ static const struct adreno_info gpulist[] = { { 190, 1 }, ), }, { - .chip_ids =ADRENO_CHIP_IDS (0x06080000 ), + .chip_ids =ADRENO_CHIP_IDS (0x06080001 ), .family = ADRENO_6XX_GEN2, .revn = 680, .fw = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 313/641 drm/panel: st7701: Fix AVCL calculation
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Morgan <[email protected]>
[ Upstream commit 799825aa87200ade1ba21db853d1c2ff720dcfe0 ]
The AVCL register, according to the datasheet, comes in increments of -0.2v between -4.4v (represented by 0x0) to -5.0v (represented by 0x3). The current calculation is done by adding the defined AVCL value in mV to -4400 and then dividing by 200 to get the register value. Unfortunately if I subtract -4400 from -4400 I get -8800, which divided by 200 gives me -44. If I instead subtract -4400 from -4400 I get 0, which divided by 200 gives me 0. Based on the datasheet this is the expected register value.
--- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-sitronix-st7701.c +1 -1
@@ -288,7 +288,7 @@ static void st7701_init_sequence(struct st7701 *st7701)FIELD_PREP (DSI_CMD2_BK1_PWRCTRL2_AVDD_MASK ,DIV_ROUND_CLOSEST (desc->avdd_mv -6200 ,200 )) |FIELD_PREP (DSI_CMD2_BK1_PWRCTRL2_AVCL_MASK , - DIV_ROUND_CLOSEST(-4400 + desc->avcl_mv, 200))); + DIV_ROUND_CLOSEST(-4400 - desc->avcl_mv, 200)));/* T2D = 0.2us * T2D[3:0] */ ST7701_DSI(st7701, DSI_CMD2_BK1_SPD1,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 314/641 f2fs: fix to wait on block writeback for post_read case
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 55fdc1c24a1d6229fe0ecf31335fb9a2eceaaa00 ]
If inode is compressed, but not encrypted, it missed to call f2fs_wait_on_block_writeback() to wait for GCed page writeback in IPU write path.
Thread A GC-Thread
- f2fs_gc
- do_garbage_collect
- gc_data_segment
- move_data_block
- f2fs_submit_page_write migrate normal cluster's block via meta_inode's page cache
- f2fs_write_single_data_page
- f2fs_do_write_data_page
- f2fs_inplace_write_data
- f2fs_submit_page_bio
IRQ
- f2fs_read_end_io
IRQ
old data overrides new data due to out-of-order GC and common IO.
- f2fs_read_end_io
--- fs/f2fs/data.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/data.c +4 -3
@@ -2566,9 +2566,6 @@ int f2fs_encrypt_one_page(struct f2fs_io_info *fio) page = fio->compressed_page ? fio->compressed_page : fio->page; -/* wait for GCed page writeback via META_MAPPING */ -f2fs_wait_on_block_writeback (inode, fio->old_blkaddr); -if (fscrypt_inode_uses_inline_crypto (inode))return 0 ;
@@ -2755,6 +2752,10 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) goto out_writepage; } +/* wait for GCed page writeback via META_MAPPING */ +if (fio->post_read) +f2fs_wait_on_block_writeback (inode, fio->old_blkaddr); +/* * If current allocation needs SSR, * it had better in-place writes for updated data.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 315/641 f2fs: fix to check compress file in f2fs_move_file_range()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit fb9b65340c818875ea86464faf3c744bdce0055c ]
f2fs_move_file_range() doesn't support migrating compressed cluster data, let's add the missing check condition and return -EOPNOTSUPP for the case until we support it.
--- fs/f2fs/file.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/f2fs/file.c +5 -0
@@ -2818,6 +2818,11 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, goto out; } +if (f2fs_compressed_file (src) ||f2fs_compressed_file (dst)) { + ret = -EOPNOTSUPP ; + goto out_unlock; + } + ret = -EINVAL ;if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 316/641 f2fs: fix to update iostat correctly in f2fs_filemap_fault()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit bb34cc6ca87ff78f9fb5913d7619dc1389554da6 ]
In f2fs_filemap_fault(), it fixes to update iostat info only if VM_FAULT_LOCKED is tagged in return value of filemap_fault().
--- fs/f2fs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/file.c +1 -1
@@ -42,7 +42,7 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)vm_fault_t ret; ret =filemap_fault (vmf); -if (!ret) +if (ret &VM_FAULT_LOCKED )f2fs_update_iostat (F2FS_I_SB (inode), inode,APP_MAPPED_READ_IO ,F2FS_BLKSIZE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 317/641 media: dvbdev: drop refcount on error path in dvb_device_open()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit a2dd235df435a05d389240be748909ada91201d2 ]
If call to file->f_op->open() fails, then call dvb_device_put(dvbdev).
--- drivers/media/dvb-core/dvbdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/dvb-core/dvbdev.c +2 -0
@@ -104,6 +104,8 @@ static int dvb_device_open(struct inode *inode, struct file *file) err = file->f_op->open (inode, file);up_read (&minor_rwsem);mutex_unlock (&dvbdev_mutex); +if (err) +dvb_device_put (dvbdev);return err; } fail:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 318/641 media: dvb-frontends: m88ds3103: Fix a memory leak in an error handling path of m88ds3103_probe()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 5b2f885e2f6f482d05c23f04c8240f7b4fc5bdb5 ]
If an error occurs after a successful i2c_mux_add_adapter(), then i2c_mux_del_adapters() should be called to free some resources, as already done in the remove function.
--- drivers/media/dvb-frontends/m88ds3103.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/dvb-frontends/m88ds3103.c +5 -2
@@ -1894,7 +1894,7 @@ static int m88ds3103_probe(struct i2c_client *client)/* get frontend address */ ret =regmap_read (dev->regmap,0x29 , &utmp);if (ret) - goto err_kfree; + goto err_del_adapters; dev->dt_addr = ((utmp &0x80 ) ==0 ) ?0x42 >>1 :0x40 >>1 ;dev_dbg (&client->dev,"dt addr is 0x%02x\n" , dev->dt_addr);
@@ -1902,11 +1902,14 @@ static int m88ds3103_probe(struct i2c_client *client) dev->dt_addr);if (IS_ERR (dev->dt_client)) { ret =PTR_ERR (dev->dt_client); - goto err_kfree; + goto err_del_adapters; } }return 0 ; + +err_del_adapters: +i2c_mux_del_adapters (dev->muxc); err_kfree:kfree (dev); err:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 319/641 clk: renesas: rzg2l-cpg: Reuse code in rzg2l_cpg_reset()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 5f9e29b9159a41fcf6733c3b59fa46a90ce3ae20 ]
Code in rzg2l_cpg_reset() is equivalent with the combined code of rzg2l_cpg_assert() and rzg2l_cpg_deassert(). There is no need to have different versions thus re-use rzg2l_cpg_assert() and rzg2l_cpg_deassert().
Stable-dep-of: da235d2fac21 ("clk: renesas: rzg2l: Check reset monitor registers")
--- drivers/clk/renesas/rzg2l-cpg.c | 38 +++++++++++++-------------------- 1 file changed, 15 insertions(+), 23 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +15 -23
@@ -1410,29 +1410,6 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod,#define rcdev_to_priv (x) container_of(x, struct rzg2l_cpg_priv, rcdev) -static int rzg2l_cpg_reset (struct reset_controller_dev *rcdev, -unsigned long id) -{ -struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev); -const struct rzg2l_cpg_info *info = priv->info; -unsigned int reg = info->resets[id].off; -u32 dis =BIT (info->resets[id].bit); -u32 we = dis <<16 ; - -dev_dbg (rcdev->dev,"reset id:%ld offset:0x%x\n" , id,CLK_RST_R (reg)); - -/* Reset module */ -writel (we, priv->base +CLK_RST_R (reg)); - -/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ -udelay (35 ); - -/* Release module from reset state */ -writel (we | dis, priv->base +CLK_RST_R (reg)); - -return 0 ; -} -static int rzg2l_cpg_assert (struct reset_controller_dev *rcdev,unsigned long id) {
@@ -1463,6 +1440,21 @@ static int rzg2l_cpg_deassert(struct reset_controller_dev *rcdev,return 0 ; } +static int rzg2l_cpg_reset (struct reset_controller_dev *rcdev, +unsigned long id) +{ +int ret; + + ret =rzg2l_cpg_assert (rcdev, id); +if (ret) +return ret; + +/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ +udelay (35 ); + +return rzg2l_cpg_deassert (rcdev, id); +} +static int rzg2l_cpg_status (struct reset_controller_dev *rcdev,unsigned long id) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 320/641 clk: renesas: rzg2l: Check reset monitor registers
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit da235d2fac212d0add570e755feb1167a830bc99 ]
The hardware manual of both RZ/G2L and RZ/G3S specifies that the reset monitor registers need to be interrogated when the reset signals are toggled (chapters "Procedures for Supplying and Stopping Reset Signals" and "Procedure for Activating Modules"). Without this, there is a chance that different modules (e.g. Ethernet) are not ready after their reset signal is toggled, leading to failures (on probe or resume from deep sleep states).
The same indications are available for RZ/V2M for TYPE-B reset controls.
--- drivers/clk/renesas/rzg2l-cpg.c | 59 ++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 15 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +44 -15
@@ -1416,12 +1416,27 @@ static int rzg2l_cpg_assert(struct reset_controller_dev *rcdev,struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev);const struct rzg2l_cpg_info *info = priv->info;unsigned int reg = info->resets[id].off; -u32 value =BIT (info->resets[id].bit) <<16 ; +u32 mask =BIT (info->resets[id].bit); +s8 monbit = info->resets[id].monbit; +u32 value = mask <<16 ;dev_dbg (rcdev->dev,"assert id:%ld offset:0x%x\n" , id,CLK_RST_R (reg));writel (value, priv->base +CLK_RST_R (reg)); -return 0 ; + +if (info->has_clk_mon_regs) { + reg =CLK_MRST_R (reg); + }else if (monbit >=0 ) { + reg =CPG_RST_MON ; + mask =BIT (monbit); + }else { +/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ +udelay (35 ); +return 0 ; + } + +return readl_poll_timeout_atomic (priv->base + reg, value, + value & mask,10 ,200 ); } static int rzg2l_cpg_deassert(struct reset_controller_dev *rcdev,
@@ -1430,14 +1445,28 @@ static int rzg2l_cpg_deassert(struct reset_controller_dev *rcdev,struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev);const struct rzg2l_cpg_info *info = priv->info;unsigned int reg = info->resets[id].off; -u32 dis =BIT (info->resets[id].bit); -u32 value = (dis <<16 ) | dis; +u32 mask =BIT (info->resets[id].bit); +s8 monbit = info->resets[id].monbit; +u32 value = (mask <<16 ) | mask;dev_dbg (rcdev->dev,"deassert id:%ld offset:0x%x\n" , id,CLK_RST_R (reg));writel (value, priv->base +CLK_RST_R (reg)); -return 0 ; + +if (info->has_clk_mon_regs) { + reg =CLK_MRST_R (reg); + }else if (monbit >=0 ) { + reg =CPG_RST_MON ; + mask =BIT (monbit); + }else { +/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ +udelay (35 ); +return 0 ; + } + +return readl_poll_timeout_atomic (priv->base + reg, value, + !(value & mask),10 ,200 ); } static int rzg2l_cpg_reset(struct reset_controller_dev *rcdev,
@@ -1449,9 +1478,6 @@ static int rzg2l_cpg_reset(struct reset_controller_dev *rcdev,if (ret)return ret; -/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ -udelay (35 ); -return rzg2l_cpg_deassert (rcdev, id); }
@@ -1460,18 +1486,21 @@ static int rzg2l_cpg_status(struct reset_controller_dev *rcdev, {struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev);const struct rzg2l_cpg_info *info = priv->info; -unsigned int reg = info->resets[id].off; -u32 bitmask =BIT (info->resets[id].bit);s8 monbit = info->resets[id].monbit; +unsigned int reg; +u32 bitmask;if (info->has_clk_mon_regs) { -return !!(readl (priv->base +CLK_MRST_R (reg)) & bitmask); + reg =CLK_MRST_R (info->resets[id].off); + bitmask =BIT (info->resets[id].bit); }else if (monbit >=0 ) { -u32 monbitmask =BIT (monbit); - -return !!(readl (priv->base +CPG_RST_MON ) & monbitmask); + reg =CPG_RST_MON ; + bitmask =BIT (monbit); + }else { +return -ENOTSUPP ; } -return -ENOTSUPP ; + +return !!(readl (priv->base + reg) & bitmask); }static const struct reset_control_ops rzg2l_cpg_reset_ops = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 321/641 drm/msm/dpu: Set input_sel bit for INTF
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jessica Zhang <[email protected]>
[ Upstream commit 980fffd0c69e5df0f67ee089d405899d532aeeab ]
Set the input_sel bit for encoders as it was missed in the initial implementation.
Patchwork: https://patchwork.freedesktop.org/patch/572007/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 9 +++++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +1 -1
@@ -320,7 +320,7 @@ static u32 dpu_hw_intf_get_line_count(struct dpu_hw_intf *intf)static void dpu_hw_intf_setup_misr (struct dpu_hw_intf *intf,bool enable,u32 frame_count) { -dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL , enable, frame_count); +dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL , enable, frame_count,0x1 ); }static int dpu_hw_intf_collect_misr (struct dpu_hw_intf *intf,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +1 -1
@@ -83,7 +83,7 @@ static void dpu_hw_lm_setup_border_color(struct dpu_hw_mixer *ctx,static void dpu_hw_lm_setup_misr (struct dpu_hw_mixer *ctx,bool enable,u32 frame_count) { -dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL , enable, frame_count); +dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL , enable, frame_count,0x0 ); }static int dpu_hw_lm_collect_misr (struct dpu_hw_mixer *ctx,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c +7 -2
@@ -481,9 +481,13 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset, cfg->danger_safe_en ? QOS_QOS_CTRL_DANGER_SAFE_EN : 0); } +/* +* note: Aside from encoders, input_sel should be set to 0x0 by default +*/ void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c,u32 misr_ctrl_offset, -bool enable,u32 frame_count) +bool enable,u32 frame_count, +u8 input_sel) {u32 config =0 ;
@@ -494,7 +498,8 @@ void dpu_hw_setup_misr(struct dpu_hw_blk_reg_map *c,if (enable) { config = (frame_count &MISR_FRAME_COUNT_MASK ) | -MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK ; +MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK | + ((input_sel &0xF ) <<24 );DPU_REG_WRITE (c, misr_ctrl_offset, config); }else {
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +2 -1
@@ -360,7 +360,8 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset,void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c,u32 misr_ctrl_offset,bool enable, -u32 frame_count); +u32 frame_count, +u8 input_sel); int dpu_hw_collect_misr(struct dpu_hw_blk_reg_map *c, u32 misr_ctrl_offset,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 322/641 drm/msm/dpu: Drop enable and frame_count parameters from dpu_hw_setup_misr()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jessica Zhang <[email protected]>
[ Upstream commit 3313c23f3eab698bc6b904520ee608fc0f7b03d0 ]
Drop the enable and frame_count parameters from dpu_hw_setup_misr() as they are always set to the same values.
In addition, replace MISR_FRAME_COUNT_MASK with MISR_FRAME_COUNT as frame_count is always set to the same value.
Patchwork: https://patchwork.freedesktop.org/patch/572009/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 19 +++++-------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 9 +++------ 8 files changed, 22 insertions(+), 33 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved. * Copyright (C) 2013 Red Hat * Author: Rob Clark <[email protected]>
@@ -125,7 +125,7 @@ static void dpu_crtc_setup_lm_misr(struct dpu_crtc_state *crtc_state)continue ;/* Calculate MISR over 1 frame */ - m->hw_lm->ops.setup_misr (m->hw_lm, true,1 ); + m->hw_lm->ops.setup_misr (m->hw_lm); } }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +2 -2
@@ -2,7 +2,7 @@/* * Copyright (C) 2013 Red Hat * Copyright (c) 2014-2018, 2020-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * * Author: Rob Clark <[email protected]> */
@@ -255,7 +255,7 @@ void dpu_encoder_setup_misr(const struct drm_encoder *drm_enc)if (!phys->hw_intf || !phys->hw_intf->ops.setup_misr)continue ; - phys->hw_intf->ops.setup_misr (phys->hw_intf, true,1 ); + phys->hw_intf->ops.setup_misr (phys->hw_intf); } }
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +3 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. */
@@ -318,9 +318,9 @@ static u32 dpu_hw_intf_get_line_count(struct dpu_hw_intf *intf)return DPU_REG_READ (c,INTF_LINE_COUNT ); } -static void dpu_hw_intf_setup_misr (struct dpu_hw_intf *intf,bool enable,u32 frame_count) +static void dpu_hw_intf_setup_misr (struct dpu_hw_intf *intf) { -dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL , enable, frame_count,0x1 ); +dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL ,0x1 ); }static int dpu_hw_intf_collect_misr (struct dpu_hw_intf *intf,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. */
@@ -95,7 +95,7 @@ struct dpu_hw_intf_ops {void (*bind_pingpong_blk)(struct dpu_hw_intf *intf,const enum dpu_pingpong pp); -void (*setup_misr)(struct dpu_hw_intf *intf,bool enable,u32 frame_count); +void (*setup_misr)(struct dpu_hw_intf *intf);int (*collect_misr)(struct dpu_hw_intf *intf,u32 *misr_value);// Tearcheck on INTF since DPU 5.0.0
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +3 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */
@@ -81,9 +81,9 @@ static void dpu_hw_lm_setup_border_color(struct dpu_hw_mixer *ctx, } } -static void dpu_hw_lm_setup_misr (struct dpu_hw_mixer *ctx,bool enable,u32 frame_count) +static void dpu_hw_lm_setup_misr (struct dpu_hw_mixer *ctx) { -dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL , enable, frame_count,0x0 ); +dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL ,0x0 ); }static int dpu_hw_lm_collect_misr (struct dpu_hw_mixer *ctx,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h +2 -1
@@ -1,5 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */
@@ -57,7 +58,7 @@ struct dpu_hw_lm_ops {/** * setup_misr: Enable/disable MISR */ -void (*setup_misr)(struct dpu_hw_mixer *ctx,bool enable,u32 frame_count); +void (*setup_misr)(struct dpu_hw_mixer *ctx);/** * collect_misr: Read MISR signature
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c +5 -14
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. */ #define pr_fmt (fmt) "[drm:%s:%d] " fmt, __func__, __LINE__
@@ -485,9 +485,7 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset,* note: Aside from encoders, input_sel should be set to 0x0 by default */ void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c, -u32 misr_ctrl_offset, -bool enable,u32 frame_count, -u8 input_sel) +u32 misr_ctrl_offset,u8 input_sel) {u32 config =0 ;
@@ -496,16 +494,9 @@ void dpu_hw_setup_misr(struct dpu_hw_blk_reg_map *c,/* Clear old MISR value (in case it's read before a new value is calculated)*/ wmb (); -if (enable) { - config = (frame_count &MISR_FRAME_COUNT_MASK ) | -MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK | - ((input_sel &0xF ) <<24 ); - -DPU_REG_WRITE (c, misr_ctrl_offset, config); - }else { -DPU_REG_WRITE (c, misr_ctrl_offset,0 ); - } - + config =MISR_FRAME_COUNT |MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK | + ((input_sel &0xF ) <<24 ); +DPU_REG_WRITE (c, misr_ctrl_offset, config); } int dpu_hw_collect_misr(struct dpu_hw_blk_reg_map *c,
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +3 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */
@@ -13,7 +13,7 @@#include "dpu_hw_catalog.h" #define REG_MASK (n) ((BIT(n)) - 1) -#define MISR_FRAME_COUNT_MASK 0xFF +#define MISR_FRAME_COUNT 0x1#define MISR_CTRL_ENABLE BIT(8)#define MISR_CTRL_STATUS BIT(9)#define MISR_CTRL_STATUS_CLEAR BIT(10)
@@ -358,10 +358,7 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset, const struct dpu_hw_qos_cfg *cfg);void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c, -u32 misr_ctrl_offset, -bool enable, -u32 frame_count, -u8 input_sel); +u32 misr_ctrl_offset,u8 input_sel); int dpu_hw_collect_misr(struct dpu_hw_blk_reg_map *c, u32 misr_ctrl_offset,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 323/641 media: i2c: mt9m114: use fsleep() in place of udelay()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 02d4e62ae2452c83e4a3e279b8e4cb4dcbad4b31 ]
With clang-16, building without COMMON_CLK triggers a range check on udelay() because of a constant division-by-zero calculation:
ld.lld: error: undefined symbol: __bad_udelay
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
referenced by
mt9m114.cdrivers/media/i2c/mt9m114.o:(mt9m114_power_on) in archive vmlinux.a
In this configuration, the driver already fails to probe, before this function gets called, so it's enough to suppress the assertion.
Do this by using fsleep(), which turns long delays into sleep() calls in place of the link failure.
This is probably a good idea regardless to avoid overly long dynamic udelay() calls on a slow clock.
--- drivers/media/i2c/mt9m114.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/mt9m114.c +1 -1
@@ -2112,7 +2112,7 @@ static int mt9m114_power_on(struct mt9m114 *sensor) duration =DIV_ROUND_UP (2 *50 *1000000 , freq);gpiod_set_value (sensor->reset,1 ); -udelay (duration); +fsleep (duration);gpiod_set_value (sensor->reset,0 ); }else {/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 324/641 drm/mediatek: Return error if MDP RDMA failed to enable the clock
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 21b287146adf39304193e4c49198021e06a28ded ]
Return the result of clk_prepare_enable() instead of always returns 0.
--- drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_mdp_rdma.c +1 -2
@@ -246,8 +246,7 @@ int mtk_mdp_rdma_clk_enable(struct device *dev) {struct mtk_mdp_rdma *rdma =dev_get_drvdata (dev); -clk_prepare_enable (rdma->clk); -return 0 ; +return clk_prepare_enable (rdma->clk); }void mtk_mdp_rdma_clk_disable (struct device *dev)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 325/641 drm/mediatek: Remove the redundant driver data for DPI
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 8ac6935e5689a491f0bec78fec732722b3dad094 ]
DPI input is in 1T2P mode on both MT8195 and MT8188. Remove the redundant driver data to align the settings, or the screen will glitch.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +1 -15
@@ -966,20 +966,6 @@ static const struct mtk_dpi_conf mt8186_conf = { .csc_enable_bit = CSC_ENABLE, }; -static const struct mtk_dpi_conf mt8188_dpintf_conf = { - .cal_factor = mt8195_dpintf_calculate_factor, - .max_clock_khz =600000 , - .output_fmts = mt8195_output_fmts, - .num_output_fmts =ARRAY_SIZE (mt8195_output_fmts), - .pixels_per_iter =4 , - .input_2pixel = false, - .dimension_mask =DPINTF_HPW_MASK , - .hvsize_mask =DPINTF_HSIZE_MASK , - .channel_swap_shift =DPINTF_CH_SWAP , - .yuv422_en_bit =DPINTF_YUV422_EN , - .csc_enable_bit =DPINTF_CSC_ENABLE , -}; -static const struct mtk_dpi_conf mt8192_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con =0xe0 ,
@@ -1103,7 +1089,7 @@ static const struct of_device_id mtk_dpi_of_ids[] = { { .compatible = "mediatek,mt8173-dpi", .data = &mt8173_conf }, { .compatible = "mediatek,mt8183-dpi", .data = &mt8183_conf }, { .compatible = "mediatek,mt8186-dpi", .data = &mt8186_conf }, - { .compatible = "mediatek,mt8188-dp-intf", .data = &mt8188_dpintf_conf }, + { .compatible = "mediatek,mt8188-dp-intf", .data = &mt8195_dpintf_conf }, { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf }, { .compatible = "mediatek,mt8195-dp-intf", .data = &mt8195_dpintf_conf }, { /* sentinel */ },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 326/641 drm/mediatek: Fix underrun in VDO1 when switches off the layer
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 73b5ab27ab2ee616f2709dc212c2b0007894a12e ]
Do not reset Merge while using CMDQ because reset API doesn't wait for frame done event as CMDQ does and could lead to underrun when the layer is switching off.
--- drivers/gpu/drm/mediatek/mtk_disp_merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_disp_merge.c +1 -1
@@ -103,7 +103,7 @@ void mtk_merge_stop_cmdq(struct device *dev, struct cmdq_pkt *cmdq_pkt)mtk_ddp_write (cmdq_pkt,0 , &priv->cmdq_reg, priv->regs,DISP_REG_MERGE_CTRL ); -if (priv->async_clk) +if (!cmdq_pkt && priv->async_clk)reset_control_reset (priv->reset_ctl); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 327/641 drm/amdgpu/debugfs: fix error code when smc register accessors are NULL
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit afe58346d5d3887b3e49ff623d2f2e471f232a8d ]
Should be -EOPNOTSUPP.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2 -2
@@ -755,7 +755,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,int r;if (!adev->smc_rreg) -return -EPERM ; +return -EOPNOTSUPP ;if (size &0x3 || *pos &0x3 )return -EINVAL ;
@@ -814,7 +814,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *int r;if (!adev->smc_wreg) -return -EPERM ; +return -EOPNOTSUPP ;if (size &0x3 || *pos &0x3 )return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 328/641 drm/amd/pm: fix a double-free in si_dpm_init
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit ac16667237a82e2597e329eb9bc520d1cf9dff30 ]
When the allocation of adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries fails, amdgpu_free_extended_power_table is called to free some fields of adev. However, when the control flow returns to si_dpm_sw_init, it goes to label dpm_failed and calls si_dpm_fini, which calls amdgpu_free_extended_power_table again and free those fields again. Thus a double-free is triggered.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +2 -3
@@ -7379,10 +7379,9 @@ static int si_dpm_init(struct amdgpu_device *adev)kcalloc (4 ,sizeof (struct amdgpu_clock_voltage_dependency_entry ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries)return -ENOMEM ; - } + adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.count =4 ; adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0 ].clk =0 ; adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0 ].v =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 329/641 drivers/amd/pm: fix a use-after-free in kv_parse_power_table
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 28dd788382c43b330480f57cd34cde0840896743 ]
When ps allocated by kzalloc equals to NULL, kv_parse_power_table frees adev->pm.dpm.ps that allocated before. However, after the control flow goes through the following call chains:
kv_parse_power_table
|-> kv_dpm_init
|-> kv_dpm_sw_init |-> kv_dpm_fini
The adev->pm.dpm.ps is used in the for loop of kv_dpm_fini after its first free in kv_parse_power_table and causes a use-after-free bug.
--- drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +1 -3
@@ -2735,10 +2735,8 @@ static int kv_parse_power_table(struct amdgpu_device *adev) non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; ps =kzalloc (sizeof (struct kv_ps ),GFP_KERNEL ); -if (ps ==NULL ) { -kfree (adev->pm.dpm.ps); +if (ps ==NULL )return -ENOMEM ; - } adev->pm.dpm.ps[i].ps_priv = ps; k =0 ; idx = (u8 *)&power_state->v2.clockInfoIndex[0 ];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 330/641 gpu/drm/radeon: fix two memleaks in radeon_vm_init
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit c2709b2d6a537ca0fa0f1da36fdaf07e48ef447d ]
When radeon_bo_create and radeon_vm_clear_bo fail, the vm->page_tables allocated before need to be freed. However, neither radeon_vm_init itself nor its caller have done such deallocation.
--- drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_vm.c +6 -2
@@ -1204,13 +1204,17 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm) r =radeon_bo_create (rdev, pd_size, align, true,RADEON_GEM_DOMAIN_VRAM ,0 ,NULL ,NULL , &vm->page_directory); -if (r) +if (r) { +kfree (vm->page_tables); + vm->page_tables =NULL ;return r; - + } r =radeon_vm_clear_bo (rdev, vm->page_directory);if (r) {radeon_bo_unref (&vm->page_directory); vm->page_directory =NULL ; +kfree (vm->page_tables); + vm->page_tables =NULL ;return r; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 331/641 drm/amd/pm: fix a double-free in amdgpu_parse_extended_power_table
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit a6582701178a47c4d0cb2188c965c59c0c0647c8 ]
The amdgpu_free_extended_power_table is called in every error-handling paths of amdgpu_parse_extended_power_table. However, after the following call chain of returning:
amdgpu_parse_extended_power_table
|-> kv_dpm_init / si_dpm_init
(the only two caller of amdgpu_parse_extended_power_table)
|-> kv_dpm_sw_init / si_dpm_sw_init
(the only caller of kv_dpm_init / si_dpm_init, accordingly)
|-> kv_dpm_fini / si_dpm_fini
(goto dpm_failed in xx_dpm_sw_init)
|-> amdgpu_free_extended_power_table
As above, the amdgpu_free_extended_power_table is called twice in this returning chain and thus a double-free is triggered. Similarily, the last kfree in amdgpu_parse_extended_power_table also cause a double free with amdgpu_free_extended_power_table in kv_dpm_fini.
--- .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 52 +++++-------------- 1 file changed, 13 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +13 -39
@@ -272,10 +272,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usVddcDependencyOnSCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.vddc_dependency_on_sclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usVddciDependencyOnMCLKOffset) { dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
@@ -283,10 +281,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usVddciDependencyOnMCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.vddci_dependency_on_mclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usVddcDependencyOnMCLKOffset) { dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
@@ -294,10 +290,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usVddcDependencyOnMCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.vddc_dependency_on_mclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usMvddDependencyOnMCLKOffset) { dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
@@ -305,10 +299,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usMvddDependencyOnMCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.mvdd_dependency_on_mclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usMaxClockVoltageOnDCOffset) { ATOM_PPLIB_Clock_Voltage_Limit_Table *clk_v =
@@ -339,10 +331,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)kcalloc (psl->ucNumEntries,sizeof (struct amdgpu_phase_shedding_limits_entry ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.phase_shedding_limits_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.phase_shedding_limits_table.entries)return -ENOMEM ; - } entry = &psl->entries[0 ];for (i =0 ; i < psl->ucNumEntries; i++) {
@@ -383,10 +373,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)ATOM_PPLIB_CAC_Leakage_Record *entry;u32 size = cac_table->ucNumEntries *sizeof (struct amdgpu_cac_leakage_table ); adev->pm.dpm.dyn_state.cac_leakage_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.cac_leakage_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.cac_leakage_table.entries)return -ENOMEM ; - } entry = &cac_table->entries[0 ];for (i =0 ; i < cac_table->ucNumEntries; i++) {if (adev->pm.dpm.platform_caps &ATOM_PP_PLATFORM_CAP_EVV ) {
@@ -438,10 +426,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_vce_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -493,10 +479,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_uvd_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -525,10 +509,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -548,10 +530,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(ext_hdr->usPPMTableOffset)); adev->pm.dpm.dyn_state.ppm_table =kzalloc (sizeof (struct amdgpu_ppm_table ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.ppm_table) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.ppm_table)return -ENOMEM ; - } adev->pm.dpm.dyn_state.ppm_table->ppm_design = ppm->ucPpmDesign; adev->pm.dpm.dyn_state.ppm_table->cpu_core_number =le16_to_cpu (ppm->usCpuCoreNumber);
@@ -583,10 +563,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -606,10 +584,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)ATOM_PowerTune_Table *pt; adev->pm.dpm.dyn_state.cac_tdp_table =kzalloc (sizeof (struct amdgpu_cac_tdp_table ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.cac_tdp_table) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.cac_tdp_table)return -ENOMEM ; - }if (rev >0 ) { ATOM_PPLIB_POWERTUNE_Table_V1 *ppt = (ATOM_PPLIB_POWERTUNE_Table_V1 *) (mode_info->atom_context->bios + data_offset +
@@ -645,10 +621,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) ret =amdgpu_parse_clk_voltage_dep_table ( &adev->pm.dpm.dyn_state.vddgfx_dependency_on_sclk, dep_table); -if (ret) { -kfree (adev->pm.dpm.dyn_state.vddgfx_dependency_on_sclk.entries); +if (ret)return ret; - } } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 332/641 f2fs: fix to check return value of f2fs_recover_xattr_data
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiguo Niu <[email protected]>
[ Upstream commit 86d7d57a3f096c8349b32a0cd5f6f314e4416a6d ]
Should check return value of f2fs_recover_xattr_data in __f2fs_setxattr rather than doing invalid retry if error happen.
Also just do set_page_dirty in f2fs_recover_xattr_data when page is changed really.
--- fs/f2fs/node.c | 6 +++--- fs/f2fs/xattr.c | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-)
fs/f2fs/node.c +3 -3
@@ -2751,11 +2751,11 @@ int f2fs_recover_xattr_data(struct inode *inode, struct page *page)f2fs_update_inode_page (inode);/* 3: update and set xattr node page dirty */ -if (page) +if (page) {memcpy (F2FS_NODE (xpage),F2FS_NODE (page),VALID_XATTR_BLOCK_SIZE ); - -set_page_dirty (xpage); +set_page_dirty (xpage); + }f2fs_put_page (xpage,1 );return 0 ;
fs/f2fs/xattr.c +7 -4
@@ -660,11 +660,14 @@ static int __f2fs_setxattr(struct inode *inode, int index, here =__find_xattr (base_addr, last_base_addr,NULL , index, len, name);if (!here) {if (!F2FS_I (inode)->i_xattr_nid) { + error =f2fs_recover_xattr_data (inode,NULL );f2fs_notice (F2FS_I_SB (inode), -"recover xattr in inode (%lu)" , inode->i_ino); -f2fs_recover_xattr_data (inode,NULL ); -kfree (base_addr); - goto retry; +"recover xattr in inode (%lu), error(%d)" , + inode->i_ino, error); +if (!error) { +kfree (base_addr); + goto retry; + } }f2fs_err (F2FS_I_SB (inode),"set inode (%lu) has corrupted xattr" , inode->i_ino);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 333/641 clk: qcom: videocc-sm8150: Add missing PLL config property
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 71f130c9193f613d497f7245365ed05ffdb0a401 ]
When the driver was ported upstream, PLL test_ctl_hi1 register value was omitted. Add it to ensure the PLLs are fully configured.
--- drivers/clk/qcom/videocc-sm8150.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/videocc-sm8150.c +1 -0
@@ -33,6 +33,7 @@ static struct alpha_pll_config video_pll0_config = { .config_ctl_val = 0x20485699, .config_ctl_hi_val = 0x00002267, .config_ctl_hi1_val = 0x00000024, + .test_ctl_hi1_val = 0x00000020, .user_ctl_val = 0x00000000, .user_ctl_hi_val = 0x00000805, .user_ctl_hi1_val = 0x000000D0,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 334/641 clk: sp7021: fix return value check in sp7021_clk_probe()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yingliang <[email protected]>
[ Upstream commit 1004c346a2b7393fce37dd1f320555e0a0d71e3f ]
devm_platform_ioremap_resource() never returns NULL pointer, it will return ERR_PTR() when it fails, so replace the check with IS_ERR().
--- drivers/clk/clk-sp7021.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/clk-sp7021.c +6 -6
@@ -604,14 +604,14 @@ static int sp7021_clk_probe(struct platform_device *pdev)int i; clk_base =devm_platform_ioremap_resource (pdev,0 ); -if (!clk_base) -return -ENXIO ; +if (IS_ERR (clk_base)) +return PTR_ERR (clk_base); pll_base =devm_platform_ioremap_resource (pdev,1 ); -if (!pll_base) -return -ENXIO ; +if (IS_ERR (pll_base)) +return PTR_ERR (pll_base); sys_base =devm_platform_ioremap_resource (pdev,2 ); -if (!sys_base) -return -ENXIO ; +if (IS_ERR (sys_base)) +return PTR_ERR (sys_base);/* enable default clks */ for (i =0 ; i <ARRAY_SIZE (sp_clken); i++)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 335/641 drivers: clk: zynqmp: calculate closest mux rate
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jay Buddhabhatti <[email protected]>
[ Upstream commit b782921ddd7f84f524723090377903f399fdbbcb ]
Currently zynqmp clock driver is not calculating closest mux rate and because of that Linux is not setting proper frequency for CPU and not able to set given frequency for dynamic frequency scaling.
E.g., In current logic initial acpu clock parent and frequency as below
apll1 0 0 0 2199999978 0 0 50000 Y
acpu0_mux 0 0 0 2199999978 0 0 50000 Y
acpu0_idiv1 0 0 0 2199999978 0 0 50000 Y
acpu0 0 0 0 2199999978 0 0 50000 YAfter changing acpu frequency to 549999994 Hz using CPU freq scaling its selecting incorrect parent which is not closest frequency.
rpll_to_xpd 0 0 0 1599999984 0 0 50000 Y
acpu0_mux 0 0 0 1599999984 0 0 50000 Y
acpu0_div1 0 0 0 533333328 0 0 50000 Y
acpu0 0 0 0 533333328 0 0 50000 YParent should remain same since 549999994 = 2199999978 / 4.
So use __clk_mux_determine_rate_closest() generic function to calculate closest rate for mux clock. After this change its selecting correct parent and correct clock rate.
apll1 0 0 0 2199999978 0 0 50000 Y
acpu0_mux 0 0 0 2199999978 0 0 50000 Y
acpu0_div1 0 0 0 549999995 0 0 50000 Y
acpu0 0 0 0 549999995 0 0 50000 Y--- drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/zynqmp/clk-mux-zynqmp.c +1 -1
@@ -89,7 +89,7 @@ static int zynqmp_clk_mux_set_parent(struct clk_hw *hw, u8 index)static const struct clk_ops zynqmp_clk_mux_ops = { .get_parent = zynqmp_clk_mux_get_parent, .set_parent = zynqmp_clk_mux_set_parent, - .determine_rate = __clk_mux_determine_rate, + .determine_rate = __clk_mux_determine_rate_closest, };static const struct clk_ops zynqmp_clk_mux_ro_ops = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 336/641 drivers: clk: zynqmp: update divider round rate logic
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jay Buddhabhatti <[email protected]>
[ Upstream commit 1fe15be1fb613534ecbac5f8c3f8744f757d237d ]
Currently zynqmp divider round rate is considering single parent and calculating rate and parent rate accordingly. But if divider clock flag is set to SET_RATE_PARENT then its not trying to traverse through all parent rate and not selecting best parent rate from that. So use common divider_round_rate() which is traversing through all clock parents and its rate and calculating proper parent rate.
--- drivers/clk/zynqmp/divider.c | 66 +++--------------------------------- 1 file changed, 5 insertions(+), 61 deletions(-)
drivers/clk/zynqmp/divider.c +5 -61
@@ -110,52 +110,6 @@ static unsigned long zynqmp_clk_divider_recalc_rate(struct clk_hw *hw,return DIV_ROUND_UP_ULL (parent_rate, value); } -static void zynqmp_get_divider2_val (struct clk_hw *hw, -unsigned long rate, -struct zynqmp_clk_divider *divider, -u32 *bestdiv) -{ -int div1; -int div2; -long error =LONG_MAX ; -unsigned long div1_prate; -struct clk_hw *div1_parent_hw; -struct zynqmp_clk_divider *pdivider; -struct clk_hw *div2_parent_hw =clk_hw_get_parent (hw); - -if (!div2_parent_hw) -return ; - - pdivider =to_zynqmp_clk_divider (div2_parent_hw); -if (!pdivider) -return ; - - div1_parent_hw =clk_hw_get_parent (div2_parent_hw); -if (!div1_parent_hw) -return ; - - div1_prate =clk_hw_get_rate (div1_parent_hw); - *bestdiv =1 ; -for (div1 =1 ; div1 <= pdivider->max_div;) { -for (div2 =1 ; div2 <= divider->max_div;) { -long new_error = ((div1_prate / div1) / div2) - rate; - -if (abs (new_error) <abs (error)) { - *bestdiv = div2; - error = new_error; - } -if (divider->flags &CLK_DIVIDER_POWER_OF_TWO ) - div2 = div2 <<1 ; -else - div2++; - } -if (pdivider->flags &CLK_DIVIDER_POWER_OF_TWO ) - div1 = div1 <<1 ; -else - div1++; - } -} -/** * zynqmp_clk_divider_round_rate() - Round rate of divider clock * @hw: handle between common and hardware-specific interfaces
@@ -174,6 +128,7 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw,u32 div_type = divider->div_type;u32 bestdiv;int ret; +u8 width;/* if read only, just return current value */ if (divider->flags &CLK_DIVIDER_READ_ONLY ) {
@@ -193,23 +148,12 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw,return DIV_ROUND_UP_ULL ((u64)*prate, bestdiv); } - bestdiv =zynqmp_divider_get_val (*prate, rate, divider->flags); - -/* -* In case of two divisors, compute best divider values and return -* divider2 value based on compute value. div1 will be automatically -* set to optimum based on required total divider value. -*/ -if (div_type ==TYPE_DIV2 && - (clk_hw_get_flags (hw) &CLK_SET_RATE_PARENT )) { -zynqmp_get_divider2_val (hw, rate, divider, &bestdiv); - } + width =fls (divider->max_div); -if ((clk_hw_get_flags (hw) &CLK_SET_RATE_PARENT ) && divider->is_frac) - bestdiv = rate % *prate ?1 : bestdiv; + rate =divider_round_rate (hw, rate, prate,NULL , width, divider->flags); - bestdiv =min_t (u32, bestdiv, divider->max_div); - *prate = rate * bestdiv; +if (divider->is_frac && (clk_hw_get_flags (hw) &CLK_SET_RATE_PARENT ) && (rate % *prate)) + *prate = rate;return rate; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 337/641 watchdog: set cdev owner before adding
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Curtis Klein <[email protected]>
[ Upstream commit 38d75297745f04206db9c29bdd75557f0344c7cc ]
When the new watchdog character device is registered, it becomes available for opening. This creates a race where userspace may open the device before the character device's owner is set. This results in an imbalance in module_get calls as the cdev_get in cdev_open will not increment the reference count on the watchdog driver module.
This causes problems when the watchdog character device is released as the module loader's reference will also be released. This makes it impossible to open the watchdog device later on as it now appears that the module is being unloaded. The open will fail with -ENXIO from chrdev_open.
The legacy watchdog device will fail with -EBUSY from the try_module_get in watchdog_open because it's module owner is the watchdog core module so it can still be opened but it will fail to get a refcount on the underlying watchdog device driver.
--- drivers/watchdog/watchdog_dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/watchdog/watchdog_dev.c +1 -2
@@ -1073,6 +1073,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)/* Fill in the data structures */ cdev_init (&wd_data->cdev, &watchdog_fops); + wd_data->cdev.owner = wdd->ops->owner;/* Add the device */ err =cdev_device_add (&wd_data->cdev, &wd_data->dev);
@@ -1087,8 +1088,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)return err; } - wd_data->cdev.owner = wdd->ops->owner; -/* Record time of most recent heartbeat as 'just before now'. */ wd_data->last_hw_keepalive =ktime_sub (ktime_get (),1 );watchdog_set_open_deadline (wd_data);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 338/641 watchdog/hpwdt: Only claim UNKNOWN NMI if from iLO
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerry Hoemann <[email protected]>
[ Upstream commit dced0b3e51dd2af3730efe14dd86b5e3173f0a65 ]
Avoid unnecessary crashes by claiming only NMIs that are due to ERROR signalling or generated by the hpwdt hardware device.
The code does this, but only for iLO5.
The intent was to preserve legacy, Gen9 and earlier, semantics of using hpwdt for error containtment as hardware/firmware would signal fatal IO errors as an NMI with the expectation of hpwdt crashing the system. Howerver, these IO errors should be received by hpwdt as an NMI_IO_CHECK. So the test is overly permissive and should not be limited to only ilo5.
We need to enable this protection for future iLOs not matching the current PCI IDs.
--- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/hpwdt.c +1 -1
@@ -178,7 +178,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)"3. OA Forward Progress Log\n" "4. iLO Event Log" ; -if (ilo5 && ulReason ==NMI_UNKNOWN && !mynmi) +if (ulReason ==NMI_UNKNOWN && !mynmi)return NMI_DONE ;if (ilo5 && !pretimeout && !mynmi)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 339/641 watchdog: bcm2835_wdt: Fix WDIOC_SETTIMEOUT handling
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Wahren <[email protected]>
[ Upstream commit f33f5b1fd1be5f5106d16f831309648cb0f1c31d ]
Users report about the unexpected behavior for setting timeouts above 15 sec on Raspberry Pi. According to watchdog-api.rst the ioctl WDIOC_SETTIMEOUT shouldn't fail because of hardware limitations. But looking at the code shows that max_timeout based on the register value PM_WDOG_TIME_SET, which is the maximum.
Since 664a39236e71 ("watchdog: Introduce hardware maximum heartbeat in watchdog core") the watchdog core is able to handle this problem.
This fix has been tested with watchdog-test from selftests.
--- drivers/watchdog/bcm2835_wdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/watchdog/bcm2835_wdt.c +2 -1
@@ -42,6 +42,7 @@#define SECS_TO_WDOG_TICKS (x) ((x) << 16)#define WDOG_TICKS_TO_SECS (x) ((x) >> 16) +#define WDOG_TICKS_TO_MSECS (x) ((x) * 1000 >> 16)struct bcm2835_wdt {void __iomem *base;
@@ -140,7 +141,7 @@ static struct watchdog_device bcm2835_wdt_wdd = { .info = &bcm2835_wdt_info, .ops = &bcm2835_wdt_ops, .min_timeout = 1, - .max_timeout = WDOG_TICKS_TO_SECS(PM_WDOG_TIME_SET), + .max_hw_heartbeat_ms = WDOG_TICKS_TO_MSECS(PM_WDOG_TIME_SET), .timeout = WDOG_TICKS_TO_SECS(PM_WDOG_TIME_SET), };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 340/641 watchdog: rti_wdt: Drop runtime pm reference count when watchdog is unused
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vignesh Raghavendra <[email protected]>
[ Upstream commit c1a6edf3b541e44e78f10bc6024df779715723f1 ]
Call runtime_pm_put*() if watchdog is not already started during probe and re enable it in watchdog start as required.
On K3 SoCs, watchdogs and their corresponding CPUs are under same power-domain, so if the reference count of unused watchdogs aren't dropped, it will lead to CPU hotplug failures as Device Management firmware won't allow to turn off the power-domain due to dangling reference count.
--- drivers/watchdog/rti_wdt.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/watchdog/rti_wdt.c +12 -1
@@ -77,6 +77,11 @@ static int rti_wdt_start(struct watchdog_device *wdd) {u32 timer_margin;struct rti_wdt_device *wdt =watchdog_get_drvdata (wdd); +int ret; + + ret =pm_runtime_resume_and_get (wdd->parent); +if (ret) +return ret;/* set timeout period */ timer_margin = (u64 )wdd->timeout * wdt->freq;
@@ -343,6 +348,9 @@ static int rti_wdt_probe(struct platform_device *pdev)if (last_ping)watchdog_set_last_hw_keepalive (wdd, last_ping); +if (!watchdog_hw_running (wdd)) +pm_runtime_put_sync (&pdev->dev); +return 0 ; err_iomap:
@@ -357,7 +365,10 @@ static void rti_wdt_remove(struct platform_device *pdev)struct rti_wdt_device *wdt =platform_get_drvdata (pdev);watchdog_unregister_device (&wdt->wdd); -pm_runtime_put (&pdev->dev); + +if (!pm_runtime_suspended (&pdev->dev)) +pm_runtime_put (&pdev->dev); +pm_runtime_disable (&pdev->dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 341/641 clk: rs9: Fix DIF OEn bit placement on 9FGV0241
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit 29d861b5d29b6c80a887e93ad982cbbf4af2a06b ]
On 9FGV0241, the DIF OE0 is BIT(1) and DIF OE1 is BIT(2), on the other chips like 9FGV0441 and 9FGV0841 DIF OE0 is BIT(0) and so on. Increment the index in BIT() macro instead of the result of BIT() macro to shift the bit correctly on 9FGV0241.
--- drivers/clk/clk-renesas-pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-renesas-pcie.c +1 -1
@@ -163,7 +163,7 @@ static u8 rs9_calc_dif(const struct rs9_driver_data *rs9, int idx)enum rs9_model model = rs9->chip_info->model;if (model ==RENESAS_9FGV0241 ) -return BIT (idx) +1 ; +return BIT (idx +1 );else if (model ==RENESAS_9FGV0441 )return BIT (idx);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 342/641 clk: si5341: fix an error code problem in si5341_output_clk_set_rate
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 5607068ae5ab02c3ac9cabc6859d36e98004c341 ]
regmap_bulk_write() return zero or negative error code, return the value of regmap_bulk_write() rather than '0'.
--- drivers/clk/clk-si5341.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clk/clk-si5341.c +1 -3
@@ -895,10 +895,8 @@ static int si5341_output_clk_set_rate(struct clk_hw *hw, unsigned long rate, r[0 ] = r_div ? (r_div &0xff ) :1 ; r[1 ] = (r_div >>8 ) &0xff ; r[2 ] = (r_div >>16 ) &0xff ; - err =regmap_bulk_write (output->data->regmap, +return regmap_bulk_write (output->data->regmap,SI5341_OUT_R_REG (output), r,3 ); - -return 0 ; }static int si5341_output_reparent (struct clk_si5341_output *output,u8 index)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 343/641 ASoC: amd: vangogh: Drop conflicting ACPI-based probing
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit ddd1ee12a8fb6e4d6f86eddeba64c135eee56623 ]
The Vangogh machine driver variant based on the MAX98388 amplifier, as found on Valve's Steam Deck OLED, relies on probing via an ACPI match table. This worked fine until commit 197b1f7f0df1 ("ASoC: amd: Add new dmi entries to config entry") enabled SOF support for the target machine (i.e. Galileo product), causing the sound card to enter the deferred probe state indefinitely:
$ cat /sys/kernel/debug/devices_deferred AMDI8821:00 acp5x_mach: Register card (acp5x-max98388) failed
The issue is related to commit e89f45edb747 ("ASoC: amd: vangogh: Add check for acp config flags in vangogh platform"), which tries to mitigate potential conflicts between SOF and generic ACP Vangogh drivers, due to sharing the PCI device IDs.
However, the solution is effective only if the machine driver is directly probed by pci-acp5x through platform_device_register_full().
Hence, remove the conflicting ACPI based probing and rely exclusively on DMI quirks for sound card setup.
--- sound/soc/amd/vangogh/acp5x-mach.c | 35 +++++++++++------------------- 1 file changed, 13 insertions(+), 22 deletions(-)
sound/soc/amd/vangogh/acp5x-mach.c +13 -22
@@ -439,7 +439,15 @@ static const struct dmi_system_id acp5x_vg_quirk_table[] = { .matches = {DMI_EXACT_MATCH (DMI_BOARD_VENDOR ,"Valve" ), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Jupiter"), - } + }, + .driver_data = (void *)&acp5x_8821_35l41_card, + }, + { + .matches = { +DMI_EXACT_MATCH (DMI_BOARD_VENDOR ,"Valve" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Galileo"), + }, + .driver_data = (void *)&acp5x_8821_98388_card, }, {} };
@@ -452,25 +460,15 @@ static int acp5x_probe(struct platform_device *pdev)struct snd_soc_card *card;int ret; - card = (struct snd_soc_card *)device_get_match_data (dev); -if (!card) { -/* -* This is normally the result of directly probing the driver -* in pci-acp5x through platform_device_register_full(), which -* is necessary for the CS35L41 variant, as it doesn't support -* ACPI probing and relies on DMI quirks. -*/ - dmi_id =dmi_first_match (acp5x_vg_quirk_table); -if (!dmi_id) -return -ENODEV ; - - card = &acp5x_8821_35l41_card; - } + dmi_id =dmi_first_match (acp5x_vg_quirk_table); +if (!dmi_id || !dmi_id->driver_data) +return -ENODEV ; machine =devm_kzalloc (dev,sizeof (*machine),GFP_KERNEL );if (!machine)return -ENOMEM ; + card = dmi_id->driver_data; card->dev = dev;platform_set_drvdata (pdev, card);snd_soc_card_set_drvdata (card, machine);
@@ -482,17 +480,10 @@ static int acp5x_probe(struct platform_device *pdev)return 0 ; } -static const struct acpi_device_id acp5x_acpi_match[] = { - {"AMDI8821" , (kernel_ulong_t)&acp5x_8821_98388_card }, - {}, -}; -MODULE_DEVICE_TABLE (acpi, acp5x_acpi_match); -static struct platform_driver acp5x_mach_driver = { .driver = { .name =DRV_NAME , .pm = &snd_soc_pm_ops, - .acpi_match_table = acp5x_acpi_match, }, .probe = acp5x_probe, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 344/641 ASoC: tas2781: add support for FW version 0x0503
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gergo Koteles <[email protected]>
[ Upstream commit ee00330a5b78e2acf4b3aac32913da43e2c12a26 ]
Layout of FW version 0x0503 is compatible with 0x0502. Already supported by TI's tas2781-linux-driver tree.
https://git.ti.com/cgit/tas2781-linux-drivers/tas2781-linux-driver/
--- sound/soc/codecs/tas2781-fmwlib.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/tas2781-fmwlib.c +1 -0
@@ -1982,6 +1982,7 @@ static int tasdevice_dspfw_ready(const struct firmware *fmw,case 0x301 :case 0x302 :case 0x502 : +case 0x503 : tas_priv->fw_parse_variable_header = fw_parse_variable_header_kernel; tas_priv->fw_parse_program_data =
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 345/641 drm/mediatek: dp: Add phy_mtk_dp module as pre-dependency
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit c8048dd0b07df68724805254b9e994d99e9a7af4 ]
The mtk_dp driver registers a phy device which is handled by the phy_mtk_dp driver and assumes that the phy probe will complete synchronously, proceeding to make use of functionality exposed by that driver right away. This assumption however is false when the phy driver is built as a module, causing the mtk_dp driver to fail probe in this case.
Add the phy_mtk_dp module as a pre-dependency to the mtk_dp module to ensure the phy module has been loaded before the dp, so that the phy probe happens synchrounously and the mtk_dp driver can probe successfully even with the phy driver built as a module.
--- drivers/gpu/drm/mediatek/mtk_dp.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_dp.c +1 -0
@@ -2818,3 +2818,4 @@ MODULE_AUTHOR("Markus Schneider-Pargmann <[email protected]>");MODULE_AUTHOR ("Bo-Chen Chen <[email protected]>" );MODULE_DESCRIPTION ("MediaTek DisplayPort Driver" );MODULE_LICENSE ("GPL" ); +MODULE_SOFTDEP ("pre: phy_mtk_dp" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 346/641 accel/habanalabs: fix information leak in sec_attest_info()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingyuan Mo <[email protected]>
[ Upstream commit a9f07790a4b2250f0140e9a61c7f842fd9b618c7 ]
This function may copy the pad0 field of struct hl_info_sec_attest to user mode which has not been initialized, resulting in leakage of kernel heap data to user mode. To prevent this, use kzalloc() to allocate and zero out the buffer, which can also eliminate other uninitialized holes, if any.
--- drivers/accel/habanalabs/common/habanalabs_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/habanalabs/common/habanalabs_ioctl.c +1 -1
@@ -685,7 +685,7 @@ static int sec_attest_info(struct hl_fpriv *hpriv, struct hl_info_args *args)if (!sec_attest_info)return -ENOMEM ; - info =kmalloc (sizeof (*info),GFP_KERNEL ); + info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { rc = -ENOMEM ; goto free_sec_attest_info;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 347/641 clk: qcom: gcc-sm8550: Add the missing RETAIN_FF_ENABLE GDSC flag
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 1fe8273c8d4088dd68faaab8640ec95f381cbf1e ]
All of the 8550's GCC GDSCs can and should use the retain registers so as not to lose their state when entering lower power modes.
--- drivers/clk/qcom/gcc-sm8550.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/clk/qcom/gcc-sm8550.c +8 -8
@@ -3002,7 +3002,7 @@ static struct gdsc pcie_0_gdsc = { .name = "pcie_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc pcie_0_phy_gdsc = {
@@ -3011,7 +3011,7 @@ static struct gdsc pcie_0_phy_gdsc = { .name = "pcie_0_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc pcie_1_gdsc = {
@@ -3020,7 +3020,7 @@ static struct gdsc pcie_1_gdsc = { .name = "pcie_1_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc pcie_1_phy_gdsc = {
@@ -3029,7 +3029,7 @@ static struct gdsc pcie_1_phy_gdsc = { .name = "pcie_1_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc ufs_phy_gdsc = {
@@ -3038,7 +3038,7 @@ static struct gdsc ufs_phy_gdsc = { .name = "ufs_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc ufs_mem_phy_gdsc = {
@@ -3047,7 +3047,7 @@ static struct gdsc ufs_mem_phy_gdsc = { .name = "ufs_mem_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc usb30_prim_gdsc = {
@@ -3056,7 +3056,7 @@ static struct gdsc usb30_prim_gdsc = { .name = "usb30_prim_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc usb3_phy_gdsc = {
@@ -3065,7 +3065,7 @@ static struct gdsc usb3_phy_gdsc = { .name = "usb3_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct clk_regmap *gcc_sm8550_clocks[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 348/641 clk: qcom: gcc-sm8550: Mark the PCIe GDSCs votable
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit e7fe73fc6b68ee97b1e8f124a66a5ee50d8d5e5b ]
The PCIe GDSCs on most Qualcomm platforms expect the OS to always consider collapse requests as successful. This also concerns SM8550.
Add the VOTABLE flag to the GDSCs in question to comply with these expectations.
--- drivers/clk/qcom/gcc-sm8550.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/qcom/gcc-sm8550.c +4 -4
@@ -3002,7 +3002,7 @@ static struct gdsc pcie_0_gdsc = { .name = "pcie_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, + .flags = VOTABLE | POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc pcie_0_phy_gdsc = {
@@ -3011,7 +3011,7 @@ static struct gdsc pcie_0_phy_gdsc = { .name = "pcie_0_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, + .flags = VOTABLE | POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc pcie_1_gdsc = {
@@ -3020,7 +3020,7 @@ static struct gdsc pcie_1_gdsc = { .name = "pcie_1_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, + .flags = VOTABLE | POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc pcie_1_phy_gdsc = {
@@ -3029,7 +3029,7 @@ static struct gdsc pcie_1_phy_gdsc = { .name = "pcie_1_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, + .flags = VOTABLE | POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; static struct gdsc ufs_phy_gdsc = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 349/641 clk: qcom: gcc-sm8550: use collapse-voting for PCIe GDSCs
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 7e77a39265293ea4f05e20fff180755503c49918 ]
The PCIe GDSCs can be shared with other masters and should use the APCS collapse-vote register when updating the power state.
This is specifically also needed to be able to disable power domains that have been enabled by boot firmware using the vote register.
Following other recent Qualcomm platforms, describe this register and the corresponding mask for the PCIe (and _phy) GDSCs.
--- drivers/clk/qcom/gcc-sm8550.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/qcom/gcc-sm8550.c +8 -0
@@ -2998,6 +2998,8 @@ static struct clk_branch gcc_video_axi1_clk = {static struct gdsc pcie_0_gdsc = { .gdscr =0x6b004 , + .collapse_ctrl =0x52020 , + .collapse_mask =BIT (0 ), .pd = { .name ="pcie_0_gdsc" , },
@@ -3007,6 +3009,8 @@ static struct gdsc pcie_0_gdsc = {static struct gdsc pcie_0_phy_gdsc = { .gdscr =0x6c000 , + .collapse_ctrl =0x52020 , + .collapse_mask =BIT (3 ), .pd = { .name ="pcie_0_phy_gdsc" , },
@@ -3016,6 +3020,8 @@ static struct gdsc pcie_0_phy_gdsc = {static struct gdsc pcie_1_gdsc = { .gdscr =0x8d004 , + .collapse_ctrl =0x52020 , + .collapse_mask =BIT (1 ), .pd = { .name ="pcie_1_gdsc" , },
@@ -3025,6 +3031,8 @@ static struct gdsc pcie_1_gdsc = {static struct gdsc pcie_1_phy_gdsc = { .gdscr =0x8e000 , + .collapse_ctrl =0x52020 , + .collapse_mask =BIT (4 ), .pd = { .name ="pcie_1_phy_gdsc" , },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 350/641 clk: qcom: gcc-sm8550: Mark RCGs shared where applicable
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 929c75d575667af389c8a9e03cebc93d43bb7f31 ]
The vast majority of shared RCGs were not marked as such. Fix it.
--- drivers/clk/qcom/gcc-sm8550.c | 86 +++++++++++++++++------------------ 1 file changed, 43 insertions(+), 43 deletions(-)
drivers/clk/qcom/gcc-sm8550.c +43 -43
@@ -401,7 +401,7 @@ static struct clk_rcg2 gcc_gp1_clk_src = { .parent_data = gcc_parent_data_1, .num_parents = ARRAY_SIZE(gcc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -416,7 +416,7 @@ static struct clk_rcg2 gcc_gp2_clk_src = { .parent_data = gcc_parent_data_1, .num_parents = ARRAY_SIZE(gcc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -431,7 +431,7 @@ static struct clk_rcg2 gcc_gp3_clk_src = { .parent_data = gcc_parent_data_1, .num_parents = ARRAY_SIZE(gcc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -451,7 +451,7 @@ static struct clk_rcg2 gcc_pcie_0_aux_clk_src = { .parent_data = gcc_parent_data_2, .num_parents = ARRAY_SIZE(gcc_parent_data_2), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -471,7 +471,7 @@ static struct clk_rcg2 gcc_pcie_0_phy_rchng_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -486,7 +486,7 @@ static struct clk_rcg2 gcc_pcie_1_aux_clk_src = { .parent_data = gcc_parent_data_2, .num_parents = ARRAY_SIZE(gcc_parent_data_2), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -501,7 +501,7 @@ static struct clk_rcg2 gcc_pcie_1_phy_rchng_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -521,7 +521,7 @@ static struct clk_rcg2 gcc_pdm2_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -536,7 +536,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s0_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -551,7 +551,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s1_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -566,7 +566,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s2_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -581,7 +581,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s3_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -596,7 +596,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s4_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -611,7 +611,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s5_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -626,7 +626,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s6_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -641,7 +641,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s7_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -656,7 +656,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s8_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -671,7 +671,7 @@ static struct clk_rcg2 gcc_qupv3_i2c_s9_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -700,7 +700,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s0_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s0_clk_src = {
@@ -717,7 +717,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s1_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s1_clk_src = {
@@ -750,7 +750,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s2_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s2_clk_src = {
@@ -767,7 +767,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s3_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s3_clk_src = {
@@ -784,7 +784,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s4_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s4_clk_src = {
@@ -801,7 +801,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s5_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s5_clk_src = {
@@ -818,7 +818,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s6_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s6_clk_src = {
@@ -835,7 +835,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s7_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap1_s7_clk_src = {
@@ -852,7 +852,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s0_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s0_clk_src = {
@@ -869,7 +869,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s1_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s1_clk_src = {
@@ -886,7 +886,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s2_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s2_clk_src = {
@@ -903,7 +903,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s3_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s3_clk_src = {
@@ -920,7 +920,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s4_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s4_clk_src = {
@@ -937,7 +937,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s5_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s5_clk_src = {
@@ -975,7 +975,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s6_clk_src_init = { .parent_data = gcc_parent_data_8, .num_parents = ARRAY_SIZE(gcc_parent_data_8), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s6_clk_src = {
@@ -992,7 +992,7 @@ static struct clk_init_data gcc_qupv3_wrap2_s7_clk_src_init = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, };static struct clk_rcg2 gcc_qupv3_wrap2_s7_clk_src = {
@@ -1025,7 +1025,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .parent_data = gcc_parent_data_9, .num_parents = ARRAY_SIZE(gcc_parent_data_9), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1048,7 +1048,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1071,7 +1071,7 @@ static struct clk_rcg2 gcc_ufs_phy_axi_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1093,7 +1093,7 @@ static struct clk_rcg2 gcc_ufs_phy_ice_core_clk_src = { .parent_data = gcc_parent_data_3, .num_parents = ARRAY_SIZE(gcc_parent_data_3), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1114,7 +1114,7 @@ static struct clk_rcg2 gcc_ufs_phy_phy_aux_clk_src = { .parent_data = gcc_parent_data_4, .num_parents = ARRAY_SIZE(gcc_parent_data_4), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1136,7 +1136,7 @@ static struct clk_rcg2 gcc_ufs_phy_unipro_core_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1159,7 +1159,7 @@ static struct clk_rcg2 gcc_usb30_prim_master_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1174,7 +1174,7 @@ static struct clk_rcg2 gcc_usb30_prim_mock_utmi_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1189,7 +1189,7 @@ static struct clk_rcg2 gcc_usb3_prim_phy_aux_clk_src = { .parent_data = gcc_parent_data_2, .num_parents = ARRAY_SIZE(gcc_parent_data_2), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 351/641 clk: qcom: gpucc-sm8550: Update GPU PLL settings
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 1d595972da12b5a78748eeb3ba1ff58bb0283b91 ]
The settings in the driver seem to have been taken from an older release. Update them to match the latest values.
--- drivers/clk/qcom/gpucc-sm8550.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/qcom/gpucc-sm8550.c +3 -3
@@ -35,12 +35,12 @@ enum { };static const struct pll_vco lucid_ole_vco[] = { - {249600000 ,2300000000 ,0 }, + {249600000 ,2000000000 ,0 }, };static const struct alpha_pll_config gpu_cc_pll0_config = { - .l =0x0d , - .alpha =0x0 , + .l =0x1e , + .alpha =0xbaaa , .config_ctl_val =0x20485699 , .config_ctl_hi_val =0x00182261 , .config_ctl_hi1_val =0x82aa299c ,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 352/641 clk: qcom: dispcc-sm8550: Update disp PLL settings
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit febd251d8775c4fb6e4acd6b5d7b0ed707f4611f ]
The settings in the driver seem to have been taken from an older release. Update them to match the latest values.
--- drivers/clk/qcom/dispcc-sm8550.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/qcom/dispcc-sm8550.c +8 -0
@@ -81,6 +81,10 @@ static const struct alpha_pll_config disp_cc_pll0_config = { .config_ctl_val = 0x20485699, .config_ctl_hi_val = 0x00182261, .config_ctl_hi1_val = 0x82aa299c, + .test_ctl_val = 0x00000000, + .test_ctl_hi_val = 0x00000003, + .test_ctl_hi1_val = 0x00009000, + .test_ctl_hi2_val = 0x00000034, .user_ctl_val = 0x00000000, .user_ctl_hi_val = 0x00000005, };
@@ -108,6 +112,10 @@ static const struct alpha_pll_config disp_cc_pll1_config = { .config_ctl_val = 0x20485699, .config_ctl_hi_val = 0x00182261, .config_ctl_hi1_val = 0x82aa299c, + .test_ctl_val = 0x00000000, + .test_ctl_hi_val = 0x00000003, + .test_ctl_hi1_val = 0x00009000, + .test_ctl_hi2_val = 0x00000034, .user_ctl_val = 0x00000000, .user_ctl_hi_val = 0x00000005, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 353/641 clk: qcom: dispcc-sm8550: Use the correct PLL configuration function
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit c559bcb92564cbaedd43c749cf9b6fbb3d53ad5e ]
To ensure that all fields (particularly CAL_L and CAL_L_RINGOSC) are filled properly, use the correct prepare function for OLE PLLs.
--- drivers/clk/qcom/dispcc-sm8550.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/qcom/dispcc-sm8550.c +2 -2
@@ -1774,8 +1774,8 @@ static int disp_cc_sm8550_probe(struct platform_device *pdev) goto err_put_rpm; } -clk_lucid_evo_pll_configure (&disp_cc_pll0, regmap, &disp_cc_pll0_config); -clk_lucid_evo_pll_configure (&disp_cc_pll1, regmap, &disp_cc_pll1_config); +clk_lucid_ole_pll_configure (&disp_cc_pll0, regmap, &disp_cc_pll0_config); +clk_lucid_ole_pll_configure (&disp_cc_pll1, regmap, &disp_cc_pll1_config);/* Enable clock gating for MDP clocks */ regmap_update_bits (regmap,DISP_CC_MISC_CMD ,0x10 ,0x10 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 354/641 clk: fixed-rate: fix clk_hw_register_fixed_rate_with_accuracy_parent_hw
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Théo Lebrun <[email protected]>
[ Upstream commit ee0cf5e07f44a10fce8f1bfa9db226c0b5ecf880 ]
Add missing comma and remove extraneous NULL argument. The macro is currently used by no one which explains why the typo slipped by.
--- include/linux/clk-provider.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/clk-provider.h +2 -2
@@ -448,8 +448,8 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,*/ #define clk_hw_register_fixed_rate_with_accuracy_parent_hw (dev, name, \ parent_hw, flags, fixed_rate, fixed_accuracy) \ - __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw) \ - NULL, NULL, (flags), (fixed_rate), \ + __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw), \ + NULL, (flags), (fixed_rate), \ (fixed_accuracy), 0, false)/** * clk_hw_register_fixed_rate_with_accuracy_parent_data - register fixed-rate
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 355/641 pwm: stm32: Use hweight32 in stm32_pwm_detect_channels
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Zabel <[email protected]>
[ Upstream commit 41fa8f57c0d269243fe3bde2bce71e82c884b9ad ]
Use hweight32() to count the CCxE bits in stm32_pwm_detect_channels(). Since the return value is assigned to chip.npwm, change it to unsigned int as well.
Stable-dep-of: 19f1016ea960 ("pwm: stm32: Fix enable count for clk in .probe()")
--- drivers/pwm/pwm-stm32.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/pwm/pwm-stm32.c +2 -15
@@ -578,10 +578,9 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv) priv->have_complementary_output = (ccer !=0 ); } -static int stm32_pwm_detect_channels (struct stm32_pwm *priv) +static unsigned int stm32_pwm_detect_channels (struct stm32_pwm *priv) {u32 ccer; -int npwm =0 ;/* * If channels enable bits don't exist writing 1 will have no
@@ -591,19 +590,7 @@ static int stm32_pwm_detect_channels(struct stm32_pwm *priv)regmap_read (priv->regmap,TIM_CCER , &ccer);regmap_clear_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE ); -if (ccer &TIM_CCER_CC1E ) - npwm++; - -if (ccer &TIM_CCER_CC2E ) - npwm++; - -if (ccer &TIM_CCER_CC3E ) - npwm++; - -if (ccer &TIM_CCER_CC4E ) - npwm++; - -return npwm; +return hweight32 (ccer &TIM_CCER_CCXE ); }static int stm32_pwm_probe (struct platform_device *pdev)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 356/641 pwm: stm32: Fix enable count for clk in .probe()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Zabel <[email protected]>
[ Upstream commit 19f1016ea9600ed89bc24247c36ff5934ad94fbb ]
Make the driver take over hardware state without disabling in .probe() and enable the clock for each enabled channel.
--- drivers/pwm/pwm-stm32.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/pwm/pwm-stm32.c +14 -4
@@ -578,17 +578,21 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv) priv->have_complementary_output = (ccer !=0 ); } -static unsigned int stm32_pwm_detect_channels (struct stm32_pwm *priv) +static unsigned int stm32_pwm_detect_channels (struct stm32_pwm *priv, +unsigned int *num_enabled) { -u32 ccer; +u32 ccer, ccer_backup;/* * If channels enable bits don't exist writing 1 will have no * effect so we can detect and count them. */ +regmap_read (priv->regmap,TIM_CCER , &ccer_backup);regmap_set_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE );regmap_read (priv->regmap,TIM_CCER , &ccer); -regmap_clear_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE ); +regmap_write (priv->regmap,TIM_CCER , ccer_backup); + + *num_enabled =hweight32 (ccer_backup &TIM_CCER_CCXE );return hweight32 (ccer &TIM_CCER_CCXE ); }
@@ -599,6 +603,8 @@ static int stm32_pwm_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct stm32_timers *ddata =dev_get_drvdata (pdev->dev.parent);struct stm32_pwm *priv; +unsigned int num_enabled; +unsigned int i;int ret; priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );
@@ -621,7 +627,11 @@ static int stm32_pwm_probe(struct platform_device *pdev) priv->chip.dev = dev; priv->chip.ops = &stm32pwm_ops; - priv->chip.npwm =stm32_pwm_detect_channels (priv); + priv->chip.npwm =stm32_pwm_detect_channels (priv, &num_enabled); + +/* Initialize clock refcount to number of enabled PWM channels. */ +for (i =0 ; i < num_enabled; i++) +clk_enable (priv->clk); ret =devm_pwmchip_add (dev, &priv->chip);if (ret <0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 357/641 ASoC: rt5645: Drop double EF20 entry from dmi_platform_data[]
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 51add1687f39292af626ac3c2046f49241713273 ]
dmi_platform_data[] first contains a DMI entry matching:
DMI_MATCH(DMI_PRODUCT_NAME, "EF20"),
and then contains an identical entry except for the match being:
DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
Since these are partial (non exact) DMI matches the first match will also match any board with "EF20EA" in their DMI product-name, drop the second, redundant, entry.
--- sound/soc/codecs/rt5645.c | 8 -------- 1 file changed, 8 deletions(-)
sound/soc/codecs/rt5645.c +0 -8
@@ -3854,14 +3854,6 @@ static const struct dmi_system_id dmi_platform_data[] = { }, .driver_data = (void *)&ecs_ef20_platform_data, }, - { - .ident = "EF20EA", - .callback = cht_rt5645_ef20_quirk_cb, - .matches = { - DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"), - }, - .driver_data = (void *)&ecs_ef20_platform_data, - }, { } };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 358/641 ALSA: scarlett2: Add missing error check to scarlett2_config_save()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit 5f6ff6931a1c0065a55448108940371e1ac8075f ]
scarlett2_config_save() was ignoring the return value from scarlett2_usb(). As this function is not called from user-space we can't return the error, so call usb_audio_err() instead.
--- sound/usb/mixer_scarlett2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/usb/mixer_scarlett2.c +5 -3
@@ -1524,9 +1524,11 @@ static void scarlett2_config_save(struct usb_mixer_interface *mixer) {__le32 req =cpu_to_le32 (SCARLETT2_USB_CONFIG_SAVE ); -scarlett2_usb (mixer,SCARLETT2_USB_DATA_CMD , - &req,sizeof (u32), -NULL ,0 ); +int err =scarlett2_usb (mixer,SCARLETT2_USB_DATA_CMD , + &req,sizeof (u32), +NULL ,0 ); +if (err <0 ) +usb_audio_err (mixer->chip,"config save failed: %d\n" , err); }/* Delayed work to save config */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 359/641 ALSA: scarlett2: Add missing error check to scarlett2_usb_set_config()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit ca459dfa7d4ed9098fcf13e410963be6ae9b6bf3 ]
scarlett2_usb_set_config() calls scarlett2_usb_get() but was not checking the result. Return the error if it fails rather than continuing with an invalid value.
--- sound/usb/mixer_scarlett2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/usb/mixer_scarlett2.c +4 -1
@@ -1577,7 +1577,10 @@ static int scarlett2_usb_set_config( size =1 ; offset = config_item->offset; -scarlett2_usb_get (mixer, offset, &tmp,1 ); + err =scarlett2_usb_get (mixer, offset, &tmp,1 ); +if (err <0 ) +return err; +if (value) tmp |= (1 << index);else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 360/641 ALSA: scarlett2: Add missing error checks to *_ctl_get()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit 50603a67daef161c78c814580d57f7f0be57167e ]
The *_ctl_get() functions which call scarlett2_update_*() were not checking the return value. Fix to check the return value and pass to the caller.
--- sound/usb/mixer_scarlett2.c | 182 +++++++++++++++++++++++++----------- 1 file changed, 130 insertions(+), 52 deletions(-)
sound/usb/mixer_scarlett2.c +130 -52
@@ -2100,14 +2100,20 @@ static int scarlett2_sync_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->sync_updated) -scarlett2_update_sync (mixer); + +if (private->sync_updated) { + err =scarlett2_update_sync (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.enumerated.item[0 ] = private->sync; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; }static const struct snd_kcontrol_new scarlett2_sync_ctl = {
@@ -2190,14 +2196,20 @@ static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->vol_updated) -scarlett2_update_volumes (mixer); -mutex_unlock (&private->data_mutex); +if (private->vol_updated) { + err =scarlett2_update_volumes (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.integer.value[0 ] = private->master_vol; -return 0 ; + +unlock: +mutex_unlock (&private->data_mutex); +return err; }static int line_out_remap (struct scarlett2_data *private,int index)
@@ -2223,14 +2235,20 @@ static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data;int index =line_out_remap (private, elem->control); +int err =0 ;mutex_lock (&private->data_mutex); -if (private->vol_updated) -scarlett2_update_volumes (mixer); -mutex_unlock (&private->data_mutex); +if (private->vol_updated) { + err =scarlett2_update_volumes (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.integer.value[0 ] = private->vol[index]; -return 0 ; + +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_volume_ctl_put(struct snd_kcontrol *kctl,
@@ -2297,14 +2315,20 @@ static int scarlett2_mute_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data;int index =line_out_remap (private, elem->control); +int err =0 ;mutex_lock (&private->data_mutex); -if (private->vol_updated) -scarlett2_update_volumes (mixer); -mutex_unlock (&private->data_mutex); +if (private->vol_updated) { + err =scarlett2_update_volumes (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.integer.value[0 ] = private->mute_switch[index]; -return 0 ; + +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_mute_ctl_put(struct snd_kcontrol *kctl,
@@ -2550,14 +2574,20 @@ static int scarlett2_level_enum_ctl_get(struct snd_kcontrol *kctl,const struct scarlett2_device_info *info = private->info;int index = elem->control + info->level_input_first; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->input_other_updated) -scarlett2_update_input_other (mixer); + +if (private->input_other_updated) { + err =scarlett2_update_input_other (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.enumerated.item[0 ] = private->level_switch[index]; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl,
@@ -2608,15 +2638,21 @@ static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->input_other_updated) -scarlett2_update_input_other (mixer); + +if (private->input_other_updated) { + err =scarlett2_update_input_other (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.integer.value[0 ] = private->pad_switch[elem->control]; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl,
@@ -2666,14 +2702,20 @@ static int scarlett2_air_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->input_other_updated) -scarlett2_update_input_other (mixer); + +if (private->input_other_updated) { + err =scarlett2_update_input_other (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.integer.value[0 ] = private->air_switch[elem->control]; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_air_ctl_put(struct snd_kcontrol *kctl,
@@ -2723,15 +2765,21 @@ static int scarlett2_phantom_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->input_other_updated) -scarlett2_update_input_other (mixer); + +if (private->input_other_updated) { + err =scarlett2_update_input_other (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.integer.value[0 ] = private->phantom_switch[elem->control]; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_phantom_ctl_put(struct snd_kcontrol *kctl,
@@ -2903,14 +2951,20 @@ static int scarlett2_direct_monitor_ctl_get(struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = elem->head.mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->monitor_other_updated) -scarlett2_update_monitor_other (mixer); + +if (private->monitor_other_updated) { + err =scarlett2_update_monitor_other (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.enumerated.item[0 ] = private->direct_monitor_switch; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_direct_monitor_ctl_put(
@@ -3010,14 +3064,20 @@ static int scarlett2_speaker_switch_enum_ctl_get(struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->monitor_other_updated) -scarlett2_update_monitor_other (mixer); + +if (private->monitor_other_updated) { + err =scarlett2_update_monitor_other (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.enumerated.item[0 ] = private->speaker_switching_switch; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; }/* when speaker switching gets enabled, switch the main/alt speakers
@@ -3165,14 +3225,20 @@ static int scarlett2_talkback_enum_ctl_get(struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->monitor_other_updated) -scarlett2_update_monitor_other (mixer); + +if (private->monitor_other_updated) { + err =scarlett2_update_monitor_other (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.enumerated.item[0 ] = private->talkback_switch; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_talkback_enum_ctl_put(
@@ -3320,14 +3386,20 @@ static int scarlett2_dim_mute_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_elem_info *elem = kctl->private_data;struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data; +int err =0 ;mutex_lock (&private->data_mutex); -if (private->vol_updated) -scarlett2_update_volumes (mixer); -mutex_unlock (&private->data_mutex); +if (private->vol_updated) { + err =scarlett2_update_volumes (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.integer.value[0 ] = private->dim_mute[elem->control]; -return 0 ; + +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_dim_mute_ctl_put(struct snd_kcontrol *kctl,
@@ -3698,14 +3770,20 @@ static int scarlett2_mux_src_enum_ctl_get(struct snd_kcontrol *kctl,struct usb_mixer_interface *mixer = elem->head.mixer;struct scarlett2_data *private = mixer->private_data;int index =line_out_remap (private, elem->control); +int err =0 ;mutex_lock (&private->data_mutex); -if (private->mux_updated) -scarlett2_usb_get_mux (mixer); + +if (private->mux_updated) { + err =scarlett2_usb_get_mux (mixer); +if (err <0 ) + goto unlock; + } ucontrol->value.enumerated.item[0 ] = private->mux[index]; -mutex_unlock (&private->data_mutex); -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); +return err; } static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 361/641 ALSA: scarlett2: Add clamp() in scarlett2_mixer_ctl_put()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit 04f8f053252b86c7583895c962d66747ecdc61b7 ]
Ensure the value passed to scarlett2_mixer_ctl_put() is between 0 and SCARLETT2_MIXER_MAX_VALUE so we don't attempt to access outside scarlett2_mixer_values[].
--- sound/usb/mixer_scarlett2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/usb/mixer_scarlett2.c +2 -1
@@ -3663,7 +3663,8 @@ static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl,mutex_lock (&private->data_mutex); oval = private->mix[index]; - val = ucontrol->value.integer.value[0 ]; + val =clamp (ucontrol->value.integer.value[0 ], +0L , (long )SCARLETT2_MIXER_MAX_VALUE ); num_mixer_in = port_count[SCARLETT2_PORT_TYPE_MIX ][SCARLETT2_PORT_OUT ]; mix_num = index / num_mixer_in;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 362/641 ALSA: scarlett2: Add missing mutex lock around get meter levels
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit 993f7b42fa066b055e3a19b7f76ad8157c0927a0 ]
As scarlett2_meter_ctl_get() uses meter_level_map[], the data_mutex should be locked while accessing it.
--- sound/usb/mixer_scarlett2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/usb/mixer_scarlett2.c +7 -2
@@ -3880,10 +3880,12 @@ static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl,u16 meter_levels[SCARLETT2_MAX_METERS ];int i, err; +mutex_lock (&private->data_mutex); + err =scarlett2_usb_get_meter_levels (elem->head.mixer, elem->channels, meter_levels);if (err <0 ) -return err; + goto unlock;/* copy & translate from meter_levels[] using meter_level_map[] */ for (i =0 ; i < elem->channels; i++) {
@@ -3898,7 +3900,10 @@ static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, ucontrol->value.integer.value[i] = value; } -return 0 ; +unlock: +mutex_unlock (&private->data_mutex); + +return err; }static const struct snd_kcontrol_new scarlett2_meter_ctl = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 363/641 mmc: sdhci_am654: Fix TI SoC dependencies
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit cb052da7f031b0d2309a4895ca236afb3b4bbf50 ]
The sdhci_am654 is specific to recent TI SoCs, update the dependencies for those SoCs and compile testing. While we're at it update the text to reflect the wider range of supported TI SoCS the driver now supports.
--- drivers/mmc/host/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/host/Kconfig +3 -2
@@ -1041,14 +1041,15 @@ config MMC_SDHCI_OMAP config MMC_SDHCI_AM654 tristate "Support for the SDHCI Controller in TI's AM654 SOCs" + depends on ARCH_K3 || COMPILE_TEST depends on MMC_SDHCI_PLTFM && OF select MMC_SDHCI_IO_ACCESSORS select MMC_CQHCI select REGMAP_MMIO help This selects the Secure Digital Host Controller Interface (SDHCI) - support present in TI's AM654 SOCs. The controller supports - SD/MMC/SDIO devices. + support present in TI's AM65x/AM64x/AM62x/J721E SOCs. The controller + supports SD/MMC/SDIO devices. If you have a controller with this interface, say Y or M here.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 364/641 mmc: sdhci_omap: Fix TI SoC dependencies
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit 09f164d393a6671e5ff8342ba6b3cb7fe3f20208 ]
The sdhci_omap is specific to older TI SoCs, update the dependencies for those SoCs and compile testing. While we're at it update the text to reflect the wider range of supported TI SoCS the driver now supports.
--- drivers/mmc/host/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/host/Kconfig +3 -2
@@ -1026,14 +1026,15 @@ config MMC_SDHCI_XENON config MMC_SDHCI_OMAP tristate "TI SDHCI Controller Support" + depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST depends on MMC_SDHCI_PLTFM && OF select THERMAL imply TI_SOC_THERMAL select MMC_SDHCI_EXTERNAL_DMA if DMA_ENGINE help This selects the Secure Digital Host Controller Interface (SDHCI) - support present in TI's DRA7 SOCs. The controller supports - SD/MMC/SDIO devices. + support present in TI's Keystone/OMAP2+/DRA7 SOCs. The controller + supports SD/MMC/SDIO devices. If you have a controller with this interface, say Y or M here.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 365/641 drm/amdkfd: Fix type of dbg_flags in struct kfd_process
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit 217e85f97031791fb48a2d374c7bdcf439365b21 ]
dbg_flags looks to be defined with incorrect data type; to process multiple debug flag options, and hence defined dbg_flags as u32.
Fixes the below:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_packet_manager_v9.c:117 pm_map_process_aldebaran() warn: maybe use && instead of &
--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -1
@@ -971,7 +971,7 @@ struct kfd_process {struct work_struct debug_event_workarea;/* Tracks debug per-vmid request for debug flags */ -bool dbg_flags; +u32 dbg_flags;atomic_t poison;/* Queues are in paused stated because we are in the process of doing a CRIU checkpoint */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 366/641 IB/iser: Prevent invalidating wrong MR
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Gorenko <[email protected]>
[ Upstream commit 2f1888281e67205bd80d3e8f54dbd519a9653f26 ]
The iser_reg_resources structure has two pointers to MR but only one mr_valid field. The implementation assumes that we use only *sig_mr when pi_enable is true. Otherwise, we use only *mr. However, it is only sometimes correct. Read commands without protection information occur even when pi_enble is true. For example, the following SCSI commands have a Data-In buffer but never have protection information: READ CAPACITY (16), INQUIRY, MODE SENSE(6), MAINTENANCE IN. So, we use*sig_mr for some SCSI commands and *mr for the other SCSI commands.
In most cases, it works fine because the remote invalidation is applied. However, there are two cases when the remote invalidation is not applicable.
1. Small write commands when all data is sent as an immediate.
2. The target does not support the remote invalidation feature.
The lazy invalidation is used if the remote invalidation is impossible. Since, at the lazy invalidation, we always invalidate the MR we want to use, the wrong MR may be invalidated.
To fix the issue, we need a field per MR that indicates the MR needs invalidation. Since the ib_mr structure already has such a field, let's use ib_mr.need_inval instead of iser_reg_resources.mr_valid.
--- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 -- drivers/infiniband/ulp/iser/iser_initiator.c | 5 ++++- drivers/infiniband/ulp/iser/iser_memory.c | 8 ++++---- drivers/infiniband/ulp/iser/iser_verbs.c | 1 - 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.h +0 -2
@@ -317,12 +317,10 @@ struct iser_device {* * @mr: memory region * @sig_mr: signature memory region -* @mr_valid: is mr valid indicator */ struct iser_reg_resources {struct ib_mr *mr;struct ib_mr *sig_mr; -u8 mr_valid:1 ; };/**
drivers/infiniband/ulp/iser/iser_initiator.c +4 -1
@@ -581,7 +581,10 @@ static inline int iser_inv_desc(struct iser_fr_desc *desc, u32 rkey)return -EINVAL ; } - desc->rsc.mr_valid =0 ; +if (desc->sig_protected) + desc->rsc.sig_mr->need_inval = false; +else + desc->rsc.mr->need_inval = false;return 0 ; }
drivers/infiniband/ulp/iser/iser_memory.c +4 -4
@@ -264,7 +264,7 @@ static int iser_reg_sig_mr(struct iscsi_iser_task *iser_task,iser_set_prot_checks (iser_task->sc, &sig_attrs->check_mask); -if (rsc->mr_valid) +if (rsc->sig_mr->need_inval)iser_inv_rkey (&tx_desc->inv_wr, mr, cqe, &wr->wr);ib_update_fast_reg_key (mr,ib_inc_rkey (mr->rkey));
@@ -288,7 +288,7 @@ static int iser_reg_sig_mr(struct iscsi_iser_task *iser_task, wr->access =IB_ACCESS_LOCAL_WRITE |IB_ACCESS_REMOTE_READ |IB_ACCESS_REMOTE_WRITE ; - rsc->mr_valid =1 ; + rsc->sig_mr->need_inval = true; sig_reg->sge.lkey = mr->lkey; sig_reg->rkey = mr->rkey;
@@ -313,7 +313,7 @@ static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task,struct ib_reg_wr *wr = &tx_desc->reg_wr;int n; -if (rsc->mr_valid) +if (rsc->mr->need_inval)iser_inv_rkey (&tx_desc->inv_wr, mr, cqe, &wr->wr);ib_update_fast_reg_key (mr,ib_inc_rkey (mr->rkey));
@@ -336,7 +336,7 @@ static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task,IB_ACCESS_REMOTE_WRITE |IB_ACCESS_REMOTE_READ ; - rsc->mr_valid =1 ; + rsc->mr->need_inval = true; reg->sge.lkey = mr->lkey; reg->rkey = mr->rkey;
drivers/infiniband/ulp/iser/iser_verbs.c +0 -1
@@ -129,7 +129,6 @@ iser_create_fastreg_desc(struct iser_device *device, goto err_alloc_mr_integrity; } } - desc->rsc.mr_valid =0 ;return desc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 367/641 drm/amdkfd: Confirm list is non-empty before utilizing list_first_entry in kfd_topology.c
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit 499839eca34ad62d43025ec0b46b80e77065f6d8 ]
Before using list_first_entry, make sure to check that list is not empty, if list is empty return -ENODATA.
Fixes the below:drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1347 kfd_create_indirect_link_prop() warn: can 'gpu_link' even be NULL? drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1428 kfd_add_peer_prop() warn: can 'iolink1' even be NULL? drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1433 kfd_add_peer_prop() warn: can 'iolink2' even be NULL?
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +12 -9
@@ -1342,10 +1342,11 @@ static int kfd_create_indirect_link_prop(struct kfd_topology_device *kdev, int g num_cpu++; } +if (list_empty (&kdev->io_link_props)) +return -ENODATA ; + gpu_link =list_first_entry (&kdev->io_link_props, - struct kfd_iolink_properties, list); -if (!gpu_link) -return -ENOMEM ; + struct kfd_iolink_properties, list);for (i =0 ; i < num_cpu; i++) {/* CPU <--> GPU */
@@ -1423,15 +1424,17 @@ static int kfd_add_peer_prop(struct kfd_topology_device *kdev, peer->gpu->adev))return ret; +if (list_empty (&kdev->io_link_props)) +return -ENODATA ; + iolink1 =list_first_entry (&kdev->io_link_props, - struct kfd_iolink_properties, list); -if (!iolink1) -return -ENOMEM ; + struct kfd_iolink_properties, list); + +if (list_empty (&peer->io_link_props)) +return -ENODATA ; iolink2 =list_first_entry (&peer->io_link_props, - struct kfd_iolink_properties, list); -if (!iolink2) -return -ENOMEM ; + struct kfd_iolink_properties, list); props =kfd_alloc_struct (props);if (!props)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 368/641 drm/amd/pm/smu7: fix a memleak in smu7_hwmgr_backend_init
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 2f3be3ca779b11c332441b10e00443a2510f4d7b ]
The hwmgr->backend, (i.e. data) allocated by kzalloc is not freed in the error-handling paths of smu7_get_evv_voltages and smu7_update_edc_leakage_table. However, it did be freed in the error-handling of phm_initializa_dynamic_state_adjustment_rule_settings, by smu7_hwmgr_backend_fini. So the lack of free in smu7_get_evv_voltages and smu7_update_edc_leakage_table is considered a memleak in this patch.
--- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +5 -1
@@ -2974,6 +2974,8 @@ static int smu7_hwmgr_backend_init(struct pp_hwmgr *hwmgr) result =smu7_get_evv_voltages (hwmgr);if (result) {pr_info ("Get EVV Voltage Failed. Abort Driver loading!\n" ); +kfree (hwmgr->backend); + hwmgr->backend =NULL ;return -EINVAL ; } }else {
@@ -3019,8 +3021,10 @@ static int smu7_hwmgr_backend_init(struct pp_hwmgr *hwmgr) } result =smu7_update_edc_leakage_table (hwmgr); -if (result) +if (result) { +smu7_hwmgr_backend_fini (hwmgr);return result; + }return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 369/641 drm/amd/display: avoid stringop-overflow warnings for dp_decide_lane_settings()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit c966dc0e9d96dc44423c404a2628236f1200c24e ]
gcc prints a warning about a possible array overflow for a couple of callers of dp_decide_lane_settings() after commit 1b56c90018f0 ("Makefile:
Enable -Wstringop-overflow globally"):
drivers/gpu/drm/amd/amdgpu/../display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.c: In function 'dp_perform_fixed_vs_pe_training_sequence_legacy':drivers/gpu/drm/amd/amdgpu/../display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.c:426:25: error: 'dp_decide_lane_settings' accessing 4 bytes in a region of size 1 [-Werror=stringop-overflow=]
426 | dp_decide_lane_settings(lt_settings, dpcd_lane_adjust,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
427 | lt_settings->hw_lane_settings, lt_settings->dpcd_lane_settings);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/gpu/drm/amd/amdgpu/../display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.c:426:25: note: referencing argument 4 of type 'union dpcd_training_lane[4]'
I'm not entirely sure what caused this, but changing the prototype to expect a pointer instead of an array avoids the warnings.
--- .../gpu/drm/amd/display/dc/link/protocols/link_dp_training.c | 2 +- .../gpu/drm/amd/display/dc/link/protocols/link_dp_training.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c +1 -1
@@ -807,7 +807,7 @@ void dp_decide_lane_settings(const struct link_training_settings *lt_settings, const union lane_adjust ln_adjust[LANE_COUNT_DP_MAX], struct dc_lane_settings hw_lane_settings[LANE_COUNT_DP_MAX], - union dpcd_training_lane dpcd_lane_settings[LANE_COUNT_DP_MAX]) + union dpcd_training_lane *dpcd_lane_settings) { uint32_t lane;
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.h +1 -1
@@ -111,7 +111,7 @@ void dp_decide_lane_settings(const struct link_training_settings *lt_settings, const union lane_adjust ln_adjust[LANE_COUNT_DP_MAX], struct dc_lane_settings hw_lane_settings[LANE_COUNT_DP_MAX], - union dpcd_training_lane dpcd_lane_settings[LANE_COUNT_DP_MAX]); + union dpcd_training_lane *dpcd_lane_settings);enum dc_dp_training_pattern decide_cr_training_pattern (const struct dc_link_settings *link_settings);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 370/641 kselftest/alsa - mixer-test: fix the number of parameters to ksft_exit_fail_msg()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mirsad Todorovac <[email protected]>
[ Upstream commit 8c51c13dc63d46e754c44215eabc0890a8bd9bfb ]
Minor fix in the number of arguments to error reporting function in the test program as reported by GCC 13.2.0 warning.
mixer-test.c: In function ‘find_controls’:
mixer-test.c:169:44: warning: too many arguments for format [-Wformat-extra-args]
169 | ksft_exit_fail_msg("snd_ctl_poll_descriptors() failed for %d\n",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The number of arguments in call to ksft_exit_fail_msg() doesn't correspond to the format specifiers, so this is adjusted resembling the sibling calls to the error function.
--- tools/testing/selftests/alsa/mixer-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/alsa/mixer-test.c +1 -1
@@ -166,7 +166,7 @@ static void find_controls(void) err =snd_ctl_poll_descriptors (card_data->handle, &card_data->pollfd,1 );if (err !=1 ) { -ksft_exit_fail_msg ("snd_ctl_poll_descriptors() failed for %d\n" , +ksft_exit_fail_msg ("snd_ctl_poll_descriptors() failed for card %d: %d\n" , card, err); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 371/641 kselftest/alsa - mixer-test: Fix the print format specifier warning
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mirsad Todorovac <[email protected]>
[ Upstream commit 3f47c1ebe5ca9c5883e596c7888dec4bec0176d8 ]
The GCC 13.2.0 compiler issued the following warning:
mixer-test.c: In function ‘ctl_value_index_valid’:
mixer-test.c:322:79: warning: format ‘%lld’ expects argument of type ‘long long int’, \
but argument 5 has type ‘long int’ [-Wformat=]
322 | ksft_print_msg("%s.%d value %lld more than maximum %lld\n",
| ~~~^
| |
| long long int
| %ld
323 | ctl->name, index, int64_val,
324 | snd_ctl_elem_info_get_max(ctl->info));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| long intFixing the format specifier as advised by the compiler suggestion removes the warning.
--- tools/testing/selftests/alsa/mixer-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/alsa/mixer-test.c +1 -1
@@ -319,7 +319,7 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, }if (int64_val >snd_ctl_elem_info_get_max64 (ctl->info)) { -ksft_print_msg ("%s.%d value %lld more than maximum %lld\n" , +ksft_print_msg ("%s.%d value %lld more than maximum %ld\n" , ctl->name, index, int64_val,snd_ctl_elem_info_get_max (ctl->info));return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 372/641 kselftest/alsa - conf: Stringify the printed errno in sysfs_get()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mirsad Todorovac <[email protected]>
[ Upstream commit fd38dd6abda589a8771e7872e4dea28c99c6a6ef ]
GCC 13.2.0 reported the warning of the print format specifier:
conf.c: In function ‘sysfs_get’:
conf.c:181:72: warning: format ‘%s’ expects argument of type ‘char *’, \
but argument 3 has type ‘int’ [-Wformat=]
181 | ksft_exit_fail_msg("sysfs: unable to read value '%s': %s\n",
| ~^
| |
| char *
| %dThe fix passes strerror(errno) as it was intended, like in the sibling error exit message.
--- tools/testing/selftests/alsa/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/alsa/conf.c +1 -1
@@ -179,7 +179,7 @@ static char *sysfs_get(const char *sysfs_root, const char *id)close (fd);if (len <0 )ksft_exit_fail_msg ("sysfs: unable to read value '%s': %s\n" , - path, errno); + path,strerror (errno));while (len >0 && path[len-1 ] =='\n' ) len--; path[len] ='\0' ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 373/641 ksmbd: validate the zero field of packet header
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 516b3eb8c8065f7465f87608d37a7ed08298c7a5 ]
The SMB2 Protocol requires that "The first byte of the Direct TCP transport packet header MUST be zero (0x00)"[1]. Commit 1c1bcf2d3ea0 ("ksmbd: validate smb request protocol id") removed the validation of this 1-byte zero. Add the validation back now.
[1]: [MS-SMB2] - v20230227, page 30.
https://winprotocoldoc.blob.core.windows.net/productionwindowsarchives/MS-SMB2/%5bMS-SMB2%5d-230227.pdf
--- fs/smb/server/smb_common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/smb/server/smb_common.c +5 -1
@@ -158,8 +158,12 @@ int ksmbd_verify_smb_message(struct ksmbd_work *work)*/ bool ksmbd_smb_request (struct ksmbd_conn *conn) { -__le32 *proto = (__le32 *)smb2_get_msg (conn->request_buf); +__le32 *proto; +if (conn->request_buf[0 ] !=0 ) +return false; + + proto = (__le32 *)smb2_get_msg (conn->request_buf);if (*proto ==SMB2_COMPRESSION_TRANSFORM_ID ) {pr_err_ratelimited ("smb2 compression not support yet" );return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 374/641 of: Fix double free in of_parse_phandle_with_args_map
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian A. Ehrhardt <[email protected]>
[ Upstream commit 4dde83569832f9377362e50f7748463340c5db6b ]
In of_parse_phandle_with_args_map() the inner loop that iterates through the map entries calls of_node_put(new) to free the reference acquired by the previous iteration of the inner loop. This assumes that the value of "new" is NULL on the first iteration of the inner loop.
Make sure that this is true in all iterations of the outer loop by setting "new" to NULL after its value is assigned to "cur".
Extend the unittest to detect the double free and add an additional test case that actually triggers this path.
--- drivers/of/base.c | 1 + drivers/of/unittest-data/tests-phandle.dtsi | 10 ++- drivers/of/unittest.c | 74 ++++++++++++--------- 3 files changed, 53 insertions(+), 32 deletions(-)
drivers/of/base.c +1 -0
@@ -1464,6 +1464,7 @@ int of_parse_phandle_with_args_map(const struct device_node *np, out_args->np = new;of_node_put (cur); cur = new; + new =NULL ; } put:of_node_put (cur);
drivers/of/unittest-data/tests-phandle.dtsi +9 -1
@@ -40,6 +40,13 @@ provider4: provider4 { phandle-map-pass-thru = <0x0 0xf0>; }; + provider5: provider5 { + #phandle-cells = <2>; + phandle-map = <2 7 &provider4 2 3>; + phandle-map-mask = <0xff 0xf>; + phandle-map-pass-thru = <0x0 0xf0>; + }; + consumer-a { phandle-list = <&provider1 1>, <&provider2 2 0>,
@@ -66,7 +73,8 @@ consumer-b { <&provider4 4 0x100>, <&provider4 0 0x61>, <&provider0>, - <&provider4 19 0x20>; + <&provider4 19 0x20>, + <&provider5 2 7>; phandle-list-bad-phandle = <12345678 0 0>; phandle-list-bad-args = <&provider2 1 0>, <&provider4 0>;
drivers/of/unittest.c +43 -31
144 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 375/641 fbdev: imxfb: fix left margin setting
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dario Binacchi <[email protected]>
[ Upstream commit 5758844105f7dd9a0a04990cd92499a1a593dd36 ]
The previous setting did not take into account the CSTN mode. For the H_WAIT_2 bitfield (bits 0-7) of the LCDC Horizontal Configuration Register (LCDCR), the IMX25RM manual states that:
In TFT mode, it specifies the number of SCLK periods between the end of HSYNC and the beginning of OE signal, and the total delay time equals (H_WAIT_2 + 3) of SCLK periods.
In CSTN mode, it specifies the number of SCLK periods between the end of HSYNC and the first display data in each line, and the total delay time equals (H_WAIT_2 + 2) of SCLK periods.
The patch handles both cases.
--- drivers/video/fbdev/imxfb.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
drivers/video/fbdev/imxfb.c +25 -2
@@ -42,6 +42,7 @@#include <video/videomode.h> #define PCR_TFT (1 << 31) +#define PCR_COLOR (1 << 30)#define PCR_BPIX_8 (3 << 25)#define PCR_BPIX_12 (4 << 25)#define PCR_BPIX_16 (5 << 25)
@@ -150,6 +151,12 @@ enum imxfb_type { IMX21_FB, }; +enum imxfb_panel_type { +PANEL_TYPE_MONOCHROME , +PANEL_TYPE_CSTN , +PANEL_TYPE_TFT , +}; +struct imxfb_info {struct platform_device *pdev;void __iomem *regs;
@@ -157,6 +164,7 @@ struct imxfb_info {struct clk *clk_ahb;struct clk *clk_per;enum imxfb_type devtype; +enum imxfb_panel_type panel_type;bool enabled;/*
@@ -444,6 +452,13 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)if (!is_imx1_fb (fbi) && imxfb_mode->aus_mode) fbi->lauscr =LAUSCR_AUS_MODE ; +if (imxfb_mode->pcr &PCR_TFT ) + fbi->panel_type =PANEL_TYPE_TFT ; +else if (imxfb_mode->pcr &PCR_COLOR ) + fbi->panel_type =PANEL_TYPE_CSTN ; +else + fbi->panel_type =PANEL_TYPE_MONOCHROME ; +/* * Copy the RGB parameters for this display * from the machine specific parameters.
@@ -596,6 +611,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf {struct imxfb_info *fbi = info->par;u32 ymax_mask =is_imx1_fb (fbi) ?YMAX_MASK_IMX1 :YMAX_MASK_IMX21 ; +u8 left_margin_low; pr_debug("var: xres=%d hslen=%d lm=%d rm=%d\n", var->xres, var->hsync_len,
@@ -604,6 +620,13 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf var->yres, var->vsync_len, var->upper_margin, var->lower_margin); +if (fbi->panel_type ==PANEL_TYPE_TFT ) + left_margin_low =3 ; +else if (fbi->panel_type ==PANEL_TYPE_CSTN ) + left_margin_low =2 ; +else + left_margin_low =0 ; +#if DEBUG_VAR if (var->xres <16 || var->xres >1024 ) printk(KERN_ERR "%s: invalid xres %d\n",
@@ -611,7 +634,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *infif (var->hsync_len <1 || var->hsync_len >64 )printk (KERN_ERR "%s: invalid hsync_len %d\n" , info->fix.id, var->hsync_len); -if (var->left_margin <3 || var->left_margin >255 ) +if (var->left_margin < left_margin_low || var->left_margin >255 )printk (KERN_ERR "%s: invalid left_margin %d\n" , info->fix.id, var->left_margin);if (var->right_margin <1 || var->right_margin >255 )
@@ -637,7 +660,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *infwritel (HCR_H_WIDTH (var->hsync_len -1 ) |HCR_H_WAIT_1 (var->right_margin -1 ) | -HCR_H_WAIT_2 (var->left_margin -3 ), +HCR_H_WAIT_2 (var->left_margin - left_margin_low), fbi->regs +LCDC_HCR ); writel(VCR_V_WIDTH(var->vsync_len) |
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 376/641 of: unittest: Fix of_count_phandle_with_args() expected value message
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 716089b417cf98d01f0dc1b39f9c47e1d7b4c965 ]
The expected result value for the call to of_count_phandle_with_args() was updated from 7 to 8, but the accompanying error message was forgotten.
--- drivers/of/unittest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/unittest.c +1 -1
@@ -574,7 +574,7 @@ static void __init of_unittest_parse_phandle_with_args_map(void) } rc =of_count_phandle_with_args (np,"phandle-list" ,"#phandle-cells" ); -unittest (rc ==8 ,"of_count_phandle_with_args() returned %i, expected 7\n" , rc); +unittest (rc ==8 ,"of_count_phandle_with_args() returned %i, expected 8\n" , rc);for (i =0 ; i <9 ; i++) {bool passed = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 377/641 class: fix use-after-free in class_register()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jing Xia <[email protected]>
commit 93ec4a3b76404bce01bd5c9032bef5df6feb1d62 upstream.
The lock_class_key is still registered and can be found in lock_keys_hash hlist after subsys_private is freed in error handler path.A task who iterate over the lock_keys_hash later may cause use-after-free.So fix that up and unregister the lock_class_key before kfree(cp).
On our platform, a driver fails to kset_register because of creating duplicate filename '/class/xxx'.With Kasan enabled, it prints a invalid-access bug report.
KASAN bug report:
BUG: KASAN: invalid-access in lockdep_register_key+0x19c/0x1bc Write of size 8 at addr 15ffff808b8c0368 by task modprobe/252
Pointer tag: [15], memory tag: [fe]
CPU: 7 PID: 252 Comm: modprobe Tainted: G W
6.6.0-mainline-maybe-dirty #1
Call trace:
dump_backtrace+0x1b0/0x1e4
show_stack+0x2c/0x40
dump_stack_lvl+0xac/0xe0
print_report+0x18c/0x4d8
kasan_report+0xe8/0x148
__hwasan_store8_noabort+0x88/0x98
lockdep_register_key+0x19c/0x1bc
class_register+0x94/0x1ec
init_module+0xbc/0xf48 [rfkill]
do_one_initcall+0x17c/0x72c
do_init_module+0x19c/0x3f8
...
Memory state around the buggy address:
ffffff808b8c0100: 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a
ffffff808b8c0200: 8a 8a 8a 8a 8a 8a 8a 8a fe fe fe fe fe fe fe fe
>ffffff808b8c0300: fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe
^
ffffff808b8c0400: 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03As CONFIG_KASAN_GENERIC is not set, Kasan reports invalid-access not use-after-free here.In this case, modprobe is manipulating the corrupted lock_keys_hash hlish where lock_class_key is already freed before.
It's worth noting that this only can happen if lockdep is enabled, which is not true for normal system.
--- drivers/base/class.c | 1 + 1 file changed, 1 insertion(+)
drivers/base/class.c +1 -0
@@ -213,6 +213,7 @@ int class_register(const struct class *creturn 0 ; err_out: +lockdep_unregister_key (key);kfree (cp);return error; }
Greg Kroah-Hartman
maintainerPATCH 378/641 kernfs: convert kernfs_idr_lock to an irq safe raw spinlock
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Righi <[email protected]>
commit c312828c37a72fe2d033a961c47c227b0767e9f8 upstream.
bpf_cgroup_from_id() is basically a wrapper to cgroup_get_from_id(), that is relying on kernfs to determine the right cgroup associated to the target id.
As a kfunc, it has the potential to be attached to any function through BPF, particularly in contexts where certain locks are held.
However, kernfs is not using an irq safe spinlock for kernfs_idr_lock, that means any kernfs function that is acquiring this lock can be interrupted and potentially hit bpf_cgroup_from_id() in the process, triggering a deadlock.
For example, it is really easy to trigger a lockdep splat between kernfs_idr_lock and rq->_lock, attaching a small BPF program to __set_cpus_allowed_ptr_locked() that just calls bpf_cgroup_from_id():
=====================================================
WARNING: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected
6.7.0-rc7-virtme #5 Not tainted
-----------------------------------------------------
repro/131 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
ffffffffb2dc4578 (kernfs_idr_lock){+.+.}-{2:2}, at: kernfs_find_and_get_node_by_id+0x1d/0x80
and this task is already holding:
ffff911cbecaf218 (&rq->__lock){-.-.}-{2:2}, at: task_rq_lock+0x50/0xc0 which would create a new lock dependency:
(&rq->__lock){-.-.}-{2:2} -> (kernfs_idr_lock){+.+.}-{2:2}
but this new dependency connects a HARDIRQ-irq-safe lock:
(&rq->__lock){-.-.}-{2:2}
... which became HARDIRQ-irq-safe at:
lock_acquire+0xbf/0x2b0 _raw_spin_lock_nested+0x2e/0x40 scheduler_tick+0x5d/0x170 update_process_times+0x9c/0xb0 tick_periodic+0x27/0xe0 tick_handle_periodic+0x24/0x70 __sysvec_apic_timer_interrupt+0x64/0x1a0 sysvec_apic_timer_interrupt+0x6f/0x80 asm_sysvec_apic_timer_interrupt+0x1a/0x20 memcpy+0xc/0x20 arch_dup_task_struct+0x15/0x30 copy_process+0x1ce/0x1eb0 kernel_clone+0xac/0x390 kernel_thread+0x6f/0xa0 kthreadd+0x199/0x230 ret_from_fork+0x31/0x50 ret_from_fork_asm+0x1b/0x30
to a HARDIRQ-irq-unsafe lock:
(kernfs_idr_lock){+.+.}-{2:2}
... which became HARDIRQ-irq-unsafe at:
...
lock_acquire+0xbf/0x2b0 _raw_spin_lock+0x30/0x40 __kernfs_new_node.isra.0+0x83/0x280 kernfs_create_root+0xf6/0x1d0 sysfs_init+0x1b/0x70 mnt_init+0xd9/0x2a0 vfs_caches_init+0xcf/0xe0 start_kernel+0x58a/0x6a0 x86_64_start_reservations+0x18/0x30 x86_64_start_kernel+0xc5/0xe0 secondary_startup_64_no_verify+0x178/0x17b
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(kernfs_idr_lock);
local_irq_disable();
lock(&rq->__lock);
lock(kernfs_idr_lock);
<Interrupt>
lock(&rq->__lock);*** DEADLOCK ***
Prevent this deadlock condition converting kernfs_idr_lock to a raw irq safe spinlock.
The performance impact of this change should be negligible and it also helps to prevent similar deadlock conditions with any other subsystems that may depend on kernfs.
--- fs/kernfs/dir.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
fs/kernfs/dir.c +13 -10
@@ -27,7 +27,7 @@ static DEFINE_RWLOCK(kernfs_rename_lock)*/ static DEFINE_SPINLOCK (kernfs_pr_cont_lock);static char kernfs_pr_cont_buf[PATH_MAX ];/* protected by pr_cont_lock */ -static DEFINE_SPINLOCK (kernfs_idr_lock);/* root->ino_idr */ +static DEFINE_RAW_SPINLOCK (kernfs_idr_lock);/* root->ino_idr */ #define rb_to_kn (X ) rb_entry((X), struct kernfs_node, rb)
@@ -539,6 +539,7 @@ void kernfs_put(struct kernfs_node *kn) {struct kernfs_node *parent;struct kernfs_root *root; +unsigned long flags;if (!kn || !atomic_dec_and_test (&kn->count))return ;
@@ -563,9 +564,9 @@ void kernfs_put(struct kernfs_node *kn)simple_xattrs_free (&kn->iattr->xattrs,NULL );kmem_cache_free (kernfs_iattrs_cache, kn->iattr); } -spin_lock (&kernfs_idr_lock); +raw_spin_lock_irqsave (&kernfs_idr_lock, flags);idr_remove (&root->ino_idr, (u32 )kernfs_ino (kn)); -spin_unlock (&kernfs_idr_lock); +raw_spin_unlock_irqrestore (&kernfs_idr_lock, flags);kmem_cache_free (kernfs_node_cache, kn); kn = parent;
@@ -607,6 +608,7 @@ static struct kernfs_node *__kernfs_new_struct kernfs_node *kn;u32 id_highbits;int ret; +unsigned long irqflags; name =kstrdup_const (name,GFP_KERNEL );if (!name)
@@ -617,13 +619,13 @@ static struct kernfs_node *__kernfs_new_ goto err_out1;idr_preload (GFP_KERNEL ); -spin_lock (&kernfs_idr_lock); +raw_spin_lock_irqsave (&kernfs_idr_lock, irqflags); ret =idr_alloc_cyclic (&root->ino_idr, kn,1 ,0 ,GFP_ATOMIC );if (ret >=0 && ret < root->last_id_lowbits) root->id_highbits++; id_highbits = root->id_highbits; root->last_id_lowbits = ret; -spin_unlock (&kernfs_idr_lock); +raw_spin_unlock_irqrestore (&kernfs_idr_lock, irqflags);idr_preload_end ();if (ret <0 ) goto err_out2;
@@ -659,9 +661,9 @@ static struct kernfs_node *__kernfs_new_return kn; err_out3: -spin_lock (&kernfs_idr_lock); +raw_spin_lock_irqsave (&kernfs_idr_lock, irqflags);idr_remove (&root->ino_idr, (u32 )kernfs_ino (kn)); -spin_unlock (&kernfs_idr_lock); +raw_spin_unlock_irqrestore (&kernfs_idr_lock, irqflags); err_out2:kmem_cache_free (kernfs_node_cache, kn); err_out1:
@@ -702,8 +704,9 @@ struct kernfs_node *kernfs_find_and_get_struct kernfs_node *kn;ino_t ino =kernfs_id_ino (id);u32 gen =kernfs_id_gen (id); +unsigned long flags; -spin_lock (&kernfs_idr_lock); +raw_spin_lock_irqsave (&kernfs_idr_lock, flags); kn =idr_find (&root->ino_idr, (u32 )ino);if (!kn)
@@ -727,10 +730,10 @@ struct kernfs_node *kernfs_find_and_get_if (unlikely (!__kernfs_active (kn) || !atomic_inc_not_zero (&kn->count))) goto err_unlock; -spin_unlock (&kernfs_idr_lock); +raw_spin_unlock_irqrestore (&kernfs_idr_lock, flags);return kn; err_unlock: -spin_unlock (&kernfs_idr_lock); +raw_spin_unlock_irqrestore (&kernfs_idr_lock, flags);return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 379/641 Revert "kernfs: convert kernfs_idr_lock to an irq safe raw spinlock"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit e3977e0609a07d86406029fceea0fd40d7849368 upstream.
This reverts commit dad3fb67ca1cbef87ce700e83a55835e5921ce8a.
The commit converted kernfs_idr_lock to an IRQ-safe raw_spinlock because it could be acquired while holding an rq lock through bpf_cgroup_from_id(). However, kernfs_idr_lock is held while doing GPF_NOWAIT allocations which involves acquiring an non-IRQ-safe and non-raw lock leading to the following lockdep warning:
=============================
[ BUG: Invalid wait context ]
6.7.0-rc5-kzm9g-00251-g655022a45b1c #578 Not tainted
-----------------------------
swapper/0/0 is trying to lock:
dfbcd488 (&c->lock){....}-{3:3}, at: local_lock_acquire+0x0/0xa4
other info that might help us debug this:
context-{5:5}
2 locks held by swapper/0/0:
#0: dfbc9c60 (lock){+.+.}-{3:3}, at: local_lock_acquire+0x0/0xa4
#1: c0c012a8 (kernfs_idr_lock){....}-{2:2}, at: __kernfs_new_node.constprop.0+0x68/0x258
stack backtrace: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 6.7.0-rc5-kzm9g-00251-g655022a45b1c #578 Hardware name: Generic SH73A0 (Flattened Device Tree) unwind_backtrace from show_stack+0x10/0x14 show_stack from dump_stack_lvl+0x68/0x90 dump_stack_lvl from __lock_acquire+0x3cc/0x168c __lock_acquire from lock_acquire+0x274/0x30c lock_acquire from local_lock_acquire+0x28/0xa4 local_lock_acquire from ___slab_alloc+0x234/0x8a8 ___slab_alloc from __slab_alloc.constprop.0+0x30/0x44 __slab_alloc.constprop.0 from kmem_cache_alloc+0x7c/0x148 kmem_cache_alloc from radix_tree_node_alloc.constprop.0+0x44/0xdc radix_tree_node_alloc.constprop.0 from idr_get_free+0x110/0x2b8 idr_get_free from idr_alloc_u32+0x9c/0x108 idr_alloc_u32 from idr_alloc_cyclic+0x50/0xb8 idr_alloc_cyclic from __kernfs_new_node.constprop.0+0x88/0x258 __kernfs_new_node.constprop.0 from kernfs_create_root+0xbc/0x154 kernfs_create_root from sysfs_init+0x18/0x5c sysfs_init from mnt_init+0xc4/0x220 mnt_init from vfs_caches_init+0x6c/0x88 vfs_caches_init from start_kernel+0x474/0x528 start_kernel from 0x0
Let's rever the commit. It's undesirable to spread out raw spinlock usage anyway and the problem can be solved by protecting the lookup path with RCU instead.
--- fs/kernfs/dir.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
fs/kernfs/dir.c +10 -13
@@ -27,7 +27,7 @@ static DEFINE_RWLOCK(kernfs_rename_lock)*/ static DEFINE_SPINLOCK (kernfs_pr_cont_lock);static char kernfs_pr_cont_buf[PATH_MAX ];/* protected by pr_cont_lock */ -static DEFINE_RAW_SPINLOCK (kernfs_idr_lock);/* root->ino_idr */ +static DEFINE_SPINLOCK (kernfs_idr_lock);/* root->ino_idr */ #define rb_to_kn (X ) rb_entry((X), struct kernfs_node, rb)
@@ -539,7 +539,6 @@ void kernfs_put(struct kernfs_node *kn) {struct kernfs_node *parent;struct kernfs_root *root; -unsigned long flags;if (!kn || !atomic_dec_and_test (&kn->count))return ;
@@ -564,9 +563,9 @@ void kernfs_put(struct kernfs_node *kn)simple_xattrs_free (&kn->iattr->xattrs,NULL );kmem_cache_free (kernfs_iattrs_cache, kn->iattr); } -raw_spin_lock_irqsave (&kernfs_idr_lock, flags); +spin_lock (&kernfs_idr_lock);idr_remove (&root->ino_idr, (u32 )kernfs_ino (kn)); -raw_spin_unlock_irqrestore (&kernfs_idr_lock, flags); +spin_unlock (&kernfs_idr_lock);kmem_cache_free (kernfs_node_cache, kn); kn = parent;
@@ -608,7 +607,6 @@ static struct kernfs_node *__kernfs_new_struct kernfs_node *kn;u32 id_highbits;int ret; -unsigned long irqflags; name =kstrdup_const (name,GFP_KERNEL );if (!name)
@@ -619,13 +617,13 @@ static struct kernfs_node *__kernfs_new_ goto err_out1;idr_preload (GFP_KERNEL ); -raw_spin_lock_irqsave (&kernfs_idr_lock, irqflags); +spin_lock (&kernfs_idr_lock); ret =idr_alloc_cyclic (&root->ino_idr, kn,1 ,0 ,GFP_ATOMIC );if (ret >=0 && ret < root->last_id_lowbits) root->id_highbits++; id_highbits = root->id_highbits; root->last_id_lowbits = ret; -raw_spin_unlock_irqrestore (&kernfs_idr_lock, irqflags); +spin_unlock (&kernfs_idr_lock);idr_preload_end ();if (ret <0 ) goto err_out2;
@@ -661,9 +659,9 @@ static struct kernfs_node *__kernfs_new_return kn; err_out3: -raw_spin_lock_irqsave (&kernfs_idr_lock, irqflags); +spin_lock (&kernfs_idr_lock);idr_remove (&root->ino_idr, (u32 )kernfs_ino (kn)); -raw_spin_unlock_irqrestore (&kernfs_idr_lock, irqflags); +spin_unlock (&kernfs_idr_lock); err_out2:kmem_cache_free (kernfs_node_cache, kn); err_out1:
@@ -704,9 +702,8 @@ struct kernfs_node *kernfs_find_and_get_struct kernfs_node *kn;ino_t ino =kernfs_id_ino (id);u32 gen =kernfs_id_gen (id); -unsigned long flags; -raw_spin_lock_irqsave (&kernfs_idr_lock, flags); +spin_lock (&kernfs_idr_lock); kn =idr_find (&root->ino_idr, (u32 )ino);if (!kn)
@@ -730,10 +727,10 @@ struct kernfs_node *kernfs_find_and_get_if (unlikely (!__kernfs_active (kn) || !atomic_inc_not_zero (&kn->count))) goto err_unlock; -raw_spin_unlock_irqrestore (&kernfs_idr_lock, flags); +spin_unlock (&kernfs_idr_lock);return kn; err_unlock: -raw_spin_unlock_irqrestore (&kernfs_idr_lock, flags); +spin_unlock (&kernfs_idr_lock);return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 380/641 selftests/bpf: Add assert for user stacks in test_task_stack
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jordan Rome <[email protected]>
commit 727a92d62fd6a382b4c5972008e45667e707b0e4 upstream.
This is a follow up to:
commit b8e3a87a627b ("bpf: Add crosstask check to __bpf_get_stack").
This test ensures that the task iterator only gets a single user stack (for the current task).
--- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 2 ++ tools/testing/selftests/bpf/progs/bpf_iter_task_stack.c | 5 +++++ 2 files changed, 7 insertions(+)
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +2 -0
@@ -334,6 +334,8 @@ static void test_task_stack(void)do_dummy_read (skel->progs.dump_task_stack);do_dummy_read (skel->progs.get_task_user_stacks); +ASSERT_EQ (skel->bss->num_user_stacks,1 ,"num_user_stacks" ); +bpf_iter_task_stack__destroy (skel); }
tools/testing/selftests/bpf/progs/bpf_iter_task_stack.c +5 -0
@@ -35,6 +35,8 @@ int dump_task_stack(struct bpf_iter__tasreturn 0 ; } +int num_user_stacks =0 ; + SEC("iter/task")int get_task_user_stacks (struct bpf_iter__task *ctx) {
@@ -51,6 +53,9 @@ int get_task_user_stacks(struct bpf_iterif (res <=0 )return 0 ; +/* Only one task, the current one, should succeed */ + ++num_user_stacks; + buf_sz += res;/* If the verifier doesn't refine bpf_get_task_stack res, and instead
Greg Kroah-Hartman
maintainerPATCH 381/641 binder: fix async space check for 0-sized buffers
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 3091c21d3e9322428691ce0b7a0cfa9c0b239eeb upstream.
Move the padding of 0-sized buffers to an earlier stage to account for this round up during the alloc->free_async_space check.
--- drivers/android/binder_alloc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/android/binder_alloc.c +4 -3
@@ -407,6 +407,10 @@ static struct binder_buffer *binder_allo alloc->pid, extra_buffers_size);return ERR_PTR (-EINVAL ); } + +/* Pad 0-size buffers so they get assigned unique addresses */ + size =max (size,sizeof (void *)); +if (is_async && alloc->free_async_space < size +sizeof (struct binder_buffer )) { binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
@@ -415,9 +419,6 @@ static struct binder_buffer *binder_alloreturn ERR_PTR (-ENOSPC ); } -/* Pad 0-size buffers so they get assigned unique addresses */ - size =max (size,sizeof (void *)); -while (n) { buffer = rb_entry(n, struct binder_buffer, rb_node);BUG_ON (!buffer->free);
Greg Kroah-Hartman
maintainerPATCH 382/641 binder: fix unused alloc->free_async_space
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit c6d05e0762ab276102246d24affd1e116a46aa0c upstream.
Each transaction is associated with a 'struct binder_buffer' that stores the metadata about its buffer area. Since commit 74310e06be4d ("android:
binder: Move buffer out of area shared with user space") this struct is no longer embedded within the buffer itself but is instead allocated on the heap to prevent userspace access to this driver-exclusive info.
Unfortunately, the space of this struct is still being accounted for in the total buffer size calculation, specifically for async transactions. This results in an additional 104 bytes added to every async buffer request, and this area is never used.
This wasted space can be substantial. If we consider the maximum mmap buffer space of SZ_4M, the driver will reserve half of it for async transactions, or 0x200000. This area should, in theory, accommodate up to 262,144 buffers of the minimum 8-byte size. However, after adding the extra 'sizeof(struct binder_buffer)', the total number of buffers drops to only 18,724, which is a sad 7.14% of the actual capacity.
This patch fixes the buffer size calculation to enable the utilization of the entire async buffer space. This is expected to reduce the number of -ENOSPC errors that are seen on the field.
--- drivers/android/binder_alloc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/android/binder_alloc.c +4 -7
@@ -344,8 +344,7 @@ static bool debug_low_async_space_lockedcontinue ;if (!buffer->async_transaction)continue ; - total_alloc_size +=binder_alloc_buffer_size (alloc, buffer) - +sizeof (struct binder_buffer ); + total_alloc_size +=binder_alloc_buffer_size (alloc, buffer); num_buffers++; }
@@ -411,8 +410,7 @@ static struct binder_buffer *binder_allo/* Pad 0-size buffers so they get assigned unique addresses */ size =max (size,sizeof (void *)); -if (is_async && - alloc->free_async_space < size +sizeof (struct binder_buffer )) { +if (is_async && alloc->free_async_space < size) {binder_alloc_debug (BINDER_DEBUG_BUFFER_ALLOC ,"%d: binder_alloc_buf size %zd failed, no async space left\n" , alloc->pid, size);
@@ -520,7 +518,7 @@ static struct binder_buffer *binder_allo buffer->pid = pid; buffer->oneway_spam_suspect = false;if (is_async) { - alloc->free_async_space -= size +sizeof (struct binder_buffer ); + alloc->free_async_space -= size;binder_alloc_debug (BINDER_DEBUG_BUFFER_ALLOC_ASYNC ,"%d: binder_alloc_buf size %zd async free %zd\n" , alloc->pid, size, alloc->free_async_space);
@@ -658,8 +656,7 @@ static void binder_free_buf_locked(strucBUG_ON (buffer->user_data > alloc->buffer + alloc->buffer_size);if (buffer->async_transaction) { - alloc->free_async_space += buffer_size +sizeof (struct binder_buffer ); - + alloc->free_async_space += buffer_size;binder_alloc_debug (BINDER_DEBUG_BUFFER_ALLOC_ASYNC ,"%d: binder_free_buf size %zd async free %zd\n" , alloc->pid, size, alloc->free_async_space);
Greg Kroah-Hartman
maintainerPATCH 383/641 Input: atkbd - use ab83 as id when skipping the getid command
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 58f65f9db7e0de366a5a115c2e2c0703858bba69 upstream.
Barnabás reported that the change to skip the getid command when the controller is in translated mode on laptops caused the Version field of his "AT Translated Set 2 keyboard" input device to change from ab83 to abba, breaking a custom hwdb entry for this keyboard.
Use the standard ab83 id for keyboards when getid is skipped (rather then that getid fails) to avoid reporting a different Version to userspace then before skipping the getid.
--- drivers/input/keyboard/atkbd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/input/keyboard/atkbd.c +7 -5
@@ -791,9 +791,9 @@ static bool atkbd_is_portable_device(voi* not work. So in this case simply assume a keyboard is connected to avoid * confusing some laptop keyboards. * -* Skipping ATKBD_CMD_GETID ends up using a fake keyboard id. Using a fake id is -* ok in translated mode, only atkbd_select_set() checks atkbd->id and in -* translated mode that is a no-op. +* Skipping ATKBD_CMD_GETID ends up using a fake keyboard id. Using the standard +* 0xab83 id is ok in translated mode, only atkbd_select_set() checks atkbd->id +* and in translated mode that is a no-op. */ static bool atkbd_skip_getid (struct atkbd *atkbd) {
@@ -811,6 +811,7 @@ static int atkbd_probe(struct atkbd *atk {struct ps2dev *ps2dev = &atkbd->ps2dev;unsigned char param[2 ]; +bool skip_getid;/* * Some systems, where the bit-twiddling when testing the io-lines of the
@@ -832,7 +833,8 @@ static int atkbd_probe(struct atkbd *atk*/ param[0 ] = param[1 ] =0xa5 ;/* initialize with invalid values */ -if (atkbd_skip_getid (atkbd) ||ps2_command (ps2dev, param,ATKBD_CMD_GETID )) { + skip_getid =atkbd_skip_getid (atkbd); +if (skip_getid ||ps2_command (ps2dev, param,ATKBD_CMD_GETID )) {/* * If the get ID command was skipped or failed, we check if we can at least set
@@ -842,7 +844,7 @@ static int atkbd_probe(struct atkbd *atk param[0 ] =0 ;if (ps2_command (ps2dev, param,ATKBD_CMD_SETLEDS ))return -1 ; - atkbd->id =0xabba ; + atkbd->id = skip_getid ?0xab83 :0xabba ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 384/641 rust: Ignore preserve-most functions
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Maurer <[email protected]>
commit bad098d76835c1379e1cf6afc935f8a7e050f83c upstream.
Neither bindgen nor Rust know about the preserve-most calling convention, and Clang describes it as unstable. Since we aren't using functions with this calling convention from Rust, blocklist them.
These functions are only added to the build when list hardening is enabled, which is likely why others didn't notice this yet.
--- rust/bindgen_parameters | 4 ++++ 1 file changed, 4 insertions(+)
rust/bindgen_parameters +4 -0
@@ -20,3 +20,7 @@ # `seccomp`'s comment gets understood as a doctest --no-doc-comments + +# These functions use the `__preserve_most` calling convention, which neither bindgen +# nor Rust currently understand, and which Clang currently declares to be unstable. +--blocklist-function __list_.*_report
Greg Kroah-Hartman
maintainerPATCH 385/641 Revert "drm/amdkfd: Relocate TBA/TMA to opposite side of VM hole"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kaibo Ma <[email protected]>
commit 0f35b0a7b8fa402adbffa2565047cdcc4c480153 upstream.
That commit causes NULL pointer dereferences in dmesgs when running applications using ROCm, including clinfo, blender, and PyTorch, since v6.6.1. Revert it to fix blender again.
This reverts commit 96c211f1f9ef82183493f4ceed4e347b52849149.
--- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +13 -13
@@ -330,12 +330,6 @@ static void kfd_init_apertures_vi(struct pdd->gpuvm_limit = pdd->dev->kfd->shared_resources.gpuvm_size -1 ; -/* dGPUs: the reserved space for kernel -* before SVM -*/ - pdd->qpd.cwsr_base =SVM_CWSR_BASE ; - pdd->qpd.ib_base =SVM_IB_BASE ; - pdd->scratch_base =MAKE_SCRATCH_APP_BASE_VI (); pdd->scratch_limit =MAKE_SCRATCH_APP_LIMIT (pdd->scratch_base); }
@@ -345,18 +339,18 @@ static void kfd_init_apertures_v9(struct pdd->lds_base =MAKE_LDS_APP_BASE_V9 (); pdd->lds_limit =MAKE_LDS_APP_LIMIT (pdd->lds_base); - pdd->gpuvm_base =PAGE_SIZE ; +/* Raven needs SVM to support graphic handle, etc. Leave the small +* reserved space before SVM on Raven as well, even though we don't +* have to. +* Set gpuvm_base and gpuvm_limit to CANONICAL addresses so that they +* are used in Thunk to reserve SVM. +*/ + pdd->gpuvm_base =SVM_USER_BASE ; pdd->gpuvm_limit = pdd->dev->kfd->shared_resources.gpuvm_size -1 ; pdd->scratch_base =MAKE_SCRATCH_APP_BASE_V9 (); pdd->scratch_limit =MAKE_SCRATCH_APP_LIMIT (pdd->scratch_base); - -/* -* Place TBA/TMA on opposite side of VM hole to prevent -* stray faults from triggering SVM on these pages. -*/ - pdd->qpd.cwsr_base = pdd->dev->kfd->shared_resources.gpuvm_size; }int kfd_init_apertures (struct kfd_process *process)
@@ -413,6 +407,12 @@ int kfd_init_apertures(struct kfd_procesreturn -EINVAL ; } } + +/* dGPUs: the reserved space for kernel +* before SVM +*/ + pdd->qpd.cwsr_base =SVM_CWSR_BASE ; + pdd->qpd.ib_base =SVM_IB_BASE ; }dev_dbg (kfd_device,"node id %u\n" , id);
Greg Kroah-Hartman
maintainerPATCH 386/641 xen-netback: dont produce zero-size SKB frags
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit c7ec4f2d684e17d69bbdd7c4324db0ef5daac26a upstream.
While frontends may submit zero-size requests (wasting a precious slot), core networking code as of at least 3ece782693c4b ("sock: skb_copy_ubufs support for compound pages") can't deal with SKBs when they have all zero-size fragments. Respond to empty requests right when populating fragments; all further processing is fragment based and hence won't encounter these empty requests anymore.
In a way this should have been that way from the beginning: When no data is to be transferred for a particular request, there's not even a point in validating the respective grant ref. That's no different from e.g. passing NULL into memcpy() when at the same time the size is 0.
This is XSA-448 / CVE-2023-46838.
--- drivers/net/xen-netback/netback.c | 44 ++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-)
drivers/net/xen-netback/netback.c +38 -6
@@ -463,12 +463,25 @@ static void xenvif_get_requests(struct x }for (shinfo->nr_frags =0 ; nr_slots >0 && shinfo->nr_frags <MAX_SKB_FRAGS ; - shinfo->nr_frags++, gop++, nr_slots--) { + nr_slots--) { +if (unlikely (!txp->size)) { +unsigned long flags; + +spin_lock_irqsave (&queue->response_lock, flags); +make_tx_response (queue, txp,0 ,XEN_NETIF_RSP_OKAY ); +push_tx_responses (queue); +spin_unlock_irqrestore (&queue->response_lock, flags); + ++txp; +continue ; + } + index =pending_index (queue->pending_cons++); pending_idx = queue->pending_ring[index];xenvif_tx_create_map_op (queue, pending_idx, txp, txp == first ? extra_count :0 , gop);frag_set_pending_idx (&frags[shinfo->nr_frags], pending_idx); + ++shinfo->nr_frags; + ++gop;if (txp == first) txp = txfrags;
@@ -481,20 +494,39 @@ static void xenvif_get_requests(struct x shinfo =skb_shinfo (nskb); frags = shinfo->frags; -for (shinfo->nr_frags =0 ; shinfo->nr_frags < nr_slots; - shinfo->nr_frags++, txp++, gop++) { +for (shinfo->nr_frags =0 ; shinfo->nr_frags < nr_slots; ++txp) { +if (unlikely (!txp->size)) { +unsigned long flags; + +spin_lock_irqsave (&queue->response_lock, flags); +make_tx_response (queue, txp,0 , +XEN_NETIF_RSP_OKAY ); +push_tx_responses (queue); +spin_unlock_irqrestore (&queue->response_lock, + flags); +continue ; + } + index =pending_index (queue->pending_cons++); pending_idx = queue->pending_ring[index];xenvif_tx_create_map_op (queue, pending_idx, txp,0 , gop);frag_set_pending_idx (&frags[shinfo->nr_frags], pending_idx); + ++shinfo->nr_frags; + ++gop; } -skb_shinfo (skb)->frag_list = nskb; - }else if (nskb) { +if (shinfo->nr_frags) { +skb_shinfo (skb)->frag_list = nskb; + nskb =NULL ; + } + } + +if (nskb) {/* A frag_list skb was allocated but it is no longer needed -* because enough slots were converted to copy ops above. +* because enough slots were converted to copy ops above or some +* were empty. */ kfree_skb (nskb); }
Greg Kroah-Hartman
maintainerPATCH 387/641 binder: fix race between mmput() and do_exit()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 9a9ab0d963621d9d12199df9817e66982582d5a5 upstream.
Task A calls binder_update_page_range() to allocate and insert pages on a remote address space from Task B. For this, Task A pins the remote mm via mmget_not_zero() first. This can race with Task B do_exit() and the final mmput() refcount decrement will come from Task A.
Task A | Task B
------------------+------------------
mmget_not_zero() |
| do_exit()
| exit_mm()
| mmput()
mmput() |
exit_mmap() |
remove_vma() |
fput() |In this case, the work of ____fput() from Task B is queued up in Task A as TWA_RESUME. So in theory, Task A returns to userspace and the cleanup work gets executed. However, Task A instead sleep, waiting for a reply from Task B that never comes (it's dead).
This means the binder_deferred_release() is blocked until an unrelated binder event forces Task A to go back to userspace. All the associated death notifications will also be delayed until then.
In order to fix this use mmput_async() that will schedule the work in the corresponding mm->async_put_work WQ instead of Task A.
--- drivers/android/binder_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/android/binder_alloc.c +2 -2
@@ -271,7 +271,7 @@ static int binder_update_page_range(stru }if (mm) {mmap_write_unlock (mm); -mmput (mm); +mmput_async (mm); }return 0 ;
@@ -304,7 +304,7 @@ err_page_ptr_cleared: err_no_vma:if (mm) {mmap_write_unlock (mm); -mmput (mm); +mmput_async (mm); }return vma ? -ENOMEM : -ESRCH ; }
Greg Kroah-Hartman
maintainerPATCH 388/641 clocksource/drivers/timer-ti-dm: Fix make W=n kerneldoc warnings
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
commit b99a212a7697c542b460adaa15d4a98abf8223f0 upstream.
Kernel test robot reports of kerneldoc related warnings that happen with make W=n for "parameter or member not described".
These were caused by changes to function parameter names with earlier commits where the kerneldoc parts were not updated.
--- drivers/clocksource/timer-ti-dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clocksource/timer-ti-dm.c +2 -2
@@ -183,7 +183,7 @@ static inline u32 dmtimer_read(struct dm* dmtimer_write - write timer registers in posted and non-posted mode * @timer: timer pointer over which write operation is to perform * @reg: lowest byte holds the register offset -* @value: data to write into the register +* @val: data to write into the register * * The posted mode bit is encoded in reg. Note that in posted mode, the write * pending bit must be checked. Otherwise a write on a register which has a
@@ -949,7 +949,7 @@ static int omap_dm_timer_set_int_enable(/** * omap_dm_timer_set_int_disable - disable timer interrupts -* @timer: pointer to timer handle +* @cookie: pointer to timer cookie * @mask: bit mask of interrupts to be disabled * * Disables the specified timer interrupts for a timer.
Greg Kroah-Hartman
maintainerPATCH 389/641 dt-bindings: timer: thead,c900-aclint-mtimer: separate mtime and mtimecmp regs
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Inochi Amaoto <[email protected]>
commit b91cf01cf3e63a627b3b65f4284dcf9a4deb80f9 upstream.
The timer registers of aclint don't follow the clint layout and can be mapped on any different offset. As sg2042 uses separated timer and mswi for its clint, it should follow the aclint spec and have separated registers.
The previous patch introduced a new type of T-HEAD aclint timer which has clint timer layout. Although it has the clint timer layout, it should follow the aclint spec and uses the separated mtime and mtimecmp regs. So a ABI change is needed to make the timer fit the aclint spec.
To make T-HEAD aclint timer more closer to the aclint spec, use regs-names to represent the mtimecmp register, which can avoid hack for unsupport mtime register of T-HEAD aclint timer.
Also, as T-HEAD aclint only supports mtimecmp, it is unnecessary to implement the whole aclint spec. To make this binding T-HEAD specific, only add reg-name for existed register. For details, see the discussion in the last link.
--- .../bindings/timer/thead,c900-aclint-mtimer.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/timer/thead,c900-aclint-mtimer.yaml +8 -1
@@ -17,7 +17,12 @@ properties: - const: thead,c900-aclint-mtimer reg: - maxItems: 1 + items: + - description: MTIMECMP Registers + + reg-names: + items: + - const: mtimecmp interrupts-extended: minItems: 1
@@ -28,6 +33,7 @@ additionalProperties: false required: - compatible - reg + - reg-names - interrupts-extended examples:
@@ -39,5 +45,6 @@ examples: <&cpu3intc 7>, <&cpu4intc 7>; reg = <0xac000000 0x00010000>; + reg-names = "mtimecmp"; }; ...
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 390/641 clocksource/drivers/ep93xx: Fix error handling during probe
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit c0c4579d79d0df841e825c68df450909a0032faf upstream.
When the interrupt property fails to be parsed, ep93xx_timer_of_init() return code ends up uninitialized:
drivers/clocksource/timer-ep93xx.c:160:6: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
if (irq < 0) {
^~~~~~~
drivers/clocksource/timer-ep93xx.c:188:9: note: uninitialized use occurs here
return ret;
^~~
drivers/clocksource/timer-ep93xx.c:160:2: note: remove the 'if' if its condition is always false
if (irq < 0) {
^~~~~~~~~~~~~~Simplify this portion to use the normal construct of just checking whether a valid interrupt was returned. Note that irq_of_parse_and_map() never returns a negative value and no other callers check for that either.
--- drivers/clocksource/timer-ep93xx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/clocksource/timer-ep93xx.c +2 -3
@@ -155,9 +155,8 @@ static int __init ep93xx_timer_of_init(struct device_node *np) ep93xx_tcu = tcu; irq =irq_of_parse_and_map (np,0 ); -if (irq ==0 ) - irq = -EINVAL ; -if (irq <0 ) { +if (!irq) { + ret = -EINVAL ;pr_err ("EP93XX Timer Can't parse IRQ %d" , irq); goto out_free; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 391/641 powerpc/64s: Increase default stack size to 32KB
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
commit 18f14afe281648e31ed35c9ad2fcb724c4838ad9 upstream.
There are reports of kernels crashing due to stack overflow while running OpenShift (Kubernetes). The primary contributor to the stack usage seems to be openvswitch, which is used by OVN-Kubernetes (based on OVN (Open Virtual Network)), but NFS also contributes in some stack traces.
There may be some opportunities to reduce stack usage in the openvswitch code, but doing so potentially require tradeoffs vs performance, and also requires testing across architectures.
Looking at stack usage across the kernel (using -fstack-usage), shows that ppc64le stack frames are on average 50-100% larger than the equivalent function built for x86-64. Which is not surprising given the minimum stack frame size is 32 bytes on ppc64le vs 16 bytes on x86-64.
So increase the default stack size to 32KB for the modern 64-bit Book3S platforms, ie. pseries (virtualised) and powernv (bare metal). That leaves the older systems like G5s, and the AmigaOne (pasemi) with a 16KB stack which should be sufficient on those machines.
--- arch/powerpc/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/Kconfig +1 -0
@@ -858,6 +858,7 @@ config THREAD_SHIFT int "Thread shift" if EXPERT range 13 15 default "15" if PPC_256K_PAGES + default "15" if PPC_PSERIES || PPC_POWERNV default "14" if PPC64 default "13" help
Greg Kroah-Hartman
maintainerPATCH 392/641 tick-sched: Fix idle and iowait sleeptime accounting vs CPU hotplug
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit 71fee48fb772ac4f6cfa63dbebc5629de8b4cc09 upstream.
When offlining and onlining CPUs the overall reported idle and iowait times as reported by /proc/stat jump backward and forward:
cpu 132 0 176 225249 47 6 6 21 0 0
cpu0 80 0 115 112575 33 3 4 18 0 0
cpu1 52 0 60 112673 13 3 1 2 0 0
cpu 133 0 177 226681 47 6 6 21 0 0
cpu0 80 0 116 113387 33 3 4 18 0 0
cpu 133 0 178 114431 33 6 6 21 0 0 <---- jump backward cpu0 80 0 116 114247 33 3 4 18 0 0
cpu1 52 0 61 183 0 3 1 2 0 0 <---- idle + iowait start with 0
cpu 133 0 178 228956 47 6 6 21 0 0 <---- jump forward cpu0 81 0 117 114929 33 3 4 18 0 0
Reason for this is that get_idle_time() in fs/proc/stat.c has different sources for both values depending on if a CPU is online or offline:
- if a CPU is online the values may be taken from its per cpu tick_cpu_sched structure
- if a CPU is offline the values are taken from its per cpu cpustat structure
The problem is that the per cpu tick_cpu_sched structure is set to zero on CPU offline. See tick_cancel_sched_timer() in kernel/time/tick-sched.c.
Therefore when a CPU is brought offline and online afterwards both its idle and iowait sleeptime will be zero, causing a jump backward in total system idle and iowait sleeptime. In a similar way if a CPU is then brought offline again the total idle and iowait sleeptimes will jump forward.
It looks like this behavior was introduced with commit 4b0c0f294f60 ("tick: Cleanup NOHZ per cpu data on cpu down").
This was only noticed now on s390, since we switched to generic idle time reporting with commit be76ea614460 ("s390/idle: remove arch_cpu_idle_time() and corresponding code").
Fix this by preserving the values of idle_sleeptime and iowait_sleeptime members of the per-cpu tick_sched structure on CPU hotplug.
--- kernel/time/tick-sched.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/time/tick-sched.c +5 -0
@@ -1573,13 +1573,18 @@ void tick_setup_sched_timer(void)void tick_cancel_sched_timer (int cpu) {struct tick_sched *ts = &per_cpu (tick_cpu_sched, cpu); +ktime_t idle_sleeptime, iowait_sleeptime;# ifdef CONFIG_HIGH_RES_TIMERS if (ts->sched_timer.base)hrtimer_cancel (&ts->sched_timer);# endif + idle_sleeptime = ts->idle_sleeptime; + iowait_sleeptime = ts->iowait_sleeptime;memset (ts,0 ,sizeof (*ts)); + ts->idle_sleeptime = idle_sleeptime; + ts->iowait_sleeptime = iowait_sleeptime; }#endif
Greg Kroah-Hartman
maintainerPATCH 393/641 Revert "usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
commit 895ee5aefb7e24203de5dffae7ce9a02d78fa3d1 upstream.
This reverts commit 3c5b006f3ee800b4bd9ed37b3a8f271b8560126e.
gadget_is_{super|dual}speed() API check UDC controller capitblity. It should pass down highest speed endpoint descriptor to UDC controller. So UDC controller driver can reserve enough resource at check_config(), especially mult and maxburst. So UDC driver (such as cdns3) can know need at least (mult + 1) * (maxburst + 1) * wMaxPacketSize internal memory for this uvc functions.
--- drivers/usb/gadget/function/f_uvc.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/usb/gadget/function/f_uvc.c +17 -1
@@ -722,13 +722,29 @@ uvc_function_bind(struct usb_configurati } uvc->enable_interrupt_ep = opts->enable_interrupt_ep; - ep =usb_ep_autoconfig (cdev->gadget, &uvc_fs_streaming_ep); +/* +* gadget_is_{super|dual}speed() API check UDC controller capitblity. It should pass down +* highest speed endpoint descriptor to UDC controller. So UDC controller driver can reserve +* enough resource at check_config(), especially mult and maxburst. So UDC driver (such as +* cdns3) can know need at least (mult + 1) * (maxburst + 1) * wMaxPacketSize internal +* memory for this uvc functions. This is the only straightforward method to resolve the UDC +* resource allocation issue in the current gadget framework. +*/ +if (gadget_is_superspeed (c->cdev->gadget)) + ep =usb_ep_autoconfig_ss (cdev->gadget, &uvc_ss_streaming_ep, + &uvc_ss_streaming_comp); +else if (gadget_is_dualspeed (cdev->gadget)) + ep =usb_ep_autoconfig (cdev->gadget, &uvc_hs_streaming_ep); +else + ep =usb_ep_autoconfig (cdev->gadget, &uvc_fs_streaming_ep); +if (!ep) {uvcg_info (f,"Unable to allocate streaming EP\n" ); goto error; } uvc->video.ep = ep; + uvc_fs_streaming_ep.bEndpointAddress = uvc->video.ep->address; uvc_hs_streaming_ep.bEndpointAddress = uvc->video.ep->address; uvc_ss_streaming_ep.bEndpointAddress = uvc->video.ep->address;
Greg Kroah-Hartman
maintainerPATCH 394/641 usb: gadget: u_ether: Re-attach netif device to mirror detachment
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Acayan <[email protected]>
commit 76c945730cdffb572c7767073cc6515fd3f646b4 upstream.
In 6.7-rc1, there was a netif_device_detach call added to the gether_disconnect function. This clears the __LINK_STATE_PRESENT bit of the netif device and suppresses pings (ICMP messages) and TCP connection requests from the connected host. If userspace temporarily disconnects the gadget, such as by temporarily removing configuration in the gadget configfs interface, network activity should continue to be processed when the gadget is re-connected. Mirror the netif_device_detach call with a netif_device_attach call in gether_connect to fix re-connecting gadgets.
--- drivers/usb/gadget/function/u_ether.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/function/u_ether.c +2 -0
@@ -1163,6 +1163,8 @@ struct net_device *gether_connect(struct gether *link)if (netif_running (dev->net))eth_start (dev,GFP_ATOMIC ); +netif_device_attach (dev->net); +/* on error, disable any endpoints */ }else { (void )usb_ep_disable (link->out_ep);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 395/641 usb: phy: mxs: remove CONFIG_USB_OTG condition for mxs_phy_is_otg_host()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit ff2b89de471da942a4d853443688113a44fd35ed upstream.
When CONFIG_USB_OTG is not set, mxs_phy_is_otg_host() will always return false. This behaviour is wrong. Since phy.last_event will always be set for either host or device mode. Therefore, CONFIG_USB_OTG condition can be removed.
--- drivers/usb/phy/phy-mxs-usb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +1 -2
@@ -388,8 +388,7 @@ static void __mxs_phy_disconnect_line(ststatic bool mxs_phy_is_otg_host (struct mxs_phy *mxs_phy) { -return IS_ENABLED (CONFIG_USB_OTG ) && - mxs_phy->phy.last_event ==USB_EVENT_ID ; +return mxs_phy->phy.last_event ==USB_EVENT_ID ; }static void mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool on)
Greg Kroah-Hartman
maintainerPATCH 396/641 usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uttkarsh Aggarwal <[email protected]>
commit e9d40b215e38480fd94c66b06d79045717a59e9c upstream.
Current implementation blocks the running operations when Plug-out and Plug-In is performed continuously, process gets stuck in dwc3_thread_interrupt().
Code Flow:
CPU1 ->Gadget_start ->dwc3_interrupt ->dwc3_thread_interrupt ->dwc3_process_event_buf ->dwc3_process_event_entry ->dwc3_endpoint_interrupt ->dwc3_ep0_interrupt ->dwc3_ep0_inspect_setup ->dwc3_ep0_stall_and_restart
By this time if pending_list is not empty, it will get the next request on the given list and calls dwc3_gadget_giveback which will unmap request and call its complete() callback to notify upper layers that it has completed. Currently dwc3_gadget_giveback status is set to -ECONNRESET, whereas it should be -ESHUTDOWN based on condition if not dwc->connected is true.
--- drivers/usb/dwc3/ep0.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/dwc3/ep0.c +4 -1
@@ -238,7 +238,10 @@ void dwc3_ep0_stall_and_restart(struct dstruct dwc3_request *req; req =next_request (&dep->pending_list); -dwc3_gadget_giveback (dep, req, -ECONNRESET ); +if (!dwc->connected) +dwc3_gadget_giveback (dep, req, -ESHUTDOWN ); +else +dwc3_gadget_giveback (dep, req, -ECONNRESET ); } dwc->eps[0 ]->trb_enqueue =0 ;
Greg Kroah-Hartman
maintainerPATCH 397/641 usb: dwc3: gadget: Handle EP0 request dequeuing properly
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
commit 730e12fbec53ab59dd807d981a204258a4cfb29a upstream.
Current EP0 dequeue path will share the same as other EPs. However, there are some special considerations that need to be made for EP0 transfers:
- EP0 transfers never transition into the started_list
- EP0 only has one active request at a time
In case there is a vendor specific control message for a function over USB FFS, then there is no guarantee on the timeline which the DATA/STATUS stage is responded to. While this occurs, any attempt to end transfers on non-control EPs will end up having the DWC3_EP_DELAY_STOP flag set, and defer issuing of the end transfer command. If the USB FFS application decides to timeout the control transfer, or if USB FFS AIO path exits, the USB FFS driver will issue a call to usb_ep_dequeue() for the ep0 request.
In case of the AIO exit path, the AIO FS blocks until all pending USB requests utilizing the AIO path is completed. However, since the dequeue of ep0 req does not happen properly, all non-control EPs with the DWC3_EP_DELAY_STOP flag set will not be handled, and the AIO exit path will be stuck waiting for the USB FFS data endpoints to receive a completion callback.
Fix is to utilize dwc3_ep0_reset_state() in the dequeue API to ensure EP0 is brought back to the SETUP state, and ensures that any deferred end transfer commands are handled. This also will end any active transfers on EP0, compared to the previous implementation which directly called giveback only.
--- drivers/usb/dwc3/gadget.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +11 -1
@@ -2103,7 +2103,17 @@ static int dwc3_gadget_ep_dequeue(structlist_for_each_entry (r, &dep->pending_list, list) {if (r == req) { -dwc3_gadget_giveback (dep, req, -ECONNRESET ); +/* +* Explicitly check for EP0/1 as dequeue for those +* EPs need to be handled differently. Control EP +* only deals with one USB req, and giveback will +* occur during dwc3_ep0_stall_and_restart(). EP0 +* requests are never added to started_list. +*/ +if (dep->number >1 ) +dwc3_gadget_giveback (dep, req, -ECONNRESET ); +else +dwc3_ep0_reset_state (dwc); goto out; } }
Greg Kroah-Hartman
maintainerPATCH 398/641 usb: dwc3: gadget: Queue PM runtime idle on disconnect event
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
commit 3c7af52c7616c3aa6dacd2336ec748d4a65df8f4 upstream.
There is a scenario where DWC3 runtime suspend is blocked due to the dwc->connected flag still being true while PM usage_count is zero after DWC3 giveback is completed and the USB gadget session is being terminated. This leads to a case where nothing schedules a PM runtime idle for the device.
The exact condition is seen with the following sequence:
1. USB bus reset is issued by the host
2. Shortly after, or concurrently, a USB PD DR SWAP request is received
(sink->source)
3. USB bus reset event handler runs and issues
dwc3_stop_active_transfers(), and pending transfer are stopped
4. DWC3 usage_count decremented to 0, and runtime idle occurs while
dwc->connected == true, returns -EBUSY 5. DWC3 disconnect event seen, dwc->connected set to false due to DR swap handling
6. No runtime idle after this point
Address this by issuing an asynchronous PM runtime idle call after the disconnect event is completed, as it modifies the dwc->connected flag, which is what blocks the initial runtime idle.
--- drivers/usb/dwc3/gadget.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/dwc3/gadget.c +7 -0
@@ -3983,6 +3983,13 @@ static void dwc3_gadget_disconnect_interusb_gadget_set_state (dwc->gadget,USB_STATE_NOTATTACHED );dwc3_ep0_reset_state (dwc); + +/* +* Request PM idle to address condition where usage count is +* already decremented to zero, but waiting for the disconnect +* interrupt to set dwc->connected to FALSE. +*/ +pm_request_idle (dwc->dev); }static void dwc3_gadget_reset_interrupt (struct dwc3 *dwc)
Greg Kroah-Hartman
maintainerPATCH 399/641 Revert "usb: dwc3: Soft reset phy on probe for host"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
commit 7059fbebcb00554c3f31e5b5d93ef6d2d96dc7b4 upstream.
This reverts commit 8bea147dfdf823eaa8d3baeccc7aeb041b41944b.
The phy soft reset GUSB2PHYCFG.PHYSOFTRST only applies to UTMI phy, not ULPI. This fix is incomplete.
--- drivers/usb/dwc3/core.c | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-)
drivers/usb/dwc3/core.c +1 -38
@@ -279,46 +279,9 @@ int dwc3_core_soft_reset(struct dwc3 *dw* XHCI driver will reset the host block. If dwc3 was configured for * host-only mode or current role is host, then we can return early. */ -if (dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST ) +if (dwc->dr_mode ==USB_DR_MODE_HOST || dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST )return 0 ; -/* -* If the dr_mode is host and the dwc->current_dr_role is not the -* corresponding DWC3_GCTL_PRTCAP_HOST, then the dwc3_core_init_mode -* isn't executed yet. Ensure the phy is ready before the controller -* updates the GCTL.PRTCAPDIR or other settings by soft-resetting -* the phy. -* -* Note: GUSB3PIPECTL[n] and GUSB2PHYCFG[n] are port settings where n -* is port index. If this is a multiport host, then we need to reset -* all active ports. -*/ -if (dwc->dr_mode ==USB_DR_MODE_HOST ) { -u32 usb3_port; -u32 usb2_port; - - usb3_port =dwc3_readl (dwc->regs,DWC3_GUSB3PIPECTL (0 )); - usb3_port |=DWC3_GUSB3PIPECTL_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB3PIPECTL (0 ), usb3_port); - - usb2_port =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 )); - usb2_port |=DWC3_GUSB2PHYCFG_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), usb2_port); - -/* Small delay for phy reset assertion */ -usleep_range (1000 ,2000 ); - - usb3_port &= ~DWC3_GUSB3PIPECTL_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB3PIPECTL (0 ), usb3_port); - - usb2_port &= ~DWC3_GUSB2PHYCFG_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), usb2_port); - -/* Wait for clock synchronization */ -msleep (50 ); -return 0 ; - } - reg =dwc3_readl (dwc->regs,DWC3_DCTL ); reg |=DWC3_DCTL_CSFTRST ; reg &= ~DWC3_DCTL_RUN_STOP ;
Greg Kroah-Hartman
maintainerPATCH 400/641 Revert "usb: dwc3: dont reset device side if dwc3 was configured as host-only"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
commit afe28cd686aeb77e8d9140d50fb1cf06a7ecb731 upstream.
This reverts commit e835c0a4e23c38531dcee5ef77e8d1cf462658c7.
Don't omit soft-reset. During initialization, the driver may need to perform a soft reset to ensure the phy is ready when the controller updates the GCTL.PRTCAPDIR or other settings by issuing phy soft-reset. Many platforms often have access to DCTL register for soft-reset despite being host-only. If there are actual reported issues from the platforms that don't expose DCTL registers, then we will need to revisit (perhaps to teach dwc3 to perform xhci's soft-reset USBCMD.HCRST).
--- drivers/usb/dwc3/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.c +2 -2
@@ -277,9 +277,9 @@ int dwc3_core_soft_reset(struct dwc3 *dw/* * We're resetting only the device side because, if we're in host mode, * XHCI driver will reset the host block. If dwc3 was configured for -* host-only mode or current role is host, then we can return early. +* host-only mode, then we can return early. */ -if (dwc->dr_mode ==USB_DR_MODE_HOST || dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST ) +if (dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST )return 0 ; reg =dwc3_readl (dwc->regs,DWC3_DCTL );
Greg Kroah-Hartman
maintainerPATCH 401/641 usb: chipidea: wait controller resume finished for wakeup irq
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit 128d849074d05545becf86e713715ce7676fc074 upstream.
After the chipidea driver introduce extcon for id and vbus, it's able to wakeup from another irq source, in case the system with extcon ID cable, wakeup from usb ID cable and device removal, the usb device disconnect irq may come firstly before the extcon notifier while system resume, so we will get 2 "wakeup" irq, one for usb device disconnect; and one for extcon ID cable change(real wakeup event), current driver treat them as 2 successive wakeup irq so can't handle it correctly, then finally the usb irq can't be enabled. This patch adds a check to bypass further usb events before controller resume finished to fix it.
--- drivers/usb/chipidea/core.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/chipidea/core.c +7 -0
@@ -523,6 +523,13 @@ static irqreturn_t ci_irq_handler(int iru32 otgsc =0 ;if (ci->in_lpm) { +/* +* If we already have a wakeup irq pending there, +* let's just return to wait resume finished firstly. +*/ +if (ci->wakeup_int) +return IRQ_HANDLED ; +disable_irq_nosync (irq); ci->wakeup_int = true;pm_runtime_get (ci->dev);
Greg Kroah-Hartman
maintainerPATCH 402/641 usb: cdns3: fix uvc failure work since sg support enabled
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
commit 1b8be5ecff26201bafb0a554c74e91571299fb94 upstream.
When IP version >= DEV_VER_V2, gadget:sg_supported is true. So uvc gadget function driver will use sg to equeue data, first is 8bytes header, the second is 1016bytes data.
cdns3_prepare_trb: ep2in: trb 0000000000ac755f, dma buf: 0xbf455000, size: 8, burst: 128 ctrl: 0x00000415 (C=1, T=0, ISP, CHAIN, Normal)
cdns3_prepare_trb: ep2in: trb 00000000a574e693, dma buf: 0xc0200fe0, size: 1016, burst: 128 ctrl: 0x00000405 (C=1, T=0, ISP, Normal)But cdns3_ep_run_transfer() can't correctly handle this case, which only support one TRB for ISO transfer.
The controller requires duplicate the TD for each SOF if priv_ep->interval is not 1. DMA will read data from DDR to internal FIFO when get SOF. Send data to bus when receive IN token. DMA always refill FIFO when get SOF regardless host send IN token or not. If host send IN token later, some frames data will be lost.
Fixed it by below major steps:
1. Calculate numembers of TRB base on sg_nums and priv_ep->interval.
2. Remove CHAIN flags for each end TRB of TD when duplicate TD.
3. The controller requires LINK TRB must be first TRB of TD. When check there are not enough TRBs lefts, just fill LINK TRB for left TRBs.
.... CHAIN_TRB DATA_TRB, CHAIN_TRB DATA_TRB, LINK_TRB ... LINK_TRB
^End of TRB List
--- drivers/usb/cdns3/cdns3-gadget.c | 51 ++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 11 deletions(-)
drivers/usb/cdns3/cdns3-gadget.c +40 -11
@@ -1119,6 +1119,7 @@ static int cdns3_ep_run_transfer(structdma_addr_t trb_dma;u32 togle_pcs =1 ;int sg_iter =0 ; +int num_trb_req;int num_trb;int address;u32 control;
@@ -1127,15 +1128,13 @@ static int cdns3_ep_run_transfer(structstruct scatterlist *s =NULL ;bool sg_supported = !!(request->num_mapped_sgs); + num_trb_req = sg_supported ? request->num_mapped_sgs :1 ; + +/* ISO transfer require each SOF have a TD, each TD include some TRBs */ if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC ) - num_trb = priv_ep->interval; + num_trb = priv_ep->interval * num_trb_req;else - num_trb = sg_supported ? request->num_mapped_sgs :1 ; - -if (num_trb > priv_ep->free_trbs) { - priv_ep->flags |=EP_RING_FULL ; -return -ENOBUFS ; - } + num_trb = num_trb_req; priv_req =to_cdns3_request (request); address = priv_ep->endpoint.desc->bEndpointAddress;
@@ -1184,14 +1183,31 @@ static int cdns3_ep_run_transfer(struct link_trb->control =cpu_to_le32 (((priv_ep->pcs) ?TRB_CYCLE :0 ) |TRB_TYPE (TRB_LINK ) |TRB_TOGGLE | ch_bit); + +if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC ) { +/* +* ISO require LINK TRB must be first one of TD. +* Fill LINK TRBs for left trb space to simply software process logic. +*/ +while (priv_ep->enqueue) { + *trb = *link_trb; +trace_cdns3_prepare_trb (priv_ep, trb); + +cdns3_ep_inc_enq (priv_ep); + trb = priv_ep->trb_pool + priv_ep->enqueue; + priv_req->trb = trb; + } + } + } + +if (num_trb > priv_ep->free_trbs) { + priv_ep->flags |=EP_RING_FULL ; +return -ENOBUFS ; }if (priv_dev->dev_ver <=DEV_VER_V2 ) togle_pcs =cdns3_wa1_update_guard (priv_ep, trb); -if (sg_supported) - s = request->sg; -/* set incorrect Cycle Bit for first trb*/ control = priv_ep->pcs ?0 :TRB_CYCLE ; trb->length =0 ;
@@ -1209,6 +1225,9 @@ static int cdns3_ep_run_transfer(struct do { u32 length; + if (!(sg_iter % num_trb_req) && sg_supported) + s = request->sg; + /* fill TRB */ control |= TRB_TYPE(TRB_NORMAL); if (sg_supported) {
@@ -1250,7 +1269,7 @@ static int cdns3_ep_run_transfer(structif (sg_supported) { trb->control |=cpu_to_le32 (TRB_ISP );/* Don't set chain bit for last TRB */ -if (sg_iter < num_trb -1 ) +if ((sg_iter % num_trb_req) < num_trb_req -1 ) trb->control |=cpu_to_le32 (TRB_CHAIN ); s =sg_next (s);
@@ -1508,6 +1527,12 @@ static void cdns3_transfer_completed(str/* The TRB was changed as link TRB, and the request was handled at ep_dequeue */ while (TRB_FIELD_TO_TYPE (le32_to_cpu (trb->control)) ==TRB_LINK ) { + +/* ISO ep_traddr may stop at LINK TRB */ +if (priv_ep->dequeue ==cdns3_get_dma_pos (priv_dev, priv_ep) && + priv_ep->type ==USB_ENDPOINT_XFER_ISOC ) +break ; +trace_cdns3_complete_trb (priv_ep, trb);cdns3_ep_inc_deq (priv_ep); trb = priv_ep->trb_pool + priv_ep->dequeue;
@@ -1540,6 +1565,10 @@ static void cdns3_transfer_completed(str }if (request_handled) { +/* TRBs are duplicated by priv_ep->interval time for ISO IN */ +if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC && priv_ep->dir) + request->actual /= priv_ep->interval; +cdns3_gadget_giveback (priv_ep, priv_req,0 ); request_handled = false; transfer_end = false;
Greg Kroah-Hartman
maintainerPATCH 403/641 usb: cdns3: fix iso transfer error when mult is not zero
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
commit 92f02efa1d86d7dcaef7f38a5fe3396c4e88a93c upstream.
ISO basic transfer is
ITP(SOF) Package_0 Package_1 ... Package_n
CDNS3 DMA start dma transfer from memmory to internal FIFO when get SOF, controller will transfer data to usb bus from internal FIFO when get IN token.
According USB spec defination:
Maximum number of packets = (bMaxBurst + 1) * (Mult + 1)
Internal memory should be the same as (bMaxBurst + 1) * (Mult + 1). DMA don't fetch data advance when ISO transfer, so only reserve (bMaxBurst + 1) * (Mult + 1) internal memory for ISO transfer.
Need save Mult and bMaxBurst information and set it into EP_CFG register, otherwise only 1 package is sent by controller, other package will be lost.
--- drivers/usb/cdns3/cdns3-gadget.c | 59 +++++++++++++++++++++++---------------- drivers/usb/cdns3/cdns3-gadget.h | 3 + 2 files changed, 39 insertions(+), 23 deletions(-)
drivers/usb/cdns3/cdns3-gadget.c +36 -23
@@ -2064,11 +2064,10 @@ int cdns3_ep_config(struct cdns3_endpoinbool is_iso_ep = (priv_ep->type ==USB_ENDPOINT_XFER_ISOC );struct cdns3_device *priv_dev = priv_ep->cdns3_dev;u32 bEndpointAddress = priv_ep->num | priv_ep->dir; -u32 max_packet_size =0 ; -u8 maxburst =0 ; +u32 max_packet_size = priv_ep->wMaxPacketSize; +u8 maxburst = priv_ep->bMaxBurst;u32 ep_cfg =0 ;u8 buffering; -u8 mult =0 ;int ret; buffering = priv_dev->ep_buf_size -1 ;
@@ -2090,8 +2089,7 @@ int cdns3_ep_config(struct cdns3_endpoinbreak ;default : ep_cfg =EP_CFG_EPTYPE (USB_ENDPOINT_XFER_ISOC ); - mult = priv_dev->ep_iso_burst -1 ; - buffering = mult +1 ; + buffering = (priv_ep->bMaxBurst +1 ) * (priv_ep->mult +1 ) -1 ; }switch (priv_dev->gadget.speed) {
@@ -2102,17 +2100,8 @@ int cdns3_ep_config(struct cdns3_endpoin max_packet_size = is_iso_ep ?1024 :512 ;break ;case USB_SPEED_SUPER : -/* It's limitation that driver assumes in driver. */ - mult =0 ; - max_packet_size =1024 ; -if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC ) { - maxburst = priv_dev->ep_iso_burst -1 ; - buffering = (mult +1 ) * - (maxburst +1 ); - -if (priv_ep->interval >1 ) - buffering++; - }else { +if (priv_ep->type !=USB_ENDPOINT_XFER_ISOC ) { + max_packet_size =1024 ; maxburst = priv_dev->ep_buf_size -1 ; }break ;
@@ -2141,7 +2130,6 @@ int cdns3_ep_config(struct cdns3_endpoinif (priv_dev->dev_ver <DEV_VER_V2 ) priv_ep->trb_burst_size =16 ; - mult =min_t (u8, mult,EP_CFG_MULT_MAX ); buffering =min_t (u8, buffering,EP_CFG_BUFFERING_MAX ); maxburst =min_t (u8, maxburst,EP_CFG_MAXBURST_MAX );
@@ -2175,7 +2163,7 @@ int cdns3_ep_config(struct cdns3_endpoin } ep_cfg |=EP_CFG_MAXPKTSIZE (max_packet_size) | -EP_CFG_MULT (mult) | +EP_CFG_MULT (priv_ep->mult) |/* must match EP setting */ EP_CFG_BUFFERING (buffering) |EP_CFG_MAXBURST (maxburst);
@@ -2265,6 +2253,13 @@ usb_ep *cdns3_gadget_match_ep(struct usb priv_ep->type =usb_endpoint_type (desc); priv_ep->flags |=EP_CLAIMED ; priv_ep->interval = desc->bInterval ?BIT (desc->bInterval -1 ) :0 ; + priv_ep->wMaxPacketSize =usb_endpoint_maxp (desc); + priv_ep->mult =USB_EP_MAXP_MULT (priv_ep->wMaxPacketSize); + priv_ep->wMaxPacketSize &=USB_ENDPOINT_MAXP_MASK ; +if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC && comp_desc) { + priv_ep->mult =USB_SS_MULT (comp_desc->bmAttributes) -1 ; + priv_ep->bMaxBurst = comp_desc->bMaxBurst; + }spin_unlock_irqrestore (&priv_dev->lock, flags);return &priv_ep->endpoint;
@@ -3048,22 +3043,40 @@ static int cdns3_gadget_check_config(strstruct cdns3_endpoint *priv_ep;struct usb_ep *ep;int n_in =0 ; +int iso =0 ; +int out =1 ;int total; +int n;list_for_each_entry (ep, &gadget->ep_list, ep_list) { priv_ep =ep_to_cdns3_ep (ep); -if ((priv_ep->flags &EP_CLAIMED ) && (ep->address &USB_DIR_IN )) - n_in++; +if (!(priv_ep->flags &EP_CLAIMED )) +continue ; + + n = (priv_ep->mult +1 ) * (priv_ep->bMaxBurst +1 ); +if (ep->address &USB_DIR_IN ) { +/* +* ISO transfer: DMA start move data when get ISO, only transfer +* data as min(TD size, iso). No benefit for allocate bigger +* internal memory than 'iso'. +*/ +if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC ) + iso += n; +else + n_in++; + }else { +if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC ) + out =max_t (int, out, n); + } }/* 2KB are reserved for EP0, 1KB for out*/ - total =2 + n_in +1 ; + total =2 + n_in + out + iso;if (total > priv_dev->onchip_buffers)return -ENOMEM ; - priv_dev->ep_buf_size = priv_dev->ep_iso_burst = - (priv_dev->onchip_buffers -2 ) / (n_in +1 ); + priv_dev->ep_buf_size = (priv_dev->onchip_buffers -2 - iso) / (n_in + out);return 0 ; }
drivers/usb/cdns3/cdns3-gadget.h +3 -0
@@ -1168,6 +1168,9 @@ struct cdns3_endpoint {u8 dir;u8 num;u8 type; +u8 mult; +u8 bMaxBurst; +u16 wMaxPacketSize;int interval;int free_trbs;
Greg Kroah-Hartman
maintainerPATCH 404/641 usb: cdns3: Fix uvc fail when DMA cross 4k boundery since sg enabled
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
commit 40c304109e866a7dc123661a5c8ca72f6b5e14e0 upstream.
Supposed DMA cross 4k bounder problem should be fixed at DEV_VER_V2, but still met problem when do ISO transfer if sg enabled.
Data pattern likes below when sg enabled, package size is 1k and mult is 2
[UVC Header(8B) ] [data(3k - 8)] ...
The received data at offset 0xd000 will get 0xc000 data, len 0x70. Error happen position as below pattern:
0xd000: wrong 0xe000: wrong 0xf000: correct 0x10000: wrong 0x11000: wrong 0x12000: correct ...
To avoid DMA cross 4k bounder at ISO transfer, reduce burst len according to start DMA address's alignment.
--- drivers/usb/cdns3/cdns3-gadget.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
drivers/usb/cdns3/cdns3-gadget.c +31 -1
@@ -1120,6 +1120,7 @@ static int cdns3_ep_run_transfer(structu32 togle_pcs =1 ;int sg_iter =0 ;int num_trb_req; +int trb_burst;int num_trb;int address;u32 control;
@@ -1242,7 +1243,36 @@ static int cdns3_ep_run_transfer(struct total_tdl +=DIV_ROUND_UP (length, priv_ep->endpoint.maxpacket); - trb->length |=cpu_to_le32 (TRB_BURST_LEN (priv_ep->trb_burst_size) | + trb_burst = priv_ep->trb_burst_size; + +/* +* Supposed DMA cross 4k bounder problem should be fixed at DEV_VER_V2, but still +* met problem when do ISO transfer if sg enabled. +* +* Data pattern likes below when sg enabled, package size is 1k and mult is 2 +* [UVC Header(8B) ] [data(3k - 8)] ... +* +* The received data at offset 0xd000 will get 0xc000 data, len 0x70. Error happen +* as below pattern: +* 0xd000: wrong +* 0xe000: wrong +* 0xf000: correct +* 0x10000: wrong +* 0x11000: wrong +* 0x12000: correct +* ... +* +* But it is still unclear about why error have not happen below 0xd000, it should +* cross 4k bounder. But anyway, the below code can fix this problem. +* +* To avoid DMA cross 4k bounder at ISO transfer, reduce burst len according to 16. +*/ +if (priv_ep->type ==USB_ENDPOINT_XFER_ISOC && priv_dev->dev_ver <=DEV_VER_V2 ) +if (ALIGN_DOWN (trb->buffer,SZ_4K ) != +ALIGN_DOWN (trb->buffer + length,SZ_4K )) + trb_burst =16 ; + + trb->length |=cpu_to_le32 (TRB_BURST_LEN (trb_burst) |TRB_LEN (length)); pcs = priv_ep->pcs ?TRB_CYCLE :0 ;
Greg Kroah-Hartman
maintainerPATCH 405/641 Revert "usb: typec: class: fix typec_altmode_put_partner to put plugs"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heikki Krogerus <[email protected]>
commit 9c6b789e954fae73c548f39332bcc56bdf0d4373 upstream.
This reverts commit b17b7fe6dd5c6ff74b38b0758ca799cdbb79e26e.
That commit messed up the reference counting, so it needs to be rethought.
--- drivers/usb/typec/class.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/typec/class.c +2 -3
@@ -267,7 +267,7 @@ static void typec_altmode_put_partner(stif (!partner)return ; - adev = &altmode->adev; + adev = &partner->adev;if (is_typec_plug (adev->dev.parent)) {struct typec_plug *plug =to_typec_plug (adev->dev.parent);
@@ -497,8 +497,7 @@ static void typec_altmode_release(struct {struct altmode *alt =to_altmode (to_typec_altmode (dev)); -if (!is_typec_port (dev->parent)) -typec_altmode_put_partner (alt); +typec_altmode_put_partner (alt);altmode_id_remove (alt->adev.dev.parent, alt->id);kfree (alt);
Greg Kroah-Hartman
maintainerPATCH 406/641 usb: typec: class: fix typec_altmode_put_partner to put plugs
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit 5962ded777d689cd8bf04454273e32228d7fb71f upstream.
When typec_altmode_put_partner is called by a plug altmode upon release, the port altmode the plug belongs to will not remove its reference to the plug. The check to see if the altmode being released is a plug evaluates against the released altmode's partner instead of the calling altmode, so change adev in typec_altmode_put_partner to properly refer to the altmode being released.
Because typec_altmode_set_partner calls get_device() on the port altmode, add partner_adev that points to the port altmode in typec_put_partner to call put_device() on. typec_altmode_set_partner is not called for port altmodes, so add a check in typec_altmode_release to prevent typec_altmode_put_partner() calls on port altmode release.
--- drivers/usb/typec/class.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/usb/typec/class.c +6 -3
@@ -263,11 +263,13 @@ static void typec_altmode_put_partner(struct altmode *altmode) {struct altmode *partner = altmode->partner;struct typec_altmode *adev; +struct typec_altmode *partner_adev;if (!partner)return ; - adev = &partner->adev; + adev = &altmode->adev; + partner_adev = &partner->adev;if (is_typec_plug (adev->dev.parent)) {struct typec_plug *plug =to_typec_plug (adev->dev.parent);
@@ -276,7 +278,7 @@ static void typec_altmode_put_partner(struct altmode *altmode) }else { partner->partner =NULL ; } -put_device (&adev->dev); +put_device (&partner_adev->dev); }/**
@@ -497,7 +499,8 @@ static void typec_altmode_release(struct device *dev) {struct altmode *alt =to_altmode (to_typec_altmode (dev)); -typec_altmode_put_partner (alt); +if (!is_typec_port (dev->parent)) +typec_altmode_put_partner (alt);altmode_id_remove (alt->adev.dev.parent, alt->id);kfree (alt);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 407/641 usb: mon: Fix atomicity violation in mon_bin_vma_fault
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
commit 2dd23cc4d0e6aa55cf9fb3b05f2f4165b01de81c upstream.
In mon_bin_vma_fault():
offset = vmf->pgoff << PAGE_SHIFT;
if (offset >= rp->b_size)
return VM_FAULT_SIGBUS;
chunk_idx = offset / CHUNK_SIZE;
pageptr = rp->b_vec[chunk_idx].pg;The code is executed without holding any lock.
In mon_bin_vma_close():
spin_lock_irqsave(&rp->b_lock, flags);
rp->mmap_active--;
spin_unlock_irqrestore(&rp->b_lock, flags);In mon_bin_ioctl():
spin_lock_irqsave(&rp->b_lock, flags);
if (rp->mmap_active) {
...
} else {
...
kfree(rp->b_vec);
rp->b_vec = vec;
rp->b_size = size;
...
}
spin_unlock_irqrestore(&rp->b_lock, flags);Concurrent execution of mon_bin_vma_fault() with mon_bin_vma_close() and mon_bin_ioctl() could lead to atomicity violations. mon_bin_vma_fault() accesses rp->b_size and rp->b_vec without locking, risking array out-of-bounds access or use-after-free bugs due to possible modifications in mon_bin_ioctl().
This possible bug is found by an experimental static analysis tool developed by our team, BassCheck[1]. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. The above possible bug is reported when our tool analyzes the source code of Linux 6.2.
To address this issue, it is proposed to add a spin lock pair in mon_bin_vma_fault() to ensure atomicity. With this patch applied, our tool never reports the possible bug, with the kernel configuration allyesconfig for x86_64. Due to the lack of associated hardware, we cannot test the patch in runtime testing, and just verify it according to the code logic.
[1] https://sites.google.com/view/basscheck/
--- drivers/usb/mon/mon_bin.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/mon/mon_bin.c +6 -1
@@ -1250,14 +1250,19 @@ static vm_fault_t mon_bin_vma_fault(strustruct mon_reader_bin *rp = vmf->vma->vm_private_data;unsigned long offset, chunk_idx;struct page *pageptr; +unsigned long flags; +spin_lock_irqsave (&rp->b_lock, flags); offset = vmf->pgoff <<PAGE_SHIFT ; -if (offset >= rp->b_size) +if (offset >= rp->b_size) { +spin_unlock_irqrestore (&rp->b_lock, flags);return VM_FAULT_SIGBUS ; + } chunk_idx = offset /CHUNK_SIZE ; pageptr = rp->b_vec[chunk_idx].pg;get_page (pageptr); vmf->page = pageptr; +spin_unlock_irqrestore (&rp->b_lock, flags);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 408/641 dt-bindings: phy: qcom,sc8280xp-qmp-usb43dp-phy: fix path to header
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 21a1d02579ae75fd45555b84d20ba55632a14a19 upstream.
Fix the path to bindings header in description.
--- Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml +2 -2
@@ -62,12 +62,12 @@ properties: "#clock-cells": const: 1 description: - See include/dt-bindings/dt-bindings/phy/phy-qcom-qmp.h + See include/dt-bindings/phy/phy-qcom-qmp.h "#phy-cells": const: 1 description: - See include/dt-bindings/dt-bindings/phy/phy-qcom-qmp.h + See include/dt-bindings/phy/phy-qcom-qmp.h orientation-switch: description:
Greg Kroah-Hartman
maintainerPATCH 409/641 serial: Do not hold the port lock when setting rx-during-tx GPIO
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit 07c30ea5861fb26a77dade8cdc787252f6122fb1 upstream.
Both the imx and stm32 driver set the rx-during-tx GPIO in rs485_config(). Since this function is called with the port lock held, this can be a problem in case that setting the GPIO line can sleep (e.g. if a GPIO expander is used which is connected via SPI or I2C).
Avoid this issue by moving the GPIO setting outside of the port lock into the serial core and thus making it a generic feature.
Also with commit c54d48543689 ("serial: stm32: Add support for rs485 RX_DURING_TX output GPIO") the SER_RS485_RX_DURING_TX flag is only set if a rx-during-tx GPIO is _not_ available, which is wrong. Fix this, too.
Furthermore reset old GPIO settings in case that changing the RS485 configuration failed.
--- drivers/tty/serial/imx.c | 4 ---- drivers/tty/serial/serial_core.c | 26 ++++++++++++++++++++++++-- drivers/tty/serial/stm32-usart.c | 8 ++------ 3 files changed, 26 insertions(+), 12 deletions(-)
drivers/tty/serial/imx.c +0 -4
@@ -1943,10 +1943,6 @@ static int imx_uart_rs485_config(struct rs485conf->flags & SER_RS485_RX_DURING_TX)imx_uart_start_rx (port); -if (port->rs485_rx_during_tx_gpio) -gpiod_set_value_cansleep (port->rs485_rx_during_tx_gpio, - !!(rs485conf->flags &SER_RS485_RX_DURING_TX )); -return 0 ; }
drivers/tty/serial/serial_core.c +24 -2
@@ -1402,6 +1402,16 @@ static void uart_set_rs485_termination(s !!(rs485->flags & SER_RS485_TERMINATE_BUS)); } +static void uart_set_rs485_rx_during_tx (struct uart_port *port, +const struct serial_rs485 *rs485) +{ +if (!(rs485->flags &SER_RS485_ENABLED )) +return ; + +gpiod_set_value_cansleep (port->rs485_rx_during_tx_gpio, + !!(rs485->flags &SER_RS485_RX_DURING_TX )); +} +static int uart_rs485_config (struct uart_port *port) {struct serial_rs485 *rs485 = &port->rs485;
@@ -1413,12 +1423,17 @@ static int uart_rs485_config(struct uartuart_sanitize_serial_rs485 (port, rs485);uart_set_rs485_termination (port, rs485); +uart_set_rs485_rx_during_tx (port, rs485);uart_port_lock_irqsave (port, &flags); ret = port->rs485_config (port,NULL , rs485);uart_port_unlock_irqrestore (port, flags); -if (ret) +if (ret) {memset (rs485,0 ,sizeof (*rs485)); +/* unset GPIOs */ +gpiod_set_value_cansleep (port->rs485_term_gpio,0 ); +gpiod_set_value_cansleep (port->rs485_rx_during_tx_gpio,0 ); + }return ret; }
@@ -1457,6 +1472,7 @@ static int uart_set_rs485_config(structreturn ret;uart_sanitize_serial_rs485 (port, &rs485);uart_set_rs485_termination (port, &rs485); +uart_set_rs485_rx_during_tx (port, &rs485);uart_port_lock_irqsave (port, &flags); ret = port->rs485_config (port, &tty->termios, &rs485);
@@ -1468,8 +1484,14 @@ static int uart_set_rs485_config(struct port->ops->set_mctrl (port, port->mctrl); }uart_port_unlock_irqrestore (port, flags); -if (ret) +if (ret) { +/* restore old GPIO settings */ +gpiod_set_value_cansleep (port->rs485_term_gpio, + !!(port->rs485.flags &SER_RS485_TERMINATE_BUS )); +gpiod_set_value_cansleep (port->rs485_rx_during_tx_gpio, + !!(port->rs485.flags &SER_RS485_RX_DURING_TX ));return ret; + }if (copy_to_user (rs485_user, &port->rs485,sizeof (port->rs485)))return -EFAULT ;
drivers/tty/serial/stm32-usart.c +2 -6
@@ -226,12 +226,6 @@ static int stm32_usart_config_rs485(strustm32_usart_clr_bits (port, ofs->cr1,BIT (cfg->uart_enable_bit)); -if (port->rs485_rx_during_tx_gpio) -gpiod_set_value_cansleep (port->rs485_rx_during_tx_gpio, - !!(rs485conf->flags &SER_RS485_RX_DURING_TX )); -else - rs485conf->flags |=SER_RS485_RX_DURING_TX ; -if (rs485conf->flags &SER_RS485_ENABLED ) { cr1 =readl_relaxed (port->membase + ofs->cr1); cr3 =readl_relaxed (port->membase + ofs->cr3);
@@ -256,6 +250,8 @@ static int stm32_usart_config_rs485(struwritel_relaxed (cr3, port->membase + ofs->cr3);writel_relaxed (cr1, port->membase + ofs->cr1); + + rs485conf->flags |=SER_RS485_RX_DURING_TX ; }else {stm32_usart_clr_bits (port, ofs->cr3,USART_CR3_DEM |USART_CR3_DEP );
Greg Kroah-Hartman
maintainerPATCH 410/641 serial: core: fix sanitizing check for RTS settings
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit 4afeced55baa391490b61ed9164867e2927353ed upstream.
Among other things uart_sanitize_serial_rs485() tests the sanity of the RTS settings in a RS485 configuration that has been passed by userspace. If RTS-on-send and RTS-after-send are both set or unset the configuration is adjusted and RTS-after-send is disabled and RTS-on-send enabled.
This however makes only sense if both RTS modes are actually supported by the driver.
With commit be2e2cb1d281 ("serial: Sanitize rs485_struct") the code does take the driver support into account but only checks if one of both RTS modes are supported. This may lead to the errorneous result of RTS-on-send being set even if only RTS-after-send is supported.
Fix this by changing the implemented logic: First clear all unsupported flags in the RS485 configuration, then adjust an invalid RTS setting by taking into account which RTS mode is supported.
--- drivers/tty/serial/serial_core.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-)
drivers/tty/serial/serial_core.c +18 -10
@@ -1371,19 +1371,27 @@ static void uart_sanitize_serial_rs485(sreturn ; } + rs485->flags &= supported_flags; +/* Pick sane settings if the user hasn't */ -if ((supported_flags & (SER_RS485_RTS_ON_SEND |SER_RS485_RTS_AFTER_SEND )) && - !(rs485->flags &SER_RS485_RTS_ON_SEND ) == +if (!(rs485->flags &SER_RS485_RTS_ON_SEND ) == !(rs485->flags &SER_RS485_RTS_AFTER_SEND )) { -dev_warn_ratelimited (port->dev, -"%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n" , - port->name, port->line); - rs485->flags |=SER_RS485_RTS_ON_SEND ; - rs485->flags &= ~SER_RS485_RTS_AFTER_SEND ; - supported_flags |=SER_RS485_RTS_ON_SEND |SER_RS485_RTS_AFTER_SEND ; - } +if (supported_flags &SER_RS485_RTS_ON_SEND ) { + rs485->flags |=SER_RS485_RTS_ON_SEND ; + rs485->flags &= ~SER_RS485_RTS_AFTER_SEND ; - rs485->flags &= supported_flags; +dev_warn_ratelimited (port->dev, +"%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n" , + port->name, port->line); + }else { + rs485->flags |=SER_RS485_RTS_AFTER_SEND ; + rs485->flags &= ~SER_RS485_RTS_ON_SEND ; + +dev_warn_ratelimited (port->dev, +"%s (%d): invalid RTS setting, using RTS_AFTER_SEND instead\n" , + port->name, port->line); + } + }uart_sanitize_serial_rs485_delays (port, rs485);
Greg Kroah-Hartman
maintainerPATCH 411/641 serial: core: make sure RS485 cannot be enabled when it is not supported
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit c73986913fa47e71e0b1ad7f039f6444915e8810 upstream.
Some uart drivers specify a rs485_config() function and then decide later to disable RS485 support for some reason (e.g. imx and ar933).
In these cases userspace may be able to activate RS485 via TIOCSRS485 nevertheless, since in uart_set_rs485_config() an existing rs485_config() function indicates that RS485 is supported.
Make sure that this is not longer possible by checking the uarts rs485_supported.flags instead and bailing out if SER_RS485_ENABLED is not set.
Furthermore instead of returning an empty structure return -ENOTTY if the RS485 configuration is requested via TIOCGRS485 but RS485 is not supported. This has a small impact on userspace visibility but it is consistent with the -ENOTTY error for TIOCGRS485.
--- drivers/tty/serial/serial_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/serial_core.c +1 -1
@@ -1469,7 +1469,7 @@ static int uart_set_rs485_config(structint ret;unsigned long flags; -if (!port->rs485_config) +if (!(port->rs485_supported.flags &SER_RS485_ENABLED ))return -ENOTTY ;if (copy_from_user (&rs485, rs485_user,sizeof (*rs485_user)))
Greg Kroah-Hartman
maintainerPATCH 412/641 serial: core: set missing supported flag for RX during TX GPIO
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit 1a33e33ca0e80d485458410f149265cdc0178cfa upstream.
If the RS485 feature RX-during-TX is supported by means of a GPIO set the according supported flag. Otherwise setting this feature from userspace may not be possible, since in uart_sanitize_serial_rs485() the passed RS485 configuration is matched against the supported features and unsupported settings are thereby removed and thus take no effect.
--- drivers/tty/serial/serial_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/serial_core.c +2 -0
@@ -3650,6 +3650,8 @@ int uart_get_rs485_mode(struct uart_portif (IS_ERR (desc))return dev_err_probe (dev,PTR_ERR (desc),"Cannot get rs485-rx-during-tx-gpios\n" ); port->rs485_rx_during_tx_gpio = desc; +if (port->rs485_rx_during_tx_gpio) + port->rs485_supported.flags |=SER_RS485_RX_DURING_TX ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 413/641 serial: 8250_bcm2835aux: Restore clock error handling
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Wahren <[email protected]>
commit 83e571f054cd742eb9a46d46ef05193904adf53f upstream.
The commit fcc446c8aa63 ("serial: 8250_bcm2835aux: Add ACPI support") dropped the error handling for clock acquiring. But even an optional clock needs this.
--- drivers/tty/serial/8250/8250_bcm2835aux.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_bcm2835aux.c +2 -0
@@ -119,6 +119,8 @@ static int bcm2835aux_serial_probe(struc/* get the clock - this also enables the HW */ data->clk =devm_clk_get_optional (&pdev->dev,NULL ); +if (IS_ERR (data->clk)) +return dev_err_probe (&pdev->dev,PTR_ERR (data->clk),"could not get clk\n" );/* get the interrupt */ ret =platform_get_irq (pdev,0 );
Greg Kroah-Hartman
maintainerPATCH 414/641 serial: core, imx: do not set RS485 enabled if it is not supported
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit 74eab89b26ac433ad857292f4707b43c1a8f0209 upstream.
If the imx driver cannot support RS485 it nullifies the ports rs485_supported structure. But it still calls uart_get_rs485_mode() which may set the RS485_ENABLED flag nevertheless.
This may lead to an attempt to configure RS485 even if it is not supported when the flag is evaluated in uart_configure_port() at port startup.
Avoid this by bailing out of uart_get_rs485_mode() if the RS485_ENABLED flag is not supported by the caller.
With this fix a check for RTS availability is now obsolete in the imx driver, since it can not evaluate to true any more. So remove this check.
Furthermore the explicit nullifcation of rs485_supported is not needed, since the memory has already been set to zeros at allocation. So remove this, too.
--- drivers/tty/serial/imx.c | 7 ------- drivers/tty/serial/serial_core.c | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-)
drivers/tty/serial/imx.c +0 -7
@@ -2206,7 +2206,6 @@ static enum hrtimer_restart imx_trigger_return HRTIMER_NORESTART ; } -static const struct serial_rs485 imx_no_rs485 = {};/* No RS485 if no RTS */ static const struct serial_rs485 imx_rs485_supported = { .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND |SER_RS485_RTS_AFTER_SEND |SER_RS485_RX_DURING_TX ,
@@ -2290,8 +2289,6 @@ static int imx_uart_probe(struct platfor/* RTS is required to control the RS485 transmitter */ if (sport->have_rtscts || sport->have_rtsgpio) sport->port.rs485_supported = imx_rs485_supported; -else - sport->port.rs485_supported = imx_no_rs485; sport->port.flags =UPF_BOOT_AUTOCONF ;timer_setup (&sport->timer, imx_uart_timeout,0 );
@@ -2328,10 +2325,6 @@ static int imx_uart_probe(struct platforreturn ret; } -if (sport->port.rs485.flags &SER_RS485_ENABLED && - (!sport->have_rtscts && !sport->have_rtsgpio)) -dev_err (&pdev->dev,"no RTS control, disabling rs485\n" ); -/* * If using the i.MX UART RTS/CTS control then the RTS (CTS_B) * signal cannot be set low during transmission in case the
drivers/tty/serial/serial_core.c +3 -0
@@ -3600,6 +3600,9 @@ int uart_get_rs485_mode(struct uart_portu32 rs485_delay[2 ];int ret; +if (!(port->rs485_supported.flags &SER_RS485_ENABLED )) +return 0 ; + ret =device_property_read_u32_array (dev,"rs485-rts-delay" , rs485_delay,2 );if (!ret) {
Greg Kroah-Hartman
maintainerPATCH 415/641 serial: imx: Ensure that imx_uart_rs485_config() is called with enabled clock
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Niedermaier <[email protected]>
commit 7c45eaa813476bd195ac1227a64b52f9cf2e2030 upstream.
There are register accesses in the function imx_uart_rs485_config(). The clock must be enabled for these accesses. This was ensured by calling it via the function uart_rs485_config() in the probe() function within the range where the clock is enabled. With the commit 7c7f9bc986e6 ("serial:
Deassert Transmit Enable on probe in driver-specific way") it was removed from the probe() function and is now only called through the function uart_add_one_port() which is located at the end of the probe() function. But the clock is already switched off in this area. To ensure that the clock is enabled during register access, move the disabling of the clock to the very end of the probe() function. To avoid leaking enabled clocks on error also add an error path for exiting with disabling the clock.
--- drivers/tty/serial/imx.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/tty/serial/imx.c +12 -11
@@ -2320,10 +2320,8 @@ static int imx_uart_probe(struct platfor } ret =uart_get_rs485_mode (&sport->port); -if (ret) { -clk_disable_unprepare (sport->clk_ipg); -return ret; - } +if (ret) + goto err_clk;/* * If using the i.MX UART RTS/CTS control then the RTS (CTS_B)
@@ -2403,8 +2401,6 @@ static int imx_uart_probe(struct platforimx_uart_writel (sport, ucr3,UCR3 ); } -clk_disable_unprepare (sport->clk_ipg); -hrtimer_init (&sport->trigger_start_tx,CLOCK_MONOTONIC ,HRTIMER_MODE_REL );hrtimer_init (&sport->trigger_stop_tx,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); sport->trigger_start_tx.function = imx_trigger_start_tx;
@@ -2420,7 +2416,7 @@ static int imx_uart_probe(struct platforif (ret) {dev_err (&pdev->dev,"failed to request rx irq: %d\n" , ret); -return ret; + goto err_clk; } ret = devm_request_irq(&pdev->dev, txirq, imx_uart_txint, 0,
@@ -2428,7 +2424,7 @@ static int imx_uart_probe(struct platforif (ret) {dev_err (&pdev->dev,"failed to request tx irq: %d\n" , ret); -return ret; + goto err_clk; } ret = devm_request_irq(&pdev->dev, rtsirq, imx_uart_rtsint, 0,
@@ -2436,14 +2432,14 @@ static int imx_uart_probe(struct platforif (ret) {dev_err (&pdev->dev,"failed to request rts irq: %d\n" , ret); -return ret; + goto err_clk; } }else { ret =devm_request_irq (&pdev->dev, rxirq, imx_uart_int,0 ,dev_name (&pdev->dev), sport);if (ret) {dev_err (&pdev->dev,"failed to request irq: %d\n" , ret); -return ret; + goto err_clk; } }
@@ -2451,7 +2447,12 @@ static int imx_uart_probe(struct platforplatform_set_drvdata (pdev, sport); -return uart_add_one_port (&imx_uart_uart_driver, &sport->port); + ret =uart_add_one_port (&imx_uart_uart_driver, &sport->port); + +err_clk: +clk_disable_unprepare (sport->clk_ipg); + +return ret; }static int imx_uart_remove (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 416/641 serial: 8250_exar: Set missing rs485_supported flag
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit 0c2a5f471ce58bca8f8ab5fcb911aff91eaaa5eb upstream.
The UART supports an auto-RTS mode in which the RTS pin is automatically activated during transmission. So mark this mode as being supported even if RTS is not controlled by the driver but the UART.
Also the serial core expects now at least one of both modes rts-on-send or rts-after-send to be supported. This is since during sanitization unsupported flags are deleted from a RS485 configuration set by userspace. However if the configuration ends up with both flags unset, the core prints a warning since it considers such a configuration invalid (see uart_sanitize_serial_rs485()).
--- drivers/tty/serial/8250/8250_exar.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_exar.c +3 -2
@@ -480,7 +480,7 @@ static int sealevel_rs485_config(struct }static const struct serial_rs485 generic_rs485_supported = { - .flags =SER_RS485_ENABLED , + .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND , };static const struct exar8250_platform exar8250_default_platform = {
@@ -524,7 +524,8 @@ static int iot2040_rs485_config(struct u }static const struct serial_rs485 iot2040_rs485_supported = { - .flags =SER_RS485_ENABLED |SER_RS485_RX_DURING_TX |SER_RS485_TERMINATE_BUS , + .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND | +SER_RS485_RX_DURING_TX |SER_RS485_TERMINATE_BUS , };static const struct property_entry iot2040_gpio_properties[] = {
Greg Kroah-Hartman
maintainerPATCH 417/641 serial: omap: do not override settings for RS485 support
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit 51f93776b84dee23e44a7be880736669a01cec2b upstream.
The drivers RS485 support is deactivated if there is no RTS GPIO available. This is done by nullifying the ports rs485_supported struct. After that however the settings in serial_omap_rs485_supported are assigned to the same structure unconditionally, which results in an unintended reactivation of RS485 support.
Fix this by moving the assignment to the beginning of serial_omap_probe_rs485() and thus before uart_get_rs485_mode() gets called.
Also replace the assignment of rs485_config() to have the complete RS485 setup in one function.
--- drivers/tty/serial/omap-serial.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/tty/serial/omap-serial.c +14 -13
@@ -1483,6 +1483,13 @@ static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)return omap_up_info; } +static const struct serial_rs485 serial_omap_rs485_supported = { + .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND |SER_RS485_RTS_AFTER_SEND | +SER_RS485_RX_DURING_TX , + .delay_rts_before_send =1 , + .delay_rts_after_send =1 , +}; +static int serial_omap_probe_rs485 (struct uart_omap_port *up,struct device *dev) {
@@ -1497,6 +1504,9 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,if (!np)return 0 ; + up->port.rs485_config = serial_omap_config_rs485; + up->port.rs485_supported = serial_omap_rs485_supported; + ret =uart_get_rs485_mode (&up->port);if (ret)return ret;
@@ -1531,13 +1541,6 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,return 0 ; } -static const struct serial_rs485 serial_omap_rs485_supported = { - .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND |SER_RS485_RTS_AFTER_SEND | -SER_RS485_RX_DURING_TX , - .delay_rts_before_send =1 , - .delay_rts_after_send =1 , -}; -static int serial_omap_probe (struct platform_device *pdev) {struct omap_uart_port_info *omap_up_info =dev_get_platdata (&pdev->dev);
@@ -1604,17 +1607,11 @@ static int serial_omap_probe(struct platform_device *pdev)dev_info (up->port.dev,"no wakeirq for uart%d\n" , up->port.line); - ret =serial_omap_probe_rs485 (up, &pdev->dev); -if (ret <0 ) - goto err_rs485; -sprintf (up->name,"OMAP UART%d" , up->port.line); up->port.mapbase = mem->start; up->port.membase = base; up->port.flags = omap_up_info->flags; up->port.uartclk = omap_up_info->uartclk; - up->port.rs485_config = serial_omap_config_rs485; - up->port.rs485_supported = serial_omap_rs485_supported;if (!up->port.uartclk) { up->port.uartclk =DEFAULT_CLK_SPEED ; dev_warn(&pdev->dev,
@@ -1622,6 +1619,10 @@ static int serial_omap_probe(struct platform_device *pdev) DEFAULT_CLK_SPEED); } + ret =serial_omap_probe_rs485 (up, &pdev->dev); +if (ret <0 ) + goto err_rs485; + up->latency =PM_QOS_CPU_LATENCY_DEFAULT_VALUE ; up->calc_latency =PM_QOS_CPU_LATENCY_DEFAULT_VALUE ;cpu_latency_qos_add_request (&up->pm_qos_request, up->latency);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 418/641 ALSA: oxygen: Fix right channel of capture volume mixer
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit a03cfad512ac24a35184d7d87ec0d5489e1cb763 upstream.
There was a typo in oxygen mixer code that didn't update the right channel value properly for the capture volume. Let's fix it.
This trivial fix was originally reported on Bugzilla.
--- sound/pci/oxygen/oxygen_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/oxygen/oxygen_mixer.c +1 -1
@@ -718,7 +718,7 @@ static int ac97_fp_rec_volume_put(struct oldreg =oxygen_read_ac97 (chip,1 ,AC97_REC_GAIN ); newreg = oldreg & ~0x0707 ; newreg = newreg | (value->value.integer.value[0 ] &7 ); - newreg = newreg | ((value->value.integer.value[0 ] &7 ) <<8 ); + newreg = newreg | ((value->value.integer.value[1 ] &7 ) <<8 ); change = newreg != oldreg;if (change)oxygen_write_ac97 (chip,1 ,AC97_REC_GAIN , newreg);
Greg Kroah-Hartman
maintainerPATCH 419/641 ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq2xxx
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Çağhan Demir <[email protected]>
commit bc7863d18677df66b2c7a0e172c91296ff380f11 upstream.
This HP Laptop uses ALC236 codec with COEF 0x07 idx 1 controlling the mute LED. This patch enables the already existing quirk for this device.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9848,6 +9848,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x87f5 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x87f6 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ),SND_PCI_QUIRK (0x103c ,0x87f7 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ), +SND_PCI_QUIRK (0x103c ,0x87fe ,"HP Laptop 15s-fq2xxx" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x8805 ,"HP ProBook 650 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x880d ,"HP EliteBook 830 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
Greg Kroah-Hartman
maintainerPATCH 420/641 ALSA: hda/realtek: Enable mute/micmute LEDs and limit mic boost on HP ZBook
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yo-Jung Lin <[email protected]>
commit b018cee7369896c7a15bfdbe88f168f3dbd8ba27 upstream.
On some HP ZBooks, the audio LEDs can be enabled by ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF. So use it accordingly.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9943,6 +9943,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8c71 ,"HP EliteBook 845 G11" ,ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c72 ,"HP EliteBook 865 G11" ,ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c96 ,"HP" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ), +SND_PCI_QUIRK (0x103c ,0x8c97 ,"HP ZBook" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8ca4 ,"HP ZBook Fury" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8ca7 ,"HP ZBook Fury" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8cf5, "HP ZBook Studio 16", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 421/641 ALSA: hda/realtek: Enable headset mic on Lenovo M70 Gen5
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bin Li <[email protected]>
commit fb3c007fde80d9d3b4207943e74c150c9116cead upstream.
Lenovo M70 Gen5 is equipped with ALC623, and it needs ALC283_FIXUP_HEADSET_MIC quirk to make its headset mic work.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -10220,6 +10220,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x3176 ,"ThinkCentre Station" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x17aa ,0x3178 ,"ThinkCentre Station" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x17aa ,0x31af ,"ThinkCentre Station" ,ALC623_FIXUP_LENOVO_THINKSTATION_P340 ), +SND_PCI_QUIRK (0x17aa ,0x334b ,"Lenovo ThinkCentre M70 Gen5" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x17aa ,0x3801 ,"Lenovo Yoga9 14IAP7" ,ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN ),SND_PCI_QUIRK (0x17aa ,0x3802 ,"Lenovo Yoga DuetITL 2021" ,ALC287_FIXUP_YOGA7_14ITL_SPEAKERS ), SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS),
Greg Kroah-Hartman
maintainerPATCH 422/641 ksmbd: validate mech token in session setup
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
commit 92e470163d96df8db6c4fa0f484e4a229edb903d upstream.
If client send invalid mech token in session setup request, ksmbd validate and make the error if it is invalid.
--- fs/smb/server/asn1.c | 5 +++++ fs/smb/server/connection.h | 1 + fs/smb/server/smb2pdu.c | 22 +++++++++++++++++----- 3 files changed, 23 insertions(+), 5 deletions(-)
fs/smb/server/asn1.c +5 -0
@@ -214,10 +214,15 @@ static int ksmbd_neg_token_alloc(void *c {struct ksmbd_conn *conn = context; +if (!vlen) +return -EINVAL ; + conn->mechToken =kmemdup_nul (value, vlen,GFP_KERNEL );if (!conn->mechToken)return -ENOMEM ; + conn->mechTokenLen = (unsigned int )vlen; +return 0 ; }
fs/smb/server/connection.h +1 -0
@@ -88,6 +88,7 @@ struct ksmbd_conn {__u16 dialect;char *mechToken; +unsigned int mechTokenLen;struct ksmbd_conn_ops *conn_ops;
fs/smb/server/smb2pdu.c +17 -5
@@ -1414,7 +1414,10 @@ static struct ksmbd_user *session_user(schar *name;unsigned int name_off, name_len, secbuf_len; - secbuf_len =le16_to_cpu (req->SecurityBufferLength); +if (conn->use_spnego && conn->mechToken) + secbuf_len = conn->mechTokenLen; +else + secbuf_len =le16_to_cpu (req->SecurityBufferLength);if (secbuf_len <sizeof (struct authenticate_message )) {ksmbd_debug (SMB ,"blob len %d too small\n" , secbuf_len);return NULL ;
@@ -1505,7 +1508,10 @@ static int ntlm_authenticate(struct ksmbstruct authenticate_message *authblob; authblob =user_authblob (conn, req); - sz =le16_to_cpu (req->SecurityBufferLength); +if (conn->use_spnego && conn->mechToken) + sz = conn->mechTokenLen; +else + sz =le16_to_cpu (req->SecurityBufferLength); rc =ksmbd_decode_ntlmssp_auth_blob (authblob, sz, conn, sess);if (rc) {set_user_flag (sess->user,KSMBD_USER_FLAG_BAD_PASSWORD );
@@ -1778,8 +1784,7 @@ int smb2_sess_setup(struct ksmbd_work *w negblob_off =le16_to_cpu (req->SecurityBufferOffset); negblob_len =le16_to_cpu (req->SecurityBufferLength); -if (negblob_off < offsetof(struct smb2_sess_setup_req , Buffer) || - negblob_len < offsetof(struct negotiate_message , NegotiateFlags)) { +if (negblob_off < offsetof(struct smb2_sess_setup_req , Buffer)) { rc = -EINVAL ; goto out_err; }
@@ -1788,8 +1793,15 @@ int smb2_sess_setup(struct ksmbd_work *w negblob_off);if (decode_negotiation_token (conn, negblob, negblob_len) ==0 ) { -if (conn->mechToken) +if (conn->mechToken) { negblob = (struct negotiate_message *)conn->mechToken; + negblob_len = conn->mechTokenLen; + } + } + +if (negblob_len < offsetof(struct negotiate_message , NegotiateFlags)) { + rc = -EINVAL ; + goto out_err; }if (server_conf.auth_mechs & conn->auth_mechs) {
Greg Kroah-Hartman
maintainerPATCH 423/641 ksmbd: fix UAF issue in ksmbd_tcp_new_connection()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
commit 38d20c62903d669693a1869aa68c4dd5674e2544 upstream.
The race is between the handling of a new TCP connection and its disconnection. It leads to UAF on struct tcp_transport in ksmbd_tcp_new_connection() function.
--- fs/smb/server/connection.c | 6 ------ fs/smb/server/connection.h | 1 - fs/smb/server/transport_rdma.c | 11 ++++++----- fs/smb/server/transport_tcp.c | 13 +++++++------ 4 files changed, 13 insertions(+), 18 deletions(-)
fs/smb/server/connection.c +0 -6
@@ -415,13 +415,7 @@ static void stop_sessions(void) again:down_read (&conn_list_lock);list_for_each_entry (conn, &conn_list, conns_list) { -struct task_struct *task; - t = conn->transport; - task = t->handler; -if (task) -ksmbd_debug (CONN ,"Stop session handler %s/%d\n" , - task->comm,task_pid_nr (task));ksmbd_conn_set_exiting (conn);if (t->ops->shutdown) {up_read (&conn_list_lock);
fs/smb/server/connection.h +0 -1
@@ -135,7 +135,6 @@ struct ksmbd_transport_ops {struct ksmbd_transport {struct ksmbd_conn *conn;struct ksmbd_transport_ops *ops; -struct task_struct *handler; };#define KSMBD_TCP_RECV_TIMEOUT (7 * HZ)
fs/smb/server/transport_rdma.c +6 -5
@@ -2039,6 +2039,7 @@ static bool rdma_frwr_is_supported(strucstatic int smb_direct_handle_connect_request (struct rdma_cm_id *new_cm_id) {struct smb_direct_transport *t; +struct task_struct *handler;int ret;if (!rdma_frwr_is_supported (&new_cm_id->device->attrs)) {
@@ -2056,11 +2057,11 @@ static int smb_direct_handle_connect_reqif (ret) goto out_err; -KSMBD_TRANS (t)->handler =kthread_run (ksmbd_conn_handler_loop, -KSMBD_TRANS (t)->conn,"ksmbd:r%u" , - smb_direct_port); -if (IS_ERR (KSMBD_TRANS (t)->handler)) { - ret =PTR_ERR (KSMBD_TRANS (t)->handler); + handler =kthread_run (ksmbd_conn_handler_loop, +KSMBD_TRANS (t)->conn,"ksmbd:r%u" , + smb_direct_port); +if (IS_ERR (handler)) { + ret =PTR_ERR (handler);pr_err ("Can't start thread\n" ); goto out_err; }
fs/smb/server/transport_tcp.c +7 -6
@@ -185,6 +185,7 @@ static int ksmbd_tcp_new_connection(strustruct sockaddr *csin;int rc =0 ;struct tcp_transport *t; +struct task_struct *handler; t =alloc_transport (client_sk);if (!t) {
@@ -199,13 +200,13 @@ static int ksmbd_tcp_new_connection(stru goto out_error; } -KSMBD_TRANS (t)->handler =kthread_run (ksmbd_conn_handler_loop, -KSMBD_TRANS (t)->conn, -"ksmbd:%u" , -ksmbd_tcp_get_port (csin)); -if (IS_ERR (KSMBD_TRANS (t)->handler)) { + handler =kthread_run (ksmbd_conn_handler_loop, +KSMBD_TRANS (t)->conn, +"ksmbd:%u" , +ksmbd_tcp_get_port (csin)); +if (IS_ERR (handler)) {pr_err ("cannot start conn thread\n" ); - rc =PTR_ERR (KSMBD_TRANS (t)->handler); + rc =PTR_ERR (handler);free_transport (t); }return rc;
Greg Kroah-Hartman
maintainerPATCH 424/641 ksmbd: only v2 leases handle the directory
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
commit 77bebd186442a7d703b796784db7495129cc3e70 upstream.
When smb2 leases is disable, ksmbd can send oplock break notification and cause wait oplock break ack timeout. It may appear like hang when accessing a directory. This patch make only v2 leases handle the directory.
--- fs/smb/server/oplock.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/smb/server/oplock.c +6 -0
@@ -1191,6 +1191,12 @@ int smb_grant_oplock(struct ksmbd_work *bool prev_op_has_lease;__le32 prev_op_state =0 ; +/* Only v2 leases handle the directory */ +if (S_ISDIR (file_inode (fp->filp)->i_mode)) { +if (!lctx || lctx->version !=2 ) +return 0 ; + } + opinfo =alloc_opinfo (work, pid, tid);if (!opinfo)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 425/641 ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit 9c896d6bc3dfef86659a6a1fb25ccdea5dbef6a3 upstream.
The kconfig options for filesystems that support FS_ENCRYPTION are supposed to select FS_ENCRYPTION_ALGS. This is needed to ensure that required crypto algorithms get enabled as loadable modules or builtin as is appropriate for the set of enabled filesystems. Do this for CEPH_FS so that there aren't any missing algorithms if someone happens to have CEPH_FS as their only enabled filesystem that supports encryption.
--- fs/ceph/Kconfig | 1 + 1 file changed, 1 insertion(+)
fs/ceph/Kconfig +1 -0
@@ -7,6 +7,7 @@ config CEPH_FS select CRYPTO_AES select CRYPTO select NETFS_SUPPORT + select FS_ENCRYPTION_ALGS if FS_ENCRYPTION default n help Choose Y or M here to include support for mounting the
Greg Kroah-Hartman
maintainerPATCH 426/641 LoongArch: Fix and simplify fcsr initialization on execve()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xi Ruoyao <[email protected]>
commit c2396651309eba291c15e32db8fbe44c738b5921 upstream.
There has been a lingering bug in LoongArch Linux systems causing some GCC tests to intermittently fail (see Closes link). I've made a minimal reproducer:
zsh% cat measure.s
.align 4
.globl _start
_start:
movfcsr2gr $a0, $fcsr0
bstrpick.w $a0, $a0, 16, 16
beqz $a0, .ok
break 0
.ok:
li.w $a7, 93
syscall 0
zsh% cc mesaure.s -o measure -nostdlib
zsh% echo $((1.0/3))
0.33333333333333331
zsh% while ./measure; do ; doneThis while loop should not stop as POSIX is clear that execve must set fenv to the default, where FCSR should be zero. But in fact it will just stop after running for a while (normally less than 30 seconds). Note that "$((1.0/3))" is needed to reproduce this issue because it raises FE_INVALID and makes fcsr0 non-zero.
The problem is we are currently relying on SET_PERSONALITY2() to reset current->thread.fpu.fcsr. But SET_PERSONALITY2() is executed before start_thread which calls lose_fpu(0). We can see if kernel preempt is enabled, we may switch to another thread after SET_PERSONALITY2() but before lose_fpu(0). Then bad thing happens: during the thread switch the value of the fcsr0 register is stored into current->thread.fpu.fcsr, making it dirty again.
The issue can be fixed by setting current->thread.fpu.fcsr after lose_fpu(0) because lose_fpu() clears TIF_USEDFPU, then the thread switch won't touch current->thread.fpu.fcsr.
The only other architecture setting FCSR in SET_PERSONALITY2() is MIPS. I've ran a similar test on MIPS with mainline kernel and it turns out MIPS is buggy, too. Anyway MIPS do this for supporting different FP flavors (NaN encodings, etc.) which do not exist on LoongArch. So for LoongArch, we can simply remove the current->thread.fpu.fcsr setting from SET_PERSONALITY2() and do it in start_thread(), after lose_fpu(0).
The while loop failing with the mainline kernel has survived one hour after this change on LoongArch.
--- arch/loongarch/include/asm/elf.h | 5 ----- arch/loongarch/kernel/elf.c | 5 ----- arch/loongarch/kernel/process.c | 1 + 3 files changed, 1 insertion(+), 10 deletions(-)
arch/loongarch/include/asm/elf.h +0 -5
@@ -241,8 +241,6 @@ void loongarch_dump_regs64(u64 *uregs, cdo { \ current->thread.vdso = &vdso_info; \ \ -loongarch_set_personality_fcsr (state); \ - \if (personality (current->personality) !=PER_LINUX ) \set_personality (PER_LINUX ); \ }while (0 )
@@ -259,7 +257,6 @@ do { \clear_thread_flag (TIF_32BIT_ADDR ); \ \ current->thread.vdso = &vdso_info; \ -loongarch_set_personality_fcsr (state); \ \ p =personality (current->personality); \if (p !=PER_LINUX32 && p !=PER_LINUX ) \
@@ -340,6 +337,4 @@ extern int arch_elf_pt_proc(void *ehdr,extern int arch_check_elf (void *ehdr,bool has_interpreter,void *interp_ehdr,struct arch_elf_state *state); -extern void loongarch_set_personality_fcsr (struct arch_elf_state *state); -#endif /* _ASM_ELF_H */
arch/loongarch/kernel/elf.c +0 -5
@@ -23,8 +23,3 @@ int arch_check_elf(void *_ehdr, bool has {return 0 ; } - -void loongarch_set_personality_fcsr (struct arch_elf_state *state) -{ - current->thread.fpu.fcsr = boot_cpu_data.fpu_csr0; -}
arch/loongarch/kernel/process.c +1 -0
@@ -85,6 +85,7 @@ void start_thread(struct pt_regs *regs, regs->csr_euen = euen;lose_fpu (0 );lose_lbt (0 ); + current->thread.fpu.fcsr = boot_cpu_data.fpu_csr0;clear_thread_flag (TIF_LSX_CTX_LIVE );clear_thread_flag (TIF_LASX_CTX_LIVE );
Greg Kroah-Hartman
maintainerPATCH 427/641 io_uring: dont check iopoll if request completes
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
commit 9b43ef3d52532a0175ed6654618f7db61d390d2e upstream.
IOPOLL request should never return IOU_OK, so the following iopoll queueing check in io_issue_sqe() after getting IOU_OK doesn't make any sense as would never turn true. Let's optimise on that and return a bit earlier. It's also much more resilient to potential bugs from mischieving iopoll implementations.
--- io_uring/io_uring.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
io_uring/io_uring.c +5 -1
@@ -1898,7 +1898,11 @@ static int io_issue_sqe(struct io_kiocbio_req_complete_defer (req); elseio_req_complete_post (req ,issue_flags ); - }else if (ret !=IOU_ISSUE_SKIP_COMPLETE ) + +return 0 ; + } + +if (ret !=IOU_ISSUE_SKIP_COMPLETE )return ret;/* If the op doesn't have a file, we're not polling for it */
Jiri Slaby
maintainerRe: [PATCH 6.7 427/641] io_uring: dont check iopoll if request completes
Quoted 1 line · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
Hi,
6.7.2 fails in liburing tests (both x64 and x86-32 lib on x64 kernel):
[ 115s] Tests failed (5): <fd-pass.t> <msg-ring-overflow.t> <pipe-bug.t> <poll-race-mshot.t> <reg-hint.t>
I cannot reproduce locally, that happens only in openSUSE build machinery (the errors are transient, the links might not be valid in the future):
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/i586
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/x86_64
So I cannot tell if 6.8-rc is affected.
I suspect one of the 6.7.2 uring changes:e24bf5b47a57 io_uring: adjust defer tw counting 22eed9134509 io_uring: ensure local task_work is run on wait timeout ba8d8a8a36b2 io_uring/rw: ensure io->bytes_done is always initialized d413a342275d io_uring: don't check iopoll if request completes
It looks like EINVAL is received unexpectedly (see below). Any ideas?
The tests' failures:
[ 53s] Running test fd-pass.t
msg_ring failed -22
[ 53s] test failed 0 2 [ 53s] msg_ring failed -22 [ 53s] test failed 1 1 [ 53s] msg_ring failed -22 [ 53s] test failed 1 0 [ 53s] io_uring_register_file_alloc_range -22 [ 53s] test failed 1 ALLOC [ 53s] Test fd-pass.t failed with ret 1
[ 65s] Running test msg-ring-overflow.t
Destination ring create failed -22
[ 65s] test defer failed
[ 65s] Test msg-ring-overflow.t failed with ret 1
[ 75s] Running test pipe-bug.t
pipe-bug.c:73 io_uring_wait_cqe_timeout(&ring, &cqe, &to) == 0 failed
[ 75s] Test pipe-bug.t failed with ret 1
[ 76s] Running test poll-race-mshot.t
Bad cqe res 0
[ 76s] Bad cqe res 0 [ 76s] Bad cqe res 0 [ 76s] Bad cqe res 0 [ 76s] Bad cqe res 0 ... a lot of these [ 76s] Bad cqe res 0 [ 76s] Bad cqe res 0 [ 76s] Bad cqe res 0 [ 76s] Bad cqe res 0 [ 76s] Only got 1 requests [ 76s] Test mshot failed loop 0 [ 76s] Test poll-race-mshot.t failed with ret 1
[ 84s] Running test reg-hint.t
Bad CQE res: -22
[ 84s] Test reg-hint.t failed with ret 1
Quoted 37 lines
From: Pavel Begunkov <[email protected]>
commit
9b43ef3d52532a0175ed6654618f7db61d390d2eupstream.IOPOLL request should never return
IOU_OK, so the following iopoll queueing check inio_issue_sqe()after gettingIOU_OKdoesn't make any sense as would never turn true. Let's optimise on that and return a bit earlier. It's also much more resilient to potential bugs from mischieving iopoll implementations.Cc <[email protected]>Signed-off-by Pavel Begunkov <[email protected]>Link https://lore.kernel.org/r/2f8690e2fa5213a2ff292fac29a7143c036cdd60.1701390926.git.asml.silence@gmail.com open hereSigned-off-by Jens Axboe <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- io_uring/io_uring.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)io_uring/io_uring.c +5
-1@@ -1898,7 +1898,11 @@ static int io_issue_sqe(struct io_kiocbio_req_complete_defer (req); elseio_req_complete_post (req ,issue_flags ); - }else if (ret !=IOU_ISSUE_SKIP_COMPLETE ) + +return 0 ; + } + +if (ret !=IOU_ISSUE_SKIP_COMPLETE )return ret;/* If the op doesn't have a file, we're not polling for it */
Signature · 2 lines
js suse labs
Jiri Slaby
maintainerRe: [PATCH 6.7 427/641] io_uring: dont check iopoll if request completes
Quoted 14 lines · Jiri Slaby
Quoted 1 line · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
Hi,
6.7.2 fails in liburing tests (both x64 and x86-32 lib on x64 kernel):
[ 115s] Tests failed (5): <fd-pass.t> <msg-ring-overflow.t> <pipe-bug.t> <poll-race-mshot.t> <reg-hint.t>I cannot reproduce locally, that happens only in openSUSE build machinery (the errors are transient, the links might not be valid in the future):
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/i586
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/x86_64So I cannot tell if 6.8-rc is affected.
Quoted 7 lines
I suspect one of the 6.7.2 uring changes:
e24bf5b47a57io_uring: adjust defer tw counting22eed9134509io_uring: ensure localtask_workis run on wait timeoutba8d8a8a36b2io_uring/rw: ensureio->bytes_doneis always initializedd413a342275dio_uring: don't check iopoll if request completesIt looks like EINVAL is received unexpectedly (see below). Any ideas?
Forget about this. The build service is currently broken and is using 5.14 kernel instead of 6.7.2.
So the failures are likely expected. At least they are not new.
Sorry for the noise.
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH 6.7 427/641] io_uring: dont check iopoll if request completes
Quoted 21 lines · Jiri Slaby
Quoted 20 lines · Jiri Slaby
Quoted 1 line · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
Hi,
6.7.2 fails in liburing tests (both x64 and x86-32 lib on x64 kernel):
[ 115s] Tests failed (5): <fd-pass.t> <msg-ring-overflow.t> <pipe-bug.t> <poll-race-mshot.t> <reg-hint.t>I cannot reproduce locally, that happens only in openSUSE build machinery (the errors are transient, the links might not be valid in the future):
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/i586
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/x86_64So I cannot tell if 6.8-rc is affected.
I suspect one of the 6.7.2 uring changes:
e24bf5b47a57io_uring: adjust defer tw counting22eed9134509io_uring: ensure localtask_workis run on wait timeoutba8d8a8a36b2io_uring/rw: ensureio->bytes_doneis always initializedd413a342275dio_uring: don't check iopoll if request completes
Quoted 4 lines
Quoted 1 line
It looks like EINVAL is received unexpectedly (see below). Any ideas?
Forget about this. The build service is currently broken and is using 5.14 kernel instead of 6.7.2.
Ah that makes sense, the tests should work (in the sense that they should not fail) on eg 5.15-stable, but I guess the 5.14 kernel is something else entirely? Most of them would return 77 on older kernels where a specific feature is missing, but eg pipe-bug.t should definitely run and pass on older kernels.
Signature · 1 line
Jens Axboe
Jiri Slaby
maintainerRe: [PATCH 6.7 427/641] io_uring: dont check iopoll if request completes
Quoted 24 lines · Jens Axboe
Quoted 23 lines · Jiri Slaby
Quoted 21 lines · Jiri Slaby
Quoted 1 line · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
Hi,
6.7.2 fails in liburing tests (both x64 and x86-32 lib on x64 kernel):
[ 115s] Tests failed (5): <fd-pass.t> <msg-ring-overflow.t> <pipe-bug.t> <poll-race-mshot.t> <reg-hint.t>I cannot reproduce locally, that happens only in openSUSE build machinery (the errors are transient, the links might not be valid in the future):
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/i586
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/x86_64So I cannot tell if 6.8-rc is affected.
I suspect one of the 6.7.2 uring changes:
e24bf5b47a57io_uring: adjust defer tw counting22eed9134509io_uring: ensure localtask_workis run on wait timeoutba8d8a8a36b2io_uring/rw: ensureio->bytes_doneis always initializedd413a342275dio_uring: don't check iopoll if request completesIt looks like EINVAL is received unexpectedly (see below). Any ideas?
Quoted 8 lines
Quoted 2 lines
Forget about this. The build service is currently broken and is using 5.14 kernel instead of 6.7.2.
Ah that makes sense, the tests should work (in the sense that they should not fail) on eg 5.15-stable, but I guess the 5.14 kernel is something else entirely? Most of them would return 77 on older kernels where a specific feature is missing, but eg pipe-bug.t should definitely run and pass on older kernels.
It's SUSE's 5.14, so 5.14 with this many patches (45k+):
https://raw.githubusercontent.com/openSUSE/kernel-source/SLE15-SP5/series.conf
I am not sure it is supposed to be working in there too. But maybe we are missing some fixes on the top of the backported patches...
FWIW 6.7.2 was fine after all.
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH 6.7 427/641] io_uring: dont check iopoll if request completes
Quoted 34 lines · Jiri Slaby
Quoted 24 lines · Jens Axboe
Quoted 23 lines · Jiri Slaby
Quoted 21 lines · Jiri Slaby
Quoted 1 line · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
Hi,
6.7.2 fails in liburing tests (both x64 and x86-32 lib on x64 kernel):
[ 115s] Tests failed (5): <fd-pass.t> <msg-ring-overflow.t> <pipe-bug.t> <poll-race-mshot.t> <reg-hint.t>I cannot reproduce locally, that happens only in openSUSE build machinery (the errors are transient, the links might not be valid in the future):
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/i586
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:H/liburing/standard/x86_64So I cannot tell if 6.8-rc is affected.
I suspect one of the 6.7.2 uring changes:
e24bf5b47a57io_uring: adjust defer tw counting22eed9134509io_uring: ensure localtask_workis run on wait timeoutba8d8a8a36b2io_uring/rw: ensureio->bytes_doneis always initializedd413a342275dio_uring: don't check iopoll if request completesIt looks like EINVAL is received unexpectedly (see below). Any ideas?
Quoted 8 lines
Quoted 2 lines
Forget about this. The build service is currently broken and is using 5.14 kernel instead of 6.7.2.
Ah that makes sense, the tests should work (in the sense that they should not fail) on eg 5.15-stable, but I guess the 5.14 kernel is something else entirely? Most of them would return 77 on older kernels where a specific feature is missing, but eg pipe-bug.t should definitely run and pass on older kernels.
Quoted 7 lines
It's SUSE's 5.14, so 5.14 with this many patches (45k+):
https://raw.githubusercontent.com/openSUSE/kernel-source/SLE15-SP5/series.confI am not sure it is supposed to be working in there too. But maybe we are missing some fixes on the top of the backported patches...
FWIW 6.7.2 was fine after all.
If all stable backports were done, it should Just Work. But it's obviously a bit harder as it's not matching eg 5.15-stable, since it's 5.14 based.
Signature · 1 line
Jens Axboe
Greg Kroah-Hartman
maintainerPATCH 428/641 io_uring/rw: ensure io->bytes_done is always initialized
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 0a535eddbe0dc1de4386046ab849f08aeb2f8faf upstream.
If IOSQE_ASYNC is set and we fail importing an iovec for a readv or writev request, then we leave ->bytes_done uninitialized and hence the eventual failure CQE posted can potentially have a random res value rather than the expected -EINVAL.
Setup ->bytes_done before potentially failing, so we have a consistent value if we fail the request early.
--- io_uring/rw.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
io_uring/rw.c +7 -3
@@ -589,15 +589,19 @@ static inline int io_rw_prep_async(strucstruct iovec *iov;int ret; + iorw->bytes_done =0 ; + iorw->free_iovec =NULL ; +/* submission path, ->uring_lock should already be taken */ ret =io_import_iovec (rw, req, &iov, &iorw->s,0 );if (unlikely (ret <0 ))return ret; - iorw->bytes_done =0 ; - iorw->free_iovec = iov; -if (iov) +if (iov) { + iorw->free_iovec = iov; req->flags |=REQ_F_NEED_CLEANUP ; + } +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 429/641 io_uring: ensure local task_work is run on wait timeout
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 6ff1407e24e6fdfa4a16ba9ba551e3d253a26391 upstream.
A previous commit added an earlier break condition here, which is fine if we're using non-local task_work as it'll be run on return to userspace. However, if DEFER_TASKRUN is used, then we could be leaving local task_work that is ready to process in the ctx list until next time that we enter the kernel to wait for events.
Move the break condition to _after_ we have run task_work.
--- io_uring/io_uring.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
io_uring/io_uring.c +12 -2
@@ -2637,8 +2637,6 @@ static int io_cqring_wait(struct io_ring__set_current_state (TASK_RUNNING );atomic_set (&ctx->cq_wait_nr,0 ); -if (ret <0 ) -break ;/* * Run task_work after scheduling and before io_should_wake(). * If we got woken because of task_work being processed, run it
@@ -2648,6 +2646,18 @@ static int io_cqring_wait(struct io_ringif (!llist_empty (&ctx->work_llist))io_run_local_work (ctx); +/* +* Non-local task_work will be run on exit to userspace, but +* if we're using DEFER_TASKRUN, then we could have waited +* with a timeout for a number of requests. If the timeout +* hits, we could have some requests ready to process. Ensure +* this break is _after_ we have run task_work, to avoid +* deferring running potentially pending requests until the +* next time we wait for events. +*/ +if (ret <0 ) +break ; + check_cq =READ_ONCE (ctx->check_cq);if (unlikely (check_cq)) {/* let the caller flush overflows, retry */
Greg Kroah-Hartman
maintainerPATCH 430/641 fbdev/acornfb: Fix name of fb_ops initializer macro
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit b48807788e7a2bd93044fe84cfe8ff64b85ec15e upstream.
Fix build by using the correct name for the initializer macro for struct fb_ops.
--- drivers/video/fbdev/acornfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/acornfb.c +1 -1
@@ -605,7 +605,7 @@ acornfb_pan_display(struct fb_var_screenstatic const struct fb_ops acornfb_ops = { .owner =THIS_MODULE , -FB_IOMEM_DEFAULT_OPS , +FB_DEFAULT_IOMEM_OPS , .fb_check_var = acornfb_check_var, .fb_set_par = acornfb_set_par, .fb_setcolreg = acornfb_setcolreg,
Greg Kroah-Hartman
maintainerPATCH 431/641 fbdev: flush deferred work in fb_deferred_io_fsync()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
commit 15e4c1f462279b4e128f27de48133e0debe9e0df upstream.
The driver's fsync() is supposed to flush any pending operation to hardware. It is implemented in this driver by cancelling the queued deferred IO first, then schedule it for "immediate execution" by calling schedule_delayed_work() again with delay=0. However, setting delay=0 only means the work is scheduled immediately, it does not mean the work is executed immediately. There is no guarantee that the work is finished after schedule_delayed_work() returns. After this driver's fsync() returns, there can still be pending work. Furthermore, if close() is called by users immediately after fsync(), the pending work gets cancelled and fsync() may do nothing.
To ensure that the deferred IO completes, use flush_delayed_work() instead. Write operations to this driver either write to the device directly, or invoke schedule_delayed_work(); so by flushing the workqueue, it can be guaranteed that all previous writes make it to the device.
--- drivers/video/fbdev/core/fb_defio.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/video/fbdev/core/fb_defio.c +1 -5
@@ -132,11 +132,7 @@ int fb_deferred_io_fsync(struct file *fireturn 0 ;inode_lock (inode); -/* Kill off the delayed work */ -cancel_delayed_work_sync (&info->deferred_work); - -/* Run it immediately */ -schedule_delayed_work (&info->deferred_work,0 ); +flush_delayed_work (&info->deferred_work);inode_unlock (inode);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 432/641 fbdev: flush deferred IO before closing
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
commit 33cd6ea9c0673517cdb06ad5c915c6f22e9615fc upstream.
When framebuffer gets closed, the queued deferred IO gets cancelled. This can cause some last display data to vanish. This is problematic for users who send a still image to the framebuffer, then close the file: the image may never appear.
To ensure none of display data get lost, flush the queued deferred IO first before closing.
Another possible solution is to delete the cancel_delayed_work_sync() instead. The difference is that the display may appear some time after closing. However, the clearing of page mapping after this needs to be removed too, because the page mapping is used by the deferred work. It is not completely obvious whether it is okay to not clear the page mapping. For a patch intended for stable trees, go with the simple and obvious solution.
--- drivers/video/fbdev/core/fb_defio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fb_defio.c +1 -1
@@ -313,7 +313,7 @@ static void fb_deferred_io_lastclose(strstruct page *page;int i; -cancel_delayed_work_sync (&info->deferred_work); +flush_delayed_work (&info->deferred_work);/* clear out the mapping that we setup */ for (i =0 ; i < info->fix.smem_len; i +=PAGE_SIZE ) {
Greg Kroah-Hartman
maintainerPATCH 433/641 scsi: ufs: core: Simplify power management during async scan
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
commit daf7795406bf307997366f694888bd317ae5b5fa upstream.
ufshcd_init() calls pm_runtime_get_sync() before it calls async_schedule(). ufshcd_async_scan() calls pm_runtime_put_sync() directly or indirectly from ufshcd_add_lus(). Simplify ufshcd_async_scan() by always calling pm_runtime_put_sync() from ufshcd_async_scan().
--- drivers/ufs/core/ufshcd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/ufs/core/ufshcd.c +3 -4
@@ -8646,7 +8646,6 @@ static int ufshcd_add_lus(struct ufs_hbaufs_bsg_probe (hba);scsi_scan_host (hba->host); -pm_runtime_put_sync (hba->dev); out:return ret;
@@ -8914,15 +8913,15 @@ static void ufshcd_async_scan(void *data/* Probe and add UFS logical units */ ret =ufshcd_add_lus (hba); + out: +pm_runtime_put_sync (hba->dev);/* * If we failed to initialize the device or the device is not * present, turn off the power/clocks etc. */ -if (ret) { -pm_runtime_put_sync (hba->dev); +if (ret)ufshcd_hba_exit (hba); - } }static enum scsi_timeout_action ufshcd_eh_timed_out (struct scsi_cmnd *scmd)
Greg Kroah-Hartman
maintainerPATCH 434/641 scsi: target: core: add missing file_{start,end}_write()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
commit 0db1d53937fafa8bb96e077375691e16902f4899 upstream.
The callers of vfs_iter_write() are required to hold file_start_write(). file_start_write() is a no-op for the S_ISBLK() case, but it is really needed when the backing file is a regular file.
We are going to move file_{start,end}_write() into vfs_iter_write(), but we need to fix this first, so that the fix could be backported to stable kernels.
--- drivers/target/target_core_file.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/target/target_core_file.c +7 -3
@@ -332,11 +332,13 @@ static int fd_do_rw(struct se_cmd *cmd, }iov_iter_bvec (&iter, is_write, bvec, sgl_nents, len); -if (is_write) +if (is_write) { +file_start_write (fd); ret =vfs_iter_write (fd, &iter, &pos,0 ); -else +file_end_write (fd); + }else { ret =vfs_iter_read (fd, &iter, &pos,0 ); - + }if (is_write) {if (ret <0 || ret != data_length) {pr_err ("%s() write returned %d\n" , __func__, ret);
@@ -467,7 +469,9 @@ fd_execute_write_same(struct se_cmd *cmd }iov_iter_bvec (&iter,ITER_SOURCE , bvec, nolb, len); +file_start_write (fd_dev->fd_file); ret =vfs_iter_write (fd_dev->fd_file, &iter, &pos,0 ); +file_end_write (fd_dev->fd_file);kfree (bvec);if (ret <0 || ret != len) {
Greg Kroah-Hartman
maintainerPATCH 435/641 scsi: mpi3mr: Refresh sdev queue depth after controller reset
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandrakanth patil <[email protected]>
commit e5aab848dfdf7996d20ece4d28d2733c732c5e5a upstream.
After a controller reset, the firmware may modify the device queue depth. Therefore, update the device queue depth accordingly.
--- drivers/scsi/mpi3mr/mpi3mr_os.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_os.c +8 -2
@@ -1070,8 +1070,14 @@ void mpi3mr_rfresh_tgtdevs(struct mpi3mr tgtdev =NULL ;list_for_each_entry (tgtdev, &mrioc->tgtdev_list, list) {if ((tgtdev->dev_handle !=MPI3MR_INVALID_DEV_HANDLE ) && - !tgtdev->is_hidden && !tgtdev->host_exposed) -mpi3mr_report_tgtdev_to_host (mrioc, tgtdev->perst_id); + !tgtdev->is_hidden) { +if (!tgtdev->host_exposed) +mpi3mr_report_tgtdev_to_host (mrioc, + tgtdev->perst_id); +else if (tgtdev->starget) +starget_for_each_device (tgtdev->starget, + (void *)tgtdev, mpi3mr_update_sdev); + } } }
Greg Kroah-Hartman
maintainerPATCH 436/641 scsi: mpi3mr: Clean up block devices post controller reset
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandrakanth patil <[email protected]>
commit c01d515687e358b22aa8414d6dac60d7defa6eb9 upstream.
After a controller reset, if the firmware changes the state of devices to "hide", then remove those devices from the OS.
--- drivers/scsi/mpi3mr/mpi3mr_os.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_os.c +7 -2
@@ -1047,8 +1047,9 @@ void mpi3mr_rfresh_tgtdevs(struct mpi3mrlist_for_each_entry_safe (tgtdev, tgtdev_next, &mrioc->tgtdev_list, list) {if ((tgtdev->dev_handle ==MPI3MR_INVALID_DEV_HANDLE ) && - tgtdev->host_exposed && tgtdev->starget && - tgtdev->starget->hostdata) { + tgtdev->is_hidden && + tgtdev->host_exposed && tgtdev->starget && + tgtdev->starget->hostdata) { tgt_priv = tgtdev->starget->hostdata; tgt_priv->dev_removed =1 ;atomic_set (&tgt_priv->block_io,0 );
@@ -1064,6 +1065,10 @@ void mpi3mr_rfresh_tgtdevs(struct mpi3mrmpi3mr_remove_tgtdev_from_host (mrioc, tgtdev);mpi3mr_tgtdev_del_from_list (mrioc, tgtdev, true);mpi3mr_tgtdev_put (tgtdev); + }else if (tgtdev->is_hidden & tgtdev->host_exposed) { +dprint_reset (mrioc,"hiding target device with perst_id(%d)\n" , + tgtdev->perst_id); +mpi3mr_remove_tgtdev_from_host (mrioc, tgtdev); } }
Greg Kroah-Hartman
maintainerPATCH 437/641 scsi: mpi3mr: Block PEL Enable Command on Controller Reset and Unrecoverable State
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandrakanth patil <[email protected]>
commit f8fb3f39148e8010479e4b2003ba4728818ec661 upstream.
If a controller reset is underway or the controller is in an unrecoverable state, the PEL enable management command will be returned as EAGAIN or EFAULT.
--- drivers/scsi/mpi3mr/mpi3mr_app.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/scsi/mpi3mr/mpi3mr_app.c +16 -0
@@ -223,6 +223,22 @@ static long mpi3mr_bsg_pel_enable(structreturn rval; } +if (mrioc->unrecoverable) { +dprint_bsg_err (mrioc,"%s: unrecoverable controller\n" , + __func__); +return -EFAULT ; + } + +if (mrioc->reset_in_progress) { +dprint_bsg_err (mrioc,"%s: reset in progress\n" , __func__); +return -EAGAIN ; + } + +if (mrioc->stop_bsgs) { +dprint_bsg_err (mrioc,"%s: bsgs are blocked\n" , __func__); +return -EAGAIN ; + } +sg_copy_to_buffer (job->request_payload.sg_list, job->request_payload.sg_cnt, &pel_enable,sizeof (pel_enable));