A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "icnss2: Improve IPC logging"

Browse source
This commit is contained in:
qctecmdr 2021-09-13 08:48:12 -07:00 • committed by Gerrit - the friendly Code Review server
commit 07005fd0c6
4 changed files with 80 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/soc/qcom/icnss2/debug.c
View file

@ -14,7 +14,8 @@
void *icnss_ipc_log_context;
void *icnss_ipc_log_long_context;
void *icnss_ipc_log_long1_context;
void *icnss_ipc_log_smp2p_context;
void *icnss_ipc_soc_wake_context;
static ssize_t icnss_regwrite_write(struct file *fp,
const char __user *user_buf,
@ -775,10 +776,15 @@ void icnss_debug_init(void)
if (!icnss_ipc_log_long_context)
icnss_pr_err("Unable to create log long context\n");
icnss_ipc_log_long1_context = ipc_log_context_create(NUM_LOG_LONG_PAGES,
"icnss_long1", 0);
if (!icnss_ipc_log_long1_context)
icnss_pr_err("Unable to create log long context\n");
icnss_ipc_log_smp2p_context = ipc_log_context_create(NUM_LOG_LONG_PAGES,
"icnss_smp2p", 0);
if (!icnss_ipc_log_smp2p_context)
icnss_pr_err("Unable to create log smp2p context\n");
icnss_ipc_soc_wake_context = ipc_log_context_create(NUM_LOG_LONG_PAGES,
"icnss_soc_wake", 0);
if (!icnss_ipc_soc_wake_context)
icnss_pr_err("Unable to create log soc_wake context\n");
}
@ -793,9 +799,14 @@ void icnss_debug_deinit(void)
ipc_log_context_destroy(icnss_ipc_log_long_context);
icnss_ipc_log_long_context = NULL;
}
if (icnss_ipc_log_long1_context) {
ipc_log_context_destroy(icnss_ipc_log_long1_context);
icnss_ipc_log_long1_context = NULL;
if (icnss_ipc_log_smp2p_context) {
ipc_log_context_destroy(icnss_ipc_log_smp2p_context);
icnss_ipc_log_smp2p_context = NULL;
}
if (icnss_ipc_soc_wake_context) {
ipc_log_context_destroy(icnss_ipc_soc_wake_context);
icnss_ipc_soc_wake_context = NULL;
}
}

41
drivers/soc/qcom/icnss2/debug.h
View file

@ -14,7 +14,8 @@
extern void *icnss_ipc_log_context;
extern void *icnss_ipc_log_long_context;
extern void *icnss_ipc_log_long1_context;
extern void *icnss_ipc_log_smp2p_context;
extern void *icnss_ipc_soc_wake_context;
#define icnss_ipc_log_string(_x...) \
ipc_log_string(icnss_ipc_log_context, _x)
@ -22,8 +23,11 @@ extern void *icnss_ipc_log_long1_context;
#define icnss_ipc_log_long_string(_x...) \
ipc_log_string(icnss_ipc_log_long_context, _x)
#define icnss_ipc_log_long1_string(_x...) \
ipc_log_string(icnss_ipc_log_long1_context, _x)
#define icnss_ipc_log_smp2p_string(_x...) \
ipc_log_string(icnss_ipc_log_smp2p_context, _x)
#define icnss_ipc_soc_wake_string(_x...) \
ipc_log_string(icnss_ipc_soc_wake_context, _x)
#define icnss_pr_err(_fmt, ...) do { \
printk("%s" pr_fmt(_fmt), KERN_ERR, ##__VA_ARGS__); \
@ -54,9 +58,14 @@ extern void *icnss_ipc_log_long1_context;
icnss_ipc_log_long_string(pr_fmt(_fmt), ##__VA_ARGS__); \
} while (0)
#define icnss_pr_vdbg1(_fmt, ...) do { \
#define icnss_pr_smp2p(_fmt, ...) do { \
pr_debug(_fmt, ##__VA_ARGS__); \
icnss_ipc_log_long1_string(pr_fmt(_fmt), ##__VA_ARGS__); \
icnss_ipc_log_smp2p_string(pr_fmt(_fmt), ##__VA_ARGS__); \
} while (0)
#define icnss_pr_soc_wake(_fmt, ...) do { \
pr_debug(_fmt, ##__VA_ARGS__); \
icnss_ipc_soc_wake_string(pr_fmt(_fmt), ##__VA_ARGS__); \
} while (0)
#elif defined(DEBUG)
@ -72,9 +81,15 @@ extern void *icnss_ipc_log_long1_context;
##__VA_ARGS__); \
} while (0)
#define icnss_pr_vdbg1(_fmt, ...) do { \
pr_debug(_fmt, ##__VA_ARGS__); \
icnss_ipc_log_long1_string("%s" pr_fmt(_fmt), "", \
#define icnss_pr_smp2p(_fmt, ...) do { \
pr_debug(_fmt, ##__VA_ARGS__); \
icnss_ipc_log_smp2p_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)
#define icnss_pr_soc_wake(_fmt, ...) do { \
pr_debug(_fmt, ##__VA_ARGS__); \
icnss_ipc_soc_wake_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)
@ -91,9 +106,15 @@ extern void *icnss_ipc_log_long1_context;
##__VA_ARGS__); \
} while (0)
#define icnss_pr_vdbg1(_fmt, ...) do { \
#define icnss_pr_smp2p(_fmt, ...) do { \
no_printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__); \
icnss_ipc_log_long1_string("%s" pr_fmt(_fmt), "", \
icnss_ipc_log_smp2p_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)
#define icnss_pr_soc_wake(_fmt, ...) do { \
no_printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__); \
icnss_ipc_soc_wake_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)

58
drivers/soc/qcom/icnss2/main.c
View file

@ -293,9 +293,9 @@ int icnss_soc_wake_event_post(struct icnss_priv *priv,
if (!priv)
return -ENODEV;
icnss_pr_dbg("Posting event: %s(%d), %s, flags: 0x%x, state: 0x%lx\n",
icnss_soc_wake_event_to_str(type), type, current->comm,
flags, priv->state);
icnss_pr_soc_wake("Posting event: %s(%d), %s, flags: 0x%x, state: 0x%lx\n",
icnss_soc_wake_event_to_str(type),
type, current->comm, flags, priv->state);
if (type >= ICNSS_SOC_WAKE_EVENT_MAX) {
icnss_pr_err("Invalid Event type: %d, can't post", type);
@ -332,9 +332,9 @@ int icnss_soc_wake_event_post(struct icnss_priv *priv,
else
ret = wait_for_completion_interruptible(&event->complete);
icnss_pr_dbg("Completed event: %s(%d), state: 0x%lx, ret: %d/%d\n",
icnss_soc_wake_event_to_str(type), type, priv->state, ret,
event->ret);
icnss_pr_soc_wake("Completed event: %s(%d), state: 0x%lx, ret: %d/%d\n",
icnss_soc_wake_event_to_str(type),
type, priv->state, ret, event->ret);
spin_lock_irqsave(&priv->soc_wake_msg_lock, irq_flags);
if (ret == -ERESTARTSYS && event->ret == ICNSS_EVENT_PENDING) {
@ -1094,8 +1094,8 @@ static int icnss_event_soc_wake_request(struct icnss_priv *priv, void *data)
return -ENODEV;
if (atomic_inc_not_zero(&priv->soc_wake_ref_count)) {
icnss_pr_dbg("SOC awake after posting work, Ref count: %d",
atomic_read(&priv->soc_wake_ref_count));
icnss_pr_soc_wake("SOC awake after posting work, Ref count: %d",
atomic_read(&priv->soc_wake_ref_count));
return 0;
}
@ -1114,8 +1114,8 @@ static int icnss_event_soc_wake_release(struct icnss_priv *priv, void *data)
return -ENODEV;
if (atomic_dec_if_positive(&priv->soc_wake_ref_count)) {
icnss_pr_dbg("Wake release not called. Ref count: %d",
priv->soc_wake_ref_count);
icnss_pr_soc_wake("Wake release not called. Ref count: %d",
priv->soc_wake_ref_count);
return 0;
}
@ -1566,10 +1566,10 @@ static void icnss_soc_wake_msg_work(struct work_struct *work)
list_del(&event->list);
spin_unlock_irqrestore(&priv->soc_wake_msg_lock, flags);
icnss_pr_dbg("Processing event: %s%s(%d), state: 0x%lx\n",
icnss_soc_wake_event_to_str(event->type),
event->sync ? "-sync" : "", event->type,
priv->state);
icnss_pr_soc_wake("Processing event: %s%s(%d), state: 0x%lx\n",
icnss_soc_wake_event_to_str(event->type),
event->sync ? "-sync" : "", event->type,
priv->state);
switch (event->type) {
case ICNSS_SOC_WAKE_REQUEST_EVENT:
@ -1588,10 +1588,10 @@ static void icnss_soc_wake_msg_work(struct work_struct *work)
priv->stats.soc_wake_events[event->type].processed++;
icnss_pr_dbg("Event Processed: %s%s(%d), ret: %d, state: 0x%lx\n",
icnss_soc_wake_event_to_str(event->type),
event->sync ? "-sync" : "", event->type, ret,
priv->state);
icnss_pr_soc_wake("Event Processed: %s%s(%d), ret: %d, state: 0x%lx\n",
icnss_soc_wake_event_to_str(event->type),
event->sync ? "-sync" : "", event->type, ret,
priv->state);
spin_lock_irqsave(&priv->soc_wake_msg_lock, flags);
if (event->sync) {
@ -2212,14 +2212,14 @@ static int icnss_send_smp2p(struct icnss_priv *priv,
value <<= ICNSS_SMEM_SEQ_NO_POS;
value |= msg_id;
icnss_pr_vdbg1("Sending SMP2P value: 0x%X\n", value);
icnss_pr_smp2p("Sending SMP2P value: 0x%X\n", value);
ret = qcom_smem_state_update_bits(
priv->smp2p_info.smem_state,
ICNSS_SMEM_VALUE_MASK,
value);
if (ret)
icnss_pr_vdbg1("Error in SMP2P send ret: %d\n", ret);
icnss_pr_smp2p("Error in SMP2P send ret: %d\n", ret);
return ret;
}
@ -2761,12 +2761,12 @@ int icnss_force_wake_request(struct device *dev)
}
if (atomic_inc_not_zero(&priv->soc_wake_ref_count)) {
icnss_pr_dbg("SOC already awake, Ref count: %d",
atomic_read(&priv->soc_wake_ref_count));
icnss_pr_soc_wake("SOC already awake, Ref count: %d",
atomic_read(&priv->soc_wake_ref_count));
return 0;
}
icnss_pr_dbg("Calling SOC Wake request");
icnss_pr_soc_wake("Calling SOC Wake request");
icnss_soc_wake_event_post(priv, ICNSS_SOC_WAKE_REQUEST_EVENT,
0, NULL);
@ -2789,12 +2789,12 @@ int icnss_force_wake_release(struct device *dev)
return -EINVAL;
}
icnss_pr_dbg("Calling SOC Wake response");
icnss_pr_soc_wake("Calling SOC Wake response");
if (atomic_read(&priv->soc_wake_ref_count) &&
icnss_atomic_dec_if_greater_one(&priv->soc_wake_ref_count)) {
icnss_pr_dbg("SOC previous release pending, Ref count: %d",
atomic_read(&priv->soc_wake_ref_count));
icnss_pr_soc_wake("SOC previous release pending, Ref count: %d",
atomic_read(&priv->soc_wake_ref_count));
return 0;
}
@ -3128,7 +3128,7 @@ int icnss_trigger_recovery(struct device *dev)
}
if (priv->device_id == WCN6750_DEVICE_ID) {
icnss_pr_vdbg1("Initiate Root PD restart");
icnss_pr_vdbg("Initiate Root PD restart");
ret = icnss_send_smp2p(priv, ICNSS_TRIGGER_SSR);
if (!ret)
set_bit(ICNSS_HOST_TRIGGERED_PDR, &priv->state);
@ -3210,7 +3210,7 @@ int icnss_exit_power_save(struct device *dev)
{
struct icnss_priv *priv = dev_get_drvdata(dev);
icnss_pr_vdbg1("Calling Exit Power Save\n");
icnss_pr_vdbg("Calling Exit Power Save\n");
if (test_bit(ICNSS_PD_RESTART, &priv->state) ||
!test_bit(ICNSS_MODE_ON, &priv->state))
@ -3881,7 +3881,7 @@ static inline void icnss_get_smp2p_info(struct icnss_priv *priv)
"wlan-smp2p-out",
&priv->smp2p_info.smem_bit);
if (IS_ERR(priv->smp2p_info.smem_state)) {
icnss_pr_vdbg1("Failed to get smem state %d",
icnss_pr_smp2p("Failed to get smem state %d",
PTR_ERR(priv->smp2p_info.smem_state));
}

2
drivers/soc/qcom/icnss2/qmi.c
View file

@ -440,7 +440,7 @@ int wlfw_send_soc_wake_msg(struct icnss_priv *priv,
if (test_bit(ICNSS_FW_DOWN, &priv->state))
return -EINVAL;
icnss_pr_dbg("Sending soc wake msg, type: 0x%x\n",
icnss_pr_soc_wake("Sending soc wake msg, type: 0x%x\n",
type);
req = kzalloc(sizeof(*req), GFP_KERNEL);