From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D08D2314D03; Mon, 5 Jan 2026 10:21:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608490; cv=none; b=OMipyaWWOfu4Y5nBBFj9+OzDmIKc/9x/S0Yyrj3Yt4SLLx7SrTD8ZE9qYKkOiqBtK3NoD9fcMgZzN3zstqjd7d9I3VyaqUIebPiiBjO2G7VfNgy5RltQjG07MjgJdeMnYiKy6SidUyjIXPjZZATDllVP2kwao7S506LZu6W0t0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608490; c=relaxed/simple; bh=DOndyKOPHC+XjWwo8IQmKVVgE+2YxR9PrmL7vaEb2Uk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aHAZ19nr9eqAfm4fiDT2Idp0L7b0Jz2+VdQSKLl+3ikodkeNTfRp3CDBSeHSG5ej+Iv6jdhgXLJhmP3zJANaDtHkp0XofnnEj3UM7pURFWRmu5TBjqQj/lnWvI9b0gbtevrL/hK0gffWq2TR7SKU920CxDe85jWYsUQpaAnbtgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=Pd1EQ1e4; arc=none smtp.client-ip=117.135.210.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="Pd1EQ1e4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=vk 5iutERJA27zH/tcNhHf5mNR2d/fQros4GcMViC0s4=; b=Pd1EQ1e43tMdvbAX/3 Fvwz+0MdYBHpIHyM+xydY1i7PuA+Zqw2GWmOOwKZX1Hb5B46cToa7Z5GjQAQ96d1 bbR8SDl3T97HFib8hkxHYxSkkdkegB7qJL3GBq4z5wT7kJrPa+j8pffu/4Z2daU+ GrD0RFlLiPADUZzUVPb9BZIeA= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S3; Mon, 05 Jan 2026 18:20:36 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 1/8] net: wwan: core: remove unused port_id field Date: Mon, 5 Jan 2026 18:20:11 +0800 Message-Id: <20260105102018.62731-2-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Jw15Jr48Kw1DZF1fKw17ZFb_yoWkGwbEkr nYvrZ5Z348CFyvvr42gF43ZFWFvF4IqF4kuwnaqrZ3AFWDXrWrW3Z8XFnrWrn8ur18ZrZr WrZrXFs2vr1fKjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1eMNUUUUUU== X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbCvxRy1mlbkHS2zAAA3j Content-Type: text/plain; charset="utf-8" From: Sergey Ryazanov It was used initially for a port id allocation, then removed, and then accidently introduced again, but it is still unused. Drop it again to keep code clean. Signed-off-by: Sergey Ryazanov Reviewed-by: Loic Poulain --- drivers/net/wwan/wwan_core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index 63a47d420bc5..ade8bbffc93e 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -43,7 +43,6 @@ static struct dentry *wwan_debugfs_dir; * * @id: WWAN device unique ID. * @dev: Underlying device. - * @port_id: Current available port ID to pick. * @ops: wwan device ops * @ops_ctxt: context to pass to ops * @debugfs_dir: WWAN device debugfs dir @@ -51,7 +50,6 @@ static struct dentry *wwan_debugfs_dir; struct wwan_device { unsigned int id; struct device dev; - atomic_t port_id; const struct wwan_ops *ops; void *ops_ctxt; #ifdef CONFIG_WWAN_DEBUGFS --=20 2.25.1 From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFBD82F25EF; Mon, 5 Jan 2026 10:21:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608491; cv=none; b=Nktt3LEkfJ9oqCOwp38zuCOqb9rx77AUP2rlVyjpcJDDLwM3+uNACtk//3IkFOhmtSoHuOVNuYf5LjaId6rzMkvtwBT5fpRagdremyB7MYs/m97ENe/cwFz7YmCSYUdVTl3KXJ+kd+5aad7elm2Uz7acCnDKQKUUvQ5Sk+Fg778= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608491; c=relaxed/simple; bh=uwBpo1F6QPiu3cqG/KphpIXDyG1I93Ps81dd1bruFEo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SYLMM9r5fnpPPiADCX/48F6/MkSYEV0qWzIKUO9gsgiCkqoOy9DtP6RpqUBmwZw5FdNQQ7ki2xrWTuFEIS7j94Ae9gmMaKBGz1buVFgpI8n45oc42xlPHdk5pO1mO6cPhrmQ27I/DEBhFXWkxBtbO2kGa6bLw3rTnbaApjGleEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=k0yYMaZU; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="k0yYMaZU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Rp Tbb2gLO4QJQ+S7G8iNjUbiqTtKOf3krgXz6hII5WY=; b=k0yYMaZUaBtdNc+KEW YZg80g5qxPmMPhtNRAfm10AhHX1WhWZxSHZQbdsM8W33NOKLcjh2cEH1UKjwB4Ww UVPTkiPF6Ddetfq1ija6TMN5tUGtpG80IDvasrKOkW6x3iIHvU/E8CDdAlXuxZz8 GHK7VCI6NJSKb8WK6iTlCwdZk= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S4; Mon, 05 Jan 2026 18:20:44 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 2/8] net: wwan: core: split port creation and registration Date: Mon, 5 Jan 2026 18:20:12 +0800 Message-Id: <20260105102018.62731-3-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxJFWkAw45CFWxKFW5Jw1xuFg_yoWrCFWUp3 W0gas3tFW8Jr13ur43AF47ZFWF9a1Ika4SyrW8W34Skrn0qryFvFZY9FyqvrWrGFy7GFy3 XF45ta10k3WUGr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j2jgxUUUUU= X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbC5xx02GlbkHwS3AAA3H Content-Type: text/plain; charset="utf-8" From: Sergey Ryazanov Upcoming GNSS (NMEA) port type support requires exporting it via the GNSS subsystem. On another hand, we still need to do basic WWAN core work: find or allocate the WWAN device, make it the port parent, etc. To reuse as much code as possible, split the port creation function into the registration of a regular WWAN port device, and basic port struct initialization. To be able to use put_device() uniformly, break the device_register() call into device_initialize() and device_add() and call device initialization earlier. Signed-off-by: Sergey Ryazanov --- drivers/net/wwan/wwan_core.c | 66 ++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index ade8bbffc93e..edee5ff48f28 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -361,7 +361,8 @@ static void wwan_port_destroy(struct device *dev) { struct wwan_port *port =3D to_wwan_port(dev); =20 - ida_free(&minors, MINOR(port->dev.devt)); + if (dev->class =3D=3D &wwan_class) + ida_free(&minors, MINOR(dev->devt)); mutex_destroy(&port->data_lock); mutex_destroy(&port->ops_lock); kfree(port); @@ -440,6 +441,41 @@ static int __wwan_port_dev_assign_name(struct wwan_por= t *port, const char *fmt) return dev_set_name(&port->dev, "%s", buf); } =20 +/* Register a regular WWAN port device (e.g. AT, MBIM, etc.) */ +static int wwan_port_register_wwan(struct wwan_port *port) +{ + struct wwan_device *wwandev =3D to_wwan_dev(port->dev.parent); + char namefmt[0x20]; + int minor, err; + + /* A port is exposed as character device, get a minor */ + minor =3D ida_alloc_range(&minors, 0, WWAN_MAX_MINORS - 1, GFP_KERNEL); + if (minor < 0) + return minor; + + port->dev.class =3D &wwan_class; + port->dev.devt =3D MKDEV(wwan_major, minor); + + /* allocate unique name based on wwan device id, port type and number */ + snprintf(namefmt, sizeof(namefmt), "wwan%u%s%%d", wwandev->id, + wwan_port_types[port->type].devsuf); + + /* Serialize ports registration */ + mutex_lock(&wwan_register_lock); + + __wwan_port_dev_assign_name(port, namefmt); + err =3D device_add(&port->dev); + + mutex_unlock(&wwan_register_lock); + + if (err) + return err; + + dev_info(&wwandev->dev, "port %s attached\n", dev_name(&port->dev)); + + return 0; +} + struct wwan_port *wwan_create_port(struct device *parent, enum wwan_port_type type, const struct wwan_port_ops *ops, @@ -448,8 +484,7 @@ struct wwan_port *wwan_create_port(struct device *paren= t, { struct wwan_device *wwandev; struct wwan_port *port; - char namefmt[0x20]; - int minor, err; + int err; =20 if (type > WWAN_PORT_MAX || !ops) return ERR_PTR(-EINVAL); @@ -461,17 +496,9 @@ struct wwan_port *wwan_create_port(struct device *pare= nt, if (IS_ERR(wwandev)) return ERR_CAST(wwandev); =20 - /* A port is exposed as character device, get a minor */ - minor =3D ida_alloc_range(&minors, 0, WWAN_MAX_MINORS - 1, GFP_KERNEL); - if (minor < 0) { - err =3D minor; - goto error_wwandev_remove; - } - port =3D kzalloc(sizeof(*port), GFP_KERNEL); if (!port) { err =3D -ENOMEM; - ida_free(&minors, minor); goto error_wwandev_remove; } =20 @@ -485,27 +512,14 @@ struct wwan_port *wwan_create_port(struct device *par= ent, mutex_init(&port->data_lock); =20 port->dev.parent =3D &wwandev->dev; - port->dev.class =3D &wwan_class; port->dev.type =3D &wwan_port_dev_type; - port->dev.devt =3D MKDEV(wwan_major, minor); dev_set_drvdata(&port->dev, drvdata); + device_initialize(&port->dev); =20 - /* allocate unique name based on wwan device id, port type and number */ - snprintf(namefmt, sizeof(namefmt), "wwan%u%s%%d", wwandev->id, - wwan_port_types[port->type].devsuf); - - /* Serialize ports registration */ - mutex_lock(&wwan_register_lock); - - __wwan_port_dev_assign_name(port, namefmt); - err =3D device_register(&port->dev); - - mutex_unlock(&wwan_register_lock); - + err =3D wwan_port_register_wwan(port); if (err) goto error_put_device; =20 - dev_info(&wwandev->dev, "port %s attached\n", dev_name(&port->dev)); return port; =20 error_put_device: --=20 2.25.1 From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC67A314B6B; Mon, 5 Jan 2026 10:21:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608493; cv=none; b=kYXId2JC4tNvW/Ew+oJmuPLv46BT4gMDofQy9oJutBkHjkCQg/QqE3Qrpz5MaVoU7ko9vLnWA0q9dJiShKUnIEyBaRVGlj/EBCUAVwSDz9DiCZjcyU/xjGOQ+cER9MY934l0rw6BGqoHXgduQnmIaH5JBkIue+hBfR6OYWZyELE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608493; c=relaxed/simple; bh=YY3Vx9PIFhrCTpocaI1ZwHiT4Zc4qeWkF9q4sJfNauM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sWVun8lLcjQY8c5erdZaKY4QP9iLwxZpdbyv+O4vCJrhLTfS4VVYkAYCY9kqhAPtRBm4o9GRuG08fpFU7C6gCKa/+NJ+qB4wKtaW6JWVtZMR/Zf0lQfOUTL6azpw/UiWPcRn19qj10/jDQwxS9PlOdu5zM3/YpYt838NIkBwXfU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=C7ziEwEj; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="C7ziEwEj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=oO dtIcMYsSD0TmAAE42OsXPNuxSQgAJE5aR5WCRdbik=; b=C7ziEwEj/Eo4gJbQ/W +X05f9f2moYbz7d4J1HRhM5ZAFj2NNmA7l9Q/dwXRB/kwdcjw+sFm/5oQrwglHjB Ka284jQH271XK1RK+VzTYcQTl/TC0CfodVteWKQIhIyAxAl8ipnuGyhT+uIPUnQL 4UryX3uBxqmyWgDIaQVFmHU24= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S5; Mon, 05 Jan 2026 18:20:46 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 3/8] net: wwan: core: split port unregister and stop Date: Mon, 5 Jan 2026 18:20:13 +0800 Message-Id: <20260105102018.62731-4-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ww48CFy3Cr1kJr15WFWxZwb_yoW8KF1Dpa 1qqF9xKFW8Jr43Ww43XF4xXFWruF4xGw1Sy34xW34Skrn5tryFv3ykuF1qyrWrJF97WFyY vrW5tFWUCa45Cr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkXo7UUUUU= X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbC6B502GlbkH4OZwAA3v Content-Type: text/plain; charset="utf-8" From: Sergey Ryazanov Upcoming GNSS (NMEA) port type support requires exporting it via the GNSS subsystem. On another hand, we still need to do basic WWAN core work: call the port stop operation, purge queues, release the parent WWAN device, etc. To reuse as much code as possible, split the port unregistering function into the deregistration of a regular WWAN port device, and the common port tearing down code. In order to keep more code generic, break the device_unregister() call into device_del() and put_device(), which release the port memory uniformly. Signed-off-by: Sergey Ryazanov Reviewed-by: Loic Poulain --- drivers/net/wwan/wwan_core.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index edee5ff48f28..c735b9830e6e 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -476,6 +476,18 @@ static int wwan_port_register_wwan(struct wwan_port *p= ort) return 0; } =20 +/* Unregister a regular WWAN port (e.g. AT, MBIM, etc) */ +static void wwan_port_unregister_wwan(struct wwan_port *port) +{ + struct wwan_device *wwandev =3D to_wwan_dev(port->dev.parent); + + dev_set_drvdata(&port->dev, NULL); + + dev_info(&wwandev->dev, "port %s disconnected\n", dev_name(&port->dev)); + + device_del(&port->dev); +} + struct wwan_port *wwan_create_port(struct device *parent, enum wwan_port_type type, const struct wwan_port_ops *ops, @@ -536,18 +548,19 @@ void wwan_remove_port(struct wwan_port *port) struct wwan_device *wwandev =3D to_wwan_dev(port->dev.parent); =20 mutex_lock(&port->ops_lock); - if (port->start_count) + if (port->start_count) { port->ops->stop(port); + port->start_count =3D 0; + } port->ops =3D NULL; /* Prevent any new port operations (e.g. from fops) */ mutex_unlock(&port->ops_lock); =20 wake_up_interruptible(&port->waitqueue); - skb_queue_purge(&port->rxq); - dev_set_drvdata(&port->dev, NULL); =20 - dev_info(&wwandev->dev, "port %s disconnected\n", dev_name(&port->dev)); - device_unregister(&port->dev); + wwan_port_unregister_wwan(port); + + put_device(&port->dev); =20 /* Release related wwan device */ wwan_remove_dev(wwandev); --=20 2.25.1 From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BEBF6315D27; Mon, 5 Jan 2026 10:22:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608559; cv=none; b=OrvWJs64IrEbRmHp13aFnxU1qVXzo7VH+Eww1eg/Xt+LmDTzmW299YwLFhOmLcxopKFB6WIIzAsELC7ouxgyrK6sixIjVFDkSKByBNjlSR+hnSnAh2aVtgR12Tw5+DedRZ85SQGQGdNQQYD+yXbHewh3PcvXiap8leXmtv3DMWY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608559; c=relaxed/simple; bh=AKoTnq4T0lEyELN41m/RguKuixmEvJRnyt3hSjzYPAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rYGZ0Ag3Ym00tx6TNrzV4R1Cz27MiTNLYXrbEtuyvtWXh8lysyT8yp61E/PfaF4WSEkMsmOmPOWshvsO8d8smbAL082bjw02MZv3ndOWTmd5hq0dmEYW7plBWAUkxdaoDbOCq/BjFQOrRzm9e1WIA1e+SVWSiweK3EX/M04DAt4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=WQmy1SSv; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="WQmy1SSv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=di rEyjF7Aye1YprdntPBjLndBjOZXG+blqE7Ty9vCzE=; b=WQmy1SSv0uQKvH/TYm L+nz+iQtdH4C/ZiOxqBxd6+3YWBWdjLg6BCWduxHNPg2GDSeSJon/g96M8lM1tjJ HzFncdFyneFHKGGKy7qIVngRNreqA3hGhVuQsvi6fX2yAdpjG7asEBK0jEJ93KXb 1qELgsbRaFuCL4cUgd9BcyQjU= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S6; Mon, 05 Jan 2026 18:20:53 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Slark Xiao , Muhammad Nuzaihan , Qiang Yu , Manivannan Sadhasivam , Johan Hovold , kernel test robot Subject: [net-next v4 4/8] net: wwan: add NMEA port support Date: Mon, 5 Jan 2026 18:20:14 +0800 Message-Id: <20260105102018.62731-5-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S6 X-Coremail-Antispam: 1Uf129KBjvJXoWxKrW8uF4rWw1kXw4rGF1rJFb_yoWfCF13pa yqga45trZ5JF47Wr47JF42vFWYg3WxCryxtry8W34Skr1UtryFvayv9FyqyFy5JrZ7uFya 9rZ5tFW8u345CrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piVHq5UUUUU= X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbC6AZ22mlbkIYPIQAA3I Content-Type: text/plain; charset="utf-8" From: Sergey Ryazanov Many WWAN modems come with embedded GNSS receiver inside and have a dedicated port to output geopositioning data. On the one hand, the GNSS receiver has little in common with WWAN modem and just shares a host interface and should be exported using the GNSS subsystem. On the other hand, GNSS receiver is not automatically activated and needs a generic WWAN control port (AT, MBIM, etc.) to be turned on. And a user space software needs extra information to find the control port. Introduce the new type of WWAN port - NMEA. When driver asks to register a NMEA port, the core allocates common parent WWAN device as usual, but exports the NMEA port via the GNSS subsystem and acts as a proxy between the device driver and the GNSS subsystem. From the WWAN device driver perspective, a NMEA port is registered as a regular WWAN port without any difference. And the driver interacts only with the WWAN core. From the user space perspective, the NMEA port is a GNSS device which parent can be used to enumerate and select the proper control port for the GNSS receiver management. Add the description for structure member gnss in wwan_port. CC: Slark Xiao CC: Muhammad Nuzaihan CC: Qiang Yu CC: Manivannan Sadhasivam CC: Johan Hovold Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202512312143.W82zclxI-lkp@int= el.com/ Suggested-by: Loic Poulain Signed-off-by: Sergey Ryazanov Reviewed-by: Loic Poulain --- drivers/net/wwan/Kconfig | 1 + drivers/net/wwan/wwan_core.c | 156 +++++++++++++++++++++++++++++++++-- include/linux/wwan.h | 2 + 3 files changed, 154 insertions(+), 5 deletions(-) diff --git a/drivers/net/wwan/Kconfig b/drivers/net/wwan/Kconfig index 410b0245114e..88df55d78d90 100644 --- a/drivers/net/wwan/Kconfig +++ b/drivers/net/wwan/Kconfig @@ -7,6 +7,7 @@ menu "Wireless WAN" =20 config WWAN tristate "WWAN Driver Core" + depends on GNSS || GNSS =3D n help Say Y here if you want to use the WWAN driver core. This driver provides a common framework for WWAN drivers. diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index c735b9830e6e..453ff259809c 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -1,5 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2021, Linaro Ltd */ +/* WWAN Driver Core + * + * Copyright (c) 2021, Linaro Ltd + * Copyright (c) 2025, Sergey Ryazanov + */ =20 #include #include @@ -16,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -71,6 +76,7 @@ struct wwan_device { * @headroom_len: SKB reserved headroom size * @frag_len: Length to fragment packet * @at_data: AT port specific data + * @gnss: Pointer to GNSS device associated with this port */ struct wwan_port { enum wwan_port_type type; @@ -89,9 +95,16 @@ struct wwan_port { struct ktermios termios; int mdmbits; } at_data; + struct gnss_device *gnss; }; }; =20 +static int wwan_port_op_start(struct wwan_port *port); +static void wwan_port_op_stop(struct wwan_port *port); +static int wwan_port_op_tx(struct wwan_port *port, struct sk_buff *skb, + bool nonblock); +static int wwan_wait_tx(struct wwan_port *port, bool nonblock); + static ssize_t index_show(struct device *dev, struct device_attribute *att= r, char *buf) { struct wwan_device *wwan =3D to_wwan_dev(dev); @@ -340,6 +353,7 @@ static const struct { .name =3D "MIPC", .devsuf =3D "mipc", }, + /* WWAN_PORT_NMEA is exported via the GNSS subsystem */ }; =20 static ssize_t type_show(struct device *dev, struct device_attribute *attr, @@ -488,6 +502,124 @@ static void wwan_port_unregister_wwan(struct wwan_por= t *port) device_del(&port->dev); } =20 +#if IS_ENABLED(CONFIG_GNSS) +static int wwan_gnss_open(struct gnss_device *gdev) +{ + return wwan_port_op_start(gnss_get_drvdata(gdev)); +} + +static void wwan_gnss_close(struct gnss_device *gdev) +{ + wwan_port_op_stop(gnss_get_drvdata(gdev)); +} + +static int wwan_gnss_write(struct gnss_device *gdev, const unsigned char *= buf, + size_t count) +{ + struct wwan_port *port =3D gnss_get_drvdata(gdev); + struct sk_buff *skb, *head =3D NULL, *tail =3D NULL; + size_t frag_len, remain =3D count; + int ret; + + ret =3D wwan_wait_tx(port, false); + if (ret) + return ret; + + do { + frag_len =3D min(remain, port->frag_len); + skb =3D alloc_skb(frag_len + port->headroom_len, GFP_KERNEL); + if (!skb) { + ret =3D -ENOMEM; + goto freeskb; + } + skb_reserve(skb, port->headroom_len); + memcpy(skb_put(skb, frag_len), buf + count - remain, frag_len); + + if (!head) { + head =3D skb; + } else { + if (!tail) + skb_shinfo(head)->frag_list =3D skb; + else + tail->next =3D skb; + + tail =3D skb; + head->data_len +=3D skb->len; + head->len +=3D skb->len; + head->truesize +=3D skb->truesize; + } + } while (remain -=3D frag_len); + + ret =3D wwan_port_op_tx(port, head, false); + if (!ret) + return count; + +freeskb: + kfree_skb(head); + return ret; +} + +static struct gnss_operations wwan_gnss_ops =3D { + .open =3D wwan_gnss_open, + .close =3D wwan_gnss_close, + .write_raw =3D wwan_gnss_write, +}; + +/* GNSS port specific device registration */ +static int wwan_port_register_gnss(struct wwan_port *port) +{ + struct wwan_device *wwandev =3D to_wwan_dev(port->dev.parent); + struct gnss_device *gdev; + int err; + + gdev =3D gnss_allocate_device(&wwandev->dev); + if (!gdev) + return -ENOMEM; + + /* NB: for now we support only NMEA WWAN port type, so hardcode + * the GNSS port type. If more GNSS WWAN port types will be added, + * then we should dynamically mapt WWAN port type to GNSS type. + */ + gdev->type =3D GNSS_TYPE_NMEA; + gdev->ops =3D &wwan_gnss_ops; + gnss_set_drvdata(gdev, port); + + port->gnss =3D gdev; + + err =3D gnss_register_device(gdev); + if (err) { + gnss_put_device(gdev); + return err; + } + + dev_info(&wwandev->dev, "port %s attached\n", dev_name(&gdev->dev)); + + return 0; +} + +/* GNSS port specific device unregistration */ +static void wwan_port_unregister_gnss(struct wwan_port *port) +{ + struct wwan_device *wwandev =3D to_wwan_dev(port->dev.parent); + struct gnss_device *gdev =3D port->gnss; + + dev_info(&wwandev->dev, "port %s disconnected\n", dev_name(&gdev->dev)); + + gnss_deregister_device(gdev); + gnss_put_device(gdev); +} +#else +static inline int wwan_port_register_gnss(struct wwan_port *port) +{ + return -EOPNOTSUPP; +} + +static inline void wwan_port_unregister_gnss(struct wwan_port *port) +{ + WARN_ON(1); /* This handler cannot be called */ +} +#endif + struct wwan_port *wwan_create_port(struct device *parent, enum wwan_port_type type, const struct wwan_port_ops *ops, @@ -528,7 +660,11 @@ struct wwan_port *wwan_create_port(struct device *pare= nt, dev_set_drvdata(&port->dev, drvdata); device_initialize(&port->dev); =20 - err =3D wwan_port_register_wwan(port); + if (port->type =3D=3D WWAN_PORT_NMEA) + err =3D wwan_port_register_gnss(port); + else + err =3D wwan_port_register_wwan(port); + if (err) goto error_put_device; =20 @@ -558,7 +694,10 @@ void wwan_remove_port(struct wwan_port *port) wake_up_interruptible(&port->waitqueue); skb_queue_purge(&port->rxq); =20 - wwan_port_unregister_wwan(port); + if (port->type =3D=3D WWAN_PORT_NMEA) + wwan_port_unregister_gnss(port); + else + wwan_port_unregister_wwan(port); =20 put_device(&port->dev); =20 @@ -569,8 +708,15 @@ EXPORT_SYMBOL_GPL(wwan_remove_port); =20 void wwan_port_rx(struct wwan_port *port, struct sk_buff *skb) { - skb_queue_tail(&port->rxq, skb); - wake_up_interruptible(&port->waitqueue); + if (port->type =3D=3D WWAN_PORT_NMEA) { +#if IS_ENABLED(CONFIG_GNSS) + gnss_insert_raw(port->gnss, skb->data, skb->len); +#endif + consume_skb(skb); + } else { + skb_queue_tail(&port->rxq, skb); + wake_up_interruptible(&port->waitqueue); + } } EXPORT_SYMBOL_GPL(wwan_port_rx); =20 diff --git a/include/linux/wwan.h b/include/linux/wwan.h index a4d6cc0c9f68..1e0e2cb53579 100644 --- a/include/linux/wwan.h +++ b/include/linux/wwan.h @@ -19,6 +19,7 @@ * @WWAN_PORT_FASTBOOT: Fastboot protocol control * @WWAN_PORT_ADB: ADB protocol control * @WWAN_PORT_MIPC: MTK MIPC diagnostic interface + * @WWAN_PORT_NMEA: embedded GNSS receiver with NMEA output * * @WWAN_PORT_MAX: Highest supported port types * @WWAN_PORT_UNKNOWN: Special value to indicate an unknown port type @@ -34,6 +35,7 @@ enum wwan_port_type { WWAN_PORT_FASTBOOT, WWAN_PORT_ADB, WWAN_PORT_MIPC, + WWAN_PORT_NMEA, =20 /* Add new port types above this line */ =20 --=20 2.25.1 From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6579314A78; Mon, 5 Jan 2026 10:21:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608497; cv=none; b=jGeoSwFi0PdLP5nRx4un/uQYFl9et3jN3WVmEYrySoyUDm0vg3jCI/RTnrPJU4hvar9Qf5i2Ugrxyavd/WjZ79DCMvmFykg1Ukl6oCtkrXr8O82YJyufmsfZKzWZ/p4/jqMQ//QdmEeHxnTpyIuyppy9R+UZijaHZ7Y4l+p29GM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608497; c=relaxed/simple; bh=ch3WUowE0r41pxeM/FiSHDm2a/bn91+yh/Iqf4f8cno=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pA6djQLga4+jcaSPxSH7IYsSa6fLgqXzuHS0HAOLJGjcx1vK60sfMoENodGF5zwHrUt5s7MvVfieGy5HIPrvh2x7t5EBXt6PtUENE4UM2m9kDKkMx1fpAza2wnjExPgplqD3RQZ1XZBQI0zx9auUa8Q3O4ZyiXeKSkYuxpoho1o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=XV21oUlv; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="XV21oUlv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=xj XLh9OxB7OyImjOAQduujoqYcXrgtQdnE2zosJw5bA=; b=XV21oUlvDXZBUGoE41 ++ABzQqMmymoMWgYOrQed76LVDylcgx1JGfv1VipTTssJjEYeke6I2N99cMjuej4 4VxDpQDYyPCVfwa7MgXjLSw1dMDQi/P9+jRImosYVfy93DgThPGjEw5w48CnCJkm 46wevym4HJuX/3247MhRvH7Pw= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S7; Mon, 05 Jan 2026 18:20:57 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 5/8] net: wwan: hwsim: refactor to support more port types Date: Mon, 5 Jan 2026 18:20:15 +0800 Message-Id: <20260105102018.62731-6-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S7 X-Coremail-Antispam: 1Uf129KBjvJXoW3Xr4UKr1UAry5CFWfAFykAFb_yoWxJrykpa yqgr9xKrWUt3Z3Wry7tFsrAa4Fkrn5WryvqrWrW34FqFn7t345ZFWvk3s0kr4DAFy7CFy3 Cr98t343Jw47Cr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jOgAwUUUUU= X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbCwAl322lbkInAfQAA3z Content-Type: text/plain; charset="utf-8" From: Sergey Ryazanov Just introduced WWAN NMEA port type needs a testing option. The WWAN HW simulator was developed with the AT port type in mind and cannot be easily extended. Refactor it now to make it capable to support more port types. No big functional changes, mostly renaming with a little code rearrangement. Signed-off-by: Sergey Ryazanov Reviewed-by: Loic Poulain --- drivers/net/wwan/wwan_hwsim.c | 73 ++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/drivers/net/wwan/wwan_hwsim.c b/drivers/net/wwan/wwan_hwsim.c index 733688cd4607..11d15dc39041 100644 --- a/drivers/net/wwan/wwan_hwsim.c +++ b/drivers/net/wwan/wwan_hwsim.c @@ -56,12 +56,16 @@ struct wwan_hwsim_port { struct wwan_port *wwan; struct work_struct del_work; struct dentry *debugfs_topdir; - enum { /* AT command parser state */ - AT_PARSER_WAIT_A, - AT_PARSER_WAIT_T, - AT_PARSER_WAIT_TERM, - AT_PARSER_SKIP_LINE, - } pstate; + union { + struct { + enum { /* AT command parser state */ + AT_PARSER_WAIT_A, + AT_PARSER_WAIT_T, + AT_PARSER_WAIT_TERM, + AT_PARSER_SKIP_LINE, + } pstate; + } at_emul; + }; }; =20 static const struct file_operations wwan_hwsim_debugfs_portdestroy_fops; @@ -101,16 +105,16 @@ static const struct wwan_ops wwan_hwsim_wwan_rtnl_ops= =3D { .setup =3D wwan_hwsim_netdev_setup, }; =20 -static int wwan_hwsim_port_start(struct wwan_port *wport) +static int wwan_hwsim_at_emul_start(struct wwan_port *wport) { struct wwan_hwsim_port *port =3D wwan_port_get_drvdata(wport); =20 - port->pstate =3D AT_PARSER_WAIT_A; + port->at_emul.pstate =3D AT_PARSER_WAIT_A; =20 return 0; } =20 -static void wwan_hwsim_port_stop(struct wwan_port *wport) +static void wwan_hwsim_at_emul_stop(struct wwan_port *wport) { } =20 @@ -120,7 +124,7 @@ static void wwan_hwsim_port_stop(struct wwan_port *wpor= t) * * Be aware that this processor is not fully V.250 compliant. */ -static int wwan_hwsim_port_tx(struct wwan_port *wport, struct sk_buff *in) +static int wwan_hwsim_at_emul_tx(struct wwan_port *wport, struct sk_buff *= in) { struct wwan_hwsim_port *port =3D wwan_port_get_drvdata(wport); struct sk_buff *out; @@ -142,17 +146,17 @@ static int wwan_hwsim_port_tx(struct wwan_port *wport= , struct sk_buff *in) for (i =3D 0, s =3D 0; i < in->len; ++i) { char c =3D in->data[i]; =20 - if (port->pstate =3D=3D AT_PARSER_WAIT_A) { + if (port->at_emul.pstate =3D=3D AT_PARSER_WAIT_A) { if (c =3D=3D 'A' || c =3D=3D 'a') - port->pstate =3D AT_PARSER_WAIT_T; + port->at_emul.pstate =3D AT_PARSER_WAIT_T; else if (c !=3D '\n') /* Ignore formating char */ - port->pstate =3D AT_PARSER_SKIP_LINE; - } else if (port->pstate =3D=3D AT_PARSER_WAIT_T) { + port->at_emul.pstate =3D AT_PARSER_SKIP_LINE; + } else if (port->at_emul.pstate =3D=3D AT_PARSER_WAIT_T) { if (c =3D=3D 'T' || c =3D=3D 't') - port->pstate =3D AT_PARSER_WAIT_TERM; + port->at_emul.pstate =3D AT_PARSER_WAIT_TERM; else - port->pstate =3D AT_PARSER_SKIP_LINE; - } else if (port->pstate =3D=3D AT_PARSER_WAIT_TERM) { + port->at_emul.pstate =3D AT_PARSER_SKIP_LINE; + } else if (port->at_emul.pstate =3D=3D AT_PARSER_WAIT_TERM) { if (c !=3D '\r') continue; /* Consume the trailing formatting char as well */ @@ -162,11 +166,11 @@ static int wwan_hwsim_port_tx(struct wwan_port *wport= , struct sk_buff *in) skb_put_data(out, &in->data[s], n);/* Echo */ skb_put_data(out, "\r\nOK\r\n", 6); s =3D i + 1; - port->pstate =3D AT_PARSER_WAIT_A; - } else if (port->pstate =3D=3D AT_PARSER_SKIP_LINE) { + port->at_emul.pstate =3D AT_PARSER_WAIT_A; + } else if (port->at_emul.pstate =3D=3D AT_PARSER_SKIP_LINE) { if (c !=3D '\r') continue; - port->pstate =3D AT_PARSER_WAIT_A; + port->at_emul.pstate =3D AT_PARSER_WAIT_A; } } =20 @@ -183,18 +187,25 @@ static int wwan_hwsim_port_tx(struct wwan_port *wport= , struct sk_buff *in) return 0; } =20 -static const struct wwan_port_ops wwan_hwsim_port_ops =3D { - .start =3D wwan_hwsim_port_start, - .stop =3D wwan_hwsim_port_stop, - .tx =3D wwan_hwsim_port_tx, +static const struct wwan_port_ops wwan_hwsim_at_emul_port_ops =3D { + .start =3D wwan_hwsim_at_emul_start, + .stop =3D wwan_hwsim_at_emul_stop, + .tx =3D wwan_hwsim_at_emul_tx, }; =20 -static struct wwan_hwsim_port *wwan_hwsim_port_new(struct wwan_hwsim_dev *= dev) +static struct wwan_hwsim_port *wwan_hwsim_port_new(struct wwan_hwsim_dev *= dev, + enum wwan_port_type type) { + const struct wwan_port_ops *ops; struct wwan_hwsim_port *port; char name[0x10]; int err; =20 + if (type =3D=3D WWAN_PORT_AT) + ops =3D &wwan_hwsim_at_emul_port_ops; + else + return ERR_PTR(-EINVAL); + port =3D kzalloc(sizeof(*port), GFP_KERNEL); if (!port) return ERR_PTR(-ENOMEM); @@ -205,9 +216,7 @@ static struct wwan_hwsim_port *wwan_hwsim_port_new(stru= ct wwan_hwsim_dev *dev) port->id =3D dev->port_idx++; spin_unlock(&dev->ports_lock); =20 - port->wwan =3D wwan_create_port(&dev->dev, WWAN_PORT_AT, - &wwan_hwsim_port_ops, - NULL, port); + port->wwan =3D wwan_create_port(&dev->dev, type, ops, NULL, port); if (IS_ERR(port->wwan)) { err =3D PTR_ERR(port->wwan); goto err_free_port; @@ -392,7 +401,7 @@ static ssize_t wwan_hwsim_debugfs_portcreate_write(stru= ct file *file, struct wwan_hwsim_dev *dev =3D file->private_data; struct wwan_hwsim_port *port; =20 - port =3D wwan_hwsim_port_new(dev); + port =3D wwan_hwsim_port_new(dev, WWAN_PORT_AT); if (IS_ERR(port)) return PTR_ERR(port); =20 @@ -459,6 +468,8 @@ static int __init wwan_hwsim_init_devs(void) int i, j; =20 for (i =3D 0; i < wwan_hwsim_devsnum; ++i) { + struct wwan_hwsim_port *port; + dev =3D wwan_hwsim_dev_new(); if (IS_ERR(dev)) return PTR_ERR(dev); @@ -471,9 +482,7 @@ static int __init wwan_hwsim_init_devs(void) * the simulator readiness time. */ for (j =3D 0; j < 2; ++j) { - struct wwan_hwsim_port *port; - - port =3D wwan_hwsim_port_new(dev); + port =3D wwan_hwsim_port_new(dev, WWAN_PORT_AT); if (IS_ERR(port)) return PTR_ERR(port); =20 --=20 2.25.1 From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39ACE3161B2; Mon, 5 Jan 2026 10:21:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608500; cv=none; b=mDZ7Z/3cWhunLsd2407axXng/Fcp0ukvxCnUTzranNclnu7OLCxDCX3M5pXosy8T1hlMsRyip58hsceRA6kl4zYESBHwsERZaHyjukIftOdjl6u6agsqrRAl6K+D3jfTQH3Bf9Fj15l370qh/DpOzuX1vBzq/rNJKad6frb57mQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608500; c=relaxed/simple; bh=hJb2PfqzOI9tHMOZ4VhGa1KJ5pcdFKMsblP79Oj7SMM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZmLHRcSFbsevVozKSzVaTyZR+Dbpx1HWZncINrUw4WNCQygscFiqQGKE8PRW17YujAPhATQC6RTC8cgkfYPY8Z+hZqHKRuyEiqsgdOB2jaDagOL0c8vHQZXx70O25F/Mm2xCCj9An2FHxHJUGcKK0hJVHi1XPpyhpIKfSr/VpvU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=gnj05H0I; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="gnj05H0I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Eh TKEMdihrRmGhc2+GnqMu/SEAiNyVgMgt/1+m5A8zE=; b=gnj05H0IVkOvh0T2if sDvQ7DwIt+sZxvAdTv/Fr3z8jfmGSU7p5SP5bl9c9jJ/Al/j1Kiigybu4iuxbCtS e1JCT8V7vlIt9/CAMzRAZmNC6fXpuBTX0ofc99vd1co3fAA800YoQBncMAwp6BHT 8y1XU/DADXbPF2zP1aeF5ZOKw= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S8; Mon, 05 Jan 2026 18:20:59 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 6/8] net: wwan: hwsim: support NMEA port emulation Date: Mon, 5 Jan 2026 18:20:16 +0800 Message-Id: <20260105102018.62731-7-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S8 X-Coremail-Antispam: 1Uf129KBjvJXoWxKrWUJr4UKFy5AFykJFW8WFg_yoWxJr15pa 1qgasxKrWUJw47W343GFsxJFWYqF1kWry0v34rWryYyr1xtry5XFWvkr90vrW5Gr97uFy3 urs5tw13Z397CrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UJl1PUUUUU= X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbCvwt322lbkIu44gAA3r Content-Type: text/plain; charset="utf-8" From: Sergey Ryazanov Support NMEA port emulation for the WWAN core GNSS port testing purpose. Emulator produces pair of GGA + RMC sentences every second what should be enough to fool gpsd into believing it is working with a NMEA GNSS receiver. If the GNSS system is enabled then one NMEA port will be created automatically for the simulated WWAN device. Manual NMEA port creation is not supported at the moment. Signed-off-by: Sergey Ryazanov Reviewed-by: Loic Poulain --- drivers/net/wwan/wwan_hwsim.c | 128 +++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 2 deletions(-) diff --git a/drivers/net/wwan/wwan_hwsim.c b/drivers/net/wwan/wwan_hwsim.c index 11d15dc39041..e4b1bbff9af2 100644 --- a/drivers/net/wwan/wwan_hwsim.c +++ b/drivers/net/wwan/wwan_hwsim.c @@ -2,7 +2,7 @@ /* * WWAN device simulator for WWAN framework testing. * - * Copyright (c) 2021, Sergey Ryazanov + * Copyright (c) 2021, 2025, Sergey Ryazanov */ =20 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -12,8 +12,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -65,6 +67,9 @@ struct wwan_hwsim_port { AT_PARSER_SKIP_LINE, } pstate; } at_emul; + struct { + struct timer_list timer; + } nmea_emul; }; }; =20 @@ -193,6 +198,108 @@ static const struct wwan_port_ops wwan_hwsim_at_emul_= port_ops =3D { .tx =3D wwan_hwsim_at_emul_tx, }; =20 +#if IS_ENABLED(CONFIG_GNSS) +#define NMEA_MAX_LEN 82 /* Max sentence length */ +#define NMEA_TRAIL_LEN 5 /* '*' + Checksum + */ +#define NMEA_MAX_DATA_LEN (NMEA_MAX_LEN - NMEA_TRAIL_LEN) + +static __printf(2, 3) +void wwan_hwsim_nmea_skb_push_sentence(struct sk_buff *skb, + const char *fmt, ...) +{ + unsigned char *s, *p; + va_list ap; + u8 cs =3D 0; + int len; + + s =3D skb_put(skb, NMEA_MAX_LEN + 1); /* +'\0' */ + if (!s) + return; + + va_start(ap, fmt); + len =3D vsnprintf(s, NMEA_MAX_DATA_LEN + 1, fmt, ap); + va_end(ap); + if (WARN_ON_ONCE(len > NMEA_MAX_DATA_LEN))/* No space for trailer */ + return; + + for (p =3D s + 1; *p !=3D '\0'; ++p)/* Skip leading '$' or '!' */ + cs ^=3D *p; + p +=3D snprintf(p, 5 + 1, "*%02X\r\n", cs); + + len =3D (p - s) - (NMEA_MAX_LEN + 1); /* exp. vs real length diff */ + skb->tail +=3D len; /* Adjust tail to real length */ + skb->len +=3D len; +} + +static void wwan_hwsim_nmea_emul_timer(struct timer_list *t) +{ + /* 43.74754722298909 N 11.25759835922875 E in DMM format */ + static const unsigned int coord[4 * 2] =3D { 43, 44, 8528, 0, + 11, 15, 4559, 0 }; + struct wwan_hwsim_port *port =3D timer_container_of(port, t, nmea_emul.ti= mer); + struct sk_buff *skb; + struct tm tm; + + time64_to_tm(ktime_get_real_seconds(), 0, &tm); + + mod_timer(&port->nmea_emul.timer, jiffies + HZ); /* 1 second */ + + skb =3D alloc_skb(NMEA_MAX_LEN * 2, GFP_KERNEL); /* GGA + RMC */ + if (!skb) + return; + + wwan_hwsim_nmea_skb_push_sentence(skb, + "$GPGGA,%02u%02u%02u.000,%02u%02u.%04u,%c,%03u%02u.%04u,%c,1,7,1.03= ,176.2,M,55.2,M,,", + tm.tm_hour, tm.tm_min, tm.tm_sec, + coord[0], coord[1], coord[2], + coord[3] ? 'S' : 'N', + coord[4], coord[5], coord[6], + coord[7] ? 'W' : 'E'); + + wwan_hwsim_nmea_skb_push_sentence(skb, + "$GPRMC,%02u%02u%02u.000,A,%02u%02u.%04u,%c,%03u%02u.%04u,%c,0.02,3= 1.66,%02u%02u%02u,,,A", + tm.tm_hour, tm.tm_min, tm.tm_sec, + coord[0], coord[1], coord[2], + coord[3] ? 'S' : 'N', + coord[4], coord[5], coord[6], + coord[7] ? 'W' : 'E', + tm.tm_mday, tm.tm_mon + 1, + (unsigned int)tm.tm_year - 100); + + wwan_port_rx(port->wwan, skb); +} + +static int wwan_hwsim_nmea_emul_start(struct wwan_port *wport) +{ + struct wwan_hwsim_port *port =3D wwan_port_get_drvdata(wport); + + timer_setup(&port->nmea_emul.timer, wwan_hwsim_nmea_emul_timer, 0); + wwan_hwsim_nmea_emul_timer(&port->nmea_emul.timer); + + return 0; +} + +static void wwan_hwsim_nmea_emul_stop(struct wwan_port *wport) +{ + struct wwan_hwsim_port *port =3D wwan_port_get_drvdata(wport); + + timer_delete_sync(&port->nmea_emul.timer); +} + +static int wwan_hwsim_nmea_emul_tx(struct wwan_port *wport, struct sk_buff= *in) +{ + consume_skb(in); + + return 0; +} + +static const struct wwan_port_ops wwan_hwsim_nmea_emul_port_ops =3D { + .start =3D wwan_hwsim_nmea_emul_start, + .stop =3D wwan_hwsim_nmea_emul_stop, + .tx =3D wwan_hwsim_nmea_emul_tx, +}; +#endif + static struct wwan_hwsim_port *wwan_hwsim_port_new(struct wwan_hwsim_dev *= dev, enum wwan_port_type type) { @@ -203,6 +310,10 @@ static struct wwan_hwsim_port *wwan_hwsim_port_new(str= uct wwan_hwsim_dev *dev, =20 if (type =3D=3D WWAN_PORT_AT) ops =3D &wwan_hwsim_at_emul_port_ops; +#if IS_ENABLED(CONFIG_GNSS) + else if (type =3D=3D WWAN_PORT_NMEA) + ops =3D &wwan_hwsim_nmea_emul_port_ops; +#endif else return ERR_PTR(-EINVAL); =20 @@ -478,9 +589,10 @@ static int __init wwan_hwsim_init_devs(void) list_add_tail(&dev->list, &wwan_hwsim_devs); spin_unlock(&wwan_hwsim_devs_lock); =20 - /* Create a couple of ports per each device to accelerate + /* Create a few various ports per each device to accelerate * the simulator readiness time. */ + for (j =3D 0; j < 2; ++j) { port =3D wwan_hwsim_port_new(dev, WWAN_PORT_AT); if (IS_ERR(port)) @@ -490,6 +602,18 @@ static int __init wwan_hwsim_init_devs(void) list_add_tail(&port->list, &dev->ports); spin_unlock(&dev->ports_lock); } + +#if IS_ENABLED(CONFIG_GNSS) + port =3D wwan_hwsim_port_new(dev, WWAN_PORT_NMEA); + if (IS_ERR(port)) { + dev_warn(&dev->dev, "failed to create initial NMEA port: %d\n", + (int)PTR_ERR(port)); + } else { + spin_lock(&dev->ports_lock); + list_add_tail(&port->list, &dev->ports); + spin_unlock(&dev->ports_lock); + } +#endif } =20 return 0; --=20 2.25.1 From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1AAB315D45; Mon, 5 Jan 2026 10:21:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608505; cv=none; b=qT5nNicBNP0BpHXkIoi9e+Su/OehsXjrSCWn4y8qcSuy/+s6VaTdFX4J4sV7MqqrFOmLjQISJzWzjuF+3dFH4Xe9c2C999Fhavu9Am7gGujh682wB1+SiCUoG7NyRoNYvxguHoJCnCVZVhSaWp27Ivcm43W8+vh55G4Z02bimaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608505; c=relaxed/simple; bh=8oEVsQ/aax8iJBAK9WfweElPheAitLq0tb0cSad4lFc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GD//2oYa9b338c/pOGDUI+7tFN7c3RogTtNLgNmX8AOlmKRJniKV4O0FRKobUVUN0jiM7ZZyjkl3mjBihBBWwKwP7Y2RYJCYEgY84FcZ6I+BhMpytsqLdWQvpak1iQFiBi1ZzMOu5Llelk2s/uOE+BTYbkJitLnwxPDoOEjmXjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=GP557h4p; arc=none smtp.client-ip=117.135.210.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="GP557h4p" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=eM OgPbvGBudF68T2uDGGd26nD1U28CGBg/rUrP+mlVw=; b=GP557h4pVa5cocB6M+ xMEez3XE3A2A/JVxFjp90LutfS31UcX20Uyg+7kWyKaOLlcAYGQpWp5VfbKlxrwS QKyTds3CjgU6X/aq5X0E2CdnzBZVPuEWbQyxmdifI8NJ9u2lkGd/FwozdTNms1CX WgBDd83WdVxtO+zS2tJF9f/hc= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S9; Mon, 05 Jan 2026 18:21:00 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniele Palmas Subject: [net-next v4 7/8] net: wwan: prevent premature device unregister when NMEA port is present Date: Mon, 5 Jan 2026 18:20:17 +0800 Message-Id: <20260105102018.62731-8-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S9 X-Coremail-Antispam: 1Uf129KBjvJXoWxAr1DXF4fJrWxGw4fCw1xKrg_yoW5Cw4rpa 1qgas8KrWkJr47ur43tF47XFWruF4xC34Ivry0g34Skr1DtryFvrZ7CF90vFZ8JFyxCFy5 urZ8tay8uw4UCr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jOSdgUUUUU= X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbCvw143GlbkI25AgAA3C Content-Type: text/plain; charset="utf-8" From: Loic Poulain The WWAN core unregisters the device when it has no remaining WWAN ops or child devices. For NMEA port types, the child is registered under the GNSS class instead of WWAN, so the core incorrectly assumes there are no children and unregisters the WWAN device too early. This leads to a second unregister attempt after the NMEA device is removed. To fix this issue, we register a virtual WWAN port device along the GNSS device, this ensures the WWAN device remains registered until all associated ports, including NMEA, are properly removed. Reported-by: Daniele Palmas Closes: https://lore.kernel.org/netdev/CAGRyCJE28yf-rrfkFbzu44ygLEvoUM7fecK= 1vnrghjG_e9UaRA@mail.gmail.com/ Signed-off-by: Loic Poulain --- drivers/net/wwan/wwan_core.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index 453ff259809c..df35b188cf6f 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -456,7 +456,7 @@ static int __wwan_port_dev_assign_name(struct wwan_port= *port, const char *fmt) } =20 /* Register a regular WWAN port device (e.g. AT, MBIM, etc.) */ -static int wwan_port_register_wwan(struct wwan_port *port) +static int wwan_port_register_wwan(struct wwan_port *port, bool cdev) { struct wwan_device *wwandev =3D to_wwan_dev(port->dev.parent); char namefmt[0x20]; @@ -468,7 +468,8 @@ static int wwan_port_register_wwan(struct wwan_port *po= rt) return minor; =20 port->dev.class =3D &wwan_class; - port->dev.devt =3D MKDEV(wwan_major, minor); + if (cdev) + port->dev.devt =3D MKDEV(wwan_major, minor); =20 /* allocate unique name based on wwan device id, port type and number */ snprintf(namefmt, sizeof(namefmt), "wwan%u%s%%d", wwandev->id, @@ -626,6 +627,7 @@ struct wwan_port *wwan_create_port(struct device *paren= t, struct wwan_port_caps *caps, void *drvdata) { + bool cdev =3D (type =3D=3D WWAN_PORT_NMEA) ? false : true; struct wwan_device *wwandev; struct wwan_port *port; int err; @@ -660,16 +662,20 @@ struct wwan_port *wwan_create_port(struct device *par= ent, dev_set_drvdata(&port->dev, drvdata); device_initialize(&port->dev); =20 - if (port->type =3D=3D WWAN_PORT_NMEA) - err =3D wwan_port_register_gnss(port); - else - err =3D wwan_port_register_wwan(port); - + err =3D wwan_port_register_wwan(port, cdev); if (err) goto error_put_device; =20 + if (type =3D=3D WWAN_PORT_NMEA) { + err =3D wwan_port_register_gnss(port); + if (err) + goto error_port_unregister; + } + return port; =20 +error_port_unregister: + wwan_port_unregister_wwan(port); error_put_device: put_device(&port->dev); error_wwandev_remove: @@ -696,8 +702,8 @@ void wwan_remove_port(struct wwan_port *port) =20 if (port->type =3D=3D WWAN_PORT_NMEA) wwan_port_unregister_gnss(port); - else - wwan_port_unregister_wwan(port); + + wwan_port_unregister_wwan(port); =20 put_device(&port->dev); =20 --=20 2.25.1 From nobody Mon Feb 9 17:07:51 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0975D3164CB; Mon, 5 Jan 2026 10:21:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608501; cv=none; b=k92SooI6f7B3Nv+2BKGRJ8S+9YoviJrcTf+Iii0pA1EMg9BjIB2eP9gMl66sV6fT17h8HHdpDnRbgewH+3LpDLGiTcK96nE0UypeHatfsxiTmj8mevS1vbeSjjkiDjmxeyzVmJUWRAwHU27GIYXMk7OOn8C8PJgyoMSHUTsDdPM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767608501; c=relaxed/simple; bh=QJwR31LUjagdVEaSKK25/11zLr/1MNw+I0HRRvelUeE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bc4R3qRajoiJTPypAWqZQfk2xr5NBLqOlT98VQ1Uc1nEQq+bK2k0oqvk58bDc8agdfv75cq5YCTWD06LNJA1wIwR6/T6Lt3Wf+4zUmrc3DHXyX+5E50h2ownEfXqXGvLamVoYqSlnWtW56VCXshL96I5DaJ6SaUUWkppA8AFB5A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=f12n0v9H; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="f12n0v9H" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=LX Da7p8qMOIcHKrHr4whPEp5/2uFN+0BctnZg49fC7g=; b=f12n0v9HB8vaRTTPba 5sNCx2vXMEVG9BLtlE4wsnknfFHpRzhhTBlHOQEN6/q8utWSWmp8YRHBKwIZlmbP VEHMHFGhYuyJz7c5pfqzJxJDFkwchUEWARzblHLRvE/KKJgxoBjYsV7D4bjgZsuW IU8TLcoNC3D541U8U2sezr+Aw= Received: from localhost.localdomain (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgDnrxNrkFtpVWA8KQ--.198S10; Mon, 05 Jan 2026 18:21:02 +0800 (CST) From: Slark Xiao To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, johannes@sipsolutions.net, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mani@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Slark Xiao Subject: [net-next v4 8/8] net: wwan: mhi_wwan_ctrl: Add NMEA channel support Date: Mon, 5 Jan 2026 18:20:18 +0800 Message-Id: <20260105102018.62731-9-slark_xiao@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260105102018.62731-1-slark_xiao@163.com> References: <20260105102018.62731-1-slark_xiao@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgDnrxNrkFtpVWA8KQ--.198S10 X-Coremail-Antispam: 1Uf129KBjvdXoWrKrW3Xw48Gr4fGrWDAF45Awb_yoWfWwbE9w 1DXF9rJrW5W34UKFsFgF13ZryfKw10qF4kXFnavrZYv347XryfWw1kZF4Dtr9Fkr17CF9F 9rnxWayFyw4fWjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sREK0P3UUUUU== X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbCvw543GlbkI65KQAA3p Content-Type: text/plain; charset="utf-8" For MHI WWAN device, we need a match between NMEA channel and WWAN_PORT_NMEA type. Then the GNSS subsystem could create the gnss device succssfully. Signed-off-by: Slark Xiao Reviewed-by: Loic Poulain --- drivers/net/wwan/mhi_wwan_ctrl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wwan/mhi_wwan_ctrl.c b/drivers/net/wwan/mhi_wwan_c= trl.c index e9f979d2d851..e13c0b078175 100644 --- a/drivers/net/wwan/mhi_wwan_ctrl.c +++ b/drivers/net/wwan/mhi_wwan_ctrl.c @@ -263,6 +263,7 @@ static const struct mhi_device_id mhi_wwan_ctrl_match_t= able[] =3D { { .chan =3D "QMI", .driver_data =3D WWAN_PORT_QMI }, { .chan =3D "DIAG", .driver_data =3D WWAN_PORT_QCDM }, { .chan =3D "FIREHOSE", .driver_data =3D WWAN_PORT_FIREHOSE }, + { .chan =3D "NMEA", .driver_data =3D WWAN_PORT_NMEA }, {}, }; MODULE_DEVICE_TABLE(mhi, mhi_wwan_ctrl_match_table); --=20 2.25.1