From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.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 2A58F5013AF for ; Tue, 8 Sep 2026 09:39:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788860357; cv=none; b=uOS7lD6NjOmYEq3RpQpB27UizuBT1pK8d+/S3aBWQMjbe2iMK1pOeZ7dXywdoobSdgNOtlqMm4ro6rFspJoSU5xWBfN/0HRPp5aNM3y3AAlHrQnoN4FzM/IZj0gsnzkyetAECWtI/t8QdF/00M5L3ZVfg357RYtno35UpQXbnlM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788860357; c=relaxed/simple; bh=4Sbr75c0abt10xZybWlwcKOCX9shIU/NqqpX3auH90Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Q0OJofM+5h8cHmAAVVhYWLht3as5O3eASfi2VsNuRO4DoHSj4j4iU/FRnJ2uDPEIrsVJf4N3/sWAVEqY/KwsR/InyykokUJWP2I+6fboyXnePxVkLs/rjrMLH9RZWwosJ5pxItUDSEgOY9zQA+qBTSY3vms2nTr9dmCa2BiouY0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=oPffJ0S5; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oPffJ0S5" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2d6e954afbdso27933935ad.2 for ; Tue, 08 Sep 2026 02:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788860355; x=1789465155; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4UaQxBJSfqPaQYKAdjMuukZ2PpCv6cQKQMT0AYXy5/I=; b=oPffJ0S5R4JqpwhDzGxlk24N1dJNWu5XIO8MzvAuQt8pnqm1ri76IBqjmlkD7pm4ew +fz8Nbq56PpV+NDHHn/Jl3Ij1i2hy8k1YlygOZ5n7m3iBSn0pHRAfII1/wL8VLiQQAQ5 vFyyGZQLXFtLn1cTMEWkYKg1OUVZJnhbyRBJs1WZ/QWmeu0PvzfhOD6jocp56RIaL8Mv MjGYVB1z3IhWngkQtOtwISroDILA5wBKWcMwiMpPozEg8l2TcNl0bg0hS+SGvN1y/uTE Sa6204ILohs+qaCgMol6j8DP4x/2o5S6EMivqh5CgzZwEVypJBUdBDNInCx1Z4x7ZeKH zylQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788860355; x=1789465155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4UaQxBJSfqPaQYKAdjMuukZ2PpCv6cQKQMT0AYXy5/I=; b=ePbgJxBEF7ZvzoVXhKfPZc+1u5X4MCfn8Lr9zeseLqdu2QtLy4DAtYdV6x3T+y4lWE KqfRBcwgruWmIrfdPkZqAsq0+rHdSoahfz46OxvNknYVCMBOTjE0Fe5aSNIo/VyGUTaM VUYN389jvasyNiW7BRmhvN7wAqX3WEDngybUGdvUmd+1jgZ1VRtYKqa2o3Ot43NSaYNU HvxWfqNpxNsurr4GoIp3jI5s1/2WNgf0v6BmFpuyMbl5i7fvXfmUg0PMYyz6RzILJ7vD aRuHMQW2kvFbp1LuKPm0wjHG4bNhdIfP2e8CWIK8C8DE4yE+6AgejNoqWyU72qS88XAG MmOg== X-Forwarded-Encrypted: i=1; AKwUvBxvMsS9CHrLa/kVuWDEssrxDc4JAoVBdn8UCJWwtH7uUWqwYSFqqowX6f1kGGhuMoz5VCq2HQ8MoKE=@vger.kernel.org X-Gm-Message-State: AFuF++kmk+dOykT+pyfDAl4GBL05bM2nfPasTg+Y+u20Ag5SHuFxNaKS k8b9ni7vnjtjYa44Pe7wjs+f0Ba0Sdoeu3r2M7JtNAOq8aKXcco/b+gl X-Gm-Gg: AYBFou2g4NJ1YPRI20BbPh58q+GVKEUCidJReOhHTTZzNJWFOZ2T/WbdXjPPZt6T/SR Mj/gxYjMYKfZ8BbiBlr5omoLKhQBVvQ19qZ25Sc/R1l3fAifkEJaMV0VadGacZNwGxWIR6cJRHO cSCQC3fiD1u0MZhfM0vEwWkBp8vaXKddGRz6EqxgYDl6s6ZsQocIcwCQx1H7UvDU7k0D/Bm03dW jL/MKc0I8bnuDdpk5XIQdW8u42Q5byL8pDOIfkbvd3U6vZkILM/DdvA+m9iP0w+TfMt2MVz2466 TZKD7L4LsracoUXYm6eU9CmpmsIlqupz5niBTwQabrIAR+UBkf3djlP/ovQkU95eMU8uLSdElvO aZtUrzyhjpwTKwCf6NYHCy1YbxroC92Wvs3goZj2aZWeO1znJFThr99DceL9hDo016JrZFNVdAC ZlLSO+m8x7F/quVy7Drqj7IZlUbXnFlkvw2YRRhQjoXtkfHVXnN3zGtYRI/LLM5LYYq3G40TpOi EQ/1WSvamfe4T/eCq+YZH5gy7HhJCztvq5cWlpQ59PRqYApl6FAGn8eLBFLQsm4P8hK86vrSGgY Vw== X-Received: by 2002:a17:903:4b04:b0:2d3:160b:c01f with SMTP id d9443c01a7336-2db124b1ae2mr384628815ad.6.1788860355450; Tue, 08 Sep 2026 02:39:15 -0700 (PDT) Received: from nxpwireless-Inspiron-14-Plus-7440.tw-tpe02.nxp.com (114-25-99-144.dynamic-ip.hinet.net. [114.25.99.144]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2db1497d9f9sm54848085ad.32.2026.09.08.02.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 02:39:14 -0700 (PDT) From: Jeff Chen To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, francesco@dolcini.it, linux-mmc@vger.kernel.org, Ulf Hansson , Jeff Chen Subject: [PATCH wireless-next 4/4] wifi: nxpwifi: Limit channel width based on firmware capability Date: Tue, 8 Sep 2026 17:37:58 +0800 Message-Id: <20260908093758.596444-5-chunfan.chen@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260908093758.596444-1-chunfan.chen@gmail.com> References: <20260908093758.596444-1-chunfan.chen@gmail.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jeff Chen nxpwifi_cmd_append_11n_tlv() derived the channel width solely from the AP's advertised operating bandwidth and could request 40/80 MHz operation even when the firmware did not support it. On 20 MHz-only devices such as IW610, this may cause the firmware to be configured with an unsupported channel width. Check firmware bandwidth capabilities before selecting the channel width: - Allow 80 MHz only when ISSUPP_NO_80MHZ() is false. - Allow 40 MHz only when ISSUPP_40MHZ_ENABLED() is true. - Otherwise fall back to 20 MHz operation. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Jeff Chen --- drivers/net/wireless/nxp/nxpwifi/11n.c | 4 +++- drivers/net/wireless/nxp/nxpwifi/fw.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/nxp/nxpwifi/11n.c b/drivers/net/wireless/nxp/nxpwifi/11n.c index c2a54d781b42..a83e29ecc466 100644 --- a/drivers/net/wireless/nxp/nxpwifi/11n.c +++ b/drivers/net/wireless/nxp/nxpwifi/11n.c @@ -349,6 +349,7 @@ nxpwifi_cmd_append_11n_tlv(struct nxpwifi_private *priv, nxpwifi_band_to_radio_type((u8)bss_desc->bss_band); if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info) && + !ISSUPP_NO_80MHZ(priv->adapter->fw_cap_ext) && bss_desc->bcn_vht_oper && bss_desc->bcn_vht_oper->chan_width == IEEE80211_VHT_CHANWIDTH_80MHZ) { @@ -359,7 +360,8 @@ nxpwifi_cmd_append_11n_tlv(struct nxpwifi_private *priv, ((CHAN_BW_80MHZ << BAND_CFG_CHAN_WIDTH_SHIFT_BIT) & BAND_CFG_CHAN_WIDTH_MASK); - } else if (sband->ht_cap.cap & + } else if (ISSUPP_40MHZ_ENABLED(priv->adapter->fw_cap_ext) && + sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 && bss_desc->bcn_ht_oper->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY) { diff --git a/drivers/net/wireless/nxp/nxpwifi/fw.h b/drivers/net/wireless/nxp/nxpwifi/fw.h index 188110b020cf..124728a72442 100644 --- a/drivers/net/wireless/nxp/nxpwifi/fw.h +++ b/drivers/net/wireless/nxp/nxpwifi/fw.h @@ -334,6 +334,8 @@ enum NXPWIFI_802_11_PRIVACY_FILTER { #define DFS_CHAN_MOVE_TIME 10000 #define ISSUPP_11AXENABLED(fw_cap_ext) ((fw_cap_ext) & BIT(7)) +#define ISSUPP_NO_80MHZ(fw_cap_ext) ((fw_cap_ext) & BIT(8)) +#define ISSUPP_40MHZ_ENABLED(fw_cap_ext) ((fw_cap_ext) & BIT(15)) #define HOST_CMD_GET_HW_SPEC 0x0003 #define HOST_CMD_802_11_SCAN 0x0006 -- 2.34.1