From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C924C43387 for ; Thu, 3 Jan 2019 23:44:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F1B021479 for ; Thu, 3 Jan 2019 23:44:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Bxp9jCE+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbfACXoc (ORCPT ); Thu, 3 Jan 2019 18:44:32 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:46411 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728950AbfACXob (ORCPT ); Thu, 3 Jan 2019 18:44:31 -0500 Received: by mail-pg1-f196.google.com with SMTP id w7so16634432pgp.13 for ; Thu, 03 Jan 2019 15:44:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=rR+EBtvA9xgoU84S5jkmEU68u5I5YHa/BpEoF9EZcZI=; b=Bxp9jCE+OMJGhvvBAecmL5rSgWar9KfIJRfoRPn2VKlw8Iobjz7rc5mbx7XWOjVev8 2RyvpvGYdjCaj8Fo83f4DFkJBlQDdAp5/aSKdJDaYMkmB6ngDiwGLstn6XiZU6lOOfSt Xy5LLBoDFi+GMq8PosGlD6/v1tX4Vqbwcnjxc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=rR+EBtvA9xgoU84S5jkmEU68u5I5YHa/BpEoF9EZcZI=; b=U9PIHSV7vxdqDSQUua4aA+pp07rllTwKfwEP8Mma4S7pCv+OKQ7aI8JHSL0LHW3CCB f4W94b0QEbH0Q/xfcLYkE/U2CFsEd1YNejP/5W8x5Y7B69v2WDEdYwU348suPU79uiRJ f0CAxNnqFjz4L3HsBrPCySCHWiCeMhRGFeTJhiHOUAvlZk2FxPe0+XmtCOBUkFE9X2sn U9HwGP9dkGgbDt3U3oisvEZUhHVnCnRULro4MBt+6/h6W+Ob7ZYRgmaRbPgsY+Q9iyqp rKQlrLWZzD9M+TxEJG3FOAaA9Yc+DUdS7riyl1ewrxqKo2IsqwtwU/3qmxfaNzAkd0EL 45UA== X-Gm-Message-State: AA+aEWZk7IMkR/2RGTqdCNYcS+z2i2MOiymqSO0MeuQ04eNm0lCERe7z 5exyhO9D3wyz6/5BuNCxXurVPw== X-Google-Smtp-Source: AFSGD/XvV0f+b+8aau3wddn6EuZ943au/aU46aUUBzl+t8YMERdFmhZttVLjPn0GaOo+Sqi5d2Es7A== X-Received: by 2002:a62:42d4:: with SMTP id h81mr50037615pfd.259.1546559070515; Thu, 03 Jan 2019 15:44:30 -0800 (PST) Received: from google.com ([2620:15c:202:1:534:b7c0:a63c:460c]) by smtp.gmail.com with ESMTPSA id n68sm96292312pfb.62.2019.01.03.15.44.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Jan 2019 15:44:29 -0800 (PST) Date: Thu, 3 Jan 2019 15:44:27 -0800 From: Brian Norris To: Sibi Sankar Cc: bjorn.andersson@linaro.org, david.brown@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, andy.gross@linaro.org, akdwived@codeaurora.org, clew@codeaurora.org, linux-kernel@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org, ohad@wizery.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH v2 2/2] remoteproc: qcom: Add support for parsing fw dt bindings Message-ID: <20190103234426.GB181833@google.com> References: <20181228044819.5697-1-sibis@codeaurora.org> <20181228044819.5697-3-sibis@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181228044819.5697-3-sibis@codeaurora.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 28, 2018 at 10:18:19AM +0530, Sibi Sankar wrote: > Add support for parsing "firmware-name" dt bindings which specifies > the relative paths of mba/modem/pas image as strings. Fallback to > the default paths for mba/modem/pas image on -EINVAL. > > Signed-off-by: Sibi Sankar > --- > drivers/remoteproc/qcom_q6v5_mss.c | 46 +++++++++++++++++++++++------- > drivers/remoteproc/qcom_q6v5_pas.c | 11 ++++++- > 2 files changed, 46 insertions(+), 11 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index 01be7314e176..c75179006e24 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -188,6 +188,7 @@ struct q6v5 { > bool has_alt_reset; > int mpss_perm; > int mba_perm; > + const char *hexagon_mdt_image; > int version; > }; > > @@ -860,17 +861,27 @@ static int q6v5_mpss_load(struct q6v5 *qproc) > phys_addr_t min_addr = PHYS_ADDR_MAX; > phys_addr_t max_addr = 0; > bool relocate = false; > - char seg_name[10]; > + char *fw_name; > + size_t fw_name_len; > ssize_t offset; > size_t size = 0; > void *ptr; > int ret; > int i; > > - ret = request_firmware(&fw, "modem.mdt", qproc->dev); > + fw_name_len = strlen(qproc->hexagon_mdt_image); > + if (fw_name_len <= 4) > + return -EINVAL; > + > + fw_name = kstrdup(qproc->hexagon_mdt_image, GFP_KERNEL); > + if (!fw_name) > + return -ENOMEM; > + > + ret = request_firmware(&fw, qproc->hexagon_mdt_image, qproc->dev); > if (ret < 0) { > - dev_err(qproc->dev, "unable to load modem.mdt\n"); > - return ret; > + dev_err(qproc->dev, "unable to load %s\n", > + qproc->hexagon_mdt_image); > + goto out; > } > > /* Initialize the RMB validator */ > @@ -918,10 +929,12 @@ static int q6v5_mpss_load(struct q6v5 *qproc) > ptr = qproc->mpss_region + offset; > > if (phdr->p_filesz) { > - snprintf(seg_name, sizeof(seg_name), "modem.b%02d", i); > - ret = request_firmware(&seg_fw, seg_name, qproc->dev); > + snprintf(fw_name + fw_name_len - 3, fw_name_len, > + "b%02d", i); So, you're assuming that 'fw_name' ends in '.XXX' (for some 3-char value of 'XXX')? Seems a bit odd. But if you really want this, it feels like you should enforce this, and either comment on what you're doing or else use a proper computation that makes it clear (e.g., strlen("bin")). Brian > + ret = request_firmware(&seg_fw, fw_name, qproc->dev); > if (ret) { > - dev_err(qproc->dev, "failed to load %s\n", seg_name); > + dev_err(qproc->dev, "failed to load %s\n", > + fw_name); > goto release_firmware; > } > > @@ -960,6 +973,8 @@ static int q6v5_mpss_load(struct q6v5 *qproc) > > release_firmware: > release_firmware(fw); > +out: > + kfree(fw_name); > > return ret < 0 ? ret : 0; > } > @@ -1075,9 +1090,10 @@ static int qcom_q6v5_register_dump_segments(struct rproc *rproc, > unsigned long i; > int ret; > > - ret = request_firmware(&fw, "modem.mdt", qproc->dev); > + ret = request_firmware(&fw, qproc->hexagon_mdt_image, qproc->dev); > if (ret < 0) { > - dev_err(qproc->dev, "unable to load modem.mdt\n"); > + dev_err(qproc->dev, "unable to load %s\n", > + qproc->hexagon_mdt_image); > return ret; > } > > @@ -1253,6 +1269,8 @@ static int q6v5_probe(struct platform_device *pdev) > const struct rproc_hexagon_res *desc; > struct q6v5 *qproc; > struct rproc *rproc; > + const char *mba_image; > + const char *fw_name[2]; > int ret; > > desc = of_device_get_match_data(&pdev->dev); > @@ -1262,8 +1280,15 @@ static int q6v5_probe(struct platform_device *pdev) > if (desc->need_mem_protection && !qcom_scm_is_available()) > return -EPROBE_DEFER; > > + ret = of_property_read_string_array(pdev->dev.of_node, "firmware-name", > + fw_name, 2); > + if (ret != -EINVAL && ret != 2) > + return ret > 0 ? -EINVAL : ret; > + > + mba_image = (ret != 2) ? desc->hexagon_mba_image : fw_name[0]; > + > rproc = rproc_alloc(&pdev->dev, pdev->name, &q6v5_ops, > - desc->hexagon_mba_image, sizeof(*qproc)); > + mba_image, sizeof(*qproc)); > if (!rproc) { > dev_err(&pdev->dev, "failed to allocate rproc\n"); > return -ENOMEM; > @@ -1272,6 +1297,7 @@ static int q6v5_probe(struct platform_device *pdev) > qproc = (struct q6v5 *)rproc->priv; > qproc->dev = &pdev->dev; > qproc->rproc = rproc; > + qproc->hexagon_mdt_image = (ret != 2) ? "modem.mdt" : fw_name[1]; > platform_set_drvdata(pdev, qproc); > > ret = q6v5_init_mem(qproc, pdev); > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c > index b1e63fcd5fdf..141c7da29e9a 100644 > --- a/drivers/remoteproc/qcom_q6v5_pas.c > +++ b/drivers/remoteproc/qcom_q6v5_pas.c > @@ -258,6 +258,8 @@ static int adsp_probe(struct platform_device *pdev) > const struct adsp_data *desc; > struct qcom_adsp *adsp; > struct rproc *rproc; > + const char *fw_name; > + const char *of_fw_name; > int ret; > > desc = of_device_get_match_data(&pdev->dev); > @@ -267,8 +269,15 @@ static int adsp_probe(struct platform_device *pdev) > if (!qcom_scm_is_available()) > return -EPROBE_DEFER; > > + ret = of_property_read_string(pdev->dev.of_node, "firmware-name", > + &of_fw_name); > + if (ret && ret != -EINVAL) > + return ret; > + > + fw_name = ret ? desc->firmware_name : of_fw_name; > + > rproc = rproc_alloc(&pdev->dev, pdev->name, &adsp_ops, > - desc->firmware_name, sizeof(*adsp)); > + fw_name, sizeof(*adsp)); > if (!rproc) { > dev_err(&pdev->dev, "unable to allocate remoteproc\n"); > return -ENOMEM; > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project >