From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:37152 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933384AbcBQKBM (ORCPT ); Wed, 17 Feb 2016 05:01:12 -0500 Message-ID: <1455703312.31169.163.camel@linux.intel.com> Subject: Re: FAILED: patch "[PATCH] spi: dw: explicitly free IRQ handler in dw_spi_remove_host()" failed to apply to 4.3-stable tree From: Andy Shevchenko To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org Date: Wed, 17 Feb 2016 12:01:52 +0200 In-Reply-To: <145540187711557@kroah.com> References: <145540187711557@kroah.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: On Sat, 2016-02-13 at 14:17 -0800, gregkh@linuxfoundation.org wrote: > The patch below does not apply to the 4.3-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git > commit > id to . Yes, because the next patch in the series had been applied before this one. Thus, to apply this cleanly we have to apply the commit 1cc3f141f0cb5a822cdef30fb1d92ae6f4176bfa ("spi: dw: introduce spi_shutdown_chip()") first. Sorry for this. > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From 02f20387e1bca550639c37b1945f20cd32ddfcce Mon Sep 17 00:00:00 > 2001 > From: Andy Shevchenko > Date: Tue, 20 Oct 2015 12:11:40 +0300 > Subject: [PATCH] spi: dw: explicitly free IRQ handler in > dw_spi_remove_host() > > The following warning occurs when DW SPI is compiled as a module and > it's a PCI > device. On the removal stage pcibios_free_irq() is called earlier > than > free_irq() due to the latter is called at managed resources free > strage. > > ------------[ cut here ]------------ > WARNING: CPU: 1 PID: 1003 at > /home/andy/prj/linux/fs/proc/generic.c:575 > remove_proc_entry+0x118/0x150() > remove_proc_entry: removing non-empty directory 'irq/38', leaking at > least 'dw_spi1' > Modules linked in: spi_dw_midpci(-) spi_dw [last unloaded: > dw_dmac_core] > CPU: 1 PID: 1003 Comm: modprobe Not tainted 4.3.0-rc5-next-20151013+ > #32 >  00000000 00000000 f5535d70 c12dc220 f5535db0 f5535da0 c104e912 > c198a6bc >  f5535dcc 000003eb c198a638 0000023f c11b4098 c11b4098 f54f1ec8 > f54f1ea0 >  f642ba20 f5535db8 c104e96e 00000009 f5535db0 c198a6bc f5535dcc > f5535df0 > Call Trace: >  [] dump_stack+0x41/0x61 >  [] warn_slowpath_common+0x82/0xb0 >  [] ? remove_proc_entry+0x118/0x150 >  [] ? remove_proc_entry+0x118/0x150 >  [] warn_slowpath_fmt+0x2e/0x30 >  [] remove_proc_entry+0x118/0x150 >  [] unregister_irq_proc+0xaa/0xc0 >  [] free_desc+0x1e/0x60 >  [] irq_free_descs+0x32/0x70 >  [] irq_domain_free_irqs+0x120/0x150 >  [] mp_unmap_irq+0x5c/0x60 >  [] intel_mid_pci_irq_disable+0x20/0x40 >  [] pcibios_free_irq+0xf/0x20 >  [] pci_device_remove+0x52/0xb0 >  [] __device_release_driver+0x77/0x100 >  [] driver_detach+0x87/0x90 >  [] bus_remove_driver+0x4a/0xc0 >  [] ? selinux_capable+0xd/0x10 >  [] driver_unregister+0x23/0x60 >  [] ? find_module_all+0x5a/0x80 >  [] pci_unregister_driver+0x13/0x60 >  [] dw_spi_driver_exit+0xd/0xf [spi_dw_midpci] >  [] SyS_delete_module+0x17a/0x210 > > Explicitly call free_irq() at removal stage of the DW SPI driver. > > Fixes: 04f421e7b0b1 (spi: dw: use managed resources) > Cc: stable@vger.kernel.org > Signed-off-by: Andy Shevchenko > Signed-off-by: Mark Brown > > diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c > index a730c353d3bf..221ff97557a3 100644 > --- a/drivers/spi/spi-dw.c > +++ b/drivers/spi/spi-dw.c > @@ -486,8 +486,7 @@ int dw_spi_add_host(struct device *dev, struct > dw_spi *dws) >   dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); >   snprintf(dws->name, sizeof(dws->name), "dw_spi%d", dws- > >bus_num); >   > - ret = devm_request_irq(dev, dws->irq, dw_spi_irq, > IRQF_SHARED, > - dws->name, master); > + ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, dws- > >name, master); >   if (ret < 0) { >   dev_err(dev, "can not get IRQ\n"); >   goto err_free_master; > @@ -532,6 +531,7 @@ err_dma_exit: >   if (dws->dma_ops && dws->dma_ops->dma_exit) >   dws->dma_ops->dma_exit(dws); >   spi_enable_chip(dws, 0); > + free_irq(dws->irq, master); >  err_free_master: >   spi_master_put(master); >   return ret; > @@ -548,6 +548,8 @@ void dw_spi_remove_host(struct dw_spi *dws) >   dws->dma_ops->dma_exit(dws); >   >   spi_shutdown_chip(dws); > + > + free_irq(dws->irq, dws->master); >  } >  EXPORT_SYMBOL_GPL(dw_spi_remove_host); >   > -- Andy Shevchenko Intel Finland Oy