qcacld-3.0: Add idle restart/shutdown support for PCIe in PLD

Provide platform driver interface for idle restart/shutdown for
PCIe bus in PLD. Remove PCIe power off call for discrete PCIe bus
enabled SoC such that platform driver can execute proper SoC power
off sequence.

Change-Id: If08186247e89a4182cadbf83817dce4f02654ecc
CRs-Fixed: 2431419

core/hdd/src/wlan_hdd_main.c

@@ -239,6 +239,7 @@ static struct kparam_string fwpath = {
 static char *country_code;
 static int enable_11d = -1;
 static int enable_dfs_chan_scan = -1;
+static bool is_mode_change_psoc_idle_shutdown;
 
 #define WLAN_NLINK_CESIUM 30
 
@@ -9256,11 +9257,20 @@ exit:
 	return errno;
 }
 
+static int __hdd_mode_change_psoc_idle_shutdown(struct hdd_context *hdd_ctx)
+{
+	is_mode_change_psoc_idle_shutdown = false;
+	return hdd_wlan_stop_modules(hdd_ctx, true);
+}
+
 int hdd_psoc_idle_shutdown(struct device *dev)
 {
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
-	return __hdd_psoc_idle_shutdown(hdd_ctx);
+	if (is_mode_change_psoc_idle_shutdown)
+		return __hdd_mode_change_psoc_idle_shutdown(hdd_ctx);
+	else
+		return __hdd_psoc_idle_shutdown(hdd_ctx);
 }
 
 static int __hdd_psoc_idle_restart(struct hdd_context *hdd_ctx)
@@ -13506,6 +13516,20 @@ hdd_parse_driver_mode(const char *mode_str, enum QDF_GLOBAL_MODE *out_mode)
 	return 0;
 }
 
+static int hdd_mode_change_psoc_idle_shutdown(struct device *dev)
+{
+	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+
+	return hdd_wlan_stop_modules(hdd_ctx, true);
+}
+
+static int hdd_mode_change_psoc_idle_restart(struct device *dev)
+{
+	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+
+	return hdd_wlan_start_modules(hdd_ctx, false);
+}
+
 /**
  * __hdd_driver_mode_change() - Handles a driver mode change
  * @hdd_ctx: Pointer to the global HDD context
@@ -13542,8 +13566,11 @@ static int __hdd_driver_mode_change(struct hdd_context *hdd_ctx,
 	/* ensure adapters are stopped */
 	hdd_stop_present_mode(hdd_ctx, curr_mode);
 
-	errno = hdd_wlan_stop_modules(hdd_ctx, true);
+	is_mode_change_psoc_idle_shutdown = true;
+	errno = pld_idle_shutdown(hdd_ctx->parent_dev,
+				  hdd_mode_change_psoc_idle_shutdown);
 	if (errno) {
+		is_mode_change_psoc_idle_shutdown = false;
 		hdd_err("Stop wlan modules failed");
 		return errno;
 	}
@@ -13553,7 +13580,8 @@ static int __hdd_driver_mode_change(struct hdd_context *hdd_ctx,
 
 	hdd_set_conparam(next_mode);
 
-	errno = hdd_wlan_start_modules(hdd_ctx, false);
+	errno = pld_idle_restart(hdd_ctx->parent_dev,
+				 hdd_mode_change_psoc_idle_restart);
 	if (errno) {
 		hdd_err("Start wlan modules failed: %d", errno);
 		return errno;

core/pld/src/pld_common.c

@@ -1279,7 +1279,10 @@ int pld_power_on(struct device *dev)
 
 	switch (pld_get_bus_type(dev)) {
 	case PLD_BUS_TYPE_PCIE:
-		ret = pld_pcie_power_on(dev);
+		/* cnss platform driver handles PCIe SoC
+		 * power on/off seqeunce so let CNSS driver
+		 * handle the power on sequence for PCIe SoC
+		 */
 		break;
 	case PLD_BUS_TYPE_SNOC:
 		ret = pld_snoc_power_on(dev);
@@ -1305,7 +1308,10 @@ int pld_power_off(struct device *dev)
 
 	switch (pld_get_bus_type(dev)) {
 	case PLD_BUS_TYPE_PCIE:
-		ret = pld_pcie_power_off(dev);
+		/* cnss platform driver handles PCIe SoC
+		 * power on/off seqeunce so let CNSS driver
+		 * handle the power off sequence for PCIe SoC
+		 */
 		break;
 	case PLD_BUS_TYPE_SNOC:
 		ret = pld_snoc_power_off(dev);
@@ -1841,9 +1847,11 @@ int pld_idle_shutdown(struct device *dev,
 		case PLD_BUS_TYPE_SDIO:
 		case PLD_BUS_TYPE_USB:
 		case PLD_BUS_TYPE_SNOC:
-		case PLD_BUS_TYPE_PCIE:
 			errno = shutdown_cb(dev);
 			break;
+		case PLD_BUS_TYPE_PCIE:
+			errno = pld_pcie_idle_shutdown(dev);
+			break;
 		default:
 			pr_err("Invalid device type %d\n", type);
 			break;
@@ -1866,9 +1874,11 @@ int pld_idle_restart(struct device *dev,
 		case PLD_BUS_TYPE_SDIO:
 		case PLD_BUS_TYPE_USB:
 		case PLD_BUS_TYPE_SNOC:
-		case PLD_BUS_TYPE_PCIE:
 			errno = restart_cb(dev);
 			break;
+		case PLD_BUS_TYPE_PCIE:
+			errno = pld_pcie_idle_restart(dev);
+			break;
 		default:
 			pr_err("Invalid device type %d\n", type);
 			break;

core/pld/src/pld_pcie.c

@@ -94,6 +94,49 @@ static void pld_pcie_remove(struct pci_dev *pdev)
 }
 
 #ifdef CONFIG_PLD_PCIE_CNSS
+/**
+ * pld_pcie_idle_restart_cb() - Perform idle restart
+ * @pdev: PCIE device
+ * @id: PCIE device ID
+ *
+ * This function will be called if there is an idle restart request
+ *
+ * Return: int
+ */
+static int pld_pcie_idle_restart_cb(struct pci_dev *pdev,
+				    const struct pci_device_id *id)
+{
+	struct pld_context *pld_context;
+
+	pld_context = pld_get_global_context();
+	if (pld_context->ops->idle_restart)
+		return pld_context->ops->idle_restart(&pdev->dev,
+						      PLD_BUS_TYPE_PCIE);
+
+	return -ENODEV;
+}
+
+/**
+ * pld_pcie_idle_shutdown_cb() - Perform idle shutdown
+ * @pdev: PCIE device
+ * @id: PCIE device ID
+ *
+ * This function will be called if there is an idle shutdown request
+ *
+ * Return: int
+ */
+static int pld_pcie_idle_shutdown_cb(struct pci_dev *pdev)
+{
+	struct pld_context *pld_context;
+
+	pld_context = pld_get_global_context();
+	if (pld_context->ops->shutdown)
+		return pld_context->ops->idle_shutdown(&pdev->dev,
+						       PLD_BUS_TYPE_PCIE);
+
+	return -ENODEV;
+}
+
 /**
  * pld_pcie_reinit() - SSR re-initialize function for PCIE device
  * @pdev: PCIE device
@@ -460,6 +503,8 @@ struct cnss_wlan_driver pld_pcie_ops = {
 	.id_table   = pld_pcie_id_table,
 	.probe      = pld_pcie_probe,
 	.remove     = pld_pcie_remove,
+	.idle_restart  = pld_pcie_idle_restart_cb,
+	.idle_shutdown = pld_pcie_idle_shutdown_cb,
 	.reinit     = pld_pcie_reinit,
 	.shutdown   = pld_pcie_shutdown,
 	.crash_shutdown = pld_pcie_crash_shutdown,

core/pld/src/pld_pcie.h

@@ -285,6 +285,16 @@ static inline int pld_pcie_power_off(struct device *dev)
 	return 0;
 }
 
+static inline int pld_pcie_idle_restart(struct device *dev)
+{
+	return 0;
+}
+
+static inline int pld_pcie_idle_shutdown(struct device *dev)
+{
+	return 0;
+}
+
 static inline int pld_pcie_force_assert_target(struct device *dev)
 {
 	return -EINVAL;
@@ -452,6 +462,16 @@ static inline int pld_pcie_power_off(struct device *dev)
 	return cnss_power_down(dev);
 }
 
+static inline int pld_pcie_idle_restart(struct device *dev)
+{
+	return cnss_idle_restart(dev);
+}
+
+static inline int pld_pcie_idle_shutdown(struct device *dev)
+{
+	return cnss_idle_shutdown(dev);
+}
+
 static inline int pld_pcie_force_assert_target(struct device *dev)
 {
 	return cnss_force_fw_assert(dev);