Received: by 2002:a05:7412:3b8b:b0:fc:a2b0:25d7 with SMTP id nd11csp2453211rdb; Mon, 12 Feb 2024 05:37:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVHN+HgnYsXbIpfCox8BuiyIaFXG3EJGumEFqdvwGUFsBtFP9vC8E0kX9ZO4uwUq7ykJXP8Ez6LacNzJvWeRmLD9Gt3PfbJBWib2/ADTQ== X-Google-Smtp-Source: AGHT+IHEtKp0dtWKIhZ2AYCzEB5uP4Kt20E9EFow9mGvb9QO1K3brJy2SDH0IX9a2ewf2Aso8NBd X-Received: by 2002:a6b:e60f:0:b0:7c4:19c7:ec2e with SMTP id g15-20020a6be60f000000b007c419c7ec2emr9706908ioh.15.1707745032237; Mon, 12 Feb 2024 05:37:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707745032; cv=pass; d=google.com; s=arc-20160816; b=Itoi8QLwGb+qB3XStvJYsdU0sUIKUdzpHLFh9Idu9fQPl4479nGJhii0bZvQnSQxtH r75IJWho7zjc4WmsN4ZweovbyKzjMubJvkJTTUXGIPth/D2c8HdkLVRlHXRBlFJD160O 7KWYrYfKML3vmJ9ZyEtLyLF8dPGvKUhNJvi6KEqAjJmnlqkTOvziU77r4aRhh0PW1X6A m9xJKE/cxurfqFnHKcywm2LQ/WJumvSRC2PbBIt7N5UDWeLG5Fm8gsad+9/P+b3EuTTU TTdc9YI3D/r5joQcDFzGu6hLDlNMe2pmgOHWEsVhmqB+pgo+SG+W4Ut2kji8OVI8u9Xv V/iw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :dkim-signature; bh=I/A7r9NP/0VziEIfxN1XbFV9hH5pFIDQbUZtjpYFKSQ=; fh=oeMLVb8z0jcQxKl+j9NeXd1+19QE9xdCA3E8rrXOsWg=; b=Ae+SQ9egYwwwx4fj+sWBUg+oqkxA9dk/0hV+xTg9X2b33Uykt3uihYxBDvZHfw9E2O +kzktepFu3Y+lyzOPLOJXtH3cvW/8JuMgLO2MxeswepoNhPeCb8RGioqjd7QTm1DMe10 XTu+tWdY2pE1+p91tekxxtOkWZUgXm5+VMdILi+bKRVtn20lfT8Bd67OHLZaSkfL+EYD WNN+2Dd6hzVh+kXCT2D/kVFeQSTmhKItZ+BfLOfEEJJWk3RXI+quf7tXOeXVZw29ecF4 dtxQfwEEV6G+yxPmWo0+Icd9R3m9hNZC7B9Cd3eKfYlbcuOtsitgmF5aKz/nlcI8VbOo BMUw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gtwvT075; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-wireless+bounces-3456-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-wireless+bounces-3456-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=2; AJvYcCXIHba4CzB0zQc4K2jwOtKyxsa0Au05we3pGbVJWZRLPxo/E9JSdwwEJXOAWpklw1i7C4JiqeZEAK6VbJfaLrSHk3XBcI6Bh+A2lLVwUA== Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id d20-20020a637354000000b005cdf8b1fcdasi259255pgn.194.2024.02.12.05.37.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 05:37:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless+bounces-3456-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gtwvT075; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-wireless+bounces-3456-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-wireless+bounces-3456-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A44192833CE for ; Mon, 12 Feb 2024 13:34:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E471A3F9EA; Mon, 12 Feb 2024 13:23:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="gtwvT075" X-Original-To: linux-wireless@vger.kernel.org Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D6313F9C6 for ; Mon, 12 Feb 2024 13:23:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707744229; cv=none; b=WZmqvqu7XvpEWTyugfJONcu2kDQY+bSpKND+/3QxcdQgXFtEJiMMKtmMcqHmx3qYjMFmGtr1aK/QxHKp+IFOy1WQFh64F4UevDZSTRdEi1tYCz5uLT0Ca0VPrNWuq7Wa/mK1CY9d/8uTFT9PxZJVf38We6SpmGg+Dkm/RIMA2nc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707744229; c=relaxed/simple; bh=ydSEgrw3vWH0wzxU4QWRY90lfDyvLwBVFaRZ31MUPio=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=SXrzNVGi+9ES7i2tfH9NUMHZ4l+QphK6CEjlMscEMa8mCTY5MRgABj58VujNtSF0323aCM+MNmamg9bQHYMv1ZwTnbz3ZVmr34AxxZP/UbokV4asW/BD19GiSPlSB3qURV7b7xTu6vMoEhE5enj+S4VxBym8DiOLgaXl88xnRhE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=gtwvT075; arc=none smtp.client-ip=209.85.219.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-yb1-f170.google.com with SMTP id 3f1490d57ef6-dc6e080c1f0so2724035276.2 for ; Mon, 12 Feb 2024 05:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707744227; x=1708349027; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=I/A7r9NP/0VziEIfxN1XbFV9hH5pFIDQbUZtjpYFKSQ=; b=gtwvT075RsSFOrYLxrG8VHIo/BUCxR3Dz8B/3A+qZ3YZPe/FXIPXXy3b8AW3ekaXka SBaN8TX0PMCqLPsg0VANzW94hR62fwOBFCFbrXsu/dN5w1yAFVAvwNFs9OGi4ZPhUT8T 0K79rQJjUkqcEL0NpyK878kUs/sGLusRYbr8C3DwNDXrxjXS/d9JMd+QExUVWSCW1XnF hoFpPlhOhj5nUantFzwhTWaOILdgZACL4GK9vLJ7TOdBY4VWBtWq2/FSA4hkFkxIYM3n u/ruC8Y9i+ymtH2wemeV3K1XK6nfivYZzUxIER03Xjphl4sbbinyOZCpnCDAP5wo77D6 TZoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707744227; x=1708349027; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=I/A7r9NP/0VziEIfxN1XbFV9hH5pFIDQbUZtjpYFKSQ=; b=aKpZ5AkVkY93rEE7nSvWiC8zmA1XsE91qPGzNuv8J5aDTgksmXiM//radF99hiLsuL D1UPl0PISguSeXuPzI57PI+suyqhy8X64YRUceexPVvkAp0Gb2c9s/7RoYkF9Ia1SdbZ F9b051RnJ4FFoNi2o2OdVGW3Pow9/4T4f2VPblx/Ep2BvHloJ8lqLIj4WsNJ7WG9mqlx hvc8PINpUNZSr4mvM6IFlwXbuViLZyZoen2W/eK92q9M8rVTBL/J3BdPr81LwqIWvbpi M5XgSmr2RZLVNQCmItDqtInS9pSTrsot2I6g8VdqWbcvQ90k/02AHPJU8WL9HBFpvwAn i8kw== X-Forwarded-Encrypted: i=1; AJvYcCWgVvquBJc/8XDXlSOv4tMCfiASgx/ZkWkt71PmKFby5c0h/RNKIWx0mb9wpxYP3yipU6F34X2+J4uUMCla6HMC3ovXb4a+MoF9IDo20lk= X-Gm-Message-State: AOJu0Yw9mOfm+pphdsQUkQJOCLOfpCTPVFDMWw1B8CZf88pQE748C4Jv A08cWDdYKO3OUXrrmvsJvvFgDI4HovloUsL4LZ0CZRScWWCuZKojYlZkEsVEvXIiiNRKb7GoEah WzRLLJxY45ch1bH4E7z27Emb420jPWytcsrLIpA== X-Received: by 2002:a05:6902:2489:b0:dc6:421a:3024 with SMTP id ds9-20020a056902248900b00dc6421a3024mr6213196ybb.43.1707744225689; Mon, 12 Feb 2024 05:23:45 -0800 (PST) Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240130-wcn3990-firmware-path-v1-0-826b93202964@linaro.org> <20240130-wcn3990-firmware-path-v1-2-826b93202964@linaro.org> <03d5d556-9477-4f2e-a737-c2f6a96d97a4@linaro.org> In-Reply-To: <03d5d556-9477-4f2e-a737-c2f6a96d97a4@linaro.org> From: Dmitry Baryshkov Date: Mon, 12 Feb 2024 15:23:35 +0200 Message-ID: Subject: Re: [PATCH RFC 2/4] wifi: ath10k: support board-specific firmware overrides To: Konrad Dybcio Cc: Kalle Valo , Jeff Johnson , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" On Mon, 12 Feb 2024 at 13:12, Konrad Dybcio wrote: > > On 30.01.2024 17:38, Dmitry Baryshkov wrote: > > Different Qualcomm platforms using WCN3990 WiFI chip use SoC-specific > > firmware versions with different features. For example firmware for > > SDM845 doesn't use single-chan-info-per-channel feature, while firmware > > for QRB2210 / QRB4210 requires that feature. Allow board DT files to > > override the subdir of the fw dir used to lookup the firmware-N.bin file > > decribing corresponding WiFi firmware. > > > > Signed-off-by: Dmitry Baryshkov > > --- > > drivers/net/wireless/ath/ath10k/core.c | 11 ++++++++++- > > drivers/net/wireless/ath/ath10k/core.h | 2 ++ > > drivers/net/wireless/ath/ath10k/snoc.c | 3 +++ > > 3 files changed, 15 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c > > index 0032f8aa892f..ef7ce8b3f8fb 100644 > > --- a/drivers/net/wireless/ath/ath10k/core.c > > +++ b/drivers/net/wireless/ath/ath10k/core.c > > @@ -942,11 +942,20 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar, > > if (dir == NULL) > > dir = "."; > > > > + if (ar->board_name) { > > + snprintf(filename, sizeof(filename), "%s/%s/%s", > > + dir, ar->board_name, file); > > + ret = firmware_request_nowarn(&fw, filename, ar->dev); > > + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", > > + filename, ret); > > Perhaps it'd be useful to move to a more noisy loglevel No, these are details. If the firmware is in place, it is loaded properly. -- With best wishes Dmitry