diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-06 13:39:53 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-07 16:48:00 -0400 |
commit | 85f27cec5d010d4ac0f4646f11f145d4b3a122e4 (patch) | |
tree | 7c3c7427e1481d34fd652c2a4d3fa307f786f2db /drivers | |
parent | 6022b4cf6b5ba9d63a5888c7bd944e4e1e11b604 (diff) |
gpu: nvgpu: common: vbios: Use new error macros
gk20a_err() and gk20a_warn() require a struct device pointer,
which is not portable across operating systems. The new nvgpu_err()
and nvgpu_warn() macros take struct gk20a pointer. Convert code
to use the more portable macros.
JIRA NVGPU-16
Change-Id: I1a63fbbe21f14f203f10a6abd4c16bcda97db524
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457343
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/common/vbios/bios.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c index b640a761..b84542bf 100644 --- a/drivers/gpu/nvgpu/common/vbios/bios.c +++ b/drivers/gpu/nvgpu/common/vbios/bios.c | |||
@@ -236,7 +236,7 @@ int nvgpu_bios_parse_rom(struct gk20a *g) | |||
236 | 236 | ||
237 | if (pci_rom->sig != PCI_EXP_ROM_SIG && | 237 | if (pci_rom->sig != PCI_EXP_ROM_SIG && |
238 | pci_rom->sig != PCI_EXP_ROM_SIG_NV) { | 238 | pci_rom->sig != PCI_EXP_ROM_SIG_NV) { |
239 | gk20a_err(g->dev, "invalid VBIOS signature"); | 239 | nvgpu_err(g, "invalid VBIOS signature"); |
240 | return -EINVAL; | 240 | return -EINVAL; |
241 | } | 241 | } |
242 | 242 | ||
@@ -338,8 +338,7 @@ static void nvgpu_bios_parse_memory_ptrs(struct gk20a *g, int offset, u8 version | |||
338 | g->bios.mem_strap_xlat_tbl_ptr = v2.mem_strap_xlat_tbl_ptr; | 338 | g->bios.mem_strap_xlat_tbl_ptr = v2.mem_strap_xlat_tbl_ptr; |
339 | return; | 339 | return; |
340 | default: | 340 | default: |
341 | gk20a_err(dev_from_gk20a(g), | 341 | nvgpu_err(g, "unknown vbios memory table version %x", version); |
342 | "unknown vbios memory table version %x", version); | ||
343 | return; | 342 | return; |
344 | } | 343 | } |
345 | } | 344 | } |
@@ -467,7 +466,7 @@ static int nvgpu_bios_parse_falcon_ucode_table(struct gk20a *g, int offset) | |||
467 | g->bios.expansion_rom_offset); | 466 | g->bios.expansion_rom_offset); |
468 | 467 | ||
469 | if (err) | 468 | if (err) |
470 | gk20a_err(dev_from_gk20a(g), | 469 | nvgpu_err(g, |
471 | "could not parse devinit ucode desc"); | 470 | "could not parse devinit ucode desc"); |
472 | } else if (entry.target_id == TARGET_ID_PMU && | 471 | } else if (entry.target_id == TARGET_ID_PMU && |
473 | entry.application_id == APPLICATION_ID_PRE_OS) { | 472 | entry.application_id == APPLICATION_ID_PRE_OS) { |
@@ -482,7 +481,7 @@ static int nvgpu_bios_parse_falcon_ucode_table(struct gk20a *g, int offset) | |||
482 | g->bios.expansion_rom_offset); | 481 | g->bios.expansion_rom_offset); |
483 | 482 | ||
484 | if (err) | 483 | if (err) |
485 | gk20a_err(dev_from_gk20a(g), | 484 | nvgpu_err(g, |
486 | "could not parse preos ucode desc"); | 485 | "could not parse preos ucode desc"); |
487 | } | 486 | } |
488 | 487 | ||
@@ -508,8 +507,7 @@ static void nvgpu_bios_parse_falcon_data_v2(struct gk20a *g, int offset) | |||
508 | g->bios.expansion_rom_offset); | 507 | g->bios.expansion_rom_offset); |
509 | 508 | ||
510 | if (err) | 509 | if (err) |
511 | gk20a_err(dev_from_gk20a(g), | 510 | nvgpu_err(g, "could not parse falcon ucode table"); |
512 | "could not parse falcon ucode table"); | ||
513 | } | 511 | } |
514 | 512 | ||
515 | void *nvgpu_bios_get_perf_table_ptrs(struct gk20a *g, | 513 | void *nvgpu_bios_get_perf_table_ptrs(struct gk20a *g, |
@@ -552,10 +550,10 @@ void *nvgpu_bios_get_perf_table_ptrs(struct gk20a *g, | |||
552 | perf_table_ptr = | 550 | perf_table_ptr = |
553 | &g->bios.data[perf_table_id_offset]; | 551 | &g->bios.data[perf_table_id_offset]; |
554 | } else | 552 | } else |
555 | gk20a_warn(g->dev, "PERF TABLE ID %d is NULL", | 553 | nvgpu_warn(g, "PERF TABLE ID %d is NULL", |
556 | table_id); | 554 | table_id); |
557 | } else | 555 | } else |
558 | gk20a_warn(g->dev, "INVALID PERF TABLE ID - %d ", table_id); | 556 | nvgpu_warn(g, "INVALID PERF TABLE ID - %d ", table_id); |
559 | 557 | ||
560 | return (void *)perf_table_ptr; | 558 | return (void *)perf_table_ptr; |
561 | } | 559 | } |
@@ -746,7 +744,7 @@ int nvgpu_bios_execute_script(struct gk20a *g, u32 offset) | |||
746 | break; | 744 | break; |
747 | 745 | ||
748 | default: | 746 | default: |
749 | gk20a_err(dev_from_gk20a(g), "opcode: 0x%02x", opcode); | 747 | nvgpu_err(g, "opcode: 0x%02x", opcode); |
750 | end = true; | 748 | end = true; |
751 | status = -EINVAL; | 749 | status = -EINVAL; |
752 | break; | 750 | break; |