From: Greg Kroah-Hartman Date: Sat, 23 Sep 2023 08:32:47 +0000 (+0200) Subject: drop queue-4.19/pci-dwc-provide-deinit-callback-for-i.mx.patch X-Git-Tag: v4.14.326~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=641c3c0e6220b7587324ff7ded98d6e64893d726;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/pci-dwc-provide-deinit-callback-for-i.mx.patch --- diff --git a/queue-4.19/pci-dwc-provide-deinit-callback-for-i.mx.patch b/queue-4.19/pci-dwc-provide-deinit-callback-for-i.mx.patch deleted file mode 100644 index 218f63902c7..00000000000 --- a/queue-4.19/pci-dwc-provide-deinit-callback-for-i.mx.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b0804ed8ae17af82157d0a4dec0592bc2dd26de9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 31 Jul 2023 12:55:01 +0100 -Subject: PCI: dwc: Provide deinit callback for i.MX - -From: Mark Brown - -[ Upstream commit fc8b24c28bec19fc0621d108b9ee81ddfdedb25a ] - -The i.MX integration for the DesignWare PCI controller has a _host_exit() -operation which undoes everything that the _host_init() operation does but -does not wire this up as the host_deinit callback for the core, or call it -in any path other than suspend. This means that if we ever unwind the -initial probe of the device, for example because it fails, the regulator -core complains that the regulators for the device were left enabled: - -imx6q-pcie 33800000.pcie: iATU: unroll T, 4 ob, 4 ib, align 64K, limit 16G -imx6q-pcie 33800000.pcie: Phy link never came up -imx6q-pcie 33800000.pcie: Phy link never came up -imx6q-pcie: probe of 33800000.pcie failed with error -110 -------------[ cut here ]------------ -WARNING: CPU: 2 PID: 46 at drivers/regulator/core.c:2396 _regulator_put+0x110/0x128 - -Wire up the callback so that the core can clean up after itself. - -Link: https://lore.kernel.org/r/20230731-pci-imx-regulator-cleanup-v2-1-fc8fa5c9893d@kernel.org -Tested-by: Fabio Estevam -Signed-off-by: Mark Brown -Signed-off-by: Lorenzo Pieralisi -Reviewed-by: Richard Zhu -Acked-by: Manivannan Sadhasivam -Signed-off-by: Sasha Levin ---- - drivers/pci/controller/dwc/pci-imx6.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c -index 3b2ceb5667289..c949d11f95507 100644 ---- a/drivers/pci/controller/dwc/pci-imx6.c -+++ b/drivers/pci/controller/dwc/pci-imx6.c -@@ -642,6 +642,7 @@ static int imx6_pcie_host_init(struct pcie_port *pp) - - static const struct dw_pcie_host_ops imx6_pcie_host_ops = { - .host_init = imx6_pcie_host_init, -+ .host_deinit = imx6_pcie_host_exit, - }; - - static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie, --- -2.40.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 04231a9283d..f10a26b5c47 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -249,7 +249,6 @@ md-raid1-fix-potential-oob-in-raid1_remove_disk.patch ext2-fix-datatype-of-block-number-in-ext2_xattr_set2.patch fs-jfs-prevent-double-free-in-dbunmount-after-failed.patch jfs-fix-invalid-free-of-jfs_ip-ipimap-i_imap-in-diun.patch -pci-dwc-provide-deinit-callback-for-i.mx.patch powerpc-pseries-fix-possible-memory-leak-in-ibmebus_.patch media-dvb-usb-v2-af9035-fix-null-ptr-deref-in-af9035.patch media-dw2102-fix-null-ptr-deref-in-dw2102_i2c_transf.patch