samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rmnet: Convert to use remoteproc notifications

Browse Source 
Support rmnet_ipa driver to register for remoteproc notifications
along with legacy subsys notifier.

Change-Id: Ibce7ad0efa5c264f9649f69ee2f98fc0bdc66ad9
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>
This commit is contained in:
Michael Adisumarta
2020-12-28 17:57:05 -08:00
parent b54510f96d
commit eb1d4087ae
1 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
View File

@@ -24,6 +24,7 @@
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <soc/qcom/subsystem_restart.h> #include <soc/qcom/subsystem_restart.h>
#include <soc/qcom/subsystem_notif.h> #include <soc/qcom/subsystem_notif.h>
#include <linux/remoteproc/qcom_rproc.h>
#include "ipa_qmi_service.h" #include "ipa_qmi_service.h"
#include <linux/rmnet_ipa_fd_ioctl.h> #include <linux/rmnet_ipa_fd_ioctl.h>
#include <linux/ipa.h> #include <linux/ipa.h>
@@ -2884,7 +2885,11 @@ static int ipa3_lcl_mdm_ssr_notifier_cb(struct notifier_block *this,
} }
switch (code) { switch (code) {
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_BEFORE_SHUTDOWN:
#else
case SUBSYS_BEFORE_SHUTDOWN: case SUBSYS_BEFORE_SHUTDOWN:
#endif
IPAWANINFO("IPA received MPSS BEFORE_SHUTDOWN\n"); IPAWANINFO("IPA received MPSS BEFORE_SHUTDOWN\n");
/* send SSR before-shutdown notification to IPACM */ /* send SSR before-shutdown notification to IPACM */
rmnet_ipa_send_ssr_notification(false); rmnet_ipa_send_ssr_notification(false);
@@ -2905,7 +2910,11 @@ static int ipa3_lcl_mdm_ssr_notifier_cb(struct notifier_block *this,
ipa3_odl_pipe_cleanup(true); ipa3_odl_pipe_cleanup(true);
IPAWANINFO("IPA BEFORE_SHUTDOWN handling is complete\n"); IPAWANINFO("IPA BEFORE_SHUTDOWN handling is complete\n");
break; break;
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_AFTER_SHUTDOWN:
#else
case SUBSYS_AFTER_SHUTDOWN: case SUBSYS_AFTER_SHUTDOWN:
#endif
IPAWANINFO("IPA Received MPSS AFTER_SHUTDOWN\n"); IPAWANINFO("IPA Received MPSS AFTER_SHUTDOWN\n");
if (atomic_read(&rmnet_ipa3_ctx->is_ssr) && if (atomic_read(&rmnet_ipa3_ctx->is_ssr) &&
ipa3_ctx_get_type(IPA_HW_TYPE) < IPA_HW_v4_0) ipa3_ctx_get_type(IPA_HW_TYPE) < IPA_HW_v4_0)
@@ -2916,7 +2925,11 @@ static int ipa3_lcl_mdm_ssr_notifier_cb(struct notifier_block *this,
IPAWANINFO("IPA AFTER_SHUTDOWN handling is complete\n"); IPAWANINFO("IPA AFTER_SHUTDOWN handling is complete\n");
break; break;
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_BEFORE_POWERUP:
#else
case SUBSYS_BEFORE_POWERUP: case SUBSYS_BEFORE_POWERUP:
#endif
IPAWANINFO("IPA received MPSS BEFORE_POWERUP\n"); IPAWANINFO("IPA received MPSS BEFORE_POWERUP\n");
if (atomic_read(&rmnet_ipa3_ctx->is_ssr)) { if (atomic_read(&rmnet_ipa3_ctx->is_ssr)) {
/* clean up cached QMI msg/handlers */ /* clean up cached QMI msg/handlers */
@@ -2928,7 +2941,11 @@ static int ipa3_lcl_mdm_ssr_notifier_cb(struct notifier_block *this,
ipa3_reset_freeze_vote(); ipa3_reset_freeze_vote();
IPAWANINFO("IPA BEFORE_POWERUP handling is complete\n"); IPAWANINFO("IPA BEFORE_POWERUP handling is complete\n");
break; break;
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_AFTER_POWERUP:
#else
case SUBSYS_AFTER_POWERUP: case SUBSYS_AFTER_POWERUP:
#endif
IPAWANINFO("IPA received MPSS AFTER_POWERUP\n"); IPAWANINFO("IPA received MPSS AFTER_POWERUP\n");
if (!atomic_read(&rmnet_ipa3_ctx->is_initialized) && if (!atomic_read(&rmnet_ipa3_ctx->is_initialized) &&
atomic_read(&rmnet_ipa3_ctx->is_ssr)) atomic_read(&rmnet_ipa3_ctx->is_ssr))
@@ -2962,16 +2979,32 @@ static int ipa3_rmt_mdm_ssr_notifier_cb(struct notifier_block *this,
} }
switch (code) { switch (code) {
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_BEFORE_SHUTDOWN:
#else
case SUBSYS_BEFORE_SHUTDOWN: case SUBSYS_BEFORE_SHUTDOWN:
#endif
IPAWANINFO("IPA received RMT MPSS BEFORE_SHUTDOWN\n"); IPAWANINFO("IPA received RMT MPSS BEFORE_SHUTDOWN\n");
break; break;
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_AFTER_SHUTDOWN:
#else
case SUBSYS_AFTER_SHUTDOWN: case SUBSYS_AFTER_SHUTDOWN:
#endif
IPAWANINFO("IPA Received RMT MPSS AFTER_SHUTDOWN\n"); IPAWANINFO("IPA Received RMT MPSS AFTER_SHUTDOWN\n");
break; break;
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_BEFORE_POWERUP:
#else
case SUBSYS_BEFORE_POWERUP: case SUBSYS_BEFORE_POWERUP:
#endif
IPAWANINFO("IPA received RMT MPSS BEFORE_POWERUP\n"); IPAWANINFO("IPA received RMT MPSS BEFORE_POWERUP\n");
break; break;
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
case QCOM_SSR_AFTER_POWERUP:
#else
case SUBSYS_AFTER_POWERUP: case SUBSYS_AFTER_POWERUP:
#endif
IPAWANINFO("IPA received RMT MPSS AFTER_POWERUP\n"); IPAWANINFO("IPA received RMT MPSS AFTER_POWERUP\n");
break; break;
default: default:
@@ -4938,8 +4971,13 @@ int ipa3_wwan_init(void)
rmnet_ipa_debugfs_init(); rmnet_ipa_debugfs_init();
/* Register for Local Modem SSR */ /* Register for Local Modem SSR */
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
ssr_hdl = qcom_register_ssr_notifier(SUBSYS_LOCAL_MODEM,
&ipa3_lcl_mdm_ssr_notifier);
#else
ssr_hdl = subsys_notif_register_notifier(SUBSYS_LOCAL_MODEM, ssr_hdl = subsys_notif_register_notifier(SUBSYS_LOCAL_MODEM,
&ipa3_lcl_mdm_ssr_notifier); &ipa3_lcl_mdm_ssr_notifier);
#endif
if (!IS_ERR(ssr_hdl)) if (!IS_ERR(ssr_hdl))
rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle = ssr_hdl; rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle = ssr_hdl;
else if (!rmnet_ipa3_ctx->ipa_config_is_apq) { else if (!rmnet_ipa3_ctx->ipa_config_is_apq) {
@@ -4950,8 +4988,13 @@ int ipa3_wwan_init(void)
if (rmnet_ipa3_ctx->ipa_config_is_apq) { if (rmnet_ipa3_ctx->ipa_config_is_apq) {
/* Register for Remote Modem SSR */ /* Register for Remote Modem SSR */
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
ssr_hdl = qcom_register_ssr_notifier(SUBSYS_REMOTE_MODEM,
&ipa3_rmt_mdm_ssr_notifier);
#else
ssr_hdl = subsys_notif_register_notifier(SUBSYS_REMOTE_MODEM, ssr_hdl = subsys_notif_register_notifier(SUBSYS_REMOTE_MODEM,
&ipa3_rmt_mdm_ssr_notifier); &ipa3_rmt_mdm_ssr_notifier);
#endif
if (IS_ERR(ssr_hdl)) { if (IS_ERR(ssr_hdl)) {
rc = PTR_ERR(ssr_hdl); rc = PTR_ERR(ssr_hdl);
IPAWANERR_RL("remote modem ssr register fail rc=%d\n", IPAWANERR_RL("remote modem ssr register fail rc=%d\n",
@@ -4967,9 +5010,15 @@ int ipa3_wwan_init(void)
fail_unreg_lcl_mdm_ssr: fail_unreg_lcl_mdm_ssr:
if (rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle) { if (rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle) {
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
qcom_unregister_ssr_notifier(
rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle,
&ipa3_lcl_mdm_ssr_notifier);
#else
subsys_notif_unregister_notifier( subsys_notif_unregister_notifier(
rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle, rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle,
&ipa3_lcl_mdm_ssr_notifier); &ipa3_lcl_mdm_ssr_notifier);
#endif
rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle = NULL; rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle = NULL;
} }
fail_dbgfs_rm: fail_dbgfs_rm:
@@ -4983,18 +5032,30 @@ void ipa3_wwan_cleanup(void)
platform_driver_unregister(&rmnet_ipa_driver); platform_driver_unregister(&rmnet_ipa_driver);
if (rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle) { if (rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle) {
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
ret = qcom_unregister_ssr_notifier(
rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle,
&ipa3_lcl_mdm_ssr_notifier);
#else
ret = subsys_notif_unregister_notifier( ret = subsys_notif_unregister_notifier(
rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle, rmnet_ipa3_ctx->lcl_mdm_subsys_notify_handle,
&ipa3_lcl_mdm_ssr_notifier); &ipa3_lcl_mdm_ssr_notifier);
#endif
if (ret) if (ret)
IPAWANERR( IPAWANERR(
"Failed to unregister subsys %s notifier ret=%d\n", "Failed to unregister subsys %s notifier ret=%d\n",
SUBSYS_LOCAL_MODEM, ret); SUBSYS_LOCAL_MODEM, ret);
} }
if (rmnet_ipa3_ctx->rmt_mdm_subsys_notify_handle) { if (rmnet_ipa3_ctx->rmt_mdm_subsys_notify_handle) {
#if IS_ENABLED(CONFIG_QCOM_Q6V5_PAS)
ret = qcom_unregister_ssr_notifier(
rmnet_ipa3_ctx->rmt_mdm_subsys_notify_handle,
&ipa3_rmt_mdm_ssr_notifier);
#else
ret = subsys_notif_unregister_notifier( ret = subsys_notif_unregister_notifier(
rmnet_ipa3_ctx->rmt_mdm_subsys_notify_handle, rmnet_ipa3_ctx->rmt_mdm_subsys_notify_handle,
&ipa3_rmt_mdm_ssr_notifier); &ipa3_rmt_mdm_ssr_notifier);
#endif
if (ret) if (ret)
IPAWANERR( IPAWANERR(
"Failed to unregister subsys %s notifier ret=%d\n", "Failed to unregister subsys %s notifier ret=%d\n",