Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c45e07 authored by Ramprasad Katkam's avatar Ramprasad Katkam
Browse files

soc: swr-mstr: Avoid race condition during device up 



During device up call from platform driver, if master
is already up pm get_sync is currently skipped. However
pm suspend can get called after this check. Hence do a pm
get_sync even if master is already up to avoid race
condition.

Change-Id: I1779db3d65f58bda220d1ec07706e91745814c1f
Signed-off-by: default avatarRamprasad Katkam <katkam@codeaurora.org>
parent 6bbd1d46

soc/swr-mstr-ctrl.c

+12 −20
Original line number Original line Diff line number Diff line
@@ -1191,6 +1191,7 @@ static int swrm_disconnect_port(struct swr_master *master, 
		if (!port_req) {

		if (!port_req) {

			dev_err(&master->dev, "%s:port not enabled : port %d\n",

			dev_err(&master->dev, "%s:port not enabled : port %d\n",

					 __func__, portinfo->port_id[i]);

					 __func__, portinfo->port_id[i]);

			mutex_unlock(&swrm->mlock);

			return -EINVAL;

			return -EINVAL;

		}

		}

		port_req->req_ch &= ~portinfo->ch_en[i];

		port_req->req_ch &= ~portinfo->ch_en[i];
@@ -2108,15 +2109,7 @@ int swrm_wcd_notify(struct platform_device *pdev, u32 id, void *data) 
	case SWR_DEVICE_UP:

	case SWR_DEVICE_UP:

		dev_dbg(swrm->dev, "%s: swr master up called\n", __func__);

		dev_dbg(swrm->dev, "%s: swr master up called\n", __func__);

		mutex_lock(&swrm->mlock);

		mutex_lock(&swrm->mlock);

		mutex_lock(&swrm->reslock);

		if (swrm->state == SWR_MSTR_UP) {

			dev_dbg(swrm->dev, "%s: SWR master is already UP: %d\n",

				__func__, swrm->state);

			list_for_each_entry(swr_dev, &mstr->devices, dev_list)

				swr_reset_device(swr_dev);

		} else {

		pm_runtime_mark_last_busy(&pdev->dev);

		pm_runtime_mark_last_busy(&pdev->dev);

			mutex_unlock(&swrm->reslock);

		pm_runtime_get_sync(&pdev->dev);

		pm_runtime_get_sync(&pdev->dev);

		mutex_lock(&swrm->reslock);

		mutex_lock(&swrm->reslock);

		list_for_each_entry(swr_dev, &mstr->devices, dev_list) {

		list_for_each_entry(swr_dev, &mstr->devices, dev_list) {
@@ -2130,7 +2123,6 @@ int swrm_wcd_notify(struct platform_device *pdev, u32 id, void *data) 
		}

		}

		pm_runtime_mark_last_busy(&pdev->dev);

		pm_runtime_mark_last_busy(&pdev->dev);

		pm_runtime_put_autosuspend(&pdev->dev);

		pm_runtime_put_autosuspend(&pdev->dev);

		}

		mutex_unlock(&swrm->reslock);

		mutex_unlock(&swrm->reslock);

		mutex_unlock(&swrm->mlock);

		mutex_unlock(&swrm->mlock);

		break;

		break;