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

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

Merge "cnss2: Do sync resume during driver shutdown"

parents db877a9c 6476dc97

drivers/net/wireless/cnss2/debug.c

+4 −0
Original line number Diff line number Diff line
@@ -456,6 +456,10 @@ static ssize_t cnss_runtime_pm_debug_write(struct file *fp, 


	if (sysfs_streq(cmd, "usage_count")) {

		cnss_pci_pm_runtime_show_usage_count(pci_priv);

	} else if (sysfs_streq(cmd, "request_resume")) {

		ret = cnss_pci_pm_request_resume(pci_priv);

	} else if (sysfs_streq(cmd, "resume")) {

		ret = cnss_pci_pm_runtime_resume(pci_priv);

	} else if (sysfs_streq(cmd, "get")) {

		ret = cnss_pci_pm_runtime_get(pci_priv);

	} else if (sysfs_streq(cmd, "get_noresume")) {

drivers/net/wireless/cnss2/pci.c

+33 −19
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int cnss_qca6174_shutdown(struct cnss_pci_data *pci_priv) 
	int ret = 0;

	struct cnss_plat_data *plat_priv = pci_priv->plat_priv;



	cnss_pm_request_resume(pci_priv);

	cnss_pci_pm_runtime_resume(pci_priv);



	cnss_pci_call_driver_remove(pci_priv);
@@ -755,7 +755,7 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv) 
	int ret = 0;

	struct cnss_plat_data *plat_priv = pci_priv->plat_priv;



	cnss_pm_request_resume(pci_priv);

	cnss_pci_pm_runtime_resume(pci_priv);



	cnss_pci_call_driver_remove(pci_priv);
@@ -1103,7 +1103,7 @@ static void cnss_pci_event_cb(struct msm_pcie_notify *notify) 
		if (cnss_pci_get_monitor_wake_intr(pci_priv) &&

		    cnss_pci_get_auto_suspended(pci_priv)) {

			cnss_pci_set_monitor_wake_intr(pci_priv, false);

			pm_request_resume(&pci_dev->dev);

			cnss_pci_pm_request_resume(pci_priv);

		}

		break;

	default:
@@ -1392,6 +1392,34 @@ void cnss_pci_pm_runtime_show_usage_count(struct cnss_pci_data *pci_priv) 
		    atomic_read(&dev->power.usage_count));

}



int cnss_pci_pm_request_resume(struct cnss_pci_data *pci_priv)

{

	struct pci_dev *pci_dev;



	if (!pci_priv)

		return -ENODEV;



	pci_dev = pci_priv->pci_dev;

	if (!pci_dev)

		return -ENODEV;



	return pm_request_resume(&pci_dev->dev);

}



int cnss_pci_pm_runtime_resume(struct cnss_pci_data *pci_priv)

{

	struct pci_dev *pci_dev;



	if (!pci_priv)

		return -ENODEV;



	pci_dev = pci_priv->pci_dev;

	if (!pci_dev)

		return -ENODEV;



	return pm_runtime_resume(&pci_dev->dev);

}



int cnss_pci_pm_runtime_get(struct cnss_pci_data *pci_priv)

{

	if (!pci_priv)
@@ -1529,20 +1557,6 @@ int cnss_auto_resume(struct device *dev) 
}

EXPORT_SYMBOL(cnss_auto_resume);



int cnss_pm_request_resume(struct cnss_pci_data *pci_priv)

{

	struct pci_dev *pci_dev;



	if (!pci_priv)

		return -ENODEV;



	pci_dev = pci_priv->pci_dev;

	if (!pci_dev)

		return -ENODEV;



	return pm_request_resume(&pci_dev->dev);

}



int cnss_pci_force_wake_request(struct device *dev)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -2202,7 +2216,7 @@ static int cnss_mhi_pm_runtime_get(struct mhi_controller *mhi_ctrl, void *priv) 
{

	struct cnss_pci_data *pci_priv = priv;



	return pm_runtime_get(&pci_priv->pci_dev->dev);

	return cnss_pci_pm_runtime_get(pci_priv);

}



static void cnss_mhi_pm_runtime_put_noidle(struct mhi_controller *mhi_ctrl,
@@ -2210,7 +2224,7 @@ static void cnss_mhi_pm_runtime_put_noidle(struct mhi_controller *mhi_ctrl, 
{

	struct cnss_pci_data *pci_priv = priv;



	pm_runtime_put_noidle(&pci_priv->pci_dev->dev);

	cnss_pci_pm_runtime_put_noidle(pci_priv);

}



static char *cnss_mhi_state_to_str(enum cnss_mhi_state mhi_state)

drivers/net/wireless/cnss2/pci.h

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ int cnss_pci_start_mhi(struct cnss_pci_data *pci_priv); 
void cnss_pci_stop_mhi(struct cnss_pci_data *pci_priv);

void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv, bool in_panic);

void cnss_pci_clear_dump_info(struct cnss_pci_data *pci_priv);

int cnss_pm_request_resume(struct cnss_pci_data *pci_priv);

u32 cnss_pci_get_wake_msi(struct cnss_pci_data *pci_priv);

int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv);

void cnss_pci_fw_boot_timeout_hdlr(struct cnss_pci_data *pci_priv);
@@ -154,6 +153,8 @@ int cnss_pci_unregister_driver_hdlr(struct cnss_pci_data *pci_priv); 
int cnss_pci_call_driver_modem_status(struct cnss_pci_data *pci_priv,

				      int modem_current_status);

void cnss_pci_pm_runtime_show_usage_count(struct cnss_pci_data *pci_priv);

int cnss_pci_pm_request_resume(struct cnss_pci_data *pci_priv);

int cnss_pci_pm_runtime_resume(struct cnss_pci_data *pci_priv);

int cnss_pci_pm_runtime_get(struct cnss_pci_data *pci_priv);

void cnss_pci_pm_runtime_get_noresume(struct cnss_pci_data *pci_priv);

int cnss_pci_pm_runtime_put_autosuspend(struct cnss_pci_data *pci_priv);