samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Enhance error signature in qdf_check_state_before_panic

Browse Source 
Improve error signature in qdf_check_state_before_panic API.

Change-Id: I5774c07e9359b711f0863c40072962b802318f2f
CRs-Fixed: 2879026
This commit is contained in:
Karthik Kantamneni
2021-02-15 22:24:16 +05:30
committed by snandini
parent 31dfdf84bf
commit 3c3d944246
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hal/wifi3.0/hal_api.h
View File

@@ -290,7 +290,7 @@ static inline void hal_write32_mb(struct hal_soc *hal_soc, uint32_t offset,
ret = hif_force_wake_request(hal_soc->hif_handle); ret = hif_force_wake_request(hal_soc->hif_handle);
if (ret) { if (ret) {
hal_err_rl("Wake up request failed"); hal_err_rl("Wake up request failed");
qdf_check_state_before_panic(); qdf_check_state_before_panic(__func__, __LINE__);
return; return;
} }
} }
@@ -315,7 +315,7 @@ static inline void hal_write32_mb(struct hal_soc *hal_soc, uint32_t offset,
ret = hif_force_wake_release(hal_soc->hif_handle); ret = hif_force_wake_release(hal_soc->hif_handle);
if (ret) { if (ret) {
hal_err("Wake up release failed"); hal_err("Wake up release failed");
qdf_check_state_before_panic(); qdf_check_state_before_panic(__func__, __LINE__);
return; return;
} }
} }
@@ -350,7 +350,7 @@ static inline void hal_write32_mb_confirm(struct hal_soc *hal_soc,
ret = hif_force_wake_request(hal_soc->hif_handle); ret = hif_force_wake_request(hal_soc->hif_handle);
if (ret) { if (ret) {
hal_err("Wake up request failed"); hal_err("Wake up request failed");
qdf_check_state_before_panic(); qdf_check_state_before_panic(__func__, __LINE__);
return; return;
} }
} }
@@ -385,7 +385,7 @@ static inline void hal_write32_mb_confirm(struct hal_soc *hal_soc,
ret = hif_force_wake_release(hal_soc->hif_handle); ret = hif_force_wake_release(hal_soc->hif_handle);
if (ret) { if (ret) {
hal_err("Wake up release failed"); hal_err("Wake up release failed");
qdf_check_state_before_panic(); qdf_check_state_before_panic(__func__, __LINE__);
return; return;
} }
} }
@@ -538,7 +538,7 @@ uint32_t hal_read32_mb(struct hal_soc *hal_soc, uint32_t offset)
if ((!hal_soc->init_phase) && if ((!hal_soc->init_phase) &&
hif_force_wake_request(hal_soc->hif_handle)) { hif_force_wake_request(hal_soc->hif_handle)) {
hal_err("Wake up request failed"); hal_err("Wake up request failed");
qdf_check_state_before_panic(); qdf_check_state_before_panic(__func__, __LINE__);
return 0; return 0;
} }
@@ -561,7 +561,7 @@ uint32_t hal_read32_mb(struct hal_soc *hal_soc, uint32_t offset)
if ((!hal_soc->init_phase) && if ((!hal_soc->init_phase) &&
hif_force_wake_release(hal_soc->hif_handle)) { hif_force_wake_release(hal_soc->hif_handle)) {
hal_err("Wake up release failed"); hal_err("Wake up release failed");
qdf_check_state_before_panic(); qdf_check_state_before_panic(__func__, __LINE__);
return 0; return 0;
} }

6
qdf/inc/qdf_platform.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -250,10 +250,12 @@ void qdf_register_drv_connected_callback(qdf_is_drv_connected_callback
/** /**
* qdf_check_state_before_panic() - API to check if FW is down * qdf_check_state_before_panic() - API to check if FW is down
* or driver is in recovery before calling assert * or driver is in recovery before calling assert
* @func: Caller function pointer used for debug info
* @line: Caller function line number
* *
* Return: none * Return: none
*/ */
void qdf_check_state_before_panic(void); void qdf_check_state_before_panic(const char *func, const uint32_t line);
/** /**
* qdf_is_drv_supported_callback() - callback to query if drv is supported * qdf_is_drv_supported_callback() - callback to query if drv is supported

6
qdf/src/qdf_platform.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -172,10 +172,10 @@ bool qdf_is_drv_connected(void)
} }
qdf_export_symbol(qdf_is_drv_connected); qdf_export_symbol(qdf_is_drv_connected);
void qdf_check_state_before_panic(void) void qdf_check_state_before_panic(const char *func, const uint32_t line)
{ {
if (!qdf_is_recovering() && !qdf_is_fw_down()) if (!qdf_is_recovering() && !qdf_is_fw_down())
QDF_BUG(0); QDF_DEBUG_PANIC_FL(func, line, "");
} }
qdf_export_symbol(qdf_check_state_before_panic); qdf_export_symbol(qdf_check_state_before_panic);