Commit e1ae85e1 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Greg Kroah-Hartman
Browse files

slimbus: qcom-ngd-ctrl: add Protection Domain Restart Support 



Add support to protection domain restart. Protection domain restart
would also restart the service just like SSR.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20201127102451.17114-4-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a899d324

drivers/slimbus/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config SLIM_QCOM_NGD_CTRL 
	depends on ARCH_QCOM || COMPILE_TEST

	select QCOM_QMI_HELPERS

	select QCOM_RPROC_COMMON

	select QCOM_PDR_HELPERS

	help

	  Select driver if Qualcomm's SLIMbus Satellite Non-Generic Device

	  Component is programmed using Linux kernel.

drivers/slimbus/qcom-ngd-ctrl.c

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

#include <linux/io.h>

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

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

#include <net/sock.h>

#include "slimbus.h"
@@ -166,6 +167,7 @@ struct qcom_slim_ngd_ctrl { 
	struct mutex ssr_lock;

	struct notifier_block nb;

	void *notifier;

	struct pdr_handle *pdr;

	enum qcom_slim_ngd_state state;

	dma_addr_t rx_phys_base;

	dma_addr_t tx_phys_base;
@@ -1382,6 +1384,7 @@ static int qcom_slim_ngd_ssr_pdr_notify(struct qcom_slim_ngd_ctrl *ctrl, 
{

	switch (action) {

	case QCOM_SSR_BEFORE_SHUTDOWN:

	case SERVREG_SERVICE_STATE_DOWN:

		/* Make sure the last dma xfer is finished */

		mutex_lock(&ctrl->tx_lock);

		if (ctrl->state != QCOM_SLIM_NGD_CTRL_DOWN) {
@@ -1393,6 +1396,7 @@ static int qcom_slim_ngd_ssr_pdr_notify(struct qcom_slim_ngd_ctrl *ctrl, 
		mutex_unlock(&ctrl->tx_lock);

		break;

	case QCOM_SSR_AFTER_POWERUP:

	case SERVREG_SERVICE_STATE_UP:

		schedule_work(&ctrl->ngd_up_work);

		break;

	default:
@@ -1412,6 +1416,12 @@ static int qcom_slim_ngd_ssr_notify(struct notifier_block *nb, 
	return qcom_slim_ngd_ssr_pdr_notify(ctrl, action);

}



static void slim_pd_status(int state, char *svc_path, void *priv)

{

	struct qcom_slim_ngd_ctrl *ctrl = (struct qcom_slim_ngd_ctrl *)priv;



	qcom_slim_ngd_ssr_pdr_notify(ctrl, state);

}

static int of_qcom_slim_ngd_register(struct device *parent,

				     struct qcom_slim_ngd_ctrl *ctrl)

{
@@ -1499,6 +1509,7 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) 
	struct qcom_slim_ngd_ctrl *ctrl;

	struct resource *res;

	int ret;

	struct pdr_service *pds;



	ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);

	if (!ctrl)
@@ -1549,6 +1560,18 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) 
	init_completion(&ctrl->qmi.qmi_comp);

	init_completion(&ctrl->qmi_up);



	ctrl->pdr = pdr_handle_alloc(slim_pd_status, ctrl);

	if (IS_ERR(ctrl->pdr)) {

		dev_err(dev, "Failed to init PDR handle\n");

		return PTR_ERR(ctrl->pdr);

	}



	pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd");

	if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) {

		dev_err(dev, "pdr add lookup failed: %d\n", ret);

		return PTR_ERR(pds);

	}



	platform_driver_register(&qcom_slim_ngd_driver);

	return of_qcom_slim_ngd_register(dev, ctrl);

}
@@ -1565,6 +1588,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);

	pdr_handle_release(ctrl->pdr);

	qcom_unregister_ssr_notifier(ctrl->notifier, &ctrl->nb);

	qcom_slim_ngd_enable(ctrl, false);

	qcom_slim_ngd_exit_dma(ctrl);