From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.218.54 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793621980; b=aKi6w2Bc7Cz55KI7kbvrn0oZ8iSyZNOkPIW0athm8CN3MzJCKmNRGNkmQeNAZZIydEA8 U+1HIyRj1TFDC6XXnHmz5ofQg13YiHottq9I93rqDufEXuNzjIVD342jgzt4mAaYeFPcv zTxElKzZcdY+ik/na/2U5ScvObRdEjdiY+zrTR6+oDOSHrmCtMu/2/0ke9a02JMaPsrjG V2KrE8pQgrZxNxv0eAfqh2vS+I26oLSZzihmc3q+oUr2QL5NEGusaFe+U+GE0oXs81u+h SrTVRpZPIYmY89qK582Sh5ERawj6Gxwubv+C89kylHNVtaRZrpsTXwE6C349K9D4omw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793621980; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=TsQ7SUUVHUQq2PWgfT1D050Y58fUNisV6VpQiBCfSZE=; b=G+8Vu3T4stJrKRf7J3bd9e/UPqxkJxaIjCIsUpqvn6a5RSRhAFPHDjE9Zl1KAI55FEn7 ZtIkMWYYYhe6r4LyjJ6+NvRNTYNyKCGlbmxg1sj4q4ndJ/zoh5iwCUYpk7rA18kBaI8mS 5IRQuM3cg54nIxUIKCJ3of1W2Eo3kpmtHh4lmA24boKmQcutfcnvZpIdbZ4hdeu6CHFsr NHrmFC8F4SYa4xeGbJmdIviWtZizgdPtG6Opt61U458r3FOZyJXyVBSPLWCewdU3plrtx jiP06b/GhnHFuI0WsN/4AUFtnsEfwy+gzhyc5Kyxsusp+eV3PIF93vLIQIE7HdZR6BA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=remarkable.no; spf=pass smtp.mailfrom=remarkable.no; dkim=pass header.d=remarkable.no header.i=@remarkable.no header.a=rsa-sha256 header.s=google header.b=T+nUEvAH; arc=none smtp.remote-ip=209.85.218.54 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60CE6606A326 for ; Mon, 2 Nov 2026 12:19:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 60CE6606A326 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=remarkable.no Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=remarkable.no Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=remarkable.no header.i=@remarkable.no header.a=rsa-sha256 header.s=google header.b=T+nUEvAH Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-c40f29667e6so444272666b.0 for ; Mon, 02 Nov 2026 04:19:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=remarkable.no; s=google; t=1793621979; x=1794226779; 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=TsQ7SUUVHUQq2PWgfT1D050Y58fUNisV6VpQiBCfSZE=; b=T+nUEvAHPgsmmnOiDE/slWiMw7Q736AfYFblYaMMERMPiAVPBXi3j8Vde+z/lQat9d vQtWYeEzVjWhdoMqOVG5aUt+HoaAUyxiAZRjSoUgcmn2tvOTTmGmdVPrhlzFgpR8wHX9 4sF2ItwkKBC/wn+2mjfokBS2ByAJcsgy45LVDP+LvG+93jSb4dF8qF/O6GuPWryadNgN zg0xzzgikzCJgDPbZ4kybdiQIyGz7Gnf8i4UJGYjMm001oOhvLdynUlCc2zVcnqgc2y0 9Gmvv3/qsZoj+UbKoIh4UHjeqnJagny6e3O+90nUb7Nf/PKZYzPG6c/hdlCiSiTPGpoX OBKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793621979; x=1794226779; 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=TsQ7SUUVHUQq2PWgfT1D050Y58fUNisV6VpQiBCfSZE=; b=OALHZ6pLTHfA6ysfTppFgwCByAK8hY/VKJNbUJx0Q4Hx6+5/jSvAtHFgrBaE7DZEiK 3MwHdIZ49VrQqjbH37BLpUoKP6GYcZlg8KiX1mT00gwCUpAC3Xth2iZ5fzrV606FxRvE JnLXEAgjyh2YRLrUeWv2N21jjkRDgfIMsnz4hBf0bfb/UdXOP/RjnPjttt+D2X2bDrjE baAB3a98bKUgRuGFToWeVKB62mVjt3KEoD29N6A6NEOixw9dng2fZ/9MDt92aaF4O7t6 0hYknjPj9tcezxYcN2xJNSxBENgIh5XWUnN6cwPbmuMKq67F+CC0Dw4a6QFQAKP7zcdI roEQ== X-Forwarded-Encrypted: i=1; AKwUvByawAHfX6OOh/bw7weaUBx2Ea6+R2Qa8HISqbuOPLUVAfNTmIzx28BrBP0Q2VkzGhHODgp8nb426xLKex8=@vger.kernel.org X-Gm-Message-State: APuU4Z+PILqsKbVro0t3bbtsAD1R0NMQvX1bYlH7x4lDlj28cCSYLKqR 5nBcdDhvUXxjssSfvdxI2q4xta9/WyIVwsL/TjVs3wh0dBT1BkVzNFGzszjDvWAp91U= X-Gm-Gg: AYBFou0eKqbiV9KlWC8f6Sc1ooNUFEBrth5WR4vfFjYJX3XT0x+ZvK8Te8rvut1sDmv mT6ysymrxlpjRnVrZRegxYULC6v8iuW7ig9enX9Zh2yxfbJ3NNRciH5ARsfXNcPeeOsXoy5+PXe U0jjL1tzVbuEy+DLbBqysXOCgW5g/wDWLed6rRDiIX93wPGFa3UZ7/o9ZeTJuldumnMYU95E9a/ Q/UmCOW8W96ll+wuNwgbjCDye/pX3fr+BbWlrsVGg5nY3uaeNdJe0uYwo8LdhakECX9Uh3HRPIv EKkC+e1axj3T6gsIVGkQxD+G9GBKNzlHy+R6vRxMJF46usg0OKCjmGFWNPrrkZICc2C+tW++Tnd Lz432vKeZ2/2B5eK1wr1R1+Hx1YDtZCFmwg/KJwj7JYxcVH5CI5XvL54V6DOPllKiJfN30pJSx6 x36/v9Z5R8OaWqz+JQc/NseHsvtnm5ncv36KKsKHbe+x9DTbGjZe14nE9c8U2+r6HgBZUH/O5a2 WPCQhO2+mftbM9VhSKGgL1y2A2bOYtB2PrdeFGJVaVC9UUxglX//y3LOFFkBYuidVKByVQtrUNA IovVP8Xz61r1SyE3oFcD2QlTjqWd6v8jH/LjGvFR7lDK X-Received: by 2002:a17:907:961a:b0:c31:91f9:60b7 with SMTP id a640c23a62f3a-c4ca7a69731mr830226366b.34.1793621978663; Mon, 02 Nov 2026 04:19:38 -0800 (PST) Received: from vkn-desktop.lan ([213.52.63.204]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c4cabcfd22bsm378293666b.28.2026.11.02.04.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2026 04:19:38 -0800 (PST) From: Viktor Korsnes To: Jeff Chen , Johannes Berg Cc: Viktor Korsnes , Francesco Dolcini , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH wireless 2/2] wifi: nxpwifi: add missing header to HOST_CMD_CFG_DATA Date: Mon, 2 Nov 2026 13:18:00 +0100 Message-ID: <20261102121856.1011263-2-viktor.korsnes@remarkable.no> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261102121856.1011263-1-viktor.korsnes@remarkable.no> References: <20261102121856.1011263-1-viktor.korsnes@remarkable.no> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nxpwifi_cmd_sta_cfg_data() writes the parsed calibration payload directly at S_DS_GEN without prepending the 6-byte host_cmd_ds_802_11_cfg_data header (action, type, data_len) expected by the firmware for HOST_CMD_CFG_DATA (0x008f), matching upstream mwifiex commit 9868c4ce9481 ("wifi: mwifiex: Fix RF calibration data download from file"). Add struct host_cmd_ds_802_11_cfg_data to struct host_cmd_ds_command, populate the header before the calibration payload, and include its size in cmd->size. Fixes: 73b01e57ed3e ("wifi: nxp: add nxpwifi driver for IW61x") Assisted-by: GitHub-Copilot:Gemini-4-Argon Signed-off-by: Viktor Korsnes --- Tested on i.MX8MM with IW611 (SDIO, FW 18.99.8.p136.0) using a 458-byte calibration configuration file: verified via kprobes on nxpwifi_ret_sta_cfg_data() that HOST_CMD_CFG_DATA (0x8f) succeeds (result=0, action=1, type=0x2, data_len=458, size=472) and the firmware parses and endian-converts all 113 32-bit calibration words from the file. drivers/net/wireless/nxp/nxpwifi/fw.h | 10 ++++++++++ drivers/net/wireless/nxp/nxpwifi/sta_cmd.c | 12 ++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/nxp/nxpwifi/fw.h b/drivers/net/wireless/nxp/nxpwifi/fw.h index 124728a72442..d4fe29faedea 100644 --- a/drivers/net/wireless/nxp/nxpwifi/fw.h +++ b/drivers/net/wireless/nxp/nxpwifi/fw.h @@ -2375,6 +2375,15 @@ struct host_cmd_twt_cfg { u8 val[]; } __packed; +#define NXPWIFI_CFG_TYPE_CAL 0x2 + +struct host_cmd_ds_802_11_cfg_data { + __le16 action; + __le16 type; + __le16 data_len; + u8 data[]; +} __packed; + struct host_cmd_ds_command { __le16 command; __le16 size; @@ -2382,6 +2391,7 @@ struct host_cmd_ds_command { __le16 result; union { struct host_cmd_ds_get_hw_spec hw_spec; + struct host_cmd_ds_802_11_cfg_data cfg_data; struct host_cmd_ds_mac_control mac_ctrl; struct host_cmd_ds_802_11_mac_address mac_addr; struct host_cmd_ds_mac_multicast_adr mc_addr; diff --git a/drivers/net/wireless/nxp/nxpwifi/sta_cmd.c b/drivers/net/wireless/nxp/nxpwifi/sta_cmd.c index f3cd5a51c438..a62ea7b9dc07 100644 --- a/drivers/net/wireless/nxp/nxpwifi/sta_cmd.c +++ b/drivers/net/wireless/nxp/nxpwifi/sta_cmd.c @@ -1421,24 +1421,28 @@ nxpwifi_cmd_sta_cfg_data(struct nxpwifi_private *priv, u16 cmd_action, u32 cmd_type) { struct nxpwifi_adapter *adapter = priv->adapter; + struct host_cmd_ds_802_11_cfg_data *pcfg_data = &cmd->params.cfg_data; u32 len; - u8 *data = (u8 *)cmd + S_DS_GEN; if (!adapter->cal_data || !adapter->cal_data->data || !adapter->cal_data->size) return -EINVAL; len = nxpwifi_parse_cal_cfg((u8 *)adapter->cal_data->data, - adapter->cal_data->size, data, - NXPWIFI_SIZE_OF_CMD_BUFFER - S_DS_GEN); + adapter->cal_data->size, pcfg_data->data, + NXPWIFI_SIZE_OF_CMD_BUFFER - S_DS_GEN - + sizeof(*pcfg_data)); if (!len) return -EINVAL; + pcfg_data->action = cpu_to_le16(cmd_action); + pcfg_data->type = cpu_to_le16(NXPWIFI_CFG_TYPE_CAL); + pcfg_data->data_len = cpu_to_le16(len); nxpwifi_dbg(adapter, INFO, "download cfg_data from config file\n"); cmd->command = cpu_to_le16(HOST_CMD_CFG_DATA); - cmd->size = cpu_to_le16(S_DS_GEN + len); + cmd->size = cpu_to_le16(S_DS_GEN + sizeof(*pcfg_data) + len); return 0; } -- 2.53.0