From nobody Tue Oct 7 01:58:29 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 67CE52E62D1; Tue, 15 Jul 2025 13:26:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752585981; cv=pass; b=Euvg4j7DqYAPhdEogYOHhTsetrkc+pfpnH4qXQU6DjCM7m9toKrL0D4ytiD3/t9XkBv9/R4qIBLYpPV7LlK/6Ol6iZDoI8iBas53ZfvDsmvsnJ8sBXXGeAL8Vmf5+NzW7SBsWOU6ddWMAc3E1kJaH0qWGs/CgXniRVOoCegXaNs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752585981; c=relaxed/simple; bh=lNP6j8FAExuphUY2GnzZpWUe4N42y+ooQuD66rTkNp4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ls2G9orbX0WHj5ANO4pF2UpHGc9DZvFJV1mDDxexmzHyyb3vvQfT6uhtVyAXdGwHhNZwg2pulNbqGmSa8AQLV7vCqkA37W/KHMcHVjU/m/zK1fH2OpTOUSQ1VV2WSUvhjb+0AZ/X7Yb1JydVktgYJb6esJDi4yCFqIAkzFDDl94= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=usama.anjum@collabora.com header.b=ErFFBia0; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=usama.anjum@collabora.com header.b="ErFFBia0" ARC-Seal: i=1; a=rsa-sha256; t=1752585921; cv=none; d=zohomail.com; s=zohoarc; b=T8d1pYrJdNmc7qeRah1Vnv7ySI5qe/c18r/1wuGBC3I8CIt06rFAbeIx9xd/lN2w5k52ZSlEGhaPdjbDn5h9q/Im6tlH0IvuCKKQYWo6mOfetduUarlX0ZaEptg2GF8tGayqoVVcRUlRugqnpcY8FMBXNjzHo3duaz/BXQzGTzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752585921; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=g+nNKePYIp7l9bMZn9BgWi+OVDW4AE/CYs/TEIn87ls=; b=Qcbb8GQ31Tj3nCZGPdbPYAJ1sACnEmyN5h2Q3PC0a2dYUb0oe2mK1kc88rbg05JeMrqzU1fg5+nQuKroUJ9IS1x0Emw4mS6zmXQeIINwOtDfh/26bbqv5fJjdQHr/vGg0nElHUJ73x43ZtNDE1lywIf4vldo2fj4myYS0ScZffE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752585921; s=zohomail; d=collabora.com; i=usama.anjum@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=g+nNKePYIp7l9bMZn9BgWi+OVDW4AE/CYs/TEIn87ls=; b=ErFFBia02nSQ9C2h/hlNUzlPl89J+vXJEUjgW6D/k0Tgq2YDgdWM+WFw1/ouk4f/ T+3ZKSdUV/Gv5m4S6+Ozcn9wC7XuBkqm06/WBNCVKgphHFg4f8Wbbc4lBRdiJyU/e1i 6f9cuqFqRu6sB72o/0eLKqiJd6nCBAR36cu61h7w= Received: by mx.zohomail.com with SMTPS id 1752585918863968.9690914142641; Tue, 15 Jul 2025 06:25:18 -0700 (PDT) From: Muhammad Usama Anjum To: Manivannan Sadhasivam , Jeff Hugo , Muhammad Usama Anjum , Youssef Samir , Matthew Leung , Alexander Wilhelm , Kunwu Chan , Krishna Chaitanya Chundru , Jacek Lawrynowicz , Yan Zhen , Sujeev Dias , Greg Kroah-Hartman , Siddartha Mohanadoss , mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, stable@vger.kernel.org Subject: [PATCH v2 1/3] bus: mhi: host: keep bhi buffer through suspend cycle Date: Tue, 15 Jul 2025 18:25:07 +0500 Message-Id: <20250715132509.2643305-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250715132509.2643305-1-usama.anjum@collabora.com> References: <20250715132509.2643305-1-usama.anjum@collabora.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-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" When there is memory pressure, at resume time dma_alloc_coherent() returns error which in turn fails the loading of firmware and hence the driver crashes: kernel: kworker/u33:5: page allocation failure: order:7, mode:0xc04(GFP_NOIO|GFP_DMA32), nodemask=3D(null),cpuset=3D/,mems_allowed= =3D0 kernel: CPU: 1 UID: 0 PID: 7693 Comm: kworker/u33:5 Not tainted 6.11.11-val= ve17-1-neptune-611-g027868a0ac03 #1 3843143b92e9da0fa2d3d5f21f51beaed15c7d59 kernel: Hardware name: Valve Galileo/Galileo, BIOS F7G0112 08/01/2024 kernel: Workqueue: mhi_hiprio_wq mhi_pm_st_worker [mhi] kernel: Call Trace: kernel: kernel: dump_stack_lvl+0x4e/0x70 kernel: warn_alloc+0x164/0x190 kernel: ? srso_return_thunk+0x5/0x5f kernel: ? __alloc_pages_direct_compact+0xaf/0x360 kernel: __alloc_pages_slowpath.constprop.0+0xc75/0xd70 kernel: __alloc_pages_noprof+0x321/0x350 kernel: __dma_direct_alloc_pages.isra.0+0x14a/0x290 kernel: dma_direct_alloc+0x70/0x270 kernel: mhi_fw_load_handler+0x126/0x340 [mhi a96cb91daba500cc77f86bad60c1f= 332dc3babdf] kernel: mhi_pm_st_worker+0x5e8/0xac0 [mhi a96cb91daba500cc77f86bad60c1f332= dc3babdf] kernel: ? srso_return_thunk+0x5/0x5f kernel: process_one_work+0x17e/0x330 kernel: worker_thread+0x2ce/0x3f0 kernel: ? __pfx_worker_thread+0x10/0x10 kernel: kthread+0xd2/0x100 kernel: ? __pfx_kthread+0x10/0x10 kernel: ret_from_fork+0x34/0x50 kernel: ? __pfx_kthread+0x10/0x10 kernel: ret_from_fork_asm+0x1a/0x30 kernel: kernel: Mem-Info: kernel: active_anon:513809 inactive_anon:152 isolated_anon:0 active_file:359315 inactive_file:2487001 isolated_file:0 unevictable:637 dirty:19 writeback:0 slab_reclaimable:160391 slab_unreclaimable:39729 mapped:175836 shmem:51039 pagetables:4415 sec_pagetables:0 bounce:0 kernel_misc_reclaimable:0 free:125666 free_pcp:0 free_cma:0 In above example, if we sum all the consumed memory, it comes out to be 15.5GB and free memory is ~ 500MB from a total of 16GB RAM. Even though memory is present. But all of the dma memory has been exhausted or fragmented. Fix it by allocating it only once and then reuse the same allocated memory. As we'll allocate this memory only once, this memory will stay allocated. Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03926.13-QCAHSPSWPL_V2_SILICONZ_C= E-2.52297.6 Fixes: cd457afb1667 ("bus: mhi: core: Add support for downloading firmware = over BHIe") Cc: stable@vger.kernel.org Cc: Krishna Chaitanya Chundru Signed-off-by: Muhammad Usama Anjum --- Reported here: https://lore.kernel.org/all/ead32f5b-730a-4b81-b38f-93d822f990c6@collabora.= com Still a lot of more fixes are required. Hence, I'm not adding closes tag. Changes since v1: - fix mhi_load_image_bhi() - Cc stable and fix tested on tag --- drivers/bus/mhi/host/boot.c | 25 +++++++++++++++---------- drivers/bus/mhi/host/init.c | 5 +++++ drivers/bus/mhi/host/internal.h | 2 ++ include/linux/mhi.h | 1 + 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/bus/mhi/host/boot.c b/drivers/bus/mhi/host/boot.c index b3a85aa3c4768..9fc983bc12d49 100644 --- a/drivers/bus/mhi/host/boot.c +++ b/drivers/bus/mhi/host/boot.c @@ -302,8 +302,8 @@ static int mhi_fw_load_bhi(struct mhi_controller *mhi_c= ntrl, return -EIO; } =20 -static void mhi_free_bhi_buffer(struct mhi_controller *mhi_cntrl, - struct image_info *image_info) +void mhi_free_bhi_buffer(struct mhi_controller *mhi_cntrl, + struct image_info *image_info) { struct mhi_buf *mhi_buf =3D image_info->mhi_buf; =20 @@ -455,18 +455,23 @@ static enum mhi_fw_load_type mhi_fw_load_type_get(con= st struct mhi_controller *m =20 static int mhi_load_image_bhi(struct mhi_controller *mhi_cntrl, const u8 *= fw_data, size_t size) { - struct image_info *image; + struct image_info **image =3D &mhi_cntrl->bhi_image; int ret; =20 - ret =3D mhi_alloc_bhi_buffer(mhi_cntrl, &image, size); - if (ret) - return ret; + if (!(*image)) { + ret =3D mhi_alloc_bhi_buffer(mhi_cntrl, image, size); + if (ret) + return ret; =20 - /* Load the firmware into BHI vec table */ - memcpy(image->mhi_buf->buf, fw_data, size); + /* Load the firmware into BHI vec table */ + memcpy((*image)->mhi_buf->buf, fw_data, size); + } =20 - ret =3D mhi_fw_load_bhi(mhi_cntrl, &image->mhi_buf[image->entries - 1]); - mhi_free_bhi_buffer(mhi_cntrl, image); + ret =3D mhi_fw_load_bhi(mhi_cntrl, &(*image)->mhi_buf[(*image)->entries -= 1]); + if (ret) { + mhi_free_bhi_buffer(mhi_cntrl, *image); + *image =3D NULL; + } =20 return ret; } diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c index 6e06e4efec765..2e0f18c939e68 100644 --- a/drivers/bus/mhi/host/init.c +++ b/drivers/bus/mhi/host/init.c @@ -1228,6 +1228,11 @@ void mhi_unprepare_after_power_down(struct mhi_contr= oller *mhi_cntrl) mhi_cntrl->rddm_image =3D NULL; } =20 + if (mhi_cntrl->bhi_image) { + mhi_free_bhi_buffer(mhi_cntrl, mhi_cntrl->bhi_image); + mhi_cntrl->bhi_image =3D NULL; + } + mhi_deinit_dev_ctxt(mhi_cntrl); } EXPORT_SYMBOL_GPL(mhi_unprepare_after_power_down); diff --git a/drivers/bus/mhi/host/internal.h b/drivers/bus/mhi/host/interna= l.h index 1054e67bb450d..60b0699323375 100644 --- a/drivers/bus/mhi/host/internal.h +++ b/drivers/bus/mhi/host/internal.h @@ -324,6 +324,8 @@ int mhi_alloc_bhie_table(struct mhi_controller *mhi_cnt= rl, struct image_info **image_info, size_t alloc_size); void mhi_free_bhie_table(struct mhi_controller *mhi_cntrl, struct image_info *image_info); +void mhi_free_bhi_buffer(struct mhi_controller *mhi_cntrl, + struct image_info *image_info); =20 /* Power management APIs */ enum mhi_pm_state __must_check mhi_tryset_pm_state( diff --git a/include/linux/mhi.h b/include/linux/mhi.h index 4c567907933a5..593012f779d97 100644 --- a/include/linux/mhi.h +++ b/include/linux/mhi.h @@ -391,6 +391,7 @@ struct mhi_controller { size_t reg_len; struct image_info *fbc_image; struct image_info *rddm_image; + struct image_info *bhi_image; struct mhi_chan *mhi_chan; struct list_head lpm_chans; int *irq; --=20 2.39.5 From nobody Tue Oct 7 01:58:29 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 67C762E62D0; Tue, 15 Jul 2025 13:26:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752585980; cv=pass; b=NYkI0pJD6yZU9mLNWjRnAFda1x4Q6dyowWdcv3iWj4K9I+TUjolR/gLSAZlS8bPOtVfJ9EKksBgz66sxk1RRmr+beJcWn6a8aGgkCXzsAaIMxjXFhnwhQOEi7DEnI5FwThoD8wDdBrWfapOsIeVW8RncFSVDFBsZ2pU1kza7mQc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752585980; c=relaxed/simple; bh=M8j7JAndjW76gZkMNx9GjJJXm+NYfmI5q0z6lnV/IuI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ClFjXx4hpQrT9+UV97h9592MyPhD8R6G2rUSV+SZ2l6Jt3ztH63QwSdosqp2687QR2ziEPVN7SF+a7Vp+N2XKK3vJZRtjHqq5rzq2YFT+6wP4tPs5NNAd/B8iuNwoKKwbsiZdHWtbJpO5SJb07G/CedusUWrEUgdq/Ip8zSbxL0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=usama.anjum@collabora.com header.b=OgQCcXgz; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=usama.anjum@collabora.com header.b="OgQCcXgz" ARC-Seal: i=1; a=rsa-sha256; t=1752585926; cv=none; d=zohomail.com; s=zohoarc; b=ZdQxCDeWOHLEFuTlFqIixHgGjtzZ3Z9TLntiH3HWyPuPUbOhtv4uI5u+RDYgCEMMreis9h/DZWtZugtu1P2nhtmSrjbXgZVAaM4GJaWSir32zUpgxKmYrMqh2FClXXaYdm6cHqK92kkc4VojsYLAib6GvzTn/mTyRTYYcx7JeZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752585926; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=yOrcLOG6tjcTjNDL4YHJ2yUTrv14txmB+F3Ap51joxo=; b=PCUDKkJMbeHOvJw34GnomgTc4I8mySfgqK1EY6Tgf/ijFgRhapFs92BDJEjz4NEphtHSIcio8vUx0WxUFrzPE0E5Lc4+5JNiRqTtMsG13qElqoHPjPtZblHYOR7nhLD11466cYS+gXHCRJIiYN/FJdgnKOtUihvha315RRvMQvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752585926; s=zohomail; d=collabora.com; i=usama.anjum@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=yOrcLOG6tjcTjNDL4YHJ2yUTrv14txmB+F3Ap51joxo=; b=OgQCcXgzCF37pcPDWJSJ2V3IqI7BfXU55+a6qazyknVajfRCbWZ+s6zocxnF3o6U 8zOwgTVGkGZrEvU+Kvim4P4FEsQoK+JNJ1NnxmvIL/Oey8d2eDqY5tWk9Qp8qrGtAYl Hd/PUDbkG7d6zm5F+BU7c1ZA3HUmHoHQnzhJx8nY= Received: by mx.zohomail.com with SMTPS id 1752585925284460.38188208462543; Tue, 15 Jul 2025 06:25:25 -0700 (PDT) From: Muhammad Usama Anjum To: Manivannan Sadhasivam , Jeff Hugo , Muhammad Usama Anjum , Youssef Samir , Matthew Leung , Alexander Wilhelm , Kunwu Chan , Krishna Chaitanya Chundru , Jacek Lawrynowicz , Yan Zhen , Sujeev Dias , Greg Kroah-Hartman , Siddartha Mohanadoss , mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, stable@vger.kernel.org Subject: [PATCH v2 2/3] bus: mhi: host: keep bhie buffer through suspend cycle Date: Tue, 15 Jul 2025 18:25:08 +0500 Message-Id: <20250715132509.2643305-3-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250715132509.2643305-1-usama.anjum@collabora.com> References: <20250715132509.2643305-1-usama.anjum@collabora.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-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" When there is memory pressure, at resume time dma_alloc_coherent() returns error which in turn fails the loading of the firmware and hence the driver crashes. Fix it by allocating only once and then reuse the same allocated memory. As we'll allocate this memory only once, this memory will stays allocated. Fixes: f88f1d0998ea ("bus: mhi: host: Add a policy to enable image transfer= via BHIe in PBL") Cc: Krishna Chaitanya Chundru Cc: stable@vger.kernel.org Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - Added in v2 --- drivers/bus/mhi/host/boot.c | 19 ++++++++++++------- drivers/bus/mhi/host/init.c | 5 +++++ include/linux/mhi.h | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/bus/mhi/host/boot.c b/drivers/bus/mhi/host/boot.c index 9fc983bc12d49..9f35ce9d670e7 100644 --- a/drivers/bus/mhi/host/boot.c +++ b/drivers/bus/mhi/host/boot.c @@ -478,17 +478,22 @@ static int mhi_load_image_bhi(struct mhi_controller *= mhi_cntrl, const u8 *fw_dat =20 static int mhi_load_image_bhie(struct mhi_controller *mhi_cntrl, const u8 = *fw_data, size_t size) { - struct image_info *image; + struct image_info **image =3D &mhi_cntrl->bhie_image; int ret; =20 - ret =3D mhi_alloc_bhie_table(mhi_cntrl, &image, size); - if (ret) - return ret; + if (!(*image)) { + ret =3D mhi_alloc_bhie_table(mhi_cntrl, image, size); + if (ret) + return ret; =20 - mhi_firmware_copy_bhie(mhi_cntrl, fw_data, size, image); + mhi_firmware_copy_bhie(mhi_cntrl, fw_data, size, *image); + } =20 - ret =3D mhi_fw_load_bhie(mhi_cntrl, &image->mhi_buf[image->entries - 1]); - mhi_free_bhie_table(mhi_cntrl, image); + ret =3D mhi_fw_load_bhie(mhi_cntrl, &(*image)->mhi_buf[(*image)->entries = - 1]); + if (ret) { + mhi_free_bhie_table(mhi_cntrl, *image); + *image =3D NULL; + } =20 return ret; } diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c index 2e0f18c939e68..46ed0ae2ac285 100644 --- a/drivers/bus/mhi/host/init.c +++ b/drivers/bus/mhi/host/init.c @@ -1228,6 +1228,11 @@ void mhi_unprepare_after_power_down(struct mhi_contr= oller *mhi_cntrl) mhi_cntrl->rddm_image =3D NULL; } =20 + if (mhi_cntrl->bhie_image) { + mhi_free_bhie_table(mhi_cntrl, mhi_cntrl->bhie_image); + mhi_cntrl->bhie_image =3D NULL; + } + if (mhi_cntrl->bhi_image) { mhi_free_bhi_buffer(mhi_cntrl, mhi_cntrl->bhi_image); mhi_cntrl->bhi_image =3D NULL; diff --git a/include/linux/mhi.h b/include/linux/mhi.h index 593012f779d97..77986cd66fda3 100644 --- a/include/linux/mhi.h +++ b/include/linux/mhi.h @@ -391,6 +391,7 @@ struct mhi_controller { size_t reg_len; struct image_info *fbc_image; struct image_info *rddm_image; + struct image_info *bhie_image; struct image_info *bhi_image; struct mhi_chan *mhi_chan; struct list_head lpm_chans; --=20 2.39.5 From nobody Tue Oct 7 01:58:29 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 BEBD42E2F12; Tue, 15 Jul 2025 13:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752586038; cv=pass; b=Dx8ubmTLNHSSLNPfzctarrQBI53ZSnStkHoOBDBx8VcPm463pkvaAhykwlHeThmZDciieiCnMClYCD+/u1DK333OrP5iefW0a+Co2vMZoaeXDJl6OCBcsY02RRjb4itWGp38TuVbNqi66MWFR2TKYZIwL2NaGhfLurF9Px6jsEY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752586038; c=relaxed/simple; bh=nZ8L4CNPFWLdv3DnqHL3TaBlkT7ADo8ZfSs7NvwAMPY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OceNyGOl05LNVbQQvbVj5eFVnC2CiiJ+Za03jeXRKeGVzHfcablzcb4vjZYfWDhTVKF8wkQpQttQob+dkwl2D/lRwtd7JtCZVfW0U70GGVa0sbNTpikNuiZKq1MadyaWD3mpxR3mNrhvXyoWQ60GkIP3y9Ip3RvVRnMSD4BbFwk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=usama.anjum@collabora.com header.b=K2BGU8cB; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=usama.anjum@collabora.com header.b="K2BGU8cB" ARC-Seal: i=1; a=rsa-sha256; t=1752585934; cv=none; d=zohomail.com; s=zohoarc; b=iS8ydypJ5Ytea+qvuAIEasiV3zxEFaxKCuidthawyGncohprwE+IyNB7RvXvm2+00iqj2xIeQQT/mBiqdbi/UtwNxpNmKUxa/NcWp19/Qj7gM0d9BxTkO7y8NZixVv+Vre8lQ/bTPlF4i3W5wpNdvgLMqzKKELWtVYVnw52rIdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752585934; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=khWqCIhyOZuc5K6Or8KOBVZRXHfT5Uql8gBWeLi0Yps=; b=j3SrtF1361SUCcdQZ9ZraZxDLOnB2hbduI/8yP+1ryWIIUvUhTvbt6JEHIo4y6HGghGBUlXK4arXBDMR+ZW5n/y6zyDk9xUobsGaOlJ19moCu0CuCA3qfekMqeypx106ksmn/Ru+HR4+45pZYuG0FEtEUSFO3w10OWSX3cVO2KU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752585934; s=zohomail; d=collabora.com; i=usama.anjum@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=khWqCIhyOZuc5K6Or8KOBVZRXHfT5Uql8gBWeLi0Yps=; b=K2BGU8cBPn31wLpVvwj1Z4IFsUiSDA83EWM15n+b1C8kesw+QALaSdmpEDcWOQUU aPuF0fkD4fspDBCB/zXzND588GJsf6hNeLsV0WOIB9LwRa33S+e1jpQo8+pPTGjdKNz /ctWi6ynB9OQGpv9PYTSWDSPRZg+EYTB41F/vdic= Received: by mx.zohomail.com with SMTPS id 1752585931663919.1784462606722; Tue, 15 Jul 2025 06:25:31 -0700 (PDT) From: Muhammad Usama Anjum To: Manivannan Sadhasivam , Jeff Hugo , Muhammad Usama Anjum , Youssef Samir , Matthew Leung , Alexander Wilhelm , Kunwu Chan , Krishna Chaitanya Chundru , Jacek Lawrynowicz , Yan Zhen , Sujeev Dias , Greg Kroah-Hartman , Siddartha Mohanadoss , mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, stable@vger.kernel.org Subject: [PATCH v2 3/3] bus: mhi: keep device context through suspend cycles Date: Tue, 15 Jul 2025 18:25:09 +0500 Message-Id: <20250715132509.2643305-4-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250715132509.2643305-1-usama.anjum@collabora.com> References: <20250715132509.2643305-1-usama.anjum@collabora.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-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" Don't deinitialize the device context while going into suspend or hibernation cycles. Otherwise the resume may fail if at resume time, the memory pressure is high and no dma memory is available. At resume, only reset the read/write ring pointers as rings may have stale data. Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03926.13-QCAHSPSWPL_V2_SILICONZ_C= E-2.52297.6 Fixes: 3000f85b8f47 ("bus: mhi: core: Add support for basic PM operations") Cc: Krishna Chaitanya Chundru Cc: stable@vger.kernel.org Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - Cc stable and fix tested on tag - Add logic to reset rings at resume --- drivers/bus/mhi/host/init.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c index 46ed0ae2ac285..6513012311ce3 100644 --- a/drivers/bus/mhi/host/init.c +++ b/drivers/bus/mhi/host/init.c @@ -474,6 +474,24 @@ static int mhi_init_dev_ctxt(struct mhi_controller *mh= i_cntrl) return ret; } =20 +static void mhi_reset_dev_rings(struct mhi_controller *mhi_cntrl) +{ + struct mhi_event *mhi_event =3D mhi_cntrl->mhi_event; + struct mhi_cmd *mhi_cmd =3D mhi_cntrl->mhi_cmd; + struct mhi_ring *ring; + int i; + + for (i =3D 0; i < mhi_cntrl->total_ev_rings; i++, mhi_event++) { + ring =3D &mhi_event->ring; + ring->rp =3D ring->wp =3D ring->base; + } + + for (i =3D 0; i < NR_OF_CMD_RINGS; i++, mhi_cmd++) { + ring =3D &mhi_cmd->ring; + ring->rp =3D ring->wp =3D ring->base; + } +} + int mhi_init_mmio(struct mhi_controller *mhi_cntrl) { u32 val; @@ -1133,9 +1151,13 @@ int mhi_prepare_for_power_up(struct mhi_controller *= mhi_cntrl) =20 mutex_lock(&mhi_cntrl->pm_mutex); =20 - ret =3D mhi_init_dev_ctxt(mhi_cntrl); - if (ret) - goto error_dev_ctxt; + if (!mhi_cntrl->mhi_ctxt) { + ret =3D mhi_init_dev_ctxt(mhi_cntrl); + if (ret) + goto error_dev_ctxt; + } else { + mhi_reset_dev_rings(mhi_cntrl); + } =20 ret =3D mhi_read_reg(mhi_cntrl, mhi_cntrl->regs, BHIOFF, &bhi_off); if (ret) { @@ -1212,8 +1234,6 @@ void mhi_deinit_dev_ctxt(struct mhi_controller *mhi_c= ntrl) { mhi_cntrl->bhi =3D NULL; mhi_cntrl->bhie =3D NULL; - - __mhi_deinit_dev_ctxt(mhi_cntrl); } =20 void mhi_unprepare_after_power_down(struct mhi_controller *mhi_cntrl) @@ -1239,6 +1259,7 @@ void mhi_unprepare_after_power_down(struct mhi_contro= ller *mhi_cntrl) } =20 mhi_deinit_dev_ctxt(mhi_cntrl); + __mhi_deinit_dev_ctxt(mhi_cntrl); } EXPORT_SYMBOL_GPL(mhi_unprepare_after_power_down); =20 --=20 2.39.5