mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
103 lines
3.4 KiB
Diff
103 lines
3.4 KiB
Diff
From d4c78d2167913b3f7af0d2189fd3d76f6614a1bf Mon Sep 17 00:00:00 2001
|
|
From: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Date: Mon, 22 Jun 2020 12:19:40 -0700
|
|
Subject: [PATCH] remoteproc: qcom: Update PIL relocation info on load
|
|
|
|
Update the PIL relocation information in IMEM with information about
|
|
where the firmware for various remoteprocs are loaded.
|
|
|
|
Reviewed-by: Vinod Koul <vkoul@kernel.org>
|
|
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Link: https://lore.kernel.org/r/20200622191942.255460-4-bjorn.andersson@linaro.org
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
---
|
|
drivers/remoteproc/Kconfig | 5 +++++
|
|
drivers/remoteproc/qcom_q6v5_adsp.c | 16 +++++++++++++---
|
|
drivers/remoteproc/qcom_q6v5_mss.c | 3 +++
|
|
drivers/remoteproc/qcom_q6v5_pas.c | 15 ++++++++++++---
|
|
drivers/remoteproc/qcom_q6v5_wcss.c | 14 +++++++++++---
|
|
drivers/remoteproc/qcom_wcnss.c | 14 +++++++++++---
|
|
6 files changed, 55 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/remoteproc/Kconfig
|
|
+++ b/drivers/remoteproc/Kconfig
|
|
@@ -153,6 +153,7 @@ config QCOM_Q6V5_WCSS
|
|
depends on QCOM_SYSMON || QCOM_SYSMON=n
|
|
select MFD_SYSCON
|
|
select QCOM_MDT_LOADER
|
|
+ select QCOM_PIL_INFO
|
|
select QCOM_Q6V5_COMMON
|
|
select QCOM_RPROC_COMMON
|
|
select QCOM_SCM
|
|
@@ -183,6 +184,7 @@ config QCOM_WCNSS_PIL
|
|
depends on QCOM_SMEM
|
|
depends on QCOM_SYSMON || QCOM_SYSMON=n
|
|
select QCOM_MDT_LOADER
|
|
+ select QCOM_PIL_INFO
|
|
select QCOM_RPROC_COMMON
|
|
select QCOM_SCM
|
|
help
|
|
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
@@ -14,6 +14,7 @@
|
|
#include <linux/reset.h>
|
|
#include <linux/soc/qcom/mdt_loader.h>
|
|
#include "qcom_common.h"
|
|
+#include "qcom_pil_info.h"
|
|
#include "qcom_q6v5.h"
|
|
|
|
#define WCSS_CRASH_REASON 421
|
|
@@ -424,10 +425,17 @@ static void *q6v5_wcss_da_to_va(struct r
|
|
static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
|
|
{
|
|
struct q6v5_wcss *wcss = rproc->priv;
|
|
+ int ret;
|
|
+
|
|
+ ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
|
|
+ 0, wcss->mem_region, wcss->mem_phys,
|
|
+ wcss->mem_size, &wcss->mem_reloc);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ qcom_pil_info_store("wcnss", wcss->mem_phys, wcss->mem_size);
|
|
|
|
- return qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
|
|
- 0, wcss->mem_region, wcss->mem_phys,
|
|
- wcss->mem_size, &wcss->mem_reloc);
|
|
+ return ret;
|
|
}
|
|
|
|
static const struct rproc_ops q6v5_wcss_ops = {
|
|
--- a/drivers/remoteproc/qcom_wcnss.c
|
|
+++ b/drivers/remoteproc/qcom_wcnss.c
|
|
@@ -27,6 +27,7 @@
|
|
|
|
#include "qcom_common.h"
|
|
#include "remoteproc_internal.h"
|
|
+#include "qcom_pil_info.h"
|
|
#include "qcom_wcnss.h"
|
|
|
|
#define WCNSS_CRASH_REASON_SMEM 422
|
|
@@ -145,10 +146,17 @@ void qcom_wcnss_assign_iris(struct qcom_
|
|
static int wcnss_load(struct rproc *rproc, const struct firmware *fw)
|
|
{
|
|
struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
|
|
+ int ret;
|
|
|
|
- return qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID,
|
|
- wcnss->mem_region, wcnss->mem_phys,
|
|
- wcnss->mem_size, &wcnss->mem_reloc);
|
|
+ ret = qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID,
|
|
+ wcnss->mem_region, wcnss->mem_phys,
|
|
+ wcnss->mem_size, &wcnss->mem_reloc);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ qcom_pil_info_store("wcnss", wcnss->mem_phys, wcnss->mem_size);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)
|