Merge "cnss2: Add new flag to check drv support" (46e4d887) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/cnss2/pci.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -2917,6 +2917,7 @@ static bool cnss_pci_is_drv_supported(struct cnss_pci_data *pci_priv)

		if (!root_port) {
		cnss_pr_err("PCIe DRV is not supported as root port is null\n");
		pci_priv->drv_supported = false;
		return drv_supported;
		}

		@@ -2928,6 +2929,7 @@ static bool cnss_pci_is_drv_supported(struct cnss_pci_data *pci_priv)

		cnss_pr_dbg("PCIe DRV is %s\n",
		drv_supported ? "supported" : "not supported");
		pci_priv->drv_supported = drv_supported;

		return drv_supported;
		}
		@@ -3165,7 +3167,7 @@ static int cnss_pci_suspend(struct device *dev)
		goto out;

		if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks) &&
		cnss_pci_get_drv_connected(pci_priv)) {
		pci_priv->drv_supported) {
		pci_priv->drv_connected_last =
		cnss_pci_get_drv_connected(pci_priv);
		if (!pci_priv->drv_connected_last) {
		@@ -3308,7 +3310,7 @@ static int cnss_pci_runtime_suspend(struct device *dev)
		}

		if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks) &&
		cnss_pci_get_drv_connected(pci_priv)) {
		pci_priv->drv_supported) {
		pci_priv->drv_connected_last =
		cnss_pci_get_drv_connected(pci_priv);
		if (!pci_priv->drv_connected_last) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ struct cnss_pci_data {
		struct cnss_misc_reg *wlaon_reg;
		u32 wlaon_reg_size;
		u8 iommu_geometry;
		bool drv_supported;
		};

		static inline void cnss_set_pci_priv(struct pci_dev pci_dev, void data)