From patchwork Wed Jan 3 09:57:03 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: 759840 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 532111865E for ; Wed, 3 Jan 2024 09:57:18 +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="BlniNCoS" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-336788cb261so9237931f8f.3 for ; Wed, 03 Jan 2024 01:57:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1704275836; x=1704880636; 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=tqU648VJqfw2SnM1oWDl+dPJ33cr8VR6B8TPpsBkc+0=; b=BlniNCoS0SLcs3l54LojDI15rqUdzF3iuCBYCZR020szstRhVEhUN3ioy0V2XW+uhv ai3gomnoyptzr6OGFFUcJRqZZbqU1QStpbKUpOo68aPKVWXyhU9vDQtoMi+OWr69SKgx SeLpxOrkporX3p59jON1rYXbLNINqVpRQULuY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704275836; x=1704880636; 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=tqU648VJqfw2SnM1oWDl+dPJ33cr8VR6B8TPpsBkc+0=; b=IAwpgAH1imZWcKvSXbzWU6jY7tOnm2pcboW1Fdcu07dCnDpFtMs2GBth+gVKnbXiyx 7cTWl3bP97QZd4ptaT0lpVLkqMG+sn3HFpAGAG6/pGPY6AMcl6ugVt5Xjq6t38WvHy25 d8E01KZzAOak5+/VuVtWSoi3sUvKfCkGgxadmRN15nHxcjD3YIKebMdNMpnBefVMejZq 68M89/0wTwZE0Cn17PPm5HjgJ361NR1fqcUvT1KmBNQ+O0hETo/iwUvM8xgOdUxh+aTj ftAx6qrdA3nIP1GlvcHWmDtVByeibc925uVkCAUUGsGJS7D2KLkPnr+xtFaLoNVy2yFs s2hg== X-Gm-Message-State: AOJu0YwvB5DmJygqgSMIvNZcy2AyWrcRd7uvPoV1OriYNUXzszJxzu5/ enfhc0qlpFdWuIEHn1P6sWFxKuQxUIZH X-Google-Smtp-Source: AGHT+IFWkmtS5P86Ww5yrIS84EIhy9j4TLj9/YTfDTzRg+emnP2VibC2tQFbc1rboqby5Fw6GCLO0Q== X-Received: by 2002:a5d:4a85:0:b0:336:7e2f:dd68 with SMTP id o5-20020a5d4a85000000b003367e2fdd68mr10010832wrq.126.1704275836703; Wed, 03 Jan 2024 01:57:16 -0800 (PST) Received: from bld-bun-02.bun.broadcom.net ([192.19.148.250]) by smtp.gmail.com with ESMTPSA id d5-20020adffbc5000000b00336e69fbc32sm18868019wrs.102.2024.01.03.01.57.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2024 01:57:14 -0800 (PST) From: Arend van Spriel To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Arend van Spriel Subject: [PATCH V2 3/4] wifi: brcmfmac: move feature overrides before feature_disable Date: Wed, 3 Jan 2024 10:57:03 +0100 Message-Id: <20240103095704.135651-4-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20240103095704.135651-1-arend.vanspriel@broadcom.com> References: <20240103095704.135651-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: