From nobody Mon Feb 9 15:09:19 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4E4732E266C; Thu, 18 Dec 2025 16:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766076709; cv=none; b=t7crKT2x1tzd5FYYisX1agj02TwVJa9Wfzy8B6tLh7C49NYu4+ahHGi08mIrm3o5quGIj/Ul5UtHgesifhZZv9eHRkOftEeJ7G935hi4QsQbasK7RtPC44+eBdmfh4K75Nu2Zzoo/4vIGTC5yfhmBj8bYLexFhgJ3igaw+aJvIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766076709; c=relaxed/simple; bh=Q/8GpnfrMmlE2LL5HbEze0rIAQlIeIt7hlwv5Pmh084=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dP9wuH2slp5SXoEOihmJ0ilrigVU06/heyD3xGEF7pMPzsCBqb11P+b6pdUShmeZwtfZNQaKphqNjWdKR6kLXyQZvxWuz5f8lGALeElikkFM/dPcqRz979pyh2ujqPEj67iA24tbkDPOnLMJAqgK4/wTDc2d9f57oyjV3ZMOT8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N0qN6hm1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N0qN6hm1" Received: by smtp.kernel.org (Postfix) with ESMTPS id 7F6EAC116C6; Thu, 18 Dec 2025 16:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766076708; bh=Q/8GpnfrMmlE2LL5HbEze0rIAQlIeIt7hlwv5Pmh084=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=N0qN6hm1RGtoVjHjBA5EV4109msEzFilC9TbhPOkhg9Jzdqs1G+JcfwlQ+e2kBx9C Gnfe8rYL7dMkmLnW5JNe7EFP8tMO/wFX2+BHXWC5kqa/g/jPlXgAlDR0T7ENmuhhTd xaJZrNzYSG/ZhnpU/I/hEvFeSdxerg0p5cBo3t+3xkp8qu6bEx8z62xiHmkkj0jVZc 1URpJ/BOATsROzK/GWPXnXYQJ1rpwQPikjlbZs57k1sdC16BCmDrd+qrypz4Nm2alh GXWzNYVJUWVStJkwH3EgC5fK/qPWpHJ2DnPJEoC/K/QD7JJuHCo1amsuha5wwn7Aow B654/jmZCED+A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70CAAD6E2B3; Thu, 18 Dec 2025 16:51:48 +0000 (UTC) From: Manivannan Sadhasivam via B4 Relay Date: Thu, 18 Dec 2025 22:21:45 +0530 Subject: [PATCH v2 2/2] bus: mhi: host: Drop the auto_queue support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251218-qrtr-fix-v2-2-c7499bfcfbe0@oss.qualcomm.com> References: <20251218-qrtr-fix-v2-0-c7499bfcfbe0@oss.qualcomm.com> In-Reply-To: <20251218-qrtr-fix-v2-0-c7499bfcfbe0@oss.qualcomm.com> To: Jeff Hugo , Carl Vanderlip , Oded Gabbay , Manivannan Sadhasivam , Jeff Johnson , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Greg Kroah-Hartman , Loic Poulain , Maxim Kochetkov Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, mhi@lists.linux.dev, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, netdev@vger.kernel.org, Bjorn Andersson , Johan Hovold , Chris Lew , Manivannan Sadhasivam X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=7811; i=manivannan.sadhasivam@oss.qualcomm.com; h=from:subject:message-id; bh=999FZ005VmQ50ugtoGwa60OjoIrDOfJs9J4slqZv21E=; b=owEBbQGS/pANAwAKAVWfEeb+kc71AcsmYgBpRDEiiTdzAY4ft40HzRS/ezsIRLSoNZ/RbJzA/ Z5McmZxO5eJATMEAAEKAB0WIQRnpUMqgUjL2KRYJ5dVnxHm/pHO9QUCaUQxIgAKCRBVnxHm/pHO 9a0UB/47xAE0KkVsOsPKTNJuunouZCvnWWk7FUl9ISg4FYtiwi1wGkGHjRbrzqY6JlbI4vqSNvb 1mJ3w1xwTz1jCDmkOTZRiTJG1CtAaOMPfq3UTtDIKmcDGgvHXAR1/hBoW5uHxc0Di20efsj6aFt Zw+zsLIOxAwW3V7Zlzw5Uwcz7Q0rT0T0IOs4tAO5MeBpddib2JG9qYSKC2rmeUM71YSk9kJXGJ3 mTJxu6kLeu1gbv+qbwEp+tAqc4W2zm+GW0rEi+HaLuavVkjsDuDDWt3IrNdSWGnqARAvHk2vfOp 8BfRqhXE4Mw4D6hQzkmrwOnUTVSOvYO+aj1GrIToOwVsn/NT X-Developer-Key: i=manivannan.sadhasivam@oss.qualcomm.com; a=openpgp; fpr=C668AEC3C3188E4C611465E7488550E901166008 X-Endpoint-Received: by B4 Relay for manivannan.sadhasivam@oss.qualcomm.com/default with auth_id=461 X-Original-From: Manivannan Sadhasivam Reply-To: manivannan.sadhasivam@oss.qualcomm.com From: Manivannan Sadhasivam Now that the only user of the 'auto_queue' feature, (QRTR) has been converted to manage the buffers on its own, drop the code related to it. Reviewed-by: Loic Poulain Signed-off-by: Manivannan Sadhasivam Reviewed-by: Jeff Hugo --- drivers/bus/mhi/host/init.c | 10 ----- drivers/bus/mhi/host/internal.h | 3 -- drivers/bus/mhi/host/main.c | 81 +------------------------------------= ---- include/linux/mhi.h | 14 ------- 4 files changed, 2 insertions(+), 106 deletions(-) diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c index 099be8dd1900..b020a6489c07 100644 --- a/drivers/bus/mhi/host/init.c +++ b/drivers/bus/mhi/host/init.c @@ -841,18 +841,8 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cnt= rl, mhi_chan->lpm_notify =3D ch_cfg->lpm_notify; mhi_chan->offload_ch =3D ch_cfg->offload_channel; mhi_chan->db_cfg.reset_req =3D ch_cfg->doorbell_mode_switch; - mhi_chan->pre_alloc =3D ch_cfg->auto_queue; mhi_chan->wake_capable =3D ch_cfg->wake_capable; =20 - /* - * If MHI host allocates buffers, then the channel direction - * should be DMA_FROM_DEVICE - */ - if (mhi_chan->pre_alloc && mhi_chan->dir !=3D DMA_FROM_DEVICE) { - dev_err(dev, "Invalid channel configuration\n"); - goto error_chan_cfg; - } - /* * Bi-directional and direction less channel must be an * offload channel diff --git a/drivers/bus/mhi/host/internal.h b/drivers/bus/mhi/host/interna= l.h index 7937bb1f742c..7b0ee5e3a12d 100644 --- a/drivers/bus/mhi/host/internal.h +++ b/drivers/bus/mhi/host/internal.h @@ -286,7 +286,6 @@ struct mhi_chan { bool lpm_notify; bool configured; bool offload_ch; - bool pre_alloc; bool wake_capable; }; =20 @@ -389,8 +388,6 @@ int mhi_rddm_prepare(struct mhi_controller *mhi_cntrl, struct image_info *img_info); void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl); =20 -/* Automatically allocate and queue inbound buffers */ -#define MHI_CH_INBOUND_ALLOC_BUFS BIT(0) int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan); void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl, diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c index 861551274319..53c0ffe30070 100644 --- a/drivers/bus/mhi/host/main.c +++ b/drivers/bus/mhi/host/main.c @@ -664,23 +664,6 @@ static int parse_xfer_event(struct mhi_controller *mhi= _cntrl, mhi_cntrl->runtime_put(mhi_cntrl); } =20 - /* - * Recycle the buffer if buffer is pre-allocated, - * if there is an error, not much we can do apart - * from dropping the packet - */ - if (mhi_chan->pre_alloc) { - if (mhi_queue_buf(mhi_chan->mhi_dev, - mhi_chan->dir, - buf_info->cb_buf, - buf_info->len, MHI_EOT)) { - dev_err(dev, - "Error recycling buffer for chan:%d\n", - mhi_chan->chan); - kfree(buf_info->cb_buf); - } - } - read_lock_bh(&mhi_chan->lock); } break; @@ -1177,17 +1160,12 @@ static int mhi_queue(struct mhi_device *mhi_dev, st= ruct mhi_buf_info *buf_info, int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir, struct sk_buff *skb, size_t len, enum mhi_flags mflags) { - struct mhi_chan *mhi_chan =3D (dir =3D=3D DMA_TO_DEVICE) ? mhi_dev->ul_ch= an : - mhi_dev->dl_chan; struct mhi_buf_info buf_info =3D { }; =20 buf_info.v_addr =3D skb->data; buf_info.cb_buf =3D skb; buf_info.len =3D len; =20 - if (unlikely(mhi_chan->pre_alloc)) - return -EINVAL; - return mhi_queue(mhi_dev, &buf_info, dir, mflags); } EXPORT_SYMBOL_GPL(mhi_queue_skb); @@ -1472,45 +1450,6 @@ static int mhi_prepare_channel(struct mhi_controller= *mhi_cntrl, if (ret) goto error_pm_state; =20 - if (mhi_chan->dir =3D=3D DMA_FROM_DEVICE) - mhi_chan->pre_alloc =3D !!(flags & MHI_CH_INBOUND_ALLOC_BUFS); - - /* Pre-allocate buffer for xfer ring */ - if (mhi_chan->pre_alloc) { - int nr_el =3D get_nr_avail_ring_elements(mhi_cntrl, - &mhi_chan->tre_ring); - size_t len =3D mhi_cntrl->buffer_len; - - while (nr_el--) { - void *buf; - struct mhi_buf_info info =3D { }; - - buf =3D kmalloc(len, GFP_KERNEL); - if (!buf) { - ret =3D -ENOMEM; - goto error_pre_alloc; - } - - /* Prepare transfer descriptors */ - info.v_addr =3D buf; - info.cb_buf =3D buf; - info.len =3D len; - ret =3D mhi_gen_tre(mhi_cntrl, mhi_chan, &info, MHI_EOT); - if (ret) { - kfree(buf); - goto error_pre_alloc; - } - } - - read_lock_bh(&mhi_cntrl->pm_lock); - if (MHI_DB_ACCESS_VALID(mhi_cntrl)) { - read_lock_irq(&mhi_chan->lock); - mhi_ring_chan_db(mhi_cntrl, mhi_chan); - read_unlock_irq(&mhi_chan->lock); - } - read_unlock_bh(&mhi_cntrl->pm_lock); - } - mutex_unlock(&mhi_chan->mutex); =20 return 0; @@ -1522,12 +1461,6 @@ static int mhi_prepare_channel(struct mhi_controller= *mhi_cntrl, error_init_chan: mutex_unlock(&mhi_chan->mutex); =20 - return ret; - -error_pre_alloc: - mutex_unlock(&mhi_chan->mutex); - mhi_unprepare_channel(mhi_cntrl, mhi_chan); - return ret; } =20 @@ -1600,12 +1533,8 @@ static void mhi_reset_data_chan(struct mhi_controlle= r *mhi_cntrl, mhi_del_ring_element(mhi_cntrl, buf_ring); mhi_del_ring_element(mhi_cntrl, tre_ring); =20 - if (mhi_chan->pre_alloc) { - kfree(buf_info->cb_buf); - } else { - result.buf_addr =3D buf_info->cb_buf; - mhi_chan->xfer_cb(mhi_chan->mhi_dev, &result); - } + result.buf_addr =3D buf_info->cb_buf; + mhi_chan->xfer_cb(mhi_chan->mhi_dev, &result); } } =20 @@ -1666,12 +1595,6 @@ int mhi_prepare_for_transfer(struct mhi_device *mhi_= dev) } EXPORT_SYMBOL_GPL(mhi_prepare_for_transfer); =20 -int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev) -{ - return __mhi_prepare_for_transfer(mhi_dev, MHI_CH_INBOUND_ALLOC_BUFS); -} -EXPORT_SYMBOL_GPL(mhi_prepare_for_transfer_autoqueue); - void mhi_unprepare_from_transfer(struct mhi_device *mhi_dev) { struct mhi_controller *mhi_cntrl =3D mhi_dev->mhi_cntrl; diff --git a/include/linux/mhi.h b/include/linux/mhi.h index dd372b0123a6..88ccb3e14f48 100644 --- a/include/linux/mhi.h +++ b/include/linux/mhi.h @@ -215,7 +215,6 @@ enum mhi_db_brst_mode { * @lpm_notify: The channel master requires low power mode notifications * @offload_channel: The client manages the channel completely * @doorbell_mode_switch: Channel switches to doorbell mode on M0 transiti= on - * @auto_queue: Framework will automatically queue buffers for DL traffic * @wake-capable: Channel capable of waking up the system */ struct mhi_channel_config { @@ -232,7 +231,6 @@ struct mhi_channel_config { bool lpm_notify; bool offload_channel; bool doorbell_mode_switch; - bool auto_queue; bool wake_capable; }; =20 @@ -743,18 +741,6 @@ void mhi_device_put(struct mhi_device *mhi_dev); */ int mhi_prepare_for_transfer(struct mhi_device *mhi_dev); =20 -/** - * mhi_prepare_for_transfer_autoqueue - Setup UL and DL channels with auto= queue - * buffers for DL traffic - * @mhi_dev: Device associated with the channels - * - * Allocate and initialize the channel context and also issue the START ch= annel - * command to both channels. Channels can be started only if both host and - * device execution environments match and channels are in a DISABLED stat= e. - * The MHI core will automatically allocate and queue buffers for the DL t= raffic. - */ -int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev); - /** * mhi_unprepare_from_transfer - Reset UL and DL channels for data transfe= r. * Issue the RESET channel command and let t= he --=20 2.48.1