diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/vbios')
-rw-r--r-- | drivers/gpu/nvgpu/common/vbios/bios.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c index 52c0a798..01f9262c 100644 --- a/drivers/gpu/nvgpu/common/vbios/bios.c +++ b/drivers/gpu/nvgpu/common/vbios/bios.c | |||
@@ -296,7 +296,7 @@ int nvgpu_bios_parse_rom(struct gk20a *g) | |||
296 | struct pci_ext_data_struct *pci_ext_data; | 296 | struct pci_ext_data_struct *pci_ext_data; |
297 | 297 | ||
298 | pci_rom = (struct pci_exp_rom *)&g->bios.data[offset]; | 298 | pci_rom = (struct pci_exp_rom *)&g->bios.data[offset]; |
299 | gk20a_dbg_fn("pci rom sig %04x ptr %04x block %x", | 299 | nvgpu_log_fn(g, "pci rom sig %04x ptr %04x block %x", |
300 | pci_rom->sig, pci_rom->pci_data_struct_ptr, | 300 | pci_rom->sig, pci_rom->pci_data_struct_ptr, |
301 | pci_rom->size_of_block); | 301 | pci_rom->size_of_block); |
302 | 302 | ||
@@ -309,7 +309,7 @@ int nvgpu_bios_parse_rom(struct gk20a *g) | |||
309 | pci_data = | 309 | pci_data = |
310 | (struct pci_data_struct *) | 310 | (struct pci_data_struct *) |
311 | &g->bios.data[offset + pci_rom->pci_data_struct_ptr]; | 311 | &g->bios.data[offset + pci_rom->pci_data_struct_ptr]; |
312 | gk20a_dbg_fn("pci data sig %08x len %d image len %x type %x last %d max %08x", | 312 | nvgpu_log_fn(g, "pci data sig %08x len %d image len %x type %x last %d max %08x", |
313 | pci_data->sig, pci_data->pci_data_struct_len, | 313 | pci_data->sig, pci_data->pci_data_struct_len, |
314 | pci_data->image_len, pci_data->code_type, | 314 | pci_data->image_len, pci_data->code_type, |
315 | pci_data->last_image, | 315 | pci_data->last_image, |
@@ -322,7 +322,7 @@ int nvgpu_bios_parse_rom(struct gk20a *g) | |||
322 | pci_data->pci_data_struct_len + | 322 | pci_data->pci_data_struct_len + |
323 | 0xf) | 323 | 0xf) |
324 | & ~0xf]; | 324 | & ~0xf]; |
325 | gk20a_dbg_fn("pci ext data sig %08x rev %x len %x sub_image_len %x priv_last %d flags %x", | 325 | nvgpu_log_fn(g, "pci ext data sig %08x rev %x len %x sub_image_len %x priv_last %d flags %x", |
326 | pci_ext_data->sig, | 326 | pci_ext_data->sig, |
327 | pci_ext_data->nv_pci_data_ext_rev, | 327 | pci_ext_data->nv_pci_data_ext_rev, |
328 | pci_ext_data->nv_pci_data_ext_len, | 328 | pci_ext_data->nv_pci_data_ext_len, |
@@ -330,7 +330,7 @@ int nvgpu_bios_parse_rom(struct gk20a *g) | |||
330 | pci_ext_data->priv_last_image, | 330 | pci_ext_data->priv_last_image, |
331 | pci_ext_data->flags); | 331 | pci_ext_data->flags); |
332 | 332 | ||
333 | gk20a_dbg_fn("expansion rom offset %x", | 333 | nvgpu_log_fn(g, "expansion rom offset %x", |
334 | pci_data->image_len * 512); | 334 | pci_data->image_len * 512); |
335 | g->bios.expansion_rom_offset = | 335 | g->bios.expansion_rom_offset = |
336 | pci_data->image_len * 512; | 336 | pci_data->image_len * 512; |
@@ -342,7 +342,7 @@ int nvgpu_bios_parse_rom(struct gk20a *g) | |||
342 | } | 342 | } |
343 | } | 343 | } |
344 | 344 | ||
345 | gk20a_dbg_info("read bios"); | 345 | nvgpu_log_info(g, "read bios"); |
346 | for (i = 0; i < g->bios.size - 6; i++) { | 346 | for (i = 0; i < g->bios.size - 6; i++) { |
347 | if (nvgpu_bios_rdu16(g, i) == BIT_HEADER_ID && | 347 | if (nvgpu_bios_rdu16(g, i) == BIT_HEADER_ID && |
348 | nvgpu_bios_rdu32(g, i+2) == BIT_HEADER_SIGNATURE) { | 348 | nvgpu_bios_rdu32(g, i+2) == BIT_HEADER_SIGNATURE) { |
@@ -362,7 +362,7 @@ static void nvgpu_bios_parse_biosdata(struct gk20a *g, int offset) | |||
362 | struct biosdata biosdata; | 362 | struct biosdata biosdata; |
363 | 363 | ||
364 | memcpy(&biosdata, &g->bios.data[offset], sizeof(biosdata)); | 364 | memcpy(&biosdata, &g->bios.data[offset], sizeof(biosdata)); |
365 | gk20a_dbg_fn("bios version %x, oem version %x", | 365 | nvgpu_log_fn(g, "bios version %x, oem version %x", |
366 | biosdata.version, | 366 | biosdata.version, |
367 | biosdata.oem_version); | 367 | biosdata.oem_version); |
368 | 368 | ||
@@ -375,9 +375,9 @@ static void nvgpu_bios_parse_nvinit_ptrs(struct gk20a *g, int offset) | |||
375 | struct nvinit_ptrs nvinit_ptrs; | 375 | struct nvinit_ptrs nvinit_ptrs; |
376 | 376 | ||
377 | memcpy(&nvinit_ptrs, &g->bios.data[offset], sizeof(nvinit_ptrs)); | 377 | memcpy(&nvinit_ptrs, &g->bios.data[offset], sizeof(nvinit_ptrs)); |
378 | gk20a_dbg_fn("devinit ptr %x size %d", nvinit_ptrs.devinit_tables_ptr, | 378 | nvgpu_log_fn(g, "devinit ptr %x size %d", nvinit_ptrs.devinit_tables_ptr, |
379 | nvinit_ptrs.devinit_tables_size); | 379 | nvinit_ptrs.devinit_tables_size); |
380 | gk20a_dbg_fn("bootscripts ptr %x size %d", nvinit_ptrs.bootscripts_ptr, | 380 | nvgpu_log_fn(g, "bootscripts ptr %x size %d", nvinit_ptrs.bootscripts_ptr, |
381 | nvinit_ptrs.bootscripts_size); | 381 | nvinit_ptrs.bootscripts_size); |
382 | 382 | ||
383 | g->bios.devinit_tables = &g->bios.data[nvinit_ptrs.devinit_tables_ptr]; | 383 | g->bios.devinit_tables = &g->bios.data[nvinit_ptrs.devinit_tables_ptr]; |
@@ -449,7 +449,7 @@ static void nvgpu_bios_parse_devinit_appinfo(struct gk20a *g, int dmem_offset) | |||
449 | struct devinit_engine_interface interface; | 449 | struct devinit_engine_interface interface; |
450 | 450 | ||
451 | memcpy(&interface, &g->bios.devinit.dmem[dmem_offset], sizeof(interface)); | 451 | memcpy(&interface, &g->bios.devinit.dmem[dmem_offset], sizeof(interface)); |
452 | gk20a_dbg_fn("devinit version %x tables phys %x script phys %x size %d", | 452 | nvgpu_log_fn(g, "devinit version %x tables phys %x script phys %x size %d", |
453 | interface.version, | 453 | interface.version, |
454 | interface.tables_phys_base, | 454 | interface.tables_phys_base, |
455 | interface.script_phys_base, | 455 | interface.script_phys_base, |
@@ -468,7 +468,7 @@ static int nvgpu_bios_parse_appinfo_table(struct gk20a *g, int offset) | |||
468 | 468 | ||
469 | memcpy(&hdr, &g->bios.data[offset], sizeof(hdr)); | 469 | memcpy(&hdr, &g->bios.data[offset], sizeof(hdr)); |
470 | 470 | ||
471 | gk20a_dbg_fn("appInfoHdr ver %d size %d entrySize %d entryCount %d", | 471 | nvgpu_log_fn(g, "appInfoHdr ver %d size %d entrySize %d entryCount %d", |
472 | hdr.version, hdr.header_size, | 472 | hdr.version, hdr.header_size, |
473 | hdr.entry_size, hdr.entry_count); | 473 | hdr.entry_size, hdr.entry_count); |
474 | 474 | ||
@@ -481,7 +481,7 @@ static int nvgpu_bios_parse_appinfo_table(struct gk20a *g, int offset) | |||
481 | 481 | ||
482 | memcpy(&entry, &g->bios.data[offset], sizeof(entry)); | 482 | memcpy(&entry, &g->bios.data[offset], sizeof(entry)); |
483 | 483 | ||
484 | gk20a_dbg_fn("appInfo id %d dmem_offset %d", | 484 | nvgpu_log_fn(g, "appInfo id %d dmem_offset %d", |
485 | entry.id, entry.dmem_offset); | 485 | entry.id, entry.dmem_offset); |
486 | 486 | ||
487 | if (entry.id == APPINFO_ID_DEVINIT) | 487 | if (entry.id == APPINFO_ID_DEVINIT) |
@@ -530,26 +530,26 @@ static int nvgpu_bios_parse_falcon_ucode_desc(struct gk20a *g, | |||
530 | memcpy(&desc, &udesc, sizeof(udesc.v2)); | 530 | memcpy(&desc, &udesc, sizeof(udesc.v2)); |
531 | break; | 531 | break; |
532 | default: | 532 | default: |
533 | gk20a_dbg_info("invalid version"); | 533 | nvgpu_log_info(g, "invalid version"); |
534 | return -EINVAL; | 534 | return -EINVAL; |
535 | } | 535 | } |
536 | 536 | ||
537 | gk20a_dbg_info("falcon ucode desc version %x len %x", version, desc_size); | 537 | nvgpu_log_info(g, "falcon ucode desc version %x len %x", version, desc_size); |
538 | 538 | ||
539 | gk20a_dbg_info("falcon ucode desc stored size %x uncompressed size %x", | 539 | nvgpu_log_info(g, "falcon ucode desc stored size %x uncompressed size %x", |
540 | desc.stored_size, desc.uncompressed_size); | 540 | desc.stored_size, desc.uncompressed_size); |
541 | gk20a_dbg_info("falcon ucode desc virtualEntry %x, interfaceOffset %x", | 541 | nvgpu_log_info(g, "falcon ucode desc virtualEntry %x, interfaceOffset %x", |
542 | desc.virtual_entry, desc.interface_offset); | 542 | desc.virtual_entry, desc.interface_offset); |
543 | gk20a_dbg_info("falcon ucode IMEM phys base %x, load size %x virt base %x sec base %x sec size %x", | 543 | nvgpu_log_info(g, "falcon ucode IMEM phys base %x, load size %x virt base %x sec base %x sec size %x", |
544 | desc.imem_phys_base, desc.imem_load_size, | 544 | desc.imem_phys_base, desc.imem_load_size, |
545 | desc.imem_virt_base, desc.imem_sec_base, | 545 | desc.imem_virt_base, desc.imem_sec_base, |
546 | desc.imem_sec_size); | 546 | desc.imem_sec_size); |
547 | gk20a_dbg_info("falcon ucode DMEM offset %x phys base %x, load size %x", | 547 | nvgpu_log_info(g, "falcon ucode DMEM offset %x phys base %x, load size %x", |
548 | desc.dmem_offset, desc.dmem_phys_base, | 548 | desc.dmem_offset, desc.dmem_phys_base, |
549 | desc.dmem_load_size); | 549 | desc.dmem_load_size); |
550 | 550 | ||
551 | if (desc.stored_size != desc.uncompressed_size) { | 551 | if (desc.stored_size != desc.uncompressed_size) { |
552 | gk20a_dbg_info("does not match"); | 552 | nvgpu_log_info(g, "does not match"); |
553 | return -EINVAL; | 553 | return -EINVAL; |
554 | } | 554 | } |
555 | 555 | ||
@@ -575,7 +575,7 @@ static int nvgpu_bios_parse_falcon_ucode_table(struct gk20a *g, int offset) | |||
575 | int i; | 575 | int i; |
576 | 576 | ||
577 | memcpy(&hdr, &g->bios.data[offset], sizeof(hdr)); | 577 | memcpy(&hdr, &g->bios.data[offset], sizeof(hdr)); |
578 | gk20a_dbg_fn("falcon ucode table ver %d size %d entrySize %d entryCount %d descVer %d descSize %d", | 578 | nvgpu_log_fn(g, "falcon ucode table ver %d size %d entrySize %d entryCount %d descVer %d descSize %d", |
579 | hdr.version, hdr.header_size, | 579 | hdr.version, hdr.header_size, |
580 | hdr.entry_size, hdr.entry_count, | 580 | hdr.entry_size, hdr.entry_count, |
581 | hdr.desc_version, hdr.desc_size); | 581 | hdr.desc_version, hdr.desc_size); |
@@ -590,7 +590,7 @@ static int nvgpu_bios_parse_falcon_ucode_table(struct gk20a *g, int offset) | |||
590 | 590 | ||
591 | memcpy(&entry, &g->bios.data[offset], sizeof(entry)); | 591 | memcpy(&entry, &g->bios.data[offset], sizeof(entry)); |
592 | 592 | ||
593 | gk20a_dbg_fn("falcon ucode table entry appid %x targetId %x descPtr %x", | 593 | nvgpu_log_fn(g, "falcon ucode table entry appid %x targetId %x descPtr %x", |
594 | entry.application_id, entry.target_id, | 594 | entry.application_id, entry.target_id, |
595 | entry.desc_ptr); | 595 | entry.desc_ptr); |
596 | 596 | ||
@@ -638,7 +638,7 @@ static void nvgpu_bios_parse_falcon_data_v2(struct gk20a *g, int offset) | |||
638 | int err; | 638 | int err; |
639 | 639 | ||
640 | memcpy(&falcon_data, &g->bios.data[offset], sizeof(falcon_data)); | 640 | memcpy(&falcon_data, &g->bios.data[offset], sizeof(falcon_data)); |
641 | gk20a_dbg_fn("falcon ucode table ptr %x", | 641 | nvgpu_log_fn(g, "falcon ucode table ptr %x", |
642 | falcon_data.falcon_ucode_table_ptr); | 642 | falcon_data.falcon_ucode_table_ptr); |
643 | err = nvgpu_bios_parse_falcon_ucode_table(g, | 643 | err = nvgpu_bios_parse_falcon_ucode_table(g, |
644 | falcon_data.falcon_ucode_table_ptr); | 644 | falcon_data.falcon_ucode_table_ptr); |
@@ -676,7 +676,7 @@ void *nvgpu_bios_get_perf_table_ptrs(struct gk20a *g, | |||
676 | 676 | ||
677 | if (table_id < (ptoken->data_size/data_size)) { | 677 | if (table_id < (ptoken->data_size/data_size)) { |
678 | 678 | ||
679 | gk20a_dbg_info("Perf_Tbl_ID-offset 0x%x Tbl_ID_Ptr-offset- 0x%x", | 679 | nvgpu_log_info(g, "Perf_Tbl_ID-offset 0x%x Tbl_ID_Ptr-offset- 0x%x", |
680 | (ptoken->data_ptr + | 680 | (ptoken->data_ptr + |
681 | (table_id * data_size)), | 681 | (table_id * data_size)), |
682 | perf_table_id_offset); | 682 | perf_table_id_offset); |
@@ -705,18 +705,18 @@ static void nvgpu_bios_parse_bit(struct gk20a *g, int offset) | |||
705 | struct bit_token bit_token; | 705 | struct bit_token bit_token; |
706 | int i; | 706 | int i; |
707 | 707 | ||
708 | gk20a_dbg_fn(""); | 708 | nvgpu_log_fn(g, " "); |
709 | memcpy(&bit, &g->bios.data[offset], sizeof(bit)); | 709 | memcpy(&bit, &g->bios.data[offset], sizeof(bit)); |
710 | 710 | ||
711 | gk20a_dbg_info("BIT header: %04x %08x", bit.id, bit.signature); | 711 | nvgpu_log_info(g, "BIT header: %04x %08x", bit.id, bit.signature); |
712 | gk20a_dbg_info("tokens: %d entries * %d bytes", | 712 | nvgpu_log_info(g, "tokens: %d entries * %d bytes", |
713 | bit.token_entries, bit.token_size); | 713 | bit.token_entries, bit.token_size); |
714 | 714 | ||
715 | offset += bit.header_size; | 715 | offset += bit.header_size; |
716 | for (i = 0; i < bit.token_entries; i++) { | 716 | for (i = 0; i < bit.token_entries; i++) { |
717 | memcpy(&bit_token, &g->bios.data[offset], sizeof(bit_token)); | 717 | memcpy(&bit_token, &g->bios.data[offset], sizeof(bit_token)); |
718 | 718 | ||
719 | gk20a_dbg_info("BIT token id %d ptr %d size %d ver %d", | 719 | nvgpu_log_info(g, "BIT token id %d ptr %d size %d ver %d", |
720 | bit_token.token_id, bit_token.data_ptr, | 720 | bit_token.token_id, bit_token.data_ptr, |
721 | bit_token.data_size, bit_token.data_version); | 721 | bit_token.data_size, bit_token.data_version); |
722 | 722 | ||
@@ -753,7 +753,7 @@ static void nvgpu_bios_parse_bit(struct gk20a *g, int offset) | |||
753 | 753 | ||
754 | offset += bit.token_size; | 754 | offset += bit.token_size; |
755 | } | 755 | } |
756 | gk20a_dbg_fn("done"); | 756 | nvgpu_log_fn(g, "done"); |
757 | } | 757 | } |
758 | 758 | ||
759 | static u32 __nvgpu_bios_readbyte(struct gk20a *g, u32 offset) | 759 | static u32 __nvgpu_bios_readbyte(struct gk20a *g, u32 offset) |