From patchwork Wed Aug 7 05:39:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 170704 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6660460ile; Tue, 6 Aug 2019 22:39:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqwgFtbrDtfWcGa7quiS/k+nJZXwCIqizM32ibyVw2jVBhOxh6Ra4v8dvqUfFiLXbEQtnrAp X-Received: by 2002:a63:755e:: with SMTP id f30mr6272974pgn.246.1565156394941; Tue, 06 Aug 2019 22:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565156394; cv=none; d=google.com; s=arc-20160816; b=JL888tTl/9ztk9Rk115Y3TQwQ2J3YSz8FqHfwbp5zsmVN5LLcx+Tp/DmjFnbFZH1rH 0nEfz7LrOOJT9rgtd/BFMJj06z8t9dENe2xAbiEpHdiu6F/4UOWrSoiydxJ162xPGKl4 3rtraa3gCc0f7ku0nCzDvmZ4Ee2Ip3WP97rqGiMUp4hCZ8wmsnt41suTD+tALk3z96pi /3SO06k0LskwXeMhrEDRYIVwbnWssaK8wjAdB95bnIVm6ffE8PM7vQDylgCHNZNYn4To ZwFfPk/nk41ijRDWX1e6KKYa6BtlxjJoNaKfNRrTLrgnCvIWwZsKulv2y8F3NnKwS86i ZqoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=DHLSpNf1LsuJ1wDDF5wISNJL3XiKw5OPuws/j+9mEZ4=; b=W1TTT/01GNr9b5TfIEQbWAF4gfIQofkCGovsZp/toeBesXzf+QGShBmzjQjSDegNGu ds36N2AyrG1oBjswKI1g2jwrkepWyEsMu3IaWnF2KSnvib7yfLGoV5aWkeutEpXWluDU 0K8X715YsoVpjLUHrSWrpMJ9SI2LfDBuZ/hm4+4YYo1cKofEAAadBqOoI8NhOCXIFKHI JLuknDfuG5SjHfFsXqDyWMxCNr+yARwhcv8DBi1DZ8j0drnFSuDW4c2hECxm4vSNbeKE RzVKF+ObE4BvInFVYgTEUR7GxndtSJGjTyg/enxNBjukm0w6FxFewDSuYpDMBwsXHlyy ci2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oKH3tIkL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c62si53135984pga.441.2019.08.06.22.39.54; Tue, 06 Aug 2019 22:39:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oKH3tIkL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727191AbfHGFjx (ORCPT + 28 others); Wed, 7 Aug 2019 01:39:53 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:39850 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726858AbfHGFjv (ORCPT ); Wed, 7 Aug 2019 01:39:51 -0400 Received: by mail-pl1-f196.google.com with SMTP id b7so38991469pls.6 for ; Tue, 06 Aug 2019 22:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DHLSpNf1LsuJ1wDDF5wISNJL3XiKw5OPuws/j+9mEZ4=; b=oKH3tIkLcOj5q28FdagPOcCl8w1CPiQNdCAVUaqi/AaD/hNMH2zdiCwbcoQ03uypze IaOOoFZXCjw3UyiXTHidDRMzG62oDDK4nU4GhB07Yl/+8300sDfaDJ0vAmpHO2kMFpg5 Y9V0Vi+ARHOiGQqL0Q0GRpkLQNXFykRRKoD8H2lMZ29hPJrqx5VD/RGdyMhd2BP0YrKl upPN/mSJxWgdE3Z2eoaHAelNrz8Gu8oiDPfrgCUHOc1Rwx2W/+++AD9nIae/fJKRMIM3 +kHiSMB4w/q3t45uQlUAzjnmg2/36p8PklnCYc4H68lwnZvqy4b8113aaezP2AjdwBIf VHXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DHLSpNf1LsuJ1wDDF5wISNJL3XiKw5OPuws/j+9mEZ4=; b=PHtQEukegZyPy/IaLrsUdfbYfqb6xQTdfwkTyAqLEyy4T9La91xVyDcIY5ONolvrBX 3o06yfaiFhjied0Up6JOPEV7XzyJ7v/TEWzuInJvNon3WjYVyaPB5Ih+WhSOZ4jgQAdF 67HNpDRGahafMiHFLe4cxdJ4MUWsXjiHc6vrf/PmrK33kN6PrbuWwVcETUoCT5xWNeoi SJxwZ0VTEEIX9g3qufixpcyuyLXjh6rFsWZxdv0QipBVqTGYZCenz+RNbSdoAzYGJQ8N M2+Br2esaJSq/1svAolqx82Bfp7bflXLsYHQhFCwstUTK/IwP0rY9eoEdFNjCFy1Ug95 fwvg== X-Gm-Message-State: APjAAAUWE3x+pg6ShIeyA0ADJC/ny1voW9yxdgqpMACu0sYzwphGjCQA m6iGCsrKAeYQU3ki34FwnDCF8A== X-Received: by 2002:a63:4522:: with SMTP id s34mr6167748pga.362.1565156390665; Tue, 06 Aug 2019 22:39:50 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id u7sm86070777pfm.96.2019.08.06.22.39.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 22:39:50 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: Andy Gross , Sibi Sankar , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Subject: [PATCH 4/9] remoteproc: qcom: wcnss: Update IMEM PIL info on load Date: Tue, 6 Aug 2019 22:39:37 -0700 Message-Id: <20190807053942.9836-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190807053942.9836-1-bjorn.andersson@linaro.org> References: <20190807053942.9836-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Store the relocated base address and size in the PIL relocation info structure in IMEM. Signed-off-by: Bjorn Andersson --- drivers/remoteproc/Kconfig | 1 + drivers/remoteproc/qcom_wcnss.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) -- 2.18.0 diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 2aa0743fc05b..3f976ce3df3c 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -185,6 +185,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 diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index dc135754bb9c..9db9a3d25af4 100644 --- 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_wcnss *wcnss, static int wcnss_load(struct rproc *rproc, const struct firmware *fw) { struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv; + int ret; + + 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_reloc, wcnss->mem_size); - return qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID, - wcnss->mem_region, wcnss->mem_phys, - wcnss->mem_size, &wcnss->mem_reloc); + return 0; } static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)