From patchwork Wed May 23 05:20:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 136615 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp449742lji; Tue, 22 May 2018 22:21:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq3mjd3PfZwr43+7Vekj0IA8ua+o4YUn+Yo/EEFazh0nDT4wQH3lMDsJW1m3GaNfQDOVleO X-Received: by 2002:a63:b046:: with SMTP id z6-v6mr1131851pgo.16.1527052869562; Tue, 22 May 2018 22:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527052869; cv=none; d=google.com; s=arc-20160816; b=u4Ecesk2+9gWr7HaJkkJUkd8CRgsz2KyP3+X5IlzClt83h6+A6m120iANoLzguhfdW +9PmVH95PHsdKzN/kFwIdFLdJtEoLI2EJXrnOIjw7SQ3rUivPWeoYkmB7q6t0L5lNuDU pbT2vypzUpkPdfLLrhf5Y9fH0SannyNWb53LNag/wWzkwZi6yPpA7S+F0LolO3iZ6oIq eMR5KQNnwCy5lLoU0a/Ii948j4VahbyDEpDqL658+aI0DparSZ8CC3rF2gD8cDTLsNUs IwjdkbJk/KxqLghtDbgzSl3QY8yBOsz6LorSXQcAJNFxWPIJTN8Qtya6K/S0O2VFesfY t8bg== 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:arc-authentication-results; bh=mMuZ30ydMlpAKJdnZzJGRRao+UNlvkY24uRwi/xCojY=; b=gouRQ3lC3WMTS1/fFW14he9t63er7nanAkwOTiEOXrDtWlZdYoHl4wZ80kGT2OHMiW 7rwq9LnpaygJqO1sXGZ6d6CHYsl+zaWXsBCb7W7PLAfBwYrK9IWEicBDQureghkYLNTS znLlqNqnxXKXt5vcglump+Xmx0ureHfdFxnKTSLIHn3p9lj9MN6fp12/TdNCJjUmlcSm xv/lqJHfWTVerTMU7ylW75jST1V95ZMbfziRHr7OkrVKDWdnoWmEk+H0trDJS1F0QptR kbxayoDce/WqApLaHE1gyqYoVUxuJL8hyv36w5XGZWMnxUNK84y8Dq+sibO8FsFSh4p9 HywQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZUVDLQft; 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 e125-v6si17937518pfg.112.2018.05.22.22.21.09; Tue, 22 May 2018 22:21:09 -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=ZUVDLQft; 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 S1754111AbeEWFVH (ORCPT + 30 others); Wed, 23 May 2018 01:21:07 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:40240 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754072AbeEWFVA (ORCPT ); Wed, 23 May 2018 01:21:00 -0400 Received: by mail-pf0-f196.google.com with SMTP id f189-v6so9893860pfa.7 for ; Tue, 22 May 2018 22:20:59 -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=mMuZ30ydMlpAKJdnZzJGRRao+UNlvkY24uRwi/xCojY=; b=ZUVDLQfthQOvdvYCVgZ1+Z2zN3n2nR5f9ee7PmL46P+uJpvInRSioFjsPeWNw4XDTN Gaid80HgBmUzAKVPESRlW5S3ae35Ogjed4zDgpxipbRcXX1Ukl1DF48WaLIeIeh5VGvo uBjuKjiOwF4brtXHeGrGQpyOLzurhHrbxtaC0= 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=mMuZ30ydMlpAKJdnZzJGRRao+UNlvkY24uRwi/xCojY=; b=Pf6vOBxJ85JmEXNtH5519GdlKL20WBAKqdk/muuS27B49nua28HKshT1IE035gMjNO dDYQU9V55A8Cpcl049wRsGhLkTzSmxnMsG1QeUG8axoNFgixDq+OeAF1eaDVk2gho8qV s19fuV6zc9e+Xax67ncQ7jUU97p7byxZ94s7IU+goheVpkPFxO13YkaYzQw89oPHtuhb 1fcTQjbXYbLu7Kz8CsK4rEvgah3mo0xJkkMbvMzsz06Ywcx7PXglgOczotXoaUvk5pe/ Cl1MC+5cMKNXCu1jiUi9KHMpWuP9Wv79fS6bgtNnqqDFi1chFDSQcWEBalKdNTx4fZ9M UZWw== X-Gm-Message-State: ALKqPwcp1WZZkhCtC0nj7QiHCEXSXysi3TUN6gMiMx2hq1R6qX5yHb7k j0DifU24MlCH9akWbiNzgL74pg== X-Received: by 2002:a62:fb14:: with SMTP id x20-v6mr1432288pfm.48.1527052859193; Tue, 22 May 2018 22:20:59 -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 r76-v6sm34401146pfl.1.2018.05.22.22.20.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 22:20:58 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson , Sricharan R , Sibi Sankar , Rohit kumar , Andy Gross Cc: linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [RFC PATCH 1/5] remoteproc: qcom: mdt_loader: Make the firmware authentication optional Date: Tue, 22 May 2018 22:20:50 -0700 Message-Id: <20180523052054.19025-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523052054.19025-1-bjorn.andersson@linaro.org> References: <20180523052054.19025-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sricharan R qcom_mdt_load function loads the mdt type firmware and initialises the secure memory as well. Make the initialisation only when requested by the caller, so that the function can be used by self-authenticating remoteproc as well. Acked-by: Bjorn Andersson Signed-off-by: Sricharan R Signed-off-by: Bjorn Andersson --- No changes from Sricharan's V6. drivers/soc/qcom/mdt_loader.c | 87 ++++++++++++++++++++--------- include/linux/soc/qcom/mdt_loader.h | 4 ++ 2 files changed, 66 insertions(+), 25 deletions(-) -- 2.17.0 diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index dc09d7ac905f..1c488024c698 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -74,23 +74,10 @@ ssize_t qcom_mdt_get_size(const struct firmware *fw) } EXPORT_SYMBOL_GPL(qcom_mdt_get_size); -/** - * qcom_mdt_load() - load the firmware which header is loaded as fw - * @dev: device handle to associate resources with - * @fw: firmware object for the mdt file - * @firmware: name of the firmware, for construction of segment file names - * @pas_id: PAS identifier - * @mem_region: allocated memory region to load firmware into - * @mem_phys: physical address of allocated memory region - * @mem_size: size of the allocated memory region - * @reloc_base: adjusted physical address after relocation - * - * Returns 0 on success, negative errno otherwise. - */ -int qcom_mdt_load(struct device *dev, const struct firmware *fw, - const char *firmware, int pas_id, void *mem_region, - phys_addr_t mem_phys, size_t mem_size, - phys_addr_t *reloc_base) +static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, + const char *firmware, int pas_id, void *mem_region, + phys_addr_t mem_phys, size_t mem_size, + phys_addr_t *reloc_base, bool pas_init) { const struct elf32_phdr *phdrs; const struct elf32_phdr *phdr; @@ -121,10 +108,12 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw, if (!fw_name) return -ENOMEM; - ret = qcom_scm_pas_init_image(pas_id, fw->data, fw->size); - if (ret) { - dev_err(dev, "invalid firmware metadata\n"); - goto out; + if (pas_init) { + ret = qcom_scm_pas_init_image(pas_id, fw->data, fw->size); + if (ret) { + dev_err(dev, "invalid firmware metadata\n"); + goto out; + } } for (i = 0; i < ehdr->e_phnum; i++) { @@ -144,10 +133,13 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw, } if (relocate) { - ret = qcom_scm_pas_mem_setup(pas_id, mem_phys, max_addr - min_addr); - if (ret) { - dev_err(dev, "unable to setup relocation\n"); - goto out; + if (pas_init) { + ret = qcom_scm_pas_mem_setup(pas_id, mem_phys, + max_addr - min_addr); + if (ret) { + dev_err(dev, "unable to setup relocation\n"); + goto out; + } } /* @@ -202,7 +194,52 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw, return ret; } + +/** + * qcom_mdt_load() - load the firmware which header is loaded as fw + * @dev: device handle to associate resources with + * @fw: firmware object for the mdt file + * @firmware: name of the firmware, for construction of segment file names + * @pas_id: PAS identifier + * @mem_region: allocated memory region to load firmware into + * @mem_phys: physical address of allocated memory region + * @mem_size: size of the allocated memory region + * @reloc_base: adjusted physical address after relocation + * + * Returns 0 on success, negative errno otherwise. + */ +int qcom_mdt_load(struct device *dev, const struct firmware *fw, + const char *firmware, int pas_id, void *mem_region, + phys_addr_t mem_phys, size_t mem_size, + phys_addr_t *reloc_base) +{ + return __qcom_mdt_load(dev, fw, firmware, pas_id, mem_region, mem_phys, + mem_size, reloc_base, true); +} EXPORT_SYMBOL_GPL(qcom_mdt_load); +/** + * qcom_mdt_load_no_init() - load the firmware which header is loaded as fw + * @dev: device handle to associate resources with + * @fw: firmware object for the mdt file + * @firmware: name of the firmware, for construction of segment file names + * @pas_id: PAS identifier + * @mem_region: allocated memory region to load firmware into + * @mem_phys: physical address of allocated memory region + * @mem_size: size of the allocated memory region + * @reloc_base: adjusted physical address after relocation + * + * Returns 0 on success, negative errno otherwise. + */ +int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, + const char *firmware, int pas_id, + void *mem_region, phys_addr_t mem_phys, + size_t mem_size, phys_addr_t *reloc_base) +{ + return __qcom_mdt_load(dev, fw, firmware, pas_id, mem_region, mem_phys, + mem_size, reloc_base, false); +} +EXPORT_SYMBOL_GPL(qcom_mdt_load_no_init); + MODULE_DESCRIPTION("Firmware parser for Qualcomm MDT format"); MODULE_LICENSE("GPL v2"); diff --git a/include/linux/soc/qcom/mdt_loader.h b/include/linux/soc/qcom/mdt_loader.h index 5b98bbdabc25..944b06aefb0f 100644 --- a/include/linux/soc/qcom/mdt_loader.h +++ b/include/linux/soc/qcom/mdt_loader.h @@ -17,4 +17,8 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw, phys_addr_t mem_phys, size_t mem_size, phys_addr_t *reloc_base); +int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, + const char *fw_name, int pas_id, void *mem_region, + phys_addr_t mem_phys, size_t mem_size, + phys_addr_t *reloc_base); #endif