Commit 332c6562 authored by Kalle Valo's avatar Kalle Valo
Browse files

wifi: ath11k: pci: cleanup debug logging 



For better readability fix PCI debug messages to follow the preferred style.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230609142440.24643-10-kvalo@kernel.org
parent 00608b40

drivers/net/wireless/ath/ath11k/mhi.c

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ void ath11k_mhi_set_mhictrl_reset(struct ath11k_base *ab) 


	val = ath11k_pcic_read32(ab, MHISTATUS);



	ath11k_dbg(ab, ATH11K_DBG_PCI, "MHISTATUS 0x%x\n", val);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "mhistatus 0x%x\n", val);



	/* Observed on QCA6390 that after SOC_GLOBAL_RESET, MHISTATUS

	 * has SYSERR bit set and thus need to set MHICTRL_RESET
@@ -263,7 +263,7 @@ static int ath11k_mhi_get_msi(struct ath11k_pci *ab_pci) 
	if (ret)

		return ret;



	ath11k_dbg(ab, ATH11K_DBG_PCI, "Number of assigned MSI for MHI is %d, base vector is %d\n",

	ath11k_dbg(ab, ATH11K_DBG_PCI, "num_vectors %d base_vector %d\n",

		   num_vectors, base_vector);



	irq = kcalloc(num_vectors, sizeof(int), GFP_KERNEL);

drivers/net/wireless/ath/ath11k/pci.c

+5 −5
Original line number Diff line number Diff line
@@ -203,10 +203,10 @@ static void ath11k_pci_clear_dbg_registers(struct ath11k_base *ab) 


	/* read cookie */

	val = ath11k_pcic_read32(ab, PCIE_Q6_COOKIE_ADDR);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "cookie:0x%x\n", val);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "pcie_q6_cookie_addr 0x%x\n", val);



	val = ath11k_pcic_read32(ab, WLAON_WARM_SW_ENTRY);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "WLAON_WARM_SW_ENTRY 0x%x\n", val);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "wlaon_warm_sw_entry 0x%x\n", val);



	/* TODO: exact time to sleep is uncertain */

	mdelay(10);
@@ -218,13 +218,13 @@ static void ath11k_pci_clear_dbg_registers(struct ath11k_base *ab) 
	mdelay(10);



	val = ath11k_pcic_read32(ab, WLAON_WARM_SW_ENTRY);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "WLAON_WARM_SW_ENTRY 0x%x\n", val);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "wlaon_warm_sw_entry 0x%x\n", val);



	/* A read clear register. clear the register to prevent

	 * Q6 from entering wrong code path.

	 */

	val = ath11k_pcic_read32(ab, WLAON_SOC_RESET_CAUSE_REG);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "soc reset cause:%d\n", val);

	ath11k_dbg(ab, ATH11K_DBG_PCI, "soc reset cause %d\n", val);

}



static int ath11k_pci_set_link_reg(struct ath11k_base *ab,
@@ -433,7 +433,7 @@ static int ath11k_pci_alloc_msi(struct ath11k_pci *ab_pci) 
		}

		clear_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &ab->dev_flags);

		ab->pci.msi.config = &msi_config_one_msi;

		ath11k_dbg(ab, ATH11K_DBG_PCI, "request MSI one vector\n");

		ath11k_dbg(ab, ATH11K_DBG_PCI, "request one msi vector\n");

	}

	ath11k_info(ab, "MSI vectors: %d\n", num_vectors);

drivers/net/wireless/ath/ath11k/pcic.c

+3 −3
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ int ath11k_pcic_get_user_msi_assignment(struct ath11k_base *ab, char *user_name, 
			*user_base_data = *base_vector + ab->pci.msi.ep_base_data;



			ath11k_dbg(ab, ATH11K_DBG_PCI,

				   "Assign MSI to user: %s, num_vectors: %d, user_base_data: %u, base_vector: %u\n",

				   "msi assignment %s num_vectors %d user_base_data %u base_vector %u\n",

				   user_name, *num_vectors, *user_base_data,

				   *base_vector);
@@ -527,7 +527,7 @@ static irqreturn_t ath11k_pcic_ext_interrupt_handler(int irq, void *arg) 
	if (!test_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, &ab->dev_flags))

		return IRQ_HANDLED;



	ath11k_dbg(irq_grp->ab, ATH11K_DBG_PCI, "ext irq:%d\n", irq);

	ath11k_dbg(irq_grp->ab, ATH11K_DBG_PCI, "ext irq %d\n", irq);



	/* last interrupt received for this group */

	irq_grp->timestamp = jiffies;
@@ -597,7 +597,7 @@ static int ath11k_pcic_ext_irq_config(struct ath11k_base *ab) 
			ab->irq_num[irq_idx] = irq;



			ath11k_dbg(ab, ATH11K_DBG_PCI,

				   "irq:%d group:%d\n", irq, i);

				   "irq %d group %d\n", irq, i);



			irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY);

			ret = request_irq(irq, ath11k_pcic_ext_interrupt_handler,