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

Commit 593d0568 authored by Arjun Singh's avatar Arjun Singh Committed by Gerrit - the friendly Code Review server
Browse files

soc: qcom: bgrsb: provide synchronization between enable/disable rsb 



Avoids race condition between enable/disable rsb to keep
rsb in proper state.

Change-Id: Ia02defbe4e11b92be0eace6bca37e5022bab79eb
Signed-off-by: default avatarArjun Singh <arsingh@codeaurora.org>
parent 3901f5f2

drivers/soc/qcom/bg_rsb.c

+31 −12
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ struct bgrsb_priv { 
	struct input_dev *input;

	struct mutex glink_mutex;



	struct mutex rsb_state_mutex;



	enum bgrsb_state bgrsb_current_state;

	enum glink_link_state link_state;
@@ -651,9 +653,10 @@ static void bgrsb_enable_rsb(struct work_struct *work) 
	struct bgrsb_priv *dev = container_of(work, struct bgrsb_priv,

								rsb_up_work);



	mutex_lock(&dev->rsb_state_mutex);

	if (dev->bgrsb_current_state != BGRSB_STATE_RSB_CONFIGURED) {

		pr_err("BG is not yet configured for RSB\n");

		return;

		goto unlock;

	}



	if (bgrsb_ldo_work(dev, BGRSB_ENABLE_LDO15) == 0) {
@@ -663,7 +666,7 @@ static void bgrsb_enable_rsb(struct work_struct *work) 
			pr_err("Failed to send enable command to BG\n");

			bgrsb_ldo_work(dev, BGRSB_DISABLE_LDO15);

			dev->bgrsb_current_state = BGRSB_STATE_RSB_CONFIGURED;

			return;

			goto unlock;

		}

	}

	dev->bgrsb_current_state = BGRSB_STATE_RSB_ENABLED;
@@ -673,6 +676,9 @@ static void bgrsb_enable_rsb(struct work_struct *work) 
		dev->calibration_needed = false;

		queue_work(dev->bgrsb_wq, &dev->rsb_calibration_work);

	}

unlock:

	mutex_unlock(&dev->rsb_state_mutex);



}



static void bgrsb_disable_rsb(struct work_struct *work)
@@ -681,20 +687,24 @@ static void bgrsb_disable_rsb(struct work_struct *work) 
	struct bgrsb_priv *dev = container_of(work, struct bgrsb_priv,

								rsb_down_work);



	mutex_lock(&dev->rsb_state_mutex);

	if (dev->bgrsb_current_state == BGRSB_STATE_RSB_ENABLED) {



		rc = bgrsb_enable(dev, false);

		if (rc != 0) {

			pr_err("Failed to send disable command to BG\n");

			return;

			goto unlock;

		}



		if (bgrsb_ldo_work(dev, BGRSB_DISABLE_LDO15) != 0)

			return;

			goto unlock;



		dev->bgrsb_current_state = BGRSB_STATE_RSB_CONFIGURED;

		pr_debug("RSB Disabled\n");

	}



unlock:

	mutex_unlock(&dev->rsb_state_mutex);

}



static void bgrsb_calibration(struct work_struct *work)
@@ -763,13 +773,9 @@ static int split_bg_work(struct bgrsb_priv *dev, char *str) 


	switch (val) {

	case BGRSB_POWER_DISABLE:

		if (dev->bgrsb_current_state == BGRSB_STATE_RSB_CONFIGURED)

			return 0;

		queue_work(dev->bgrsb_wq, &dev->rsb_down_work);

		break;

	case BGRSB_POWER_ENABLE:

		if (dev->bgrsb_current_state == BGRSB_STATE_RSB_ENABLED)

			return 0;

		queue_work(dev->bgrsb_wq, &dev->rsb_up_work);

		break;

	case BGRSB_POWER_CALIBRATION:
@@ -857,6 +863,7 @@ static int bgrsb_init(struct bgrsb_priv *dev) 
	dev->chnl.chnl_edge = "bg";

	dev->chnl.chnl_trnsprt = "bgcom";

	mutex_init(&dev->glink_mutex);

	mutex_init(&dev->rsb_state_mutex);

	dev->link_state = GLINK_LINK_STATE_DOWN;



	dev->ldo_action = BGRSB_NO_ACTION;
@@ -981,18 +988,24 @@ static int bg_rsb_resume(struct device *pldev) 
	struct platform_device *pdev = to_platform_device(pldev);

	struct bgrsb_priv *dev = platform_get_drvdata(pdev);



	mutex_lock(&dev->rsb_state_mutex);

	if (dev->bgrsb_current_state == BGRSB_STATE_RSB_CONFIGURED)

		return 0;

		goto ret_success;



	if (dev->bgrsb_current_state == BGRSB_STATE_INIT) {

		if (bgrsb_ldo_work(dev, BGRSB_ENABLE_LDO11) == 0) {

			dev->bgrsb_current_state = BGRSB_STATE_RSB_CONFIGURED;

			pr_debug("RSB Cofigured\n");

			return 0;

			goto ret_success;

		}

		pr_err("RSB failed to resume\n");

	}

	mutex_unlock(&dev->rsb_state_mutex);

	return -EINVAL;



ret_success:

	mutex_unlock(&dev->rsb_state_mutex);

	return 0;

}



static int bg_rsb_suspend(struct device *pldev)
@@ -1000,8 +1013,9 @@ static int bg_rsb_suspend(struct device *pldev) 
	struct platform_device *pdev = to_platform_device(pldev);

	struct bgrsb_priv *dev = platform_get_drvdata(pdev);



	mutex_lock(&dev->rsb_state_mutex);

	if (dev->bgrsb_current_state == BGRSB_STATE_INIT)

		return 0;

		goto ret_success;



	if (dev->bgrsb_current_state == BGRSB_STATE_RSB_ENABLED) {

		if (bgrsb_ldo_work(dev, BGRSB_DISABLE_LDO15) != 0)
@@ -1011,12 +1025,17 @@ static int bg_rsb_suspend(struct device *pldev) 
	if (bgrsb_ldo_work(dev, BGRSB_DISABLE_LDO11) == 0) {

		dev->bgrsb_current_state = BGRSB_STATE_INIT;

		pr_debug("RSB Init\n");

		return 0;

		goto ret_success;

	}



ret_err:

	pr_err("RSB failed to suspend\n");

	mutex_unlock(&dev->rsb_state_mutex);

	return -EINVAL;



ret_success:

	mutex_unlock(&dev->rsb_state_mutex);

	return 0;

}



static const struct of_device_id bg_rsb_of_match[] = {