Skip to contentSkip to conversation

net: wwan: mhi_wwan_mbim: use correct mux_id for multiplexing

PATCH Applied Daniele Palmas 3 participants 3 messages Jun 3, 2025 – Jun 5, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: wwan: mhi_wwan_mbim: use correct mux_id for multiplexing

Recent Qualcomm chipsets like SDX72/75 require MBIM sessionId mapping to muxId in the range (0x70-0x8F) for the PCIe tethered use.

This has been partially addressed by the referenced commit, mapping the default data call to muxId = 112, but the multiplexed data calls scenario was not properly considered, mapping sessionId = 1 to muxId 1, while it should have been 113.

Fix this by moving the session_id assignment logic to mhi_mbim_newlink, in order to map sessionId = n to muxId = n + WDS_BIND_MUX_DATA_PORT_MUX_ID.

Fixes 65bc58c3dcad ("net: wwan: mhi: make default data link id configurable")

---
v2: change commit description including information from QC case according to Loic's feedback

@Loic, I've left out the mux-id macro/function renaming, since I'm not sure that it can really be considered a fix for net. Maybe we can think about it when net-next opens again.

 drivers/net/wwan/mhi_wwan_mbim.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wwan/mhi_wwan_mbim.c +3 -6
index 8755c5e6a65b..c814fbd756a1 100644
@@ -550,8 +550,8 @@ static int mhi_mbim_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
 	struct mhi_mbim_link *link = wwan_netdev_drvpriv(ndev);
 	struct mhi_mbim_context *mbim = ctxt;
 
-	link->session = if_id;
 	link->mbim = mbim;
+	link->session = mhi_mbim_get_link_mux_id(link->mbim->mdev->mhi_cntrl) + if_id;
 	link->ndev = ndev;
 	u64_stats_init(&link->rx_syncp);
 	u64_stats_init(&link->tx_syncp);
@@ -607,7 +607,7 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id
 {
 	struct mhi_controller *cntrl = mhi_dev->mhi_cntrl;
 	struct mhi_mbim_context *mbim;
-	int err, link_id;
+	int err;
 
 	mbim = devm_kzalloc(&mhi_dev->dev, sizeof(*mbim), GFP_KERNEL);
 	if (!mbim)
@@ -628,11 +628,8 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id
 	/* Number of transfer descriptors determines size of the queue */
 	mbim->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE);
 
-	/* Get the corresponding mux_id from mhi */
-	link_id = mhi_mbim_get_link_mux_id(cntrl);
-
 	/* Register wwan link ops with MHI controller representing WWAN instance */
-	return wwan_register_ops(&cntrl->mhi_dev->dev, &mhi_mbim_wwan_ops, mbim, link_id);
+	return wwan_register_ops(&cntrl->mhi_dev->dev, &mhi_mbim_wwan_ops, mbim, 0);
 }
 
 static void mhi_mbim_remove(struct mhi_device *mhi_dev)

base-commit: 408da3a0f89d581421ca9bd6ff39c7dd05bc4b2f

Signature · 1 line
2.37.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Daniele Palmas

Recent Qualcomm chipsets like SDX72/75 require MBIM sessionId mapping to muxId in the range (0x70-0x8F) for the PCIe tethered use.

This has been partially addressed by the referenced commit, mapping the default data call to muxId = 112, but the multiplexed data calls scenario was not properly considered, mapping sessionId = 1 to muxId 1, while it should have been 113.

Quoted 5 lines

Fix this by moving the session_id assignment logic to mhi_mbim_newlink, in order to map sessionId = n to muxId = n + WDS_BIND_MUX_DATA_PORT_MUX_ID.

Fixes 65bc58c3dcad ("net: wwan: mhi: make default data link id configurable")
Quoted 52 lines

---
v2: change commit description including information from QC case according to Loic's feedback

@Loic, I've left out the mux-id macro/function renaming, since I'm not sure that it can really be considered a fix for net. Maybe we can think about it when net-next opens again.

 drivers/net/wwan/mhi_wwan_mbim.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wwan/mhi_wwan_mbim.c +3 -6
index 8755c5e6a65b..c814fbd756a1 100644
@@ -550,8 +550,8 @@ static int mhi_mbim_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
        struct mhi_mbim_link *link = wwan_netdev_drvpriv(ndev);
        struct mhi_mbim_context *mbim = ctxt;
 
-       link->session = if_id;
        link->mbim = mbim;
+       link->session = mhi_mbim_get_link_mux_id(link->mbim->mdev->mhi_cntrl) + if_id;
        link->ndev = ndev;
        u64_stats_init(&link->rx_syncp);
        u64_stats_init(&link->tx_syncp);
@@ -607,7 +607,7 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id
 {
        struct mhi_controller *cntrl = mhi_dev->mhi_cntrl;
        struct mhi_mbim_context *mbim;
-       int err, link_id;
+       int err;
 
        mbim = devm_kzalloc(&mhi_dev->dev, sizeof(*mbim), GFP_KERNEL);
        if (!mbim)
@@ -628,11 +628,8 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id
        /* Number of transfer descriptors determines size of the queue */
        mbim->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE);
 
-       /* Get the corresponding mux_id from mhi */
-       link_id = mhi_mbim_get_link_mux_id(cntrl);
-
        /* Register wwan link ops with MHI controller representing WWAN instance */
-       return wwan_register_ops(&cntrl->mhi_dev->dev, &mhi_mbim_wwan_ops, mbim, link_id);
+       return wwan_register_ops(&cntrl->mhi_dev->dev, &mhi_mbim_wwan_ops, mbim, 0);
 }
 
 static void mhi_mbim_remove(struct mhi_device *mhi_dev)

base-commit: 408da3a0f89d581421ca9bd6ff39c7dd05bc4b2f --
2.37.1

#2 lore raw
In reply to Daniele Palmas
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

Quoted 9 lines · On Tue, 3 Jun 2025 11:12:04 +0200 you wrote:

Recent Qualcomm chipsets like SDX72/75 require MBIM sessionId mapping to muxId in the range (0x70-0x8F) for the PCIe tethered use.

This has been partially addressed by the referenced commit, mapping the default data call to muxId = 112, but the multiplexed data calls scenario was not properly considered, mapping sessionId = 1 to muxId 1, while it should have been 113.

[...]

Here is the summary with links:
- [net,v2,1/1] net: wwan: mhi_wwan_mbim: use correct mux_id for multiplexing

    https://git.kernel.org/netdev/net/c/501fe52aa908

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html