xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath10k: switch to use new generic UUID API

Browse Source 
There are new types and helpers that are supposed to be used in new code.

As a preparation to get rid of legacy types and API functions do
the conversion here.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Andy Shevchenko
2017-08-02 16:57:25 +03:00
committed by Kalle Valo
parent f35a7f91f6
commit ab3f9c8868
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath10k/core.h
View File

@@ -462,7 +462,7 @@ struct ath10k_ce_crash_hdr {
struct ath10k_fw_crash_data { struct ath10k_fw_crash_data {
bool crashed_since_read; bool crashed_since_read;
uuid_le uuid; guid_t guid;
struct timespec timestamp; struct timespec timestamp;
__le32 registers[REG_DUMP_COUNT_QCA988X]; __le32 registers[REG_DUMP_COUNT_QCA988X];
struct ath10k_ce_crash_data ce_crash_data[CE_COUNT_MAX]; struct ath10k_ce_crash_data ce_crash_data[CE_COUNT_MAX];

6
drivers/net/wireless/ath/ath10k/debug.c
View File

@@ -70,7 +70,7 @@ struct ath10k_dump_file_data {
/* some info we can get from ath10k struct that might help */ /* some info we can get from ath10k struct that might help */
u8 uuid[16]; guid_t guid;
__le32 chip_id; __le32 chip_id;
@@ -719,7 +719,7 @@ ath10k_debug_get_new_fw_crash_data(struct ath10k *ar)
lockdep_assert_held(&ar->data_lock); lockdep_assert_held(&ar->data_lock);
crash_data->crashed_since_read = true; crash_data->crashed_since_read = true;
uuid_le_gen(&crash_data->uuid); guid_gen(&crash_data->guid);
getnstimeofday(&crash_data->timestamp); getnstimeofday(&crash_data->timestamp);
return crash_data; return crash_data;
@@ -766,7 +766,7 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar,
dump_data->version = cpu_to_le32(ATH10K_FW_CRASH_DUMP_VERSION); dump_data->version = cpu_to_le32(ATH10K_FW_CRASH_DUMP_VERSION);
memcpy(dump_data->uuid, &crash_data->uuid, sizeof(dump_data->uuid)); guid_copy(&dump_data->guid, &crash_data->guid);
dump_data->chip_id = cpu_to_le32(ar->chip_id); dump_data->chip_id = cpu_to_le32(ar->chip_id);
dump_data->bus_type = cpu_to_le32(0); dump_data->bus_type = cpu_to_le32(0);
dump_data->target_version = cpu_to_le32(ar->target_version); dump_data->target_version = cpu_to_le32(ar->target_version);

8
drivers/net/wireless/ath/ath10k/pci.c
View File

@@ -1463,7 +1463,7 @@ static void ath10k_pci_dump_registers(struct ath10k *ar,
static void ath10k_pci_fw_crashed_dump(struct ath10k *ar) static void ath10k_pci_fw_crashed_dump(struct ath10k *ar)
{ {
struct ath10k_fw_crash_data *crash_data; struct ath10k_fw_crash_data *crash_data;
char uuid[50]; char guid[UUID_STRING_LEN + 1];
spin_lock_bh(&ar->data_lock); spin_lock_bh(&ar->data_lock);
@@ -1472,11 +1472,11 @@ static void ath10k_pci_fw_crashed_dump(struct ath10k *ar)
crash_data = ath10k_debug_get_new_fw_crash_data(ar); crash_data = ath10k_debug_get_new_fw_crash_data(ar);
if (crash_data) if (crash_data)
scnprintf(uuid, sizeof(uuid), "%pUl", &crash_data->uuid); scnprintf(guid, sizeof(guid), "%pUl", &crash_data->guid);
else else
scnprintf(uuid, sizeof(uuid), "n/a"); scnprintf(guid, sizeof(guid), "n/a");
ath10k_err(ar, "firmware crashed! (uuid %s)\n", uuid); ath10k_err(ar, "firmware crashed! (guid %s)\n", guid);
ath10k_print_driver_info(ar); ath10k_print_driver_info(ar);
ath10k_pci_dump_registers(ar, crash_data); ath10k_pci_dump_registers(ar, crash_data);
ath10k_ce_dump_registers(ar, crash_data); ath10k_ce_dump_registers(ar, crash_data);