From patchwork Mon Jan 1 08:44:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 13508616 X-Patchwork-Delegate: kvalo@adurom.com Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (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 71FF533D6 for ; Mon, 1 Jan 2024 08:44:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="PNw+tR0p" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-4280bd41317so18434101cf.3 for ; Mon, 01 Jan 2024 00:44:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1704098683; x=1704703483; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=iM1m2haukfEwf1HjoDwW2wD/CarfDHmVHSiMxkV11sU=; b=PNw+tR0pisTnb+cFjv83pHXLaSxpzors+foKSDJBwuUo+Z9PY6vi41QudnCTVm+Ld2 aEHhsKy8kT5YPNonIaSXgFec+9z3p2PKBx1wVr4+XOJWdN+mYDjraD4vl0u9zVha0VZ7 3JS+0eSk//qcGV/DktiMUZGC15PcZMHjKaC6M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704098683; x=1704703483; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iM1m2haukfEwf1HjoDwW2wD/CarfDHmVHSiMxkV11sU=; b=EA70q+oMkwWygqRxJQIkw0oJ3Tv34yMqpLCoe0JI+YozbPyRXry5y/FqbF7YshdAcN Yp0aZrODgSihGUAJfM0zAIafrwZLyYH43n08d/XcBGsGKckqlAA3c0BgOWmA/uULXfUp klFBFrvQq/0Z9bSclN4pzW8ghrl4M3X4Oa80mlN4ya6BrfUVoQR6n0hX13CLhX1jZbgS QDS2u542zolQF5Ro1rmf4xiTnh4bmmUpqVgvTer3mUFNeaLQKpEWVULCB9XAmJTE1NHy ovGsOzMFh+ljJq9M7O6LfKc3f3rsw8oo10HuEf5Uh3ZqtniCWc3mB+2nKSmM/SRZUYnM Hg1g== X-Gm-Message-State: AOJu0YzIDiYncenXaz4i/+mDkndMhbcitldogkFs1BKjidjiMTVWlv40 P9vRnt2g7fgrzVWU0Y0zjkkB9gYOrMiC X-Google-Smtp-Source: AGHT+IGj5jfefHnN8VBLLajhM5T4PFLiLl3lToADg+G25MzxV4bKfmrS9rOELII7Q3Q2j0k/VnbdQg== X-Received: by 2002:a05:622a:48a:b0:427:7725:e90f with SMTP id p10-20020a05622a048a00b004277725e90fmr23775573qtx.8.1704098683276; Mon, 01 Jan 2024 00:44:43 -0800 (PST) Received: from bld-bun-02.bun.broadcom.net ([192.19.148.250]) by smtp.gmail.com with ESMTPSA id ey25-20020a05622a4c1900b00427fb1d6b44sm4186230qtb.5.2024.01.01.00.44.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jan 2024 00:44:42 -0800 (PST) From: Arend van Spriel To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Arend van Spriel Subject: [PATCH 3/4] wifi: brcmfmac: move feature overrides before feature_disable Date: Mon, 1 Jan 2024 09:44:29 +0100 Message-Id: <20240101084430.161821-4-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20240101084430.161821-1-arend.vanspriel@broadcom.com> References: <20240101084430.161821-1-arend.vanspriel@broadcom.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The feature_disable option in brcmf_feat_attach() is a debugging or workaround option to disable features that cause driver issues. Hence they should be done as last step after all feature detection mechanisms have been completed. Signed-off-by: Arend van Spriel --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c index 7fef93ede0fb..f23310a77a5d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c @@ -340,6 +340,9 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_FWSUP, "sup_wpa"); brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_SCAN_V2, "scan_ver"); + brcmf_feat_wlc_version_overrides(drvr); + brcmf_feat_firmware_overrides(drvr); + brcmf_fwvid_feat_attach(ifp); if (drvr->settings->feature_disable) { @@ -349,9 +352,6 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) ifp->drvr->feat_flags &= ~drvr->settings->feature_disable; } - brcmf_feat_wlc_version_overrides(drvr); - brcmf_feat_firmware_overrides(drvr); - /* set chip related quirks */ switch (drvr->bus_if->chip) { case BRCM_CC_43236_CHIP_ID: