Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b8fd900 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Avoid printing some verbose logs to kmsg"

parents 48c30d3f 9ea529cf

drivers/net/wireless/cnss2/debug.h

+4 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. */



#ifndef _CNSS_DEBUG_H

#define _CNSS_DEBUG_H
@@ -44,6 +44,9 @@ extern void *cnss_ipc_log_long_context; 
					 ##__VA_ARGS__);		\

	} while (0)



#define cnss_pr_buf(_fmt, ...)						\

	cnss_ipc_log_long_string("%scnss: " _fmt, "", ##__VA_ARGS__)	\



#ifdef CONFIG_CNSS2_DEBUG

#define CNSS_ASSERT(_condition) do {					\

		if (!(_condition)) {					\

drivers/net/wireless/cnss2/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -3391,7 +3391,7 @@ int cnss_pci_qmi_send_get(struct cnss_pci_data *pci_priv) 
	    !pci_priv->qmi_send_usage_count)

		ret = cnss_pci_resume_bus(pci_priv);

	pci_priv->qmi_send_usage_count++;

	cnss_pr_vdbg("Increased QMI send usage count to %d\n",

	cnss_pr_buf("Increased QMI send usage count to %d\n",

		    pci_priv->qmi_send_usage_count);

	mutex_unlock(&pci_priv->bus_lock);
@@ -3408,7 +3408,7 @@ int cnss_pci_qmi_send_put(struct cnss_pci_data *pci_priv) 
	mutex_lock(&pci_priv->bus_lock);

	if (pci_priv->qmi_send_usage_count)

		pci_priv->qmi_send_usage_count--;

	cnss_pr_vdbg("Decreased QMI send usage count to %d\n",

	cnss_pr_buf("Decreased QMI send usage count to %d\n",

		    pci_priv->qmi_send_usage_count);

	if (cnss_pci_get_auto_suspended(pci_priv) &&

	    !pci_priv->qmi_send_usage_count &&

drivers/net/wireless/cnss2/qmi.c

+6 −6
Original line number Diff line number Diff line
@@ -1660,7 +1660,7 @@ int cnss_wlfw_get_info_send_sync(struct cnss_plat_data *plat_priv, int type, 
	struct qmi_txn txn;

	int ret = 0;



	cnss_pr_vdbg("Sending get info message, type: %d, cmd length: %d, state: 0x%lx\n",

	cnss_pr_buf("Sending get info message, type: %d, cmd length: %d, state: 0x%lx\n",

		    type, cmd_len, plat_priv->driver_state);



	if (cmd_len > QMI_WLFW_MAX_DATA_SIZE_V01)
@@ -2015,14 +2015,14 @@ static void cnss_wlfw_respond_get_info_ind_cb(struct qmi_handle *qmi_wlfw, 
		container_of(qmi_wlfw, struct cnss_plat_data, qmi_wlfw);

	const struct wlfw_respond_get_info_ind_msg_v01 *ind_msg = data;



	cnss_pr_vdbg("Received QMI WLFW respond get info indication\n");

	cnss_pr_buf("Received QMI WLFW respond get info indication\n");



	if (!txn) {

		cnss_pr_err("Spurious indication\n");

		return;

	}



	cnss_pr_vdbg("Extract message with event length: %d, type: %d, is last: %d, seq no: %d\n",

	cnss_pr_buf("Extract message with event length: %d, type: %d, is last: %d, seq no: %d\n",

		    ind_msg->data_len, ind_msg->type,

		    ind_msg->is_last, ind_msg->seq_no);