lkml.org 
[lkml]   [2019]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 120/191] silmbus: ngd: register controller after power up.
    Date
    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    [ Upstream commit 94fe5f2b45c4108885e4b71f6b181068632ec904 ]

    Register slimbus controller only after finishing powerup sequnce so that we
    do not endup in situation where core starts sending transactions before
    the controller is ready.

    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/slimbus/qcom-ngd-ctrl.c | 20 +++++++++++---------
    1 file changed, 11 insertions(+), 9 deletions(-)

    diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
    index e587be9064e74..d72f8eed2e8b7 100644
    --- a/drivers/slimbus/qcom-ngd-ctrl.c
    +++ b/drivers/slimbus/qcom-ngd-ctrl.c
    @@ -1234,8 +1234,17 @@ static int qcom_slim_ngd_enable(struct qcom_slim_ngd_ctrl *ctrl, bool enable)
    pm_runtime_resume(ctrl->dev);
    pm_runtime_mark_last_busy(ctrl->dev);
    pm_runtime_put(ctrl->dev);
    +
    + ret = slim_register_controller(&ctrl->ctrl);
    + if (ret) {
    + dev_err(ctrl->dev, "error adding slim controller\n");
    + return ret;
    + }
    +
    + dev_info(ctrl->dev, "SLIM controller Registered\n");
    } else {
    qcom_slim_qmi_exit(ctrl);
    + slim_unregister_controller(&ctrl->ctrl);
    }

    return 0;
    @@ -1360,11 +1369,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev)
    int ret;

    ctrl->ctrl.dev = dev;
    - ret = slim_register_controller(&ctrl->ctrl);
    - if (ret) {
    - dev_err(dev, "error adding slim controller\n");
    - return ret;
    - }

    pm_runtime_use_autosuspend(dev);
    pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND);
    @@ -1374,7 +1378,7 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev)
    ret = qcom_slim_ngd_qmi_svc_event_init(ctrl);
    if (ret) {
    dev_err(&pdev->dev, "QMI service registration failed:%d", ret);
    - goto err;
    + return ret;
    }

    INIT_WORK(&ctrl->m_work, qcom_slim_ngd_master_worker);
    @@ -1386,8 +1390,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev)
    }

    return 0;
    -err:
    - slim_unregister_controller(&ctrl->ctrl);
    wq_err:
    qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi);
    if (ctrl->mwq)
    @@ -1460,7 +1462,7 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev)
    struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev);

    pm_runtime_disable(&pdev->dev);
    - slim_unregister_controller(&ctrl->ctrl);
    + qcom_slim_ngd_enable(ctrl, false);
    qcom_slim_ngd_exit_dma(ctrl);
    qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi);
    if (ctrl->mwq)
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-10 04:11    [W:4.258 / U:0.624 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site