Skip to content

Commit 964234a

Browse files
KobyElbazogabbay
authored andcommitted
accel/habanalabs: rename security functions related arguments
Make the argument names specify the registers array represent registers that should be unsecured so the user can access them. Signed-off-by: Koby Elbaz <kelbaz@habana.ai> Reviewed-by: Oded Gabbay <ogabbay@kernel.org> Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
1 parent 9ec7639 commit 964234a

1 file changed

Lines changed: 29 additions & 28 deletions

File tree

drivers/accel/habanalabs/common/security.c

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -284,14 +284,14 @@ void hl_secure_block(struct hl_device *hdev,
284284
* @instance_offset: offset between instances
285285
* @pb_blocks: blocks array
286286
* @blocks_array_size: blocks array size
287-
* @regs_array: register array
288-
* @regs_array_size: register array size
287+
* @user_regs_array: unsecured register array
288+
* @user_regs_array_size: unsecured register array size
289289
* @mask: enabled instances mask: 1- enabled, 0- disabled
290290
*/
291291
int hl_init_pb_with_mask(struct hl_device *hdev, u32 num_dcores,
292292
u32 dcore_offset, u32 num_instances, u32 instance_offset,
293293
const u32 pb_blocks[], u32 blocks_array_size,
294-
const u32 *regs_array, u32 regs_array_size, u64 mask)
294+
const u32 *user_regs_array, u32 user_regs_array_size, u64 mask)
295295
{
296296
int i, j;
297297
struct hl_block_glbl_sec *glbl_sec;
@@ -303,8 +303,8 @@ int hl_init_pb_with_mask(struct hl_device *hdev, u32 num_dcores,
303303
return -ENOMEM;
304304

305305
hl_secure_block(hdev, glbl_sec, blocks_array_size);
306-
hl_unsecure_registers(hdev, regs_array, regs_array_size, 0, pb_blocks,
307-
glbl_sec, blocks_array_size);
306+
hl_unsecure_registers(hdev, user_regs_array, user_regs_array_size, 0,
307+
pb_blocks, glbl_sec, blocks_array_size);
308308

309309
/* Fill all blocks with the same configuration */
310310
for (i = 0 ; i < num_dcores ; i++) {
@@ -336,19 +336,19 @@ int hl_init_pb_with_mask(struct hl_device *hdev, u32 num_dcores,
336336
* @instance_offset: offset between instances
337337
* @pb_blocks: blocks array
338338
* @blocks_array_size: blocks array size
339-
* @regs_array: register array
340-
* @regs_array_size: register array size
339+
* @user_regs_array: unsecured register array
340+
* @user_regs_array_size: unsecured register array size
341341
*
342342
*/
343343
int hl_init_pb(struct hl_device *hdev, u32 num_dcores, u32 dcore_offset,
344344
u32 num_instances, u32 instance_offset,
345345
const u32 pb_blocks[], u32 blocks_array_size,
346-
const u32 *regs_array, u32 regs_array_size)
346+
const u32 *user_regs_array, u32 user_regs_array_size)
347347
{
348348
return hl_init_pb_with_mask(hdev, num_dcores, dcore_offset,
349349
num_instances, instance_offset, pb_blocks,
350-
blocks_array_size, regs_array, regs_array_size,
351-
ULLONG_MAX);
350+
blocks_array_size, user_regs_array,
351+
user_regs_array_size, ULLONG_MAX);
352352
}
353353

354354
/**
@@ -364,15 +364,15 @@ int hl_init_pb(struct hl_device *hdev, u32 num_dcores, u32 dcore_offset,
364364
* @instance_offset: offset between instances
365365
* @pb_blocks: blocks array
366366
* @blocks_array_size: blocks array size
367-
* @regs_range_array: register range array
368-
* @regs_range_array_size: register range array size
367+
* @user_regs_range_array: unsecured register range array
368+
* @user_regs_range_array_size: unsecured register range array size
369369
* @mask: enabled instances mask: 1- enabled, 0- disabled
370370
*/
371371
int hl_init_pb_ranges_with_mask(struct hl_device *hdev, u32 num_dcores,
372372
u32 dcore_offset, u32 num_instances, u32 instance_offset,
373373
const u32 pb_blocks[], u32 blocks_array_size,
374-
const struct range *regs_range_array, u32 regs_range_array_size,
375-
u64 mask)
374+
const struct range *user_regs_range_array,
375+
u32 user_regs_range_array_size, u64 mask)
376376
{
377377
int i, j, rc = 0;
378378
struct hl_block_glbl_sec *glbl_sec;
@@ -384,8 +384,8 @@ int hl_init_pb_ranges_with_mask(struct hl_device *hdev, u32 num_dcores,
384384
return -ENOMEM;
385385

386386
hl_secure_block(hdev, glbl_sec, blocks_array_size);
387-
rc = hl_unsecure_registers_range(hdev, regs_range_array,
388-
regs_range_array_size, 0, pb_blocks, glbl_sec,
387+
rc = hl_unsecure_registers_range(hdev, user_regs_range_array,
388+
user_regs_range_array_size, 0, pb_blocks, glbl_sec,
389389
blocks_array_size);
390390
if (rc)
391391
goto free_glbl_sec;
@@ -422,19 +422,20 @@ int hl_init_pb_ranges_with_mask(struct hl_device *hdev, u32 num_dcores,
422422
* @instance_offset: offset between instances
423423
* @pb_blocks: blocks array
424424
* @blocks_array_size: blocks array size
425-
* @regs_range_array: register range array
426-
* @regs_range_array_size: register range array size
425+
* @user_regs_range_array: unsecured register range array
426+
* @user_regs_range_array_size: unsecured register range array size
427427
*
428428
*/
429429
int hl_init_pb_ranges(struct hl_device *hdev, u32 num_dcores,
430430
u32 dcore_offset, u32 num_instances, u32 instance_offset,
431431
const u32 pb_blocks[], u32 blocks_array_size,
432-
const struct range *regs_range_array, u32 regs_range_array_size)
432+
const struct range *user_regs_range_array,
433+
u32 user_regs_range_array_size)
433434
{
434435
return hl_init_pb_ranges_with_mask(hdev, num_dcores, dcore_offset,
435436
num_instances, instance_offset, pb_blocks,
436-
blocks_array_size, regs_range_array,
437-
regs_range_array_size, ULLONG_MAX);
437+
blocks_array_size, user_regs_range_array,
438+
user_regs_range_array_size, ULLONG_MAX);
438439
}
439440

440441
/**
@@ -447,14 +448,14 @@ int hl_init_pb_ranges(struct hl_device *hdev, u32 num_dcores,
447448
* @instance_offset: offset between instances
448449
* @pb_blocks: blocks array
449450
* @blocks_array_size: blocks array size
450-
* @regs_array: register array
451-
* @regs_array_size: register array size
451+
* @user_regs_array: unsecured register array
452+
* @user_regs_array_size: unsecured register array size
452453
*
453454
*/
454455
int hl_init_pb_single_dcore(struct hl_device *hdev, u32 dcore_offset,
455456
u32 num_instances, u32 instance_offset,
456457
const u32 pb_blocks[], u32 blocks_array_size,
457-
const u32 *regs_array, u32 regs_array_size)
458+
const u32 *user_regs_array, u32 user_regs_array_size)
458459
{
459460
int i, rc = 0;
460461
struct hl_block_glbl_sec *glbl_sec;
@@ -466,8 +467,8 @@ int hl_init_pb_single_dcore(struct hl_device *hdev, u32 dcore_offset,
466467
return -ENOMEM;
467468

468469
hl_secure_block(hdev, glbl_sec, blocks_array_size);
469-
rc = hl_unsecure_registers(hdev, regs_array, regs_array_size, 0,
470-
pb_blocks, glbl_sec, blocks_array_size);
470+
rc = hl_unsecure_registers(hdev, user_regs_array, user_regs_array_size,
471+
0, pb_blocks, glbl_sec, blocks_array_size);
471472
if (rc)
472473
goto free_glbl_sec;
473474

@@ -495,8 +496,8 @@ int hl_init_pb_single_dcore(struct hl_device *hdev, u32 dcore_offset,
495496
* @instance_offset: offset between instances
496497
* @pb_blocks: blocks array
497498
* @blocks_array_size: blocks array size
498-
* @user_regs_range_array: register range array
499-
* @user_regs_range_array_size: register range array size
499+
* @user_regs_range_array: unsecured register range array
500+
* @user_regs_range_array_size: unsecured register range array size
500501
*
501502
*/
502503
int hl_init_pb_ranges_single_dcore(struct hl_device *hdev, u32 dcore_offset,

0 commit comments

Comments
 (0)