Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v6.8 2024-01-05T21:10:43Z 2024-01-05T21:10:43Z Srinivasan Shanmugam srinivasan.shanmugam@amd.com 2024-01-03T16:35:16Z urn:sha1:4f32504a2f85a7b40fe149436881381f48e9c0c0 Fixes the below: drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c:377 amdgpu_mca_smu_get_mca_entry() warn: variable dereferenced before check 'mca_funcs' (see line 368) 357 int amdgpu_mca_smu_get_mca_entry(struct amdgpu_device *adev, enum amdgpu_mca_error_type type, 358 int idx, struct mca_bank_entry *entry) 359 { 360 const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; 361 int count; 362 363 switch (type) { 364 case AMDGPU_MCA_ERROR_TYPE_UE: 365 count = mca_funcs->max_ue_count; mca_funcs is dereferenced here. 366 break; 367 case AMDGPU_MCA_ERROR_TYPE_CE: 368 count = mca_funcs->max_ce_count; mca_funcs is dereferenced here. 369 break; 370 default: 371 return -EINVAL; 372 } 373 374 if (idx >= count) 375 return -EINVAL; 376 377 if (mca_funcs && mca_funcs->mca_get_mca_entry) ^^^^^^^^^ Checked too late! Cc: Yang Wang <kevinyang.wang@amd.com> Cc: Hawking Zhang <Hawking.Zhang@amd.com> Cc: Christian König <christian.koenig@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com> Reviewed-by: Yang Wang <kevinyang.wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-12-19T19:59:03Z YiPeng Chai YiPeng.Chai@amd.com 2023-12-12T09:26:58Z urn:sha1:9f91e983ee82d3b6f6d713e1c84ebb8d53180b3d MCA supports recording umc address information. V2: Move err_addr variable from struct ras_err_node to struct ras_err_info. Signed-off-by: YiPeng Chai <YiPeng.Chai@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-11-30T23:26:22Z Yang Wang kevinyang.wang@amd.com 2023-11-30T04:58:14Z urn:sha1:00f9d49bce844e8196e0c2ea298f9a41a11129d9 Use amdgpu_ip_version() helper function to check ip version. The ip version contains other information, use the helper function to avoid reading wrong value. Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Yang Wang <kevinyang.wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-11-29T21:49:01Z Lijo Lazar lijo.lazar@amd.com 2023-11-09T05:20:38Z urn:sha1:201761b5eb57c3fad810cde555795c3b5721a031 Refactor code such that ras block decides the default mca debug mode, and not swsmu block. By default mca debug mode is set to false. v2: squash in uninitialized value fix (Alex) Signed-off-by: Lijo Lazar <lijo.lazar@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-11-09T22:02:32Z Yang Wang kevinyang.wang@amd.com 2023-11-08T12:35:52Z urn:sha1:8140b07b0a69a7e8d5d764237c68af7942c4bfdd avoid driver to touch invalid mca reg. Signed-off-by: Yang Wang <kevinyang.wang@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-11-09T22:02:26Z Hawking Zhang Hawking.Zhang@amd.com 2023-11-08T09:08:49Z urn:sha1:d406aec8dc2a001d4a91f786b525b3b4ea7fa1ef So driver doesn't touch invalid aca entries. Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> Reviewed-by: Yang Wang <kevinyang.wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-11-09T22:01:51Z Yang Wang kevinyang.wang@amd.com 2023-11-02T06:17:04Z urn:sha1:07c1db70364671eea4e84befe43ac91941153a43 refine smu mca driver to support query ras error from pmfw path. - correct gfx smu bank hwid (from mp5 to smu bank) - retire unused callback function in amdgpu_mca_smu_funcs{} - add new mca_bank_set{} structure to collect mca bank - move enum mca_reg_idx into amdgpu_mca.h header - add mca status register field decode macro Signed-off-by: Yang Wang <kevinyang.wang@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-09-20T16:25:19Z Yang Wang kevinyang.wang@amd.com 2023-09-06T04:37:14Z urn:sha1:4051844c6616c0bf33dd16342967ea5b931746ae add amdgpu mca debug sysfs support. Signed-off-by: Yang Wang <kevinyang.wang@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-09-20T16:25:01Z Yang Wang kevinyang.wang@amd.com 2023-09-05T03:39:10Z urn:sha1:7ff607e27233861b3f83e658317b3fb18b047229 add amdgpu smu mca dump feature support. Signed-off-by: Yang Wang <kevinyang.wang@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> 2023-03-15T22:45:26Z Hawking Zhang Hawking.Zhang@amd.com 2023-03-15T00:59:04Z urn:sha1:7f544c5488cf5bc94b379de750e08fa3e146b6ba To align with other IP blocks Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> Reviewed-by: Stanley Yang <Stanley.Yang@amd.com> Reviewed-by: Tao Zhou <tao.zhou1@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>