mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-24 18:15:54 -04:00
drm/amdgpu: guard zero divisors in soc_v1_0 partition code
Abort driver load when num_mem_partitions is zero since operation is unreliable without valid memory partition info. Skip absent resources in soc_v1_0_get_xcp_res_info() to avoid divide-by-zero on firmware- reported zero instance counts. v2: Remove redundant checks (Lijo) v3: Return error instead when num_mem_partitions is zero (Lijo) Signed-off-by: Asad Kamal <asad.kamal@amd.com> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
@@ -1761,10 +1761,15 @@ int amdgpu_gmc_init_mem_ranges(struct amdgpu_device *adev)
|
||||
valid = true;
|
||||
else
|
||||
valid = amdgpu_gmc_validate_partition_info(adev);
|
||||
if (!valid) {
|
||||
/* TODO: handle invalid case */
|
||||
if (!valid)
|
||||
dev_warn(adev->dev,
|
||||
"Mem ranges not matching with hardware config\n");
|
||||
|
||||
if (!adev->gmc.num_mem_partitions) {
|
||||
dev_err(adev->dev, "num_mem_partitions is zero\n");
|
||||
kfree(adev->gmc.mem_partitions);
|
||||
adev->gmc.mem_partitions = NULL;
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -600,8 +600,10 @@ static int soc_v1_0_get_xcp_res_info(struct amdgpu_xcp_mgr *xcp_mgr,
|
||||
xcp_cfg->num_res = ARRAY_SIZE(max_res);
|
||||
|
||||
for (i = 0; i < xcp_cfg->num_res; i++) {
|
||||
res_lt_xcp = max_res[i] < num_xcp;
|
||||
xcp_cfg->xcp_res[i].id = i;
|
||||
if (!max_res[i])
|
||||
continue;
|
||||
res_lt_xcp = max_res[i] < num_xcp;
|
||||
xcp_cfg->xcp_res[i].num_inst =
|
||||
res_lt_xcp ? 1 : max_res[i] / num_xcp;
|
||||
xcp_cfg->xcp_res[i].num_inst =
|
||||
|
||||
Reference in New Issue
Block a user