Merge "cnss2: Fix synchronization issues related to idle shutdown" (adee9374) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/cnss2/debug.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,9 @@ static int cnss_stats_show_state(struct seq_file *s,
	case CNSS_IMS_CONNECTED:		case CNSS_IMS_CONNECTED:
	seq_puts(s, "IMS_CONNECTED");		seq_puts(s, "IMS_CONNECTED");
	continue;		continue;
			case CNSS_IN_SUSPEND_RESUME:
			seq_puts(s, "IN_SUSPEND_RESUME");
			continue;
	}		}

	seq_printf(s, "UNKNOWN-%d", i);		seq_printf(s, "UNKNOWN-%d", i);

drivers/net/wireless/cnss2/main.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -696,6 +696,11 @@ int cnss_idle_shutdown(struct device *dev)
	return -ENODEV;		return -ENODEV;
	}		}

			if (test_bit(CNSS_IN_SUSPEND_RESUME, &plat_priv->driver_state)) {
			cnss_pr_dbg("System suspend or resume in progress, ignore idle shutdown\n");
			return -EAGAIN;
			}

	cnss_pr_dbg("Doing idle shutdown\n");		cnss_pr_dbg("Doing idle shutdown\n");

	if (!test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state) &&		if (!test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state) &&

drivers/net/wireless/cnss2/main.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -202,6 +202,7 @@ enum cnss_driver_state {
	CNSS_DRIVER_DEBUG,		CNSS_DRIVER_DEBUG,
	CNSS_COEX_CONNECTED,		CNSS_COEX_CONNECTED,
	CNSS_IMS_CONNECTED,		CNSS_IMS_CONNECTED,
			CNSS_IN_SUSPEND_RESUME,
	};		};

	struct cnss_recovery_data {		struct cnss_recovery_data {

drivers/net/wireless/cnss2/pci.c

+26 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1008,6 +1008,7 @@ int cnss_pci_call_driver_probe(struct cnss_pci_data *pci_priv)
	int cnss_pci_call_driver_remove(struct cnss_pci_data *pci_priv)		int cnss_pci_call_driver_remove(struct cnss_pci_data *pci_priv)
	{		{
	struct cnss_plat_data *plat_priv;		struct cnss_plat_data *plat_priv;
			int ret;

	if (!pci_priv)		if (!pci_priv)
	return -ENODEV;		return -ENODEV;
	@@ -1037,7 +1038,12 @@ int cnss_pci_call_driver_remove(struct cnss_pci_data *pci_priv)
	clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);		clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);
	} else if (test_bit(CNSS_DRIVER_IDLE_SHUTDOWN,		} else if (test_bit(CNSS_DRIVER_IDLE_SHUTDOWN,
	&plat_priv->driver_state)) {		&plat_priv->driver_state)) {
	pci_priv->driver_ops->idle_shutdown(pci_priv->pci_dev);		ret = pci_priv->driver_ops->idle_shutdown(pci_priv->pci_dev);
			if (ret == -EAGAIN) {
			clear_bit(CNSS_DRIVER_IDLE_SHUTDOWN,
			&plat_priv->driver_state);
			return ret;
			}
	clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);		clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);
	}		}

	@@ -1173,7 +1179,9 @@ static int cnss_qca6174_shutdown(struct cnss_pci_data *pci_priv)

	cnss_pci_pm_runtime_resume(pci_priv);		cnss_pci_pm_runtime_resume(pci_priv);

	cnss_pci_call_driver_remove(pci_priv);		ret = cnss_pci_call_driver_remove(pci_priv);
			if (ret == -EAGAIN)
			goto out;

	cnss_request_bus_bandwidth(&plat_priv->plat_dev->dev,		cnss_request_bus_bandwidth(&plat_priv->plat_dev->dev,
	CNSS_BUS_WIDTH_NONE);		CNSS_BUS_WIDTH_NONE);
	@@ -1189,6 +1197,7 @@ static int cnss_qca6174_shutdown(struct cnss_pci_data *pci_priv)
	clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);		clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);
	clear_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state);		clear_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state);

			out:
	return ret;		return ret;
	}		}

	@@ -1289,7 +1298,9 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv)

	cnss_pci_pm_runtime_resume(pci_priv);		cnss_pci_pm_runtime_resume(pci_priv);

	cnss_pci_call_driver_remove(pci_priv);		ret = cnss_pci_call_driver_remove(pci_priv);
			if (ret == -EAGAIN)
			goto out;

	cnss_request_bus_bandwidth(&plat_priv->plat_dev->dev,		cnss_request_bus_bandwidth(&plat_priv->plat_dev->dev,
	CNSS_BUS_WIDTH_NONE);		CNSS_BUS_WIDTH_NONE);
	@@ -1322,6 +1333,7 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv)
	clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);		clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);
	clear_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state);		clear_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state);

			out:
	return ret;		return ret;
	}		}

	@@ -1731,6 +1743,8 @@ static int cnss_pci_suspend(struct device *dev)
	if (!cnss_is_device_powered_on(plat_priv))		if (!cnss_is_device_powered_on(plat_priv))
	goto out;		goto out;

			set_bit(CNSS_IN_SUSPEND_RESUME, &plat_priv->driver_state);

	if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks))		if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks))
	pci_priv->drv_connected_last =		pci_priv->drv_connected_last =
	cnss_pci_get_drv_connected(pci_priv);		cnss_pci_get_drv_connected(pci_priv);
	@@ -1742,7 +1756,7 @@ static int cnss_pci_suspend(struct device *dev)
	cnss_pr_err("Failed to suspend host driver, err = %d\n",		cnss_pr_err("Failed to suspend host driver, err = %d\n",
	ret);		ret);
	ret = -EAGAIN;		ret = -EAGAIN;
	goto out;		goto clear_flag;
	}		}
	}		}

	@@ -1785,7 +1799,9 @@ static int cnss_pci_suspend(struct device *dev)
	resume_driver:		resume_driver:
	if (driver_ops && driver_ops->resume)		if (driver_ops && driver_ops->resume)
	driver_ops->resume(pci_dev);		driver_ops->resume(pci_dev);
			clear_flag:
	pci_priv->drv_connected_last = 0;		pci_priv->drv_connected_last = 0;
			clear_bit(CNSS_IN_SUSPEND_RESUME, &plat_priv->driver_state);
	out:		out:
	return ret;		return ret;
	}		}
	@@ -1795,11 +1811,16 @@ static int cnss_pci_resume(struct device *dev)
	int ret = 0;		int ret = 0;
	struct pci_dev *pci_dev = to_pci_dev(dev);		struct pci_dev *pci_dev = to_pci_dev(dev);
	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);		struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);
			struct cnss_plat_data *plat_priv;
	struct cnss_wlan_driver *driver_ops;		struct cnss_wlan_driver *driver_ops;

	if (!pci_priv)		if (!pci_priv)
	goto out;		goto out;

			plat_priv = pci_priv->plat_priv;
			if (!plat_priv)
			goto out;

	if (pci_priv->pci_link_down_ind)		if (pci_priv->pci_link_down_ind)
	goto out;		goto out;

	@@ -1842,8 +1863,7 @@ static int cnss_pci_resume(struct device *dev)
	}		}

	pci_priv->drv_connected_last = 0;		pci_priv->drv_connected_last = 0;
			clear_bit(CNSS_IN_SUSPEND_RESUME, &plat_priv->driver_state);
	return 0;

	out:		out:
	return ret;		return ret;