[GIT PULL] MHI changes for v6.20

[GIT PULL] MHI changes for v6.20

[Manivannan Sadhasivam]

The following changes since commit 8f0b4cce4481fb22653697cced8d0d04027cb1e8:

  Linux 6.19-rc1 (2025-12-14 16:05:07 +1200)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git tags/mhi-for-v6.20

for you to fetch changes up to 91a0b0dce350766675961892ba4431363c4e29f7:

  bus: mhi: ep: Use bus callbacks for .probe() and .remove() (2025-12-31 16:27:13 +0530)

There is a minor conflict between mhi and ath trees in
drivers/net/wireless/ath/ath12k/mhi.c file:

between commits:

  7f54938fc525 ("wifi: ath12k: Move Wi-Fi 7 MHI configuration to dedicated file")
  a72027045263 ("wifi: ath12k: Modularize driver into common and Wi-Fi 7 specific components")
  bce3b73d1ca7 ("wifi: ath12k: Rename ath12k_* symbols to ath12k_wifi7_* for clarity")

from the ath tree and commit:

  51731792a25c ("net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels")

from the mhi tree.

I've pushed the resolution here for reference:
https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git/commit/?h=mhi-ath-resolution&id=a1cf17be3ba3718f1a8c70e614f4c0ee026a90fd

Please let Linus know about this conflict incase the ath tree gets merged first.
I believe ath maintainer will let the netdev maintainers know about this
conflict for the case of mhi getting merged first.

NOTE: Commit 51731792a25c has changes across netdev and accel drivers with Acks
from the respective maintainers.

----------------------------------------------------------------
MHI Host
--------

- Add support for loading dual ELF image format firmware to Qcom Trust
  Management Engine Lit (TME-L) supported devices like QCC2072, which require
  separate ELF header for SBL and WLAN firmware segments in a single firmware.

- Remove the MHI auto_queue feature support. This feature was added to offload
  the queuing of buffers from the client drivers to the MHI stack, but it caused
  a lot of race over the time. So remove this feature from the QRTR client
  driver and also from the MHI stack/controller drivers.

- Move the .probe() and .remove() callbacks from driver level to bus level.

MHI Endpoint
------------

- Move the .probe() and .remove() callbacks from driver level to bus level.

----------------------------------------------------------------
Manivannan Sadhasivam (2):
      net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels
      bus: mhi: host: Drop the auto_queue support

Qiang Yu (1):
      mhi: host: Add support for loading dual ELF image format

Uwe Kleine-König (2):
      bus: mhi: host: Use bus callbacks for .probe() and .remove()
      bus: mhi: ep: Use bus callbacks for .probe() and .remove()

 drivers/accel/qaic/mhi_controller.c   | 44 --------------------------------------------
 drivers/bus/mhi/ep/main.c             | 12 +++++-------
 drivers/bus/mhi/host/boot.c           | 10 ++++++++++
 drivers/bus/mhi/host/init.c           | 22 +++++-----------------
 drivers/bus/mhi/host/internal.h       |  3 ---
 drivers/bus/mhi/host/main.c           | 81 ++-------------------------------------------------------------------------------
 drivers/bus/mhi/host/pci_generic.c    | 20 ++------------------
 drivers/net/wireless/ath/ath11k/mhi.c |  4 ----
 drivers/net/wireless/ath/ath12k/mhi.c |  4 ----
 include/linux/mhi.h                   | 14 --------------
 net/qrtr/mhi.c                        | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 11 files changed, 82 insertions(+), 201 deletions(-)

-- 
மணிவண்ணன் சதாசிவம்

Re: [GIT PULL] MHI changes for v6.20

[Greg KH]

On Tue, Jan 20, 2026 at 02:48:34PM +0530, Manivannan Sadhasivam wrote:
> The following changes since commit 8f0b4cce4481fb22653697cced8d0d04027cb1e8:
> 
>   Linux 6.19-rc1 (2025-12-14 16:05:07 +1200)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git tags/mhi-for-v6.20
> 
> for you to fetch changes up to 91a0b0dce350766675961892ba4431363c4e29f7:
> 
>   bus: mhi: ep: Use bus callbacks for .probe() and .remove() (2025-12-31 16:27:13 +0530)
> 
> There is a minor conflict between mhi and ath trees in
> drivers/net/wireless/ath/ath12k/mhi.c file:
> 
> between commits:
> 
>   7f54938fc525 ("wifi: ath12k: Move Wi-Fi 7 MHI configuration to dedicated file")
>   a72027045263 ("wifi: ath12k: Modularize driver into common and Wi-Fi 7 specific components")
>   bce3b73d1ca7 ("wifi: ath12k: Rename ath12k_* symbols to ath12k_wifi7_* for clarity")
> 
> from the ath tree and commit:
> 
>   51731792a25c ("net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels")
> 
> from the mhi tree.
> 
> I've pushed the resolution here for reference:
> https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git/commit/?h=mhi-ath-resolution&id=a1cf17be3ba3718f1a8c70e614f4c0ee026a90fd
> 
> Please let Linus know about this conflict incase the ath tree gets merged first.
> I believe ath maintainer will let the netdev maintainers know about this
> conflict for the case of mhi getting merged first.

I'll try to remember, that's many weeks in the future :)

Now pulled and pushed out, thanks.

greg k-h