Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp10926529pxu; Wed, 30 Dec 2020 16:17:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzu+7kIr4oXLsE/beCUDY0iiZMe7QpGifK1SZih5bcxvY6S8J7eSB6YcrVcYtK8mfDEeeb5 X-Received: by 2002:a17:906:7090:: with SMTP id b16mr8009869ejk.76.1609373879329; Wed, 30 Dec 2020 16:17:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609373879; cv=none; d=google.com; s=arc-20160816; b=jQii/UKEMWPBEZTdURecJyA3lCmxDE8MUYy83sFE2Go04B9J6ZszlWWwWsUUFdnrXA S98bGJ/Sr9Sg+RWD3z92lG/bGDLZ87SMxhW1ogOp7sRTvOtnnJh9UafEzPr8EZF0R9lX VbKkMOKGAOcQr2Ld9QRFRxsmsn3cK1fsojgwKdpV8jZj3VwpoOXuTHItl2pMVdldfDi4 L8qtweCaG1AhSnyJS6K/8kjidcKn6nidxtfOp2/4KsovA2UYzCGxkrPmFsZtG9DjTBFM WzcLX8TRPl9ydIehr0zKlPeUBqN9eMtvF0c7SJgOY5xyW9nSre0m3r0KDk0qPOHfFX0p BAoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=lMXYrZJzd/CwrdkpsHKZuOZZj8d6MV5O/qvgtlF+45k=; b=b7CsQGpvQcBNsOYbfR3nk7nYuOatiu0uYUja8zMl3CceVL2lrnlTpnWhw8AiHzDgep kbQWaYA67aW8eCI6EII3p1YxTns9YiRoifWg70dH2GT6t1zgfiFKtUlg0qCkwCvxbkLh HkF3GbieUdEQgNKwfb3WB+YFhe4Llx6yM975rwrEMqOlwvEhqC7tQOgofjZoZWb2W4hX xbpqAxofBzsjmpogOHxmDRkWCml34aery2u29jdv61zIQ9qrlKiowBsL4OTiziWhqllU prcdmhzmm42ONfJSd7WeV37fDbh7O9Yz646LdVUfxs5B4q95au7KeuTQx6chRI8V7QD7 BFQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=nnFhaZsr; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id si15si22694995ejb.394.2020.12.30.16.17.37; Wed, 30 Dec 2020 16:17:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=nnFhaZsr; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726348AbgLaAGN (ORCPT + 99 others); Wed, 30 Dec 2020 19:06:13 -0500 Received: from mail2.candelatech.com ([208.74.158.173]:47710 "EHLO mail3.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726285AbgLaAGM (ORCPT ); Wed, 30 Dec 2020 19:06:12 -0500 Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 3ECE413C2B4; Wed, 30 Dec 2020 16:05:32 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 3ECE413C2B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1609373132; bh=MYYA1lu2bURnsdzJW7BUzNGdF1aE8TOYYJCaWgBJ7dY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nnFhaZsrTckJu3W0gfEqBcvvLDHPixR+8uXwR6PqWJXxpMl+Gd/8nKOujiGQn5vIp CdZjLcjDzS32AQXA+3WNzvayrzTi+vpJlFieVE6rh5cA6nC8HR+cOuoCZCw0MDW3Et 6kQtUrQkMwVadz6Mr4IxCWOvjlei8mMjtKArEh2M= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: luca@coelho.fi, Ben Greear Subject: [PATCH 3/6] iwlwifi: Allow per-device fwcfg files. Date: Wed, 30 Dec 2020 16:05:20 -0800 Message-Id: <20201231000523.14963-3-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201231000523.14963-1-greearb@candelatech.com> References: <20201231000523.14963-1-greearb@candelatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear This allows one to set the NSS and some other low-level features for ax200 radios. Signed-off-by: Ben Greear --- drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c index 223c716d9fce..e2ae509d1650 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c @@ -246,12 +246,16 @@ void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg) const struct firmware *fw; char *data, *end, *pos; int err; + char fname[128]; if (dbgcfg->loaded) return; - /* TODO: maybe add a per-device file? */ - err = firmware_request_nowarn(&fw, "iwl-dbg-cfg.ini", dev); + snprintf(fname, 127, "iwl-dbg-cfg-%s.ini", dev_name(dev)); + fname[127] = 0; + + /* TODO: maybe add a per-device file? Yes, did that. --Ben */ + err = firmware_request_nowarn(&fw, fname, dev); if (err) return; -- 2.20.1