Skip to content

Commit 4c74635

Browse files
YiPeng Chaialexdeucher
YiPeng Chai
authored and
alexdeucher
committed
drm/amd/ras: Update ras command context structure name
According to the actual usage of this structure, it is more appropriate to call it context, the structure name with ioctl is easy to cause misunderstanding. V2: Update commit message content. Signed-off-by: YiPeng Chai <YiPeng.Chai@amd.com> Reviewed-by: Tao Zhou <tao.zhou1@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 7ce9d9c commit 4c74635

4 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#define AMDGPU_RAS_TYPE_VF 0x3
3838

3939
static int amdgpu_ras_query_interface_info(struct ras_core_context *ras_core,
40-
struct ras_cmd_ioctl *cmd)
40+
struct ras_cmd_ctx *cmd)
4141
{
4242
struct amdgpu_device *adev = (struct amdgpu_device *)ras_core->dev;
4343
struct ras_query_interface_info_rsp *output_data =
@@ -77,7 +77,7 @@ static struct ras_core_context *ras_cmd_get_ras_core(uint64_t dev_handle)
7777
}
7878

7979
static int amdgpu_ras_get_devices_info(struct ras_core_context *ras_core,
80-
struct ras_cmd_ioctl *cmd)
80+
struct ras_cmd_ctx *cmd)
8181
{
8282
struct amdgpu_device *adev = (struct amdgpu_device *)ras_core->dev;
8383
struct ras_cmd_devices_info_rsp *output_data =
@@ -146,7 +146,7 @@ static uint64_t local_addr_to_xgmi_global_addr(struct ras_core_context *ras_core
146146
}
147147

148148
static int amdgpu_ras_inject_error(struct ras_core_context *ras_core,
149-
struct ras_cmd_ioctl *cmd, void *data)
149+
struct ras_cmd_ctx *cmd, void *data)
150150
{
151151
struct amdgpu_device *adev = (struct amdgpu_device *)ras_core->dev;
152152
struct ras_cmd_inject_error_req *req =
@@ -189,7 +189,7 @@ static int amdgpu_ras_inject_error(struct ras_core_context *ras_core,
189189
}
190190

191191
static int amdgpu_ras_get_ras_safe_fb_addr_ranges(struct ras_core_context *ras_core,
192-
struct ras_cmd_ioctl *cmd, void *data)
192+
struct ras_cmd_ctx *cmd, void *data)
193193
{
194194
struct amdgpu_device *adev = (struct amdgpu_device *)ras_core->dev;
195195
struct ras_cmd_dev_handle *input_data =
@@ -259,7 +259,7 @@ static int ras_translate_fb_address(struct ras_core_context *ras_core,
259259
}
260260

261261
static int amdgpu_ras_translate_fb_address(struct ras_core_context *ras_core,
262-
struct ras_cmd_ioctl *cmd, void *data)
262+
struct ras_cmd_ctx *cmd, void *data)
263263
{
264264
struct ras_cmd_translate_fb_address_req *req_buff =
265265
(struct ras_cmd_translate_fb_address_req *)cmd->input_buff_raw;
@@ -291,7 +291,7 @@ static struct ras_cmd_func_map amdgpu_ras_cmd_maps[] = {
291291
{RAS_CMD__TRANSLATE_FB_ADDRESS, amdgpu_ras_translate_fb_address},
292292
};
293293

294-
int amdgpu_ras_handle_cmd(struct ras_core_context *ras_core, struct ras_cmd_ioctl *cmd, void *data)
294+
int amdgpu_ras_handle_cmd(struct ras_core_context *ras_core, struct ras_cmd_ctx *cmd, void *data)
295295
{
296296
struct ras_cmd_func_map *ras_cmd = NULL;
297297
int i, res;
@@ -314,7 +314,7 @@ int amdgpu_ras_handle_cmd(struct ras_core_context *ras_core, struct ras_cmd_ioct
314314
int amdgpu_ras_cmd_ioctl_handler(struct ras_core_context *ras_core,
315315
uint8_t *cmd_buf, uint32_t buf_size)
316316
{
317-
struct ras_cmd_ioctl *cmd = (struct ras_cmd_ioctl *)cmd_buf;
317+
struct ras_cmd_ctx *cmd = (struct ras_cmd_ctx *)cmd_buf;
318318
struct ras_core_context *cmd_core = NULL;
319319
struct ras_cmd_dev_handle *cmd_handle = NULL;
320320
int timeout = 60;

‎drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct ras_cmd_translate_memory_fd_rsp {
4848
};
4949

5050
int amdgpu_ras_handle_cmd(struct ras_core_context *ras_core,
51-
struct ras_cmd_ioctl *cmd, void *data);
51+
struct ras_cmd_ctx *cmd, void *data);
5252
int amdgpu_ras_cmd_ioctl_handler(struct ras_core_context *ras_core,
5353
uint8_t *cmd_buf, uint32_t buf_size);
5454

‎drivers/gpu/drm/amd/ras/rascore/ras_cmd.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static int ras_cmd_remove_device(struct ras_core_context *ras_core)
4343
}
4444

4545
static int ras_get_block_ecc_info(struct ras_core_context *ras_core,
46-
struct ras_cmd_ioctl *cmd, void *data)
46+
struct ras_cmd_ctx *cmd, void *data)
4747
{
4848
struct ras_cmd_block_ecc_info_req *input_data =
4949
(struct ras_cmd_block_ecc_info_req *)cmd->input_buff_raw;
@@ -119,7 +119,7 @@ static int ras_cmd_get_group_bad_pages(struct ras_core_context *ras_core,
119119
}
120120

121121
static int ras_cmd_get_bad_pages(struct ras_core_context *ras_core,
122-
struct ras_cmd_ioctl *cmd, void *data)
122+
struct ras_cmd_ctx *cmd, void *data)
123123
{
124124
struct ras_cmd_bad_pages_info_req *input_data =
125125
(struct ras_cmd_bad_pages_info_req *)cmd->input_buff_raw;
@@ -141,7 +141,7 @@ static int ras_cmd_get_bad_pages(struct ras_core_context *ras_core,
141141
}
142142

143143
static int ras_cmd_clear_bad_page_info(struct ras_core_context *ras_core,
144-
struct ras_cmd_ioctl *cmd, void *data)
144+
struct ras_cmd_ctx *cmd, void *data)
145145
{
146146
if (cmd->input_size != sizeof(struct ras_cmd_dev_handle))
147147
return RAS_CMD__ERROR_INVALID_INPUT_SIZE;
@@ -156,7 +156,7 @@ static int ras_cmd_clear_bad_page_info(struct ras_core_context *ras_core,
156156
}
157157

158158
static int ras_cmd_reset_all_error_counts(struct ras_core_context *ras_core,
159-
struct ras_cmd_ioctl *cmd, void *data)
159+
struct ras_cmd_ctx *cmd, void *data)
160160
{
161161
if (cmd->input_size != sizeof(struct ras_cmd_dev_handle))
162162
return RAS_CMD__ERROR_INVALID_INPUT_SIZE;
@@ -171,7 +171,7 @@ static int ras_cmd_reset_all_error_counts(struct ras_core_context *ras_core,
171171
}
172172

173173
static int ras_cmd_get_cper_snapshot(struct ras_core_context *ras_core,
174-
struct ras_cmd_ioctl *cmd, void *data)
174+
struct ras_cmd_ctx *cmd, void *data)
175175
{
176176
struct ras_cmd_cper_snapshot_rsp *output_data =
177177
(struct ras_cmd_cper_snapshot_rsp *)cmd->output_buff_raw;
@@ -193,7 +193,7 @@ static int ras_cmd_get_cper_snapshot(struct ras_core_context *ras_core,
193193
}
194194

195195
static int ras_cmd_get_cper_records(struct ras_core_context *ras_core,
196-
struct ras_cmd_ioctl *cmd, void *data)
196+
struct ras_cmd_ctx *cmd, void *data)
197197
{
198198
struct ras_cmd_cper_record_req *req =
199199
(struct ras_cmd_cper_record_req *)cmd->input_buff_raw;
@@ -253,7 +253,7 @@ static int ras_cmd_get_cper_records(struct ras_core_context *ras_core,
253253
}
254254

255255
static int ras_cmd_get_batch_trace_snapshot(struct ras_core_context *ras_core,
256-
struct ras_cmd_ioctl *cmd, void *data)
256+
struct ras_cmd_ctx *cmd, void *data)
257257
{
258258
struct ras_cmd_batch_trace_snapshot_rsp *rsp =
259259
(struct ras_cmd_batch_trace_snapshot_rsp *)cmd->output_buff_raw;
@@ -275,7 +275,7 @@ static int ras_cmd_get_batch_trace_snapshot(struct ras_core_context *ras_core,
275275
}
276276

277277
static int ras_cmd_get_batch_trace_records(struct ras_core_context *ras_core,
278-
struct ras_cmd_ioctl *cmd, void *data)
278+
struct ras_cmd_ctx *cmd, void *data)
279279
{
280280
struct ras_cmd_batch_trace_record_req *input_data =
281281
(struct ras_cmd_batch_trace_record_req *)cmd->input_buff_raw;
@@ -400,7 +400,7 @@ static enum ras_ta_error_type __get_ras_ta_err_type(enum ras_ecc_err_type error)
400400
}
401401

402402
static int ras_cmd_inject_error(struct ras_core_context *ras_core,
403-
struct ras_cmd_ioctl *cmd, void *data)
403+
struct ras_cmd_ctx *cmd, void *data)
404404
{
405405
struct ras_cmd_inject_error_req *req =
406406
(struct ras_cmd_inject_error_req *)cmd->input_buff_raw;
@@ -441,7 +441,7 @@ static struct ras_cmd_func_map ras_cmd_maps[] = {
441441
};
442442

443443
int rascore_handle_cmd(struct ras_core_context *ras_core,
444-
struct ras_cmd_ioctl *cmd, void *data)
444+
struct ras_cmd_ctx *cmd, void *data)
445445
{
446446
struct ras_cmd_func_map *ras_cmd = NULL;
447447
int i;

‎drivers/gpu/drm/amd/ras/rascore/ras_cmd.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ enum ras_error_type {
101101
};
102102

103103
struct ras_core_context;
104-
struct ras_cmd_ioctl;
104+
struct ras_cmd_ctx;
105105

106106
struct ras_cmd_mgr {
107107
struct list_head head;
@@ -112,7 +112,7 @@ struct ras_cmd_mgr {
112112
struct ras_cmd_func_map {
113113
uint32_t cmd_id;
114114
int (*func)(struct ras_core_context *ras_core,
115-
struct ras_cmd_ioctl *cmd, void *data);
115+
struct ras_cmd_ctx *cmd, void *data);
116116
};
117117

118118
struct ras_device_bdf {
@@ -133,7 +133,7 @@ struct ras_cmd_param {
133133
};
134134

135135
#pragma pack(push, 8)
136-
struct ras_cmd_ioctl {
136+
struct ras_cmd_ctx {
137137
uint32_t magic;
138138
union {
139139
struct {
@@ -414,7 +414,7 @@ struct ras_cmd_batch_trace_record_rsp {
414414

415415
int ras_cmd_init(struct ras_core_context *ras_core);
416416
int ras_cmd_fini(struct ras_core_context *ras_core);
417-
int rascore_handle_cmd(struct ras_core_context *ras_core, struct ras_cmd_ioctl *cmd, void *data);
417+
int rascore_handle_cmd(struct ras_core_context *ras_core, struct ras_cmd_ctx *cmd, void *data);
418418
uint64_t ras_cmd_get_dev_handle(struct ras_core_context *ras_core);
419419
int ras_cmd_query_interface_info(struct ras_core_context *ras_core,
420420
struct ras_query_interface_info_rsp *rsp);

0 commit comments

Comments
 (0)