Commit 02545aa3 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Vinod Koul
Browse files

phy: qcom-qmp-combo: Move phy_mutex out of com_init/exit 



With the upcoming introduction of USB Type-C orientation switching the
region of mutual exclusion needs to be extended to cover both the common
init/exit as well as the individual functions.

So move the phy_mutex one step up the stack.

Reviewed-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Tested-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Tested-by: default avatarSteev Klimaszewski <steev@kali.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on HDK8450
Tested-by: Johan Hovold <johan+linaro@kernel.org>	# X13s
Signed-off-by: default avatarBjorn Andersson <quic_bjorande@quicinc.com>
Link: https://lore.kernel.org/r/20230515032743.400170-3-quic_bjorande@quicinc.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 6c0237db

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+28 −19
Original line number Original line Diff line number Diff line
@@ -2463,11 +2463,8 @@ static int qmp_combo_com_init(struct qmp_combo *qmp) 
	void __iomem *com = qmp->com;

	void __iomem *com = qmp->com;

	int ret;

	int ret;





	mutex_lock(&qmp->phy_mutex);

	if (qmp->init_count++)

	if (qmp->init_count++) {

		mutex_unlock(&qmp->phy_mutex);

		return 0;

		return 0;

	}





	ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs);

	ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs);

	if (ret) {

	if (ret) {
@@ -2514,8 +2511,6 @@ static int qmp_combo_com_init(struct qmp_combo *qmp) 
	qphy_setbits(qmp->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],

	qphy_setbits(qmp->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],

			SW_PWRDN);

			SW_PWRDN);





	mutex_unlock(&qmp->phy_mutex);



	return 0;

	return 0;





err_assert_reset:

err_assert_reset:
@@ -2524,7 +2519,6 @@ static int qmp_combo_com_init(struct qmp_combo *qmp) 
	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);

	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);

err_decrement_count:

err_decrement_count:

	qmp->init_count--;

	qmp->init_count--;

	mutex_unlock(&qmp->phy_mutex);





	return ret;

	return ret;

}

}
@@ -2533,11 +2527,8 @@ static int qmp_combo_com_exit(struct qmp_combo *qmp) 
{

{

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	const struct qmp_phy_cfg *cfg = qmp->cfg;





	mutex_lock(&qmp->phy_mutex);

	if (--qmp->init_count)

	if (--qmp->init_count) {

		mutex_unlock(&qmp->phy_mutex);

		return 0;

		return 0;

	}





	reset_control_bulk_assert(cfg->num_resets, qmp->resets);

	reset_control_bulk_assert(cfg->num_resets, qmp->resets);
@@ -2545,8 +2536,6 @@ static int qmp_combo_com_exit(struct qmp_combo *qmp) 




	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);

	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);





	mutex_unlock(&qmp->phy_mutex);



	return 0;

	return 0;

}

}
@@ -2556,21 +2545,29 @@ static int qmp_combo_dp_init(struct phy *phy) 
	const struct qmp_phy_cfg *cfg = qmp->cfg;

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	int ret;

	int ret;





	mutex_lock(&qmp->phy_mutex);



	ret = qmp_combo_com_init(qmp);

	ret = qmp_combo_com_init(qmp);

	if (ret)

	if (ret)

		return ret;

		goto out_unlock;





	cfg->dp_aux_init(qmp);

	cfg->dp_aux_init(qmp);





	return 0;

out_unlock:

	mutex_unlock(&qmp->phy_mutex);

	return ret;

}

}





static int qmp_combo_dp_exit(struct phy *phy)

static int qmp_combo_dp_exit(struct phy *phy)

{

{

	struct qmp_combo *qmp = phy_get_drvdata(phy);

	struct qmp_combo *qmp = phy_get_drvdata(phy);





	mutex_lock(&qmp->phy_mutex);



	qmp_combo_com_exit(qmp);

	qmp_combo_com_exit(qmp);





	mutex_unlock(&qmp->phy_mutex);



	return 0;

	return 0;

}

}
@@ -2687,14 +2684,19 @@ static int qmp_combo_usb_init(struct phy *phy) 
	struct qmp_combo *qmp = phy_get_drvdata(phy);

	struct qmp_combo *qmp = phy_get_drvdata(phy);

	int ret;

	int ret;





	mutex_lock(&qmp->phy_mutex);

	ret = qmp_combo_com_init(qmp);

	ret = qmp_combo_com_init(qmp);

	if (ret)

	if (ret)

		return ret;

		goto out_unlock;





	ret = qmp_combo_usb_power_on(phy);

	ret = qmp_combo_usb_power_on(phy);

	if (ret)

	if (ret) {

		qmp_combo_com_exit(qmp);

		qmp_combo_com_exit(qmp);

		goto out_unlock;

	}





out_unlock:

	mutex_unlock(&qmp->phy_mutex);

	return ret;

	return ret;

}

}
@@ -2703,11 +2705,18 @@ static int qmp_combo_usb_exit(struct phy *phy) 
	struct qmp_combo *qmp = phy_get_drvdata(phy);

	struct qmp_combo *qmp = phy_get_drvdata(phy);

	int ret;

	int ret;





	mutex_lock(&qmp->phy_mutex);

	ret = qmp_combo_usb_power_off(phy);

	ret = qmp_combo_usb_power_off(phy);

	if (ret)

	if (ret)

		return ret;

		goto out_unlock;





	return qmp_combo_com_exit(qmp);

	ret = qmp_combo_com_exit(qmp);

	if (ret)

		goto out_unlock;



out_unlock:

	mutex_unlock(&qmp->phy_mutex);

	return ret;

}

}





static int qmp_combo_usb_set_mode(struct phy *phy, enum phy_mode mode, int submode)

static int qmp_combo_usb_set_mode(struct phy *phy, enum phy_mode mode, int submode)