| Message ID | 1662643422-14909-7-git-send-email-quic_srivasam@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Update ADSP pil loader for SC7280 platform | expand |
Quoting Srinivasa Rao Mandadapu (2022-09-08 06:23:40) > Add efuse evb selection control and enable it for starting ADSP. > > Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org>
On 9/8/22 6:53 PM, Srinivasa Rao Mandadapu wrote: > Add efuse evb selection control and enable it for starting ADSP. > > Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com> Reviewed-by: Sibi Sankar <quic_sibis@quicinc.com> > --- > Changes since V5: > -- Split devm_platform_ioremap_resource_byname function. > > drivers/remoteproc/qcom_q6v5_adsp.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c > index 389b2c0..ccb5592 100644 > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > @@ -56,6 +56,7 @@ > > #define LPASS_BOOT_CORE_START BIT(0) > #define LPASS_BOOT_CMD_START BIT(0) > +#define LPASS_EFUSE_Q6SS_EVB_SEL 0x0 > > struct adsp_pil_data { > int crash_reason_smem; > @@ -86,6 +87,7 @@ struct qcom_adsp { > struct clk_bulk_data *clks; > > void __iomem *qdsp6ss_base; > + void __iomem *lpass_efuse; > > struct reset_control *pdc_sync_reset; > struct reset_control *restart; > @@ -368,6 +370,9 @@ static int adsp_start(struct rproc *rproc) > /* Program boot address */ > writel(adsp->mem_phys >> 4, adsp->qdsp6ss_base + RST_EVB_REG); > > + if (adsp->lpass_efuse) > + writel(LPASS_EFUSE_Q6SS_EVB_SEL, adsp->lpass_efuse); > + > /* De-assert QDSP6 stop core. QDSP6 will execute after out of reset */ > writel(LPASS_BOOT_CORE_START, adsp->qdsp6ss_base + CORE_START_REG); > > @@ -513,6 +518,7 @@ static int adsp_init_reset(struct qcom_adsp *adsp) > static int adsp_init_mmio(struct qcom_adsp *adsp, > struct platform_device *pdev) > { > + struct resource *efuse_region; > struct device_node *syscon; > int ret; > > @@ -522,6 +528,17 @@ static int adsp_init_mmio(struct qcom_adsp *adsp, > return PTR_ERR(adsp->qdsp6ss_base); > } > > + efuse_region = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + if (!efuse_region) { > + adsp->lpass_efuse = NULL; > + dev_dbg(adsp->dev, "failed to get efuse memory region\n"); > + } else { > + adsp->lpass_efuse = devm_ioremap_resource(&pdev->dev, efuse_region); > + if (IS_ERR(adsp->lpass_efuse)) { > + dev_err(adsp->dev, "failed to map efuse registers\n"); > + return PTR_ERR(adsp->lpass_efuse); > + } > + } > syscon = of_parse_phandle(pdev->dev.of_node, "qcom,halt-regs", 0); > if (!syscon) { > dev_err(&pdev->dev, "failed to parse qcom,halt-regs\n"); >
diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c index 389b2c0..ccb5592 100644 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@ -56,6 +56,7 @@ #define LPASS_BOOT_CORE_START BIT(0) #define LPASS_BOOT_CMD_START BIT(0) +#define LPASS_EFUSE_Q6SS_EVB_SEL 0x0 struct adsp_pil_data { int crash_reason_smem; @@ -86,6 +87,7 @@ struct qcom_adsp { struct clk_bulk_data *clks; void __iomem *qdsp6ss_base; + void __iomem *lpass_efuse; struct reset_control *pdc_sync_reset; struct reset_control *restart; @@ -368,6 +370,9 @@ static int adsp_start(struct rproc *rproc) /* Program boot address */ writel(adsp->mem_phys >> 4, adsp->qdsp6ss_base + RST_EVB_REG); + if (adsp->lpass_efuse) + writel(LPASS_EFUSE_Q6SS_EVB_SEL, adsp->lpass_efuse); + /* De-assert QDSP6 stop core. QDSP6 will execute after out of reset */ writel(LPASS_BOOT_CORE_START, adsp->qdsp6ss_base + CORE_START_REG); @@ -513,6 +518,7 @@ static int adsp_init_reset(struct qcom_adsp *adsp) static int adsp_init_mmio(struct qcom_adsp *adsp, struct platform_device *pdev) { + struct resource *efuse_region; struct device_node *syscon; int ret; @@ -522,6 +528,17 @@ static int adsp_init_mmio(struct qcom_adsp *adsp, return PTR_ERR(adsp->qdsp6ss_base); } + efuse_region = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (!efuse_region) { + adsp->lpass_efuse = NULL; + dev_dbg(adsp->dev, "failed to get efuse memory region\n"); + } else { + adsp->lpass_efuse = devm_ioremap_resource(&pdev->dev, efuse_region); + if (IS_ERR(adsp->lpass_efuse)) { + dev_err(adsp->dev, "failed to map efuse registers\n"); + return PTR_ERR(adsp->lpass_efuse); + } + } syscon = of_parse_phandle(pdev->dev.of_node, "qcom,halt-regs", 0); if (!syscon) { dev_err(&pdev->dev, "failed to parse qcom,halt-regs\n");
Add efuse evb selection control and enable it for starting ADSP. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com> --- Changes since V5: -- Split devm_platform_ioremap_resource_byname function. drivers/remoteproc/qcom_q6v5_adsp.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)