pa-fazil
/
dragonheart_kernel_oneplus_sm8150
mirror of https://github.com/fazilsheik96/dragonheart_kernel_oneplus_sm8150.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "slim-msm-ngd: Depend on PIL driver notification instead of qmi" 

This reverts commit 588c40613d63f84d16a3c50a1d3c15f5ed5f1069.

Change-Id: I89656b14d2da067e5d3cb11611894ae137e41b7b
Signed-off-by: Chandana Kishori Chiluveru <cchiluve@codeaurora.org>
This commit is contained in:
Chandana Kishori Chiluveru 2021-10-14 13:06:11 +05:30 committed by Anvesh Salveru
parent 117650a7a9
commit 501a8924cf
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/slimbus/slim-msm-ngd.c
View File

@ -176,7 +176,8 @@ static int ngd_slim_qmi_new_server(struct qmi_handle *hdl,
qmi->svc_info.sq_family = AF_QIPCRTR;
qmi->svc_info.sq_node = service->node;
qmi->svc_info.sq_port = service->port;
complete(&dev->qmi_up);
atomic_set(&dev->ssr_in_progress, 0);
schedule_work(&dev->dsp.dom_up);
return 0;
}
@ -186,10 +187,7 @@ static void ngd_slim_qmi_del_server(struct qmi_handle *hdl,
{
struct msm_slim_qmi *qmi =
container_of(hdl, struct msm_slim_qmi, svc_event_hdl);
struct msm_slim_ctrl *dev =
container_of(qmi, struct msm_slim_ctrl, qmi);
reinit_completion(&dev->qmi_up);
qmi->svc_info.sq_node = 0;
qmi->svc_info.sq_port = 0;
}
@ -265,7 +263,7 @@ static int dsp_domr_notify_cb(struct notifier_block *n, unsigned long code,
switch (code) {
case SUBSYS_BEFORE_SHUTDOWN:
case SERVREG_NOTIF_SERVICE_STATE_DOWN_V01:
SLIM_INFO(dev, "SLIM DSP SSR notify cb:0x%lx\n", code);
SLIM_INFO(dev, "SLIM DSP SSR notify cb:%lu\n", code);
atomic_set(&dev->ssr_in_progress, 1);
/* wait for current transaction */
mutex_lock(&dev->tx_lock);
@ -277,12 +275,6 @@ static int dsp_domr_notify_cb(struct notifier_block *n, unsigned long code,
ngd_dom_down(dev);
mutex_unlock(&dev->tx_lock);
break;
case SUBSYS_AFTER_POWERUP:
case SERVREG_NOTIF_SERVICE_STATE_UP_V01:
SLIM_INFO(dev, "SLIM DSP SSR notify cb:0x%lx\n", code);
atomic_set(&dev->ssr_in_progress, 0);
schedule_work(&dev->dsp.dom_up);
break;
case LOCATOR_UP:
reg = _cmd;
if (!reg || reg->total_domains != 1) {
@ -1630,7 +1622,6 @@ static int ngd_notify_slaves(void *data)
pr_err("Slimbus QMI service registration failed:%d", ret);
return ret;
}
ngd_dom_init(dev);
while (!kthread_should_stop()) {
wait_for_completion_interruptible(&dev->qmi.slave_notify);
@ -1646,6 +1637,7 @@ static int ngd_notify_slaves(void *data)
* controller is up
*/
slim_ctrl_add_boarddevs(&dev->ctrl);
ngd_dom_init(dev);
} else {
slim_framer_booted(ctrl);
}
@ -1691,10 +1683,6 @@ static void ngd_dom_up(struct work_struct *work)
container_of(work, struct msm_slim_ss, dom_up);
struct msm_slim_ctrl *dev =
container_of(dsp, struct msm_slim_ctrl, dsp);
/* Make sure qmi service is up before continuing */
wait_for_completion_interruptible(&dev->qmi_up);
mutex_lock(&dev->ssr_lock);
ngd_slim_enable(dev, true);
mutex_unlock(&dev->ssr_lock);
@ -1934,7 +1922,6 @@ static int ngd_slim_probe(struct platform_device *pdev)
init_completion(&dev->reconf);
init_completion(&dev->ctrl_up);
init_completion(&dev->qmi_up);
mutex_init(&dev->tx_lock);
mutex_init(&dev->ssr_lock);
spin_lock_init(&dev->tx_buf_lock);

1
drivers/slimbus/slim-msm.h
View File

@ -327,7 +327,6 @@ struct msm_slim_ctrl {
u32 current_rx_buf[10];
int current_count;
atomic_t ssr_in_progress;
struct completion qmi_up;
};
struct msm_sat_chan {