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

Commit 3733045f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Add fatal error string in CNSS"

parents a945c0c6 4afbd266

drivers/net/wireless/cnss2/debug.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ extern void *cnss_ipc_log_context; 
	} while (0)

#endif



#define cnss_fatal_err(_fmt, ...)					\

	cnss_pr_err("fatal: " _fmt, ##__VA_ARGS__)



int cnss_debug_init(void);

void cnss_debug_deinit(void);

int cnss_debugfs_create(struct cnss_plat_data *plat_priv);

drivers/net/wireless/cnss2/pci.c

+5 −5
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static int cnss_pci_check_link_status(struct cnss_pci_data *pci_priv) 


	pci_read_config_word(pci_priv->pci_dev, PCI_DEVICE_ID, &device_id);

	if (device_id != pci_priv->device_id)  {

		cnss_pr_err("PCI device ID mismatch, link possibly down, current read ID: 0x%x, record ID: 0x%x\n",

		cnss_fatal_err("PCI device ID mismatch, link possibly down, current read ID: 0x%x, record ID: 0x%x\n",

			       device_id, pci_priv->device_id);

		return -EIO;

	}
@@ -1066,7 +1066,7 @@ static void cnss_pci_event_cb(struct msm_pcie_notify *notify) 
		pci_priv->pci_link_down_ind = true;

		spin_unlock_irqrestore(&pci_link_down_lock, flags);



		cnss_pr_err("PCI link down, schedule recovery!\n");

		cnss_fatal_err("PCI link down, schedule recovery!\n");

		if (pci_dev->device == QCA6174_DEVICE_ID)

			disable_irq(pci_dev->irq);

		cnss_schedule_recovery(&pci_dev->dev, CNSS_REASON_LINK_DOWN);
@@ -1703,7 +1703,7 @@ void cnss_pci_fw_boot_timeout_hdlr(struct cnss_pci_data *pci_priv) 
	if (!pci_priv)

		return;



	cnss_pr_err("Timeout waiting for FW ready indication\n");

	cnss_fatal_err("Timeout waiting for FW ready indication\n");



	cnss_schedule_recovery(&pci_priv->pci_dev->dev,

			       CNSS_REASON_TIMEOUT);
@@ -2234,7 +2234,7 @@ static void cnss_dev_rddm_timeout_hdlr(struct timer_list *t) 
	if (!pci_priv)

		return;



	cnss_pr_err("Timeout waiting for RDDM notification\n");

	cnss_fatal_err("Timeout waiting for RDDM notification\n");



	cnss_schedule_recovery(&pci_priv->pci_dev->dev, CNSS_REASON_TIMEOUT);

}