Piteball
/
android_kernel_samsung_msm8226
mirror of https://github.com/S3NEO/android_kernel_samsung_msm8226.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "ngd_slim: Decouple clock pause from power down/up"

This commit is contained in:
Linux Build Service Account 2014-05-21 11:34:23 -07:00 committed by Gerrit - the friendly Code Review server
parent 782645eb52 9bd4c719ee
commit 854d305299
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,17 +301,9 @@ static int ngd_xfer_msg(struct slim_controller *ctrl, struct slim_msg_txn *txn)
*/
ngd_slim_runtime_resume(dev->dev);
}
if ((txn->mc == (SLIM_MSG_CLK_PAUSE_SEQ_FLG |
SLIM_MSG_MC_RECONFIGURE_NOW)) &&
dev->state <= MSM_CTRL_IDLE) {
msm_slim_disconnect_endp(dev, &dev->rx_msgq,
&dev->use_rx_msgqs);
msm_slim_disconnect_endp(dev, &dev->tx_msgq,
&dev->use_tx_msgqs);
return msm_slim_qmi_power_request(dev, false);
}
else if (txn->mc & SLIM_MSG_CLK_PAUSE_SEQ_FLG)
return 0;
return -EPROTONOSUPPORT;
if (txn->mt == SLIM_MSG_MT_CORE &&
(txn->mc >= SLIM_MSG_MC_BEGIN_RECONFIGURATION &&
@ -385,6 +377,7 @@ static int ngd_xfer_msg(struct slim_controller *ctrl, struct slim_msg_txn *txn)
if (report_sat == false && dev->state != MSM_CTRL_AWAKE) {
SLIM_ERR(dev, "controller not ready\n");
mutex_unlock(&dev->tx_lock);
pm_runtime_set_suspended(dev->dev);
msm_slim_put_ctrl(dev);
return -EREMOTEIO;
}
@ -1074,20 +1067,7 @@ static int ngd_slim_enable(struct msm_slim_ctrl *dev, bool enable)
ret = msm_slim_qmi_init(dev, false);
/* controller state should be in sync with framework state */
if (!ret) {
ret = slim_ctrl_clk_pause(&dev->ctrl, false,
SLIM_CLK_UNSPECIFIED);
complete(&dev->qmi.qmi_comp);
/*
* Power-up won't be called if clock pause failed.
* This can happen if ADSP SSR happened when audio
* session is in progress. Framework will think that
* clock pause failed so no need to wakeup controller.
* Call power-up explicitly in that case, since slimbus
* HW needs to be powered-on to be in sync with
* framework state
*/
if (ret)
ngd_slim_power_up(dev, false);
if (!pm_runtime_enabled(dev->dev) ||
!pm_runtime_suspended(dev->dev))
ngd_slim_runtime_resume(dev->dev);
@ -1105,10 +1085,25 @@ static int ngd_slim_enable(struct msm_slim_ctrl *dev, bool enable)
return ret;
}
static int ngd_clk_pause_wakeup(struct slim_controller *ctrl)
static int ngd_slim_power_down(struct msm_slim_ctrl *dev)
{
struct msm_slim_ctrl *dev = slim_get_ctrldata(ctrl);
return ngd_slim_power_up(dev, false);
int i;
struct slim_controller *ctrl = &dev->ctrl;
mutex_lock(&ctrl->m_ctrl);
/* Pending response for a message */
for (i = 0; i < ctrl->last_tid; i++) {
if (ctrl->txnt[i]) {
SLIM_INFO(dev, "NGD down:txn-rsp for %d pending", i);
mutex_unlock(&ctrl->m_ctrl);
return -EBUSY;
}
}
mutex_unlock(&ctrl->m_ctrl);
msm_slim_disconnect_endp(dev, &dev->rx_msgq,
&dev->use_rx_msgqs);
msm_slim_disconnect_endp(dev, &dev->tx_msgq,
&dev->use_tx_msgqs);
return msm_slim_qmi_power_request(dev, false);
}
static int ngd_slim_rx_msgq_thread(void *data)
@ -1365,7 +1360,7 @@ static int __devinit ngd_slim_probe(struct platform_device *pdev)
dev->ctrl.allocbw = ngd_allocbw;
dev->ctrl.xfer_msg = ngd_xfer_msg;
dev->ctrl.xfer_user_msg = ngd_user_msg;
dev->ctrl.wakeup = ngd_clk_pause_wakeup;
dev->ctrl.wakeup = NULL;
dev->ctrl.alloc_port = msm_alloc_port;
dev->ctrl.dealloc_port = msm_dealloc_port;
dev->ctrl.port_xfer = msm_slim_port_xfer;
@ -1528,9 +1523,9 @@ static int ngd_slim_runtime_resume(struct device *device)
struct msm_slim_ctrl *dev = platform_get_drvdata(pdev);
int ret = 0;
if (dev->state >= MSM_CTRL_ASLEEP)
ret = slim_ctrl_clk_pause(&dev->ctrl, true, 0);
ret = ngd_slim_power_up(dev, false);
if (ret) {
/* Did SSR cause this clock pause failure */
/* Did SSR cause this power up failure */
if (dev->state != MSM_CTRL_DOWN)
dev->state = MSM_CTRL_ASLEEP;
else
@ -1548,10 +1543,10 @@ static int ngd_slim_runtime_suspend(struct device *device)
struct platform_device *pdev = to_platform_device(device);
struct msm_slim_ctrl *dev = platform_get_drvdata(pdev);
int ret = 0;
ret = slim_ctrl_clk_pause(&dev->ctrl, false, SLIM_CLK_UNSPECIFIED);
ret = ngd_slim_power_down(dev);
if (ret) {
if (ret != -EBUSY)
SLIM_INFO(dev, "clk pause not entered:%d\n", ret);
SLIM_INFO(dev, "slim resource not idle:%d\n", ret);
dev->state = MSM_CTRL_AWAKE;
} else {
dev->state = MSM_CTRL_ASLEEP;