6.12.31-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainerPATCH 388/626 drm/amdkfd: fix missing L2 cache info in topology
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Huang <[email protected]>
[ Upstream commit 5ffd56822a7159917306d99f18fd15dfd7288f20 ]
In some ASICs L2 cache info may miss in kfd topology, because the first bitmap may be empty, that means the first cu may be inactive, so to find the first active cu will solve the issue.
v2: Only find the first active cu in the first xcc
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +17 -2
@@ -1683,17 +1683,32 @@ static int fill_in_l2_l3_pcache(struct kfd_cache_properties **props_ext, int cache_type, unsigned int cu_processor_id, struct kfd_node *knode) { - unsigned int cu_sibling_map_mask; + unsigned int cu_sibling_map_mask = 0;int first_active_cu;int i, j, k, xcc, start, end;int num_xcc =NUM_XCC (knode->xcc_mask);struct kfd_cache_properties *pcache =NULL ;enum amdgpu_memory_partition mode;struct amdgpu_device *adev = knode->adev; +bool found = false; start =ffs (knode->xcc_mask) -1 ; end = start + num_xcc; - cu_sibling_map_mask = cu_info->bitmap[start][0 ][0 ]; + +/* To find the bitmap in the first active cu in the first +* xcc, it is based on the assumption that evrey xcc must +* have at least one active cu. +*/ +for (i =0 ; i < gfx_info->max_shader_engines && !found; i++) { +for (j =0 ; j < gfx_info->max_sh_per_se && !found; j++) { +if (cu_info->bitmap[start][i %4 ][j %4 ]) { + cu_sibling_map_mask = + cu_info->bitmap[start][i %4 ][j %4 ]; + found = true; + } + } + } + cu_sibling_map_mask &= ((1 << pcache_info[cache_type].num_cu_shared) -1 ); first_active_cu =ffs (cu_sibling_map_mask);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 389/626 drm/amdgpu: Set snoop bit for SDMA for MI series
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harish Kasiviswanathan <[email protected]>
[ Upstream commit 3394b1f76d3f8adf695ceed350a5dae49003eb37 ]
SDMA writes has to probe invalidate RW lines. Set snoop bit in mmhub for this to happen.
v2: Missed a few mmhub_v9_4. Added now.
v3: Calculate hub offset once since it doesn't change inside the loop
Modified function names based on review comments.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 25 ++++++++++ drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 27 +++++++++++ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 31 ++++++++++++ .../asic_reg/mmhub/mmhub_9_4_1_offset.h | 32 +++++++++++++ .../asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 48 +++++++++++++++++++ 5 files changed, 163 insertions(+)
drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c +25 -0
@@ -172,6 +172,30 @@ static void mmhub_v1_7_init_tlb_regs(struct amdgpu_device *adev)WREG32_SOC15 (MMHUB ,0 , regMC_VM_MX_L1_TLB_CNTL, tmp); } +/* Set snoop bit for SDMA so that SDMA writes probe-invalidates RW lines */ +static void mmhub_v1_7_init_snoop_override_regs (struct amdgpu_device *adev) +{ +uint32_t tmp; +int i; +uint32_t distance = regDAGB1_WRCLI_GPU_SNOOP_OVERRIDE - + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE; + +for (i =0 ; i <5 ; i++) {/* DAGB instances */ + tmp =RREG32_SOC15_OFFSET (MMHUB ,0 , + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE, i * distance); + tmp |= (1 <<15 );/* SDMA client is BIT15 */ +WREG32_SOC15_OFFSET (MMHUB ,0 , + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE, i * distance, tmp); + + tmp =RREG32_SOC15_OFFSET (MMHUB ,0 , + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE, i * distance); + tmp |= (1 <<15 ); +WREG32_SOC15_OFFSET (MMHUB ,0 , + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE, i * distance, tmp); + } + +} +static void mmhub_v1_7_init_cache_regs (struct amdgpu_device *adev) {uint32_t tmp;
@@ -337,6 +361,7 @@ static int mmhub_v1_7_gart_enable(struct amdgpu_device *adev)mmhub_v1_7_init_system_aperture_regs (adev);mmhub_v1_7_init_tlb_regs (adev);mmhub_v1_7_init_cache_regs (adev); +mmhub_v1_7_init_snoop_override_regs (adev);mmhub_v1_7_enable_system_domain (adev);mmhub_v1_7_disable_identity_aperture (adev);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c +27 -0
@@ -214,6 +214,32 @@ static void mmhub_v1_8_init_tlb_regs(struct amdgpu_device *adev) } } +/* Set snoop bit for SDMA so that SDMA writes probe-invalidates RW lines */ +static void mmhub_v1_8_init_snoop_override_regs (struct amdgpu_device *adev) +{ +uint32_t tmp, inst_mask; +int i, j; +uint32_t distance = regDAGB1_WRCLI_GPU_SNOOP_OVERRIDE - + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE; + + inst_mask = adev->aid_mask; +for_each_inst (i, inst_mask) { +for (j =0 ; j <5 ; j++) {/* DAGB instances */ + tmp =RREG32_SOC15_OFFSET (MMHUB , i, + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE, j * distance); + tmp |= (1 <<15 );/* SDMA client is BIT15 */ +WREG32_SOC15_OFFSET (MMHUB , i, + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE, j * distance, tmp); + + tmp =RREG32_SOC15_OFFSET (MMHUB , i, + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE, j * distance); + tmp |= (1 <<15 ); +WREG32_SOC15_OFFSET (MMHUB , i, + regDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE, j * distance, tmp); + } + } +} +static void mmhub_v1_8_init_cache_regs (struct amdgpu_device *adev) {uint32_t tmp, inst_mask;
@@ -419,6 +445,7 @@ static int mmhub_v1_8_gart_enable(struct amdgpu_device *adev)mmhub_v1_8_init_system_aperture_regs (adev);mmhub_v1_8_init_tlb_regs (adev);mmhub_v1_8_init_cache_regs (adev); +mmhub_v1_8_init_snoop_override_regs (adev);mmhub_v1_8_enable_system_domain (adev);mmhub_v1_8_disable_identity_aperture (adev);
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +31 -0
@@ -198,6 +198,36 @@ static void mmhub_v9_4_init_tlb_regs(struct amdgpu_device *adev, int hubid) hubid * MMHUB_INSTANCE_REGISTER_OFFSET, tmp); } +/* Set snoop bit for SDMA so that SDMA writes probe-invalidates RW lines */ +static void mmhub_v9_4_init_snoop_override_regs (struct amdgpu_device *adev,int hubid) +{ +uint32_t tmp; +int i; +uint32_t distance = mmDAGB1_WRCLI_GPU_SNOOP_OVERRIDE - + mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE; +uint32_t huboffset = hubid *MMHUB_INSTANCE_REGISTER_OFFSET ; + +for (i =0 ; i <5 - (2 * hubid); i++) { +/* DAGB instances 0 to 4 are in hub0 and 5 to 7 are in hub1 */ + tmp =RREG32_SOC15_OFFSET (MMHUB ,0 , + mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE, + huboffset + i * distance); + tmp |= (1 <<15 );/* SDMA client is BIT15 */ +WREG32_SOC15_OFFSET (MMHUB ,0 , + mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE, + huboffset + i * distance, tmp); + + tmp =RREG32_SOC15_OFFSET (MMHUB ,0 , + mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE, + huboffset + i * distance); + tmp |= (1 <<15 ); +WREG32_SOC15_OFFSET (MMHUB ,0 , + mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE, + huboffset + i * distance, tmp); + } + +} +static void mmhub_v9_4_init_cache_regs (struct amdgpu_device *adev,int hubid) {uint32_t tmp;
@@ -392,6 +422,7 @@ static int mmhub_v9_4_gart_enable(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev))mmhub_v9_4_init_cache_regs (adev, i); +mmhub_v9_4_init_snoop_override_regs (adev, i);mmhub_v9_4_enable_system_domain (adev, i);if (!amdgpu_sriov_vf (adev))mmhub_v9_4_disable_identity_aperture (adev, i);
drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_offset.h +32 -0
@@ -203,6 +203,10 @@#define mmDAGB0_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB0_WR_MISC_CREDIT 0x0058#define mmDAGB0_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE 0x005b +#define mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x005c +#define mmDAGB0_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB0_WRCLI_ASK_PENDING 0x005d#define mmDAGB0_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB0_WRCLI_GO_PENDING 0x005e
@@ -455,6 +459,10 @@#define mmDAGB1_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB1_WR_MISC_CREDIT 0x00d8#define mmDAGB1_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB1_WRCLI_GPU_SNOOP_OVERRIDE 0x00db +#define mmDAGB1_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB1_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x00dc +#define mmDAGB1_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB1_WRCLI_ASK_PENDING 0x00dd#define mmDAGB1_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB1_WRCLI_GO_PENDING 0x00de
@@ -707,6 +715,10 @@#define mmDAGB2_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB2_WR_MISC_CREDIT 0x0158#define mmDAGB2_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB2_WRCLI_GPU_SNOOP_OVERRIDE 0x015b +#define mmDAGB2_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB2_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x015c +#define mmDAGB2_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB2_WRCLI_ASK_PENDING 0x015d#define mmDAGB2_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB2_WRCLI_GO_PENDING 0x015e
@@ -959,6 +971,10 @@#define mmDAGB3_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB3_WR_MISC_CREDIT 0x01d8#define mmDAGB3_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB3_WRCLI_GPU_SNOOP_OVERRIDE 0x01db +#define mmDAGB3_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB3_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x01dc +#define mmDAGB3_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB3_WRCLI_ASK_PENDING 0x01dd#define mmDAGB3_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB3_WRCLI_GO_PENDING 0x01de
@@ -1211,6 +1227,10 @@#define mmDAGB4_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB4_WR_MISC_CREDIT 0x0258#define mmDAGB4_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB4_WRCLI_GPU_SNOOP_OVERRIDE 0x025b +#define mmDAGB4_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB4_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x025c +#define mmDAGB4_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB4_WRCLI_ASK_PENDING 0x025d#define mmDAGB4_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB4_WRCLI_GO_PENDING 0x025e
@@ -4793,6 +4813,10 @@#define mmDAGB5_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB5_WR_MISC_CREDIT 0x3058#define mmDAGB5_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB5_WRCLI_GPU_SNOOP_OVERRIDE 0x305b +#define mmDAGB5_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB5_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x305c +#define mmDAGB5_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB5_WRCLI_ASK_PENDING 0x305d#define mmDAGB5_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB5_WRCLI_GO_PENDING 0x305e
@@ -5045,6 +5069,10 @@#define mmDAGB6_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB6_WR_MISC_CREDIT 0x30d8#define mmDAGB6_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB6_WRCLI_GPU_SNOOP_OVERRIDE 0x30db +#define mmDAGB6_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB6_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x30dc +#define mmDAGB6_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB6_WRCLI_ASK_PENDING 0x30dd#define mmDAGB6_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB6_WRCLI_GO_PENDING 0x30de
@@ -5297,6 +5325,10 @@#define mmDAGB7_WR_DATA_CREDIT_BASE_IDX 1#define mmDAGB7_WR_MISC_CREDIT 0x3158#define mmDAGB7_WR_MISC_CREDIT_BASE_IDX 1 +#define mmDAGB7_WRCLI_GPU_SNOOP_OVERRIDE 0x315b +#define mmDAGB7_WRCLI_GPU_SNOOP_OVERRIDE_BASE_IDX 1 +#define mmDAGB7_WRCLI_GPU_SNOOP_OVERRIDE_VALUE 0x315c +#define mmDAGB7_WRCLI_GPU_SNOOP_OVERRIDE_VALUE_BASE_IDX 1#define mmDAGB7_WRCLI_ASK_PENDING 0x315d#define mmDAGB7_WRCLI_ASK_PENDING_BASE_IDX 1#define mmDAGB7_WRCLI_GO_PENDING 0x315e
drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h +48 -0
96 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 390/626 drm/amd/display: pass calculated dram_speed_mts to dml2
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charlene Liu <[email protected]>
[ Upstream commit b40d022ec06ade9f6c809091dc188422a0f0946d ]
[why]
currently dml2 is using a hard coded 16 to convert memclk to dram_speed_mts. for apu, this depends on wck_ratio.
change to pass the already calculated dram_speed_mts from fpu to dml2.
v2: use existing calculation of dram_speed_mts for now to avoid regression
--- drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 2 ++ drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 1 + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 1 + 3 files changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +2 -0
@@ -367,6 +367,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc, clock_limits[i].socclk_mhz; dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].memclk_mhz = clk_table->entries[i].memclk_mhz * clk_table->entries[i].wck_ratio; + + dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].dram_speed_mts = clock_limits[i].dram_speed_mts; dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz = clock_limits[i].dtbclk_mhz; dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels =
drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c +1 -0
@@ -401,6 +401,7 @@ void dcn351_update_bw_bounding_box_fpu(struct dc *dc, clock_limits[i].socclk_mhz; dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].memclk_mhz = clk_table->entries[i].memclk_mhz * clk_table->entries[i].wck_ratio; + dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].dram_speed_mts = clock_limits[i].dram_speed_mts; dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz = clock_limits[i].dtbclk_mhz; dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels =
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h +1 -0
@@ -159,6 +159,7 @@ struct dml2_clks_table_entry {unsigned int dtbclk_mhz;unsigned int dispclk_mhz;unsigned int dppclk_mhz; +unsigned int dram_speed_mts;/*which is based on wck_ratio*/ };struct dml2_clks_num_entries {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 391/626 drm/amd/display: Dont try AUX transactions on disconnected link
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Bakoulin <[email protected]>
[ Upstream commit e8bffa52e0253cfd689813a620e64521256bc712 ]
[Why]
Setting link DPMS off in response to HPD disconnect creates AUX transactions on a link that is supposed to be disconnected. This can cause issues in some cases when the sink re-asserts HPD and expects source to re-enable the link.
[How]
Avoid AUX transactions on disconnected link.
--- .../gpu/drm/amd/display/dc/link/protocols/link_dp_phy.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_phy.c +5 -3
@@ -75,7 +75,8 @@ void dp_disable_link_phy(struct dc_link *link,struct dc *dc = link->ctx->dc;if (!link->wa_flags.dp_keep_receiver_powered && - !link->skip_implict_edp_power_control) + !link->skip_implict_edp_power_control && + link->type != dc_connection_none)dpcd_write_rx_power_ctrl (link, false); dc->hwss.disable_link_output (link, link_res, signal);
@@ -163,8 +164,9 @@ enum dc_status dp_set_fec_ready(struct dc_link *link, const struct link_resource }else {if (link->fec_state == dc_link_fec_ready) { fec_config =0 ; -core_link_write_dpcd (link,DP_FEC_CONFIGURATION , - &fec_config,sizeof (fec_config)); +if (link->type != dc_connection_none) +core_link_write_dpcd (link,DP_FEC_CONFIGURATION , + &fec_config,sizeof (fec_config)); link_enc->funcs->fec_set_ready (link_enc, false); link->fec_state = dc_link_fec_not_ready;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 392/626 drm/amdgpu: reset psp->cmd to NULL after releasing the buffer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiang Liu <[email protected]>
[ Upstream commit e92f3f94cad24154fd3baae30c6dfb918492278d ]
Reset psp->cmd to NULL after releasing the buffer in function psp_sw_fini().
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -3
@@ -531,7 +531,6 @@ static int psp_sw_fini(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct psp_context *psp = &adev->psp; -struct psp_gfx_cmd_resp *cmd = psp->cmd;psp_memory_training_fini (psp);
@@ -541,8 +540,8 @@ static int psp_sw_fini(void *handle)amdgpu_ucode_release (&psp->cap_fw);amdgpu_ucode_release (&psp->toc_fw); -kfree (cmd); - cmd =NULL ; +kfree (psp->cmd); + psp->cmd =NULL ;psp_free_shared_bufs (psp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 393/626 drm/amd/pm: Skip P2S load for SMU v13.0.12
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Asad Kamal <[email protected]>
[ Upstream commit 1fb85819d629676f1d53f40c3fffa25a33a881e4 ]
Skip P2S table load for SMU v13.0.12
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +3 -2
@@ -275,8 +275,9 @@ static int smu_v13_0_6_init_microcode(struct smu_context *smu)int var = (adev->pdev->device &0xF );char ucode_prefix[15 ]; -/* No need to load P2S tables in IOV mode */ -if (amdgpu_sriov_vf (adev)) +/* No need to load P2S tables in IOV mode or for smu v13.0.12 */ +if (amdgpu_sriov_vf (adev) || + (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,12 )))return 0 ;if (!(adev->flags &AMD_IS_APU )) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 394/626 drm/amd/display: Support multiple options during psr entry.
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Tsai <[email protected]>
[ Upstream commit 3a5fa55455db6a11248a25f24570c365f9246144 ]
[WHY]
Some panels may not handle idle pattern properly during PSR entry.
[HOW]
Add a condition to allow multiple options on power down sequence during PSR1 entry.
--- drivers/gpu/drm/amd/display/dc/dc_types.h | 7 +++++++ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 ++++ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 6 ++++++ 3 files changed, 17 insertions(+)
drivers/gpu/drm/amd/display/dc/dc_types.h +7 -0
@@ -1009,6 +1009,13 @@ struct psr_settings {unsigned int psr_sdp_transmit_line_num_deadline;uint8_t force_ffu_mode;unsigned int psr_power_opt; + +/** +* Some panels cannot handle idle pattern during PSR entry. +* To power down phy before disable stream to avoid sending +* idle pattern. +*/ +uint8_t power_down_phy_before_disable_stream; };enum replay_coasting_vtotal_type {
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +4 -0
@@ -419,6 +419,10 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, copy_settings_data->relock_delay_frame_cnt =0 ;if (link->dpcd_caps.sink_dev_id ==DP_BRANCH_DEVICE_ID_001CF8 ) copy_settings_data->relock_delay_frame_cnt =2 ; + + copy_settings_data->power_down_phy_before_disable_stream = + link->psr_settings.power_down_phy_before_disable_stream; + copy_settings_data->dsc_slice_height = psr_context->dsc_slice_height;dc_wake_and_execute_dmub_cmd (dc, &cmd,DM_DMUB_WAIT_TYPE_WAIT );
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +6 -0
@@ -2869,6 +2869,12 @@ struct dmub_cmd_psr_copy_settings_data {* Some panels request main link off before xth vertical line */ uint16_t poweroff_before_vertical_line; +/** +* Some panels cannot handle idle pattern during PSR entry. +* To power down phy before disable stream to avoid sending +* idle pattern. +*/ +uint8_t power_down_phy_before_disable_stream; };/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 395/626 Revert "drm/amd/display: Exit idle optimizations before attempt to access PHY"
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brandon Syu <[email protected]>
[ Upstream commit be704e5ef4bd66dee9bb3f876964327e3a247d31 ]
This reverts commit de612738e9771bd66aeb20044486c457c512f684.
Reason to revert: screen flashes or gray screen appeared half of the screen after resume from S4/S5.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +0 -5
@@ -1888,7 +1888,6 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)bool can_apply_edp_fast_boot = false;bool can_apply_seamless_boot = false;bool keep_edp_vdd_on = false; -struct dc_bios *dcb = dc->ctx->dc_bios;DC_LOGGER_INIT ();
@@ -1965,8 +1964,6 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control (edp_link_with_sink, false); }/*resume from S3, no vbios posting, no need to power down again*/ -if (dcb && dcb->funcs && !dcb->funcs->is_accelerated_mode (dcb)) -clk_mgr_exit_optimized_pwr_state (dc, dc->clk_mgr);power_down_all_hw_blocks (dc);
@@ -1979,8 +1976,6 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)disable_vga_and_power_gate_all_controllers (dc);if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control (edp_link_with_sink, false); -if (dcb && dcb->funcs && !dcb->funcs->is_accelerated_mode (dcb)) -clk_mgr_optimize_pwr_state (dc, dc->clk_mgr); }bios_set_scratch_acc_mode_change (dc->ctx->dc_bios,1 ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 396/626 drm/amd/display: Update CR AUX RD interval interpretation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Shen <[email protected]>
[ Upstream commit 6a7fde433231c18164c117592d3e18ced648ad58 ]
[Why]
DP spec updated to have the CR AUX RD interval match the EQ AUX RD interval interpretation of DPCD 0000Eh/0220Eh for 8b/10b non-LTTPR mode and LTTPR transparent mode cases.
[How]
Update interpretation of DPCD 0000Eh/0220Eh for CR AUX RD interval during 8b/10b link training.
--- .../display/dc/link/protocols/link_dp_training_8b_10b.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.c +5 -2
@@ -36,7 +36,8 @@ link->ctx->loggerstatic int32_t get_cr_training_aux_rd_interval (struct dc_link *link, -const struct dc_link_settings *link_settings) +const struct dc_link_settings *link_settings, +enum lttpr_mode lttpr_mode) {union training_aux_rd_interval training_rd_interval;uint32_t wait_in_micro_secs =100 ;
@@ -49,6 +50,8 @@ static int32_t get_cr_training_aux_rd_interval(struct dc_link *link,DP_TRAINING_AUX_RD_INTERVAL , (uint8_t *)&training_rd_interval, sizeof(training_rd_interval)); +if (lttpr_mode !=LTTPR_MODE_NON_TRANSPARENT ) + wait_in_micro_secs =400 ;if (training_rd_interval.bits.TRAINIG_AUX_RD_INTERVAL) wait_in_micro_secs = training_rd_interval.bits.TRAINIG_AUX_RD_INTERVAL *4000 ; }
@@ -110,7 +113,6 @@ void decide_8b_10b_training_settings(*/ lt_settings->link_settings.link_spread = link->dp_ss_off ?LINK_SPREAD_DISABLED :LINK_SPREAD_05_DOWNSPREAD_30KHZ ; - lt_settings->cr_pattern_time =get_cr_training_aux_rd_interval (link, link_setting); lt_settings->eq_pattern_time =get_eq_training_aux_rd_interval (link, link_setting); lt_settings->pattern_for_cr =decide_cr_training_pattern (link_setting); lt_settings->pattern_for_eq =decide_eq_training_pattern (link, link_setting);
@@ -119,6 +121,7 @@ void decide_8b_10b_training_settings( lt_settings->disallow_per_lane_settings = true; lt_settings->always_match_dpcd_with_hw_lane_settings = true; lt_settings->lttpr_mode =dp_decide_8b_10b_lttpr_mode (link); + lt_settings->cr_pattern_time =get_cr_training_aux_rd_interval (link, link_setting, lt_settings->lttpr_mode);dp_hw_to_dpcd_lane_settings (lt_settings, lt_settings->hw_lane_settings, lt_settings->dpcd_lane_settings); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 397/626 drm/amd/display: Initial psr_version with correct setting
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Chung <[email protected]>
[ Upstream commit d8c782cac5007e68e7484d420168f12d3490def6 ]
[Why & How]
The initial setting for psr_version is not correct while create a virtual link.
The default psr_version should be DC_PSR_VERSION_UNSUPPORTED.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -0
@@ -276,6 +276,7 @@ static bool create_links( link->link_id.type =OBJECT_TYPE_CONNECTOR ; link->link_id.id =CONNECTOR_ID_VIRTUAL ; link->link_id.enum_id =ENUM_ID_1 ; + link->psr_settings.psr_version =DC_PSR_VERSION_UNSUPPORTED ; link->link_enc =kzalloc (sizeof (*link->link_enc),GFP_KERNEL );if (!link->link_enc) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 398/626 drm/amd/display: Increase block_sequence array size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joshua Aberback <[email protected]>
[ Upstream commit 3a7810c212bcf2f722671dadf4b23ff70a7d23ee ]
[Why]
It's possible to generate more than 50 steps in hwss_build_fast_sequence, for example with a 6-pipe asic where all pipes are in one MPC chain. This overflows the block_sequence buffer and corrupts block_sequence_steps, causing a crash.
[How]
Expand block_sequence to 100 items. A naive upper bound on the possible number of steps for a 6-pipe asic, ignoring the potential for steps to be mutually exclusive, is 91 with current code, therefore 100 is sufficient.
--- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -1
@@ -621,7 +621,7 @@ struct dc_state {*/ struct bw_context bw_ctx; -struct block_sequence block_sequence[50 ]; +struct block_sequence block_sequence[100 ];unsigned int block_sequence_steps;struct dc_dmub_cmd dc_dmub_cmd[10 ];unsigned int dmub_cmd_count;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 399/626 drm/amd/display: Use Nominal vBlank If Provided Instead Of Capping It
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Austin Zheng <[email protected]>
[ Upstream commit 41df56b1fc24cc36fffb10e437385b3a49fbb5e2 ]
[Why/How]
vBlank used to determine the max vStartup is based on the smallest between the vblank provided by the timing and vblank in ip_caps.
Extra vblank time is not considered if the vblank provided by the timing ends up being higher than what's defined by the ip_caps
Use 1 less than the vblank size in case the timing is interlaced so vstartup will always be less than vblank_nom.
--- .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c +2 -3
@@ -3630,13 +3630,12 @@ static unsigned int CalculateMaxVStartup(double line_time_us = (double )timing->h_total / ((double )timing->pixel_clock_khz /1000 );unsigned int vblank_actual = timing->v_total - timing->v_active;unsigned int vblank_nom_default_in_line = (unsigned int )math_floor2 ((double )vblank_nom_default_us / line_time_us,1.0 ); -unsigned int vblank_nom_input = (unsigned int )math_min2 (timing->vblank_nom, vblank_nom_default_in_line); -unsigned int vblank_avail = (vblank_nom_input ==0 ) ? vblank_nom_default_in_line : vblank_nom_input; +unsigned int vblank_avail = (timing->vblank_nom ==0 ) ? vblank_nom_default_in_line : (unsigned int )timing->vblank_nom; vblank_size = (unsigned int )math_min2 (vblank_actual, vblank_avail);if (timing->interlaced && !ptoi_supported) - max_vstartup_lines = (unsigned int )(math_floor2 (vblank_size /2.0 ,1.0 )); + max_vstartup_lines = (unsigned int )(math_floor2 ((vblank_size -1 ) /2.0 ,1.0 ));else max_vstartup_lines = vblank_size - (unsigned int )math_max2 (1.0 ,math_ceil2 (write_back_delay_us / line_time_us,1.0 ));#ifdef __DML_VBA_DEBUG__
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 400/626 drm/amd/display: Populate register address for dentist for dcn401
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dillon Varone <[email protected]>
[ Upstream commit 5f0d1ef6f16e150ee46cc00b8d233d9d271fe39e ]
[WHY&HOW]
Address was not previously populated which can result in incorrect clock frequencies being read on boot.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 2 ++ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 1 + 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c +2 -0
@@ -24,6 +24,8 @@#include "dml/dcn401/dcn401_fpu.h" +#define DCN_BASE__INST0_SEG1 0x000000C0 +#define mmCLK01_CLK0_CLK_PLL_REQ 0x16E37#define mmCLK01_CLK0_CLK0_DFS_CNTL 0x16E69#define mmCLK01_CLK0_CLK1_DFS_CNTL 0x16E6C
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +1 -0
@@ -221,6 +221,7 @@ enum dentist_divider_range { CLK_SF(CLK0_CLK_PLL_REQ, FbMult_frac, mask_sh)#define CLK_REG_LIST_DCN401 () \ + SR(DENTIST_DISPCLK_CNTL), \ CLK_SR_DCN401(CLK0_CLK_PLL_REQ, CLK01, 0), \ CLK_SR_DCN401(CLK0_CLK0_DFS_CNTL, CLK01, 0), \ CLK_SR_DCN401(CLK0_CLK1_DFS_CNTL, CLK01, 0), \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 401/626 drm/amdgpu: Use active umc info from discovery
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit f7a594e40517fa2ab25d5ca10e7b6a158f529fb5 ]
There could be configs where some UMC instances are harvested. This information is obtained through discovery data and populated in umc.active_mask. Avoid reassigning this as AID mask, instead use the mask directly while iterating through umc instances. This is to avoid accesses to harvested UMC instances.
v2: fix warning (Alex)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 42 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 - 2 files changed, 42 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +42 -0
@@ -383,6 +383,45 @@ int amdgpu_umc_fill_error_record(struct ras_err_data *err_data,return 0 ; } +static int amdgpu_umc_loop_all_aid (struct amdgpu_device *adev,umc_func func, +void *data) +{ +uint32_t umc_node_inst; +uint32_t node_inst; +uint32_t umc_inst; +uint32_t ch_inst; +int ret; + +/* +* This loop is done based on the following - +* umc.active mask = mask of active umc instances across all nodes +* umc.umc_inst_num = maximum number of umc instancess per node +* umc.node_inst_num = maximum number of node instances +* Channel instances are not assumed to be harvested. +*/ +dev_dbg (adev->dev,"active umcs :%lx umc_inst per node: %d" , + adev->umc.active_mask, adev->umc.umc_inst_num); +for_each_set_bit (umc_node_inst, &(adev->umc.active_mask), + adev->umc.node_inst_num * adev->umc.umc_inst_num) { + node_inst = umc_node_inst / adev->umc.umc_inst_num; + umc_inst = umc_node_inst % adev->umc.umc_inst_num; +LOOP_UMC_CH_INST (ch_inst) { +dev_dbg (adev->dev, +"node_inst :%d umc_inst: %d ch_inst: %d" , + node_inst, umc_inst, ch_inst); + ret =func (adev, node_inst, umc_inst, ch_inst, data); +if (ret) { +dev_err (adev->dev, +"Node %d umc %d ch %d func returns %d\n" , + node_inst, umc_inst, ch_inst, ret); +return ret; + } + } + } + +return 0 ; +} +int amdgpu_umc_loop_channels (struct amdgpu_device *adev,umc_func func,void *data) {
@@ -391,6 +430,9 @@ int amdgpu_umc_loop_channels(struct amdgpu_device *adev,uint32_t ch_inst =0 ;int ret =0 ; +if (adev->aid_mask) +return amdgpu_umc_loop_all_aid (adev, func, data); +if (adev->umc.node_inst_num) { LOOP_UMC_EACH_NODE_INST_AND_CH(node_inst, umc_inst, ch_inst) { ret =func (adev, node_inst, umc_inst, ch_inst, data);
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -1
@@ -1461,7 +1461,6 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev) adev->umc.umc_inst_num =UMC_V12_0_UMC_INSTANCE_NUM ; adev->umc.node_inst_num /=UMC_V12_0_UMC_INSTANCE_NUM ; adev->umc.channel_offs =UMC_V12_0_PER_CHANNEL_OFFSET ; - adev->umc.active_mask = adev->aid_mask; adev->umc.retire_unit =UMC_V12_0_BAD_PAGE_NUM_PER_CHANNEL ;if (!adev->gmc.xgmi.connected_to_cpu && !adev->gmc.is_app_apu) adev->umc.ras = &umc_v12_0_ras;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 402/626 drm/amdgpu: enlarge the VBIOS binary size limit
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiwu Zhang <[email protected]>
[ Upstream commit 667b96134c9e206aebe40985650bf478935cbe04 ]
Some chips have a larger VBIOS file so raise the size limit to support the flashing tool.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -1
@@ -44,7 +44,7 @@#include "amdgpu_securedisplay.h" #include "amdgpu_atomfirmware.h" -#define AMD_VBIOS_FILE_MAX_SIZE_B (1024*1024*3) +#define AMD_VBIOS_FILE_MAX_SIZE_B (1024*1024*16)static int psp_load_smu_fw (struct psp_context *psp);static int psp_rap_terminate (struct psp_context *psp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 403/626 drm/amd/display/dm: drop hw_support check in amdgpu_dm_i2c_xfer()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 33da70bd1e115d7d73f45fb1c09f5ecc448f3f13 ]
DC supports SW i2c as well. Drop the check.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -8288,7 +8288,7 @@ static int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap,int i;int result = -EIO ; -if (!ddc_service->ddc_pin || !ddc_service->ddc_pin->hw_info.hw_supported) +if (!ddc_service->ddc_pin)return result; cmd.payloads =kcalloc (num,sizeof (struct i2c_payload ),GFP_KERNEL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 404/626 scsi: target: spc: Fix loop traversal in spc_rsoc_get_descr()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chaohai Chen <[email protected]>
[ Upstream commit 04ad06e41d1c74cc323b20a7bd023c47bd0e0c38 ]
Stop traversing after finding the appropriate descriptor.
--- drivers/target/target_core_spc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/target/target_core_spc.c +10 -4
@@ -2151,8 +2151,10 @@ spc_rsoc_get_descr(struct se_cmd *cmd, struct target_opcode_descriptor **opcode)if (descr->serv_action_valid)return TCM_INVALID_CDB_FIELD ; -if (!descr->enabled || descr->enabled (descr, cmd)) +if (!descr->enabled || descr->enabled (descr, cmd)) { *opcode = descr; +return TCM_NO_SENSE ; + }break ;case 0x2 :/*
@@ -2166,8 +2168,10 @@ spc_rsoc_get_descr(struct se_cmd *cmd, struct target_opcode_descriptor **opcode)if (descr->serv_action_valid && descr->service_action == requested_sa) {if (!descr->enabled || descr->enabled (descr, - cmd)) + cmd)) { *opcode = descr; +return TCM_NO_SENSE ; + } }else if (!descr->serv_action_valid)return TCM_INVALID_CDB_FIELD ;break ;
@@ -2180,13 +2184,15 @@ spc_rsoc_get_descr(struct se_cmd *cmd, struct target_opcode_descriptor **opcode)*/ if (descr->service_action == requested_sa)if (!descr->enabled || descr->enabled (descr, - cmd)) + cmd)) { *opcode = descr; +return TCM_NO_SENSE ; + }break ; } } -return 0 ; +return TCM_NO_SENSE ; } static sense_reason_t
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 405/626 net/mlx5: XDP, Enable TX side XDP multi-buffer support
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Lazar <[email protected]>
[ Upstream commit 1a9304859b3a4119579524c293b902a8927180f3 ]
In XDP scenarios, fragmented packets can occur if the MTU is larger than the page size, even when the packet size fits within the linear part.
If XDP multi-buffer support is disabled, the fragmented part won't be handled in the TX flow, leading to packet drops.
Since XDP multi-buffer support is always available, this commit removes the conditional check for enabling it.
This ensures that XDP multi-buffer support is always enabled, regardless of the is_xdp_mb parameter, and guarantees the handling of fragmented packets in such scenarios.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 - .../ethernet/mellanox/mlx5/core/en/params.c | 1 - .../ethernet/mellanox/mlx5/core/en/params.h | 1 - .../mellanox/mlx5/core/en/reporter_tx.c | 1 - .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 49 ++++++++----------- .../net/ethernet/mellanox/mlx5/core/en_main.c | 29 ----------- 6 files changed, 21 insertions(+), 61 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +0 -1
@@ -385,7 +385,6 @@ enum {MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE ,MLX5E_SQ_STATE_PENDING_XSK_TX ,MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC , -MLX5E_SQ_STATE_XDP_MULTIBUF , MLX5E_NUM_SQ_STATES, /* Must be kept last */ };
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +0 -1
@@ -1242,7 +1242,6 @@ void mlx5e_build_xdpsq_param(struct mlx5_core_dev *mdev,mlx5e_build_sq_param_common (mdev, param);MLX5_SET (wq, wq, log_wq_sz, params->log_sq_size); param->is_mpw =MLX5E_GET_PFLAG (params,MLX5E_PFLAG_XDP_TX_MPWQE ); - param->is_xdp_mb = !mlx5e_rx_is_linear_skb (mdev, params, xsk);mlx5e_build_tx_cq_param (mdev, params, ¶m->cqp); }
drivers/net/ethernet/mellanox/mlx5/core/en/params.h +0 -1
@@ -33,7 +33,6 @@ struct mlx5e_sq_param {struct mlx5_wq_param wq;bool is_mpw;bool is_tls; -bool is_xdp_mb;u16 stop_room; };
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +0 -1
@@ -16,7 +16,6 @@ static const char * const sq_sw_state_type_name[] = { [MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE] = "vlan_need_l2_inline", [MLX5E_SQ_STATE_PENDING_XSK_TX] = "pending_xsk_tx", [MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC] = "pending_tls_rx_resync", - [MLX5E_SQ_STATE_XDP_MULTIBUF] = "xdp_multibuf", };static int mlx5e_wait_for_sq_flush (struct mlx5e_txqsq *sq)
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +21 -28
68 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +0 -29
@@ -2030,41 +2030,12 @@ int mlx5e_open_xdpsq(struct mlx5e_channel *c, struct mlx5e_params *params, csp.min_inline_mode = sq->min_inline_mode;set_bit (MLX5E_SQ_STATE_ENABLED , &sq->state); -if (param->is_xdp_mb) -set_bit (MLX5E_SQ_STATE_XDP_MULTIBUF , &sq->state); - err =mlx5e_create_sq_rdy (c->mdev, param, &csp,0 , &sq->sqn);if (err) goto err_free_xdpsq;mlx5e_set_xmit_fp (sq, param->is_mpw); -if (!param->is_mpw && !test_bit (MLX5E_SQ_STATE_XDP_MULTIBUF , &sq->state)) { -unsigned int ds_cnt =MLX5E_TX_WQE_EMPTY_DS_COUNT +1 ; -unsigned int inline_hdr_sz =0 ; -int i; - -if (sq->min_inline_mode !=MLX5_INLINE_MODE_NONE ) { - inline_hdr_sz =MLX5E_XDP_MIN_INLINE ; - ds_cnt++; - } - -/* Pre initialize fixed WQE fields */ -for (i =0 ; i <mlx5_wq_cyc_get_size (&sq->wq); i++) { -struct mlx5e_tx_wqe *wqe =mlx5_wq_cyc_get_wqe (&sq->wq, i); -struct mlx5_wqe_ctrl_seg *cseg = &wqe->ctrl; -struct mlx5_wqe_eth_seg *eseg = &wqe->eth; - - sq->db.wqe_info[i] = (struct mlx5e_xdp_wqe_info ) { - .num_wqebbs =1 , - .num_pkts =1 , - }; - - cseg->qpn_ds =cpu_to_be32 ((sq->sqn <<8 ) | ds_cnt); - eseg->inline_hdr.sz =cpu_to_be16 (inline_hdr_sz); - } - } -return 0 ; err_free_xdpsq:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 406/626 net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Lazar <[email protected]>
[ Upstream commit 95b9606b15bb3ce1198d28d2393dd0e1f0a5f3e9 ]
Current loopback test validation ignores non-linear SKB case in the SKB access, which can lead to failures in scenarios such as when HW GRO is enabled.
Linearize the SKB so both cases will be handled.
--- drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c +3 -0
@@ -166,6 +166,9 @@ mlx5e_test_loopback_validate(struct sk_buff *skb,struct udphdr *udph;struct iphdr *iph; +if (skb_linearize (skb)) + goto out; +/* We are only going to peek, no need to clone the SKB */ if (MLX5E_TEST_PKT_SIZE -ETH_HLEN >skb_headlen (skb)) goto out;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 407/626 net/mlx5e: set the tx_queue_len for pfifo_fast
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Tu <[email protected]>
[ Upstream commit a38cc5706fb9f7dc4ee3a443f61de13ce1e410ed ]
By default, the mq netdev creates a pfifo_fast qdisc. On a system with 16 core, the pfifo_fast with 3 bands consumes 16 * 3 * 8 (size of pointer) * 1024 (default tx queue len) = 393KB. The patch sets the tx qlen to representor default value, 128 (1<<MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE), which consumes 16 * 3 * 8 * 128 = 49KB, saving 344KB for each representor at ECPF.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2 -0
@@ -885,6 +885,8 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev, netdev->ethtool_ops = &mlx5e_rep_ethtool_ops; netdev->watchdog_timeo =15 *HZ ; +if (mlx5_core_is_ecpf (mdev)) + netdev->tx_queue_len =1 <<MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE ;#if IS_ENABLED (CONFIG_MLX5_CLS_ACT ) netdev->hw_features |=NETIF_F_HW_TC ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 408/626 net/mlx5e: reduce rep rxq depth to 256 for ECPF
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Tu <[email protected]>
[ Upstream commit b9cc8f9d700867aaa77aedddfea85e53d5e5d584 ]
By experiments, a single queue representor netdev consumes kernel memory around 2.8MB, and 1.8MB out of the 2.8MB is due to page pool for the RXQ. Scaling to a thousand representors consumes 2.8GB, which becomes a memory pressure issue for embedded devices such as BlueField-2 16GB / BlueField-3 32GB memory.
Since representor netdevs mostly handles miss traffic, and ideally, most of the traffic will be offloaded, reduce the default non-uplink rep netdev's RXQ default depth from 1024 to 256 if mdev is ecpf eswitch manager. This saves around 1MB of memory per regular RQ, (1024 - 256) * 2KB, allocated from page pool.
With rxq depth of 256, the netlink page pool tool reports $./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \
--dump page-pool-get
{'id': 277,
'ifindex': 9,
'inflight': 128,
'inflight-mem': 786432,
'napi-id': 775}]
This is due to mtu 1500 + headroom consumes half pages, so 256 rxq entries consumes around 128 pages (thus create a page pool with size 128), shown above at inflight.
Note that each netdev has multiple types of RQs, including Regular RQ, XSK, PTP, Drop, Trap RQ. Since non-uplink representor only supports regular rq, this patch only changes the regular RQ's default depth.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +3 -0
@@ -65,6 +65,7 @@#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \ max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)#define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1 +#define MLX5E_REP_PARAMS_DEF_LOG_RQ_SIZE 0x8static const char mlx5e_rep_driver_name[] ="mlx5e_rep" ;
@@ -854,6 +855,8 @@ static void mlx5e_build_rep_params(struct net_device *netdev)/* RQ */ mlx5e_build_rq_params (mdev, params); +if (!mlx5e_is_uplink_rep (priv) &&mlx5_core_is_ecpf (mdev)) + params->log_rq_mtu_frames =MLX5E_REP_PARAMS_DEF_LOG_RQ_SIZE ;/* If netdev is already registered (e.g. move from nic profile to uplink, * RTNL lock must be held before triggering netdev notifiers.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 409/626 net/mlx5e: reduce the max log mpwrq sz for ECPF and reps
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Tu <[email protected]>
[ Upstream commit e1d68ea58c7e9ebacd9ad7a99b25a3578fa62182 ]
For the ECPF and representors, reduce the max MPWRQ size from 256KB (18) to 128KB (17). This prepares the later patch for saving representor memory.
With Striding RQ, there is a minimum of 4 MPWQEs. So with 128KB of max MPWRQ size, the minimal memory is 4 * 128KB = 512KB. When creating page pool, consider 1500 mtu, the minimal page pool size will be 512KB/4KB = 128 pages = 256 rx ring entries (2 entries per page).
Before this patch, setting RX ringsize (ethtool -G rx) to 256 causes driver to allocate page pool size more than it needs due to max MPWRQ is 256KB (18). Ex: 4 * 256KB = 1MB, 1MB/4KB = 256 pages, but actually 128 pages is good enough. Reducing the max MPWRQ to 128KB fixes the limitation.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 -- .../net/ethernet/mellanox/mlx5/core/en/params.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +0 -2
@@ -94,8 +94,6 @@ struct page_pool;#define MLX5_MPWRQ_DEF_LOG_STRIDE_SZ (mdev) \ MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, order_base_2(MLX5E_RX_MAX_HEAD)) -#define MLX5_MPWRQ_MAX_LOG_WQE_SZ 18 -/* Keep in sync with mlx5e_mpwrq_log_wqe_sz. * These are theoretical maximums, which can be further restricted by * capabilities. These values are used for static resource allocations and
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +11 -4
@@ -10,6 +10,9 @@#include <net/page_pool/types.h> #include <net/xdp_sock_drv.h> +#define MLX5_MPWRQ_MAX_LOG_WQE_SZ 18 +#define MLX5_REP_MPWRQ_MAX_LOG_WQE_SZ 17 +static u8 mlx5e_mpwrq_min_page_shift (struct mlx5_core_dev *mdev) {u8 min_page_shift =MLX5_CAP_GEN_2 (mdev, log_min_mkey_entity_size);
@@ -103,18 +106,22 @@ u8 mlx5e_mpwrq_log_wqe_sz(struct mlx5_core_dev *mdev, u8 page_shift, enum mlx5e_mpwrq_umr_mode umr_mode) {u8 umr_entry_size =mlx5e_mpwrq_umr_entry_size (umr_mode); -u8 max_pages_per_wqe, max_log_mpwqe_size; +u8 max_pages_per_wqe, max_log_wqe_size_calc; +u8 max_log_wqe_size_cap;u16 max_wqe_size;/* Keep in sync with MLX5_MPWRQ_MAX_PAGES_PER_WQE. */ max_wqe_size =mlx5e_get_max_sq_aligned_wqebbs (mdev) *MLX5_SEND_WQE_BB ; max_pages_per_wqe =ALIGN_DOWN (max_wqe_size -sizeof (struct mlx5e_umr_wqe ),MLX5_UMR_FLEX_ALIGNMENT ) / umr_entry_size; - max_log_mpwqe_size =ilog2 (max_pages_per_wqe) + page_shift; + max_log_wqe_size_calc =ilog2 (max_pages_per_wqe) + page_shift; + +WARN_ON_ONCE (max_log_wqe_size_calc <MLX5E_ORDER2_MAX_PACKET_MTU ); -WARN_ON_ONCE (max_log_mpwqe_size <MLX5E_ORDER2_MAX_PACKET_MTU ); + max_log_wqe_size_cap =mlx5_core_is_ecpf (mdev) ? +MLX5_REP_MPWRQ_MAX_LOG_WQE_SZ :MLX5_MPWRQ_MAX_LOG_WQE_SZ ; -return min_t (u8, max_log_mpwqe_size,MLX5_MPWRQ_MAX_LOG_WQE_SZ ); +return min_t (u8, max_log_wqe_size_calc, max_log_wqe_size_cap); } u8 mlx5e_mpwrq_pages_per_wqe(struct mlx5_core_dev *mdev, u8 page_shift,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 410/626 drm/v3d: Add clock handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Wahren <[email protected]>
[ Upstream commit 4dd40b5f9c3d89b67af0dbe059cf4a51aac6bf06 ]
Since the initial commit 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") the struct v3d_dev reserved a pointer for an optional V3D clock. But there wasn't any code, which fetched it. So add the missing clock handling before accessing any V3D registers.
--- drivers/gpu/drm/v3d/v3d_drv.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/drm/v3d/v3d_drv.c +20 -5
@@ -286,11 +286,21 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)if (ret)return ret; + v3d->clk =devm_clk_get_optional (dev,NULL ); +if (IS_ERR (v3d->clk)) +return dev_err_probe (dev,PTR_ERR (v3d->clk),"Failed to get V3D clock\n" ); + + ret =clk_prepare_enable (v3d->clk); +if (ret) { +dev_err (&pdev->dev,"Couldn't enable the V3D clock\n" ); +return ret; + } + mmu_debug =V3D_READ (V3D_MMU_DEBUG_INFO ); mask =DMA_BIT_MASK (30 +V3D_GET_FIELD (mmu_debug,V3D_MMU_PA_WIDTH )); ret =dma_set_mask_and_coherent (dev, mask);if (ret) -return ret; + goto clk_disable; v3d->va_width =30 +V3D_GET_FIELD (mmu_debug,V3D_MMU_VA_WIDTH );
@@ -310,28 +320,29 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) ret =PTR_ERR (v3d->reset);if (ret == -EPROBE_DEFER ) -return ret; + goto clk_disable; v3d->reset =NULL ; ret =map_regs (v3d, &v3d->bridge_regs,"bridge" );if (ret) {dev_err (dev,"Failed to get reset control or bridge regs\n" ); -return ret; + goto clk_disable; } }if (v3d->ver <41 ) { ret =map_regs (v3d, &v3d->gca_regs,"gca" );if (ret) -return ret; + goto clk_disable; } v3d->mmu_scratch =dma_alloc_wc (dev,4096 , &v3d->mmu_scratch_paddr,GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);if (!v3d->mmu_scratch) {dev_err (dev,"Failed to allocate MMU scratch page\n" ); -return -ENOMEM ; + ret = -ENOMEM ; + goto clk_disable; } ret =v3d_gem_init (drm);
@@ -360,6 +371,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)v3d_gem_destroy (drm); dma_free:dma_free_wc (dev,4096 , v3d->mmu_scratch, v3d->mmu_scratch_paddr); +clk_disable: +clk_disable_unprepare (v3d->clk);return ret; }
@@ -377,6 +390,8 @@ static void v3d_platform_drm_remove(struct platform_device *pdev)dma_free_wc (v3d->drm.dev,4096 , v3d->mmu_scratch, v3d->mmu_scratch_paddr); + +clk_disable_unprepare (v3d->clk); }static struct platform_driver v3d_platform_driver = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 411/626 xfrm: prevent high SEQ input in non-ESN mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit e3aa43a50a6455831e3c32dabc7ece38d9cd9d05 ]
In non-ESN mode, the SEQ numbers are limited to 32 bits and seq_hi/oseq_hi are not used. So make sure that user gets proper error message, in case such assignment occurred.
--- net/xfrm/xfrm_user.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
net/xfrm/xfrm_user.c +12 -0
@@ -178,6 +178,12 @@ static inline int verify_replay(struct xfrm_usersa_info *p, "Replay seq and seq_hi should be 0 for output SA");return -EINVAL ; } +if (rs->oseq_hi && !(p->flags &XFRM_STATE_ESN )) { +NL_SET_ERR_MSG ( + extack, +"Replay oseq_hi should be 0 in non-ESN mode for output SA" ); +return -EINVAL ; + }if (rs->bmp_len) {NL_SET_ERR_MSG (extack,"Replay bmp_len should 0 for output SA" );return -EINVAL ;
@@ -190,6 +196,12 @@ static inline int verify_replay(struct xfrm_usersa_info *p, "Replay oseq and oseq_hi should be 0 for input SA");return -EINVAL ; } +if (rs->seq_hi && !(p->flags &XFRM_STATE_ESN )) { +NL_SET_ERR_MSG ( + extack, +"Replay seq_hi should be 0 in non-ESN mode for input SA" ); +return -EINVAL ; + } }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 412/626 wifi: ath12k: fix the ampdu id fetch in the HAL_RX_MPDU_START TLV
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit dff4f278ee1ef12d822b7ed2a1048d27037209bb ]
Currently, ampdu id is update with peer id mask which is incorrect. Therefore, update the ampdu id with PPDU id mask value. Also move the ampdu_id field inside the user stats since it is a user id based statistics.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_mon.c | 16 ++++++++++------ drivers/net/wireless/ath/ath12k/hal_rx.h | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath12k/dp_mon.c +10 -6
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "dp_mon.h"
@@ -666,6 +666,11 @@ ath12k_dp_mon_rx_parse_status_tlv(struct ath12k_base *ab,if (userid <HAL_MAX_UL_MU_USERS ) {struct hal_rx_user_status *rxuser_stats = &ppdu_info->userstats[userid]; + +if (ppdu_info->num_mpdu_fcs_ok >1 || + ppdu_info->num_mpdu_fcs_err >1 ) + ppdu_info->userstats[userid].ampdu_present = true; + ppdu_info->num_users +=1 ;ath12k_dp_mon_rx_handle_ofdma_info (tlv_data, rxuser_stats);
@@ -783,8 +788,8 @@ ath12k_dp_mon_rx_parse_status_tlv(struct ath12k_base *ab,if (userid <HAL_MAX_UL_MU_USERS ) { info[0 ] =__le32_to_cpu (mpdu_start->info0); ppdu_info->userid = userid; - ppdu_info->ampdu_id[userid] = -u32_get_bits (info[0 ],HAL_RX_MPDU_START_INFO1_PEERID ); + ppdu_info->userstats[userid].ampdu_id = +u32_get_bits (info[0 ],HAL_RX_MPDU_START_INFO0_PPDU_ID ); } mon_mpdu =kzalloc (sizeof (*mon_mpdu),GFP_ATOMIC );
@@ -1020,15 +1025,14 @@ static void ath12k_dp_mon_update_radiotap(struct ath12k *ar, {struct ieee80211_supported_band *sband;u8 *ptr =NULL ; -u16 ampdu_id = ppduinfo->ampdu_id[ppduinfo->userid]; rxs->flag |=RX_FLAG_MACTIME_START ; rxs->signal = ppduinfo->rssi_comb +ATH12K_DEFAULT_NOISE_FLOOR ; rxs->nss = ppduinfo->nss +1 ; -if (ampdu_id) { +if (ppduinfo->userstats[ppduinfo->userid].ampdu_present) { rxs->flag |=RX_FLAG_AMPDU_DETAILS ; - rxs->ampdu_reference = ampdu_id; + rxs->ampdu_reference = ppduinfo->userstats[ppduinfo->userid].ampdu_id; }if (ppduinfo->he_mu_flags) {
drivers/net/wireless/ath/ath12k/hal_rx.h +2 -1
@@ -143,6 +143,8 @@ struct hal_rx_user_status {u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP ];u32 mpdu_ok_byte_count;u32 mpdu_err_byte_count; +bool ampdu_present; +u16 ampdu_id; };#define HAL_MAX_UL_MU_USERS 37
@@ -226,7 +228,6 @@ struct hal_rx_mon_ppdu_info {u8 addr4[ETH_ALEN ];struct hal_rx_user_status userstats[HAL_MAX_UL_MU_USERS ];u8 userid; -u16 ampdu_id[HAL_MAX_UL_MU_USERS ];bool first_msdu_in_mpdu;bool is_ampdu;u8 medium_prot_type;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 413/626 mptcp: pm: userspace: flags: clearer msg if no remote addr
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
[ Upstream commit 58b21309f97b08b6b9814d1ee1419249eba9ef08 ]
Since its introduction in commit 892f396c8e68 ("mptcp: netlink: issue MP_PRIO signals from userspace PMs"), it was mandatory to specify the remote address, because of the 'if (rem->addr.family == AF_UNSPEC)' check done later one.
In theory, this attribute can be optional, but it sounds better to be precise to avoid sending the MP_PRIO on the wrong subflow, e.g. if there are multiple subflows attached to the same local ID. This can be relaxed later on if there is a need to act on multiple subflows with one command.
For the moment, the check to see if attr_rem is NULL can be removed, because mptcp_pm_parse_entry() will do this check as well, no need to do that differently here.
--- net/mptcp/pm_userspace.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/mptcp/pm_userspace.c +3 -5
@@ -589,11 +589,9 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)if (ret <0 ) goto set_flags_err; -if (attr_rem) { - ret =mptcp_pm_parse_entry (attr_rem, info, false, &rem); -if (ret <0 ) - goto set_flags_err; - } + ret =mptcp_pm_parse_entry (attr_rem, info, false, &rem); +if (ret <0 ) + goto set_flags_err;if (loc.addr.family ==AF_UNSPEC || rem.addr.family ==AF_UNSPEC ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 414/626 wifi: iwlwifi: use correct IMR dump variable
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 21e4d29ac0def546d57bacebe4a51cbed1209b03 ]
We shouldn't dump the reg_data here which dumps the last entry again, it should use the imr_reg_data.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +2 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2005-2014, 2018-2024 Intel Corporation +* Copyright (C) 2005-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH */
@@ -2691,7 +2691,7 @@ static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt, }/* collect DRAM_IMR region in the last */ if (imr_reg_data.reg_tlv) - size +=iwl_dump_ini_mem (fwrt, list, ®_data, + size +=iwl_dump_ini_mem (fwrt, list, &imr_reg_data, &iwl_dump_ini_region_ops[IWL_FW_INI_REGION_DRAM_IMR ]);if (size) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 415/626 wifi: iwlwifi: dont warn during reprobe
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 696cca64308dc641d0bbe4aa2c09dd9752aa288d ]
During reprobe, the sw state is being destroyd, and so is the connection. When the peer STA is being removed, the opmode sends a command to flush the TXQs of the STA and uses iwl_trans_wait_txq_empty.
This one warns if the FW is not alive, but it really shouldn't if there is a FW error - and return silently instead, just like we do when sending a hcmd.
--- drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/iwl-trans.c +3 -0
@@ -454,6 +454,9 @@ IWL_EXPORT_SYMBOL(iwl_trans_txq_enable_cfg);int iwl_trans_wait_txq_empty (struct iwl_trans *trans,int queue) { +if (unlikely (test_bit (STATUS_FW_ERROR , &trans->status))) +return -EIO ; +if (WARN_ONCE (trans->state !=IWL_TRANS_FW_ALIVE ,"bad state = %d\n" , trans->state))return -EIO ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 416/626 wifi: mac80211: dont unconditionally call drv_mgd_complete_tx()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 1798271b3604b902d45033ec569f2bf77e94ecc2 ]
We might not have called drv_mgd_prepare_tx(), so only call drv_mgd_complete_tx() under the same conditions.
--- net/mac80211/mlme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/mlme.c +2 -1
@@ -3589,7 +3589,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,if (tx)ieee80211_flush_queues (local, sdata, false); -drv_mgd_complete_tx (sdata->local, sdata, &info); +if (tx || frame_buf) +drv_mgd_complete_tx (sdata->local, sdata, &info);/* clear AP addr only after building the needed mgmt frames */ eth_zero_addr (sdata->deflink.u.mgd.bssid);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 417/626 wifi: mac80211: remove misplaced drv_mgd_complete_tx() call
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit f4995cdc4d02d0abc8e9fcccad5c71ce676c1e3f ]
In the original commit 15fae3410f1d ("mac80211: notify driver on mgd TX completion") I evidently made a mistake and placed the call in the "associated" if, rather than the "assoc_data". Later I noticed the missing call and placed it in commit c042600c17d8 ("wifi: mac80211: adding missing drv_mgd_complete_tx() call"), but didn't remove the wrong one. Remove it now.
--- net/mac80211/mlme.c | 1 - 1 file changed, 1 deletion(-)
net/mac80211/mlme.c +0 -1
@@ -9220,7 +9220,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,ieee80211_report_disconnect (sdata, frame_buf,sizeof (frame_buf), true, req->reason_code, false); -drv_mgd_complete_tx (sdata->local, sdata, &info);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 418/626 wifi: mac80211: set ieee80211_prep_tx_info::link_id upon Auth Rx
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emmanuel Grumbach <[email protected]>
[ Upstream commit 8c60179b64434894eac1ffab7396bac131bc8b6e ]
This will be used by the low level driver.
Note that link_id will be 0 in case of a non-MLO authentication. Also fix a call-site of mgd_prepare_tx() where the link_id was not populated.
Update the documentation to reflect the current state ieee80211_prep_tx_info::link_id is also available in mgd_complete_tx().
--- include/net/mac80211.h | 4 ++-- net/mac80211/driver-ops.h | 3 ++- net/mac80211/mlme.c | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-)
include/net/mac80211.h +2 -2
@@ -7,7 +7,7 @@* Copyright 2007-2010 Johannes Berg <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 - 2017 Intel Deutschland GmbH -* Copyright (C) 2018 - 2024 Intel Corporation +* Copyright (C) 2018 - 2025 Intel Corporation */ #ifndef MAC80211_H
@@ -3803,7 +3803,7 @@ enum ieee80211_reconfig_type {* @was_assoc: set if this call is due to deauth/disassoc * while just having been associated * @link_id: the link id on which the frame will be TX'ed. -* Only used with the mgd_prepare_tx() method. +* 0 for a non-MLO connection. */ struct ieee80211_prep_tx_info {u16 duration;
net/mac80211/driver-ops.h +2 -1
@@ -2,7 +2,7 @@/* * Portions of this file * Copyright(c) 2016 Intel Deutschland GmbH -* Copyright (C) 2018-2019, 2021-2024 Intel Corporation +* Copyright (C) 2018-2019, 2021-2025 Intel Corporation */ #ifndef __MAC80211_DRIVER_OPS
@@ -955,6 +955,7 @@ static inline void drv_mgd_complete_tx(struct ieee80211_local *local,return ;WARN_ON_ONCE (sdata->vif.type !=NL80211_IFTYPE_STATION ); + info->link_id = info->link_id <0 ?0 : info->link_id;trace_drv_mgd_complete_tx (local, sdata, info->duration, info->subtype, info->success);if (local->ops->mgd_complete_tx)
net/mac80211/mlme.c +3 -1
@@ -8,7 +8,7 @@* Copyright 2007, Michael Wu <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 - 2017 Intel Deutschland GmbH -* Copyright (C) 2018 - 2024 Intel Corporation +* Copyright (C) 2018 - 2025 Intel Corporation */ #include <linux/delay.h>
@@ -4307,6 +4307,8 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, auth_transaction =le16_to_cpu (mgmt->u.auth.auth_transaction); status_code =le16_to_cpu (mgmt->u.auth.status_code); + info.link_id = ifmgd->auth_data->link_id; + if (auth_alg != ifmgd->auth_data->algorithm || (auth_alg != WLAN_AUTH_SAE && auth_transaction != ifmgd->auth_data->expected_transaction) ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 419/626 net: fec: Refactor MAC reset to function
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Csókás, Bence <[email protected]>
[ Upstream commit 67800d296191d0a9bde0a7776f99ca1ddfa0fc26 ]
The core is reset both in fec_restart() (called on link-up) and fec_stop() (going to sleep, driver remove etc.). These two functions had their separate implementations, which was at first only a register write and a udelay() (and the accompanying block comment). However, since then we got soft-reset (MAC disable) and Wake-on-LAN support, which meant that these implementations diverged, often causing bugs.
For instance, as of now, fec_stop() does not check for FEC_QUIRK_NO_HARD_RESET, meaning the MII/RMII mode is cleared on eg. a PM power-down event; and fec_restart() missed the refactor renaming the "magic" constant 1 to FEC_ECR_RESET.
To harmonize current implementations, and eliminate this source of potential future bugs, refactor implementation to a common function.
--- drivers/net/ethernet/freescale/fec_main.c | 52 +++++++++++------------ 1 file changed, 25 insertions(+), 27 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +25 -27
@@ -1098,6 +1098,29 @@ static void fec_enet_enable_ring(struct net_device *ndev) } } +/* Whack a reset. We should wait for this. +* For i.MX6SX SOC, enet use AXI bus, we use disable MAC +* instead of reset MAC itself. +*/ +static void fec_ctrl_reset (struct fec_enet_private *fep,bool allow_wol) +{ +u32 val; + +if (!allow_wol || !(fep->wol_flag &FEC_WOL_FLAG_SLEEP_ON )) { +if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES || + ((fep->quirks &FEC_QUIRK_NO_HARD_RESET ) && fep->link)) { +writel (0 , fep->hwp +FEC_ECNTRL ); + }else { +writel (FEC_ECR_RESET , fep->hwp +FEC_ECNTRL ); +udelay (10 ); + } + }else { + val =readl (fep->hwp +FEC_ECNTRL ); + val |= (FEC_ECR_MAGICEN |FEC_ECR_SLEEP ); +writel (val, fep->hwp +FEC_ECNTRL ); + } +} +/* * This function is called to start or restart the FEC during a link * change, transmit timeout, or to reconfigure the FEC. The network
@@ -1114,17 +1137,7 @@ fec_restart(struct net_device *ndev)if (fep->bufdesc_ex)fec_ptp_save_state (fep); -/* Whack a reset. We should wait for this. -* For i.MX6SX SOC, enet use AXI bus, we use disable MAC -* instead of reset MAC itself. -*/ -if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES || - ((fep->quirks &FEC_QUIRK_NO_HARD_RESET ) && fep->link)) { -writel (0 , fep->hwp +FEC_ECNTRL ); - }else { -writel (1 , fep->hwp +FEC_ECNTRL ); -udelay (10 ); - } +fec_ctrl_reset (fep, false);/* * enet-mac reset will reset mac address registers too,
@@ -1378,22 +1391,7 @@ fec_stop(struct net_device *ndev)if (fep->bufdesc_ex)fec_ptp_save_state (fep); -/* Whack a reset. We should wait for this. -* For i.MX6SX SOC, enet use AXI bus, we use disable MAC -* instead of reset MAC itself. -*/ -if (!(fep->wol_flag &FEC_WOL_FLAG_SLEEP_ON )) { -if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES ) { -writel (0 , fep->hwp +FEC_ECNTRL ); - }else { -writel (FEC_ECR_RESET , fep->hwp +FEC_ECNTRL ); -udelay (10 ); - } - }else { - val =readl (fep->hwp +FEC_ECNTRL ); - val |= (FEC_ECR_MAGICEN |FEC_ECR_SLEEP ); -writel (val, fep->hwp +FEC_ECNTRL ); - } +fec_ctrl_reset (fep, true);writel (fep->phy_speed, fep->hwp +FEC_MII_SPEED );writel (FEC_DEFAULT_IMASK , fep->hwp +FEC_IMASK );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 420/626 powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaurav Batra <[email protected]>
[ Upstream commit 6aa989ab2bd0d37540c812b4270006ff794662e7 ]
iommu_mem_notifier() is invoked when RAM is dynamically added/removed. This notifier call is responsible to add/remove TCEs from the Dynamic DMA Window (DDW) when TCEs are pre-mapped. TCEs are pre-mapped only for RAM and not for persistent memory (pmemory). For DMA buffers in pmemory, TCEs are dynamically mapped when the device driver instructs to do so.
The issue is 'daxctl' command is capable of adding pmemory as "System RAM" after LPAR boot. The command to do so is -
daxctl reconfigure-device --mode=system-ram dax0.0 --force
This will dynamically add pmemory range to LPAR RAM eventually invoking iommu_mem_notifier(). The address range of pmemory is way beyond the Max RAM that the LPAR can have. Which means, this range is beyond the DDW created for the device, at device initialization time.
As a result when TCEs are pre-mapped for the pmemory range, by iommu_mem_notifier(), PHYP HCALL returns H_PARAMETER. This failed the command, daxctl, to add pmemory as RAM.
The solution is to not pre-map TCEs for pmemory.
--- arch/powerpc/include/asm/mmzone.h | 1 + arch/powerpc/mm/numa.c | 2 +- arch/powerpc/platforms/pseries/iommu.c | 29 ++++++++++++++------------ 3 files changed, 18 insertions(+), 14 deletions(-)
arch/powerpc/include/asm/mmzone.h +1 -0
@@ -29,6 +29,7 @@ extern cpumask_var_t node_to_cpumask_map[];#ifdef CONFIG_MEMORY_HOTPLUG extern unsigned long max_pfn;u64 memory_hotplug_max (void ); +u64 hot_add_drconf_memory_max (void );#else #define memory_hotplug_max () memblock_end_of_DRAM()#endif
arch/powerpc/mm/numa.c +1 -1
@@ -1336,7 +1336,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)return nid; } -static u64 hot_add_drconf_memory_max (void ) +u64 hot_add_drconf_memory_max (void ) {struct device_node *memory =NULL ;struct device_node *dn =NULL ;
arch/powerpc/platforms/pseries/iommu.c +16 -13
@@ -1284,17 +1284,13 @@ static LIST_HEAD(failed_ddw_pdn_list);static phys_addr_t ddw_memory_hotplug_max (void ) { -resource_size_t max_addr =memory_hotplug_max (); -struct device_node *memory; +resource_size_t max_addr; -for_each_node_by_type (memory,"memory" ) { -struct resource res; - -if (of_address_to_resource (memory,0 , &res)) -continue ; - - max_addr =max_t (resource_size_t, max_addr, res.end +1 ); - } +#if defined(CONFIG_NUMA ) && defined(CONFIG_MEMORY_HOTPLUG ) + max_addr =hot_add_drconf_memory_max (); +#else + max_addr =memblock_end_of_DRAM (); +#endif return max_addr; }
@@ -1600,7 +1596,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)if (direct_mapping) {/* DDW maps the whole partition, so enable direct DMA mapping */ - ret =walk_system_ram_range (0 ,memblock_end_of_DRAM () >>PAGE_SHIFT , + ret =walk_system_ram_range (0 ,ddw_memory_hotplug_max () >>PAGE_SHIFT , win64->value, tce_setrange_multi_pSeriesLP_walk);if (ret) { dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",
@@ -2349,11 +2345,17 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,struct memory_notify *arg = data;int ret =0 ; +/* This notifier can get called when onlining persistent memory as well. +* TCEs are not pre-mapped for persistent memory. Persistent memory will +* always be above ddw_memory_hotplug_max() +*/ +switch (action) {case MEM_GOING_ONLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct) { +if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < +ddw_memory_hotplug_max ()) { ret |=tce_setrange_multi_pSeriesLP (arg->start_pfn, arg->nr_pages, window->prop); }
@@ -2365,7 +2367,8 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case MEM_OFFLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct) { +if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < +ddw_memory_hotplug_max ()) { ret |=tce_clearrange_multi_pSeriesLP (arg->start_pfn, arg->nr_pages, window->prop); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 421/626 powerpc/pseries/iommu: create DDW for devices with DMA mask less than 64-bits
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaurav Batra <[email protected]>
[ Upstream commit 67dfc11982f7e3c37f0977e74671da2391b29181 ]
Starting with PAPR level 2.13, platform supports placing PHB in limited address mode. Devices that support DMA masks less that 64-bit but greater than 32-bits are placed in limited address mode. In this mode, the starting DMA address returned by the DDW is 4GB.
When the device driver calls dma_supported, with mask less then 64-bit, the PowerPC IOMMU driver places PHB in the Limited Addressing Mode before creating DDW.
--- arch/powerpc/platforms/pseries/iommu.c | 110 +++++++++++++++++++++---- 1 file changed, 94 insertions(+), 16 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +94 -16
@@ -52,7 +52,8 @@ enum {enum {DDW_EXT_SIZE =0 ,DDW_EXT_RESET_DMA_WIN =1 , -DDW_EXT_QUERY_OUT_SIZE =2 +DDW_EXT_QUERY_OUT_SIZE =2 , +DDW_EXT_LIMITED_ADDR_MODE =3 };static struct iommu_table *iommu_pseries_alloc_table (int node)
@@ -1327,6 +1328,54 @@ static void reset_dma_window(struct pci_dev *dev, struct device_node *par_dn) ret); } +/* +* Platforms support placing PHB in limited address mode starting with LoPAR +* level 2.13 implement. In this mode, the DMA address returned by DDW is over +* 4GB but, less than 64-bits. This benefits IO adapters that don't support +* 64-bits for DMA addresses. +*/ +static int limited_dma_window (struct pci_dev *dev,struct device_node *par_dn) +{ +int ret; +u32 cfg_addr, reset_dma_win, las_supported; +u64 buid; +struct device_node *dn; +struct pci_dn *pdn; + + ret =ddw_read_ext (par_dn,DDW_EXT_RESET_DMA_WIN , &reset_dma_win); +if (ret) + goto out; + + ret =ddw_read_ext (par_dn,DDW_EXT_LIMITED_ADDR_MODE , &las_supported); + +/* Limited Address Space extension available on the platform but DDW in +* limited addressing mode not supported +*/ +if (!ret && !las_supported) + ret = -EPROTO ; + +if (ret) { +dev_info (&dev->dev,"Limited Address Space for DDW not Supported, err: %d" , ret); + goto out; + } + + dn =pci_device_to_OF_node (dev); + pdn =PCI_DN (dn); + buid = pdn->phb->buid; + cfg_addr = (pdn->busno <<16 ) | (pdn->devfn <<8 ); + + ret =rtas_call (reset_dma_win,4 ,1 ,NULL , cfg_addr,BUID_HI (buid), +BUID_LO (buid),1 ); +if (ret) +dev_info (&dev->dev, +"ibm,reset-pe-dma-windows(%x) for Limited Addr Support: %x %x %x returned %d " , + reset_dma_win, cfg_addr,BUID_HI (buid),BUID_LO (buid), + ret); + +out: +return ret; +} +/* Return largest page shift based on "IO Page Sizes" output of ibm,query-pe-dma-window. */ static int iommu_get_page_shift (u32 query_page_size) {
@@ -1394,7 +1443,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64* * returns true if can map all pages (direct mapping), false otherwise.. */ -static bool enable_ddw (struct pci_dev *dev,struct device_node *pdn) +static bool enable_ddw (struct pci_dev *dev,struct device_node *pdn,u64 dma_mask) {int len =0 , ret;int max_ram_len =order_base_2 (ddw_memory_hotplug_max ());
@@ -1413,6 +1462,9 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)bool pmem_present;struct pci_dn *pci =PCI_DN (pdn);struct property *default_win =NULL ; +bool limited_addr_req = false, limited_addr_enabled = false; +int dev_max_ddw; +int ddw_sz; dn =of_find_node_by_type (NULL ,"ibm,pmemory" ); pmem_present = dn !=NULL ;
@@ -1439,7 +1491,6 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)* the ibm,ddw-applicable property holds the tokens for: * ibm,query-pe-dma-window * ibm,create-pe-dma-window -* ibm,remove-pe-dma-window * for the given node in that order. * the property is actually in the parent, not the PE */
@@ -1459,6 +1510,20 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)if (ret !=0 ) goto out_failed; +/* DMA Limited Addressing required? This is when the driver has +* requested to create DDW but supports mask which is less than 64-bits +*/ + limited_addr_req = (dma_mask !=DMA_BIT_MASK (64 )); + +/* place the PHB in Limited Addressing mode */ +if (limited_addr_req) { +if (limited_dma_window (dev, pdn)) + goto out_failed; + +/* PHB is in Limited address mode */ + limited_addr_enabled = true; + } +/* * If there is no window available, remove the default DMA window, * if it's present. This will make all the resources available to the
@@ -1505,6 +1570,15 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn) goto out_failed; } +/* Maximum DMA window size that the device can address (in log2) */ + dev_max_ddw =fls64 (dma_mask); + +/* If the device DMA mask is less than 64-bits, make sure the DMA window +* size is not bigger than what the device can access +*/ + ddw_sz =min (order_base_2 (query.largest_available_block << page_shift), + dev_max_ddw); +/* * The "ibm,pmemory" can appear anywhere in the address space. * Assuming it is still backed by page structs, try MAX_PHYSMEM_BITS
@@ -1513,23 +1587,21 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)*/ len = max_ram_len;if (pmem_present) { -if (query.largest_available_block >= - (1ULL << (MAX_PHYSMEM_BITS - page_shift))) +if (ddw_sz >=MAX_PHYSMEM_BITS ) len =MAX_PHYSMEM_BITS ;else dev_info (&dev->dev,"Skipping ibm,pmemory" ); }/* check if the available block * number of ptes will map everything */ -if (query.largest_available_block < (1ULL << (len - page_shift))) { +if (ddw_sz < len) {dev_dbg (&dev->dev,"can't map partition max 0x%llx with %llu %llu-sized pages\n" ,1ULL << len, query.largest_available_block,1ULL << page_shift); - len =order_base_2 (query.largest_available_block << page_shift); - + len = ddw_sz; dynamic_mapping = true; }else { direct_mapping = !default_win_removed ||
@@ -1543,8 +1615,9 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)*/ if (default_win_removed && pmem_present && !direct_mapping) {/* DDW is big enough to be split */ -if ((query.largest_available_block << page_shift) >= -MIN_DDW_VPMEM_DMA_WINDOW + (1ULL << max_ram_len)) { +if ((1ULL << ddw_sz) >= +MIN_DDW_VPMEM_DMA_WINDOW + (1ULL << max_ram_len)) { + direct_mapping = true;/* offset of the Dynamic part of DDW */
@@ -1555,8 +1628,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn) dynamic_mapping = true;/* create max size DDW possible */ - len =order_base_2 (query.largest_available_block - << page_shift); + len = ddw_sz; } }
@@ -1685,7 +1757,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)__remove_dma_window (pdn, ddw_avail, create.liobn); out_failed: -if (default_win_removed) +if (default_win_removed || limited_addr_enabled)reset_dma_window (dev, pdn); fpdn =kzalloc (sizeof (*fpdn),GFP_KERNEL );
@@ -1704,6 +1776,9 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn) dev->dev.bus_dma_limit = dev->dev.archdata.dma_offset + (1ULL << max_ram_len); +dev_info (&dev->dev,"lsa_required: %x, lsa_enabled: %x, direct mapping: %x\n" , + limited_addr_req, limited_addr_enabled, direct_mapping); +return direct_mapping; }
@@ -1829,8 +1904,11 @@ static bool iommu_bypass_supported_pSeriesLP(struct pci_dev *pdev, u64 dma_mask) {struct device_node *dn =pci_device_to_OF_node (pdev), *pdn; -/* only attempt to use a new window if 64-bit DMA is requested */ -if (dma_mask <DMA_BIT_MASK (64 )) +/* For DDW, DMA mask should be more than 32-bits. For mask more then +* 32-bits but less then 64-bits, DMA addressing is supported in +* Limited Addressing mode. +*/ +if (dma_mask <=DMA_BIT_MASK (32 ))return false;dev_dbg (&pdev->dev,"node is %pOF\n" , dn);
@@ -1843,7 +1921,7 @@ static bool iommu_bypass_supported_pSeriesLP(struct pci_dev *pdev, u64 dma_mask)*/ pdn =pci_dma_find (dn,NULL );if (pdn &&PCI_DN (pdn)) -return enable_ddw (pdev, pdn); +return enable_ddw (pdev, pdn, dma_mask);return false; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 422/626 arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Athira Rajeev <[email protected]>
[ Upstream commit 2ffb26afa64261139e608bf087a0c1fe24d76d4d ]
perf mem report aborts as below sometimes (during some corner case) in powerpc:
# ./perf mem report 1>out *** stack smashing detected ***: terminated Aborted (core dumped)
The backtrace is as below:
__pthread_kill_implementation ()
raise ()
abort ()
__libc_message
__fortify_fail
__stack_chk_fail
hist_entry.lvl_snprintf
__sort__hpp_entry
__hist_entry__snprintf
hists.fprintf
cmd_report
cmd_mem
Snippet of code which triggers the issue
from tools/perf/util/sort.c
static int hist_entry__lvl_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
{
char out[64]; perf_mem__lvl_scnprintf(out, sizeof(out), he->mem_info);
return repsep_snprintf(bf, size, "%-*s", width, out);}
The value of "out" is filled from perf_mem_data_src value. Debugging this further showed that for some corner cases, the value of "data_src" was pointing to wrong value. This resulted in bigger size of string and causing stack check fail.
The perf mem data source values are captured in the sample via isa207_get_mem_data_src function. The initial check is to fetch the type of sampled instruction. If the type of instruction is not valid (not a load/store instruction), the function returns.
Since 'commit e16fd7f2cb1a ("perf: Use sample_flags for data_src")', data_src field is not initialized by the perf_sample_data_init() function. If the PMU driver doesn't set the data_src value to zero if type is not valid, this will result in uninitailised value for data_src. The uninitailised value of data_src resulted in stack check fail followed by abort for "perf mem report".
When requesting for data source information in the sample, the instruction type is expected to be load or store instruction. In ISA v3.0, due to hardware limitation, there are corner cases where the instruction type other than load or store is observed. In ISA v3.0 and before values "0" and "7" are considered reserved. In ISA v3.1, value "7" has been used to indicate "larx/stcx". Drop the sample if instruction type has reserved values for this field with a ISA version check. Initialize data_src to zero in isa207_get_mem_data_src if the instruction type is not load/store.
--- arch/powerpc/perf/core-book3s.c | 20 ++++++++++++++++++++ arch/powerpc/perf/isa207-common.c | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-)
arch/powerpc/perf/core-book3s.c +20 -0
@@ -2222,6 +2222,10 @@ static struct pmu power_pmu = {#define PERF_SAMPLE_ADDR_TYPE (PERF_SAMPLE_ADDR | \ PERF_SAMPLE_PHYS_ADDR | \ PERF_SAMPLE_DATA_PAGE_SIZE) + +#define SIER_TYPE_SHIFT 15 +#define SIER_TYPE_MASK (0x7ull << SIER_TYPE_SHIFT) +/* * A counter has overflowed; update its count and record * things if requested. Note that interrupts are hard-disabled
@@ -2290,6 +2294,22 @@ static void record_and_restart(struct perf_event *event, unsigned long val, is_kernel_addr(mfspr(SPRN_SIAR))) record =0 ; +/* +* SIER[46-48] presents instruction type of the sampled instruction. +* In ISA v3.0 and before values "0" and "7" are considered reserved. +* In ISA v3.1, value "7" has been used to indicate "larx/stcx". +* Drop the sample if "type" has reserved values for this field with a +* ISA version check. +*/ +if (event->attr.sample_type &PERF_SAMPLE_DATA_SRC && + ppmu->get_mem_data_src) { + val = (regs->dar &SIER_TYPE_MASK ) >>SIER_TYPE_SHIFT ; +if (val ==0 || (val ==7 && !cpu_has_feature (CPU_FTR_ARCH_31 ))) { + record =0 ; +atomic64_inc (&event->lost_samples); + } + } +/* * Finally record data if requested. */
arch/powerpc/perf/isa207-common.c +3 -1
@@ -321,8 +321,10 @@ void isa207_get_mem_data_src(union perf_mem_data_src *dsrc, u32 flags, sier =mfspr (SPRN_SIER ); val = (sier &ISA207_SIER_TYPE_MASK ) >>ISA207_SIER_TYPE_SHIFT ; -if (val !=1 && val !=2 && !(val ==7 &&cpu_has_feature (CPU_FTR_ARCH_31 ))) +if (val !=1 && val !=2 && !(val ==7 &&cpu_has_feature (CPU_FTR_ARCH_31 ))) { + dsrc->val =0 ;return ; + } idx = (sier &ISA207_SIER_LDST_MASK ) >>ISA207_SIER_LDST_SHIFT ; sub_idx = (sier &ISA207_SIER_DATA_SRC_MASK ) >>ISA207_SIER_DATA_SRC_SHIFT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 423/626 ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure().
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 5a1ccffd30a08f5a2428cd5fbb3ab03e8eb6c66d ]
The following patch will not set skb->sk from VRF path.
Let's fetch net from fib_rule->fr_net instead of sock_net(skb->sk) in fib[46]_rule_configure().
--- net/ipv4/fib_rules.c | 4 ++-- net/ipv6/fib6_rules.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/ipv4/fib_rules.c +2 -2
@@ -245,9 +245,9 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,struct nlattr **tb, struct netlink_ext_ack *extack) { - struct net *net = sock_net(skb->sk); + struct fib4_rule *rule4 = (struct fib4_rule *)rule; +struct net *net = rule->fr_net;int err = -EINVAL ; -struct fib4_rule *rule4 = (struct fib4_rule *) rule;if (!inet_validate_dscp (frh->tos)) { NL_SET_ERR_MSG(extack,
net/ipv6/fib6_rules.c +2 -2
@@ -365,9 +365,9 @@ static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,struct nlattr **tb, struct netlink_ext_ack *extack) { + struct fib6_rule *rule6 = (struct fib6_rule *)rule; +struct net *net = rule->fr_net;int err = -EINVAL ; -struct net *net =sock_net (skb->sk); -struct fib6_rule *rule6 = (struct fib6_rule *) rule;if (!inet_validate_dscp (frh->tos)) { NL_SET_ERR_MSG(extack,
Signature · 1 line
2.39.5
Re: [PATCH 6.12 423/626] ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure().
Hi!
Quoted 1 line
6.12-stable review patch. If anyone has any objections, please let
me know.
Preparation for future development, does not fix a bug. Sasha should not be picking these up.
BR,
Pavel
Quoted 53 lines
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit
5a1ccffd30a08f5a2428cd5fbb3ab03e8eb6c66d]The following patch will not set
skb->skfrom VRF path.Let's fetch net from
fib_rule->fr_netinstead ofsock_net(skb->sk)in fib[46]_rule_configure().Signed-off-by Kuniyuki Iwashima <[email protected]>Reviewed-by Eric Dumazet <[email protected]>Reviewed-by Ido Schimmel <[email protected]>Tested-by Ido Schimmel <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/ipv4/fib_rules.c | 4 ++-- net/ipv6/fib6_rules.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)net/ipv4/fib_rules.c +2
-2@@ -245,9 +245,9 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,struct nlattr **tb, struct netlink_ext_ack *extack) { - struct net *net = sock_net(skb->sk); + struct fib4_rule *rule4 = (struct fib4_rule *)rule; +struct net *net = rule->fr_net;int err = -EINVAL ; -struct fib4_rule *rule4 = (struct fib4_rule *) rule;if (!inet_validate_dscp (frh->tos)) { NL_SET_ERR_MSG(extack,net/ipv6/fib6_rules.c +2
-2@@ -365,9 +365,9 @@ static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,struct nlattr **tb, struct netlink_ext_ack *extack) { + struct fib6_rule *rule6 = (struct fib6_rule *)rule; +struct net *net = rule->fr_net;int err = -EINVAL ; -struct net *net =sock_net (skb->sk); -struct fib6_rule *rule6 = (struct fib6_rule *) rule;if (!inet_validate_dscp (frh->tos)) { NL_SET_ERR_MSG(extack,
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 424/626 r8152: add vendor/device ID pair for Dell Alienware AW1022z
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksander Jan Bajkowski <[email protected]>
[ Upstream commit 848b09d53d923b4caee5491f57a5c5b22d81febc ]
The Dell AW1022z is an RTL8156B based 2.5G Ethernet controller.
Add the vendor and product ID values to the driver. This makes Ethernet work with the adapter.
--- drivers/net/usb/r8152.c | 1 + include/linux/usb/r8152.h | 1 + 2 files changed, 2 insertions(+)
drivers/net/usb/r8152.c +1 -0
@@ -10085,6 +10085,7 @@ static const struct usb_device_id rtl8152_table[] = { { USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff) }, { USB_DEVICE(VENDOR_ID_TPLINK, 0x0601) }, { USB_DEVICE(VENDOR_ID_DLINK, 0xb301) }, + { USB_DEVICE(VENDOR_ID_DELL, 0xb097) }, { USB_DEVICE(VENDOR_ID_ASUS, 0x1976) }, {} };
include/linux/usb/r8152.h +1 -0
@@ -30,6 +30,7 @@#define VENDOR_ID_NVIDIA 0x0955#define VENDOR_ID_TPLINK 0x2357#define VENDOR_ID_DLINK 0x2001 +#define VENDOR_ID_DELL 0x413c#define VENDOR_ID_ASUS 0x0b05#if IS_REACHABLE (CONFIG_USB_RTL8152 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 425/626 iio: adc: ad7944: dont use storagebits for sizing
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lechner <[email protected]>
[ Upstream commit 503d20ed8cf7c7b40ec0bd94f53c490c1d91c31b ]
Replace use of storagebits with realbits for determining the number of bytes needed for SPI transfers.
When adding SPI offload support, storagebits will always be 32 rather than 16 for 16-bit 16-bit chips so we can no longer rely on storagebits being the correct size expected by the SPI framework (it always uses 4 bytes for > 16-bit xfers and 2 bytes for > 8-bit xfers). Instead, derive the correct size from realbits since it will always be correct even when SPI offloading is used.
Reviewed-vy: Nuno Sa <[email protected]>
--- drivers/iio/adc/ad7944.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/iio/adc/ad7944.c +9 -7
@@ -98,6 +98,9 @@ struct ad7944_chip_info {const struct iio_chan_spec channels[2 ]; }; +/* get number of bytes for SPI xfer */ +#define AD7944_SPI_BYTES (scan_type) ((scan_type).realbits > 16 ? 4 : 2) +/* * AD7944_DEFINE_CHIP_INFO - Define a chip info structure for a specific chip * @_name: The name of the chip
@@ -164,7 +167,7 @@ static int ad7944_3wire_cs_mode_init_msg(struct device *dev, struct ad7944_adc */* Then we can read the data during the acquisition phase */ xfers[2 ].rx_buf = &adc->sample.raw; - xfers[2 ].len =BITS_TO_BYTES (chan->scan_type.storagebits); + xfers[2 ].len =AD7944_SPI_BYTES (chan->scan_type); xfers[2 ].bits_per_word = chan->scan_type.realbits;spi_message_init_with_transfers (&adc->msg, xfers,3 );
@@ -193,7 +196,7 @@ static int ad7944_4wire_mode_init_msg(struct device *dev, struct ad7944_adc *adc xfers[0 ].delay.unit =SPI_DELAY_UNIT_NSECS ; xfers[1 ].rx_buf = &adc->sample.raw; - xfers[1 ].len =BITS_TO_BYTES (chan->scan_type.storagebits); + xfers[1 ].len =AD7944_SPI_BYTES (chan->scan_type); xfers[1 ].bits_per_word = chan->scan_type.realbits;spi_message_init_with_transfers (&adc->msg, xfers,2 );
@@ -228,7 +231,7 @@ static int ad7944_chain_mode_init_msg(struct device *dev, struct ad7944_adc *adc xfers[0 ].delay.unit =SPI_DELAY_UNIT_NSECS ; xfers[1 ].rx_buf = adc->chain_mode_buf; - xfers[1 ].len =BITS_TO_BYTES (chan->scan_type.storagebits) * n_chain_dev; + xfers[1 ].len =AD7944_SPI_BYTES (chan->scan_type) * n_chain_dev; xfers[1 ].bits_per_word = chan->scan_type.realbits;spi_message_init_with_transfers (&adc->msg, xfers,2 );
@@ -274,12 +277,12 @@ static int ad7944_single_conversion(struct ad7944_adc *adc,return ret;if (adc->spi_mode ==AD7944_SPI_MODE_CHAIN ) { -if (chan->scan_type.storagebits >16 ) +if (chan->scan_type.realbits >16 ) *val = ((u32 *)adc->chain_mode_buf)[chan->scan_index];else *val = ((u16 *)adc->chain_mode_buf)[chan->scan_index]; }else { -if (chan->scan_type.storagebits >16 ) +if (chan->scan_type.realbits >16 ) *val = adc->sample.raw.u32;else *val = adc->sample.raw.u16;
@@ -409,8 +412,7 @@ static int ad7944_chain_mode_alloc(struct device *dev,/* 1 word for each voltage channel + aligned u64 for timestamp */ chain_mode_buf_size =ALIGN (n_chain_dev * -BITS_TO_BYTES (chan[0 ].scan_type.storagebits),sizeof (u64)) - +sizeof (u64); +AD7944_SPI_BYTES (chan[0 ].scan_type),sizeof (u64)) +sizeof (u64); buf =devm_kzalloc (dev, chain_mode_buf_size,GFP_KERNEL );if (!buf)return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 426/626 pstore: Change kmsg_bytes storage size to u32
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 5674609535bafa834ab014d90d9bbe8e89223a0b ]
The types around kmsg_bytes were inconsistent. The global was unsigned long, the argument to pstore_set_kmsg_bytes() was int, and the filesystem option was u32. Given other internal limits, there's not much sense in making a single pstore record larger than INT_MAX and it can't be negative, so use u32 everywhere. Additionally, use READ/WRITE_ONCE and a local variable in pstore_dump() to avoid kmsg_bytes changing during a dump.
--- fs/pstore/inode.c | 2 +- fs/pstore/internal.h | 4 ++-- fs/pstore/platform.c | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-)
fs/pstore/inode.c +1 -1
@@ -265,7 +265,7 @@ static void parse_options(char *options)static int pstore_show_options (struct seq_file *m,struct dentry *root) {if (kmsg_bytes !=CONFIG_PSTORE_DEFAULT_KMSG_BYTES ) -seq_printf (m,",kmsg_bytes=%lu" , kmsg_bytes); +seq_printf (m,",kmsg_bytes=%u" , kmsg_bytes);return 0 ; }
fs/pstore/internal.h +2 -2
@@ -6,7 +6,7 @@#include <linux/time.h> #include <linux/pstore.h> -extern unsigned long kmsg_bytes; +extern unsigned int kmsg_bytes;#ifdef CONFIG_PSTORE_FTRACE extern void pstore_register_ftrace (void );
@@ -35,7 +35,7 @@ static inline void pstore_unregister_pmsg(void) {}extern struct pstore_info *psinfo; -extern void pstore_set_kmsg_bytes (int ); +extern void pstore_set_kmsg_bytes (unsigned int bytes);extern void pstore_get_records (int );extern void pstore_get_backend_records (struct pstore_info *psi,struct dentry *root,int quiet);
fs/pstore/platform.c +6 -5
@@ -92,8 +92,8 @@ module_param(compress, charp, 0444);MODULE_PARM_DESC (compress,"compression to use" );/* How much of the kernel log to snapshot */ -unsigned long kmsg_bytes =CONFIG_PSTORE_DEFAULT_KMSG_BYTES ; -module_param (kmsg_bytes, ulong,0444 ); +unsigned int kmsg_bytes =CONFIG_PSTORE_DEFAULT_KMSG_BYTES ; +module_param (kmsg_bytes, uint,0444 );MODULE_PARM_DESC (kmsg_bytes,"amount of kernel log to snapshot (in bytes)" );static void *compress_workspace;
@@ -107,9 +107,9 @@ static void *compress_workspace;static char *big_oops_buf;static size_t max_compressed_size; -void pstore_set_kmsg_bytes (int bytes) +void pstore_set_kmsg_bytes (unsigned int bytes) { - kmsg_bytes = bytes; +WRITE_ONCE (kmsg_bytes, bytes); }/* Tag each group of saved records with a sequence number */
@@ -278,6 +278,7 @@ static void pstore_dump(struct kmsg_dumper *dumper, struct kmsg_dump_detail *detail) {struct kmsg_dump_iter iter; +unsigned int remaining =READ_ONCE (kmsg_bytes);unsigned long total =0 ;const char *why;unsigned int part =1 ;
@@ -300,7 +301,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,kmsg_dump_rewind (&iter); oopscount++; -while (total < kmsg_bytes) { +while (total < remaining) {char *dst;size_t dst_size;int header_size;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 427/626 leds: trigger: netdev: Configure LED blink interval for HW offload
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit c629c972b310af41e9e072febb6dae9a299edde6 ]
In case a PHY LED implements .blink_set callback to set LED blink interval, call it even if .hw_control is already set, as that LED blink interval likely controls the blink rate of that HW offloaded LED. For PHY LEDs, that can be their activity blinking interval.
The software blinking is not affected by this change.
With this change, the LED interval setting looks something like this:
$ echo netdev > /sys/class/leds/led:green:lan/trigger $ echo 1 > /sys/class/leds/led:green:lan/brightness $ echo 250 > /sys/class/leds/led:green:lan/interval
--- drivers/leds/trigger/ledtrig-netdev.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/leds/trigger/ledtrig-netdev.c +13 -3
@@ -68,6 +68,7 @@ struct led_netdev_data {unsigned int last_activity;unsigned long mode; +unsigned long blink_delay;int link_speed;__ETHTOOL_DECLARE_LINK_MODE_MASK (supported_link_modes);u8 duplex;
@@ -86,6 +87,10 @@ static void set_baseline_state(struct led_netdev_data *trigger_data)/* Already validated, hw control is possible with the requested mode */ if (trigger_data->hw_control) { led_cdev->hw_control_set (led_cdev, trigger_data->mode); +if (led_cdev->blink_set) { + led_cdev->blink_set (led_cdev, &trigger_data->blink_delay, + &trigger_data->blink_delay); + }return ; }
@@ -454,10 +459,11 @@ static ssize_t interval_store(struct device *dev, size_t size) {struct led_netdev_data *trigger_data =led_trigger_get_drvdata (dev); +struct led_classdev *led_cdev = trigger_data->led_cdev;unsigned long value;int ret; -if (trigger_data->hw_control) +if (trigger_data->hw_control && !led_cdev->blink_set)return -EINVAL ; ret =kstrtoul (buf,0 , &value);
@@ -466,9 +472,13 @@ static ssize_t interval_store(struct device *dev,/* impose some basic bounds on the timer interval */ if (value >=5 && value <=10000 ) { -cancel_delayed_work_sync (&trigger_data->work); +if (trigger_data->hw_control) { + trigger_data->blink_delay = value; + }else { +cancel_delayed_work_sync (&trigger_data->work); -atomic_set (&trigger_data->interval,msecs_to_jiffies (value)); +atomic_set (&trigger_data->interval,msecs_to_jiffies (value)); + }set_baseline_state (trigger_data);/* resets timer */ }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 428/626 ext4: dont write back data before punch hole in nojournal mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 43d0105e2c7523cc6b14cad65e2044e829c0a07a ]
There is no need to write back all data before punching a hole in non-journaled mode since it will be dropped soon after removing space. Therefore, the call to filemap_write_and_wait_range() can be eliminated. Besides, similar to ext4_zero_range(), we must address the case of partially punched folios when block size < page size. It is essential to remove writable userspace mappings to ensure that the folio can be faulted again during subsequent mmap write access.
In journaled mode, we need to write dirty pages out before discarding page cache in case of crash before committing the freeing data transaction, which could expose old, stale data, even if synchronization has been performed.
--- fs/ext4/inode.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
fs/ext4/inode.c +5 -13
@@ -3933,17 +3933,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)trace_ext4_punch_hole (inode, offset, length,0 ); -/* -* Write out all dirty pages to avoid race conditions -* Then release them. -*/ -if (mapping_tagged (mapping,PAGECACHE_TAG_DIRTY )) { - ret =filemap_write_and_wait_range (mapping, offset, - offset + length -1 ); -if (ret) -return ret; - } -inode_lock (inode);/* No need to punch hole beyond i_size */
@@ -4005,8 +3994,11 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) ret =ext4_update_disksize_before_punch (inode, offset, length);if (ret) goto out_dio; -truncate_pagecache_range (inode, first_block_offset, - last_block_offset); + + ret =ext4_truncate_page_cache_block_range (inode, + first_block_offset, last_block_offset +1 ); +if (ret) + goto out_dio; }if (ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 429/626 ext4: remove writable userspace mappings before truncating page cache
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 17207d0bb209e8b40f27d7f3f96e82a78af0bf2c ]
When zeroing a range of folios on the filesystem which block size is less than the page size, the file's mapped blocks within one page will be marked as unwritten, we should remove writable userspace mappings to ensure that ext4_page_mkwrite() can be called during subsequent write access to these partial folios. Otherwise, data written by subsequent mmap writes may not be saved to disk.
$mkfs.ext4 -b 1024 /dev/vdb
$mount /dev/vdb /mnt
$xfs_io -t -f -c "pwrite -S 0x58 0 4096" -c "mmap -rw 0 4096" \
-c "mwrite -S 0x5a 2048 2048" -c "fzero 2048 2048" \
-c "mwrite -S 0x59 2048 2048" -c "close" /mnt/foo $od -Ax -t x1z /mnt/foo
000000 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 *
000800 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 *
001000
$umount /mnt && mount /dev/vdb /mnt
$od -Ax -t x1z /mnt/foo
000000 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 *
000800 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 *
001000
Fix this by introducing ext4_truncate_page_cache_block_range() to remove writable userspace mappings when truncating a partial folio range. Additionally, move the journal data mode-specific handlers and truncate_pagecache_range() into this function, allowing it to serve as a common helper that correctly manages the page cache in preparation for block range manipulations.
--- fs/ext4/ext4.h | 2 ++ fs/ext4/extents.c | 19 ++++---------- fs/ext4/inode.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 14 deletions(-)
fs/ext4/ext4.h +2 -0
@@ -3013,6 +3013,8 @@ extern int ext4_inode_attach_jinode(struct inode *inode);extern int ext4_can_truncate (struct inode *inode);extern int ext4_truncate (struct inode *);extern int ext4_break_layouts (struct inode *); +extern int ext4_truncate_page_cache_block_range (struct inode *inode, +loff_t start,loff_t end);extern int ext4_punch_hole (struct file *file,loff_t offset,loff_t length);extern void ext4_set_inode_flags (struct inode *,bool init);extern int ext4_alloc_da_blocks (struct inode *inode);
fs/ext4/extents.c +5 -14
@@ -4667,22 +4667,13 @@ static long ext4_zero_range(struct file *file, loff_t offset, goto out_mutex; } -/* -* For journalled data we need to write (and checkpoint) pages -* before discarding page cache to avoid inconsitent data on -* disk in case of crash before zeroing trans is committed. -*/ -if (ext4_should_journal_data (inode)) { - ret =filemap_write_and_wait_range (mapping, start, - end -1 ); -if (ret) { -filemap_invalidate_unlock (mapping); - goto out_mutex; - } +/* Now release the pages and zero block aligned part of pages */ + ret =ext4_truncate_page_cache_block_range (inode, start, end); +if (ret) { +filemap_invalidate_unlock (mapping); + goto out_mutex; } -/* Now release the pages and zero block aligned part of pages */ -truncate_pagecache_range (inode, start, end -1 );inode_set_mtime_to_ts (inode,inode_set_ctime_current (inode)); ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,
fs/ext4/inode.c +63 -0
75 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 430/626 wifi: rtw88: Fix download_firmware_validate() for RTL8814AU
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit 9e8243025cc06abc975c876dffda052073207ab3 ]
After the firmware is uploaded, download_firmware_validate() checks some bits in REG_MCUFW_CTRL to see if everything went okay. The RTL8814AU power on sequence sets bits 13 and 12 to 2, which this function does not expect, so it thinks the firmware upload failed.
Make download_firmware_validate() ignore bits 13 and 12.
--- drivers/net/wireless/realtek/rtw88/reg.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/reg.h +2 -1
@@ -109,6 +109,7 @@#define BIT_SHIFT_ROM_PGE 16#define BIT_FW_INIT_RDY BIT(15)#define BIT_FW_DW_RDY BIT(14) +#define BIT_CPU_CLK_SEL (BIT(12) | BIT(13))#define BIT_RPWM_TOGGLE BIT(7)#define BIT_RAM_DL_SEL BIT(7)/* legacy only */ #define BIT_DMEM_CHKSUM_OK BIT(6)
@@ -126,7 +127,7 @@ BIT_CHECK_SUM_OK)#define FW_READY_LEGACY (BIT_MCUFWDL_RDY | BIT_FWDL_CHK_RPT | \ BIT_WINTINI_RDY | BIT_RAM_DL_SEL) -#define FW_READY_MASK 0xffff +#define FW_READY_MASK (0xffff & ~BIT_CPU_CLK_SEL)#define REG_MCU_TST_CFG 0x84#define VAL_FW_TRIGGER 0x1
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 431/626 wifi: rtw88: Fix __rtw_download_firmware() for RTL8814AU
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit 8425f5c8f04dbcf11ade78f984a494fc0b90e7a0 ]
Don't call ltecoex_read_reg() and ltecoex_reg_write() when the ltecoex_addr member of struct rtw_chip_info is NULL. The RTL8814AU doesn't have this feature.
--- drivers/net/wireless/realtek/rtw88/mac.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/mac.c +4 -2
@@ -783,7 +783,8 @@ static int __rtw_download_firmware(struct rtw_dev *rtwdev,if (!check_firmware_size (data, size))return -EINVAL ; -if (!ltecoex_read_reg (rtwdev,0x38 , <ecoex_bckp)) +if (rtwdev->chip->ltecoex_addr && + !ltecoex_read_reg (rtwdev,0x38 , <ecoex_bckp))return -EBUSY ;wlan_cpu_enable (rtwdev, false);
@@ -801,7 +802,8 @@ static int __rtw_download_firmware(struct rtw_dev *rtwdev,wlan_cpu_enable (rtwdev, true); -if (!ltecoex_reg_write (rtwdev,0x38 , ltecoex_bckp)) { +if (rtwdev->chip->ltecoex_addr && + !ltecoex_reg_write (rtwdev,0x38 , ltecoex_bckp)) { ret = -EBUSY ; goto dlfw_fail; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 432/626 wifi: rtw89: coex: Assign value over than 0 to avoid firmware timer hang
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ching-Te Ku <[email protected]>
[ Upstream commit 2e4c4717b3f6f019c71af984564b6e4d0ae8d0bd ]
If the slot duration is 0, the firmware timer will trigger timer hang at the timer initializing state in a low rate due to hardware algorithm.
--- drivers/net/wireless/realtek/rtw89/coex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +3 -3
@@ -89,10 +89,10 @@ static const struct rtw89_btc_fbtc_slot s_def[] = { [CXST_B4] = __DEF_FBTC_SLOT(50, 0xe5555555, SLOT_MIX), [CXST_LK] = __DEF_FBTC_SLOT(20, 0xea5a5a5a, SLOT_ISO), [CXST_BLK] = __DEF_FBTC_SLOT(500, 0x55555555, SLOT_MIX), - [CXST_E2G] = __DEF_FBTC_SLOT(0, 0xea5a5a5a, SLOT_MIX), - [CXST_E5G] = __DEF_FBTC_SLOT(0, 0xffffffff, SLOT_ISO), + [CXST_E2G] = __DEF_FBTC_SLOT(5, 0xea5a5a5a, SLOT_MIX), + [CXST_E5G] = __DEF_FBTC_SLOT(5, 0xffffffff, SLOT_ISO), [CXST_EBT] = __DEF_FBTC_SLOT(5, 0xe5555555, SLOT_MIX), - [CXST_ENULL] = __DEF_FBTC_SLOT(0, 0xaaaaaaaa, SLOT_ISO), + [CXST_ENULL] = __DEF_FBTC_SLOT(5, 0xaaaaaaaa, SLOT_ISO), [CXST_WLK] = __DEF_FBTC_SLOT(250, 0xea5a5a5a, SLOT_MIX), [CXST_W1FDD] = __DEF_FBTC_SLOT(50, 0xffffffff, SLOT_ISO), [CXST_B1FDD] = __DEF_FBTC_SLOT(50, 0xffffdfff, SLOT_ISO),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 433/626 wifi: rtw89: fw: validate multi-firmware header before getting its size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit 2b8bdc5237014cc61784b3676cbaca5325959f3d ]
To access firmware elements appended after multi-firmware, add its size as offset to get start address of firmware elements.
+-----+-------+------+---------+--------------+ --
| sig | fw_nr | rsvd | version | reserved | \
+---------------------------------------------+ |
fw 0 | cv | type | mp | rsvd | shift | size | rsvd | |
+---------------------------------------------+ |
fw 1 | cv | type | mp | rsvd | shift | size | rsvd | |
+---------------------------------------------+ |
fw N-1 | ... | |
+=============================================+ | mfw size
| fw 0 content | |
+=============================================+ |
| fw 1 content | |
+=============================================+ |
| ... | |
+=============================================+ |
| fw N -1 content | |
+=============================================+ --/
| fw element TLV X |
+=============================================+
| fw element TLV Y |
+=============================================+
| fw element TLV Z |
+=============================================+To avoid Coverity warning when getting mfw size, validate it header ahead.
Addresses-Coverity-ID: 1544385 ("Untrusted array index read")
--- drivers/net/wireless/realtek/rtw89/fw.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +5 -0
@@ -563,12 +563,17 @@ static u32 rtw89_mfw_get_size(struct rtw89_dev *rtwdev) (const struct rtw89_mfw_hdr *)firmware->data;const struct rtw89_mfw_info *mfw_info;u32 size; +int ret;if (mfw_hdr->sig !=RTW89_MFW_SIG ) {rtw89_warn (rtwdev,"not mfw format\n" );return 0 ; } + ret =rtw89_mfw_validate_hdr (rtwdev, firmware, mfw_hdr); +if (ret) +return ret; + mfw_info = &mfw_hdr->info[mfw_hdr->fw_nr -1 ]; size =le32_to_cpu (mfw_info->shift) +le32_to_cpu (mfw_info->size);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 434/626 wifi: rtw89: fw: validate multi-firmware header before accessing
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit 1f0efffd597893404aea5c3d4f1bdaa1c61d4434 ]
A firmeware file contains multi-firmware with a header to represent contents. The mfw_hdr->fw_nr is to define number of firmware in file.
+-----+-------+------+---------+--------------+
| sig | fw_nr | rsvd | version | reserved |
+---------------------------------------------+ --
fw 0 | cv | type | mp | rsvd | shift | size | rsvd | \
+---------------------------------------------+ |
fw 1 | cv | type | mp | rsvd | shift | size | rsvd | | mfw_hdr->fw_nr
+---------------------------------------------+ |
fw N-1 | ... | /
+=============================================+ --
| fw 0 content |
| (pointed by fw0 shift/size) |
+=============================================+To avoid Coverity warning, validate header is in range of firmware size, and also validate the range of actual firmware content is in range.
Addresses-Coverity-ID: 1494046 ("Untrusted loop bound")
--- drivers/net/wireless/realtek/rtw89/fw.c | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +35 -0
@@ -501,6 +501,30 @@ static int rtw89_fw_hdr_parser(struct rtw89_dev *rtwdev, } } +static int rtw89_mfw_validate_hdr (struct rtw89_dev *rtwdev, +const struct firmware *firmware, +const struct rtw89_mfw_hdr *mfw_hdr) +{ +const void *mfw = firmware->data; +u32 mfw_len = firmware->size; +u8 fw_nr = mfw_hdr->fw_nr; +const void *ptr; + +if (fw_nr ==0 ) { +rtw89_err (rtwdev,"mfw header has no fw entry\n" ); +return -ENOENT ; + } + + ptr = &mfw_hdr->info[fw_nr]; + +if (ptr > mfw + mfw_len) { +rtw89_err (rtwdev,"mfw header out of address\n" ); +return -EFAULT ; + } + +return 0 ; +} +static int rtw89_mfw_recognize (struct rtw89_dev *rtwdev,enum rtw89_fw_type type,struct rtw89_fw_suit *fw_suit,bool nowarn)
@@ -511,6 +535,7 @@ int rtw89_mfw_recognize(struct rtw89_dev *rtwdev, enum rtw89_fw_type type,u32 mfw_len = firmware->size;const struct rtw89_mfw_hdr *mfw_hdr = (const struct rtw89_mfw_hdr *)mfw;const struct rtw89_mfw_info *mfw_info =NULL , *tmp; +int ret;int i;if (mfw_hdr->sig !=RTW89_MFW_SIG ) {
@@ -523,6 +548,10 @@ int rtw89_mfw_recognize(struct rtw89_dev *rtwdev, enum rtw89_fw_type type,return 0 ; } + ret =rtw89_mfw_validate_hdr (rtwdev, firmware, mfw_hdr); +if (ret) +return ret; +for (i =0 ; i < mfw_hdr->fw_nr; i++) { tmp = &mfw_hdr->info[i];if (tmp->type != type)
@@ -552,6 +581,12 @@ int rtw89_mfw_recognize(struct rtw89_dev *rtwdev, enum rtw89_fw_type type, found: fw_suit->data = mfw +le32_to_cpu (mfw_info->shift); fw_suit->size =le32_to_cpu (mfw_info->size); + +if (fw_suit->data + fw_suit->size > mfw + mfw_len) { +rtw89_err (rtwdev,"fw_suit %d out of address\n" , type); +return -EFAULT ; + } +return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 435/626 wifi: rtw89: call power_on ahead before selecting firmware
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit d078f5857a00c06fa0ddee26d3cb722e938e1688 ]
Driver selects firmware by hardware version, which normally can be read from registers before selecting firmware. However, certain chips such as RTL8851B, it needs to read hardware version from efuse while doing power_on, but do power_on after selecting firmware in current flow.
To resolve this flow problem, move power_on out from rtw89_mac_partial_init(), and call rtw89_mac_pwr_on() separately at proper places to have expected flow.
--- drivers/net/wireless/realtek/rtw89/core.c | 23 +++++++++++------- drivers/net/wireless/realtek/rtw89/mac.c | 29 ++++++++++++++++------- drivers/net/wireless/realtek/rtw89/mac.h | 1 + 3 files changed, 36 insertions(+), 17 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +15 -8
@@ -4862,8 +4862,6 @@ static int rtw89_chip_efuse_info_setup(struct rtw89_dev *rtwdev)rtw89_hci_mac_pre_deinit (rtwdev); -rtw89_mac_pwr_off (rtwdev); -return 0 ; }
@@ -4944,36 +4942,45 @@ int rtw89_chip_info_setup(struct rtw89_dev *rtwdev)rtw89_read_chip_ver (rtwdev); + ret =rtw89_mac_pwr_on (rtwdev); +if (ret) { +rtw89_err (rtwdev,"failed to power on\n" ); +return ret; + } + ret =rtw89_wait_firmware_completion (rtwdev);if (ret) {rtw89_err (rtwdev,"failed to wait firmware completion\n" ); -return ret; + goto out; } ret =rtw89_fw_recognize (rtwdev);if (ret) {rtw89_err (rtwdev,"failed to recognize firmware\n" ); -return ret; + goto out; } ret =rtw89_chip_efuse_info_setup (rtwdev);if (ret) -return ret; + goto out; ret =rtw89_fw_recognize_elements (rtwdev);if (ret) {rtw89_err (rtwdev,"failed to recognize firmware elements\n" ); -return ret; + goto out; } ret =rtw89_chip_board_info_setup (rtwdev);if (ret) -return ret; + goto out;rtw89_core_setup_rfe_parms (rtwdev); rtwdev->ps_mode =rtw89_update_ps_mode (rtwdev); -return 0 ; +out: +rtw89_mac_pwr_off (rtwdev); + +return ret; }EXPORT_SYMBOL (rtw89_chip_info_setup);
drivers/net/wireless/realtek/rtw89/mac.c +20 -9
@@ -1491,6 +1491,21 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)#undef PWR_ACT } +int rtw89_mac_pwr_on (struct rtw89_dev *rtwdev) +{ +int ret; + + ret =rtw89_mac_power_switch (rtwdev, true); +if (ret) { +rtw89_mac_power_switch (rtwdev, false); + ret =rtw89_mac_power_switch (rtwdev, true); +if (ret) +return ret; + } + +return 0 ; +} +void rtw89_mac_pwr_off (struct rtw89_dev *rtwdev) {rtw89_mac_power_switch (rtwdev, false);
@@ -3918,14 +3933,6 @@ int rtw89_mac_partial_init(struct rtw89_dev *rtwdev, bool include_bb) {int ret; - ret =rtw89_mac_power_switch (rtwdev, true); -if (ret) { -rtw89_mac_power_switch (rtwdev, false); - ret =rtw89_mac_power_switch (rtwdev, true); -if (ret) -return ret; - } -rtw89_mac_ctrl_hci_dma_trx (rtwdev, true);if (include_bb) {
@@ -3958,6 +3965,10 @@ int rtw89_mac_init(struct rtw89_dev *rtwdev)bool include_bb = !!chip->bbmcu_nr;int ret; + ret =rtw89_mac_pwr_on (rtwdev); +if (ret) +return ret; + ret =rtw89_mac_partial_init (rtwdev, include_bb);if (ret) goto fail;
@@ -3989,7 +4000,7 @@ int rtw89_mac_init(struct rtw89_dev *rtwdev)return ret; fail: -rtw89_mac_power_switch (rtwdev, false); +rtw89_mac_pwr_off (rtwdev);return ret; }
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -1120,6 +1120,7 @@ rtw89_write32_port_set(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_lrtw89_write32_set (rtwdev, reg, bit); } +int rtw89_mac_pwr_on (struct rtw89_dev *rtwdev);void rtw89_mac_pwr_off (struct rtw89_dev *rtwdev);int rtw89_mac_partial_init (struct rtw89_dev *rtwdev,bool include_bb);int rtw89_mac_init (struct rtw89_dev *rtwdev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 436/626 clk: qcom: camcc-sm8250: Use clk_rcg2_shared_ops for some RCGs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jordan Crouse <[email protected]>
[ Upstream commit 52b10b591f83dc6d9a1d6c2dc89433470a787ecd ]
Update some RCGs on the sm8250 camera clock controller to use clk_rcg2_shared_ops. The shared_ops ensure the RCGs get parked to the XO during clock disable to prevent the clocks from locking up when the GDSC is enabled. These mirror similar fixes for other controllers such as commit e5c359f70e4b ("clk: qcom: camcc: Update the clock ops for the SC7180").
--- drivers/clk/qcom/camcc-sm8250.c | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-)
drivers/clk/qcom/camcc-sm8250.c +28 -28
@@ -411,7 +411,7 @@ static struct clk_rcg2 cam_cc_bps_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -433,7 +433,7 @@ static struct clk_rcg2 cam_cc_camnoc_axi_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -454,7 +454,7 @@ static struct clk_rcg2 cam_cc_cci_0_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -469,7 +469,7 @@ static struct clk_rcg2 cam_cc_cci_1_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -490,7 +490,7 @@ static struct clk_rcg2 cam_cc_cphy_rx_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -511,7 +511,7 @@ static struct clk_rcg2 cam_cc_csi0phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -526,7 +526,7 @@ static struct clk_rcg2 cam_cc_csi1phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -556,7 +556,7 @@ static struct clk_rcg2 cam_cc_csi3phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -571,7 +571,7 @@ static struct clk_rcg2 cam_cc_csi4phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -586,7 +586,7 @@ static struct clk_rcg2 cam_cc_csi5phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_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 cam_cc_fast_ahb_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -634,7 +634,7 @@ static struct clk_rcg2 cam_cc_fd_core_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -649,7 +649,7 @@ static struct clk_rcg2 cam_cc_icp_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -673,7 +673,7 @@ static struct clk_rcg2 cam_cc_ife_0_clk_src = { .parent_data = cam_cc_parent_data_2, .num_parents = ARRAY_SIZE(cam_cc_parent_data_2), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -710,7 +710,7 @@ static struct clk_rcg2 cam_cc_ife_0_csid_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -734,7 +734,7 @@ static struct clk_rcg2 cam_cc_ife_1_clk_src = { .parent_data = cam_cc_parent_data_3, .num_parents = ARRAY_SIZE(cam_cc_parent_data_3), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -749,7 +749,7 @@ static struct clk_rcg2 cam_cc_ife_1_csid_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -771,7 +771,7 @@ static struct clk_rcg2 cam_cc_ife_lite_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -786,7 +786,7 @@ static struct clk_rcg2 cam_cc_ife_lite_csid_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -810,7 +810,7 @@ static struct clk_rcg2 cam_cc_ipe_0_clk_src = { .parent_data = cam_cc_parent_data_4, .num_parents = ARRAY_SIZE(cam_cc_parent_data_4), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -825,7 +825,7 @@ static struct clk_rcg2 cam_cc_jpeg_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -847,7 +847,7 @@ static struct clk_rcg2 cam_cc_mclk0_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -862,7 +862,7 @@ static struct clk_rcg2 cam_cc_mclk1_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -877,7 +877,7 @@ static struct clk_rcg2 cam_cc_mclk2_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -892,7 +892,7 @@ static struct clk_rcg2 cam_cc_mclk3_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -907,7 +907,7 @@ static struct clk_rcg2 cam_cc_mclk4_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -922,7 +922,7 @@ static struct clk_rcg2 cam_cc_mclk5_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -993,7 +993,7 @@ static struct clk_rcg2 cam_cc_slow_ahb_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 437/626 net: page_pool: avoid false positive warning if NAPI was never added
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit c1e00bc4be06cacee6307cedb9b55bbaddb5044d ]
We expect NAPI to be in disabled state when page pool is torn down. But it is also legal if the NAPI is completely uninitialized.
--- net/core/dev.h | 12 ++++++++++++ net/core/page_pool.c | 7 ++----- 2 files changed, 14 insertions(+), 5 deletions(-)
net/core/dev.h +12 -0
@@ -148,6 +148,18 @@ void xdp_do_check_flushed(struct napi_struct *napi);static inline void xdp_do_check_flushed (struct napi_struct *napi) { }#endif +/* Best effort check that NAPI is not idle (can't be scheduled to run) */ +static inline void napi_assert_will_not_race (const struct napi_struct *napi) +{ +/* uninitialized instance, can't race */ +if (!napi->poll_list.next) +return ; + +/* SCHED bit is set on disabled instances */ +WARN_ON (!test_bit (NAPI_STATE_SCHED , &napi->state)); +WARN_ON (READ_ONCE (napi->list_owner) !=-1 ); +} +void kick_defer_list_purge (struct softnet_data *sd,unsigned int cpu);#define XMIT_RECURSION_LIMIT 8
net/core/page_pool.c +2 -5
@@ -25,6 +25,7 @@#include <trace/events/page_pool.h> +#include "dev.h" #include "mp_dmabuf_devmem.h" #include "netmem_priv.h" #include "page_pool_priv.h"
@@ -1108,11 +1109,7 @@ void page_pool_disable_direct_recycling(struct page_pool *pool)if (!pool->p.napi)return ; -/* To avoid races with recycling and additional barriers make sure -* pool and NAPI are unlinked when NAPI is disabled. -*/ -WARN_ON (!test_bit (NAPI_STATE_SCHED , &pool->p.napi->state)); -WARN_ON (READ_ONCE (pool->p.napi->list_owner) !=-1 ); +napi_assert_will_not_race (pool->p.napi);WRITE_ONCE (pool->p.napi,NULL ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 438/626 tools/power turbostat: Clustered Uncore MHz counters should honor show/hide options
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Len Brown <[email protected]>
[ Upstream commit 1c7c7388e6c31f46b26a884d80b45efbad8237b2 ]
The clustered uncore frequency counters, UMHz*.* should honor the --show and --hide options.
All non-specified counters should be implicityly hidden. But when --show was used, UMHz*.* showed up anyway:
$ sudo turbostat -q -S --show Busy% Busy% UMHz0.0 UMHz1.0 UMHz2.0 UMHz3.0 UMHz4.0
Indeed, there was no string that can be used to explicitly show or hide clustered uncore counters.
Even through they are dynamically probed and added, group the clustered UMHz*.* counters with the legacy built-in-counter "UncMHz" for show/hide.
turbostat --show Busy%
does not show UMHz*.*.
turbostat --show UncMHz
shows either UncMHz or UMHz*.*, if present
turbostat --hide UncMHz
hides either UncMHz or UMHz*.*, if present
--- tools/power/x86/turbostat/turbostat.8 | 1 + tools/power/x86/turbostat/turbostat.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.8 +1 -0
@@ -199,6 +199,7 @@ The system configuration dump (if --quiet is not used) is followed by statistics \fBUncMHz\fP per-package uncore MHz, instantaneous sample. .PP \fBUMHz1.0\fP per-package uncore MHz for domain=1 and fabric_cluster=0, instantaneous sample. System summary is the average of all packages. +For the "--show" and "--hide" options, use "UncMHz" to operate on all UMHz*.* as a group. .SH TOO MUCH INFORMATION EXAMPLE By default, turbostat dumps all possible information -- a system configuration header, followed by columns for all counters. This is ideal for remote debugging, use the "--out" option to save everything to a text file, and get that file to the expert helping you debug.
tools/power/x86/turbostat/turbostat.c +12 -1
@@ -6445,7 +6445,18 @@ static void probe_intel_uncore_frequency_cluster(void)sprintf (path,"%s/current_freq_khz" , path_base);sprintf (name_buf,"UMHz%d.%d" , domain_id, cluster_id); -add_counter (0 , path, name_buf,0 ,SCOPE_PACKAGE ,COUNTER_K2M ,FORMAT_AVERAGE ,0 , package_id); +/* +* Once add_couter() is called, that counter is always read +* and reported -- So it is effectively (enabled & present). +* Only call add_counter() here if legacy BIC_UNCORE_MHZ (UncMHz) +* is (enabled). Since we are in this routine, we +* know we will not probe and set (present) the legacy counter. +* +* This allows "--show/--hide UncMHz" to be effective for +* the clustered MHz counters, as a group. +*/ + if BIC_IS_ENABLED(BIC_UNCORE_MHZ) + add_counter(0, path, name_buf, 0, SCOPE_PACKAGE, COUNTER_K2M, FORMAT_AVERAGE, 0, package_id);if (quiet)continue ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 439/626 hwmon: (xgene-hwmon) use appropriate type for the latency value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Vatoropin <[email protected]>
[ Upstream commit 8df0f002827e18632dcd986f7546c1abf1953a6f ]
The expression PCC_NUM_RETRIES * pcc_chan->latency is currently being evaluated using 32-bit arithmetic.
Since a value of type 'u64' is used to store the eventual result, and this result is later sent to the function usecs_to_jiffies with input parameter unsigned int, the current data type is too wide to store the value of ctx->usecs_lat.
Change the data type of "usecs_lat" to a more suitable (narrower) type.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/hwmon/xgene-hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/xgene-hwmon.c +1 -1
@@ -105,7 +105,7 @@ struct xgene_hwmon_dev {phys_addr_t comm_base_addr;void *pcc_comm_addr; -u64 usecs_lat; +unsigned int usecs_lat; };/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 440/626 f2fs: introduce f2fs_base_attr for global sysfs entries
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jaegeuk Kim <[email protected]>
[ Upstream commit 21925ede449e038ed6f9efdfe0e79f15bddc34bc ]
In /sys/fs/f2fs/features, there's no f2fs_sb_info, so let's avoid to get the pointer.
--- fs/f2fs/sysfs.c | 74 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 22 deletions(-)
fs/f2fs/sysfs.c +52 -22
@@ -61,6 +61,12 @@ struct f2fs_attr {int id; }; +struct f2fs_base_attr { +struct attribute attr; +ssize_t (*show)(struct f2fs_base_attr *a,char *buf); +ssize_t (*store)(struct f2fs_base_attr *a,const char *buf,size_t len); +}; +static ssize_t f2fs_sbi_show (struct f2fs_attr *a,struct f2fs_sb_info *sbi,char *buf);
@@ -864,6 +870,25 @@ static void f2fs_sb_release(struct kobject *kobj)complete (&sbi->s_kobj_unregister); } +static ssize_t f2fs_base_attr_show (struct kobject *kobj, +struct attribute *attr,char *buf) +{ +struct f2fs_base_attr *a =container_of (attr, + struct f2fs_base_attr, attr); + +return a->show ? a->show (a, buf) :0 ; +} + +static ssize_t f2fs_base_attr_store (struct kobject *kobj, +struct attribute *attr, +const char *buf,size_t len) +{ +struct f2fs_base_attr *a =container_of (attr, + struct f2fs_base_attr, attr); + +return a->store ? a->store (a, buf, len) :0 ; +} +/* * Note that there are three feature list entries: * 1) /sys/fs/f2fs/features
@@ -882,14 +907,13 @@ static void f2fs_sb_release(struct kobject *kobj)* please add new on-disk feature in this list only. * - ref. F2FS_SB_FEATURE_RO_ATTR() */ -static ssize_t f2fs_feature_show (struct f2fs_attr *a, -struct f2fs_sb_info *sbi,char *buf) +static ssize_t f2fs_feature_show (struct f2fs_base_attr *a,char *buf) {return sysfs_emit (buf,"supported\n" ); }#define F2FS_FEATURE_RO_ATTR (_name) \ -static struct f2fs_attr f2fs_attr_##_name = { \ +static struct f2fs_base_attr f2fs_base_attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = 0444 }, \ .show = f2fs_feature_show, \ }
@@ -1258,37 +1282,38 @@ static struct attribute *f2fs_attrs[] = { };ATTRIBUTE_GROUPS (f2fs); +#define BASE_ATTR_LIST (name) (&f2fs_base_attr_##name.attr) static struct attribute *f2fs_feat_attrs[] = {#ifdef CONFIG_FS_ENCRYPTION -ATTR_LIST (encryption), -ATTR_LIST (test_dummy_encryption_v2), +BASE_ATTR_LIST (encryption), +BASE_ATTR_LIST (test_dummy_encryption_v2), #if IS_ENABLED(CONFIG_UNICODE) -ATTR_LIST (encrypted_casefold), +BASE_ATTR_LIST (encrypted_casefold), #endif #endif /* CONFIG_FS_ENCRYPTION */ #ifdef CONFIG_BLK_DEV_ZONED -ATTR_LIST (block_zoned), +BASE_ATTR_LIST (block_zoned), #endif -ATTR_LIST (atomic_write), -ATTR_LIST (extra_attr), -ATTR_LIST (project_quota), -ATTR_LIST (inode_checksum), -ATTR_LIST (flexible_inline_xattr), -ATTR_LIST (quota_ino), -ATTR_LIST (inode_crtime), -ATTR_LIST (lost_found), +BASE_ATTR_LIST (atomic_write), +BASE_ATTR_LIST (extra_attr), +BASE_ATTR_LIST (project_quota), +BASE_ATTR_LIST (inode_checksum), +BASE_ATTR_LIST (flexible_inline_xattr), +BASE_ATTR_LIST (quota_ino), +BASE_ATTR_LIST (inode_crtime), +BASE_ATTR_LIST (lost_found), #ifdef CONFIG_FS_VERITY -ATTR_LIST (verity), +BASE_ATTR_LIST (verity), #endif -ATTR_LIST (sb_checksum), +BASE_ATTR_LIST (sb_checksum), #if IS_ENABLED(CONFIG_UNICODE) -ATTR_LIST (casefold), +BASE_ATTR_LIST (casefold), #endif -ATTR_LIST (readonly), +BASE_ATTR_LIST (readonly), #ifdef CONFIG_F2FS_FS_COMPRESSION -ATTR_LIST (compression), +BASE_ATTR_LIST (compression), #endif -ATTR_LIST (pin_file), +BASE_ATTR_LIST (pin_file), NULL, };ATTRIBUTE_GROUPS (f2fs_feat);
@@ -1362,9 +1387,14 @@ static struct kset f2fs_kset = { .kobj = {.ktype = &f2fs_ktype}, }; +static const struct sysfs_ops f2fs_feat_attr_ops = { + .show = f2fs_base_attr_show, + .store = f2fs_base_attr_store, +}; +static const struct kobj_type f2fs_feat_ktype = { .default_groups = f2fs_feat_groups, - .sysfs_ops = &f2fs_attr_ops, + .sysfs_ops = &f2fs_feat_attr_ops, };static struct kobject f2fs_feat = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 441/626 media: qcom: camss: csid: Only add TPG v4l2 ctrl if TPG hardware is available
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Depeng Shao <[email protected]>
[ Upstream commit 2f1361f862a68063f37362f1beb400e78e289581 ]
There is no CSID TPG on some SoCs, so the v4l2 ctrl in CSID driver shouldn't be registered. Checking the supported TPG modes to indicate if the TPG hardware exists or not and only registering v4l2 ctrl for CSID only when the TPG hardware is present.
--- .../media/platform/qcom/camss/camss-csid.c | 60 +++++++++++-------- 1 file changed, 35 insertions(+), 25 deletions(-)
drivers/media/platform/qcom/camss/camss-csid.c +35 -25
@@ -683,11 +683,13 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)int ret;if (enable) { - ret =v4l2_ctrl_handler_setup (&csid->ctrls); -if (ret <0 ) { -dev_err (csid->camss->dev, -"could not sync v4l2 controls: %d\n" , ret); -return ret; +if (csid->testgen.nmodes !=CSID_PAYLOAD_MODE_DISABLED ) { + ret =v4l2_ctrl_handler_setup (&csid->ctrls); +if (ret <0 ) { +dev_err (csid->camss->dev, +"could not sync v4l2 controls: %d\n" , ret); +return ret; + } } if (!csid->testgen.enabled &&
@@ -761,7 +763,8 @@ static void csid_try_format(struct csid_device *csid,break ;case MSM_CSID_PAD_SRC : -if (csid->testgen_mode->cur.val ==0 ) { +if (csid->testgen.nmodes ==CSID_PAYLOAD_MODE_DISABLED || + csid->testgen_mode->cur.val ==0 ) {/* Test generator is disabled, */ /* keep pad formats in sync */ u32 code = fmt->code;
@@ -811,7 +814,8 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd, code->code = csid->res->formats->formats[code->index].code; }else { -if (csid->testgen_mode->cur.val ==0 ) { +if (csid->testgen.nmodes ==CSID_PAYLOAD_MODE_DISABLED || + csid->testgen_mode->cur.val ==0 ) {struct v4l2_mbus_framefmt *sink_fmt; sink_fmt = __csid_get_format(csid, sd_state,
@@ -1190,7 +1194,8 @@ static int csid_link_setup(struct media_entity *entity,/* If test generator is enabled */ /* do not allow a link from CSIPHY to CSID */ -if (csid->testgen_mode->cur.val !=0 ) +if (csid->testgen.nmodes !=CSID_PAYLOAD_MODE_DISABLED && + csid->testgen_mode->cur.val !=0 )return -EBUSY ; sd =media_entity_to_v4l2_subdev (remote->entity);
@@ -1283,24 +1288,27 @@ int msm_csid_register_entity(struct csid_device *csid, MSM_CSID_NAME, csid->id);v4l2_set_subdevdata (sd, csid); - ret =v4l2_ctrl_handler_init (&csid->ctrls,1 ); -if (ret <0 ) { -dev_err (dev,"Failed to init ctrl handler: %d\n" , ret); -return ret; - } +if (csid->testgen.nmodes !=CSID_PAYLOAD_MODE_DISABLED ) { + ret =v4l2_ctrl_handler_init (&csid->ctrls,1 ); +if (ret <0 ) { +dev_err (dev,"Failed to init ctrl handler: %d\n" , ret); +return ret; + } - csid->testgen_mode =v4l2_ctrl_new_std_menu_items (&csid->ctrls, - &csid_ctrl_ops,V4L2_CID_TEST_PATTERN , - csid->testgen.nmodes,0 ,0 , - csid->testgen.modes); + csid->testgen_mode = +v4l2_ctrl_new_std_menu_items (&csid->ctrls, + &csid_ctrl_ops,V4L2_CID_TEST_PATTERN , + csid->testgen.nmodes,0 ,0 , + csid->testgen.modes); -if (csid->ctrls.error) { -dev_err (dev,"Failed to init ctrl: %d\n" , csid->ctrls.error); - ret = csid->ctrls.error; - goto free_ctrl; - } +if (csid->ctrls.error) { +dev_err (dev,"Failed to init ctrl: %d\n" , csid->ctrls.error); + ret = csid->ctrls.error; + goto free_ctrl; + } - csid->subdev.ctrl_handler = &csid->ctrls; + csid->subdev.ctrl_handler = &csid->ctrls; + } ret =csid_init_formats (sd,NULL );if (ret <0 ) {
@@ -1331,7 +1339,8 @@ int msm_csid_register_entity(struct csid_device *csid, media_cleanup:media_entity_cleanup (&sd->entity); free_ctrl: -v4l2_ctrl_handler_free (&csid->ctrls); +if (csid->testgen.nmodes !=CSID_PAYLOAD_MODE_DISABLED ) +v4l2_ctrl_handler_free (&csid->ctrls);return ret; }
@@ -1344,7 +1353,8 @@ void msm_csid_unregister_entity(struct csid_device *csid) {v4l2_device_unregister_subdev (&csid->subdev);media_entity_cleanup (&csid->subdev.entity); -v4l2_ctrl_handler_free (&csid->ctrls); +if (csid->testgen.nmodes !=CSID_PAYLOAD_MODE_DISABLED ) +v4l2_ctrl_handler_free (&csid->ctrls); }inline bool csid_is_lite (struct csid_device *csid)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 442/626 media: qcom: camss: Add default case in vfe_src_pad_code
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Depeng Shao <[email protected]>
[ Upstream commit 2f4204bb00b32eca3391a468d3b37e87feb96fa9 ]
Add a default case in vfe_src_pad_code to get rid of a compile warning if a new hw enum is added.
--- drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/platform/qcom/camss/camss-vfe.c +4 -0
@@ -398,6 +398,10 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,return sink_code; }break ; +default : +WARN (1 ,"Unsupported HW version: %x\n" , + vfe->camss->res->version); +break ; }return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 443/626 drm/rockchip: vop2: Improve display modes handling on RK3588 HDMI0
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 2c1268e7aad0819f38e56134bbc2095fd95fde1b ]
The RK3588 specific implementation is currently quite limited in terms of handling the full range of display modes supported by the connected screens, e.g. 2560x1440@75Hz, 2048x1152@60Hz, 1024x768@60Hz are just a few of them.
Additionally, it doesn't cope well with non-integer refresh rates like 59.94, 29.97, 23.98, etc.
Make use of HDMI0 PHY PLL as a more accurate DCLK source to handle all display modes up to 4K@60Hz.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +34 -0
@@ -157,6 +157,7 @@ struct vop2_video_port {struct drm_crtc crtc;struct vop2 *vop2;struct clk *dclk; +struct clk *dclk_src;unsigned int id;const struct vop2_video_port_data *data;
@@ -211,6 +212,7 @@ struct vop2 {struct clk *hclk;struct clk *aclk;struct clk *pclk; +struct clk *pll_hdmiphy0;/* optional internal rgb encoder */ struct rockchip_rgb *rgb;
@@ -219,6 +221,8 @@ struct vop2 {struct vop2_win win[]; }; +#define VOP2_MAX_DCLK_RATE 600000000 +#define vop2_output_if_is_hdmi (x) ((x) == ROCKCHIP_VOP2_EP_HDMI0 || \ (x) == ROCKCHIP_VOP2_EP_HDMI1)
@@ -1051,6 +1055,9 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc,vop2_crtc_disable_irq (vp,VP_INT_DSP_HOLD_VALID ); +if (vp->dclk_src) +clk_set_parent (vp->dclk, vp->dclk_src); +clk_disable_unprepare (vp->dclk); vop2->enable_count--;
@@ -2071,6 +2078,27 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,vop2_vp_write (vp,RK3568_VP_MIPI_CTRL ,0 ); +/* +* Switch to HDMI PHY PLL as DCLK source for display modes up +* to 4K@60Hz, if available, otherwise keep using the system CRU. +*/ +if (vop2->pll_hdmiphy0 && clock <=VOP2_MAX_DCLK_RATE ) { +drm_for_each_encoder_mask (encoder, crtc->dev, crtc_state->encoder_mask) { +struct rockchip_encoder *rkencoder =to_rockchip_encoder (encoder); + +if (rkencoder->crtc_endpoint_id ==ROCKCHIP_VOP2_EP_HDMI0 ) { +if (!vp->dclk_src) + vp->dclk_src =clk_get_parent (vp->dclk); + + ret =clk_set_parent (vp->dclk, vop2->pll_hdmiphy0); +if (ret <0 ) +drm_warn (vop2->drm, +"Could not switch to HDMI0 PHY PLL: %d\n" , ret); +break ; + } + } + } +clk_set_rate (vp->dclk, clock);vop2_post_config (crtc);
@@ -3242,6 +3270,12 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)return PTR_ERR (vop2->pclk); } + vop2->pll_hdmiphy0 =devm_clk_get_optional (vop2->dev,"pll_hdmiphy0" ); +if (IS_ERR (vop2->pll_hdmiphy0)) { +drm_err (vop2->drm,"failed to get pll_hdmiphy0\n" ); +return PTR_ERR (vop2->pll_hdmiphy0); + } + vop2->irq =platform_get_irq (pdev,0 );if (vop2->irq <0 ) {drm_err (vop2->drm,"cannot find irq for vop2\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 444/626 eth: fbnic: set IFF_UNICAST_FLT to avoid enabling promiscuous mode when adding unicast addrs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Duyck <[email protected]>
[ Upstream commit 09717c28b76c30b1dc8c261c855ffb2406abab2e ]
I realized when we were adding unicast addresses we were enabling promiscuous mode. I did a bit of digging and realized we had overlooked setting the driver private flag to indicate we supported unicast filtering.
Example below shows the table with 00deadbeef01 as the main NIC address, and 5 additional addresses in the 00deadbeefX0 format.
# cat $dbgfs/mac_addr
Idx S TCAM Bitmap Addr/Mask
----------------------------------
00 0 00000000,00000000 000000000000
000000000000
01 0 00000000,00000000 000000000000
000000000000
02 0 00000000,00000000 000000000000
000000000000
...
24 0 00000000,00000000 000000000000
000000000000
25 1 00100000,00000000 00deadbeef50
000000000000
26 1 00100000,00000000 00deadbeef40
000000000000
27 1 00100000,00000000 00deadbeef30
000000000000
28 1 00100000,00000000 00deadbeef20
000000000000
29 1 00100000,00000000 00deadbeef10
000000000000
30 1 00100000,00000000 00deadbeef01
000000000000
31 0 00000000,00000000 000000000000
000000000000Before rule 31 would be active. With this change it correctly sticks to just the unicast filters.
--- drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c +2 -0
@@ -544,6 +544,8 @@ struct net_device *fbnic_netdev_alloc(struct fbnic_dev *fbd)fbnic_rss_key_fill (fbn->rss_key);fbnic_rss_init_en_mask (fbn); + netdev->priv_flags |=IFF_UNICAST_FLT ; + netdev->features |=NETIF_F_RXHASH | NETIF_F_SG |
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 445/626 tools: ynl-gen: dont output external constants
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 7e8b24e24ac46038e48c9a042e7d9b31855cbca5 ]
A definition with a "header" property is an "external" definition for C code, as in it is defined already in another C header file. Other languages will need the exact value but C codegen should not recreate it. So don't output those definitions in the uAPI header.
--- tools/net/ynl/ynl-gen-c.py | 3 +++ 1 file changed, 3 insertions(+)
tools/net/ynl/ynl-gen-c.py +3 -0
@@ -2417,6 +2417,9 @@ def render_uapi(family, cw): defines = [] for const in family['definitions']: + if const.get('header'): + continue + if const['type'] != 'const': cw.writes_defines(defines) defines = []
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 446/626 net/mlx5e: Avoid WARN_ON when configuring MQPRIO with HTB offload enabled
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carolina Jubran <[email protected]>
[ Upstream commit 689805dcc474c2accb5cffbbcea1c06ee4a54570 ]
When attempting to enable MQPRIO while HTB offload is already configured, the driver currently returns -EINVAL and triggers a WARN_ON, leading to an unnecessary call trace.
Update the code to handle this case more gracefully by returning -EOPNOTSUPP instead, while also providing a helpful user message.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +5 -2
@@ -3759,8 +3759,11 @@ static int mlx5e_setup_tc_mqprio(struct mlx5e_priv *priv,/* MQPRIO is another toplevel qdisc that can't be attached * simultaneously with the offloaded HTB. */ -if (WARN_ON (mlx5e_selq_is_htb_enabled (&priv->selq))) -return -EINVAL ; +if (mlx5e_selq_is_htb_enabled (&priv->selq)) { +NL_SET_ERR_MSG_MOD (mqprio->extack, +"MQPRIO cannot be configured when HTB offload is enabled." ); +return -EOPNOTSUPP ; + }switch (mqprio->mode) {case TC_MQPRIO_MODE_DCB :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 447/626 cpufreq: amd-pstate: Remove unnecessary driver_lock in set_boost
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dhananjay Ugwekar <[email protected]>
[ Upstream commit db1cafc77aaaf871509da06f4a864e9af6d6791f ]
set_boost is a per-policy function call, hence a driver wide lock is unnecessary. Also this mutex_acquire can collide with the mutex_acquire from the mode-switch path in status_store(), which can lead to a deadlock. So, remove it.
--- drivers/cpufreq/amd-pstate.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/amd-pstate.c +0 -1
@@ -696,7 +696,6 @@ static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)pr_err ("Boost mode is not supported by this processor or SBIOS\n" );return -EOPNOTSUPP ; } -guard (mutex)(&amd_pstate_driver_lock); ret =amd_pstate_cpu_boost_update (policy, state);WRITE_ONCE (cpudata->boost_state, !ret ? state : false);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 448/626 vxlan: Annotate FDB data races
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit f6205f8215f12a96518ac9469ff76294ae7bd612 ]
The 'used' and 'updated' fields in the FDB entry structure can be accessed concurrently by multiple threads, leading to reports such as [1]. Can be reproduced using [2].
Suppress these reports by annotating these accesses using READ_ONCE() / WRITE_ONCE().
[1]
BUG: KCSAN: data-race in vxlan_xmit / vxlan_xmit
write to 0xffff942604d263a8 of 8 bytes by task 286 on cpu 0:
vxlan_xmit+0xb29/0x2380 dev_hard_start_xmit+0x84/0x2f0 __dev_queue_xmit+0x45a/0x1650 packet_xmit+0x100/0x150 packet_sendmsg+0x2114/0x2ac0 __sys_sendto+0x318/0x330 __x64_sys_sendto+0x76/0x90 x64_sys_call+0x14e8/0x1c00 do_syscall_64+0x9e/0x1a0 entry_SYSCALL_64_after_hwframe+0x77/0x7f
read to 0xffff942604d263a8 of 8 bytes by task 287 on cpu 2:
vxlan_xmit+0xadf/0x2380 dev_hard_start_xmit+0x84/0x2f0 __dev_queue_xmit+0x45a/0x1650 packet_xmit+0x100/0x150 packet_sendmsg+0x2114/0x2ac0 __sys_sendto+0x318/0x330 __x64_sys_sendto+0x76/0x90 x64_sys_call+0x14e8/0x1c00 do_syscall_64+0x9e/0x1a0 entry_SYSCALL_64_after_hwframe+0x77/0x7f
value changed: 0x00000000fffbac6e -> 0x00000000fffbac6f
Reported by Kernel Concurrency Sanitizer on:
CPU: 2 UID: 0 PID: 287 Comm: mausezahn Not tainted 6.13.0-rc7-01544-gb4b270f11a02 #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-3.fc41 04/01/2014
[2]
#!/bin/bash
set +H
echo whitelist > /sys/kernel/debug/kcsan
echo !vxlan_xmit > /sys/kernel/debug/kcsan
ip link add name vx0 up type vxlan id 10010 dstport 4789 local 192.0.2.1 bridge fdb add 00:11:22:33:44:55 dev vx0 self static dst 198.51.100.1 taskset -c 0 mausezahn vx0 -a own -b 00:11:22:33:44:55 -c 0 -q & taskset -c 2 mausezahn vx0 -a own -b 00:11:22:33:44:55 -c 0 -q &
--- drivers/net/vxlan/vxlan_core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/vxlan/vxlan_core.c +9 -9
@@ -227,9 +227,9 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan, be32_to_cpu(fdb->vni))) goto nla_put_failure; - ci.ndm_used =jiffies_to_clock_t (now - fdb->used); + ci.ndm_used =jiffies_to_clock_t (now -READ_ONCE (fdb->used)); ci.ndm_confirmed =0 ; - ci.ndm_updated =jiffies_to_clock_t (now - fdb->updated); + ci.ndm_updated =jiffies_to_clock_t (now -READ_ONCE (fdb->updated)); ci.ndm_refcnt =0 ;if (nla_put (skb,NDA_CACHEINFO ,sizeof (ci), &ci))
@@ -434,8 +434,8 @@ static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,struct vxlan_fdb *f; f =__vxlan_find_mac (vxlan, mac, vni); -if (f && f->used != jiffies) - f->used = jiffies; +if (f &&READ_ONCE (f->used) != jiffies) +WRITE_ONCE (f->used, jiffies);return f; }
@@ -1009,12 +1009,12 @@ static int vxlan_fdb_update_existing(struct vxlan_dev *vxlan, !(f->flags & NTF_VXLAN_ADDED_BY_USER)) {if (f->state != state) { f->state = state; - f->updated = jiffies; +WRITE_ONCE (f->updated, jiffies); notify =1 ; }if (f->flags != fdb_flags) { f->flags = fdb_flags; - f->updated = jiffies; +WRITE_ONCE (f->updated, jiffies); notify =1 ; } }
@@ -1048,7 +1048,7 @@ static int vxlan_fdb_update_existing(struct vxlan_dev *vxlan, }if (ndm_flags &NTF_USE ) - f->used = jiffies; +WRITE_ONCE (f->used, jiffies);if (notify) {if (rd ==NULL )
@@ -1477,7 +1477,7 @@ static bool vxlan_snoop(struct net_device *dev, src_mac, &rdst->remote_ip.sa, &src_ip->sa); rdst->remote_ip = *src_ip; - f->updated = jiffies; +WRITE_ONCE (f->updated, jiffies);vxlan_fdb_notify (vxlan, f, rdst,RTM_NEWNEIGH , true,NULL ); }else {u32 hash_index =fdb_head_index (vxlan, src_mac, vni);
@@ -2825,7 +2825,7 @@ static void vxlan_cleanup(struct timer_list *t)if (f->flags &NTF_EXT_LEARNED )continue ; - timeout = f->used + vxlan->cfg.age_interval *HZ ; + timeout =READ_ONCE (f->used) + vxlan->cfg.age_interval *HZ ;if (time_before_eq (timeout, jiffies)) { netdev_dbg(vxlan->dev, "garbage collect %pM\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 449/626 ipv4: ip_gre: Fix set but not used warning in ipgre_err() if IPv4-only
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 50f37fc2a39c4a8cc4813629b4cf239b71c6097d ]
if CONFIG_NET_IPGRE is enabled, but CONFIG_IPV6 is disabled:
net/ipv4/ip_gre.c: In function ‘ipgre_err’:
net/ipv4/ip_gre.c:144:22: error: variable ‘data_len’ set but not used [-Werror=unused-but-set-variable]
144 | unsigned int data_len = 0;
| ^~~~~~~~
Fix this by moving all data_len processing inside the IPV6-only section that uses its result.
--- net/ipv4/ip_gre.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
net/ipv4/ip_gre.c +10 -6
@@ -141,7 +141,6 @@ static int ipgre_err(struct sk_buff *skb, u32 info,const struct iphdr *iph;const int type =icmp_hdr (skb)->type;const int code =icmp_hdr (skb)->code; -unsigned int data_len =0 ;struct ip_tunnel *t;if (tpi->proto ==htons (ETH_P_TEB ))
@@ -182,7 +181,6 @@ static int ipgre_err(struct sk_buff *skb, u32 info,case ICMP_TIME_EXCEEDED :if (code !=ICMP_EXC_TTL )return 0 ; - data_len =icmp_hdr (skb)->un.reserved[1 ] *4 ;/* RFC 4884 4.1 */ break ;case ICMP_REDIRECT :
@@ -190,10 +188,16 @@ static int ipgre_err(struct sk_buff *skb, u32 info, }#if IS_ENABLED (CONFIG_IPV6 ) -if (tpi->proto ==htons (ETH_P_IPV6 ) && - !ip6_err_gen_icmpv6_unreach (skb, iph->ihl *4 + tpi->hdr_len, - type, data_len)) -return 0 ; +if (tpi->proto ==htons (ETH_P_IPV6 )) { +unsigned int data_len =0 ; + +if (type ==ICMP_TIME_EXCEEDED ) + data_len =icmp_hdr (skb)->un.reserved[1 ] *4 ;/* RFC 4884 4.1 */ + +if (!ip6_err_gen_icmpv6_unreach (skb, iph->ihl *4 + tpi->hdr_len, + type, data_len)) +return 0 ; + }#endif if (t->parms.iph.daddr == 0 ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 450/626 r8169: dont scan PHY addresses > 0
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit faac69a4ae5abb49e62c79c66b51bb905c9aa5ec ]
The PHY address is a dummy, because r8169 PHY access registers don't support a PHY address. Therefore scan address 0 only.
--- drivers/net/ethernet/realtek/r8169_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/realtek/r8169_main.c +1 -0
@@ -5258,6 +5258,7 @@ static int r8169_mdio_register(struct rtl8169_private *tp) new_bus->priv = tp; new_bus->parent = &pdev->dev; new_bus->irq[0 ] =PHY_MAC_INTERRUPT ; + new_bus->phy_mask =GENMASK (31 ,1 );snprintf (new_bus->id,MII_BUS_ID_SIZE ,"r8169-%x-%x" ,pci_domain_nr (pdev->bus),pci_dev_id (pdev));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 451/626 net: flush_backlog() small changes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit cbe08724c18078564abefbf6591078a7c98e5e0f ]
Add READ_ONCE() around reads of skb->dev->reg_state, because this field can be changed from other threads/cpus.
Instead of calling dev_kfree_skb_irq() and kfree_skb() while interrupts are masked and locks held, use a temporary list and use __skb_queue_purge_reason()
Use SKB_DROP_REASON_DEV_READY drop reason to better describe why these skbs are dropped.
--- net/core/dev.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/core/dev.c +8 -4
@@ -6034,16 +6034,18 @@ static DEFINE_PER_CPU(struct work_struct, flush_works);static void flush_backlog (struct work_struct *work) {struct sk_buff *skb, *tmp; +struct sk_buff_head list;struct softnet_data *sd; +__skb_queue_head_init (&list);local_bh_disable (); sd =this_cpu_ptr (&softnet_data);backlog_lock_irq_disable (sd); skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) { -if (skb->dev->reg_state ==NETREG_UNREGISTERING ) { +if (READ_ONCE (skb->dev->reg_state) ==NETREG_UNREGISTERING ) {__skb_unlink (skb, &sd->input_pkt_queue); -dev_kfree_skb_irq (skb); +__skb_queue_tail (&list, skb);rps_input_queue_head_incr (sd); } }
@@ -6051,14 +6053,16 @@ static void flush_backlog(struct work_struct *work)local_lock_nested_bh (&softnet_data.process_queue_bh_lock); skb_queue_walk_safe(&sd->process_queue, skb, tmp) { -if (skb->dev->reg_state ==NETREG_UNREGISTERING ) { +if (READ_ONCE (skb->dev->reg_state) ==NETREG_UNREGISTERING ) {__skb_unlink (skb, &sd->process_queue); -kfree_skb (skb); +__skb_queue_tail (&list, skb);rps_input_queue_head_incr (sd); } }local_unlock_nested_bh (&softnet_data.process_queue_bh_lock);local_bh_enable (); + +__skb_queue_purge_reason (&list,SKB_DROP_REASON_DEV_READY ); }static bool flush_required (int cpu)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 452/626 bridge: mdb: Allow replace of a host-joined group
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Machata <[email protected]>
[ Upstream commit d9e9f6d7b7d0c520bb87f19d2cbc57aeeb2091d5 ]
Attempts to replace an MDB group membership of the host itself are currently bounced:
# ip link add name br up type bridge vlan_filtering 1 # bridge mdb replace dev br port br grp 239.0.0.1 vid 2 # bridge mdb replace dev br port br grp 239.0.0.1 vid 2 Error: bridge: Group is already joined by host.
A similar operation done on a member port would succeed. Ignore the check for replacement of host group memberships as well.
The bit of code that this enables is br_multicast_host_join(), which, for already-joined groups only refreshes the MC group expiration timer, which is desirable; and a userspace notification, also desirable.
Change a selftest that exercises this code path from expecting a rejection to expecting a pass. The rest of MDB selftests pass without modification.
--- net/bridge/br_mdb.c | 2 +- tools/testing/selftests/net/forwarding/bridge_mdb.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/bridge/br_mdb.c +1 -1
@@ -1040,7 +1040,7 @@ static int br_mdb_add_group(const struct br_mdb_config *cfg,/* host join */ if (!port) { -if (mp->host_joined) { +if (mp->host_joined && !(cfg->nlflags &NLM_F_REPLACE )) {NL_SET_ERR_MSG_MOD (extack,"Group is already joined by host" );return -EEXIST ; }
tools/testing/selftests/net/forwarding/bridge_mdb.sh +1 -1
@@ -149,7 +149,7 @@ cfg_test_host_common() check_err $? "Failed to add $name host entry" bridge mdb replace dev br0 port br0 grp $grp $state vid 10 &> /dev/null - check_fail $? "Managed to replace $name host entry" + check_err $? "Failed to replace $name host entry" bridge mdb del dev br0 port br0 grp $grp $state vid 10 bridge mdb get dev br0 grp $grp vid 10 &> /dev/null
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 453/626 ice: init flow director before RDMA
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Swiatkowski <[email protected]>
[ Upstream commit d67627e7b53203ca150e54723abbed81a0716286 ]
Flow director needs only one MSI-X. Load it before RDMA to save MSI-X for it.
--- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +4 -2
@@ -5175,11 +5175,12 @@ int ice_load(struct ice_pf *pf)ice_napi_add (vsi); +ice_init_features (pf); + err =ice_init_rdma (pf);if (err) goto err_init_rdma; -ice_init_features (pf);ice_service_task_restart (pf);clear_bit (ICE_DOWN , pf->state);
@@ -5187,6 +5188,7 @@ int ice_load(struct ice_pf *pf)return 0 ; err_init_rdma: +ice_deinit_features (pf);ice_tc_indir_block_unregister (vsi); err_tc_indir_block_register:ice_unregister_netdev (vsi);
@@ -5210,8 +5212,8 @@ void ice_unload(struct ice_pf *pf)devl_assert_locked (priv_to_devlink (pf)); -ice_deinit_features (pf);ice_deinit_rdma (pf); +ice_deinit_features (pf);ice_tc_indir_block_unregister (vsi);ice_unregister_netdev (vsi);ice_devlink_destroy_pf_port (pf);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 454/626 ice: treat dyn_allowed only as suggestion
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Swiatkowski <[email protected]>
[ Upstream commit a8c2d3932c1106af2764cc6869b29bcf3cb5bc47 ]
It can be needed to have some MSI-X allocated as static and rest as dynamic. For example on PF VSI. We want to always have minimum one MSI-X on it, because of that it is allocated as a static one, rest can be dynamic if it is supported.
Change the ice_get_irq_res() to allow using static entries if they are free even if caller wants dynamic one.
Adjust limit values to the new approach. Min and max in limit means the values that are valid, so decrease max and num_static by one.
Set vsi::irq_dyn_alloc if dynamic allocation is supported.
--- drivers/net/ethernet/intel/ice/ice_irq.c | 25 ++++++++++++------------ drivers/net/ethernet/intel/ice/ice_lib.c | 2 ++ 2 files changed, 15 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_irq.c +13 -12
@@ -45,7 +45,7 @@ static void ice_free_irq_res(struct ice_pf *pf, u16 index)/** * ice_get_irq_res - get an interrupt resource * @pf: board private structure -* @dyn_only: force entry to be dynamically allocated +* @dyn_allowed: allow entry to be dynamically allocated * * Allocate new irq entry in the free slot of the tracker. Since xarray * is used, always allocate new entry at the lowest possible index. Set
@@ -53,11 +53,12 @@ static void ice_free_irq_res(struct ice_pf *pf, u16 index)* * Returns allocated irq entry or NULL on failure. */ -static struct ice_irq_entry *ice_get_irq_res (struct ice_pf *pf,bool dyn_only) +static struct ice_irq_entry *ice_get_irq_res (struct ice_pf *pf, +bool dyn_allowed) { -struct xa_limit limit = { .max = pf->irq_tracker.num_entries, +struct xa_limit limit = { .max = pf->irq_tracker.num_entries -1 , .min =0 }; -unsigned int num_static = pf->irq_tracker.num_static; +unsigned int num_static = pf->irq_tracker.num_static -1 ;struct ice_irq_entry *entry;unsigned int index;int ret;
@@ -66,9 +67,9 @@ static struct ice_irq_entry *ice_get_irq_res(struct ice_pf *pf, bool dyn_only)if (!entry)return NULL ; -/* skip preallocated entries if the caller says so */ -if (dyn_only) - limit.min = num_static; +/* only already allocated if the caller says so */ +if (!dyn_allowed) + limit.max = num_static; ret =xa_alloc (&pf->irq_tracker.entries, &index, entry, limit,GFP_KERNEL );
@@ -78,7 +79,7 @@ static struct ice_irq_entry *ice_get_irq_res(struct ice_pf *pf, bool dyn_only) entry =NULL ; }else { entry->index = index; - entry->dynamic = index >= num_static; + entry->dynamic = index > num_static; }return entry;
@@ -272,7 +273,7 @@ int ice_init_interrupt_scheme(struct ice_pf *pf)/** * ice_alloc_irq - Allocate new interrupt vector * @pf: board private structure -* @dyn_only: force dynamic allocation of the interrupt +* @dyn_allowed: allow dynamic allocation of the interrupt * * Allocate new interrupt vector for a given owner id. * return struct msi_map with interrupt details and track
@@ -285,20 +286,20 @@ int ice_init_interrupt_scheme(struct ice_pf *pf)* interrupt will be allocated with pci_msix_alloc_irq_at. * * Some callers may only support dynamically allocated interrupts. -* This is indicated with dyn_only flag. +* This is indicated with dyn_allowed flag. * * On failure, return map with negative .index. The caller * is expected to check returned map index. * */ -struct msi_map ice_alloc_irq (struct ice_pf *pf,bool dyn_only) +struct msi_map ice_alloc_irq (struct ice_pf *pf,bool dyn_allowed) {int sriov_base_vector = pf->sriov_base_vector;struct msi_map map = { .index = -ENOENT };struct device *dev =ice_pf_to_dev (pf);struct ice_irq_entry *entry; - entry =ice_get_irq_res (pf, dyn_only); + entry =ice_get_irq_res (pf, dyn_allowed);if (!entry)return map;
drivers/net/ethernet/intel/ice/ice_lib.c +2 -0
@@ -567,6 +567,8 @@ ice_vsi_alloc_def(struct ice_vsi *vsi, struct ice_channel *ch)return -ENOMEM ; } + vsi->irq_dyn_alloc =pci_msix_can_alloc_dyn (vsi->back->pdev); +switch (vsi->type) {case ICE_VSI_PF :case ICE_VSI_SF :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 455/626 rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ankur Arora <[email protected]>
[ Upstream commit 83b28cfe796464ebbde1cf7916c126da6d572685 ]
With PREEMPT_RCU=n, cond_resched() provides urgently needed quiescent states for read-side critical sections via rcu_all_qs(). One reason why this was needed: lacking preempt-count, the tick handler has no way of knowing whether it is executing in a read-side critical section or not.
With (PREEMPT_LAZY=y, PREEMPT_DYNAMIC=n), we get (PREEMPT_COUNT=y, PREEMPT_RCU=n). In this configuration cond_resched() is a stub and does not provide quiescent states via rcu_all_qs(). (PREEMPT_RCU=y provides this information via rcu_read_unlock() and its nesting counter.)
So, use the availability of preempt_count() to report quiescent states in rcu_flavor_sched_clock_irq().
--- kernel/rcu/tree_plugin.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
kernel/rcu/tree_plugin.h +7 -4
@@ -974,13 +974,16 @@ static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp)*/ static void rcu_flavor_sched_clock_irq (int user) { -if (user ||rcu_is_cpu_rrupt_from_idle ()) { +if (user ||rcu_is_cpu_rrupt_from_idle () || + (IS_ENABLED (CONFIG_PREEMPT_COUNT ) && + (preempt_count () ==HARDIRQ_OFFSET ))) {/* * Get here if this CPU took its interrupt from user -* mode or from the idle loop, and if this is not a -* nested interrupt. In this case, the CPU is in -* a quiescent state, so note it. +* mode, from the idle loop without this being a nested +* interrupt, or while not holding the task preempt count +* (with PREEMPT_COUNT=y). In this case, the CPU is in a +* quiescent state, so note it. * * No memory barrier is required here because rcu_qs() * references only CPU-local variables that other CPUs
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 456/626 rcu: handle unstable rdp in rcu_read_unlock_strict()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ankur Arora <[email protected]>
[ Upstream commit fcf0e25ad4c8d14d2faab4d9a17040f31efce205 ]
rcu_read_unlock_strict() can be called with preemption enabled which can make for an unstable rdp and a racy norm value.
Fix this by dropping the preempt-count in __rcu_read_unlock() after the call to rcu_read_unlock_strict(), adjusting the preempt-count check appropriately.
--- include/linux/rcupdate.h | 2 +- kernel/rcu/tree_plugin.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-)
include/linux/rcupdate.h +1 -1
@@ -95,9 +95,9 @@ static inline void __rcu_read_lock(void)static inline void __rcu_read_unlock (void ) { -preempt_enable ();if (IS_ENABLED (CONFIG_RCU_STRICT_GRACE_PERIOD ))rcu_read_unlock_strict (); +preempt_enable (); }static inline int rcu_preempt_depth (void )
kernel/rcu/tree_plugin.h +10 -1
@@ -832,8 +832,17 @@ void rcu_read_unlock_strict(void) {struct rcu_data *rdp; -if (irqs_disabled () ||preempt_count () || !rcu_state.gp_kthread) +if (irqs_disabled () ||in_atomic_preempt_off () || !rcu_state.gp_kthread)return ; + +/* +* rcu_report_qs_rdp() can only be invoked with a stable rdp and +* from the local CPU. +* +* The in_atomic_preempt_off() check ensures that we come here holding +* the last preempt_count (which will get dropped once we return to +* __rcu_read_unlock(). +*/ rdp =this_cpu_ptr (&rcu_data); rdp->cpu_no_qs.b.norm = false;rcu_report_qs_rdp (rdp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 457/626 rcu: fix header guard for rcu_all_qs()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ankur Arora <[email protected]>
[ Upstream commit ad6b5b73ff565e88aca7a7d1286788d80c97ba71 ]
rcu_all_qs() is defined for !CONFIG_PREEMPT_RCU but the declaration is conditioned on CONFIG_PREEMPTION.
With CONFIG_PREEMPT_LAZY, CONFIG_PREEMPTION=y does not imply CONFIG_PREEMPT_RCU=y.
Decouple the two.
--- include/linux/rcutree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/rcutree.h +1 -1
@@ -104,7 +104,7 @@ extern int rcu_scheduler_active;void rcu_end_inkernel_boot (void );bool rcu_inkernel_boot_has_ended (void );bool rcu_is_watching (void ); -#ifndef CONFIG_PREEMPTION +#ifndef CONFIG_PREEMPT_RCU void rcu_all_qs (void );#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 458/626 perf: Avoid the read if the count is already updated
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra (Intel) <[email protected]>
[ Upstream commit 8ce939a0fa194939cc1f92dbd8bc1a7806e7d40a ]
The event may have been updated in the PMU-specific implementation, e.g., Intel PEBS counters snapshotting. The common code should not read and overwrite the value.
The PERF_SAMPLE_READ in the data->sample_type can be used to detect whether the PMU-specific value is available. If yes, avoid the pmu->read() in the common code. Add a new flag, skip_read, to track the case.
Factor out a perf_pmu_read() to clean up the code.
--- include/linux/perf_event.h | 8 +++++++- kernel/events/core.c | 33 ++++++++++++++++----------------- kernel/events/ring_buffer.c | 1 + 3 files changed, 24 insertions(+), 18 deletions(-)
include/linux/perf_event.h +7 -1
@@ -1063,7 +1063,13 @@ struct perf_output_handle {struct perf_buffer *rb;unsigned long wakeup;unsigned long size; -u64 aux_flags; +union { +u64 flags;/* perf_output*() */ +u64 aux_flags;/* perf_aux_output*() */ +struct { +u64 skip_read :1 ; + }; + };union {void *addr;unsigned long head;
kernel/events/core.c +16 -17
@@ -1195,6 +1195,12 @@ static void perf_assert_pmu_disabled(struct pmu *pmu)WARN_ON_ONCE (*this_cpu_ptr (pmu->pmu_disable_count) ==0 ); } +static inline void perf_pmu_read (struct perf_event *event) +{ +if (event->state ==PERF_EVENT_STATE_ACTIVE ) + event->pmu->read (event); +} +static void get_ctx (struct perf_event_context *ctx) {refcount_inc (&ctx->refcount);
@@ -3482,8 +3488,7 @@ static void __perf_event_sync_stat(struct perf_event *event,* we know the event must be on the current CPU, therefore we * don't need to use it. */ -if (event->state ==PERF_EVENT_STATE_ACTIVE ) - event->pmu->read (event); +perf_pmu_read (event);perf_event_update_time (event);
@@ -4634,15 +4639,8 @@ static void __perf_event_read(void *info) pmu->read (event); -for_each_sibling_event (sub, event) { -if (sub->state ==PERF_EVENT_STATE_ACTIVE ) { -/* -* Use sibling's PMU rather than @event's since -* sibling could be on different (eg: software) PMU. -*/ - sub->pmu->read (sub); - } - } +for_each_sibling_event (sub, event) +perf_pmu_read (sub); data->ret = pmu->commit_txn (pmu);
@@ -7408,9 +7406,8 @@ static void perf_output_read_group(struct perf_output_handle *handle,if (read_format &PERF_FORMAT_TOTAL_TIME_RUNNING ) values[n++] = running; -if ((leader != event) && - (leader->state ==PERF_EVENT_STATE_ACTIVE )) - leader->pmu->read (leader); +if ((leader != event) && !handle->skip_read) +perf_pmu_read (leader); values[n++] =perf_event_count (leader, self);if (read_format &PERF_FORMAT_ID )
@@ -7423,9 +7420,8 @@ static void perf_output_read_group(struct perf_output_handle *handle,for_each_sibling_event (sub, leader) { n =0 ; -if ((sub != event) && - (sub->state ==PERF_EVENT_STATE_ACTIVE )) - sub->pmu->read (sub); +if ((sub != event) && !handle->skip_read) +perf_pmu_read (sub); values[n++] =perf_event_count (sub, self);if (read_format &PERF_FORMAT_ID )
@@ -7484,6 +7480,9 @@ void perf_output_sample(struct perf_output_handle *handle, {u64 sample_type = data->type; +if (data->sample_flags &PERF_SAMPLE_READ ) + handle->skip_read =1 ; +perf_output_put (handle, *header);if (sample_type &PERF_SAMPLE_IDENTIFIER )
kernel/events/ring_buffer.c +1 -0
@@ -185,6 +185,7 @@ __perf_output_begin(struct perf_output_handle *handle, handle->rb = rb; handle->event = event; + handle->flags =0 ; have_lost =local_read (&rb->lost);if (unlikely (have_lost)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 459/626 ice: count combined queues using Rx/Tx count
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Swiatkowski <[email protected]>
[ Upstream commit c3a392bdd31adc474f1009ee85c13fdd01fe800d ]
Previous implementation assumes that there is 1:1 matching between vectors and queues. It isn't always true.
Get minimum value from Rx/Tx queues to determine combined queues number.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +1 -2
@@ -3817,8 +3817,7 @@ static u32 ice_get_combined_cnt(struct ice_vsi *vsi)ice_for_each_q_vector (vsi, q_idx) {struct ice_q_vector *q_vector = vsi->q_vectors[q_idx]; -if (q_vector->rx.rx_ring && q_vector->tx.tx_ring) - combined++; + combined +=min (q_vector->num_ring_tx, q_vector->num_ring_rx); }return combined;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 460/626 drm/xe/relay: Dont use GFP_KERNEL for new transactions
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit 78d5d1e20d1de9422f013338a0f2311448588ba7 ]
VFs use a relay transaction during the resume/reset flow and use of the GFP_KERNEL flag may conflict with the reclaim:
-> #0 (fs_reclaim){+.+.}-{0:0}:
[ ] __lock_acquire+0x1874/0x2bc0
[ ] lock_acquire+0xd2/0x310
[ ] fs_reclaim_acquire+0xc5/0x100
[ ] mempool_alloc_noprof+0x5c/0x1b0
[ ] __relay_get_transaction+0xdc/0xa10 [xe]
[ ] relay_send_to+0x251/0xe50 [xe]
[ ] xe_guc_relay_send_to_pf+0x79/0x3a0 [xe]
[ ] xe_gt_sriov_vf_connect+0x90/0x4d0 [xe]
[ ] xe_uc_init_hw+0x157/0x3b0 [xe]
[ ] do_gt_restart+0x1ae/0x650 [xe]
[ ] xe_gt_resume+0xb6/0x120 [xe]
[ ] xe_pm_runtime_resume+0x15b/0x370 [xe]
[ ] xe_pci_runtime_resume+0x73/0x90 [xe]
[ ] pci_pm_runtime_resume+0xa0/0x100
[ ] __rpm_callback+0x4d/0x170
[ ] rpm_callback+0x64/0x70
[ ] rpm_resume+0x594/0x790
[ ] __pm_runtime_resume+0x4e/0x90
[ ] xe_pm_runtime_get_ioctl+0x9c/0x160 [xe]Since we have a preallocated pool of relay transactions, which should cover all our normal relay use cases, we may use the GFP_NOWAIT flag when allocating new outgoing transactions.
--- drivers/gpu/drm/xe/xe_guc_relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_guc_relay.c +1 -1
@@ -224,7 +224,7 @@ __relay_get_transaction(struct xe_guc_relay *relay, bool incoming, u32 remote, u* with CTB lock held which is marked as used in the reclaim path. * Btw, that's one of the reason why we use mempool here! */ - txn =mempool_alloc (&relay->pool, incoming ?GFP_ATOMIC :GFP_KERNEL ); + txn =mempool_alloc (&relay->pool, incoming ?GFP_ATOMIC :GFP_NOWAIT );if (!txn)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 461/626 net/mana: fix warning in the writer of client oob
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Taranov <[email protected]>
[ Upstream commit 5ec7e1c86c441c46a374577bccd9488abea30037 ]
Do not warn on missing pad_data when oob is in sgl.
--- drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/microsoft/mana/gdma_main.c +1 -1
@@ -1044,7 +1044,7 @@ static u32 mana_gd_write_client_oob(const struct gdma_wqe_request *wqe_req, header->inline_oob_size_div4 = client_oob_size /sizeof (u32);if (oob_in_sgl) { -WARN_ON_ONCE (!pad_data || wqe_req->num_sge <2 ); +WARN_ON_ONCE (wqe_req->num_sge <2 ); header->client_oob_in_sgl =1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 462/626 scsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit 56c3d809b7b450379162d0b8a70bbe71ab8db706 ]
After a port swap between separate fabrics, there may be multiple nodes in the vport's fc_nodes list with the same fabric well known address. Duplication is temporary and eventually resolves itself after dev_loss_tmo expires, but nameserver queries may still occur before dev_loss_tmo. This possibly results in returning stale fabric ndlp objects. Fix by adding an nlp_state check to ensure the ndlp search routine returns the correct newer allocated ndlp fabric object.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +12 -5
@@ -5622,6 +5622,7 @@ static struct lpfc_nodelist * __lpfc_findnode_did(struct lpfc_vport *vport, uint32_t did) {struct lpfc_nodelist *ndlp; +struct lpfc_nodelist *np =NULL ;uint32_t data1;list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) {
@@ -5636,14 +5637,20 @@ __lpfc_findnode_did(struct lpfc_vport *vport, uint32_t did) ndlp, ndlp->nlp_DID, ndlp->nlp_flag, data1, ndlp->nlp_rpi, ndlp->active_rrqs_xri_bitmap); -return ndlp; + +/* Check for new or potentially stale node */ +if (ndlp->nlp_state !=NLP_STE_UNUSED_NODE ) +return ndlp; + np = ndlp; } } -/* FIND node did <did> NOT FOUND */ -lpfc_printf_vlog (vport,KERN_INFO ,LOG_NODE , -"0932 FIND node did x%x NOT FOUND.\n" , did); -return NULL ; +if (!np) +/* FIND node did <did> NOT FOUND */ +lpfc_printf_vlog (vport,KERN_INFO ,LOG_NODE , +"0932 FIND node did x%x NOT FOUND.\n" , did); + +return np; } struct lpfc_nodelist *
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 463/626 scsi: lpfc: Ignore ndlp rport mismatch in dev_loss_tmo callbk
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit 23ed62897746f49f195d819ce6edeb1db27d1b72 ]
With repeated port swaps between separate fabrics, there can be multiple registrations for fabric well known address 0xfffffe. This can cause ndlp reference confusion due to the usage of a single ndlp ptr that stores the rport object in fc_rport struct private storage during transport registration. Subsequent registrations update the ndlp->rport field with the newer rport, so when transport layer triggers dev_loss_tmo for the earlier registered rport the ndlp->rport private storage is referencing the newer rport instead of the older rport in dev_loss_tmo callbk.
Because the older ndlp->rport object is already cleaned up elsewhere in driver code during the time of fabric swap, check that the rport provided in dev_loss_tmo callbk actually matches the rport stored in the LLDD's ndlp->rport field. Otherwise, skip dev_loss_tmo work on a stale rport.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +9 -3
@@ -227,10 +227,16 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)if (ndlp->nlp_state ==NLP_STE_MAPPED_NODE )return ; -/* check for recovered fabric node */ -if (ndlp->nlp_state ==NLP_STE_UNMAPPED_NODE && - ndlp->nlp_DID == Fabric_DID) +/* Ignore callback for a mismatched (stale) rport */ +if (ndlp->rport != rport) { +lpfc_vlog_msg (vport,KERN_WARNING ,LOG_NODE , +"6788 fc rport mismatch: d_id x%06x ndlp x%px " +"fc rport x%px node rport x%px state x%x " +"refcnt %u\n" , + ndlp->nlp_DID, ndlp, rport, ndlp->rport, + ndlp->nlp_state,kref_read (&ndlp->kref));return ; + }if (rport->port_name !=wwn_to_u64 (ndlp->nlp_portname.u.wwn)) lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 464/626 scsi: lpfc: Free phba irq in lpfc_sli4_enable_msi() when pci_irq_vector() fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit f0842902b383982d1f72c490996aa8fc29a7aa0d ]
Fix smatch warning regarding missed calls to free_irq(). Free the phba IRQ in the failed pci_irq_vector cases.
lpfc_init.c: lpfc_sli4_enable_msi() warn: 'phba->pcidev->irq' from
request_irq() not released.
--- drivers/scsi/lpfc/lpfc_init.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/lpfc/lpfc_init.c +2 -0
@@ -13190,6 +13190,7 @@ lpfc_sli4_enable_msi(struct lpfc_hba *phba) eqhdl =lpfc_get_eq_hdl (0 ); rc =pci_irq_vector (phba->pcidev,0 );if (rc <0 ) { +free_irq (phba->pcidev->irq, phba);pci_free_irq_vectors (phba->pcidev);lpfc_printf_log (phba,KERN_WARNING ,LOG_INIT ,"0496 MSI pci_irq_vec failed (%d)\n" , rc);
@@ -13270,6 +13271,7 @@ lpfc_sli4_enable_intr(struct lpfc_hba *phba, uint32_t cfg_mode) eqhdl =lpfc_get_eq_hdl (0 ); retval =pci_irq_vector (phba->pcidev,0 );if (retval <0 ) { +free_irq (phba->pcidev->irq, phba);lpfc_printf_log (phba,KERN_WARNING ,LOG_INIT ,"0502 INTR pci_irq_vec failed (%d)\n" , retval);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 465/626 scsi: st: Restore some drive settings after reset
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai Mäkisara <[email protected]>
[ Upstream commit 7081dc75df79696d8322d01821c28e53416c932c ]
Some of the allowed operations put the tape into a known position to continue operation assuming only the tape position has changed. But reset sets partition, density and block size to drive default values. These should be restored to the values before reset.
Normally the current block size and density are stored by the drive. If the settings have been changed, the changed values have to be saved by the driver across reset.
--- drivers/scsi/st.c | 24 +++++++++++++++++++++--- drivers/scsi/st.h | 2 ++ 2 files changed, 23 insertions(+), 3 deletions(-)
drivers/scsi/st.c +21 -3
@@ -952,7 +952,6 @@ static void reset_state(struct scsi_tape *STp) STp->partition =find_partition (STp);if (STp->partition <0 ) STp->partition =0 ; - STp->new_partition = STp->partition; } }
@@ -2926,14 +2925,17 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lonif (cmd_in ==MTSETDENSITY ) { (STp->buffer)->b_data[4 ] = arg; STp->density_changed =1 ;/* At least we tried ;-) */ + STp->changed_density = arg; }else if (cmd_in ==SET_DENS_AND_BLK ) (STp->buffer)->b_data[4 ] = arg >>24 ;else (STp->buffer)->b_data[4 ] = STp->density;if (cmd_in ==MTSETBLK || cmd_in ==SET_DENS_AND_BLK ) { ltmp = arg &MT_ST_BLKSIZE_MASK ; -if (cmd_in ==MTSETBLK ) +if (cmd_in ==MTSETBLK ) { STp->blksize_changed =1 ;/* At least we tried ;-) */ + STp->changed_blksize = arg; + } }else ltmp = STp->block_size; (STp->buffer)->b_data[9 ] = (ltmp >>16 );
@@ -3634,9 +3636,25 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) retval = (-EIO ); goto out; } -reset_state (STp); +reset_state (STp);/* Clears pos_unknown */ /* remove this when the midlevel properly clears was_reset */ STp->device->was_reset =0 ; + +/* Fix the device settings after reset, ignore errors */ +if (mtc.mt_op ==MTREW || mtc.mt_op ==MTSEEK || + mtc.mt_op ==MTEOM ) { +if (STp->can_partitions) { +/* STp->new_partition contains the +* latest partition set +*/ + STp->partition =0 ; +switch_partition (STp); + } +if (STp->density_changed) +st_int_ioctl (STp,MTSETDENSITY , STp->changed_density); +if (STp->blksize_changed) +st_int_ioctl (STp,MTSETBLK , STp->changed_blksize); + } } if (mtc.mt_op != MTNOP && mtc.mt_op != MTSETBLK &&
drivers/scsi/st.h +2 -0
@@ -165,6 +165,7 @@ struct scsi_tape {unsigned char compression_changed;unsigned char drv_buffer;unsigned char density; +unsigned char changed_density;unsigned char door_locked;unsigned char autorew_dev;/* auto-rewind device */ unsigned char rew_at_close;/* rewind necessary at close */
@@ -172,6 +173,7 @@ struct scsi_tape {unsigned char cleaning_req;/* cleaning requested? */ unsigned char first_tur;/* first TEST UNIT READY */ int block_size; +int changed_blksize;int min_block;int max_block;int recover_count;/* From tape opening */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 466/626 wifi: ath12k: Avoid napi_sync() before napi_enable()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avula Sri Charan <[email protected]>
[ Upstream commit 268c73d470a5790a492a2fc2ded084b909d144f3 ]
In case of MHI error a reset work will be queued which will try napi_disable() after napi_synchronize().
As the napi will be only enabled after qmi_firmware_ready event, trying napi_synchronize() before napi_enable() will result in indefinite sleep in case of a firmware crash in QMI init sequence.
To avoid this, introduce napi_enabled flag to check if napi is enabled or not before calling napi_synchronize().
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/core.h | 1 + drivers/net/wireless/ath/ath12k/pci.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/core.h +1 -0
@@ -148,6 +148,7 @@ struct ath12k_ext_irq_grp {u32 num_irq;u32 grp_id;u64 timestamp; +bool napi_enabled;struct napi_struct napi;struct net_device *napi_ndev; };
drivers/net/wireless/ath/ath12k/pci.c +10 -3
@@ -481,8 +481,11 @@ static void __ath12k_pci_ext_irq_disable(struct ath12k_base *ab)ath12k_pci_ext_grp_disable (irq_grp); -napi_synchronize (&irq_grp->napi); -napi_disable (&irq_grp->napi); +if (irq_grp->napi_enabled) { +napi_synchronize (&irq_grp->napi); +napi_disable (&irq_grp->napi); + irq_grp->napi_enabled = false; + } } }
@@ -1112,7 +1115,11 @@ void ath12k_pci_ext_irq_enable(struct ath12k_base *ab)for (i =0 ; i <ATH12K_EXT_IRQ_GRP_NUM_MAX ; i++) {struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; -napi_enable (&irq_grp->napi); +if (!irq_grp->napi_enabled) { +napi_enable (&irq_grp->napi); + irq_grp->napi_enabled = true; + } +ath12k_pci_ext_grp_enable (irq_grp); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 467/626 HID: usbkbd: Fix the bit shift number for LED_KANA
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: junan <[email protected]>
[ Upstream commit d73a4bfa2881a6859b384b75a414c33d4898b055 ]
Since "LED_KANA" was defined as "0x04", the shift number should be "4".
--- drivers/hid/usbhid/usbkbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/usbhid/usbkbd.c +1 -1
@@ -160,7 +160,7 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type,return -1 ;spin_lock_irqsave (&kbd->leds_lock, flags); - kbd->newleds = (!!test_bit (LED_KANA , dev->led) <<3 ) | (!!test_bit (LED_COMPOSE , dev->led) <<3 ) | + kbd->newleds = (!!test_bit (LED_KANA , dev->led) <<4 ) | (!!test_bit (LED_COMPOSE , dev->led) <<3 ) | (!!test_bit (LED_SCROLLL , dev->led) <<2 ) | (!!test_bit (LED_CAPSL , dev->led) <<1 ) | (!!test_bit (LED_NUML , dev->led));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 468/626 arm64: zynqmp: add clock-output-names property in clock nodes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Naman Trivedi <[email protected]>
[ Upstream commit 385a59e7f7fb3438466a0712cc14672c708bbd57 ]
Add clock-output-names property to clock nodes, so that the resulting clock name do not change when clock node name is changed. Also, replace underscores with hyphens in the clock node names as per dt-schema rule.
--- arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +10 -5
@@ -10,39 +10,44 @@ #include <dt-bindings/clock/xlnx-zynqmp-clk.h> / { - pss_ref_clk: pss_ref_clk { + pss_ref_clk: pss-ref-clk { bootph-all; compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <33333333>; + clock-output-names = "pss_ref_clk"; }; - video_clk: video_clk { + video_clk: video-clk { bootph-all; compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>; + clock-output-names = "video_clk"; }; - pss_alt_ref_clk: pss_alt_ref_clk { + pss_alt_ref_clk: pss-alt-ref-clk { bootph-all; compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <0>; + clock-output-names = "pss_alt_ref_clk"; }; - gt_crx_ref_clk: gt_crx_ref_clk { + gt_crx_ref_clk: gt-crx-ref-clk { bootph-all; compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <108000000>; + clock-output-names = "gt_crx_ref_clk"; }; - aux_ref_clk: aux_ref_clk { + aux_ref_clk: aux-ref-clk { bootph-all; compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>; + clock-output-names = "aux_ref_clk"; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 469/626 ASoC: codecs: pcm3168a: Allow for 24-bit in provider mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 7d92a38d67e5d937b64b20aa4fd14451ee1772f3 ]
As per codec device specification, 24-bit is allowed in provider mode. Update the code to reflect that.
--- sound/soc/codecs/pcm3168a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/pcm3168a.c +3 -3
@@ -493,9 +493,9 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, }break ;case 24 : -if (provider_mode || (format ==SND_SOC_DAIFMT_DSP_A ) || - (format ==SND_SOC_DAIFMT_DSP_B )) { -dev_err (component->dev,"24-bit slots not supported in provider mode, or consumer mode using DSP\n" ); +if (!provider_mode && ((format ==SND_SOC_DAIFMT_DSP_A ) || + (format ==SND_SOC_DAIFMT_DSP_B ))) { +dev_err (component->dev,"24-bit slots not supported in consumer mode using DSP\n" );return -EINVAL ; }break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 470/626 ASoC: rt722-sdca: Add some missing readable registers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit f9a5c4b6afc79073491acdab7f1e943ee3a19fbb ]
Add a few missing registers from the readable register callback.
--- sound/soc/codecs/rt722-sdca-sdw.c | 49 +++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-)
sound/soc/codecs/rt722-sdca-sdw.c +46 -3
@@ -28,9 +28,50 @@ static bool rt722_sdca_readable_register(struct device *dev, unsigned int reg) 0):case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_GE49 ,RT722_SDCA_CTL_DETECTED_MODE ,0 ): -case SDW_SDCA_CTL (FUNC_NUM_HID ,RT722_SDCA_ENT_HID01 ,RT722_SDCA_CTL_HIDTX_CURRENT_OWNER , - 0) ... SDW_SDCA_CTL(FUNC_NUM_HID, RT722_SDCA_ENT_HID01, -RT722_SDCA_CTL_HIDTX_MESSAGE_LENGTH ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_XU03 ,RT722_SDCA_CTL_SELECTED_MODE , +0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_USER_FU05 , + RT722_SDCA_CTL_FU_MUTE, CH_L) ... +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_USER_FU05 , +RT722_SDCA_CTL_FU_MUTE ,CH_R ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_XU0D , +RT722_SDCA_CTL_SELECTED_MODE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_USER_FU0F , + RT722_SDCA_CTL_FU_MUTE, CH_L) ... +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_USER_FU0F , +RT722_SDCA_CTL_FU_MUTE ,CH_R ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 , +RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE12 , +RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_CS01 , +RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_CS11 , +RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_USER_FU1E , + RT722_SDCA_CTL_FU_MUTE, CH_01) ... +SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_USER_FU1E , +RT722_SDCA_CTL_FU_MUTE ,CH_04 ): +case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_IT26 , +RT722_SDCA_CTL_VENDOR_DEF ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_PDE2A , +RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_CS1F , +RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_HID ,RT722_SDCA_ENT_HID01 , + RT722_SDCA_CTL_HIDTX_CURRENT_OWNER, 0) ... +SDW_SDCA_CTL (FUNC_NUM_HID ,RT722_SDCA_ENT_HID01 , +RT722_SDCA_CTL_HIDTX_MESSAGE_LENGTH ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_USER_FU06 , + RT722_SDCA_CTL_FU_MUTE, CH_L) ... +SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_USER_FU06 , +RT722_SDCA_CTL_FU_MUTE ,CH_R ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_OT23 , +RT722_SDCA_CTL_VENDOR_DEF ,CH_08 ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 , +RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_CS31 , +RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): case RT722_BUF_ADDR_HID1 ... RT722_BUF_ADDR_HID2:return true;default :
@@ -74,6 +115,7 @@ static bool rt722_sdca_mbq_readable_register(struct device *dev, unsigned int re case 0x5600000 ... 0x5600007: case 0x5700000 ... 0x5700004: case 0x5800000 ... 0x5800004: +case 0x5810000 :case 0x5b00003 :case 0x5c00011 :case 0x5d00006 :
@@ -81,6 +123,7 @@ static bool rt722_sdca_mbq_readable_register(struct device *dev, unsigned int recase 0x5f00030 : case 0x6100000 ... 0x6100051: case 0x6100055 ... 0x6100057: +case 0x6100060 :case 0x6100062 : case 0x6100064 ... 0x6100065:case 0x6100067 :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 471/626 irqchip/riscv-aplic: Add support for hart indexes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Kondratiev <[email protected]>
[ Upstream commit b93afe8a3ac53ae52296d65acfaa9c5f582a48cc ]
RISC-V APLIC specification defines "hart index" in:
https://github.com/riscv/riscv-aia
Within a given interrupt domain, each of the domain’s harts has a unique index number in the range 0 to 2^14 − 1 (= 16,383). The index number a domain associates with a hart may or may not have any relationship to the unique hart identifier (“hart ID”) that the RISC-V Privileged Architecture assigns to the hart. Two different interrupt domains may employ entirely different index numbers for the same set of harts.
Further, this document says in "4.5 Memory-mapped control region for an interrupt domain":
The array of IDC structures may include some for potential hart index numbers that are not actual hart index numbers in the domain. For example, the first IDC structure is always for hart index 0, but 0 is not necessarily a valid index number for any hart in the domain.
Support arbitrary hart indices specified in an optional APLIC property "riscv,hart-indexes" which is specified as an array of u32 elements, one per interrupt target. If this property is not specified, fallback to use logical hart indices within the domain.
--- drivers/irqchip/irq-riscv-aplic-direct.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/irqchip/irq-riscv-aplic-direct.c +21 -3
@@ -31,7 +31,7 @@ struct aplic_direct { };struct aplic_idc { -unsigned int hart_index; +u32 hart_index;void __iomem *regs;struct aplic_direct *direct; };
@@ -219,6 +219,20 @@ static int aplic_direct_parse_parent_hwirq(struct device *dev, u32 index,return 0 ; } +static int aplic_direct_get_hart_index (struct device *dev,u32 logical_index, +u32 *hart_index) +{ +const char *prop_hart_index ="riscv,hart-indexes" ; +struct device_node *np =to_of_node (dev->fwnode); + +if (!np || !of_property_present (np, prop_hart_index)) { + *hart_index = logical_index; +return 0 ; + } + +return of_property_read_u32_index (np, prop_hart_index, logical_index, hart_index); +} +int aplic_direct_setup (struct device *dev,void __iomem *regs) {int i, j, rc, cpu, current_cpu, setup_count =0 ;
@@ -265,8 +279,12 @@ int aplic_direct_setup(struct device *dev, void __iomem *regs)cpumask_set_cpu (cpu, &direct->lmask); idc =per_cpu_ptr (&aplic_idcs, cpu); - idc->hart_index = i; - idc->regs = priv->regs +APLIC_IDC_BASE + i *APLIC_IDC_SIZE ; + rc =aplic_direct_get_hart_index (dev, i, &idc->hart_index); +if (rc) { +dev_warn (dev,"hart index not found for IDC%d\n" , i); +continue ; + } + idc->regs = priv->regs +APLIC_IDC_BASE + idc->hart_index *APLIC_IDC_SIZE ; idc->direct = direct;aplic_idc_set_delivery (idc, true);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 472/626 dm vdo vio-pool: allow variable-sized metadata vios
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ken Raeburn <[email protected]>
[ Upstream commit f979da512553a41a657f2c1198277e84d66f8ce3 ]
With larger-sized metadata vio pools, vdo will sometimes need to issue I/O with a smaller size than the allocated size. Since vio_reset_bio is where the bvec array and I/O size are initialized, this reset interface must now specify what I/O size to use.
--- drivers/md/dm-vdo/io-submitter.c | 6 ++++-- drivers/md/dm-vdo/io-submitter.h | 18 +++++++++++++--- drivers/md/dm-vdo/types.h | 3 +++ drivers/md/dm-vdo/vio.c | 36 +++++++++++++++++++------------- drivers/md/dm-vdo/vio.h | 2 ++ 5 files changed, 46 insertions(+), 19 deletions(-)
drivers/md/dm-vdo/io-submitter.c +4 -2
@@ -327,6 +327,7 @@ void vdo_submit_data_vio(struct data_vio *data_vio)* @error_handler: the handler for submission or I/O errors (may be NULL) * @operation: the type of I/O to perform * @data: the buffer to read or write (may be NULL) +* @size: the I/O amount in bytes * * The vio is enqueued on a vdo bio queue so that bio submission (which may block) does not block * other vdo threads.
@@ -338,7 +339,7 @@ void vdo_submit_data_vio(struct data_vio *data_vio)*/ void __submit_metadata_vio (struct vio *vio,physical_block_number_t physical,bio_end_io_t callback,vdo_action_fn error_handler, -blk_opf_t operation,char *data) +blk_opf_t operation,char *data,int size) {int result;struct vdo_completion *completion = &vio->completion;
@@ -349,7 +350,8 @@ void __submit_metadata_vio(struct vio *vio, physical_block_number_t physical,vdo_reset_completion (completion); completion->error_handler = error_handler; - result =vio_reset_bio (vio, data, callback, operation |REQ_META , physical); + result =vio_reset_bio_with_size (vio, data, size, callback, operation |REQ_META , + physical);if (result !=VDO_SUCCESS ) {continue_vio (vio, result);return ;
drivers/md/dm-vdo/io-submitter.h +15 -3
@@ -8,6 +8,7 @@#include <linux/bio.h> +#include "constants.h" #include "types.h" struct io_submitter ;
@@ -26,14 +27,25 @@ void vdo_submit_data_vio(struct data_vio *data_vio);void __submit_metadata_vio (struct vio *vio,physical_block_number_t physical,bio_end_io_t callback,vdo_action_fn error_handler, -blk_opf_t operation,char *data); +blk_opf_t operation,char *data,int size);static inline void vdo_submit_metadata_vio (struct vio *vio,physical_block_number_t physical,bio_end_io_t callback,vdo_action_fn error_handler,blk_opf_t operation) {__submit_metadata_vio (vio, physical, callback, error_handler, - operation, vio->data); + operation, vio->data, vio->block_count *VDO_BLOCK_SIZE ); +} + +static inline void vdo_submit_metadata_vio_with_size (struct vio *vio, +physical_block_number_t physical, +bio_end_io_t callback, +vdo_action_fn error_handler, +blk_opf_t operation, +int size) +{ +__submit_metadata_vio (vio, physical, callback, error_handler, + operation, vio->data, size); } static inline void vdo_submit_flush_vio(struct vio *vio, bio_end_io_t callback,
@@ -41,7 +53,7 @@ static inline void vdo_submit_flush_vio(struct vio *vio, bio_end_io_t callback, {/* FIXME: Can we just use REQ_OP_FLUSH? */ __submit_metadata_vio (vio,0 , callback, error_handler, -REQ_OP_WRITE |REQ_PREFLUSH ,NULL ); +REQ_OP_WRITE |REQ_PREFLUSH ,NULL ,0 ); }#endif /* VDO_IO_SUBMITTER_H */
drivers/md/dm-vdo/types.h +3 -0
@@ -376,6 +376,9 @@ struct vio {/* The size of this vio in blocks */ unsigned int block_count; +/* The amount of data to be read or written, in bytes */ +unsigned int io_size; +/* The data being read or written. */ char *data;
drivers/md/dm-vdo/vio.c +22 -14
@@ -188,14 +188,23 @@ void vdo_set_bio_properties(struct bio *bio, struct vio *vio, bio_end_io_t callb/* * Prepares the bio to perform IO with the specified buffer. May only be used on a VDO-allocated -* bio, as it assumes the bio wraps a 4k buffer that is 4k aligned, but there does not have to be a -* vio associated with the bio. +* bio, as it assumes the bio wraps a 4k-multiple buffer that is 4k aligned, but there does not +* have to be a vio associated with the bio. */ int vio_reset_bio (struct vio *vio,char *data,bio_end_io_t callback,blk_opf_t bi_opf,physical_block_number_t pbn) { -int bvec_count, offset, len, i; +return vio_reset_bio_with_size (vio, data, vio->block_count *VDO_BLOCK_SIZE , + callback, bi_opf, pbn); +} + +int vio_reset_bio_with_size (struct vio *vio,char *data,int size,bio_end_io_t callback, +blk_opf_t bi_opf,physical_block_number_t pbn) +{ +int bvec_count, offset, i;struct bio *bio = vio->bio; +int vio_size = vio->block_count *VDO_BLOCK_SIZE ; +int remaining;bio_reset (bio, bio->bi_bdev, bi_opf);vdo_set_bio_properties (bio, vio, callback, bi_opf, pbn);
@@ -204,22 +213,21 @@ int vio_reset_bio(struct vio *vio, char *data, bio_end_io_t callback, bio->bi_io_vec = bio->bi_inline_vecs; bio->bi_max_vecs = vio->block_count +1 ; - len =VDO_BLOCK_SIZE * vio->block_count; +if (VDO_ASSERT (size <= vio_size,"specified size %d is not greater than allocated %d" , + size, vio_size) !=VDO_SUCCESS ) + size = vio_size; + vio->io_size = size; offset =offset_in_page (data); - bvec_count =DIV_ROUND_UP (offset + len,PAGE_SIZE ); + bvec_count =DIV_ROUND_UP (offset + size,PAGE_SIZE ); + remaining = size; -/* -* If we knew that data was always on one page, or contiguous pages, we wouldn't need the -* loop. But if we're using vmalloc, it's not impossible that the data is in different -* pages that can't be merged in bio_add_page... -*/ -for (i =0 ; (i < bvec_count) && (len >0 ); i++) { +for (i =0 ; (i < bvec_count) && (remaining >0 ); i++) {struct page *page;int bytes_added;int bytes =PAGE_SIZE - offset; -if (bytes > len) - bytes = len; +if (bytes > remaining) + bytes = remaining; page =is_vmalloc_addr (data) ?vmalloc_to_page (data) :virt_to_page (data); bytes_added =bio_add_page (bio, page, bytes, offset);
@@ -231,7 +239,7 @@ int vio_reset_bio(struct vio *vio, char *data, bio_end_io_t callback, } data += bytes; - len -= bytes; + remaining -= bytes; offset =0 ; }
drivers/md/dm-vdo/vio.h +2 -0
@@ -123,6 +123,8 @@ void vdo_set_bio_properties(struct bio *bio, struct vio *vio, bio_end_io_t callbint vio_reset_bio (struct vio *vio,char *data,bio_end_io_t callback,blk_opf_t bi_opf,physical_block_number_t pbn); +int vio_reset_bio_with_size (struct vio *vio,char *data,int size,bio_end_io_t callback, +blk_opf_t bi_opf,physical_block_number_t pbn); void update_vio_error_stats(struct vio *vio, const char *format, ...) __printf(2, 3);
Signature · 1 line
2.39.5
Re: [PATCH 6.12 472/626] dm vdo vio-pool: allow variable-sized metadata vios
Quoted 1 line · Greg Kroah-Hartman
6.12-stable review patch. If anyone has any objections, please let me know.
There's no reason to take this patch for 6.12, it can just be dropped.
This patch adds a new interface, but the subsequent patches that use that interface are not being backported. So it won't hurt anything, but it's also useless in 6.12.
Matt
Quoted 202 lines
------------------
From: Ken Raeburn <[email protected]>
[ Upstream commit
f979da512553a41a657f2c1198277e84d66f8ce3]With larger-sized metadata vio pools, vdo will sometimes need to issue I/O with a smaller size than the allocated size. Since
vio_reset_biois where the bvec array and I/O size are initialized, this reset interface must now specify what I/O size to use.Signed-off-by Ken Raeburn <[email protected]>Signed-off-by Matthew Sakai <[email protected]>Signed-off-by Mikulas Patocka <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/md/dm-vdo/io-submitter.c | 6 ++++-- drivers/md/dm-vdo/io-submitter.h | 18 +++++++++++++--- drivers/md/dm-vdo/types.h | 3 +++ drivers/md/dm-vdo/vio.c | 36 +++++++++++++++++++------------- drivers/md/dm-vdo/vio.h | 2 ++ 5 files changed, 46 insertions(+), 19 deletions(-)drivers/md/dm-vdo/io-submitter.c +4
-2@@ -327,6 +327,7 @@ void vdo_submit_data_vio(struct data_vio *data_vio)* @error_handler: the handler for submission or I/O errors (may be NULL) * @operation: the type of I/O to perform * @data: the buffer to read or write (may be NULL) +* @size: the I/O amount in bytes * * The vio is enqueued on a vdo bio queue so that bio submission (which may block) does not block * other vdo threads. @@ -338,7 +339,7 @@ void vdo_submit_data_vio(struct data_vio *data_vio)*/ void __submit_metadata_vio (struct vio *vio,physical_block_number_t physical,bio_end_io_t callback,vdo_action_fn error_handler, -blk_opf_t operation,char *data) +blk_opf_t operation,char *data,int size) {int result;struct vdo_completion *completion = &vio->completion;@@ -349,7 +350,8 @@ void __submit_metadata_vio(struct vio *vio, physical_block_number_t physical,vdo_reset_completion (completion); completion->error_handler = error_handler; - result =vio_reset_bio (vio, data, callback, operation |REQ_META , physical); + result =vio_reset_bio_with_size (vio, data, size, callback, operation |REQ_META , + physical);if (result !=VDO_SUCCESS ) {continue_vio (vio, result);return ;drivers/md/dm-vdo/io-submitter.h +15
-3@@ -8,6 +8,7 @@#include <linux/bio.h> +#include "constants.h" #include "types.h" struct io_submitter ;@@ -26,14 +27,25 @@ void vdo_submit_data_vio(struct data_vio *data_vio);void __submit_metadata_vio (struct vio *vio,physical_block_number_t physical,bio_end_io_t callback,vdo_action_fn error_handler, -blk_opf_t operation,char *data); +blk_opf_t operation,char *data,int size);static inline void vdo_submit_metadata_vio (struct vio *vio,physical_block_number_t physical,bio_end_io_t callback,vdo_action_fn error_handler,blk_opf_t operation) {__submit_metadata_vio (vio, physical, callback, error_handler, - operation, vio->data); + operation, vio->data, vio->block_count *VDO_BLOCK_SIZE ); +} + +static inline void vdo_submit_metadata_vio_with_size (struct vio *vio, +physical_block_number_t physical, +bio_end_io_t callback, +vdo_action_fn error_handler, +blk_opf_t operation, +int size) +{ +__submit_metadata_vio (vio, physical, callback, error_handler, + operation, vio->data, size); } static inline void vdo_submit_flush_vio(struct vio *vio, bio_end_io_t callback,@@ -41,7 +53,7 @@ static inline void vdo_submit_flush_vio(struct vio *vio, bio_end_io_t callback, {/* FIXME: Can we just use REQ_OP_FLUSH? */ __submit_metadata_vio (vio,0 , callback, error_handler, -REQ_OP_WRITE |REQ_PREFLUSH ,NULL ); +REQ_OP_WRITE |REQ_PREFLUSH ,NULL ,0 ); }#endif /* VDO_IO_SUBMITTER_H */ drivers/md/dm-vdo/types.h +3
-0@@ -376,6 +376,9 @@ struct vio {/* The size of this vio in blocks */ unsigned int block_count; +/* The amount of data to be read or written, in bytes */ +unsigned int io_size; +/* The data being read or written. */ char *data;drivers/md/dm-vdo/vio.c +22
-14@@ -188,14 +188,23 @@ void vdo_set_bio_properties(struct bio *bio, struct vio *vio, bio_end_io_t callb/* * Prepares the bio to perform IO with the specified buffer. May only be used on a VDO-allocated -* bio, as it assumes the bio wraps a 4k buffer that is 4k aligned, but there does not have to be a -* vio associated with the bio. +* bio, as it assumes the bio wraps a 4k-multiple buffer that is 4k aligned, but there does not +* have to be a vio associated with the bio. */ int vio_reset_bio (struct vio *vio,char *data,bio_end_io_t callback,blk_opf_t bi_opf,physical_block_number_t pbn) { -int bvec_count, offset, len, i; +return vio_reset_bio_with_size (vio, data, vio->block_count *VDO_BLOCK_SIZE , + callback, bi_opf, pbn); +} + +int vio_reset_bio_with_size (struct vio *vio,char *data,int size,bio_end_io_t callback, +blk_opf_t bi_opf,physical_block_number_t pbn) +{ +int bvec_count, offset, i;struct bio *bio = vio->bio; +int vio_size = vio->block_count *VDO_BLOCK_SIZE ; +int remaining;bio_reset (bio, bio->bi_bdev, bi_opf);vdo_set_bio_properties (bio, vio, callback, bi_opf, pbn);@@ -204,22 +213,21 @@ int vio_reset_bio(struct vio *vio, char *data, bio_end_io_t callback, bio->bi_io_vec = bio->bi_inline_vecs; bio->bi_max_vecs = vio->block_count +1 ; - len =VDO_BLOCK_SIZE * vio->block_count; +if (VDO_ASSERT (size <= vio_size,"specified size %d is not greater than allocated %d" , + size, vio_size) !=VDO_SUCCESS ) + size = vio_size; + vio->io_size = size; offset =offset_in_page (data); - bvec_count =DIV_ROUND_UP (offset + len,PAGE_SIZE ); + bvec_count =DIV_ROUND_UP (offset + size,PAGE_SIZE ); + remaining = size; -/* -* If we knew that data was always on one page, or contiguous pages, we wouldn't need the -* loop. But if we're using vmalloc, it's not impossible that the data is in different -* pages that can't be merged in bio_add_page... -*/ -for (i =0 ; (i < bvec_count) && (len >0 ); i++) { +for (i =0 ; (i < bvec_count) && (remaining >0 ); i++) {struct page *page;int bytes_added;int bytes =PAGE_SIZE - offset; -if (bytes > len) - bytes = len; +if (bytes > remaining) + bytes = remaining; page =is_vmalloc_addr (data) ?vmalloc_to_page (data) :virt_to_page (data); bytes_added =bio_add_page (bio, page, bytes, offset);@@ -231,7 +239,7 @@ int vio_reset_bio(struct vio *vio, char *data, bio_end_io_t callback, } data += bytes; - len -= bytes; + remaining -= bytes; offset =0 ; }drivers/md/dm-vdo/vio.h +2
-0@@ -123,6 +123,8 @@ void vdo_set_bio_properties(struct bio *bio, struct vio *vio, bio_end_io_t callbint vio_reset_bio (struct vio *vio,char *data,bio_end_io_t callback,blk_opf_t bi_opf,physical_block_number_t pbn); +int vio_reset_bio_with_size (struct vio *vio,char *data,int size,bio_end_io_t callback, +blk_opf_t bi_opf,physical_block_number_t pbn); void update_vio_error_stats(struct vio *vio, const char *format, ...) __printf(2, 3);
Greg Kroah-Hartman
maintainerPATCH 473/626 dm vdo indexer: prevent unterminated string warning
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chung Chung <[email protected]>
[ Upstream commit f4e99b846c90163d350c69d6581ac38dd5818eb8 ]
Fix array initialization that triggers a warning:
error: initializer-string for array of ‘unsigned char’ is too long
[-Werror=unterminated-string-initialization]
--- drivers/md/dm-vdo/indexer/index-layout.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/md/dm-vdo/indexer/index-layout.c +3 -2
@@ -54,7 +54,6 @@* Each save also has a unique nonce. */ -#define MAGIC_SIZE 32#define NONCE_INFO_SIZE 32#define MAX_SAVES 2
@@ -98,9 +97,11 @@ enum region_type {#define SUPER_VERSION_CURRENT 3#define SUPER_VERSION_MAXIMUM 7 -static const u8 LAYOUT_MAGIC [MAGIC_SIZE ] ="*ALBIREO*SINGLE*FILE*LAYOUT*001*" ; +static const u8 LAYOUT_MAGIC [] ="*ALBIREO*SINGLE*FILE*LAYOUT*001*" ;static const u64 REGION_MAGIC =0x416c6252676e3031 ;/* 'AlbRgn01' */ +#define MAGIC_SIZE (sizeof(LAYOUT_MAGIC) - 1) +struct region_header {u64 magic;u64 region_blocks;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 474/626 dm vdo: use a short static string for thread name prefix
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Sakai <[email protected]>
[ Upstream commit 3280c9313c9adce01550cc9f00edfb1dc7c744da ]
Also remove MODULE_NAME and a BUG_ON check, both unneeded.
This fixes a warning about string truncation in snprintf that will never happen in practice:
drivers/md/dm-vdo/vdo.c: In function ‘vdo_make’:drivers/md/dm-vdo/vdo.c:564:5: error: ‘%s’ directive output may be truncated writing up to 55 bytes into a region of size 16 [-Werror=format-truncation=]
"%s%u", MODULE_NAME, instance);
^~
drivers/md/dm-vdo/vdo.c:563:2: note: ‘snprintf’ output between 2 and 66 bytes into a destination of size 16
snprintf(vdo->thread_name_prefix, sizeof(vdo->thread_name_prefix),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"%s%u", MODULE_NAME, instance);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- drivers/md/dm-vdo/vdo.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/md/dm-vdo/vdo.c +1 -10
@@ -31,9 +31,7 @@#include <linux/completion.h> #include <linux/device-mapper.h> -#include <linux/kernel.h> #include <linux/lz4.h> -#include <linux/module.h> #include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/types.h>
@@ -142,12 +140,6 @@ static void finish_vdo_request_queue(void *ptr)vdo_unregister_allocating_thread (); } -#ifdef MODULE -#define MODULE_NAME THIS_MODULE->name -#else -#define MODULE_NAME "dm-vdo" -#endif /* MODULE */ -static const struct vdo_work_queue_type default_queue_type = { .start = start_vdo_request_queue, .finish = finish_vdo_request_queue,
@@ -559,8 +551,7 @@ int vdo_make(unsigned int instance, struct device_config *config, char **reason, *vdo_ptr = vdo;snprintf (vdo->thread_name_prefix,sizeof (vdo->thread_name_prefix), -"%s%u" ,MODULE_NAME , instance); -BUG_ON (vdo->thread_name_prefix[0 ] =='\0' ); +"vdo%u" , instance); result =vdo_allocate (vdo->thread_config.thread_count, struct vdo_thread, __func__, &vdo->threads);if (result !=VDO_SUCCESS ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 475/626 drm/ast: Find VBIOS mode from regular display size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit c81202906b5cd56db403e95db3d29c9dfc8c74c1 ]
The ast driver looks up supplied display modes from an internal list of display modes supported by the VBIOS.
Do not use the crtc_-prefixed display values from struct drm_display_mode for looking up the VBIOS mode. The fields contain raw values that the driver programs to hardware. They are affected by display settings like double-scan or interlace.
Instead use the regular vdisplay and hdisplay fields for lookup. As the programmed values can now differ from the values used for lookup, set struct drm_display_mode.crtc_vdisplay and .crtc_hdisplay from the VBIOS mode.
--- drivers/gpu/drm/ast/ast_mode.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +6 -4
@@ -131,7 +131,7 @@ static bool ast_get_vbios_mode_info(const struct drm_format_info *format,return false; } -switch (mode->crtc_hdisplay) { +switch (mode->hdisplay) {case 640 : vbios_mode->enh_table = &res_640x480[refresh_rate_index];break ;
@@ -145,7 +145,7 @@ static bool ast_get_vbios_mode_info(const struct drm_format_info *format, vbios_mode->enh_table = &res_1152x864[refresh_rate_index];break ;case 1280 : -if (mode->crtc_vdisplay ==800 ) +if (mode->vdisplay ==800 ) vbios_mode->enh_table = &res_1280x800[refresh_rate_index];else vbios_mode->enh_table = &res_1280x1024[refresh_rate_index];
@@ -157,7 +157,7 @@ static bool ast_get_vbios_mode_info(const struct drm_format_info *format, vbios_mode->enh_table = &res_1440x900[refresh_rate_index];break ;case 1600 : -if (mode->crtc_vdisplay ==900 ) +if (mode->vdisplay ==900 ) vbios_mode->enh_table = &res_1600x900[refresh_rate_index];else vbios_mode->enh_table = &res_1600x1200[refresh_rate_index];
@@ -166,7 +166,7 @@ static bool ast_get_vbios_mode_info(const struct drm_format_info *format, vbios_mode->enh_table = &res_1680x1050[refresh_rate_index];break ;case 1920 : -if (mode->crtc_vdisplay ==1080 ) +if (mode->vdisplay ==1080 ) vbios_mode->enh_table = &res_1920x1080[refresh_rate_index];else vbios_mode->enh_table = &res_1920x1200[refresh_rate_index];
@@ -210,6 +210,7 @@ static bool ast_get_vbios_mode_info(const struct drm_format_info *format, hborder = (vbios_mode->enh_table->flags & HBorder) ?8 :0 ; vborder = (vbios_mode->enh_table->flags & VBorder) ?8 :0 ; + adjusted_mode->crtc_hdisplay = vbios_mode->enh_table->hde; adjusted_mode->crtc_htotal = vbios_mode->enh_table->ht; adjusted_mode->crtc_hblank_start = vbios_mode->enh_table->hde + hborder; adjusted_mode->crtc_hblank_end = vbios_mode->enh_table->ht - hborder;
@@ -219,6 +220,7 @@ static bool ast_get_vbios_mode_info(const struct drm_format_info *format, vbios_mode->enh_table->hfp + vbios_mode->enh_table->hsync); + adjusted_mode->crtc_vdisplay = vbios_mode->enh_table->vde; adjusted_mode->crtc_vtotal = vbios_mode->enh_table->vt; adjusted_mode->crtc_vblank_start = vbios_mode->enh_table->vde + vborder; adjusted_mode->crtc_vblank_end = vbios_mode->enh_table->vt - vborder;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 476/626 bpf: Use kallsyms to find the function name of a struct_opss stub function
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin KaFai Lau <[email protected]>
[ Upstream commit 12fdd29d5d71d2987a1aec434b704d850a4d7fcb ]
In commit 1611603537a4 ("bpf: Create argument information for nullable arguments."), it introduced a "__nullable" tagging at the argument name of a
stub function. Some background on the commit:
it requires to tag the stub function instead of directly tagging
the "ops" of a struct. This is because the btf func_proto of the "ops" does not have the argument name and the "__nullable" is tagged at
the argument name.
To find the stub function of a "ops", it currently relies on a naming convention on the stub function "st_ops__ops_name".
e.g. tcp_congestion_ops__ssthresh. However, the new kernel sub system implementing bpf_struct_ops have missed this and have been surprised that the "__nullable" and the to-be-landed "__ref" tagging was not effective.
One option would be to give a warning whenever the stub function does not follow the naming convention, regardless if it requires arg tagging or not.
Instead, this patch uses the kallsyms_lookup approach and removes the requirement on the naming convention. The st_ops->cfi_stubs has all the stub function kernel addresses. kallsyms_lookup() is used to lookup the function name. With the function name, BTF can be used to find the BTF func_proto. The existing "__nullable" arg name searching logic will then fall through.
One notable change is,
if it failed in kallsyms_lookup or it failed in looking up the stub function name from the BTF, the bpf_struct_ops registration will fail. This is different from the previous behavior that it silently ignored the "st_ops__ops_name" function not found error.
The "tcp_congestion_ops", "sched_ext_ops", and "hid_bpf_ops" can still be registered successfully after this patch. There is struct_ops_maybe_null selftest to cover the "__nullable" tagging.
Other minor changes:
1. Removed the "%s__%s" format from the pr_warn because the naming convention is removed.
2. The existing bpf_struct_ops_supported() is also moved earlier because prepare_arg_info needs to use it to decide if the stub function is NULL before calling the prepare_arg_info.
--- kernel/bpf/bpf_struct_ops.c | 98 +++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 54 deletions(-)
kernel/bpf/bpf_struct_ops.c +44 -54
@@ -147,39 +147,6 @@ void bpf_struct_ops_image_free(void *image) }#define MAYBE_NULL_SUFFIX "__nullable" -#define MAX_STUB_NAME 128 - -/* Return the type info of a stub function, if it exists. -* -* The name of a stub function is made up of the name of the struct_ops and -* the name of the function pointer member, separated by "__". For example, -* if the struct_ops type is named "foo_ops" and the function pointer -* member is named "bar", the stub function name would be "foo_ops__bar". -*/ -static const struct btf_type * -find_stub_func_proto (const struct btf *btf,const char *st_op_name, -const char *member_name) -{ -char stub_func_name[MAX_STUB_NAME ]; -const struct btf_type *func_type; -s32 btf_id; -int cp; - - cp =snprintf (stub_func_name,MAX_STUB_NAME ,"%s__%s" , - st_op_name, member_name); -if (cp >=MAX_STUB_NAME ) { -pr_warn ("Stub function name too long\n" ); -return NULL ; - } - btf_id =btf_find_by_name_kind (btf, stub_func_name,BTF_KIND_FUNC ); -if (btf_id <0 ) -return NULL ; - func_type =btf_type_by_id (btf, btf_id); -if (!func_type) -return NULL ; - -return btf_type_by_id (btf, func_type->type);/* FUNC_PROTO */ -}/* Prepare argument info for every nullable argument of a member of a * struct_ops type.
@@ -204,27 +171,42 @@ find_stub_func_proto(const struct btf *btf, const char *st_op_name,static int prepare_arg_info (struct btf *btf,const char *st_ops_name,const char *member_name, -const struct btf_type *func_proto, +const struct btf_type *func_proto,void *stub_func_addr,struct bpf_struct_ops_arg_info *arg_info) {const struct btf_type *stub_func_proto, *pointed_type;const struct btf_param *stub_args, *args;struct bpf_ctx_arg_aux *info, *info_buf;u32 nargs, arg_no, info_cnt =0 ; +char ksym[KSYM_SYMBOL_LEN ]; +const char *stub_fname; +s32 stub_func_id;u32 arg_btf_id;int offset; - stub_func_proto =find_stub_func_proto (btf, st_ops_name, member_name); -if (!stub_func_proto) -return 0 ; + stub_fname =kallsyms_lookup ((unsigned long )stub_func_addr,NULL ,NULL ,NULL , ksym); +if (!stub_fname) { +pr_warn ("Cannot find the stub function name for the %s in struct %s\n" , + member_name, st_ops_name); +return -ENOENT ; + } + + stub_func_id =btf_find_by_name_kind (btf, stub_fname,BTF_KIND_FUNC ); +if (stub_func_id <0 ) { +pr_warn ("Cannot find the stub function %s in btf\n" , stub_fname); +return -ENOENT ; + } + + stub_func_proto =btf_type_by_id (btf, stub_func_id); + stub_func_proto =btf_type_by_id (btf, stub_func_proto->type);/* Check if the number of arguments of the stub function is the same * as the number of arguments of the function pointer. */ nargs =btf_type_vlen (func_proto);if (nargs !=btf_type_vlen (stub_func_proto)) { -pr_warn ("the number of arguments of the stub function %s__%s does not match the number of arguments of the member %s of struct %s\n" , - st_ops_name, member_name, member_name, st_ops_name); +pr_warn ("the number of arguments of the stub function %s does not match the number of arguments of the member %s of struct %s\n" , + stub_fname, member_name, st_ops_name);return -EINVAL ; }
@@ -254,21 +236,21 @@ static int prepare_arg_info(struct btf *btf, &arg_btf_id);if (!pointed_type || !btf_type_is_struct (pointed_type)) { -pr_warn ("stub function %s__%s has %s tagging to an unsupported type\n" , - st_ops_name, member_name,MAYBE_NULL_SUFFIX ); +pr_warn ("stub function %s has %s tagging to an unsupported type\n" , + stub_fname,MAYBE_NULL_SUFFIX ); goto err_out; } offset =btf_ctx_arg_offset (btf, func_proto, arg_no);if (offset <0 ) { -pr_warn ("stub function %s__%s has an invalid trampoline ctx offset for arg#%u\n" , - st_ops_name, member_name, arg_no); +pr_warn ("stub function %s has an invalid trampoline ctx offset for arg#%u\n" , + stub_fname, arg_no); goto err_out; }if (args[arg_no].type != stub_args[arg_no].type) { -pr_warn ("arg#%u type in stub function %s__%s does not match with its original func_proto\n" , - arg_no, st_ops_name, member_name); +pr_warn ("arg#%u type in stub function %s does not match with its original func_proto\n" , + arg_no, stub_fname); goto err_out; }
@@ -325,6 +307,13 @@ static bool is_module_member(const struct btf *btf, u32 id)return !strcmp (btf_name_by_offset (btf, t->name_off),"module" ); } +int bpf_struct_ops_supported (const struct bpf_struct_ops *st_ops,u32 moff) +{ +void *func_ptr = *(void **)(st_ops->cfi_stubs + moff); + +return func_ptr ?0 : -ENOTSUPP ; +} +int bpf_struct_ops_desc_init (struct bpf_struct_ops_desc *st_ops_desc,struct btf *btf,struct bpf_verifier_log *log)
@@ -388,7 +377,10 @@ int bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,for_each_member (i, t, member) {const struct btf_type *func_proto; +void **stub_func_addr; +u32 moff; + moff =__btf_member_bit_offset (t, member) /8 ; mname =btf_name_by_offset (btf, member->name_off);if (!*mname) { pr_warn("anon member in struct %s is not supported\n",
@@ -414,7 +406,11 @@ int bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc, func_proto =btf_type_resolve_func_ptr (btf, member->type,NULL ); -if (!func_proto) + +/* The member is not a function pointer or +* the function pointer is not supported. +*/ +if (!func_proto ||bpf_struct_ops_supported (st_ops, moff))continue ; if (btf_distill_func_proto(log, btf,
@@ -426,8 +422,9 @@ int bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc, goto errout; } + stub_func_addr = *(void **)(st_ops->cfi_stubs + moff); err =prepare_arg_info (btf, st_ops->name, mname, - func_proto, + func_proto, stub_func_addr, arg_info + i);if (err) goto errout;
@@ -1153,13 +1150,6 @@ void bpf_struct_ops_put(const void *kdata)bpf_map_put (&st_map->map); } -int bpf_struct_ops_supported (const struct bpf_struct_ops *st_ops,u32 moff) -{ -void *func_ptr = *(void **)(st_ops->cfi_stubs + moff); - -return func_ptr ?0 : -ENOTSUPP ; -} -static bool bpf_struct_ops_valid_to_reg (struct bpf_map *map) {struct bpf_struct_ops_map *st_map = (struct bpf_struct_ops_map *)map;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 477/626 bpftool: Fix readlink usage in get_fd_type
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viktor Malik <[email protected]>
[ Upstream commit 0053f7d39d491b6138d7c526876d13885cbb65f1 ]
The readlink(path, buf, sizeof(buf)) call reads at most sizeof(buf) bytes and *does not* append null-terminator to buf. With respect to that, fix two pieces in get_fd_type:
1. Change the truncation check to contain sizeof(buf) rather than sizeof(path).
2. Append null-terminator to buf.
Reported by Coverity.
--- tools/bpf/bpftool/common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/bpf/bpftool/common.c +2 -1
@@ -461,10 +461,11 @@ int get_fd_type(int fd)p_err ("can't read link type: %s" ,strerror (errno));return -1 ; } -if (n ==sizeof (path)) { +if (n ==sizeof (buf)) {p_err ("can't read link type: path too long!" );return -1 ; } + buf[n] ='\0' ;if (strstr (buf,"bpf-map" ))return BPF_OBJ_MAP ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 478/626 firmware: arm_scmi: Relax duplicate name constraint across protocol ids
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit 21ee965267bcbdd733be0f35344fa0f0226d7861 ]
Currently in scmi_protocol_device_request(), no duplicate scmi device name is allowed across any protocol. However scmi_dev_match_id() first matches the protocol id and then the name. So, there is no strict requirement to keep this scmi device name unique across all the protocols.
Relax the constraint on the duplicate name across the protocols and inhibit only within the same protocol id.
Message-Id: <[email protected]>
--- drivers/firmware/arm_scmi/bus.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/firmware/arm_scmi/bus.c +6 -13
@@ -42,7 +42,7 @@ static atomic_t scmi_syspower_registered = ATOMIC_INIT(0);* This helper let an SCMI driver request specific devices identified by the * @id_table to be created for each active SCMI instance. * -* The requested device name MUST NOT be already existent for any protocol; +* The requested device name MUST NOT be already existent for this protocol; * at first the freshly requested @id_table is annotated in the IDR table * @scmi_requested_devices and then the requested device is advertised to any * registered party via the @scmi_requested_devices_nh notification chain.
@@ -52,7 +52,6 @@ static atomic_t scmi_syspower_registered = ATOMIC_INIT(0);static int scmi_protocol_device_request (const struct scmi_device_id *id_table) {int ret =0 ; -unsigned int id =0 ;struct list_head *head, *phead =NULL ;struct scmi_requested_dev *rdev;
@@ -67,19 +66,13 @@ static int scmi_protocol_device_request(const struct scmi_device_id *id_table) }/* -* Search for the matching protocol rdev list and then search -* of any existent equally named device...fails if any duplicate found. +* Find the matching protocol rdev list and then search of any +* existent equally named device...fails if any duplicate found. */ mutex_lock (&scmi_requested_devices_mtx); -idr_for_each_entry (&scmi_requested_devices, head, id) { -if (!phead) { -/* A list found registered in the IDR is never empty */ - rdev = list_first_entry(head, struct scmi_requested_dev, - node); -if (rdev->id_table->protocol_id == - id_table->protocol_id) - phead = head; - } + phead =idr_find (&scmi_requested_devices, id_table->protocol_id); +if (phead) { + head = phead;list_for_each_entry (rdev, head, node) {if (!strcmp (rdev->id_table->name, id_table->name)) { pr_err("Ignoring duplicate request [%d] %s\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 479/626 perf/amd/ibs: Fix perf_ibs_op.cnt_mask for CurCnt
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ravi Bangoria <[email protected]>
[ Upstream commit 46dcf85566170d4528b842bf83ffc350d71771fa ]
IBS Op uses two counters: MaxCnt and CurCnt. MaxCnt is programmed with the desired sample period. IBS hw generates sample when CurCnt reaches to MaxCnt. The size of these counter used to be 20 bits but later they were extended to 27 bits. The 7 bit extension is indicated by CPUID Fn8000_001B_EAX[6 / OpCntExt].
perf_ibs->cnt_mask variable contains bit masks for MaxCnt and CurCnt. But IBS driver does not set upper 7 bits of CurCnt in cnt_mask even when OpCntExt CPUID bit is set. Fix this.
IBS driver uses cnt_mask[CurCnt] bits only while disabling an event. Fortunately, CurCnt bits are not read from MSR while re-enabling the event, instead MaxCnt is programmed with desired period and CurCnt is set to 0. Hence, we did not see any issues so far.
--- arch/x86/events/amd/ibs.c | 3 ++- arch/x86/include/asm/perf_event.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
arch/x86/events/amd/ibs.c +2 -1
@@ -1222,7 +1222,8 @@ static __init int perf_ibs_op_init(void)if (ibs_caps &IBS_CAPS_OPCNTEXT ) { perf_ibs_op.max_period |=IBS_OP_MAX_CNT_EXT_MASK ; perf_ibs_op.config_mask |=IBS_OP_MAX_CNT_EXT_MASK ; - perf_ibs_op.cnt_mask |=IBS_OP_MAX_CNT_EXT_MASK ; + perf_ibs_op.cnt_mask |= (IBS_OP_MAX_CNT_EXT_MASK | +IBS_OP_CUR_CNT_EXT_MASK ); }if (ibs_caps &IBS_CAPS_ZEN4 )
arch/x86/include/asm/perf_event.h +1 -0
@@ -520,6 +520,7 @@ struct pebs_xmm {*/ #define IBS_OP_CUR_CNT (0xFFF80ULL<<32)#define IBS_OP_CUR_CNT_RAND (0x0007FULL<<32) +#define IBS_OP_CUR_CNT_EXT_MASK (0x7FULL<<52)#define IBS_OP_CNT_CTL (1ULL<<19)#define IBS_OP_VAL (1ULL<<18)#define IBS_OP_ENABLE (1ULL<<17)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 480/626 perf/amd/ibs: Fix ->config to sample period calculation for OP PMU
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ravi Bangoria <[email protected]>
[ Upstream commit 598bdf4fefff5af4ce6d26d16f7b2a20808fc4cb ]
Instead of using standard perf_event_attr->freq=0 and ->sample_period fields, IBS event in 'sample period mode' can also be opened by setting period value directly in perf_event_attr->config in a MaxCnt bit-field format.
IBS OP MaxCnt bits are defined as:
(high bits) IbsOpCtl[26:20] = IbsOpMaxCnt[26:20] (low bits) IbsOpCtl[15:0] = IbsOpMaxCnt[19:4]
Perf event sample period can be derived from MaxCnt bits as:
sample_period = (high bits) | ((low_bits) << 4);
However, current code just masks MaxCnt bits and shifts all of them, including high bits, which is incorrect. Fix it.
--- arch/x86/events/amd/ibs.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
arch/x86/events/amd/ibs.c +13 -4
@@ -272,7 +272,7 @@ static int perf_ibs_init(struct perf_event *event) {struct hw_perf_event *hwc = &event->hw;struct perf_ibs *perf_ibs; -u64 max_cnt, config; +u64 config;int ret; perf_ibs =get_ibs_pmu (event->attr.type);
@@ -309,10 +309,19 @@ static int perf_ibs_init(struct perf_event *event)if (!hwc->sample_period) hwc->sample_period =0x10 ; }else { - max_cnt = config & perf_ibs->cnt_mask; +u64 period =0 ; + +if (perf_ibs == &perf_ibs_op) { + period = (config &IBS_OP_MAX_CNT ) <<4 ; +if (ibs_caps &IBS_CAPS_OPCNTEXT ) + period |= config &IBS_OP_MAX_CNT_EXT_MASK ; + }else { + period = (config &IBS_FETCH_MAX_CNT ) <<4 ; + } + config &= ~perf_ibs->cnt_mask; - event->attr.sample_period = max_cnt <<4 ; - hwc->sample_period = event->attr.sample_period; + event->attr.sample_period = period; + hwc->sample_period = period; }if (!hwc->sample_period)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 481/626 clk: renesas: rzg2l-cpg: Refactor Runtime PM clock validation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lad Prabhakar <[email protected]>
[ Upstream commit f6f73b891bf6beff069fcacc7b4a796e1009bf26 ]
Refactor rzg2l_cpg_attach_dev to delegate clock validation for Runtime PM to the updated rzg2l_cpg_is_pm_clk function. Ensure validation of clocks associated with the power domain while excluding external and core clocks. Prevent incorrect Runtime PM management for clocks outside the domain's scope.
Update rzg2l_cpg_is_pm_clk to operate on a per-power-domain basis. Verify clkspec.np against the domain's device node, check argument validity, and validate clock type (CPG_MOD). Use the no_pm_mod_clks array to exclude specific clocks from PM management.
--- drivers/clk/renesas/rzg2l-cpg.c | 102 +++++++++++++++++--------------- 1 file changed, 54 insertions(+), 48 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +54 -48
@@ -1549,28 +1549,6 @@ static int rzg2l_cpg_reset_controller_register(struct rzg2l_cpg_priv *priv)return devm_reset_controller_register (priv->dev, &priv->rcdev); } -static bool rzg2l_cpg_is_pm_clk (struct rzg2l_cpg_priv *priv, -const struct of_phandle_args *clkspec) -{ -const struct rzg2l_cpg_info *info = priv->info; -unsigned int id; -unsigned int i; - -if (clkspec->args_count !=2 ) -return false; - -if (clkspec->args[0 ] !=CPG_MOD ) -return false; - - id = clkspec->args[1 ] + info->num_total_core_clks; -for (i =0 ; i < info->num_no_pm_mod_clks; i++) { -if (info->no_pm_mod_clks[i] == id) -return false; - } - -return true; -} -/** * struct rzg2l_cpg_pm_domains - RZ/G2L PM domains data structure * @onecell_data: cell data
@@ -1595,45 +1573,73 @@ struct rzg2l_cpg_pd {u16 id; }; +static bool rzg2l_cpg_is_pm_clk (struct rzg2l_cpg_pd *pd, +const struct of_phandle_args *clkspec) +{ +if (clkspec->np != pd->genpd.dev.of_node || clkspec->args_count !=2 ) +return false; + +switch (clkspec->args[0 ]) { +case CPG_MOD : { +struct rzg2l_cpg_priv *priv = pd->priv; +const struct rzg2l_cpg_info *info = priv->info; +unsigned int id = clkspec->args[1 ]; + +if (id >= priv->num_mod_clks) +return false; + + id += info->num_total_core_clks; + +for (unsigned int i =0 ; i < info->num_no_pm_mod_clks; i++) { +if (info->no_pm_mod_clks[i] == id) +return false; + } + +return true; + } + +case CPG_CORE : +default : +return false; + } +} +static int rzg2l_cpg_attach_dev (struct generic_pm_domain *domain,struct device *dev) { struct rzg2l_cpg_pd *pd = container_of(domain, struct rzg2l_cpg_pd, genpd); -struct rzg2l_cpg_priv *priv = pd->priv;struct device_node *np = dev->of_node;struct of_phandle_args clkspec;bool once = true;struct clk *clk; +unsigned int i;int error; -int i =0 ; - -while (!of_parse_phandle_with_args (np,"clocks" ,"#clock-cells" , i, - &clkspec)) { -if (rzg2l_cpg_is_pm_clk (priv, &clkspec)) { -if (once) { - once = false; - error =pm_clk_create (dev); -if (error) { -of_node_put (clkspec.np); - goto err; - } - } - clk =of_clk_get_from_provider (&clkspec); + +for (i =0 ; !of_parse_phandle_with_args (np,"clocks" ,"#clock-cells" , i, &clkspec); i++) { +if (!rzg2l_cpg_is_pm_clk (pd, &clkspec)) {of_node_put (clkspec.np); -if (IS_ERR (clk)) { - error =PTR_ERR (clk); - goto fail_destroy; - } +continue ; + } - error =pm_clk_add_clk (dev, clk); +if (once) { + once = false; + error =pm_clk_create (dev);if (error) { -dev_err (dev,"pm_clk_add_clk failed %d\n" , - error); - goto fail_put; +of_node_put (clkspec.np); + goto err; } - }else { -of_node_put (clkspec.np); } - i++; + clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np); +if (IS_ERR (clk)) { + error =PTR_ERR (clk); + goto fail_destroy; + } + + error =pm_clk_add_clk (dev, clk); +if (error) { +dev_err (dev,"pm_clk_add_clk failed %d\n" , error); + goto fail_put; + } }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 482/626 wifi: rtl8xxxu: retry firmware download on error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Soeren Moch <[email protected]>
[ Upstream commit 3d3e28feca7ac8c6cf2a390dbbe1f97e3feb7f36 ]
Occasionally there is an EPROTO error during firmware download. This error is converted to EAGAIN in the download function. But nobody tries again and so device probe fails.
Implement download retry to fix this.
This error was observed (and fix tested) on a tbs2910 board [1] with an embedded RTL8188EU (0bda:8179) device behind a USB hub.
[1] arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts
--- drivers/net/wireless/realtek/rtl8xxxu/core.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/core.c +12 -5
@@ -860,9 +860,10 @@ rtl8xxxu_writeN(struct rtl8xxxu_priv *priv, u16 addr, u8 *buf, u16 len)return len; write_error: -dev_info (&udev->dev, -"%s: Failed to write block at addr: %04x size: %04x\n" , - __func__, addr, blocksize); +if (rtl8xxxu_debug &RTL8XXXU_DEBUG_REG_WRITE ) +dev_info (&udev->dev, +"%s: Failed to write block at addr: %04x size: %04x\n" , + __func__, addr, blocksize);return -EAGAIN ; }
@@ -4064,8 +4065,14 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)*/ rtl8xxxu_write16 (priv,REG_TRXFF_BNDY +2 , fops->trxff_boundary); - ret =rtl8xxxu_download_firmware (priv); -dev_dbg (dev,"%s: download_firmware %i\n" , __func__, ret); +for (int retry =5 ; retry >=0 ; retry--) { + ret =rtl8xxxu_download_firmware (priv); +dev_dbg (dev,"%s: download_firmware %i\n" , __func__, ret); +if (ret != -EAGAIN ) +break ; +if (retry) +dev_dbg (dev,"%s: retry firmware download\n" , __func__); + }if (ret) goto exit; ret =rtl8xxxu_start_firmware (priv);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 483/626 wifi: rtw88: Dont use static local variable in rtw8822b_set_tx_power_index_by_rate
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit 00451eb3bec763f708e7e58326468c1e575e5a66 ]
Some users want to plug two identical USB devices at the same time. This static variable could theoretically cause them to use incorrect TX power values.
Move the variable to the caller and pass a pointer to it to rtw8822b_set_tx_power_index_by_rate().
--- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw88/rtw8822b.c +8 -6
@@ -976,11 +976,11 @@ static void rtw8822b_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc, }static void -rtw8822b_set_tx_power_index_by_rate (struct rtw_dev *rtwdev,u8 path,u8 rs) +rtw8822b_set_tx_power_index_by_rate (struct rtw_dev *rtwdev,u8 path, +u8 rs,u32 *phy_pwr_idx) {struct rtw_hal *hal = &rtwdev->hal;static const u32 offset_txagc[2 ] = {0x1d00 ,0x1d80 }; -static u32 phy_pwr_idx;u8 rate, rate_idx, pwr_index, shift;int j;
@@ -988,12 +988,12 @@ rtw8822b_set_tx_power_index_by_rate(struct rtw_dev *rtwdev, u8 path, u8 rs) rate = rtw_rate_section[rs][j]; pwr_index = hal->tx_pwr_tbl[path][rate]; shift = rate &0x3 ; - phy_pwr_idx |= ((u32 )pwr_index << (shift *8 )); + *phy_pwr_idx |= ((u32 )pwr_index << (shift *8 ));if (shift ==0x3 ) { rate_idx = rate &0xfc ;rtw_write32 (rtwdev, offset_txagc[path] + rate_idx, - phy_pwr_idx); - phy_pwr_idx =0 ; + *phy_pwr_idx); + *phy_pwr_idx =0 ; } } }
@@ -1001,11 +1001,13 @@ rtw8822b_set_tx_power_index_by_rate(struct rtw_dev *rtwdev, u8 path, u8 rs)static void rtw8822b_set_tx_power_index (struct rtw_dev *rtwdev) {struct rtw_hal *hal = &rtwdev->hal; +u32 phy_pwr_idx =0 ;int rs, path;for (path =0 ; path < hal->rf_path_num; path++) {for (rs =0 ; rs <RTW_RATE_SECTION_MAX ; rs++) -rtw8822b_set_tx_power_index_by_rate (rtwdev, path, rs); +rtw8822b_set_tx_power_index_by_rate (rtwdev, path, rs, + &phy_pwr_idx); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 484/626 wifi: rtw89: add wiphy_lock() to work that isnt held wiphy_lock() yet
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit ebfc9199df05d37b67f4d1b7ee997193f3d2e7c8 ]
To ensure where are protected by driver mutex can also be protected by wiphy_lock(), so afterward we can remove driver mutex safely.
--- drivers/net/wireless/realtek/rtw89/regd.c | 2 ++ drivers/net/wireless/realtek/rtw89/ser.c | 4 ++++ 2 files changed, 6 insertions(+)
drivers/net/wireless/realtek/rtw89/regd.c +2 -0
@@ -695,6 +695,7 @@ void rtw89_regd_notifier(struct wiphy *wiphy, struct regulatory_request *requeststruct ieee80211_hw *hw =wiphy_to_ieee80211_hw (wiphy);struct rtw89_dev *rtwdev = hw->priv; +wiphy_lock (wiphy);mutex_lock (&rtwdev->mutex);rtw89_leave_ps_mode (rtwdev);
@@ -712,6 +713,7 @@ void rtw89_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request exit:mutex_unlock (&rtwdev->mutex); +wiphy_unlock (wiphy); }/* Maximum Transmit Power field (@raw) can be EIRP or PSD.
drivers/net/wireless/realtek/rtw89/ser.c +4 -0
@@ -156,9 +156,11 @@ static void ser_state_run(struct rtw89_ser *ser, u8 evt)rtw89_debug (rtwdev,RTW89_DBG_SER ,"ser: %s receive %s\n" ,ser_st_name (ser),ser_ev_name (ser, evt)); +wiphy_lock (rtwdev->hw->wiphy);mutex_lock (&rtwdev->mutex);rtw89_leave_lps (rtwdev);mutex_unlock (&rtwdev->mutex); +wiphy_unlock (rtwdev->hw->wiphy); ser->st_tbl[ser->state].st_func (ser, evt); }
@@ -707,9 +709,11 @@ static void ser_l2_reset_st_hdl(struct rtw89_ser *ser, u8 evt)switch (evt) {case SER_EV_STATE_IN : +wiphy_lock (rtwdev->hw->wiphy);mutex_lock (&rtwdev->mutex);ser_l2_reset_st_pre_hdl (ser);mutex_unlock (&rtwdev->mutex); +wiphy_unlock (rtwdev->hw->wiphy);ieee80211_restart_hw (rtwdev->hw);ser_set_alarm (ser,SER_RECFG_TIMEOUT ,SER_EV_L2_RECFG_TIMEOUT );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 485/626 spi: zynqmp-gqspi: Always acknowledge interrupts
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit 89785306453ce6d949e783f6936821a0b7649ee2 ]
RXEMPTY can cause an IRQ, even though we may not do anything about it (such as if we are waiting for more received data). We must still handle these IRQs because we can tell they were caused by the device.
--- drivers/spi/spi-zynqmp-gqspi.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/spi/spi-zynqmp-gqspi.c +8 -12
@@ -799,7 +799,6 @@ static void zynqmp_process_dma_irq(struct zynqmp_qspi *xqspi)static irqreturn_t zynqmp_qspi_irq (int irq,void *dev_id) {struct zynqmp_qspi *xqspi = (struct zynqmp_qspi *)dev_id; -irqreturn_t ret =IRQ_NONE ;u32 status, mask, dma_status =0 ; status =zynqmp_gqspi_read (xqspi,GQSPI_ISR_OFST );
@@ -814,27 +813,24 @@ static irqreturn_t zynqmp_qspi_irq(int irq, void *dev_id) dma_status); } -if (mask &GQSPI_ISR_TXNOT_FULL_MASK ) { +if (!mask && !dma_status) +return IRQ_NONE ; + +if (mask &GQSPI_ISR_TXNOT_FULL_MASK )zynqmp_qspi_filltxfifo (xqspi,GQSPI_TX_FIFO_FILL ); - ret =IRQ_HANDLED ; - } -if (dma_status &GQSPI_QSPIDMA_DST_I_STS_DONE_MASK ) { +if (dma_status &GQSPI_QSPIDMA_DST_I_STS_DONE_MASK )zynqmp_process_dma_irq (xqspi); - ret =IRQ_HANDLED ; - }else if (!(mask &GQSPI_IER_RXEMPTY_MASK ) && - (mask &GQSPI_IER_GENFIFOEMPTY_MASK )) { +else if (!(mask &GQSPI_IER_RXEMPTY_MASK ) && + (mask &GQSPI_IER_GENFIFOEMPTY_MASK ))zynqmp_qspi_readrxfifo (xqspi,GQSPI_RX_FIFO_FILL ); - ret =IRQ_HANDLED ; - }if (xqspi->bytes_to_receive ==0 && xqspi->bytes_to_transfer ==0 && ((status &GQSPI_IRQ_MASK ) ==GQSPI_IRQ_MASK )) {zynqmp_gqspi_write (xqspi,GQSPI_IDR_OFST ,GQSPI_ISR_IDR_MASK );complete (&xqspi->data_completion); - ret =IRQ_HANDLED ; } -return ret; +return IRQ_HANDLED ; }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 486/626 regulator: ad5398: Add device tree support
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Isaac Scott <[email protected]>
[ Upstream commit 5a6a461079decea452fdcae955bccecf92e07e97 ]
Previously, the ad5398 driver used only platform_data, which is deprecated in favour of device tree. This caused the AD5398 to fail to probe as it could not load its init_data. If the AD5398 has a device tree node, pull the init_data from there using of_get_regulator_init_data.
--- drivers/regulator/ad5398.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/regulator/ad5398.c +9 -3
@@ -14,6 +14,7 @@#include <linux/platform_device.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> +#include <linux/regulator/of_regulator.h> #define AD5398_CURRENT_EN_MASK 0x8000
@@ -221,15 +222,20 @@ static int ad5398_probe(struct i2c_client *client)const struct ad5398_current_data_format *df = (struct ad5398_current_data_format *)id->driver_data; -if (!init_data) -return -EINVAL ; - chip =devm_kzalloc (&client->dev,sizeof (*chip),GFP_KERNEL );if (!chip)return -ENOMEM ; config.dev = &client->dev; +if (client->dev.of_node) + init_data =of_get_regulator_init_data (&client->dev, + client->dev.of_node, + &ad5398_reg); +if (!init_data) +return -EINVAL ; + config.init_data = init_data; + config.of_node = client->dev.of_node; config.driver_data = chip; chip->client = client;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 487/626 wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Escande <[email protected]>
[ Upstream commit df11edfba49e5fb69f4c9e7cb76082b89c417f78 ]
Since inception there is an obvious typo laying around in ath12k_hal_tx_cmd_ext_desc_setup(). Instead of initializing + adding flags to tcl_ext_cmd->info1, we initialize + override. This will be needed in the future to make broadcast frames work with ethernet encapsulation.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/dp_tx.c +1 -1
@@ -117,7 +117,7 @@ static void ath12k_hal_tx_cmd_ext_desc_setup(struct ath12k_base *ab,le32_encode_bits (ti->data_len,HAL_TX_MSDU_EXT_INFO1_BUF_LEN ); - tcl_ext_cmd->info1 =le32_encode_bits (1 ,HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE ) | + tcl_ext_cmd->info1 |=le32_encode_bits (1 ,HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE ) |le32_encode_bits (ti->encap_type,HAL_TX_MSDU_EXT_INFO1_ENCAP_TYPE ) | le32_encode_bits(ti->encrypt_type,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 488/626 accel/qaic: Mask out SR-IOV PCI resources
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Youssef Samir <[email protected]>
[ Upstream commit 8685520474bfc0fe4be83c3cbfe3fb3e1ca1514a ]
During the initialization of the qaic device, pci_select_bars() is used to fetch a bitmask of the BARs exposed by the device. On devices that have Virtual Functions capabilities, the bitmask includes SR-IOV BARs.
Use a mask to filter out SR-IOV BARs if they exist.
--- drivers/accel/qaic/qaic_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/qaic/qaic_drv.c +1 -1
@@ -432,7 +432,7 @@ static int init_pci(struct qaic_device *qdev, struct pci_dev *pdev)int bars;int ret; - bars =pci_select_bars (pdev,IORESOURCE_MEM ); + bars =pci_select_bars (pdev,IORESOURCE_MEM ) &0x3f ;/* make sure the device has the expected BARs */ if (bars != (BIT (0 ) |BIT (2 ) |BIT (4 ))) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 489/626 drm/xe/pf: Reset GuC VF config when unprovisioning critical resource
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit 33f17e2cbd930a2a00eb007d9b241b6db010a880 ]
GuC firmware counts received VF configuration KLVs and may start validation of the complete VF config even if some resources where unprovisioned in the meantime, leading to unexpected errors like:
$ echo 1 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/contexts_quota $ echo 0 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/contexts_quota $ echo 1 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/doorbells_quota $ echo 0 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/doorbells_quota $ echo 1 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/ggtt_quota tee: '/sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/ggtt_quota': Input/output error
To mitigate this problem trigger explicit VF config reset after unprovisioning any of the critical resources (GGTT, context or doorbell IDs) that GuC is monitoring.
--- drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 37 +++++++++++++++++++--- 1 file changed, 33 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +33 -4
@@ -323,6 +323,26 @@ static int pf_push_full_vf_config(struct xe_gt *gt, unsigned int vfid)return err; } +static int pf_push_vf_cfg (struct xe_gt *gt,unsigned int vfid,bool reset) +{ +int err =0 ; + +xe_gt_assert (gt, vfid); +lockdep_assert_held (xe_gt_sriov_pf_master_mutex (gt)); + +if (reset) + err =pf_send_vf_cfg_reset (gt, vfid); +if (!err) + err =pf_push_full_vf_config (gt, vfid); + +return err; +} + +static int pf_refresh_vf_cfg (struct xe_gt *gt,unsigned int vfid) +{ +return pf_push_vf_cfg (gt, vfid, true); +} +static u64 pf_get_ggtt_alignment (struct xe_gt *gt) {struct xe_device *xe =gt_to_xe (gt);
@@ -419,6 +439,10 @@ static int pf_provision_vf_ggtt(struct xe_gt *gt, unsigned int vfid, u64 size)return err;pf_release_vf_config_ggtt (gt, config); + + err =pf_refresh_vf_cfg (gt, vfid); +if (unlikely (err)) +return err; }xe_gt_assert (gt, !xe_ggtt_node_allocated (config->ggtt_region));
@@ -744,6 +768,10 @@ static int pf_provision_vf_ctxs(struct xe_gt *gt, unsigned int vfid, u32 num_ctxreturn ret;pf_release_config_ctxs (gt, config); + + ret =pf_refresh_vf_cfg (gt, vfid); +if (unlikely (ret)) +return ret; }if (!num_ctxs)
@@ -1041,6 +1069,10 @@ static int pf_provision_vf_dbs(struct xe_gt *gt, unsigned int vfid, u32 num_dbs)return ret;pf_release_config_dbs (gt, config); + + ret =pf_refresh_vf_cfg (gt, vfid); +if (unlikely (ret)) +return ret; }if (!num_dbs)
@@ -2003,10 +2035,7 @@ int xe_gt_sriov_pf_config_push(struct xe_gt *gt, unsigned int vfid, bool refreshxe_gt_assert (gt, vfid);mutex_lock (xe_gt_sriov_pf_master_mutex (gt)); -if (refresh) - err =pf_send_vf_cfg_reset (gt, vfid); -if (!err) - err =pf_push_full_vf_config (gt, vfid); + err =pf_push_vf_cfg (gt, vfid, refresh);mutex_unlock (xe_gt_sriov_pf_master_mutex (gt));if (unlikely (err)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 490/626 wifi: ath9k: return by of_get_mac_address
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rosen Penev <[email protected]>
[ Upstream commit dfffb317519f88534bb82797f055f0a2fd867e7b ]
When using nvmem, ath9k could potentially be loaded before nvmem, which loads after mtd. This is an issue if DT contains an nvmem mac address.
If nvmem is not ready in time for ath9k, -EPROBE_DEFER is returned. Pass it to _probe so that ath9k can properly grab a potentially present MAC address.
--- drivers/net/wireless/ath/ath9k/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/init.c +3 -1
@@ -691,7 +691,9 @@ static int ath9k_of_init(struct ath_softc *sc) ah->ah_flags |=AH_NO_EEP_SWAP ; } -of_get_mac_address (np, common->macaddr); + ret =of_get_mac_address (np, common->macaddr); +if (ret == -EPROBE_DEFER ) +return ret;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 491/626 wifi: ath12k: Fetch regdb.bin file from board-2.bin
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaradhana Sahu <[email protected]>
[ Upstream commit 24f587572acf7509127dbdfcbf1b681ef84eeba0 ]
Currently, ath12k_core_fetch_regdb() finds regdb.bin file through board id's but in board-2.bin file regdb.bin file is present with default board id because of which regdb.bin is not fetched.
Add support to fetch regdb.bin file from board-2.bin through default board id.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath12k/core.c +7 -5
@@ -161,7 +161,7 @@ EXPORT_SYMBOL(ath12k_core_resume);static int __ath12k_core_create_board_name (struct ath12k_base *ab,char *name,size_t name_len,bool with_variant, -bool bus_type_mode) +bool bus_type_mode,bool with_default) {/* strlen(',variant=') + strlen(ab->qmi.target.bdf_ext) */ char variant[9 +ATH12K_QMI_BDF_EXT_STR_LENGTH ] = {0 };
@@ -192,7 +192,9 @@ static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name,"bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s" ,ath12k_bus_str (ab->hif.bus), ab->qmi.target.chip_id, - ab->qmi.target.board_id, variant); + with_default ? +ATH12K_BOARD_ID_DEFAULT : ab->qmi.target.board_id, + variant);break ; }
@@ -204,19 +206,19 @@ static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name,static int ath12k_core_create_board_name (struct ath12k_base *ab,char *name,size_t name_len) { -return __ath12k_core_create_board_name (ab, name, name_len, true, false); +return __ath12k_core_create_board_name (ab, name, name_len, true, false, false); }static int ath12k_core_create_fallback_board_name (struct ath12k_base *ab,char *name,size_t name_len) { -return __ath12k_core_create_board_name (ab, name, name_len, false, false); +return __ath12k_core_create_board_name (ab, name, name_len, false, false, true); }static int ath12k_core_create_bus_type_board_name (struct ath12k_base *ab,char *name,size_t name_len) { -return __ath12k_core_create_board_name (ab, name, name_len, false, true); +return __ath12k_core_create_board_name (ab, name, name_len, false, true, true); } const struct firmware *ath12k_core_firmware_request(struct ath12k_base *ab,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 492/626 wifi: ath12k: Fix end offset bit definition in monitor ring descriptor
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 6788a666000d600bd8f2e9f991cad9cc805e7f01 ]
End offset for the monitor destination ring descriptor is defined as 16 bits, while the firmware definition specifies only 12 bits. The remaining bits (bit 12 to bit 15) are reserved and may contain junk values, leading to invalid information retrieval. Fix this issue by updating the correct genmask values.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/hal_desc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/hal_desc.h +1 -1
@@ -2966,7 +2966,7 @@ struct hal_mon_buf_ring {#define HAL_MON_DEST_COOKIE_BUF_ID GENMASK(17, 0) -#define HAL_MON_DEST_INFO0_END_OFFSET GENMASK(15, 0) +#define HAL_MON_DEST_INFO0_END_OFFSET GENMASK(11, 0)#define HAL_MON_DEST_INFO0_FLUSH_DETECTED BIT(16)#define HAL_MON_DEST_INFO0_END_OF_PPDU BIT(17)#define HAL_MON_DEST_INFO0_INITIATOR BIT(18)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 493/626 drm: bridge: adv7511: fill stream capabilities
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olivier Moysan <[email protected]>
[ Upstream commit c852646f12d4cd5b4f19eeec2976c5d98c0382f8 ]
Set no_i2s_capture and no_spdif_capture flags in hdmi_codec_pdata structure to report that the ADV7511 HDMI bridge does not support i2s or spdif audio capture.
--- drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +2 -0
@@ -244,7 +244,9 @@ static const struct hdmi_codec_pdata codec_data = { .ops = &adv7511_codec_ops, .max_i2s_channels = 2, .i2s = 1, + .no_i2s_capture = 1, .spdif = 1, + .no_spdif_capture = 1, };int adv7511_audio_init (struct device *dev,struct adv7511 *adv7511)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 494/626 drm/nouveau: fix the broken marco GSP_MSG_MAX_SIZE
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhi Wang <[email protected]>
[ Upstream commit bbae6680cfe38b033250b483722e60ccd865976f ]
The macro GSP_MSG_MAX_SIZE refers to another macro that doesn't exist. It represents the max GSP message element size.
Fix the broken marco so it can be used to replace some magic numbers in the code.
--- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +1 -1
@@ -58,7 +58,7 @@#include <linux/parser.h> #define GSP_MSG_MIN_SIZE GSP_PAGE_SIZE -#define GSP_MSG_MAX_SIZE GSP_PAGE_MIN_SIZE * 16 +#define GSP_MSG_MAX_SIZE (GSP_MSG_MIN_SIZE * 16)struct r535_gsp_msg {u8 auth_tag_buffer[16 ];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 495/626 wifi: ath11k: Use dma_alloc_noncoherent for rx_tid buffer allocation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit eeadc6baf8b3dcd32787cc84f0473dc2a2850370 ]
Currently, the driver allocates cacheable DMA buffers for the rx_tid structure using kzalloc() and dma_map_single(). These buffers are long-lived and can persist for the lifetime of the peer, which is not advisable. Instead of using kzalloc() and dma_map_single() for allocating cacheable DMA buffers, utilize the dma_alloc_noncoherent() helper for the allocation of long-lived cacheable DMA buffers, such as the peer's rx_tid. Since dma_alloc_noncoherent() returns unaligned physical and virtual addresses, align them internally before use within the driver. This ensures proper allocation of non-coherent memory through the kernel helper.
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
--- drivers/net/wireless/ath/ath11k/dp.h | 6 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 117 +++++++++++------------- 2 files changed, 58 insertions(+), 65 deletions(-)
drivers/net/wireless/ath/ath11k/dp.h +4 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023, 2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DP_H
@@ -20,7 +20,6 @@ struct ath11k_ext_irq_grp;struct dp_rx_tid {u8 tid; -u32 *vaddr;dma_addr_t paddr;u32 size;u32 ba_win_sz;
@@ -37,6 +36,9 @@ struct dp_rx_tid {/* Timer info related to fragments */ struct timer_list frag_timer;struct ath11k_base *ab; +u32 *vaddr_unaligned; +dma_addr_t paddr_unaligned; +u32 unaligned_size; };#define DP_REO_DESC_FREE_THRESHOLD 64
drivers/net/wireless/ath/ath11k/dp_rx.c +54 -63
196 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 496/626 drm/xe: Move suballocator init to after display init
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
[ Upstream commit 380b0cdaa76bc8f5c16db16eaf48751e792ff041 ]
No allocations should be done before we have had a chance to preserve the display fb.
--- drivers/gpu/drm/xe/xe_device.c | 6 ++++++ drivers/gpu/drm/xe/xe_tile.c | 12 ++++++++---- drivers/gpu/drm/xe/xe_tile.h | 1 + 3 files changed, 15 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_device.c +6 -0
@@ -708,6 +708,12 @@ int xe_device_probe(struct xe_device *xe)if (err) goto err; +for_each_tile (tile, xe, id) { + err =xe_tile_init (tile); +if (err) + goto err; + } +for_each_gt (gt, xe, id) { last_gt = id;
drivers/gpu/drm/xe/xe_tile.c +8 -4
@@ -167,15 +167,19 @@ int xe_tile_init_noalloc(struct xe_tile *tile)if (err)return err; - tile->mem.kernel_bb_pool =xe_sa_bo_manager_init (tile,SZ_1M ,16 ); -if (IS_ERR (tile->mem.kernel_bb_pool)) -return PTR_ERR (tile->mem.kernel_bb_pool); -xe_wa_apply_tile_workarounds (tile);return xe_tile_sysfs_init (tile); } +int xe_tile_init (struct xe_tile *tile) +{ + tile->mem.kernel_bb_pool =xe_sa_bo_manager_init (tile,SZ_1M ,16 ); +if (IS_ERR (tile->mem.kernel_bb_pool)) +return PTR_ERR (tile->mem.kernel_bb_pool); + +return 0 ; +}void xe_tile_migrate_wait (struct xe_tile *tile) {xe_migrate_wait (tile->migrate);
drivers/gpu/drm/xe/xe_tile.h +1 -0
@@ -12,6 +12,7 @@ struct xe_tile;int xe_tile_init_early (struct xe_tile *tile,struct xe_device *xe,u8 id);int xe_tile_init_noalloc (struct xe_tile *tile); +int xe_tile_init (struct xe_tile *tile);void xe_tile_migrate_wait (struct xe_tile *tile);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 497/626 drm/xe: Do not attempt to bootstrap VF in execlists mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
[ Upstream commit f3b59457808f61d88178b0afa67cbd017d7ce79e ]
It was mentioned in a review that there is a possibility of choosing to load the module with VF in execlists mode.
Of course this doesn't work, just bomb out as hard as possible.
--- drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/xe/xe_gt_sriov_vf.c +3 -0
@@ -235,6 +235,9 @@ int xe_gt_sriov_vf_bootstrap(struct xe_gt *gt) {int err; +if (!xe_device_uc_enabled (gt_to_xe (gt))) +return -ENODEV ; + err =vf_reset_guc_state (gt);if (unlikely (err))return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 498/626 wifi: rtw89: coex: Separated Wi-Fi connecting event from Wi-Fi scan event
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ching-Te Ku <[email protected]>
[ Upstream commit 4a57346652154bb339c48b41166df9154cff33f5 ]
Wi-Fi connecting process don't need to assign to firmware slot control, if assign firmware slot control for Wi-Fi connecting event, firmware will not toggle slots because driver don't tell the slot schedule to firmware. Wi-Fi connecting event end should also cancel the 4way handshake status.
--- drivers/net/wireless/realtek/rtw89/coex.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +6 -2
@@ -5356,7 +5356,8 @@ static void _action_wl_scan(struct rtw89_dev *rtwdev)struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) { +if (btc->cx.state_map !=BTC_WLINKING && +RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) {_action_wl_25g_mcc (rtwdev);rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], Scan offload!\n" ); }else if (rtwdev->dbcc_en) {
@@ -7178,6 +7179,8 @@ void rtw89_btc_ntfy_scan_finish(struct rtw89_dev *rtwdev, u8 phy_idx)_fw_set_drv_info (rtwdev,CXDRVINFO_DBCC ); } + btc->dm.tdma_instant_excute =1 ; +_run_coex (rtwdev,BTC_RSN_NTFY_SCAN_FINISH ); }
@@ -7630,7 +7633,8 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev,else wl->status.map.connecting =0 ; -if (state ==BTC_ROLE_MSTS_STA_DIS_CONN ) +if (state ==BTC_ROLE_MSTS_STA_DIS_CONN || + state ==BTC_ROLE_MSTS_STA_CONN_END ) wl->status.map._4way = false;_run_coex (rtwdev,BTC_RSN_NTFY_ROLE_INFO );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 499/626 drm/xe/sa: Always call drm_suballoc_manager_fini()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit 9cd3f4efc870463f17f6c29114c61fb6bfcaa291 ]
After successful call to drm_suballoc_manager_init() we should make sure to call drm_suballoc_manager_fini() as it may include some cleanup code even if we didn't start using it for real.
As we can abort init() early due to kvzalloc() failure, we should either explicitly call drm_suballoc_manager_fini() or, even better, postpone drm_suballoc_manager_init() once we finish all other preparation steps, so we can rely on fini() that will do cleanup.
--- drivers/gpu/drm/xe/xe_sa.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_sa.c +1 -2
@@ -57,8 +57,6 @@ struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32 } sa_manager->bo = bo; sa_manager->is_iomem = bo->vmap.is_iomem; - -drm_suballoc_manager_init (&sa_manager->base, managed_size, align); sa_manager->gpu_addr =xe_bo_ggtt_addr (bo);if (bo->vmap.is_iomem) {
@@ -72,6 +70,7 @@ struct xe_sa_manager *xe_sa_bo_manager_init(struct xe_tile *tile, u32 size, u32memset (sa_manager->cpu_ptr,0 , bo->ttm.base.size); } +drm_suballoc_manager_init (&sa_manager->base, managed_size, align); ret =drmm_add_action_or_reset (&xe->drm, xe_sa_bo_manager_fini, sa_manager);if (ret)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 500/626 drm/xe: Reject BO eviction if BO is bound to current VM
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oak Zeng <[email protected]>
[ Upstream commit 0af944f0e3082ff517958b1cea76fb9b8cb379dd ]
This is a follow up fix for
https://patchwork.freedesktop.org/patch/msgid/[email protected]
The overall goal is to fail vm_bind when there is memory pressure. See more details in the commit message of above patch. Abbove patch fixes the issue when user pass in a vm_id parameter during gem_create. If user doesn't pass in a vm_id during gem_create, above patch doesn't help.
This patch further reject BO eviction (which could be triggered by bo validation) if BO is bound to the current VM. vm_bind could fail due to the eviction failure. The BO to VM reverse mapping structure is used to determine whether BO is bound to VM.
v2:
Move vm_bo definition from function scope to if(evict) clause (Thomas) Further constraint the condition by adding ctx->resv (Thomas) Add a short comment describe the change.
--- drivers/gpu/drm/xe/xe_bo.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/xe/xe_bo.c +15 -0
@@ -702,6 +702,21 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict, goto out; } +/* Reject BO eviction if BO is bound to current VM. */ +if (evict && ctx->resv) { +struct drm_gpuvm_bo *vm_bo; + +drm_gem_for_each_gpuvm_bo (vm_bo, &bo->ttm.base) { +struct xe_vm *vm =gpuvm_to_vm (vm_bo->vm); + +if (xe_vm_resv (vm) == ctx->resv && +xe_vm_in_preempt_fence_mode (vm)) { + ret = -EBUSY ; + goto out; + } + } + } +/* * Failed multi-hop where the old_mem is still marked as * TTM_PL_FLAG_TEMPORARY, should just be a dummy move.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 501/626 drm/atomic: clarify the rules around drm_atomic_state->allow_modeset
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simona Vetter <[email protected]>
[ Upstream commit c5e3306a424b52e38ad2c28c7f3399fcd03e383d ]
msm is automagically upgrading normal commits to full modesets, and that's a big no-no:
- for one this results in full on->off->on transitions on all these crtc, at least if you're using the usual helpers. Which seems to be the case, and is breaking uapi
- further even if the ctm change itself would not result in flicker, this can hide modesets for other reasons. Which again breaks the uapi
v2: I forgot the case of adding unrelated crtc state. Add that case and link to the existing kerneldoc explainers. This has come up in an irc discussion with Manasi and Ville about intel's bigjoiner mode. Also cc everyone involved in the msm irc discussion, more people joined after I sent out v1.
v3: Wording polish from Pekka and Thomas
--- include/drm/drm_atomic.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
include/drm/drm_atomic.h +21 -2
@@ -376,8 +376,27 @@ struct drm_atomic_state {* * Allow full modeset. This is used by the ATOMIC IOCTL handler to * implement the DRM_MODE_ATOMIC_ALLOW_MODESET flag. Drivers should -* never consult this flag, instead looking at the output of -* drm_atomic_crtc_needs_modeset(). +* generally not consult this flag, but instead look at the output of +* drm_atomic_crtc_needs_modeset(). The detailed rules are: +* +* - Drivers must not consult @allow_modeset in the atomic commit path. +* Use drm_atomic_crtc_needs_modeset() instead. +* +* - Drivers must consult @allow_modeset before adding unrelated struct +* drm_crtc_state to this commit by calling +* drm_atomic_get_crtc_state(). See also the warning in the +* documentation for that function. +* +* - Drivers must never change this flag, it is under the exclusive +* control of userspace. +* +* - Drivers may consult @allow_modeset in the atomic check path, if +* they have the choice between an optimal hardware configuration +* which requires a modeset, and a less optimal configuration which +* can be committed without a modeset. An example would be suboptimal +* scanout FIFO allocation resulting in increased idle power +* consumption. This allows userspace to avoid flickering and delays +* for the normal composition loop at reasonable cost. */ bool allow_modeset : 1;/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 502/626 drm/buddy: fix issue that force_merge cannot free all roots
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin.Cao <[email protected]>
[ Upstream commit 467dce3817bd2b62ccd6fcfd7aae76f242ac907e ]
If buddy manager have more than one roots and each root have sub-block need to be free. When drm_buddy_fini called, the first loop of force_merge will merge and free all of the sub block of first root, which offset is 0x0 and size is biggest(more than have of the mm size). In subsequent force_merge rounds, if we use 0 as start and use remaining mm size as end, the block of other roots will be skipped in __force_merge function. It will cause the other roots can not be freed.
Solution: use roots' offset as the start could fix this issue.
--- drivers/gpu/drm/drm_buddy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_buddy.c +3 -2
@@ -324,7 +324,7 @@ EXPORT_SYMBOL(drm_buddy_init);*/ void drm_buddy_fini (struct drm_buddy *mm) { -u64 root_size, size; +u64 root_size, size, start;unsigned int order;int i;
@@ -332,7 +332,8 @@ void drm_buddy_fini(struct drm_buddy *mm)for (i =0 ; i < mm->n_roots; ++i) { order =ilog2 (size) -ilog2 (mm->chunk_size); -__force_merge (mm,0 , size, order); + start =drm_buddy_block_offset (mm->roots[i]); +__force_merge (mm, start, start + size, order);WARN_ON (!drm_buddy_block_is_free (mm->roots[i]));drm_block_free (mm, mm->roots[i]);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 503/626 drm/panel-edp: Add Starry 116KHD024006
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 749b5b279e5636cdcef51e15d67b77162cca6caa ]
We have a few reports of sc7180-trogdor-pompom devices that have a panel in them that IDs as STA 0x0004 and has the following raw EDID:
00 ff ff ff ff ff ff 00 4e 81 04 00 00 00 00 00 10 20 01 04 a5 1a 0e 78 0a dc dd 96 5b 5b 91 28 1f 52 54 00 00 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 8e 1c 56 a0 50 00 1e 30 28 20 55 00 00 90 10 00 00 18 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fe 00 31 31 36 4b 48 44 30 32 34 30 30 36 0a 00 e6
We've been unable to locate a datasheet for this panel and our partner has not been responsive, but all Starry eDP datasheets that we can find agree on the same timing (delay_100_500_e200) so it should be safe to use that here instead of the super conservative timings. We'll still go a little extra conservative and allow hpd_absent of 200 instead of 100 because that won't add any real-world delay in most cases.
We'll associate the string from the EDID ("116KHD024006") with this panel. Given that the ID is the suspicious value of 0x0004 it seems likely that Starry doesn't always update their IDs but the string will still work to differentiate if we ever need to in the future.
--- drivers/gpu/drm/panel/panel-edp.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/panel/panel-edp.c +1 -0
@@ -1983,6 +1983,7 @@ static const struct edp_panel_entry edp_panels[] = {EDP_PANEL_ENTRY ('S' ,'H' ,'P' ,0x153a , &delay_200_500_e50,"LQ140T1JH01" ),EDP_PANEL_ENTRY ('S' ,'H' ,'P' ,0x154c , &delay_200_500_p2e100,"LQ116M1JW10" ), +EDP_PANEL_ENTRY ('S' ,'T' ,'A' ,0x0004 , &delay_200_500_e200,"116KHD024006" ), EDP_PANEL_ENTRY('S', 'T', 'A', 0x0100, &delay_100_500_e200, "2081116HHD028001-51D"), { /* sentinal */ }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 504/626 drm: Add valid clones check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jessica Zhang <[email protected]>
[ Upstream commit 41b4b11da02157c7474caf41d56baae0e941d01a ]
Check that all encoders attached to a given CRTC are valid possible_clones of each other.
--- drivers/gpu/drm/drm_atomic_helper.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/gpu/drm/drm_atomic_helper.c +28 -0
@@ -574,6 +574,30 @@ mode_valid(struct drm_atomic_state *state)return 0 ; } +static int drm_atomic_check_valid_clones (struct drm_atomic_state *state, +struct drm_crtc *crtc) +{ +struct drm_encoder *drm_enc; +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); + +drm_for_each_encoder_mask (drm_enc, crtc->dev, crtc_state->encoder_mask) { +if (!drm_enc->possible_clones) { +DRM_DEBUG ("enc%d possible_clones is 0\n" , drm_enc->base.id); +continue ; + } + +if ((crtc_state->encoder_mask & drm_enc->possible_clones) != + crtc_state->encoder_mask) { +DRM_DEBUG ("crtc%d failed valid clone check for mask 0x%x\n" , + crtc->base.id, crtc_state->encoder_mask); +return -EINVAL ; + } + } + +return 0 ; +} +/** * drm_atomic_helper_check_modeset - validate state object for modeset changes * @dev: DRM device
@@ -745,6 +769,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, ret =drm_atomic_add_affected_planes (state, crtc);if (ret !=0 )return ret; + + ret =drm_atomic_check_valid_clones (state, crtc); +if (ret !=0 ) +return ret; }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 505/626 ASoC: imx-card: Adjust over allocation of memory in imx_card_parse_of()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit a9a69c3b38c89d7992fb53db4abb19104b531d32 ]
Incorrect types are used as sizeof() arguments in devm_kcalloc(). It should be sizeof(dai_link_data) for link_data instead of sizeof(snd_soc_dai_link).
This is found by our static analysis tool.
--- sound/soc/fsl/imx-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/imx-card.c +1 -1
@@ -516,7 +516,7 @@ static int imx_card_parse_of(struct imx_card_data *data)if (!card->dai_link)return -ENOMEM ; - data->link_data =devm_kcalloc (dev, num_links,sizeof (*link),GFP_KERNEL ); + data->link_data =devm_kcalloc (dev, num_links,sizeof (*link_data),GFP_KERNEL );if (!data->link_data)return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 506/626 book3s64/radix: Fix compile errors when CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=n
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ritesh Harjani (IBM) <[email protected]>
[ Upstream commit 29bdc1f1c1df80868fb35bc69d1f073183adc6de ]
Fix compile errors when CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=n
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/mm/book3s64/radix_pgtable.c +2 -1
@@ -988,7 +988,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,return 0 ; } - +#ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP bool vmemmap_can_optimize (struct vmem_altmap *altmap,struct dev_pagemap *pgmap) {if (radix_enabled ())
@@ -996,6 +996,7 @@ bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) return false; } +#endif int __meminit vmemmap_check_pmd (pmd_t *pmdp,int node,unsigned long addr,unsigned long next)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 507/626 pinctrl: meson: define the pull up/down resistor value as 60 kOhm
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Blumenstingl <[email protected]>
[ Upstream commit e56088a13708757da68ad035269d69b93ac8c389 ]
The public datasheets of the following Amlogic SoCs describe a typical resistor value for the built-in pull up/down resistor:
- Meson8/8b/8m2: not documented
- GXBB (S905): 60 kOhm
- GXL (S905X): 60 kOhm
- GXM (S912): 60 kOhm
- G12B (S922X): 60 kOhm
- SM1 (S905D3): 60 kOhm
The public G12B and SM1 datasheets additionally state min and max values:
- min value: 50 kOhm for both, pull-up and pull-down
- max value for the pull-up: 70 kOhm
- max value for the pull-down: 130 kOhm
Use 60 kOhm in the pinctrl-meson driver as well so it's shown in the debugfs output. It may not be accurate for Meson8/8b/8m2 but in reality 60 kOhm is closer to the actual value than 1 Ohm.
--- drivers/pinctrl/meson/pinctrl-meson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-meson.c +1 -1
@@ -487,7 +487,7 @@ static int meson_pinconf_get(struct pinctrl_dev *pcdev, unsigned int pin,case PIN_CONFIG_BIAS_PULL_DOWN :case PIN_CONFIG_BIAS_PULL_UP :if (meson_pinconf_get_pull (pc, pin) == param) - arg =1 ; + arg =60000 ;else return -EINVAL ;break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 508/626 smb: server: smb2pdu: check return value of xa_store()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Salah Triki <[email protected]>
[ Upstream commit af5226abb40cae959f424f7ca614787a1c87ce48 ]
xa_store() may fail so check its return value and return error code if error occurred.
--- fs/smb/server/smb2pdu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/smb/server/smb2pdu.c +7 -2
@@ -1448,7 +1448,7 @@ static int ntlm_authenticate(struct ksmbd_work *work, {struct ksmbd_conn *conn = work->conn;struct ksmbd_session *sess = work->sess; -struct channel *chann =NULL ; +struct channel *chann =NULL , *old;struct ksmbd_user *user;u64 prev_id;int sz, rc;
@@ -1560,7 +1560,12 @@ static int ntlm_authenticate(struct ksmbd_work *work,return -ENOMEM ; chann->conn = conn; -xa_store (&sess->ksmbd_chann_list, (long )conn, chann,KSMBD_DEFAULT_GFP ); + old =xa_store (&sess->ksmbd_chann_list, (long )conn, chann, +KSMBD_DEFAULT_GFP ); +if (xa_is_err (old)) { +kfree (chann); +return xa_err (old); + } } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 509/626 platform/x86/intel: hid: Add Pantherlake support
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saranya Gopal <[email protected]>
[ Upstream commit 12df9ec3e1955aed6a0c839f2375cd8e5d5150cf ]
Add Pantherlake ACPI device ID to the Intel HID driver.
While there, clean up the device ID table to remove the ", 0" parts.
--- drivers/platform/x86/intel/hid.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/platform/x86/intel/hid.c +11 -10
@@ -44,16 +44,17 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Alex Hung" );static const struct acpi_device_id intel_hid_ids[] = { - {"INT33D5" ,0 }, - {"INTC1051" ,0 }, - {"INTC1054" ,0 }, - {"INTC1070" ,0 }, - {"INTC1076" ,0 }, - {"INTC1077" ,0 }, - {"INTC1078" ,0 }, - {"INTC107B" ,0 }, - {"INTC10CB" ,0 }, - {"" ,0 }, + {"INT33D5" }, + {"INTC1051" }, + {"INTC1054" }, + {"INTC1070" }, + {"INTC1076" }, + {"INTC1077" }, + {"INTC1078" }, + {"INTC107B" }, + {"INTC10CB" }, + {"INTC10CC" }, + { } };MODULE_DEVICE_TABLE (acpi, intel_hid_ids);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 510/626 platform/x86: asus-wmi: Disable OOBE state after resume from hibernation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Nikulin <[email protected]>
[ Upstream commit 77bdac73754e4c0c564c1ca80fe3d9c93b0e715a ]
ASUS firmware resets OOBE state during S4 suspend, so the keyboard blinks during resume from hibernation. This patch disables OOBE state after resume from hibernation.
--- drivers/platform/x86/asus-wmi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-wmi.c +10 -1
@@ -304,6 +304,7 @@ struct asus_wmi {u32 kbd_rgb_dev;bool kbd_rgb_state_available; +bool oobe_state_available;u8 throttle_thermal_policy_mode;u32 throttle_thermal_policy_dev;
@@ -1826,7 +1827,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus) goto error; } -if (asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_OOBE )) { +if (asus->oobe_state_available) {/* * Disable OOBE state, so that e.g. the keyboard backlight * works.
@@ -4741,6 +4742,7 @@ static int asus_wmi_add(struct platform_device *pdev) asus->egpu_enable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU ); asus->dgpu_disable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_DGPU ); asus->kbd_rgb_state_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_STATE ); + asus->oobe_state_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_OOBE ); asus->ally_mcu_usb_switch =acpi_has_method (NULL ,ASUS_USB0_PWR_EC0_CSEE ) &&dmi_check_system (asus_ally_mcu_quirk);
@@ -4994,6 +4996,13 @@ static int asus_hotk_restore(struct device *device) }if (!IS_ERR_OR_NULL (asus->kbd_led.dev))kbd_led_update (asus); +if (asus->oobe_state_available) { +/* +* Disable OOBE state, so that e.g. the keyboard backlight +* works. +*/ +asus_wmi_set_devstate (ASUS_WMI_DEVID_OOBE ,1 ,NULL ); + }if (asus_wmi_has_fnlock_key (asus))asus_wmi_fnlock_update (asus);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 511/626 platform/x86: ideapad-laptop: add support for some new buttons
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gašper Nemgar <[email protected]>
[ Upstream commit 02c6e43397c39edd0c172859bf8c851b46be09a8 ]
Add entries to unsupported WMI codes in ideapad_keymap[] and one check for WMI code 0x13d to trigger platform_profile_cycle().
--- drivers/platform/x86/ideapad-laptop.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/platform/x86/ideapad-laptop.c +16 -0
@@ -1297,6 +1297,16 @@ static const struct key_entry ideapad_keymap[] = {/* Specific to some newer models */ { KE_KEY, 0x3e | IDEAPAD_WMI_KEY, { KEY_MICMUTE } }, { KE_KEY, 0x3f | IDEAPAD_WMI_KEY, { KEY_RFKILL } }, +/* Star- (User Assignable Key) */ + { KE_KEY, 0x44 | IDEAPAD_WMI_KEY, { KEY_PROG1 } }, +/* Eye */ + { KE_KEY, 0x45 | IDEAPAD_WMI_KEY, { KEY_PROG3 } }, +/* Performance toggle also Fn+Q, handled inside ideapad_wmi_notify() */ + { KE_KEY, 0x3d | IDEAPAD_WMI_KEY, { KEY_PROG4 } }, +/* shift + prtsc */ + { KE_KEY, 0x2d | IDEAPAD_WMI_KEY, { KEY_CUT } }, + { KE_KEY, 0x29 | IDEAPAD_WMI_KEY, { KEY_TOUCHPAD_TOGGLE } }, + { KE_KEY, 0x2a | IDEAPAD_WMI_KEY, { KEY_ROOT_MENU } }, { KE_END }, };
@@ -2083,6 +2093,12 @@ static void ideapad_wmi_notify(struct wmi_device *wdev, union acpi_object *data)dev_dbg (&wdev->dev,"WMI fn-key event: 0x%llx\n" , data->integer.value); +/* performance button triggered by 0x3d */ +if (data->integer.value ==0x3d && priv->dytc) { +platform_profile_cycle (); +break ; + } +/* 0x02 FnLock, 0x03 Esc */ if (data->integer.value ==0x02 || data->integer.value ==0x03 )ideapad_fn_lock_led_notify (priv, data->integer.value ==0x02 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 512/626 ASoC: cs42l43: Disable headphone clamps during type detection
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit 70ad2e6bd180f94be030aef56e59693e36d945f3 ]
The headphone clamps cause fairly loud pops during type detect because they sink current from the detection process itself. Disable the clamps whilst the type detect runs, to improve the detection pop performance.
--- sound/soc/codecs/cs42l43-jack.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/codecs/cs42l43-jack.c +7 -0
@@ -654,6 +654,10 @@ static int cs42l43_run_type_detect(struct cs42l43_codec *priv)reinit_completion (&priv->type_detect); +regmap_update_bits (cs42l43->regmap,CS42L43_STEREO_MIC_CLAMP_CTRL , +CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_VAL_MASK , +CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_VAL_MASK ); +cs42l43_start_hs_bias (priv, true);regmap_update_bits (cs42l43->regmap,CS42L43_HS2 ,CS42L43_HSDET_MODE_MASK ,0x3 <<CS42L43_HSDET_MODE_SHIFT );
@@ -665,6 +669,9 @@ static int cs42l43_run_type_detect(struct cs42l43_codec *priv) CS42L43_HSDET_MODE_MASK, 0x2 << CS42L43_HSDET_MODE_SHIFT);cs42l43_stop_hs_bias (priv); +regmap_update_bits (cs42l43->regmap,CS42L43_STEREO_MIC_CLAMP_CTRL , +CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_VAL_MASK ,0 ); +if (!time_left)return -ETIMEDOUT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 513/626 ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit a549b927ea3f5e50b1394209b64e6e17e31d4db8 ]
Acer Aspire SW3-013 requires the very same quirk as other Acer Aspire model for making it working.
--- sound/soc/intel/boards/bytcr_rt5640.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/soc/intel/boards/bytcr_rt5640.c +13 -0
@@ -576,6 +576,19 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {BYT_RT5640_SSP0_AIF2 | BYT_RT5640_MCLK_EN), }, + { /* Acer Aspire SW3-013 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW3-013"), + }, + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | +BYT_RT5640_JD_SRC_JD2_IN4N | +BYT_RT5640_OVCD_TH_2000UA | +BYT_RT5640_OVCD_SF_0P75 | +BYT_RT5640_DIFF_MIC | +BYT_RT5640_SSP0_AIF1 | + BYT_RT5640_MCLK_EN), + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 514/626 ALSA: hda/realtek: Add quirk for HP Spectre x360 15-df1xxx
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit be0c40da888840fe91b45474cb70779e6cbaf7ca ]
HP Spectre x360 15-df1xxx with SSID 13c:863e requires similar workarounds that were applied to another HP Spectre x360 models; it has a mute LED only, no micmute LEDs, and needs the speaker GPIO seup.
--- sound/pci/hda/patch_realtek.c | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
sound/pci/hda/patch_realtek.c +42 -0
@@ -6965,6 +6965,41 @@ static void alc285_fixup_hp_spectre_x360_eb1(struct hda_codec *codec, } } +/* GPIO1 = amplifier on/off */ +static void alc285_fixup_hp_spectre_x360_df1 (struct hda_codec *codec, +const struct hda_fixup *fix, +int action) +{ +struct alc_spec *spec = codec->spec; +static const hda_nid_t conn[] = {0x02 }; +static const struct hda_pintbl pincfgs[] = { + {0x14 ,0x90170110 },/* front/high speakers */ + {0x17 ,0x90170130 },/* back/bass speakers */ + { } + }; + +// enable mute led +alc285_fixup_hp_mute_led_coefbit (codec, fix, action); + +switch (action) { +case HDA_FIXUP_ACT_PRE_PROBE : +/* needed for amp of back speakers */ + spec->gpio_mask |=0x01 ; + spec->gpio_dir |=0x01 ; +snd_hda_apply_pincfgs (codec, pincfgs); +/* share DAC to have unified volume control */ +snd_hda_override_conn_list (codec,0x14 ,ARRAY_SIZE (conn), conn); +snd_hda_override_conn_list (codec,0x17 ,ARRAY_SIZE (conn), conn); +break ; +case HDA_FIXUP_ACT_INIT : +/* need to toggle GPIO to enable the amp of back speakers */ +alc_update_gpio_data (codec,0x01 , true); +msleep (100 ); +alc_update_gpio_data (codec,0x01 , false); +break ; + } +} +static void alc285_fixup_hp_spectre_x360 (struct hda_codec *codec,const struct hda_fixup *fix,int action) {
@@ -7730,6 +7765,7 @@ enum {ALC280_FIXUP_HP_9480M ,ALC245_FIXUP_HP_X360_AMP ,ALC285_FIXUP_HP_SPECTRE_X360_EB1 , +ALC285_FIXUP_HP_SPECTRE_X360_DF1 ,ALC285_FIXUP_HP_ENVY_X360 ,ALC288_FIXUP_DELL_HEADSET_MODE , ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
@@ -9798,6 +9834,10 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_hp_spectre_x360_eb1 }, + [ALC285_FIXUP_HP_SPECTRE_X360_DF1] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_hp_spectre_x360_df1 + }, [ALC285_FIXUP_HP_ENVY_X360] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_hp_envy_x360,
@@ -10515,6 +10555,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x86c1 ,"HP Laptop 15-da3001TU" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x86c7 ,"HP Envy AiO 32" ,ALC274_FIXUP_HP_ENVY_GPIO ),SND_PCI_QUIRK (0x103c ,0x86e7 ,"HP Spectre x360 15-eb0xxx" ,ALC285_FIXUP_HP_SPECTRE_X360_EB1 ), +SND_PCI_QUIRK (0x103c ,0x863e ,"HP Spectre x360 15-df1xxx" ,ALC285_FIXUP_HP_SPECTRE_X360_DF1 ),SND_PCI_QUIRK (0x103c ,0x86e8 ,"HP Spectre x360 15-eb0xxx" ,ALC285_FIXUP_HP_SPECTRE_X360_EB1 ),SND_PCI_QUIRK (0x103c ,0x86f9 ,"HP Spectre x360 13-aw0xxx" ,ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED ), SND_PCI_QUIRK(0x103c, 0x8716, "HP Elite Dragonfly G2 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
@@ -11404,6 +11445,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"}, {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"}, {.id = ALC285_FIXUP_HP_SPECTRE_X360_EB1, .name = "alc285-hp-spectre-x360-eb1"}, + {.id = ALC285_FIXUP_HP_SPECTRE_X360_DF1, .name = "alc285-hp-spectre-x360-df1"}, {.id = ALC285_FIXUP_HP_ENVY_X360, .name = "alc285-hp-envy-x360"}, {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"}, {.id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN, .name = "alc287-yoga9-bass-spk-pin"},
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 515/626 nvme-pci: add quirks for device 126f:1001
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Guan <[email protected]>
[ Upstream commit 5b960f92ac3e5b4d7f60a506a6b6735eead1da01 ]
This commit adds NVME_QUIRK_NO_DEEPEST_PS and NVME_QUIRK_BOGUS_NID for device [126f:1001].
It is similar to commit e89086c43f05 ("drivers/nvme: Add quirks for device 126f:2262")
Diff is according the dmesg, use NVME_QUIRK_IGNORE_DEV_SUBNQN.
dmesg | grep -i nvme0:
nvme nvme0: pci function 0000:01:00.0
nvme nvme0: missing or invalid SUBNQN field.
nvme nvme0: 12/0/0 default/read/poll queues
--- drivers/nvme/host/pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/host/pci.c +3 -0
@@ -3587,6 +3587,9 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1217, 0x8760), /* O2 Micro 64GB Steam Deck */ .driver_data = NVME_QUIRK_DMAPOOL_ALIGN_512, }, + { PCI_DEVICE(0x126f, 0x1001), /* Silicon Motion generic */ + .driver_data = NVME_QUIRK_NO_DEEPEST_PS | + NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x126f, 0x2262), /* Silicon Motion generic */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS | NVME_QUIRK_BOGUS_NID, },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 516/626 nvme-pci: add quirks for WDC Blue SN550 15b7:5009
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Guan <[email protected]>
[ Upstream commit ab35ad950d439ec3409509835d229b3d93d3c7f9 ]
Add two quirks for the WDC Blue SN550 (PCI ID 15b7:5009) based on user reports and hardware analysis:
- NVME_QUIRK_NO_DEEPEST_PS:
liaozw talked to me the problem and solved with nvme_core.default_ps_max_latency_us=0, so add the quirk. I also found some reports in the following link.
- NVME_QUIRK_BROKEN_MSI:
after get the lspci from Jack Rio.
I think that the disk also have NVME_QUIRK_BROKEN_MSI. described in commit d5887dc6b6c0 ("nvme-pci: Add quirk for broken MSIs") as sean said in link which match the MSI 1/32 and MSI-X 17.
Log:
lspci -nn | grep -i memory
03:00.0 Non-Volatile memory controller [0108]: Sandisk Corp SanDisk Ultra 3D / WD PC SN530, IX SN530, Blue SN550 NVMe SSD (DRAM-less) [15b7:5009] (rev 01) lspci -v -d 15b7:5009
03:00.0 Non-Volatile memory controller: Sandisk Corp SanDisk Ultra 3D / WD PC SN530, IX SN530, Blue SN550 NVMe SSD (DRAM-less) (rev 01) (prog-if 02 [NVM Express])
Subsystem: Sandisk Corp WD Blue SN550 NVMe SSD
Flags: bus master, fast devsel, latency 0, IRQ 35, IOMMU group 10
Memory at fe800000 (64-bit, non-prefetchable) [size=16K]
Memory at fe804000 (64-bit, non-prefetchable) [size=256]
Capabilities: [80] Power Management version 3
Capabilities: [90] MSI: Enable- Count=1/32 Maskable- 64bit+
Capabilities: [b0] MSI-X: Enable+ Count=17 Masked-
Capabilities: [c0] Express Endpoint, MSI 00
Capabilities: [100] Advanced Error Reporting
Capabilities: [150] Device Serial Number 00-00-00-00-00-00-00-00
Capabilities: [1b8] Latency Tolerance Reporting
Capabilities: [300] Secondary PCI Express
Capabilities: [900] L1 PM Substates
Kernel driver in use: nvme
dmesg | grep nvme
[ 0.000000] Command line: BOOT_IMAGE=/vmlinuz-6.12.20-amd64-desktop-rolling root=UUID= ro splash quiet nvme_core.default_ps_max_latency_us=0 DEEPIN_GFXMODE= [ 0.059301] Kernel command line: BOOT_IMAGE=/vmlinuz-6.12.20-amd64-desktop-rolling root=UUID= ro splash quiet nvme_core.default_ps_max_latency_us=0 DEEPIN_GFXMODE= [ 0.542430] nvme nvme0: pci function 0000:03:00.0 [ 0.560426] nvme nvme0: allocated 32 MiB host memory buffer. [ 0.562491] nvme nvme0: 16/0/0 default/read/poll queues [ 0.567764] nvme0n1: p1 p2 p3 p4 p5 p6 p7 p8 p9 [ 6.388726] EXT4-fs (nvme0n1p7): mounted filesystem ro with ordered data mode. Quota mode: none. [ 6.893421] EXT4-fs (nvme0n1p7): re-mounted r/w. Quota mode: none. [ 7.125419] Adding 16777212k swap on /dev/nvme0n1p8. Priority:-2 extents:1 across:16777212k SS [ 7.157588] EXT4-fs (nvme0n1p6): mounted filesystem r/w with ordered data mode. Quota mode: none. [ 7.165021] EXT4-fs (nvme0n1p9): mounted filesystem r/w with ordered data mode. Quota mode: none. [ 8.036932] nvme nvme0: using unchecked data buffer [ 8.096023] block nvme0n1: No UUID available providing old NGUID
--- drivers/nvme/host/pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/host/pci.c +3 -0
@@ -3613,6 +3613,9 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x15b7, 0x5008), /* Sandisk SN530 */ .driver_data = NVME_QUIRK_BROKEN_MSI }, + { PCI_DEVICE(0x15b7, 0x5009), /* Sandisk SN550 */ + .driver_data =NVME_QUIRK_BROKEN_MSI | + NVME_QUIRK_NO_DEEPEST_PS }, { PCI_DEVICE(0x1987, 0x5012), /* Phison E12 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1987, 0x5016), /* Phison E16 */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 517/626 ALSA: usb-audio: Fix duplicated name in MIDI substream names
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 0759e77a6d9bd34a874da73721ce4a7dc6665023 ]
The MIDI substream name string is constructed from the combination of the card shortname (which is taken from USB iProduct) and the USB iJack. The problem is that some devices put the product name to the iJack field, too. For example, aplaymidi -l output on the Lanchkey MK 49 are like:
% aplaymidi -l
Port Client name Port name 44:0 Launchkey MK4 49 Launchkey MK4 49 Launchkey MK4 44:1 Launchkey MK4 49 Launchkey MK4 49 Launchkey MK4
where the actual iJack name can't be seen because it's truncated due to the doubly words.
For resolving those situations, this patch compares the iJack string with the card shortname, and drops if both start with the same words. Then the result becomes like:
% aplaymidi -l
Port Client name Port name 40:0 Launchkey MK4 49 Launchkey MK4 49 MIDI In 40:1 Launchkey MK4 49 Launchkey MK4 49 DAW In
A caveat is that there are some pre-defined names for certain devices in the driver code, and this workaround shouldn't be applied to them. Similarly, when the iJack isn't specified, we should skip this check, too. The patch added those checks in addition to the string comparison.
--- sound/usb/midi.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
sound/usb/midi.c +12 -4
@@ -1885,10 +1885,18 @@ static void snd_usbmidi_init_substream(struct snd_usb_midi *umidi, } port_info =find_port_info (umidi, number); - name_format = port_info ? port_info->name : - (jack_name != default_jack_name ?"%s %s" :"%s %s %d" ); -snprintf (substream->name,sizeof (substream->name), - name_format, umidi->card->shortname, jack_name, number +1 ); +if (port_info || jack_name == default_jack_name || +strncmp (umidi->card->shortname, jack_name,strlen (umidi->card->shortname)) !=0 ) { + name_format = port_info ? port_info->name : + (jack_name != default_jack_name ?"%s %s" :"%s %s %d" ); +snprintf (substream->name,sizeof (substream->name), + name_format, umidi->card->shortname, jack_name, number +1 ); + }else { +/* The manufacturer included the iProduct name in the jack +* name, do not use both +*/ +strscpy (substream->name, jack_name); + } *rsubstream = substream; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 518/626 nvmet-tcp: dont restore null sk_state_change
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alistair Francis <[email protected]>
[ Upstream commit 46d22b47df2741996af277a2838b95f130436c13 ]
queue->state_change is set as part of nvmet_tcp_set_queue_sock(), but if the TCP connection isn't established when nvmet_tcp_set_queue_sock() is called then queue->state_change isn't set and sock->sk->sk_state_change isn't replaced.
As such we don't need to restore sock->sk->sk_state_change if queue->state_change is NULL.
This avoids NULL pointer dereferences such as this:
[ 286.462026][ C0] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 286.462814][ C0] #PF: supervisor instruction fetch in kernel mode [ 286.463796][ C0] #PF: error_code(0x0010) - not-present page [ 286.464392][ C0] PGD 8000000140620067 P4D 8000000140620067 PUD 114201067 PMD 0 [ 286.465086][ C0] Oops: Oops: 0010 [#1] SMP KASAN PTI [ 286.465559][ C0] CPU: 0 UID: 0 PID: 1628 Comm: nvme Not tainted 6.15.0-rc2+ #11 PREEMPT(voluntary) [ 286.466393][ C0] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-3.fc41 04/01/2014 [ 286.467147][ C0] RIP: 0010:0x0 [ 286.467420][ C0] Code: Unable to access opcode bytes at 0xffffffffffffffd6. [ 286.467977][ C0] RSP: 0018:ffff8883ae008580 EFLAGS: 00010246 [ 286.468425][ C0] RAX: 0000000000000000 RBX: ffff88813fd34100 RCX: ffffffffa386cc43 [ 286.469019][ C0] RDX: 1ffff11027fa68b6 RSI: 0000000000000008 RDI: ffff88813fd34100 [ 286.469545][ C0] RBP: ffff88813fd34160 R08: 0000000000000000 R09: ffffed1027fa682c [ 286.470072][ C0] R10: ffff88813fd34167 R11: 0000000000000000 R12: ffff88813fd344c3 [ 286.470585][ C0] R13: ffff88813fd34112 R14: ffff88813fd34aec R15: ffff888132cdd268 [ 286.471070][ C0] FS: 00007fe3c04c7d80(0000) GS:ffff88840743f000(0000) knlGS:0000000000000000 [ 286.471644][ C0] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 286.472543][ C0] CR2: ffffffffffffffd6 CR3: 000000012daca000 CR4: 00000000000006f0 [ 286.473500][ C0] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 286.474467][ C0] DR3: 0000000000000000 DR6: 00000000ffff07f0 DR7: 0000000000000400 [ 286.475453][ C0] Call Trace: [ 286.476102][ C0] <IRQ> [ 286.476719][ C0] tcp_fin+0x2bb/0x440 [ 286.477429][ C0] tcp_data_queue+0x190f/0x4e60 [ 286.478174][ C0] ? __build_skb_around+0x234/0x330 [ 286.478940][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.479659][ C0] ? __pfx_tcp_data_queue+0x10/0x10 [ 286.480431][ C0] ? tcp_try_undo_loss+0x640/0x6c0 [ 286.481196][ C0] ? seqcount_lockdep_reader_access.constprop.0+0x82/0x90 [ 286.482046][ C0] ? kvm_clock_get_cycles+0x14/0x30 [ 286.482769][ C0] ? ktime_get+0x66/0x150 [ 286.483433][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.484146][ C0] tcp_rcv_established+0x6e4/0x2050 [ 286.484857][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.485523][ C0] ? ipv4_dst_check+0x160/0x2b0 [ 286.486203][ C0] ? __pfx_tcp_rcv_established+0x10/0x10 [ 286.486917][ C0] ? lock_release+0x217/0x2c0 [ 286.487595][ C0] tcp_v4_do_rcv+0x4d6/0x9b0 [ 286.488279][ C0] tcp_v4_rcv+0x2af8/0x3e30 [ 286.488904][ C0] ? raw_local_deliver+0x51b/0xad0 [ 286.489551][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.490198][ C0] ? __pfx_tcp_v4_rcv+0x10/0x10 [ 286.490813][ C0] ? __pfx_raw_local_deliver+0x10/0x10 [ 286.491487][ C0] ? __pfx_nf_confirm+0x10/0x10 [nf_conntrack] [ 286.492275][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.492900][ C0] ip_protocol_deliver_rcu+0x8f/0x370 [ 286.493579][ C0] ip_local_deliver_finish+0x297/0x420 [ 286.494268][ C0] ip_local_deliver+0x168/0x430 [ 286.494867][ C0] ? __pfx_ip_local_deliver+0x10/0x10 [ 286.495498][ C0] ? __pfx_ip_local_deliver_finish+0x10/0x10 [ 286.496204][ C0] ? ip_rcv_finish_core+0x19a/0x1f20 [ 286.496806][ C0] ? lock_release+0x217/0x2c0 [ 286.497414][ C0] ip_rcv+0x455/0x6e0 [ 286.497945][ C0] ? __pfx_ip_rcv+0x10/0x10 [ 286.498550][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.499137][ C0] ? __pfx_ip_rcv_finish+0x10/0x10 [ 286.499763][ C0] ? lock_release+0x217/0x2c0 [ 286.500327][ C0] ? dl_scaled_delta_exec+0xd1/0x2c0 [ 286.500922][ C0] ? __pfx_ip_rcv+0x10/0x10 [ 286.501480][ C0] __netif_receive_skb_one_core+0x166/0x1b0 [ 286.502173][ C0] ? __pfx___netif_receive_skb_one_core+0x10/0x10 [ 286.502903][ C0] ? lock_acquire+0x2b2/0x310 [ 286.503487][ C0] ? process_backlog+0x372/0x1350 [ 286.504087][ C0] ? lock_release+0x217/0x2c0 [ 286.504642][ C0] process_backlog+0x3b9/0x1350 [ 286.505214][ C0] ? process_backlog+0x372/0x1350 [ 286.505779][ C0] __napi_poll.constprop.0+0xa6/0x490 [ 286.506363][ C0] net_rx_action+0x92e/0xe10 [ 286.506889][ C0] ? __pfx_net_rx_action+0x10/0x10 [ 286.507437][ C0] ? timerqueue_add+0x1f0/0x320 [ 286.507977][ C0] ? sched_clock_cpu+0x68/0x540 [ 286.508492][ C0] ? lock_acquire+0x2b2/0x310 [ 286.509043][ C0] ? kvm_sched_clock_read+0xd/0x20 [ 286.509607][ C0] ? handle_softirqs+0x1aa/0x7d0 [ 286.510187][ C0] handle_softirqs+0x1f2/0x7d0 [ 286.510754][ C0] ? __pfx_handle_softirqs+0x10/0x10 [ 286.511348][ C0] ? irqtime_account_irq+0x181/0x290 [ 286.511937][ C0] ? __dev_queue_xmit+0x85d/0x3450 [ 286.512510][ C0] do_softirq.part.0+0x89/0xc0 [ 286.513100][ C0] </IRQ> [ 286.513548][ C0] <TASK> [ 286.513953][ C0] __local_bh_enable_ip+0x112/0x140 [ 286.514522][ C0] ? __dev_queue_xmit+0x85d/0x3450 [ 286.515072][ C0] __dev_queue_xmit+0x872/0x3450 [ 286.515619][ C0] ? nft_do_chain+0xe16/0x15b0 [nf_tables] [ 286.516252][ C0] ? __pfx___dev_queue_xmit+0x10/0x10 [ 286.516817][ C0] ? selinux_ip_postroute+0x43c/0xc50 [ 286.517433][ C0] ? __pfx_selinux_ip_postroute+0x10/0x10 [ 286.518061][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.518606][ C0] ? ip_output+0x164/0x4a0 [ 286.519149][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.519671][ C0] ? ip_finish_output2+0x17d5/0x1fb0 [ 286.520258][ C0] ip_finish_output2+0xb4b/0x1fb0 [ 286.520787][ C0] ? __pfx_ip_finish_output2+0x10/0x10 [ 286.521355][ C0] ? __ip_finish_output+0x15d/0x750 [ 286.521890][ C0] ip_output+0x164/0x4a0 [ 286.522372][ C0] ? __pfx_ip_output+0x10/0x10 [ 286.522872][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.523402][ C0] ? _raw_spin_unlock_irqrestore+0x4c/0x60 [ 286.524031][ C0] ? __pfx_ip_finish_output+0x10/0x10 [ 286.524605][ C0] ? __ip_queue_xmit+0x999/0x2260 [ 286.525200][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.525744][ C0] ? ipv4_dst_check+0x16a/0x2b0 [ 286.526279][ C0] ? lock_release+0x217/0x2c0 [ 286.526793][ C0] __ip_queue_xmit+0x1883/0x2260 [ 286.527324][ C0] ? __skb_clone+0x54c/0x730 [ 286.527827][ C0] __tcp_transmit_skb+0x209b/0x37a0 [ 286.528374][ C0] ? __pfx___tcp_transmit_skb+0x10/0x10 [ 286.528952][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.529472][ C0] ? seqcount_lockdep_reader_access.constprop.0+0x82/0x90 [ 286.530152][ C0] ? trace_hardirqs_on+0x12/0x120 [ 286.530691][ C0] tcp_write_xmit+0xb81/0x88b0 [ 286.531224][ C0] ? mod_memcg_state+0x4d/0x60 [ 286.531736][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.532253][ C0] __tcp_push_pending_frames+0x90/0x320 [ 286.532826][ C0] tcp_send_fin+0x141/0xb50 [ 286.533352][ C0] ? __pfx_tcp_send_fin+0x10/0x10 [ 286.533908][ C0] ? __local_bh_enable_ip+0xab/0x140 [ 286.534495][ C0] inet_shutdown+0x243/0x320 [ 286.535077][ C0] nvme_tcp_alloc_queue+0xb3b/0x2590 [nvme_tcp] [ 286.535709][ C0] ? do_raw_spin_lock+0x129/0x260 [ 286.536314][ C0] ? __pfx_nvme_tcp_alloc_queue+0x10/0x10 [nvme_tcp] [ 286.536996][ C0] ? do_raw_spin_unlock+0x54/0x1e0 [ 286.537550][ C0] ? _raw_spin_unlock+0x29/0x50 [ 286.538127][ C0] ? do_raw_spin_lock+0x129/0x260 [ 286.538664][ C0] ? __pfx_do_raw_spin_lock+0x10/0x10 [ 286.539249][ C0] ? nvme_tcp_alloc_admin_queue+0xd5/0x340 [nvme_tcp] [ 286.539892][ C0] ? __wake_up+0x40/0x60 [ 286.540392][ C0] nvme_tcp_alloc_admin_queue+0xd5/0x340 [nvme_tcp] [ 286.541047][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.541589][ C0] nvme_tcp_setup_ctrl+0x8b/0x7a0 [nvme_tcp] [ 286.542254][ C0] ? _raw_spin_unlock_irqrestore+0x4c/0x60 [ 286.542887][ C0] ? __pfx_nvme_tcp_setup_ctrl+0x10/0x10 [nvme_tcp] [ 286.543568][ C0] ? trace_hardirqs_on+0x12/0x120 [ 286.544166][ C0] ? _raw_spin_unlock_irqrestore+0x35/0x60 [ 286.544792][ C0] ? nvme_change_ctrl_state+0x196/0x2e0 [nvme_core] [ 286.545477][ C0] nvme_tcp_create_ctrl+0x839/0xb90 [nvme_tcp] [ 286.546126][ C0] nvmf_dev_write+0x3db/0x7e0 [nvme_fabrics] [ 286.546775][ C0] ? rw_verify_area+0x69/0x520 [ 286.547334][ C0] vfs_write+0x218/0xe90 [ 286.547854][ C0] ? do_syscall_64+0x9f/0x190 [ 286.548408][ C0] ? trace_hardirqs_on_prepare+0xdb/0x120 [ 286.549037][ C0] ? syscall_exit_to_user_mode+0x93/0x280 [ 286.549659][ C0] ? __pfx_vfs_write+0x10/0x10 [ 286.550259][ C0] ? do_syscall_64+0x9f/0x190 [ 286.550840][ C0] ? syscall_exit_to_user_mode+0x8e/0x280 [ 286.551516][ C0] ? trace_hardirqs_on_prepare+0xdb/0x120 [ 286.552180][ C0] ? syscall_exit_to_user_mode+0x93/0x280 [ 286.552834][ C0] ? ksys_read+0xf5/0x1c0 [ 286.553386][ C0] ? __pfx_ksys_read+0x10/0x10 [ 286.553964][ C0] ksys_write+0xf5/0x1c0 [ 286.554499][ C0] ? __pfx_ksys_write+0x10/0x10 [ 286.555072][ C0] ? trace_hardirqs_on_prepare+0xdb/0x120 [ 286.555698][ C0] ? syscall_exit_to_user_mode+0x93/0x280 [ 286.556319][ C0] ? do_syscall_64+0x54/0x190 [ 286.556866][ C0] do_syscall_64+0x93/0x190 [ 286.557420][ C0] ? rcu_read_unlock+0x17/0x60 [ 286.557986][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.558526][ C0] ? lock_release+0x217/0x2c0 [ 286.559087][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.559659][ C0] ? count_memcg_events.constprop.0+0x4a/0x60 [ 286.560476][ C0] ? exc_page_fault+0x7a/0x110 [ 286.561064][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.561647][ C0] ? lock_release+0x217/0x2c0 [ 286.562257][ C0] ? do_user_addr_fault+0x171/0xa00 [ 286.562839][ C0] ? do_user_addr_fault+0x4a2/0xa00 [ 286.563453][ C0] ? irqentry_exit_to_user_mode+0x84/0x270 [ 286.564112][ C0] ? rcu_is_watching+0x11/0xb0 [ 286.564677][ C0] ? irqentry_exit_to_user_mode+0x84/0x270 [ 286.565317][ C0] ? trace_hardirqs_on_prepare+0xdb/0x120 [ 286.565922][ C0] entry_SYSCALL_64_after_hwframe+0x76/0x7e [ 286.566542][ C0] RIP: 0033:0x7fe3c05e6504 [ 286.567102][ C0] Code: c7 00 16 00 00 00 b8 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 f3 0f 1e fa 80 3d c5 8b 10 00 00 74 13 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 54 c3 0f 1f 00 55 48 89 e5 48 83 ec 20 48 89 [ 286.568931][ C0] RSP: 002b:00007fff76444f58 EFLAGS: 00000202 ORIG_RAX: 0000000000000001 [ 286.569807][ C0] RAX: ffffffffffffffda RBX: 000000003b40d930 RCX: 00007fe3c05e6504 [ 286.570621][ C0] RDX: 00000000000000cf RSI: 000000003b40d930 RDI: 0000000000000003 [ 286.571443][ C0] RBP: 0000000000000003 R08: 00000000000000cf R09: 000000003b40d930 [ 286.572246][ C0] R10: 0000000000000000 R11: 0000000000000202 R12: 000000003b40cd60 [ 286.573069][ C0] R13: 00000000000000cf R14: 00007fe3c07417f8 R15: 00007fe3c073502e [ 286.573886][ C0] </TASK>
--- drivers/nvme/target/tcp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/target/tcp.c +3 -0
@@ -1560,6 +1560,9 @@ static void nvmet_tcp_restore_socket_callbacks(struct nvmet_tcp_queue *queue) {struct socket *sock = queue->sock; +if (!queue->state_change) +return ; +write_lock_bh (&sock->sk->sk_callback_lock); sock->sk->sk_data_ready = queue->data_ready; sock->sk->sk_state_change = queue->state_change;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 519/626 io_uring/fdinfo: annotate racy sq/cq head/tail reads
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit f024d3a8ded0d8d2129ae123d7a5305c29ca44ce ]
syzbot complains about the cached sq head read, and it's totally right. But we don't need to care, it's just reading fdinfo, and reading the CQ or SQ tail/head entries are known racy in that they are just a view into that very instant and may of course be outdated by the time they are reported.
Annotate both the SQ head and CQ tail read with data_race() to avoid this syzbot complaint.
--- io_uring/fdinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
io_uring/fdinfo.c +2 -2
@@ -83,11 +83,11 @@ __cold void io_uring_show_fdinfo(struct seq_file *m, struct file *file)seq_printf (m,"SqMask:\t0x%x\n" , sq_mask);seq_printf (m,"SqHead:\t%u\n" , sq_head);seq_printf (m,"SqTail:\t%u\n" , sq_tail); -seq_printf (m,"CachedSqHead:\t%u\n" , ctx->cached_sq_head); +seq_printf (m,"CachedSqHead:\t%u\n" ,data_race (ctx->cached_sq_head));seq_printf (m,"CqMask:\t0x%x\n" , cq_mask);seq_printf (m,"CqHead:\t%u\n" , cq_head);seq_printf (m,"CqTail:\t%u\n" , cq_tail); -seq_printf (m,"CachedCqTail:\t%u\n" , ctx->cached_cq_tail); +seq_printf (m,"CachedCqTail:\t%u\n" ,data_race (ctx->cached_cq_tail));seq_printf (m,"SQEs:\t%u\n" , sq_tail - sq_head); sq_entries =min (sq_tail - sq_head, ctx->sq_entries);for (i =0 ; i < sq_entries; i++) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 520/626 cifs: Fix and improve cifs_query_path_info() and cifs_query_file_info()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit 1041c117a2c33cdffc4f695ac4b469e9124d24d5 ]
When CAP_NT_SMBS was not negotiated then do not issue CIFSSMBQPathInfo() and CIFSSMBQFileInfo() commands. CIFSSMBQPathInfo() is not supported by non-NT Win9x SMB server and CIFSSMBQFileInfo() returns from Win9x SMB server bogus data in Attributes field (for example lot of files are marked as reparse points, even Win9x does not support them and read-only bit is not marked for read-only files). Correct information is returned by CIFSFindFirst() or SMBQueryInformation() command.
So as a fallback in cifs_query_path_info() function use CIFSFindFirst() with SMB_FIND_FILE_FULL_DIRECTORY_INFO level which is supported by both NT and non-NT servers and as a last option use SMBQueryInformation() as it was before.
And in function cifs_query_file_info() immediately returns -EOPNOTSUPP when not communicating with NT server. Client then revalidate inode entry by the cifs_query_path_info() call, which is working fine. So fstat() syscall on already opened file will receive correct information.
Note that both fallback functions in non-UNICODE mode expands wildcards. Therefore those fallback functions cannot be used on paths which contain SMB wildcard characters (* ? " > <).
CIFSFindFirst() returns all 4 time attributes as opposite of SMBQueryInformation() which returns only one.
With this change it is possible to query all 4 times attributes from Win9x server and at the same time, client minimize sending of unsupported commands to server.
--- fs/smb/client/smb1ops.c | 103 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 95 insertions(+), 8 deletions(-)
fs/smb/client/smb1ops.c +95 -8
@@ -541,24 +541,104 @@ static int cifs_query_path_info(const unsigned int xid,const char *full_path, struct cifs_open_info_data *data) { - int rc; + int rc = -EOPNOTSUPP;FILE_ALL_INFO fi = {}; +struct cifs_search_info search_info = {}; +bool non_unicode_wildcard = false; data->reparse_point = false; data->adjust_tz = false; -/* could do find first instead but this returns more info */ - rc =CIFSSMBQPathInfo (xid, tcon, full_path, &fi,0 /* not legacy */ , cifs_sb->local_nls, -cifs_remap (cifs_sb));/* -* BB optimize code so we do not make the above call when server claims -* no NT SMB support and the above call failed at least once - set flag -* in tcon or mount. +* First try CIFSSMBQPathInfo() function which returns more info +* (NumberOfLinks) than CIFSFindFirst() fallback function. +* Some servers like Win9x do not support SMB_QUERY_FILE_ALL_INFO over +* TRANS2_QUERY_PATH_INFORMATION, but supports it with filehandle over +* TRANS2_QUERY_FILE_INFORMATION (function CIFSSMBQFileInfo(). But SMB +* Open command on non-NT servers works only for files, does not work +* for directories. And moreover Win9x SMB server returns bogus data in +* SMB_QUERY_FILE_ALL_INFO Attributes field. So for non-NT servers, +* do not even use CIFSSMBQPathInfo() or CIFSSMBQFileInfo() function. +*/ +if (tcon->ses->capabilities &CAP_NT_SMBS ) + rc =CIFSSMBQPathInfo (xid, tcon, full_path, &fi,0 /* not legacy */ , + cifs_sb->local_nls,cifs_remap (cifs_sb)); + +/* +* Non-UNICODE variant of fallback functions below expands wildcards, +* so they cannot be used for querying paths with wildcard characters. */ -if ((rc == -EOPNOTSUPP ) || (rc == -EINVAL )) { +if (rc && !(tcon->ses->capabilities &CAP_UNICODE ) &&strpbrk (full_path,"*?\"><" )) + non_unicode_wildcard = true; + +/* +* Then fallback to CIFSFindFirst() which works also with non-NT servers +* but does not does not provide NumberOfLinks. +*/ +if ((rc == -EOPNOTSUPP || rc == -EINVAL ) && + !non_unicode_wildcard) { +if (!(tcon->ses->capabilities & tcon->ses->server->vals->cap_nt_find)) + search_info.info_level =SMB_FIND_FILE_INFO_STANDARD ; +else + search_info.info_level =SMB_FIND_FILE_FULL_DIRECTORY_INFO ; + rc =CIFSFindFirst (xid, tcon, full_path, cifs_sb,NULL , +CIFS_SEARCH_CLOSE_ALWAYS |CIFS_SEARCH_CLOSE_AT_END , + &search_info, false); +if (rc ==0 ) { +if (!(tcon->ses->capabilities & tcon->ses->server->vals->cap_nt_find)) { +FIND_FILE_STANDARD_INFO *di; +int offset = tcon->ses->server->timeAdj; + + di = (FIND_FILE_STANDARD_INFO *)search_info.srch_entries_start; + fi.CreationTime =cpu_to_le64 (cifs_UnixTimeToNT (cnvrtDosUnixTm ( + di->CreationDate, di->CreationTime, offset))); + fi.LastAccessTime =cpu_to_le64 (cifs_UnixTimeToNT (cnvrtDosUnixTm ( + di->LastAccessDate, di->LastAccessTime, offset))); + fi.LastWriteTime =cpu_to_le64 (cifs_UnixTimeToNT (cnvrtDosUnixTm ( + di->LastWriteDate, di->LastWriteTime, offset))); + fi.ChangeTime = fi.LastWriteTime; + fi.Attributes =cpu_to_le32 (le16_to_cpu (di->Attributes)); + fi.AllocationSize =cpu_to_le64 (le32_to_cpu (di->AllocationSize)); + fi.EndOfFile =cpu_to_le64 (le32_to_cpu (di->DataSize)); + }else { +FILE_FULL_DIRECTORY_INFO *di; + + di = (FILE_FULL_DIRECTORY_INFO *)search_info.srch_entries_start; + fi.CreationTime = di->CreationTime; + fi.LastAccessTime = di->LastAccessTime; + fi.LastWriteTime = di->LastWriteTime; + fi.ChangeTime = di->ChangeTime; + fi.Attributes = di->ExtFileAttributes; + fi.AllocationSize = di->AllocationSize; + fi.EndOfFile = di->EndOfFile; + fi.EASize = di->EaSize; + } + fi.NumberOfLinks =cpu_to_le32 (1 ); + fi.DeletePending =0 ; + fi.Directory = !!(le32_to_cpu (fi.Attributes) &ATTR_DIRECTORY ); +cifs_buf_release (search_info.ntwrk_buf_start); + }else if (!full_path[0 ]) { +/* +* CIFSFindFirst() does not work on root path if the +* root path was exported on the server from the top +* level path (drive letter). +*/ + rc = -EOPNOTSUPP ; + } + } + +/* +* If everything failed then fallback to the legacy SMB command +* SMB_COM_QUERY_INFORMATION which works with all servers, but +* provide just few information. +*/ +if ((rc == -EOPNOTSUPP || rc == -EINVAL ) && !non_unicode_wildcard) { rc =SMBQueryInformation (xid, tcon, full_path, &fi, cifs_sb->local_nls,cifs_remap (cifs_sb)); data->adjust_tz = true; + }else if ((rc == -EOPNOTSUPP || rc == -EINVAL ) && non_unicode_wildcard) { +/* Path with non-UNICODE wildcard character cannot exist. */ + rc = -ENOENT ; }if (!rc) {
@@ -655,6 +735,13 @@ static int cifs_query_file_info(const unsigned int xid, struct cifs_tcon *tcon,int rc;FILE_ALL_INFO fi = {}; +/* +* CIFSSMBQFileInfo() for non-NT servers returns bogus data in +* Attributes fields. So do not use this command for non-NT servers. +*/ +if (!(tcon->ses->capabilities &CAP_NT_SMBS )) +return -EOPNOTSUPP ; +if (cfile->symlink_target) { data->symlink_target =kstrdup (cfile->symlink_target,GFP_KERNEL );if (!data->symlink_target)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 521/626 cifs: Fix changing times and read-only attr over SMB1 smb_set_file_info() function
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit f122121796f91168d0894c2710b8dd71330a34f8 ]
Function CIFSSMBSetPathInfo() is not supported by non-NT servers and returns error. Fallback code via open filehandle and CIFSSMBSetFileInfo() does not work neither because CIFS_open() works also only on NT server.
Therefore currently the whole smb_set_file_info() function as a SMB1 callback for the ->set_file_info() does not work with older non-NT SMB servers, like Win9x and others.
This change implements fallback code in smb_set_file_info() which will works with any server and allows to change time values and also to set or clear read-only attributes.
To make existing fallback code via CIFSSMBSetFileInfo() working with also non-NT servers, it is needed to change open function from CIFS_open() (which is NT specific) to cifs_open_file() which works with any server (this is just a open wrapper function which choose the correct open function supported by the server).
CIFSSMBSetFileInfo() is working also on non-NT servers, but zero time values are not treated specially. So first it is needed to fill all time values if some of them are missing, via cifs_query_path_info() call.
There is another issue, opening file in write-mode (needed for changing attributes) is not possible when the file has read-only attribute set. The only option how to clear read-only attribute is via SMB_COM_SETATTR command. And opening directory is not possible neither and here the SMB_COM_SETATTR command is the only option how to change attributes. And CIFSSMBSetFileInfo() does not honor setting read-only attribute, so for setting is also needed to use SMB_COM_SETATTR command.
Existing code in cifs_query_path_info() is already using SMB_COM_GETATTR as a fallback code path (function SMBQueryInformation()), so introduce a new function SMBSetInformation which will implement SMB_COM_SETATTR command.
My testing showed that Windows XP SMB1 client is also using SMB_COM_SETATTR command for setting or clearing read-only attribute against non-NT server. So this can prove that this is the correct way how to do it.
With this change it is possible set all 4 time values and all attributes, including clearing and setting read-only bit on non-NT SMB servers. Tested against Win98 SMB1 server.
This change fixes "touch" command which was failing when called on existing file. And fixes also "chmod +w" and "chmod -w" commands which were also failing (as they are changing read-only attribute).
Note that this change depends on following change "cifs: Improve cifs_query_path_info() and cifs_query_file_info()" as it require to query all 4 time attribute values.
--- fs/smb/client/cifspdu.h | 5 +- fs/smb/client/cifsproto.h | 4 ++ fs/smb/client/cifssmb.c | 57 +++++++++++++++++++ fs/smb/client/smb1ops.c | 112 +++++++++++++++++++++++++++++++++++--- 4 files changed, 166 insertions(+), 12 deletions(-)
fs/smb/client/cifspdu.h +2 -3
@@ -1226,10 +1226,9 @@ typedef struct smb_com_query_information_rsp {typedef struct smb_com_setattr_req {struct smb_hdr hdr;/* wct = 8 */ __le16 attr; -__le16 time_low; -__le16 time_high; +__le32 last_write_time;__le16 reserved[5 ];/* must be zero */ -__u16 ByteCount; +__le16 ByteCount;__u8 BufferFormat;/* 4 = ASCII */ unsigned char fileName[]; } __attribute__((packed))SETATTR_REQ ;
fs/smb/client/cifsproto.h +4 -0
@@ -396,6 +396,10 @@ extern int CIFSSMBQFSUnixInfo(const unsigned int xid, struct cifs_tcon *tcon);extern int CIFSSMBQFSPosixInfo (const unsigned int xid,struct cifs_tcon *tcon,struct kstatfs *FSData); +extern int SMBSetInformation (const unsigned int xid,struct cifs_tcon *tcon, +const char *fileName,__le32 attributes,__le64 write_time, +const struct nls_table *nls_codepage, +struct cifs_sb_info *cifs_sb); extern int CIFSSMBSetPathInfo(const unsigned int xid, struct cifs_tcon *tcon, const char *fileName, const FILE_BASIC_INFO *data, const struct nls_table *nls_codepage,
fs/smb/client/cifssmb.c +57 -0
63 lines not on this page · raw message
fs/smb/client/smb1ops.c +103 -9
149 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 522/626 ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Binding <[email protected]>
[ Upstream commit 02b44a2b2bdcee03cbb92484d31e9ca1b91b2a38 ]
The volume control for cs42l43 speakers has a maximum gain of +31.5 dB. However, for many use cases, this can cause distorted audio, depending various factors, such as other signal-processing elements in the chain, for example if the audio passes through a gain control before reaching the codec or the signal path has been tuned for a particular maximum gain in the codec.
In the case of systems which use the soc_sdw_cs42l43 driver, audio will likely be distorted in all cases above 0 dB, therefore add a volume limit of 128, which is 0 dB maximum volume inside this driver.
--- sound/soc/sdw_utils/soc_sdw_cs42l43.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/soc/sdw_utils/soc_sdw_cs42l43.c +10 -0
@@ -20,6 +20,8 @@#include <sound/soc-dapm.h> #include <sound/soc_sdw_utils.h> +#define CS42L43_SPK_VOLUME_0DB 128/* 0dB Max */ +static const struct snd_soc_dapm_route cs42l43_hs_map[] = { {"Headphone" ,NULL ,"cs42l43 AMP3_OUT" }, {"Headphone" ,NULL ,"cs42l43 AMP4_OUT" },
@@ -117,6 +119,14 @@ int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soreturn -ENOMEM ; } + ret =snd_soc_limit_volume (card,"cs42l43 Speaker Digital Volume" , +CS42L43_SPK_VOLUME_0DB ); +if (ret) +dev_err (card->dev,"cs42l43 speaker volume limit failed: %d\n" , ret); +else +dev_info (card->dev,"Setting CS42L43 Speaker volume limit to %d\n" , +CS42L43_SPK_VOLUME_0DB ); + ret =snd_soc_dapm_add_routes (&card->dapm, cs42l43_spk_map,ARRAY_SIZE (cs42l43_spk_map));if (ret)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 523/626 btrfs: compression: adjust cb->compressed_folios allocation type
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 6f9a8ab796c6528d22de3c504c81fce7dde63d8a ]
In preparation for making the kmalloc() family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)
The assigned type is "struct folio **" but the returned type will be "struct page **". These are the same allocation size (pointer size), but the types don't match. Adjust the allocation type to match the assignment.
--- fs/btrfs/compression.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/compression.c +1 -1
@@ -606,7 +606,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)free_extent_map (em); cb->nr_folios =DIV_ROUND_UP (compressed_len,PAGE_SIZE ); - cb->compressed_folios =kcalloc (cb->nr_folios,sizeof (struct page *),GFP_NOFS ); + cb->compressed_folios =kcalloc (cb->nr_folios,sizeof (struct folio *),GFP_NOFS );if (!cb->compressed_folios) { ret =BLK_STS_RESOURCE ; goto out_free_bio;
Signature · 1 line
2.39.5