ras context might be NULL, so move con->h_data after check !con
also fix sizeof wrong type while at it.
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
data->inject.value = value;
}
} else {
data->inject.value = value;
}
} else {
- if (size < sizeof(data))
+ if (size < sizeof(*data))
return -EINVAL;
if (copy_from_user(data, buf, sizeof(*data)))
return -EINVAL;
if (copy_from_user(data, buf, sizeof(*data)))
unsigned long *bps, int pages)
{
struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
unsigned long *bps, int pages)
{
struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
- struct ras_err_handler_data *data = con->eh_data;
+ struct ras_err_handler_data *data;
int i = pages;
int ret = 0;
int i = pages;
int ret = 0;
- if (!con || !data || !bps || pages <= 0)
+ if (!con || !con->eh_data || !bps || pages <= 0)
return 0;
mutex_lock(&con->recovery_lock);
return 0;
mutex_lock(&con->recovery_lock);
int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev)
{
struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev)
{
struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
- struct ras_err_handler_data *data = con->eh_data;
+ struct ras_err_handler_data *data;
uint64_t bp;
struct amdgpu_bo *bo;
int i;
uint64_t bp;
struct amdgpu_bo *bo;
int i;
+ if (!con || !con->eh_data)
return 0;
mutex_lock(&con->recovery_lock);
return 0;
mutex_lock(&con->recovery_lock);
+ data = con->eh_data;
+ if (!data)
+ goto out;
/* reserve vram at driver post stage. */
for (i = data->last_reserved; i < data->count; i++) {
bp = data->bps[i].bp;
/* reserve vram at driver post stage. */
for (i = data->last_reserved; i < data->count; i++) {
bp = data->bps[i].bp;
data->bps[i].bo = bo;
data->last_reserved = i + 1;
}
data->bps[i].bo = bo;
data->last_reserved = i + 1;
}
mutex_unlock(&con->recovery_lock);
return 0;
}
mutex_unlock(&con->recovery_lock);
return 0;
}
static int amdgpu_ras_release_bad_pages(struct amdgpu_device *adev)
{
struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
static int amdgpu_ras_release_bad_pages(struct amdgpu_device *adev)
{
struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
- struct ras_err_handler_data *data = con->eh_data;
+ struct ras_err_handler_data *data;
struct amdgpu_bo *bo;
int i;
struct amdgpu_bo *bo;
int i;
+ if (!con || !con->eh_data)
return 0;
mutex_lock(&con->recovery_lock);
return 0;
mutex_lock(&con->recovery_lock);
+ data = con->eh_data;
+ if (!data)
+ goto out;
+
for (i = data->last_reserved - 1; i >= 0; i--) {
bo = data->bps[i].bo;
for (i = data->last_reserved - 1; i >= 0; i--) {
bo = data->bps[i].bo;
data->bps[i].bo = bo;
data->last_reserved = i;
}
data->bps[i].bo = bo;
data->last_reserved = i;
}
mutex_unlock(&con->recovery_lock);
return 0;
}
mutex_unlock(&con->recovery_lock);
return 0;
}