Merge "msm: ipa: do not remove wwan_ioctl device during SSR" (d6bdd804) · Commits · e / devices / android_kernel_sony_msm8994

drivers/platform/msm/ipa/ipa_qmi_service.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,8 @@ int wan_ioctl_init(void);

		void wan_ioctl_stop_qmi_messages(void);

		void wan_ioctl_enable_qmi_messages(void);

		void wan_ioctl_deinit(void);

		extern struct elem_info ipa_init_modem_driver_req_msg_data_v01_ei[];

+12 −5

Original line number	Diff line number	Diff line
		@@ -1654,10 +1654,15 @@ static int ipa_wwan_probe(struct platform_device *pdev)
		if (ret)
		goto setup_dflt_wan_rt_tables_err;

		/* start transport-driver fd ioctl for ipacm */
		if (!atomic_read(&is_ssr)) {
		/* Start transport-driver fd ioctl for ipacm for first init */
		ret = wan_ioctl_init();
		if (ret)
		goto wan_ioctl_init_err;
		} else {
		/* Enable sending QMI messages after SSR */
		wan_ioctl_enable_qmi_messages();
		}

		/* initialize tx/rx enpoint setup */
		memset(&apps_to_ipa_ep_cfg, 0, sizeof(struct ipa_sys_connect_params));
		@@ -1815,6 +1820,8 @@ static int ipa_wwan_remove(struct platform_device *pdev)
		IPA_RM_RESOURCE_WWAN_0_PROD, ret);
		free_netdev(ipa_netdevs[0]);
		ipa_netdevs[0] = NULL;
		/* No need to remove wwan_ioctl during SSR */
		if (!atomic_read(&is_ssr))
		wan_ioctl_deinit();
		ipa_del_dflt_wan_rt_tables();
		ipa_del_a7_qmap_hdr();

+5 −0

Original line number	Diff line number	Diff line
		@@ -197,6 +197,11 @@ void wan_ioctl_stop_qmi_messages(void)
		process_ioctl = 0;
		}

		void wan_ioctl_enable_qmi_messages(void)
		{
		process_ioctl = 1;
		}

		void wan_ioctl_deinit(void)
		{
		cdev_del(&wan_ioctl_cdev);