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=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 CC19CC4332E for ; Mon, 15 Mar 2021 11:57:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 858D764E90 for ; Mon, 15 Mar 2021 11:57:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229596AbhCOL4q (ORCPT ); Mon, 15 Mar 2021 07:56:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbhCOL4O (ORCPT ); Mon, 15 Mar 2021 07:56:14 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5281BC06175F for ; Mon, 15 Mar 2021 04:56:13 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id e10so8525825wro.12 for ; Mon, 15 Mar 2021 04:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=QcEr1X+mUwsw61u0qn6YZThDpYW/l0i66GNmDFej3bE=; b=wsJFcg2KdmWraYw/koGpYI3x1U1tJKhHWsX0i9j7ttS3rxWREfZS7j2t+0c/bL7Hq3 YRgskRKQEJry3tyMbN8d8QrqzuEUbhr/6jys7QUAj11RpPohyrW27qAGPvPcAkOzOMLL 8fu70P4RDwLr2LnfJnhPbfM+xbcKCK0H8vvgnJnXIIpC2VnLA6n81VQeAvABONNLs6U0 zu6WzSlYnCyxUNdY9iEycvbkhlI0b+GadmR6ORMqEE0EB/ZWIKuZhRa56cf0D0JD2Eon b+hW31VDvwTIFcolWjY7RKjxPSk/VRgs/w3fVTvVkXqn/oD7jIONSh6wKNsAHxQdIECO d3Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=QcEr1X+mUwsw61u0qn6YZThDpYW/l0i66GNmDFej3bE=; b=gCqSgJwJbEcKDX5gxGldmjw0bLN7kkBDY5EwVp+kJcXk5yhPrj0n1Dlez3VyCveTKa IYqM1EMV/xuFgiIqFbb2GUyzY02oWALp5JutPCYyWBXz4h96lQzlofwJVfQyg9oYuuBx PSHiL2BhcpECRYXIUtzTeH0qqYsnn+jegGvEUc8Ln+fdfWjNztiURbHvYZ7Zbt+YQxHW BsXnIdCenJwtnI+aD/fIy7coQU9x1r3FS2fQYSapIzQHt3kCqmH7zMIcIGNTrHTfq5zv piQcmfEwfrUIf1JSNop1sjbzSxk4iFkbQeaGjpkTYQeWI1zSZCUZLO58OEvXLgdqk1ze vBjA== X-Gm-Message-State: AOAM533TXSJkTOiYbQfb+9VZPQv+a4K7+M8T1pegwLqCbk0HGPbAp+oe NPOfaco6kUbwV7d54FHA4xEKww== X-Google-Smtp-Source: ABdhPJx4GYdcsvdqFcIXX9B/f4WeoeXSGuSzpeZYXE707OfevnMNhUBirIs50G/BdTvxNZaxAL/aVw== X-Received: by 2002:a5d:534b:: with SMTP id t11mr26414610wrv.186.1615809372077; Mon, 15 Mar 2021 04:56:12 -0700 (PDT) Received: from [192.168.0.162] (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id i4sm11698470wmq.12.2021.03.15.04.56.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Mar 2021 04:56:11 -0700 (PDT) Subject: Re: [PATCH 4/5] soc: qcom: wcnss_ctrl: Allow reading firmware-name from DT To: Bjorn Andersson , Andy Gross , Rob Herring Cc: Kalle Valo , "David S. Miller" , Jakub Kicinski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org References: <20210312003318.3273536-1-bjorn.andersson@linaro.org> <20210312003318.3273536-5-bjorn.andersson@linaro.org> From: Bryan O'Donoghue Message-ID: Date: Mon, 15 Mar 2021 11:57:42 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210312003318.3273536-5-bjorn.andersson@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 12/03/2021 00:33, Bjorn Andersson wrote: > The WLAN NV firmware blob differs between platforms, and possibly > devices, so add support in the wcnss_ctrl driver for reading the path of > this file from DT in order to allow these files to live in a generic > file system (or linux-firmware). > > The new property is optional and the code falls back to the old filename > if the property isn't specified. > > Signed-off-by: Bjorn Andersson > --- > drivers/soc/qcom/wcnss_ctrl.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c > index 358526b9de06..2a06d631e415 100644 > --- a/drivers/soc/qcom/wcnss_ctrl.c > +++ b/drivers/soc/qcom/wcnss_ctrl.c > @@ -200,6 +200,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) > struct wcnss_download_nv_req *req; > const struct firmware *fw; > struct device *dev = wcnss->dev; > + const char *nvbin = NVBIN_FILE; > const void *data; > ssize_t left; > int ret; > @@ -208,10 +209,13 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) > if (!req) > return -ENOMEM; > > - ret = request_firmware(&fw, NVBIN_FILE, dev); > + ret = of_property_read_string(dev->of_node, "firmware-name", &nvbin); > + if (ret < 0 && ret != -EINVAL) > + goto free_req; > + > + ret = request_firmware(&fw, nvbin, dev); > if (ret < 0) { > - dev_err(dev, "Failed to load nv file %s: %d\n", > - NVBIN_FILE, ret); > + dev_err(dev, "Failed to load nv file %s: %d\n", nvbin, ret); > goto free_req; > } > > Tested-by: Bryan O'Donoghue