Skip to content

qmi_wwan_q: kernel 6.18 compatibility fixes #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ozgunokan wants to merge 2 commits into
base: main
Choose a base branch
from
Open

qmi_wwan_q: kernel 6.18 compatibility fixes #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0d545a
qmi_wwan_q: kernel 6.18 compatibility fixes
ozgunokan Aug 29, 2026
78f373e
qmi_wwan_q: gate NSS compatibility workarounds
FUjr Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions driver/nss/quectel_QMI_WWAN_nss/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/package.mk

PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_QMODEM_QMI_NSS_RX_WAKE_FALLBACK \
CONFIG_QMODEM_QMI_NSS_REGISTRATION_RETRY

define KernelPackage/qmi_wwan_q_nss
SUBMENU:=WWAN Support
Expand All @@ -21,6 +24,22 @@ define KernelPackage/qmi_wwan_q_nss
AUTOLOAD:=$(call AutoLoad,81,qmi_wwan_q)
endef

define KernelPackage/qmi_wwan_q_nss/config
config QMODEM_QMI_NSS_RX_WAKE_FALLBACK
bool "Wake QMAP TX queues from RX completion (kernel 6.10+)"
default n
help
Enable the RX-side queue wake fallback for kernels whose usbnet BH
is no longer a tasklet. Keep disabled unless the target needs it.

config QMODEM_QMI_NSS_REGISTRATION_RETRY
bool "Retry QCA NSS registration after a transient failure"
default n
help
Retry NSS context creation for up to 90 seconds when registration is
not ready during USB probe.
endef

EXTRA_CFLAGS+= \
-Wno-unused-function \
-Wno-missing-prototypes \
Expand All @@ -30,6 +49,12 @@ ifneq ($(CONFIG_PACKAGE_kmod-rmnet-nss),)
EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include/qca-nss-rmnet
EXTRA_CFLAGS += -DCONFIG_QCA_NSS_DRV
endif
ifneq ($(CONFIG_QMODEM_QMI_NSS_RX_WAKE_FALLBACK),)
EXTRA_CFLAGS += -DQMODEM_QMI_NSS_RX_WAKE_FALLBACK
endif
ifneq ($(CONFIG_QMODEM_QMI_NSS_REGISTRATION_RETRY),)
EXTRA_CFLAGS += -DQMODEM_QMI_NSS_REGISTRATION_RETRY
endif

define Build/Compile
+$(KERNEL_MAKE) ccflags-y="$(EXTRA_CFLAGS)" M="$(PKG_BUILD_DIR)" \
Expand Down
95 changes: 75 additions & 20 deletions driver/nss/quectel_QMI_WWAN_nss/src/qmi_wwan_q.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,10 @@ typedef struct sQmiWwanQmap
#if defined(QUECTEL_UL_DATA_AGG)
struct tx_agg_ctx tx_ctx;
struct tasklet_struct txq;
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,10,0)
struct tasklet_struct usbnet_bh;
#endif
#endif

#ifdef QUECTEL_BRIDGE_MODE
uint bridge_mode;
Expand Down Expand Up @@ -225,6 +227,10 @@ struct qmap_priv {
#endif
#endif
uint use_qca_nss;
#ifdef QMODEM_QMI_NSS_REGISTRATION_RETRY
struct delayed_work nss_retry_work;
unsigned int nss_retry_count;
#endif
};

struct qmap_hdr {
Expand Down Expand Up @@ -872,24 +878,22 @@ static struct rtnl_link_stats64 *rmnet_vnd_get_stats64(struct net_device *net, s
#endif

#if defined(QUECTEL_UL_DATA_AGG)
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,10,0)
static void usbnet_bh(unsigned long data) {
sQmiWwanQmap *pQmapDev = (sQmiWwanQmap *)data;
struct tasklet_struct *t = &pQmapDev->usbnet_bh;
bool use_callback = false;

#if (LINUX_VERSION_CODE > KERNEL_VERSION( 5,8,0 )) //c955e329bb9d44fab75cf2116542fcc0de0473c5
#if (LINUX_VERSION_CODE > KERNEL_VERSION(5,8,0))
use_callback = t->use_callback;
if (use_callback)
t->callback(&pQmapDev->mpNetDev->bh);
#endif

if (!use_callback)
t->func(t->data);

if (!netif_queue_stopped(pQmapDev->mpNetDev->net)) {
qmap_wake_queue((sQmiWwanQmap *)data);
}
if (!netif_queue_stopped(pQmapDev->mpNetDev->net))
qmap_wake_queue(pQmapDev);
}
#endif

static void rmnet_usb_tx_wake_queue(unsigned long data) {
qmap_wake_queue((sQmiWwanQmap *)data);
Expand Down Expand Up @@ -1297,6 +1301,49 @@ static rx_handler_result_t qca_nss_rx_handler(struct sk_buff **pskb)
return RX_HANDLER_PASS;
}

#ifdef QMODEM_QMI_NSS_REGISTRATION_RETRY
static void qmap_nss_retry_work(struct work_struct *work);
#endif

static int qmap_nss_try_register(struct net_device *qmap_net)
{
struct qmap_priv *priv = netdev_priv(qmap_net);
int rc;

if (!nss_cb || priv->use_qca_nss)
return 0;
rc = nss_cb->nss_create(qmap_net);
if (rc)
goto retry;
rtnl_lock();
rc = netdev_rx_handler_register(qmap_net, qca_nss_rx_handler, NULL);
rtnl_unlock();
if (rc) {
nss_cb->nss_free(qmap_net);
goto retry;
}
WRITE_ONCE(priv->use_qca_nss, 1);
netdev_info(qmap_net, "NSS context created\n");
return 0;

retry:
netdev_err(qmap_net, "NSS registration failed: %d\n", rc);
#ifdef QMODEM_QMI_NSS_REGISTRATION_RETRY
if (priv->nss_retry_count++ < 90)
schedule_delayed_work(&priv->nss_retry_work, HZ);
#endif
return rc;
}

#ifdef QMODEM_QMI_NSS_REGISTRATION_RETRY
static void qmap_nss_retry_work(struct work_struct *work)
{
struct qmap_priv *priv = container_of(to_delayed_work(work),
struct qmap_priv, nss_retry_work);
qmap_nss_try_register(priv->self_dev);
}
#endif

static int qmap_register_device(sQmiWwanQmap * pDev, u8 offset_id)
{
struct net_device *real_dev = pDev->mpNetDev->net;
Expand Down Expand Up @@ -1349,12 +1396,20 @@ static int qmap_register_device(sQmiWwanQmap * pDev, u8 offset_id)
#endif
priv->agg_skb = NULL;
priv->agg_count = 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,13,0)
hrtimer_setup(&priv->agg_hrtimer, rmnet_usb_tx_agg_timer_cb, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
#else
hrtimer_init(&priv->agg_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
priv->agg_hrtimer.function = rmnet_usb_tx_agg_timer_cb;
#endif
INIT_WORK(&priv->agg_wq, rmnet_usb_tx_agg_work);
ktime_get_ts64(&priv->agg_time);
spin_lock_init(&priv->agg_lock);
priv->use_qca_nss = 0;
#ifdef QMODEM_QMI_NSS_REGISTRATION_RETRY
INIT_DELAYED_WORK(&priv->nss_retry_work, qmap_nss_retry_work);
priv->nss_retry_count = 0;
#endif

#if defined(MHI_NETDEV_STATUS64)
priv->stats64 = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
Expand All @@ -1372,19 +1427,8 @@ static int qmap_register_device(sQmiWwanQmap * pDev, u8 offset_id)
netif_device_attach (qmap_net);
netif_carrier_off(qmap_net);

if (nss_cb && use_qca_nss) {
int rc = nss_cb->nss_create(qmap_net);
if (rc) {
/* Log, but don't fail the device creation */
netdev_err(qmap_net, "Device will not use NSS path: %d\n", rc);
} else {
priv->use_qca_nss = 1;
netdev_info(qmap_net, "NSS context created\n");
rtnl_lock();
netdev_rx_handler_register(qmap_net, qca_nss_rx_handler, NULL);
rtnl_unlock();
}
}
if (nss_cb && use_qca_nss)
qmap_nss_try_register(qmap_net);

strcpy(pDev->rmnet_info.ifname[offset_id], qmap_net->name);
pDev->rmnet_info.mux_id[offset_id] = priv->mux_id;
Expand Down Expand Up @@ -1414,6 +1458,9 @@ static void qmap_unregister_device(sQmiWwanQmap * pDev, u8 offset_id) {

hrtimer_cancel(&priv->agg_hrtimer);
cancel_work_sync(&priv->agg_wq);
#ifdef QMODEM_QMI_NSS_REGISTRATION_RETRY
cancel_delayed_work_sync(&priv->nss_retry_work);
#endif
spin_lock_irqsave(&priv->agg_lock, flags);
if (priv->agg_skb) {
kfree_skb(priv->agg_skb);
Expand Down Expand Up @@ -2246,10 +2293,12 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
dev->driver_info = &pQmapDev->driver_info;
}

#if LINUX_VERSION_CODE < KERNEL_VERSION(6,10,0)
if (pQmapDev->use_rmnet_usb && !one_card_mode) {
pQmapDev->usbnet_bh = dev->bh;
tasklet_init(&dev->bh, usbnet_bh, (unsigned long)pQmapDev);
}
#endif
}
}

Expand Down Expand Up @@ -2378,6 +2427,12 @@ static int rmnet_usb_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
struct net_device *net = dev->net;
unsigned headroom = skb_headroom(skb);
#ifdef QMODEM_QMI_NSS_RX_WAKE_FALLBACK
struct qmi_wwan_state *info = (void *)&dev->data;
sQmiWwanQmap *pQmapDev = (sQmiWwanQmap *)info->unused;
if (pQmapDev && !netif_queue_stopped(dev->net))
qmap_wake_queue(pQmapDev);
#endif

#if (LINUX_VERSION_CODE < KERNEL_VERSION( 3,3,1 )) //7bdd402706cf26bfef9050dfee3f229b7f33ee4f
//some customers port to v3.2
Expand Down