Commit e637b37a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rproc-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux 

Pull remoteproc updates from Bjorn Andersson:

 - Add support for the compute DSP in the Qualcomm SDM660 platform, and
   finally fix up the way MSM8974 audio DSP remoteproc driver manages
   its power rails

 - Replace the usage of of_reserved_mem_lookup() with
   of_reserved_mem_region_to_resource() to clean things up across most
   of the drivers

 - Perform a variety of housekeeping and cleanup work across iMX,
   Mediatek, and TI remoteproc drivers

* tag 'rproc-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: (45 commits)
  remoteproc: qcom_q6v5_wcss: use optional reset for wcss_q6_bcr_reset
  remoteproc: qcom_q6v5_wcss: fix parsing of qcom,halt-regs
  remoteproc: qcom_wcnss: Fix NULL vs IS_ERR() bug in wcnss_alloc_memory_region()
  remoteproc: qcom: q6v5: Fix NULL vs IS_ERR() bug in q6v5_alloc_memory_region()
  remoteproc: qcom: pas: Fix a couple NULL vs IS_ERR() bugs
  remoteproc: qcom_q6v5_adsp: Fix a NULL vs IS_ERR() check in adsp_alloc_memory_region()
  remoteproc: imx_dsp_rproc: Fix NULL vs IS_ERR() bug in imx_dsp_rproc_add_carveout()
  remoteproc: st: Fix indexing of memory-regions
  remoteproc: qcom: pas: Add support for SDM660 CDSP
  dt-bindings: remoteproc: qcom: adsp: Add SDM660 CDSP compatible
  dt-bindings: remoteproc: qcom: adsp: Add missing constrains for SDM660 ADSP
  dt-bindings: remoteproc: qcom,sc8280xp-pas: Fix CDSP power desc
  remoteproc: omap: Remove redundant pm_runtime_mark_last_busy() calls
  remoteproc: qcom: Use of_reserved_mem_region_* functions for "memory-region"
  remoteproc: qcom_q6v5_pas: Use resource with CX PD for MSM8974
  dt-bindings: remoteproc: qcom,adsp: Make msm8974 use CX as power domain
  remoteproc: Use of_reserved_mem_region_* functions for "memory-region"
  remoteproc: imx_dsp_rproc: Simplify start/stop error handling
  remoteproc: imx_rproc: Remove enum imx_rproc_method
  remoteproc: imx_dsp_rproc: Simplify IMX_RPROC_RESET_CONTROLLER switch case
  ...
parents eee654ca 641092c1

Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml

+12 −14
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
      - qcom,msm8998-adsp-pas

      - qcom,msm8998-slpi-pas

      - qcom,sdm660-adsp-pas

      - qcom,sdm660-cdsp-pas

      - qcom,sdm845-adsp-pas

      - qcom,sdm845-cdsp-pas

      - qcom,sdm845-slpi-pas
@@ -31,9 +32,6 @@ properties: 
  reg:

    maxItems: 1



  cx-supply:

    description: Phandle to the CX regulator



  px-supply:

    description: Phandle to the PX regulator
@@ -69,6 +67,8 @@ allOf: 
              - qcom,msm8996-slpi-pil

              - qcom,msm8998-adsp-pas

              - qcom,msm8998-slpi-pas

              - qcom,sdm660-adsp-pas

              - qcom,sdm660-cdsp-pas

              - qcom,sdm845-adsp-pas

              - qcom,sdm845-cdsp-pas

              - qcom,sdm845-slpi-pas
@@ -93,6 +93,8 @@ allOf: 
              - qcom,msm8996-slpi-pil

              - qcom,msm8998-adsp-pas

              - qcom,msm8998-slpi-pas

              - qcom,sdm660-adsp-pas

              - qcom,sdm660-cdsp-pas

              - qcom,sdm845-adsp-pas

              - qcom,sdm845-cdsp-pas

              - qcom,sdm845-slpi-pas
@@ -103,16 +105,6 @@ allOf: 
        interrupt-names:

          maxItems: 5



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8974-adsp-pil

    then:

      required:

        - cx-supply



  - if:

      properties:

        compatible:
@@ -120,8 +112,11 @@ allOf: 
            enum:

              - qcom,msm8226-adsp-pil

              - qcom,msm8953-adsp-pil

              - qcom,msm8974-adsp-pil

              - qcom,msm8996-adsp-pil

              - qcom,msm8998-adsp-pas

              - qcom,sdm660-adsp-pas

              - qcom,sdm660-cdsp-pas

    then:

      properties:

        power-domains:
@@ -178,6 +173,7 @@ allOf: 
              - qcom,msm8998-adsp-pas

              - qcom,msm8998-slpi-pas

              - qcom,sdm660-adsp-pas

              - qcom,sdm660-cdsp-pas

    then:

      properties:

        qcom,qmp: false
@@ -187,6 +183,7 @@ examples: 
    #include <dt-bindings/clock/qcom,rpmcc.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/power/qcom-rpmpd.h>

    adsp {

        compatible = "qcom,msm8974-adsp-pil";
@@ -204,7 +201,8 @@ examples: 
        clocks = <&rpmcc RPM_CXO_CLK>;

        clock-names = "xo";



        cx-supply = <&pm8841_s2>;

        power-domains = <&rpmpd MSM8974_VDDCX>;

        power-domain-names = "cx";



        memory-region = <&adsp_region>;

Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml

+4 −0
Original line number Diff line number Diff line
@@ -91,9 +91,13 @@ allOf: 
        power-domains:

          items:

            - description: NSP power domain

            - description: CX power domain

            - description: MXC power domain

        power-domain-names:

          items:

            - const: nsp

            - const: cx

            - const: mxc



unevaluatedProperties: false

drivers/remoteproc/imx_dsp_rproc.c

+206 −198
Original line number Diff line number Diff line
@@ -261,56 +261,6 @@ static int imx8ulp_dsp_reset(struct imx_dsp_rproc *priv) 
	return 0;

}



/* Specific configuration for i.MX8MP */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8mp = {

	.att		= imx_dsp_rproc_att_imx8mp,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8mp),

	.method		= IMX_RPROC_RESET_CONTROLLER,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8mp = {

	.dcfg		= &dsp_rproc_cfg_imx8mp,

	.reset          = imx8mp_dsp_reset,

};



/* Specific configuration for i.MX8ULP */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8ulp = {

	.src_reg	= IMX8ULP_SIM_LPAV_REG_SYSCTRL0,

	.src_mask	= IMX8ULP_SYSCTRL0_DSP_STALL,

	.src_start	= 0,

	.src_stop	= IMX8ULP_SYSCTRL0_DSP_STALL,

	.att		= imx_dsp_rproc_att_imx8ulp,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8ulp),

	.method		= IMX_RPROC_MMIO,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8ulp = {

	.dcfg		= &dsp_rproc_cfg_imx8ulp,

	.reset          = imx8ulp_dsp_reset,

};



/* Specific configuration for i.MX8QXP */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8qxp = {

	.att		= imx_dsp_rproc_att_imx8qxp,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8qxp),

	.method		= IMX_RPROC_SCU_API,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8qxp = {

	.dcfg		= &dsp_rproc_cfg_imx8qxp,

};



/* Specific configuration for i.MX8QM */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8qm = {

	.att		= imx_dsp_rproc_att_imx8qm,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8qm),

	.method		= IMX_RPROC_SCU_API,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8qm = {

	.dcfg		= &dsp_rproc_cfg_imx8qm,

};



static int imx_dsp_rproc_ready(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;
@@ -388,6 +338,28 @@ static int imx_dsp_rproc_handle_rsc(struct rproc *rproc, u32 rsc_type, 
	return RSC_HANDLED;

}



static int imx_dsp_rproc_mmio_start(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;

	const struct imx_rproc_dcfg *dcfg = priv->dsp_dcfg->dcfg;



	return regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask, dcfg->src_start);

}



static int imx_dsp_rproc_reset_ctrl_start(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;



	return reset_control_deassert(priv->run_stall);

}



static int imx_dsp_rproc_scu_api_start(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;



	return imx_sc_pm_cpu_start(priv->ipc_handle, IMX_SC_R_DSP, true, rproc->bootaddr);

}



/*

 * Start function for rproc_ops

 *
@@ -404,32 +376,41 @@ static int imx_dsp_rproc_start(struct rproc *rproc) 
	struct device *dev = rproc->dev.parent;

	int ret;



	switch (dcfg->method) {

	case IMX_RPROC_MMIO:

		ret = regmap_update_bits(priv->regmap,

					 dcfg->src_reg,

					 dcfg->src_mask,

					 dcfg->src_start);

		break;

	case IMX_RPROC_SCU_API:

		ret = imx_sc_pm_cpu_start(priv->ipc_handle,

					  IMX_SC_R_DSP,

					  true,

					  rproc->bootaddr);

		break;

	case IMX_RPROC_RESET_CONTROLLER:

		ret = reset_control_deassert(priv->run_stall);

		break;

	default:

	if (!dcfg->ops || !dcfg->ops->start)

		return -EOPNOTSUPP;

	}



	if (ret)

	ret = dcfg->ops->start(rproc);

	if (ret) {

		dev_err(dev, "Failed to enable remote core!\n");

	else if (priv->flags & WAIT_FW_READY)

		return ret;

	}



	if (priv->flags & WAIT_FW_READY)

		return imx_dsp_rproc_ready(rproc);



	return ret;

	return 0;

}



static int imx_dsp_rproc_mmio_stop(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;

	const struct imx_rproc_dcfg *dcfg = priv->dsp_dcfg->dcfg;



	return regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask, dcfg->src_stop);

}



static int imx_dsp_rproc_reset_ctrl_stop(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;



	return reset_control_assert(priv->run_stall);

}



static int imx_dsp_rproc_scu_api_stop(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;



	return imx_sc_pm_cpu_start(priv->ipc_handle, IMX_SC_R_DSP, false, rproc->bootaddr);

}



/*
@@ -449,30 +430,18 @@ static int imx_dsp_rproc_stop(struct rproc *rproc) 
		return 0;

	}



	switch (dcfg->method) {

	case IMX_RPROC_MMIO:

		ret = regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask,

					 dcfg->src_stop);

		break;

	case IMX_RPROC_SCU_API:

		ret = imx_sc_pm_cpu_start(priv->ipc_handle,

					  IMX_SC_R_DSP,

					  false,

					  rproc->bootaddr);

		break;

	case IMX_RPROC_RESET_CONTROLLER:

		ret = reset_control_assert(priv->run_stall);

		break;

	default:

	if (!dcfg->ops || !dcfg->ops->stop)

		return -EOPNOTSUPP;

	}



	if (ret)

	ret = dcfg->ops->stop(rproc);

	if (ret) {

		dev_err(dev, "Failed to stop remote core\n");

	else

		return ret;

	}



	priv->flags &= ~REMOTE_IS_READY;



	return ret;

	return 0;

}



/**
@@ -689,11 +658,9 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) 
	struct rproc *rproc = priv->rproc;

	struct device *dev = rproc->dev.parent;

	struct device_node *np = dev->of_node;

	struct of_phandle_iterator it;

	struct rproc_mem_entry *mem;

	struct reserved_mem *rmem;

	void __iomem *cpu_addr;

	int a;

	int a, i = 0;

	u64 da;



	/* Remap required addresses */
@@ -724,49 +691,40 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) 
		rproc_add_carveout(rproc, mem);

	}



	of_phandle_iterator_init(&it, np, "memory-region", NULL, 0);

	while (of_phandle_iterator_next(&it) == 0) {

	while (1) {

		int err;

		struct resource res;



		err = of_reserved_mem_region_to_resource(np, i++, &res);

		if (err)

			return 0;



		/*

		 * Ignore the first memory region which will be used vdev buffer.

		 * No need to do extra handlings, rproc_add_virtio_dev will handle it.

		 */

		if (!strcmp(it.node->name, "vdev0buffer"))

		if (strstarts(res.name, "vdev0buffer"))

			continue;



		rmem = of_reserved_mem_lookup(it.node);

		if (!rmem) {

			of_node_put(it.node);

			dev_err(dev, "unable to acquire memory-region\n");

		if (imx_dsp_rproc_sys_to_da(priv, res.start, resource_size(&res), &da))

			return -EINVAL;

		}



		if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) {

			of_node_put(it.node);

			return -EINVAL;

		}



		cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size);

		if (!cpu_addr) {

			of_node_put(it.node);

			dev_err(dev, "failed to map memory %p\n", &rmem->base);

			return -ENOMEM;

		cpu_addr = devm_ioremap_resource_wc(dev, &res);

		if (IS_ERR(cpu_addr)) {

			dev_err(dev, "failed to map memory %pR\n", &res);

			return PTR_ERR(cpu_addr);

		}



		/* Register memory region */

		mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base,

					   rmem->size, da, NULL, NULL, it.node->name);



		if (mem) {

			rproc_coredump_add_segment(rproc, da, rmem->size);

		} else {

			of_node_put(it.node);

		mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)res.start,

					   resource_size(&res), da, NULL, NULL,

					   "%.*s", strchrnul(res.name, '@') - res.name, res.name);

		if (!mem)

			return -ENOMEM;

		}



		rproc_coredump_add_segment(rproc, da, resource_size(&res));

		rproc_add_carveout(rproc, mem);

	}



	return 0;

}



/* Prepare function for rproc_ops */
@@ -1062,42 +1020,20 @@ static const struct rproc_ops imx_dsp_rproc_ops = { 
static int imx_dsp_attach_pm_domains(struct imx_dsp_rproc *priv)

{

	struct device *dev = priv->rproc->dev.parent;

	int ret;



	/* A single PM domain is already attached. */

	if (dev->pm_domain)

		return 0;



	ret = dev_pm_domain_attach_list(dev, NULL, &priv->pd_list);

	return ret < 0 ? ret : 0;

	return devm_pm_domain_attach_list(dev, NULL, &priv->pd_list);

}



/**

 * imx_dsp_rproc_detect_mode() - detect DSP control mode

 * @priv: private data pointer

 *

 * Different platform has different control method for DSP, which depends

 * on how the DSP is integrated in platform.

 *

 * For i.MX8QXP and i.MX8QM, DSP should be started and stopped by System

 * Control Unit.

 * For i.MX8MP and i.MX8ULP, DSP should be started and stopped by system

 * integration module.

 */

static int imx_dsp_rproc_detect_mode(struct imx_dsp_rproc *priv)

static int imx_dsp_rproc_mmio_detect_mode(struct rproc *rproc)

{

	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;

	struct device *dev = priv->rproc->dev.parent;

	struct imx_dsp_rproc *priv = rproc->priv;

	struct device *dev = rproc->dev.parent;

	struct regmap *regmap;

	int ret = 0;



	switch (dsp_dcfg->dcfg->method) {

	case IMX_RPROC_SCU_API:

		ret = imx_scu_get_handle(&priv->ipc_handle);

		if (ret)

			return ret;

		break;

	case IMX_RPROC_MMIO:

	regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "fsl,dsp-ctrl");

	if (IS_ERR(regmap)) {

		dev_err(dev, "failed to find syscon\n");
@@ -1105,20 +1041,52 @@ static int imx_dsp_rproc_detect_mode(struct imx_dsp_rproc *priv) 
	}



	priv->regmap = regmap;

		break;

	case IMX_RPROC_RESET_CONTROLLER:



	return 0;

}



static int imx_dsp_rproc_reset_ctrl_detect_mode(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;

	struct device *dev = rproc->dev.parent;



	priv->run_stall = devm_reset_control_get_exclusive(dev, "runstall");

	if (IS_ERR(priv->run_stall)) {

		dev_err(dev, "Failed to get DSP runstall reset control\n");

		return PTR_ERR(priv->run_stall);

	}

		break;

	default:

		ret = -EOPNOTSUPP;

		break;



	return 0;

}



	return ret;

static int imx_dsp_rproc_scu_api_detect_mode(struct rproc *rproc)

{

	struct imx_dsp_rproc *priv = rproc->priv;



	return imx_scu_get_handle(&priv->ipc_handle);

}



/**

 * imx_dsp_rproc_detect_mode() - detect DSP control mode

 * @priv: private data pointer

 *

 * Different platform has different control method for DSP, which depends

 * on how the DSP is integrated in platform.

 *

 * For i.MX8QXP and i.MX8QM, DSP should be started and stopped by System

 * Control Unit.

 * For i.MX8MP and i.MX8ULP, DSP should be started and stopped by system

 * integration module.

 */

static int imx_dsp_rproc_detect_mode(struct imx_dsp_rproc *priv)

{

	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;

	const struct imx_rproc_dcfg *dcfg = dsp_dcfg->dcfg;



	if (dcfg->ops && dcfg->ops->detect_mode)

		return dcfg->ops->detect_mode(priv->rproc);



	return -EOPNOTSUPP;

}



static const char *imx_dsp_clks_names[DSP_RPROC_CLK_MAX] = {
@@ -1152,11 +1120,8 @@ static int imx_dsp_rproc_probe(struct platform_device *pdev) 
		return -ENODEV;



	ret = rproc_of_parse_firmware(dev, 0, &fw_name);

	if (ret) {

		dev_err(dev, "failed to parse firmware-name property, ret = %d\n",

			ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed to parse firmware-name property\n");



	rproc = devm_rproc_alloc(dev, "imx-dsp-rproc", &imx_dsp_rproc_ops,

				 fw_name, sizeof(*priv));
@@ -1179,52 +1144,28 @@ static int imx_dsp_rproc_probe(struct platform_device *pdev) 
	INIT_WORK(&priv->rproc_work, imx_dsp_rproc_vq_work);



	ret = imx_dsp_rproc_detect_mode(priv);

	if (ret) {

		dev_err(dev, "failed on imx_dsp_rproc_detect_mode\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed on imx_dsp_rproc_detect_mode\n");



	/* There are multiple power domains required by DSP on some platform */

	ret = imx_dsp_attach_pm_domains(priv);

	if (ret) {

		dev_err(dev, "failed on imx_dsp_attach_pm_domains\n");

		return ret;

	}

	if (ret < 0)

		return dev_err_probe(dev, ret, "failed on imx_dsp_attach_pm_domains\n");



	/* Get clocks */

	ret = imx_dsp_rproc_clk_get(priv);

	if (ret) {

		dev_err(dev, "failed on imx_dsp_rproc_clk_get\n");

		goto err_detach_domains;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed on imx_dsp_rproc_clk_get\n");



	init_completion(&priv->pm_comp);

	rproc->auto_boot = false;

	ret = rproc_add(rproc);

	if (ret) {

		dev_err(dev, "rproc_add failed\n");

		goto err_detach_domains;

	}

	ret = devm_rproc_add(dev, rproc);

	if (ret)

		return dev_err_probe(dev, ret, "rproc_add failed\n");



	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_XTENSA);



	pm_runtime_enable(dev);



	return 0;



err_detach_domains:

	dev_pm_domain_detach_list(priv->pd_list);



	return ret;

}



static void imx_dsp_rproc_remove(struct platform_device *pdev)

{

	struct rproc *rproc = platform_get_drvdata(pdev);

	struct imx_dsp_rproc *priv = rproc->priv;



	pm_runtime_disable(&pdev->dev);

	rproc_del(rproc);

	dev_pm_domain_detach_list(priv->pd_list);

	return devm_pm_runtime_enable(dev);

}



/* pm runtime functions */
@@ -1364,6 +1305,74 @@ static const struct dev_pm_ops imx_dsp_rproc_pm_ops = { 
	RUNTIME_PM_OPS(imx_dsp_runtime_suspend, imx_dsp_runtime_resume, NULL)

};



static const struct imx_rproc_plat_ops imx_dsp_rproc_ops_mmio = {

	.start		= imx_dsp_rproc_mmio_start,

	.stop		= imx_dsp_rproc_mmio_stop,

	.detect_mode	= imx_dsp_rproc_mmio_detect_mode,

};



static const struct imx_rproc_plat_ops imx_dsp_rproc_ops_reset_ctrl = {

	.start		= imx_dsp_rproc_reset_ctrl_start,

	.stop		= imx_dsp_rproc_reset_ctrl_stop,

	.detect_mode	= imx_dsp_rproc_reset_ctrl_detect_mode,

};



static const struct imx_rproc_plat_ops imx_dsp_rproc_ops_scu_api = {

	.start		= imx_dsp_rproc_scu_api_start,

	.stop		= imx_dsp_rproc_scu_api_stop,

	.detect_mode	= imx_dsp_rproc_scu_api_detect_mode,

};



/* Specific configuration for i.MX8MP */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8mp = {

	.att		= imx_dsp_rproc_att_imx8mp,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8mp),

	.ops		= &imx_dsp_rproc_ops_reset_ctrl,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8mp = {

	.dcfg		= &dsp_rproc_cfg_imx8mp,

	.reset          = imx8mp_dsp_reset,

};



/* Specific configuration for i.MX8ULP */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8ulp = {

	.src_reg	= IMX8ULP_SIM_LPAV_REG_SYSCTRL0,

	.src_mask	= IMX8ULP_SYSCTRL0_DSP_STALL,

	.src_start	= 0,

	.src_stop	= IMX8ULP_SYSCTRL0_DSP_STALL,

	.att		= imx_dsp_rproc_att_imx8ulp,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8ulp),

	.ops		= &imx_dsp_rproc_ops_mmio,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8ulp = {

	.dcfg		= &dsp_rproc_cfg_imx8ulp,

	.reset          = imx8ulp_dsp_reset,

};



/* Specific configuration for i.MX8QXP */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8qxp = {

	.att		= imx_dsp_rproc_att_imx8qxp,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8qxp),

	.ops		= &imx_dsp_rproc_ops_scu_api,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8qxp = {

	.dcfg		= &dsp_rproc_cfg_imx8qxp,

};



/* Specific configuration for i.MX8QM */

static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8qm = {

	.att		= imx_dsp_rproc_att_imx8qm,

	.att_size	= ARRAY_SIZE(imx_dsp_rproc_att_imx8qm),

	.ops		= &imx_dsp_rproc_ops_scu_api,

};



static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8qm = {

	.dcfg		= &dsp_rproc_cfg_imx8qm,

};



static const struct of_device_id imx_dsp_rproc_of_match[] = {

	{ .compatible = "fsl,imx8qxp-hifi4", .data = &imx_dsp_rproc_cfg_imx8qxp },

	{ .compatible = "fsl,imx8qm-hifi4",  .data = &imx_dsp_rproc_cfg_imx8qm },
@@ -1375,7 +1384,6 @@ MODULE_DEVICE_TABLE(of, imx_dsp_rproc_of_match); 


static struct platform_driver imx_dsp_rproc_driver = {

	.probe = imx_dsp_rproc_probe,

	.remove = imx_dsp_rproc_remove,

	.driver = {

		.name = "imx-dsp-rproc",

		.of_match_table = imx_dsp_rproc_of_match,

drivers/remoteproc/imx_rproc.c

+99 −139

File changed.

Preview size limit exceeded, changes collapsed.

drivers/remoteproc/imx_rproc.h

+2 −14
Original line number Diff line number Diff line
@@ -15,25 +15,14 @@ struct imx_rproc_att { 
	int flags;

};



/* Remote core start/stop method */

enum imx_rproc_method {

	IMX_RPROC_NONE,

	/* Through syscon regmap */

	IMX_RPROC_MMIO,

	/* Through ARM SMCCC */

	IMX_RPROC_SMC,

	/* Through System Control Unit API */

	IMX_RPROC_SCU_API,

	/* Through Reset Controller API */

	IMX_RPROC_RESET_CONTROLLER,

};



/* dcfg flags */

#define IMX_RPROC_NEED_SYSTEM_OFF	BIT(0)

#define IMX_RPROC_NEED_CLKS		BIT(1)



struct imx_rproc_plat_ops {

	int (*start)(struct rproc *rproc);

	int (*stop)(struct rproc *rproc);

	int (*detach)(struct rproc *rproc);

	int (*detect_mode)(struct rproc *rproc);

};
@@ -46,7 +35,6 @@ struct imx_rproc_dcfg { 
	u32				gpr_wait;

	const struct imx_rproc_att	*att;

	size_t				att_size;

	enum imx_rproc_method		method;

	u32				flags;

	const struct imx_rproc_plat_ops	*ops;

};