A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 04:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "slim-msm-ngd: Check current state of sub system restart notifier"

Browse source
This commit is contained in:
qctecmdr 2020-02-28 04:39:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit 40287648fd
2 changed files with 49 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

51
drivers/slimbus/slim-msm-ngd.c
View file

@ -272,9 +272,10 @@ static int dsp_domr_notify_cb(struct notifier_block *n, unsigned long code,
break;
case SUBSYS_AFTER_POWERUP:
case SERVREG_NOTIF_SERVICE_STATE_UP_V01:
SLIM_INFO(dev, "SLIM DSP SSR notify cb:%lu\n", code);
SLIM_INFO(dev, "SLIM DSP SSR notify cb:0x%x\n", code);
/* Hold wake lock until notify slaves thread is done */
pm_stay_awake(dev->dev);
atomic_set(&dev->init_in_progress, 1);
if (dev->lpass_mem_usage) {
dev->lpass_mem->start = dev->lpass_phy_base;
dev->lpass.base = dev->lpass_virt_base;
@ -301,9 +302,21 @@ static int dsp_domr_notify_cb(struct notifier_block *n, unsigned long code,
&cur);
SLIM_INFO(dev, "reg-PD client:%s with service:%s\n",
reg->client_name, reg->service_name);
SLIM_INFO(dev, "reg-PD dom:%s instance:%d, cur:%d\n",
SLIM_INFO(dev, "reg-PD dom:%s instance:%d, cur:0x%x\n",
reg->domain_list->name,
reg->domain_list->instance_id, cur);
if (cur == SERVREG_NOTIF_SERVICE_STATE_UP_V01) {
pm_stay_awake(dev->dev);
atomic_set(&dev->init_in_progress, 1);
if (dev->lpass_mem_usage) {
dev->lpass_mem->start = dev->lpass_phy_base;
dev->lpass.base = dev->lpass_virt_base;
}
atomic_set(&dev->ssr_in_progress, 0);
schedule_work(&dev->dsp.dom_up);
}
if (IS_ERR_OR_NULL(dev->dsp.domr))
ngd_reg_ssr(dev);
else
@ -1570,6 +1583,7 @@ static int ngd_slim_rx_msgq_thread(void *data)
struct msm_slim_ctrl *dev = (struct msm_slim_ctrl *)data;
struct completion *notify = &dev->rx_msgq_notify;
int ret = 0;
bool release_wake_lock = false;
while (!kthread_should_stop()) {
struct slim_msg_txn txn;
@ -1607,17 +1621,36 @@ capability_retry:
/* ADSP SSR, send device_up notifications */
if (prev_state == MSM_CTRL_DOWN)
complete(&dev->qmi.slave_notify);
else
release_wake_lock = true;
} else if (ret == -EIO) {
SLIM_WARN(dev, "capability message NACKed, retrying\n");
if (retries < INIT_MX_RETRIES) {
msleep(DEF_RETRY_MS);
retries++;
goto capability_retry;
} else {
release_wake_lock = true;
}
} else {
SLIM_WARN(dev, "SLIM: capability TX failed:%d\n", ret);
release_wake_lock = true;
}
if (release_wake_lock) {
/*
* As we are not going to reset the
* init_in_progress flag and release wake
* lock from notify slave thread, we are
* doing it here.
*/
atomic_set(&dev->init_in_progress, 0);
pm_relax(dev->dev);
release_wake_lock = false;
}
}
atomic_set(&dev->init_in_progress, 0);
pm_relax(dev->dev);
return 0;
}
@ -1672,7 +1705,10 @@ static int ngd_notify_slaves(void *data)
mutex_lock(&ctrl->m_ctrl);
}
mutex_unlock(&ctrl->m_ctrl);
atomic_set(&dev->init_in_progress, 0);
pm_relax(dev->dev);
}
atomic_set(&dev->init_in_progress, 0);
pm_relax(dev->dev);
return 0;
}
@ -1702,7 +1738,10 @@ static void ngd_dom_up(struct work_struct *work)
wait_for_completion_interruptible(&dev->qmi_up);
mutex_lock(&dev->ssr_lock);
ngd_slim_enable(dev, true);
if (ngd_slim_enable(dev, true)) {
atomic_set(&dev->init_in_progress, 0);
pm_relax(dev->dev);
}
mutex_unlock(&dev->ssr_lock);
}
@ -2203,6 +2242,12 @@ static int ngd_slim_suspend(struct device *dev)
cdev = platform_get_drvdata(pdev);
if (atomic_read(&cdev->init_in_progress)) {
ret = -EBUSY;
SLIM_INFO(cdev, "system suspend due to ssr: %d\n", ret);
return ret;
}
if (cdev->state == MSM_CTRL_AWAKE) {
ret = -EBUSY;
SLIM_INFO(cdev, "system suspend: %d\n", ret);

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

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