This series adds a new full-MAC Wi-Fi driver `nxpwifi` to support NXP
IW611/IW612 chip family. These chips are tri-radio single-chip solutions
with Wi-Fi 6(1x1, 2.4/5 GHz), Bluetooth 5.4, and IEEE 802.15.4.
Communication with the external host is via SDIO interface. The driver is
tested on i.MX8M Mini EVK in both STA and AP mode.

This driver is not based on mac80211. It derives from mwifiex, but due to
significant differences in firmware architecture, host command interface,
and supported features, it was not feasible to extend mwifiex without risk
of regressions. Thus, a new driver is introduced. Future NXP Wi-Fi chipsets
will also be supported under `nxpwifi`.

The driver passes checkpatch. WPA2/WPA3 personal/enterprise is currently
handled in host via wpa_supplicant/hostapd.

v4 adds support for TWT, monitor mode, WPA3 Enterprise Suite-B, and various
fixes and improvements. See below for full changelog.

Data sheet is available at:
https://www.nxp.com/docs/en/data-sheet/IW612.pdf

Firmware binaries can be obtained from:
https://github.com/nxp-imx/imx-firmware/tree/lf-6.12.34_2.1.0/nxp/FwImage_IW612_SD/

Change history:

v10:
  - Removed all remaining OF code, since DT bindings were dropped and
    OF usage is not allowed without a corresponding schema.
  - Updated all commit subjects to imperative mood and fixed non-imperative
    wording in several commit messages.

v9:
    SDIO updates (addressing v8 review feedback)
    --------------------------------------------

     - Dropped mandatory Device Tree matching in SDIO probe. DT parsing is
       now optional and no longer affects probe success. All unused OFi
       match logic was removed.
     - Removed pr_debug() and all probe()/remove() entry/exit prints. SDIO
       now stays silent on success, consistent with kernel expectations.
     - Removed legacy assignment of MMC_QUIRK_BLKSZ_FOR_BYTE_MODE.
     - Dropped deprecated `.owner = THIS_MODULE` from struct sdio_driver.
     - Reworked SDIO comments to follow current kernel style guidelines and
       removed verbose “This function …” comment blocks.
     - Modernized firmware-ready polling using read_poll_timeout().
     - Rate-limited intermittent ISR error messages.
     - Replaced sprintf/mdelay/memmove with scnprintf/msleep/memcpy.
     - Added missing return value checks to sdio_enable_func() and
       sdio_set_block_size().
     - Removed the dependency on include/linux/mmc/sdio_ids.h.
       This ID table belongs to MMC/SDIO subsystem and is handled separately;
       nxpwifi no longer requires this header and the update will be
       submitted as an MMC patch.

    Devicetree bindings note
    ------------------------

    The previous version included a devicetree binding document for
    `nxp,iw61x.yaml`. Since Device Tree support for this device is optional
    and not required for current SDIO-based bring-up, the binding has been
    dropped from this series. A proper schema will be submitted separately
    once DT usage becomes relevant, so that binding review can be handled
    in the correct subsystem and without blocking this driver introduction.


    Initialization path cleanups (aligned with upstream mwifiex)
    ------------------------------------------------------------

    This series ports three upstream mwifiex cleanups which remove obsolete
    asynchronous initialization scaffolding:

     - Based-on: c2095eb63319 ("wifi: mwifiex: remove mwifiex_sta_init_cmd() last
       argument")
       Dropped the unused “init” argument from the STA init command helper.
     - Based-on: f996f434aa78 ("wifi: mwifiex: drop asynchronous init waiting code")
       Removed all asynchronous-init waiting logic (init_wait_q, last_init_cmd,
       INIT_DONE transitional state). Initialization now completes strictly when
       the last synchronous command returns.
     - Based-on: 659d609bdda5 ("wifi: mwifiex: remove unnecessary queue empty check")
       Removed the redundant “command queue empty” check after init; retained
       only a WARN_ON() for future regression detection.


    General cleanups
    ----------------

     - Numerous comment style fixes across SDIO, HE, VHT/HT, and main files.
     - Reduced verbosity across the driver to align with upstream expectations.
     - Small structural cleanups and dead-code removals.

v8:
  - Standardized multi-line comment style across nxpwifi driver files to Linux kernel
    convention.
    /*
     * ...
     */
    No functional changes.
  - Fixed workqueue cleanup and error path ordering in nxpwifi_add_card(): ensure
    proper termination before resource free to avoid race conditions.
  - Corrected spelling mistakes in source code and comments for better readability
    (e.g., Dimentions -> Dimensions, interfacces -> interfaces).
  - Added Device Tree binding schema for NXP IW61x SDIO devices (nxp,iw61x.yaml),
    including properties for compatible, reg, interrupts, wakeup pin, and optional
    calibration data.

v7:
   - Addressed review feedback from v6
     - Removed unused variable `ext_rate_info` in `nxpwifi_rxpdinfo_to_radiotapinfo()
     - Radiotap handling fixes:
       - Converted fields to `__le16`/`__le64`
       - Applied `cpu_to_le16()`/`cpu_to_le64()` for endian correctness
       - Replaced `jiffies` with `ktime_get_ns()/1000` for timestamp
       - Validated channel frequency conversion and removed redundant code
   - General cleanup of endian conversions and Sparse warnings
     - Improved HE capability setup via `_ieee80211_set_sband_iftype_data()`
     - TWT configuration fixes:
       - Updated structs to `__le16`/`__le32`
       - Corrected debugfs write helpers for endian conversions
       - Removed redundant conversions in `nxpwifi_cmd_twt_cfg()`
     - Scan handling fixes:
       - Changed OUI variables to `__be32`
       - Used `le16_to_cpu()` for `ext_cap->header.len`
       - Moved element pointer declaration outside `switch`
     - HW spec parsing fix:
       - Added `le32_to_cpu()` before `GET_MPDU_DENSITY()`
     - Cfg80211 handling fix:
       - Moved `legacy_rates[]` definition outside `switch` block

v6:
   - Removed custom locking (main_locked, main_proc_lock, more_task_flag)
   - Refactored main process to rely solely on workqueue
   - SDIO interrupt now only queues main_work; avoids direct call to nxpwifi_main_process()
   - Introduced atomic iface_changing flag to block main process during interface transitions
   - Split monolithic main process logic into helper functions for better readability
   - Improved exit logic to avoid lost-kick scenarios and ensure all pending tasks are processed
   - Replaced rcu_read_lock()/unlock() pairs with guard(rcu)() for modern kernel style
   - Code cleanups based on review feedback

v5:
   - Fixed build errors introduced in v4.

v4:
   - Added support for TWT (STA mode)
   - Added support for Monitor mode
   - Added support for WPA3 Enterprise Suite-B
   - Bug fix: In BGN/AN HT40 mode, throughput was 50% lower than expected
   - Bug fix: In STA 2.4G HE40 mode, throughput was 80% lower than expected
   - Use wiphy work instead of general workqueue for cfg80211 ops
   - Introduced RCU protection for ba, rx_reorder, and sta_lists
   - Used per-TID spinlock for tx_ba / rx_reorder lists to improve
     concurrency
   - Replaced mutex_lock with wiphy_lock
   - Reverted "use tasklet for Rx" (back to workqueue)
   - Refactored HE capability handling for better clarity and
     maintainability
   - Used standard kernel helpers for MAC address handling
   - Replaced proprietary nxpwifi_ieee80211 with standard ieee80211_mgmt
     structure
   - Used u32_get_bits() for VHT capability field access
   - Replaced LOW_PRIO_TID with TC_PRIO_BESTEFFORT for skb priority
   - Removed static WPA/RSN OUI table; now derived from cipher suite ID
   - Removed redundant helper functions: has_vendor_hdr and has_ieee_hdr

v3:
   - Enable 802.11ax (Wi-Fi 6) for both AP and STA mode.
   - Extend driver version string with hotfix number.
   - Remove Rx mlme work.
   - Remove all useless check of netif_carrier_ok().
   - Merge decl.h to cfg.h.
   - Remove unnecessary check for wiphy parameters setting.
   - Synchronize following commits from Mwifiex:
     wifi: mwifiex: replace open-coded module_sdio_driver()
     wifi: mwifiex: Fix interface type change
     wifi: mwifiex: Do not return unused priv in mwifiex_get_priv_by_id()
     wifi: mwifiex: increase max_num_akm_suites
     wifi: mwifiex: duplicate static structs used in driver instances
     wifi: mwifiex: keep mwifiex_cfg80211_ops constant
     wifi: mwifiex: Fix uninitialized variable in
                    mwifiex_cfg80211_authenticate()
     wifi: mwifiex: remove unnecessary checks for valid priv
     wifi: mwifiex: Fix memcpy() field-spanning write warning in
                    mwifiex_cmd_802_11_scan_ext()
     wifi: mwifiex: Use IRQF_NO_AUTOEN flag in request_irq()

v2:
   - Rename ioctl.h and sta_ioctl.c to cfg.h and sta_cfg.c.
   - Remove useless header file semaphore.h.
   - Use static variable for cookie.
   - Modify nxpwifi_register to use ERR_PTR, IS_ERR and PTR_ERR.
   - Use error number for error code.
   - Remove unnecessary private ie definitions.
   - Remove mutex async_mutex and related code.
   - Remove unnecessary work queue.
   - Add the support for PSK SHA256.
   - Use tasklet for Rx.
   - Remove unused functions.
   - Remove compile warning.

Jeff Chen (21):
  wifi: nxpwifi: add 802.11n support for STA and AP modes
  wifi: nxpwifi: add initial 802.11ac support for STA and AP modes
  wifi: nxpwifi: add initial 802.11ax support for STA and AP modes
  wifi: nxpwifi: add 802.11h DFS/TPC support for 5 GHz operation
  wifi: nxpwifi: add WMM support for QoS-based traffic handling
  wifi: nxpwifi: add scan support
  wifi: nxpwifi: add join and association support
  wifi: nxpwifi: add channel/frequency/power support
  wifi: nxpwifi: add configuration support
  wifi: nxpwifi: implement cfg80211 ops for STA and AP
  wifi: nxpwifi: add firmware command and TLV definitions
  wifi: nxpwifi: add command/event handling support
  wifi: nxpwifi: add data path support for STA and AP modes
  wifi: nxpwifi: add debugfs support
  wifi: nxpwifi: add ethtool support for Wake-on-LAN
  wifi: nxpwifi: add utility and IE handling support
  wifi: nxpwifi: add init and shutdown support
  wifi: nxpwifi: add core driver implementation
  wifi: nxpwifi: add initial SDIO bus driver support
  wifi: nxpwifi: add Kconfig and Makefile entries
  wifi: nxpwifi: add MAINTAINERS entry for nxpwifi driver

 MAINTAINERS                                   |    7 +
 drivers/net/wireless/Kconfig                  |    1 +
 drivers/net/wireless/Makefile                 |    1 +
 drivers/net/wireless/nxp/Kconfig              |   17 +
 drivers/net/wireless/nxp/Makefile             |    3 +
 drivers/net/wireless/nxp/nxpwifi/11ac.c       |  280 ++
 drivers/net/wireless/nxp/nxpwifi/11ac.h       |   33 +
 drivers/net/wireless/nxp/nxpwifi/11ax.c       |  594 +++
 drivers/net/wireless/nxp/nxpwifi/11ax.h       |   73 +
 drivers/net/wireless/nxp/nxpwifi/11h.c        |  339 ++
 drivers/net/wireless/nxp/nxpwifi/11n.c        |  837 ++++
 drivers/net/wireless/nxp/nxpwifi/11n.h        |  158 +
 drivers/net/wireless/nxp/nxpwifi/11n_aggr.c   |  251 ++
 drivers/net/wireless/nxp/nxpwifi/11n_aggr.h   |   21 +
 .../net/wireless/nxp/nxpwifi/11n_rxreorder.c  |  826 ++++
 .../net/wireless/nxp/nxpwifi/11n_rxreorder.h  |   71 +
 drivers/net/wireless/nxp/nxpwifi/Kconfig      |   22 +
 drivers/net/wireless/nxp/nxpwifi/Makefile     |   39 +
 drivers/net/wireless/nxp/nxpwifi/cfg.h        |  993 +++++
 drivers/net/wireless/nxp/nxpwifi/cfg80211.c   | 3962 +++++++++++++++++
 drivers/net/wireless/nxp/nxpwifi/cfg80211.h   |   19 +
 drivers/net/wireless/nxp/nxpwifi/cfp.c        |  458 ++
 drivers/net/wireless/nxp/nxpwifi/cmdevt.c     | 1149 +++++
 drivers/net/wireless/nxp/nxpwifi/cmdevt.h     |   96 +
 drivers/net/wireless/nxp/nxpwifi/debugfs.c    | 1094 +++++
 drivers/net/wireless/nxp/nxpwifi/ethtool.c    |   58 +
 drivers/net/wireless/nxp/nxpwifi/fw.h         | 2373 ++++++++++
 drivers/net/wireless/nxp/nxpwifi/ie.c         |  480 ++
 drivers/net/wireless/nxp/nxpwifi/init.c       |  607 +++
 drivers/net/wireless/nxp/nxpwifi/join.c       |  788 ++++
 drivers/net/wireless/nxp/nxpwifi/main.c       | 1673 +++++++
 drivers/net/wireless/nxp/nxpwifi/main.h       | 1773 ++++++++
 drivers/net/wireless/nxp/nxpwifi/scan.c       | 2763 ++++++++++++
 drivers/net/wireless/nxp/nxpwifi/sdio.c       | 2327 ++++++++++
 drivers/net/wireless/nxp/nxpwifi/sdio.h       |  340 ++
 drivers/net/wireless/nxp/nxpwifi/sta_cfg.c    | 1165 +++++
 drivers/net/wireless/nxp/nxpwifi/sta_cmd.c    | 3387 ++++++++++++++
 drivers/net/wireless/nxp/nxpwifi/sta_event.c  |  862 ++++
 drivers/net/wireless/nxp/nxpwifi/sta_rx.c     |  242 +
 drivers/net/wireless/nxp/nxpwifi/sta_tx.c     |  190 +
 drivers/net/wireless/nxp/nxpwifi/txrx.c       |  352 ++
 drivers/net/wireless/nxp/nxpwifi/uap_cmd.c    | 1197 +++++
 drivers/net/wireless/nxp/nxpwifi/uap_event.c  |  488 ++
 drivers/net/wireless/nxp/nxpwifi/uap_txrx.c   |  478 ++
 drivers/net/wireless/nxp/nxpwifi/util.c       | 1523 +++++++
 drivers/net/wireless/nxp/nxpwifi/util.h       |  128 +
 drivers/net/wireless/nxp/nxpwifi/wmm.c        | 1308 ++++++
 drivers/net/wireless/nxp/nxpwifi/wmm.h        |   77 +
 48 files changed, 35923 insertions(+)
 create mode 100644 drivers/net/wireless/nxp/Kconfig
 create mode 100644 drivers/net/wireless/nxp/Makefile
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ac.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ac.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ax.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ax.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11h.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_aggr.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_aggr.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_rxreorder.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_rxreorder.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/Kconfig
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/Makefile
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfg.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfg80211.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfg80211.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfp.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/cmdevt.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/cmdevt.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/debugfs.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/ethtool.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/fw.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/ie.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/init.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/join.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/main.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/main.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/scan.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/sdio.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/sdio.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_cfg.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_cmd.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_event.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_rx.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_tx.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/txrx.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/uap_cmd.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/uap_event.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/uap_txrx.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/util.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/util.h
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/wmm.c
 create mode 100644 drivers/net/wireless/nxp/nxpwifi/wmm.h

-- 
2.34.1

On Thu, 2026-03-05 at 22:39 +0800, Jeff Chen wrote:
> This series adds a new full-MAC Wi-Fi driver `nxpwifi` to support NXP
> IW611/IW612 chip family. These chips are tri-radio single-chip solutions
> with Wi-Fi 6(1x1, 2.4/5 GHz), Bluetooth 5.4, and IEEE 802.15.4.
> Communication with the external host is via SDIO interface. The driver is
> tested on i.MX8M Mini EVK in both STA and AP mode.

How exactly was it tested, it doesn't even build ;-)

There are a couple of things I'm not a huge fan of, in particular the
whole "IOCTL" layer which is reminiscent of wireless extensions (but
thankfully those aren't used here), and while I can't really review 35k
lines here, I don't think I have any real problem with this now.

As I also just said to Lachlan, I think you should probably send a pull
request with just a single patch adding the driver once reviews settle.

https://lore.kernel.org/linux-wireless/b71d0932b10b5c446681cef588cfcf6f869f3fca.camel@sipsolutions.net/

johannes

On Fri, Mar 06, 2026 at 10:19:43 AM +0100, Johannes Berg wrote:
> On Thu, 2026-03-05 at 22:39 +0800, Jeff Chen wrote:
> > This series adds a new full-MAC Wi-Fi driver `nxpwifi` to support NXP
> > IW611/IW612 chip family. These chips are tri-radio single-chip solutions
> > with Wi-Fi 6(1x1, 2.4/5 GHz), Bluetooth 5.4, and IEEE 802.15.4.
> > Communication with the external host is via SDIO interface. The driver is
> > tested on i.MX8M Mini EVK in both STA and AP mode.
> 
> How exactly was it tested, it doesn't even build ;-)

Hi Johannes,

I’d like to double check whether it was caused by the missing IW61x SDIO IDs in sdio_ids.h:
#define SDIO_VENDOR_ID_NXP           0x0471
#define SDIO_DEVICE_ID_NXP_IW61X     0x0205
These definitions were not yet in wireless-next around 2026-03-06 when v10 was tested, and
only appeared in linux-next after 2026-03-10.
Could the build issue you saw be due to these two IDs not being defined at that time?
If not, could you share the specific error you hit so I can fix it right away?

Thanks,
Jeff

> 
> There are a couple of things I'm not a huge fan of, in particular the
> whole "IOCTL" layer which is reminiscent of wireless extensions (but
> thankfully those aren't used here), and while I can't really review 35k
> lines here, I don't think I have any real problem with this now.
> 
> As I also just said to Lachlan, I think you should probably send a pull
> request with just a single patch adding the driver once reviews settle.
> 
> https://lore.kernel.org/linux-wireless/b71d0932b10b5c446681cef588cfcf6f869f3fca.camel@sipsolutions.net/
> 
> johannes
> 

On Wed, 2026-03-11 at 11:30 +0800, Jeff Chen wrote:
> On Fri, Mar 06, 2026 at 10:19:43 AM +0100, Johannes Berg wrote:
> > On Thu, 2026-03-05 at 22:39 +0800, Jeff Chen wrote:
> > > This series adds a new full-MAC Wi-Fi driver `nxpwifi` to support NXP
> > > IW611/IW612 chip family. These chips are tri-radio single-chip solutions
> > > with Wi-Fi 6(1x1, 2.4/5 GHz), Bluetooth 5.4, and IEEE 802.15.4.
> > > Communication with the external host is via SDIO interface. The driver is
> > > tested on i.MX8M Mini EVK in both STA and AP mode.
> > 
> > How exactly was it tested, it doesn't even build ;-)
> 
> Hi Johannes,
> 
> I’d like to double check whether it was caused by the missing IW61x SDIO IDs in sdio_ids.h:
> #define SDIO_VENDOR_ID_NXP           0x0471
> #define SDIO_DEVICE_ID_NXP_IW61X     0x0205

Probably? I didn't really check too much what the failures were, it's on
patchwork and you can check yourself. I just briefly checked that it
wasn't a false report.

> These definitions were not yet in wireless-next around 2026-03-06 when v10 was tested, and
> only appeared in linux-next after 2026-03-10.
> Could the build issue you saw be due to these two IDs not being defined at that time?

Obviously that would be an issue, and they still don't appear in
wireless-next, which tree do they actually appear in? There's usually
very little to no cross-tree merging going on before it all hits Linus's
tree, but it has to build before that happens, so I don't know how you
expected this to work?

johannes

On Wed, Mar 11, 2026 at 08:02:45 AM +0100, Johannes Berg wrote:
> On Wed, 2026-03-11 at 11:30 +0800, Jeff Chen wrote:
> > On Fri, Mar 06, 2026 at 10:19:43 AM +0100, Johannes Berg wrote:
> > > On Thu, 2026-03-05 at 22:39 +0800, Jeff Chen wrote:
> > > > This series adds a new full-MAC Wi-Fi driver `nxpwifi` to support NXP
> > > > IW611/IW612 chip family. These chips are tri-radio single-chip solutions
> > > > with Wi-Fi 6(1x1, 2.4/5 GHz), Bluetooth 5.4, and IEEE 802.15.4.
> > > > Communication with the external host is via SDIO interface. The driver is
> > > > tested on i.MX8M Mini EVK in both STA and AP mode.
> > > 
> > > How exactly was it tested, it doesn't even build ;-)
> > 
> > Hi Johannes,
> > 
> > I’d like to double check whether it was caused by the missing IW61x SDIO IDs in sdio_ids.h:
> > #define SDIO_VENDOR_ID_NXP           0x0471
> > #define SDIO_DEVICE_ID_NXP_IW61X     0x0205
> 
> Probably? I didn't really check too much what the failures were, it's on
> patchwork and you can check yourself. I just briefly checked that it
> wasn't a false report.

Hi Johannes,

Thanks for the clarification.
I checked the patchwork build checks, and the failure is indeed caused by the IW61x SDIO IDs
not being defined.

> > These definitions were not yet in wireless-next around 2026-03-06 when v10 was tested, and
> > only appeared in linux-next after 2026-03-10.
> > Could the build issue you saw be due to these two IDs not being defined at that time?
> 
> Obviously that would be an issue, and they still don't appear in
> wireless-next, which tree do they actually appear in? There's usually
> very little to no cross-tree merging going on before it all hits Linus's
> tree, but it has to build before that happens, so I don't know how you
> expected this to work?

Right, understood. The IW61x SDIO IDs currently appear only in linux-next, not in wireless-next,
and the patchwork build logs confirm the build failure is exactly due to these IDs being
undefined.

For v11, I’ll add a small temporary patch with local fallback #defines (guarded with #ifndef) so
that wireless-next can build independently without relying on any cross-tree merges. I’ll drop
that patch once the IDs reach mainline.

Thanks,
Jeff

On Thu, 2026-03-12 at 16:56 +0800, Jeff Chen wrote:
> 
> Right, understood. The IW61x SDIO IDs currently appear only in linux-next, not in wireless-next,
> and the patchwork build logs confirm the build failure is exactly due to these IDs being
> undefined.
> 
> For v11, I’ll add a small temporary patch with local fallback #defines (guarded with #ifndef) so
> that wireless-next can build independently without relying on any cross-tree merges. I’ll drop
> that patch once the IDs reach mainline.

That seems kind of ugly too.

Ulf, do you rebase mmc.git's next branch?

For whatever reason, Jeff sent you the requisite IDs for the driver
rather than putting them into the same patchset and getting your ACK,
and you have it as commit c0b68bc25efe ("mmc: sdio: add NXP vendor and
IW61x device IDs").

It _looks_ like that's in your next branch only, not mux or fixes (but
I'm getting slightly confused by the branch structure), perhaps there's
a chance you could drop that?

Or maybe the less bad option would be to just have that commit twice in
both trees? I'm nott a fan of a local define that we have to clean up
later...

johannes

On Thu, Mar 12, 2026 at 10:13:07 AM +0100, Johannes Berg wrote:
> On Thu, 2026-03-12 at 16:56 +0800, Jeff Chen wrote:
> > 
> > Right, understood. The IW61x SDIO IDs currently appear only in linux-next, not in wireless-next,
> > and the patchwork build logs confirm the build failure is exactly due to these IDs being
> > undefined.
> > 
> > For v11, I’ll add a small temporary patch with local fallback #defines (guarded with #ifndef) so
> > that wireless-next can build independently without relying on any cross-tree merges. I’ll drop
> > that patch once the IDs reach mainline.
> 
> That seems kind of ugly too.
> 
> Ulf, do you rebase mmc.git's next branch?
> 
> For whatever reason, Jeff sent you the requisite IDs for the driver
> rather than putting them into the same patchset and getting your ACK,
> and you have it as commit c0b68bc25efe ("mmc: sdio: add NXP vendor and
> IW61x device IDs").
> 
> It _looks_ like that's in your next branch only, not mux or fixes (but
> I'm getting slightly confused by the branch structure), perhaps there's
> a chance you could drop that?
> 
> Or maybe the less bad option would be to just have that commit twice in
> both trees? I'm nott a fan of a local define that we have to clean up
> later...
> 
> johannes
> 

Hi Johannes,

Ulf prefers not to rebase or drop the SDIO ID patch from the mmc tree,
and his suggestion is for me to include an identical copy of that patch
in the nxpwifi series for wireless-next, so that the driver can build
independently during review. Since the change is trivial, he expects git
to resolve the duplication automatically when the wireless and mmc trees
are merged.
Would this approach be acceptable for wireless-next?

For reference, please see Ulf’s feedback here:

https://patchwork.kernel.org/project/linux-mmc/patch/20260113031517.244714-1-jeff.chen_1@nxp.com/

thanks,
Jeff