drop queue-6.6/scsi-ufs-qcom-only-free-platform-msis-when-esi-is-enabled.patch

diff --git a/queue-6.6/scsi-ufs-qcom-only-free-platform-msis-when-esi-is-enabled.patch b/queue-6.6/scsi-ufs-qcom-only-free-platform-msis-when-esi-is-enabled.patch
deleted file mode 100644 (file)
index 665621f..0000000
--- a/queue-6.6/scsi-ufs-qcom-only-free-platform-msis-when-esi-is-enabled.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 64506b3d23a337e98a74b18dcb10c8619365f2bd Mon Sep 17 00:00:00 2001
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Date: Mon, 11 Nov 2024 23:18:31 +0530
-Subject: scsi: ufs: qcom: Only free platform MSIs when ESI is enabled
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-commit 64506b3d23a337e98a74b18dcb10c8619365f2bd upstream.
-
-Otherwise, it will result in a NULL pointer dereference as below:
-
-Unable to handle kernel NULL pointer dereference at virtual address 0000000000000008
-Call trace:
- mutex_lock+0xc/0x54
- platform_device_msi_free_irqs_all+0x14/0x20
- ufs_qcom_remove+0x34/0x48 [ufs_qcom]
- platform_remove+0x28/0x44
- device_remove+0x4c/0x80
- device_release_driver_internal+0xd8/0x178
- driver_detach+0x50/0x9c
- bus_remove_driver+0x6c/0xbc
- driver_unregister+0x30/0x60
- platform_driver_unregister+0x14/0x20
- ufs_qcom_pltform_exit+0x18/0xb94 [ufs_qcom]
- __arm64_sys_delete_module+0x180/0x260
- invoke_syscall+0x44/0x100
- el0_svc_common.constprop.0+0xc0/0xe0
- do_el0_svc+0x1c/0x28
- el0_svc+0x34/0xdc
- el0t_64_sync_handler+0xc0/0xc4
- el0t_64_sync+0x190/0x194
-
-Cc: stable@vger.kernel.org # 6.3
-Fixes: 519b6274a777 ("scsi: ufs: qcom: Add MCQ ESI config vendor specific ops")
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20241111-ufs_bug_fix-v1-2-45ad8b62f02e@linaro.org
-Reviewed-by: Bean Huo <beanhuo@micron.com>
-Reviewed-by: Bart Van Assche <bvanassche@acm.org>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/ufs/host/ufs-qcom.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/ufs/host/ufs-qcom.c
-+++ b/drivers/ufs/host/ufs-qcom.c
-@@ -1926,7 +1926,8 @@ static int ufs_qcom_remove(struct platfo
- 
-       pm_runtime_get_sync(&(pdev)->dev);
-       ufshcd_remove(hba);
--      platform_msi_domain_free_irqs(hba->dev);
-+      if (host->esi_enabled)
-+              platform_msi_domain_free_irqs(hba->dev);
-       return 0;
- }
- 

diff --git a/queue-6.6/series b/queue-6.6/series
index 11c41445f167f2e42396ab5e5f47abcd30b702fa..4c5fb864827b2fc37745c372dde35dde92d92058 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -313,7 +313,6 @@ serial-8250_dw-add-sophgo-sg2044-quirk.patch
 smb-client-don-t-try-following-dfs-links-in-cifs_tre.patch
 setlocalversion-work-around-git-describe-performance.patch
 io_uring-tctx-work-around-xa_store-allocation-error-.patch
-scsi-ufs-qcom-only-free-platform-msis-when-esi-is-enabled.patch
 sched-numa-fix-mm-numa_scan_seq-based-unconditional-.patch
 sched-numa-fix-memory-leak-due-to-the-overwritten-vm.patch
 mempolicy-fix-migrate_pages-2-syscall-return-nr_fail.patch