File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed
drivers/net/wireless/ath/ath10k Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -462,7 +462,7 @@ struct ath10k_ce_crash_hdr {
462
462
struct ath10k_fw_crash_data {
463
463
bool crashed_since_read ;
464
464
465
- uuid_le uuid ;
465
+ guid_t guid ;
466
466
struct timespec timestamp ;
467
467
__le32 registers [REG_DUMP_COUNT_QCA988X ];
468
468
struct ath10k_ce_crash_data ce_crash_data [CE_COUNT_MAX ];
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ struct ath10k_dump_file_data {
70
70
71
71
/* some info we can get from ath10k struct that might help */
72
72
73
- u8 uuid [ 16 ] ;
73
+ guid_t guid ;
74
74
75
75
__le32 chip_id ;
76
76
@@ -719,7 +719,7 @@ ath10k_debug_get_new_fw_crash_data(struct ath10k *ar)
719
719
lockdep_assert_held (& ar -> data_lock );
720
720
721
721
crash_data -> crashed_since_read = true;
722
- uuid_le_gen (& crash_data -> uuid );
722
+ guid_gen (& crash_data -> guid );
723
723
getnstimeofday (& crash_data -> timestamp );
724
724
725
725
return crash_data ;
@@ -766,7 +766,7 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar,
766
766
767
767
dump_data -> version = cpu_to_le32 (ATH10K_FW_CRASH_DUMP_VERSION );
768
768
769
- memcpy ( dump_data -> uuid , & crash_data -> uuid , sizeof ( dump_data -> uuid ) );
769
+ guid_copy ( & dump_data -> guid , & crash_data -> guid );
770
770
dump_data -> chip_id = cpu_to_le32 (ar -> chip_id );
771
771
dump_data -> bus_type = cpu_to_le32 (0 );
772
772
dump_data -> target_version = cpu_to_le32 (ar -> target_version );
Original file line number Diff line number Diff line change @@ -1463,7 +1463,7 @@ static void ath10k_pci_dump_registers(struct ath10k *ar,
1463
1463
static void ath10k_pci_fw_crashed_dump (struct ath10k * ar )
1464
1464
{
1465
1465
struct ath10k_fw_crash_data * crash_data ;
1466
- char uuid [ 50 ];
1466
+ char guid [ UUID_STRING_LEN + 1 ];
1467
1467
1468
1468
spin_lock_bh (& ar -> data_lock );
1469
1469
@@ -1472,11 +1472,11 @@ static void ath10k_pci_fw_crashed_dump(struct ath10k *ar)
1472
1472
crash_data = ath10k_debug_get_new_fw_crash_data (ar );
1473
1473
1474
1474
if (crash_data )
1475
- scnprintf (uuid , sizeof (uuid ), "%pUl" , & crash_data -> uuid );
1475
+ scnprintf (guid , sizeof (guid ), "%pUl" , & crash_data -> guid );
1476
1476
else
1477
- scnprintf (uuid , sizeof (uuid ), "n/a" );
1477
+ scnprintf (guid , sizeof (guid ), "n/a" );
1478
1478
1479
- ath10k_err (ar , "firmware crashed! (uuid %s)\n" , uuid );
1479
+ ath10k_err (ar , "firmware crashed! (guid %s)\n" , guid );
1480
1480
ath10k_print_driver_info (ar );
1481
1481
ath10k_pci_dump_registers (ar , crash_data );
1482
1482
ath10k_ce_dump_registers (ar , crash_data );
You can’t perform that action at this time.
0 commit comments