Commit 8d9be5c6 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

remoteproc: qcom: q6v5: Add interconnect path proxy vote 



Many remoteproc instances requires that Linux casts a proxy vote for an
interconnect path during boot, until they can do it themselves. Add
support for voting for a single path.

As this is a shared problem between both PAS and MSS drivers, the path
is acquired and votes casted from the common helper code.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarGeorgi Djakov <djakov@kernel.org>
Link: https://lore.kernel.org/r/20220225033224.2238425-1-bjorn.andersson@linaro.org
parent 80d69185

drivers/remoteproc/qcom_q6v5.c

+20 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/interconnect.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/soc/qcom/qcom_aoss.h>
@@ -51,9 +52,17 @@ int qcom_q6v5_prepare(struct qcom_q6v5 *q6v5) 
{

	int ret;



	ret = icc_set_bw(q6v5->path, 0, UINT_MAX);

	if (ret < 0) {

		dev_err(q6v5->dev, "failed to set bandwidth request\n");

		return ret;

	}



	ret = q6v5_load_state_toggle(q6v5, true);

	if (ret)

	if (ret) {

		icc_set_bw(q6v5->path, 0, 0);

		return ret;

	}



	reinit_completion(&q6v5->start_done);

	reinit_completion(&q6v5->stop_done);
@@ -78,6 +87,9 @@ int qcom_q6v5_unprepare(struct qcom_q6v5 *q6v5) 
	disable_irq(q6v5->handover_irq);

	q6v5_load_state_toggle(q6v5, false);



	/* Disable interconnect vote, in case handover never happened */

	icc_set_bw(q6v5->path, 0, 0);



	return !q6v5->handover_issued;

}

EXPORT_SYMBOL_GPL(qcom_q6v5_unprepare);
@@ -160,6 +172,8 @@ static irqreturn_t q6v5_handover_interrupt(int irq, void *data) 
	if (q6v5->handover)

		q6v5->handover(q6v5);



	icc_set_bw(q6v5->path, 0, 0);



	q6v5->handover_issued = true;



	return IRQ_HANDLED;
@@ -332,6 +346,11 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev, 
		return load_state ? -ENOMEM : -EINVAL;

	}



	q6v5->path = devm_of_icc_get(&pdev->dev, NULL);

	if (IS_ERR(q6v5->path))

		return dev_err_probe(&pdev->dev, PTR_ERR(q6v5->path),

				     "failed to acquire interconnect path\n");



	return 0;

}

EXPORT_SYMBOL_GPL(qcom_q6v5_init);

drivers/remoteproc/qcom_q6v5.h

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/completion.h>

#include <linux/soc/qcom/qcom_aoss.h>



struct icc_path;

struct rproc;

struct qcom_smem_state;

struct qcom_sysmon;
@@ -18,6 +19,8 @@ struct qcom_q6v5 { 
	struct qcom_smem_state *state;

	struct qmp *qmp;



	struct icc_path *path;



	unsigned stop_bit;



	int wdog_irq;