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 4B1FDC4332D for ; Mon, 15 Mar 2021 11:57:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2619264EB3 for ; Mon, 15 Mar 2021 11:57:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230445AbhCOL5T (ORCPT ); Mon, 15 Mar 2021 07:57:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230405AbhCOL5A (ORCPT ); Mon, 15 Mar 2021 07:57:00 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B5EFC061574 for ; Mon, 15 Mar 2021 04:57:00 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id b2-20020a7bc2420000b029010be1081172so19288496wmj.1 for ; Mon, 15 Mar 2021 04:56:59 -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=Yev+AXBqBGQDoXLDGZvdwqzLRoGYBMa84ajRYLADAlY=; b=GKC+39P/+pAeKRKWUcuMCwME3qJHyZGlsL9yqmqZtqu8kkztx6r1WhHmqTEvmVr6TZ bgUHfi9WX4zcZ5UzwzqLfAjWbya6i5SdVTaM4HkMx9QSFtba/d1QAm7zkI++XA5oL2x6 EjxinYlQjGbo8yeoieAaNG06T6BV7YJ0sQDoFCZlwU5/5mc8VzeJ0fATfGfnEt/P/gIZ RO53T3kNHCq8UmCcNapXnAHD/M1FVJF+Z3O9Cfbr19z+ygfq/1OgvYU16mIFQ3xE9yVq 1DxhtlDlhIDn/UgecK53C6qRJCw0siuxA/HYbM12zJjX73B/zG9+rPG71VgVPhCyss7N Gdzw== 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=Yev+AXBqBGQDoXLDGZvdwqzLRoGYBMa84ajRYLADAlY=; b=NVbIWAlX8t21N50/OYHvU5YPx5a702tDn671eXjbYjtNUCfMThM88J8+bALjxNik8O eEhv5euFFDWbiAfJ83fk+0sm4+hstE2+ikHmIcC26ohRUdP6Jx/Zih83D3ooMTTQB7O2 O412mPfC973hcOQqK+U8OgsQeXv+BZ9njLdpbJOAtqdT2NuRh8gw59X3pvuZS5PE+RLq hMtuG9/xIlzNHUXDjeQjLtbJ3aZ0mLk9oBVxWhftfU6tSu25Vb4v0Uuu5lvqF1nP83uH InPGpYJoQCY8B06AhUcr4g4J6JS50wgeRxulJVwqJxlHTAlNZxD+fYeTzkLXGrVbv4GD EhXg== X-Gm-Message-State: AOAM530ieYrK8UrG458+nuLrNJwPErTEFcttUpoiwCC4oGN9aTWDmppr 93cf5WEhX1J333cZC04t9M4H2w== X-Google-Smtp-Source: ABdhPJxT6sZ4Kyu6Ea72eRUbWYWp7uYlahgXPf1kv/Lqw9O1aIRHSWEgLHAU7/0c59NW+hlMQHpP0g== X-Received: by 2002:a05:600c:3541:: with SMTP id i1mr10685689wmq.97.1615809418800; Mon, 15 Mar 2021 04:56:58 -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 l15sm18325308wru.38.2021.03.15.04.56.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Mar 2021 04:56:58 -0700 (PDT) Subject: Re: [PATCH 2/5] wcn36xx: Allow firmware name to be overridden by DT To: Bjorn Andersson , Andy Gross , Rob Herring , Kalle Valo , "David S. Miller" , Jakub Kicinski Cc: 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-3-bjorn.andersson@linaro.org> From: Bryan O'Donoghue Message-ID: Date: Mon, 15 Mar 2021 11:58:29 +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-3-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 wcn36xx 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). > > For some reason the parent (wcnss_ctrl) also needs to upload this blob, > so rather than specifying the same information in both nodes wcn36xx > reads the string from the parent's of_node. > > Signed-off-by: Bjorn Andersson > --- > > This patch can be applied independently of the others, but relates to the > acceptance of the addition to the DT binding (in patch 1/5). So my suggestion > is that this one goes through the ath tree and the others through the Qualcomm > SoC tree. > > drivers/net/wireless/ath/wcn36xx/main.c | 7 +++++++ > drivers/net/wireless/ath/wcn36xx/smd.c | 4 ++-- > drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + > 3 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c > index afb4877eaad8..87b5c0ff16c0 100644 > --- a/drivers/net/wireless/ath/wcn36xx/main.c > +++ b/drivers/net/wireless/ath/wcn36xx/main.c > @@ -1407,6 +1407,13 @@ static int wcn36xx_probe(struct platform_device *pdev) > goto out_wq; > } > > + wcn->nv_file = WLAN_NV_FILE; > + ret = of_property_read_string(wcn->dev->parent->of_node, "firmware-name", &wcn->nv_file); > + if (ret < 0 && ret != -EINVAL) { > + wcn36xx_err("failed to read \"firmware-name\" property\n"); > + goto out_wq; > + } > + > wcn->smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process, hw); > if (IS_ERR(wcn->smd_channel)) { > wcn36xx_err("failed to open WLAN_CTRL channel\n"); > diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c > index d0c3a1557e8d..7b928f988068 100644 > --- a/drivers/net/wireless/ath/wcn36xx/smd.c > +++ b/drivers/net/wireless/ath/wcn36xx/smd.c > @@ -514,10 +514,10 @@ int wcn36xx_smd_load_nv(struct wcn36xx *wcn) > u16 fm_offset = 0; > > if (!wcn->nv) { > - ret = request_firmware(&wcn->nv, WLAN_NV_FILE, wcn->dev); > + ret = request_firmware(&wcn->nv, wcn->nv_file, wcn->dev); > if (ret) { > wcn36xx_err("Failed to load nv file %s: %d\n", > - WLAN_NV_FILE, ret); > + wcn->nv_file, ret); > goto out; > } > } > diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > index 71fa9992b118..5977af2116e3 100644 > --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > @@ -185,6 +185,7 @@ struct wcn36xx { > struct device *dev; > struct list_head vif_list; > > + const char *nv_file; > const struct firmware *nv; > > u8 fw_revision; > Tested-by: Bryan O'Donoghue