From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754043AbdKMR07 (ORCPT ); Mon, 13 Nov 2017 12:26:59 -0500 Received: from lelnx194.ext.ti.com ([198.47.27.80]:19130 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753978AbdKMR0y (ORCPT ); Mon, 13 Nov 2017 12:26:54 -0500 From: "Karicheri, Muralidharan" To: Lorenzo Pieralisi , Johan Hovold CC: Bjorn Helgaas , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" , stable Subject: RE: [PATCH] PCI: keystone: fix interrupt-controller-node lookup Thread-Topic: [PATCH] PCI: keystone: fix interrupt-controller-node lookup Thread-Index: AQHTW7HS8LrfGgptgkOhF4jMAR9g/KMShZIAgAALk+A= Date: Mon, 13 Nov 2017 17:26:48 +0000 Message-ID: <02ce9c8c8e1e4f3ea18989cc515e8ff1@ti.com> References: <20171112122850.30804-1-johan@kernel.org> <20171113104306.GA27700@red-moon> In-Reply-To: <20171113104306.GA27700@red-moon> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [158.218.101.52] x-exclaimer-md-config: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id vADHR2SQ014442 -----Original Message----- From: Lorenzo Pieralisi [mailto:lorenzo.pieralisi@arm.com] Sent: Monday, November 13, 2017 5:43 AM To: Johan Hovold Cc: Karicheri, Muralidharan; Bjorn Helgaas; linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org; stable Subject: Re: [PATCH] PCI: keystone: fix interrupt-controller-node lookup Hi Johan, On Sun, Nov 12, 2017 at 01:28:50PM +0100, Johan Hovold wrote: > Fix child-node lookup during initialisation, which ended up searching > the whole device tree depth-first starting at the parent rather than > just matching on its children. > > To make things worse, the parent pci node was prematurely freed, while > the child interrupt-controller node was leaked. Thanks for fixing this. I would kindly ask you please to split the patch in two since there are two bugs you are fixing at once. Murali: please test/ack accordingly. Thanks! Acked-by: Murali Karicheri Thanks ! Lorenzo > Fixes: 0c4ffcfe1fbc ("PCI: keystone: Add TI Keystone PCIe driver") > Cc: stable # 3.18 > Cc: Murali Karicheri > --- > drivers/pci/dwc/pci-keystone.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/dwc/pci-keystone.c > b/drivers/pci/dwc/pci-keystone.c index 5bee3af47588..39405598b22d > 100644 > --- a/drivers/pci/dwc/pci-keystone.c > +++ b/drivers/pci/dwc/pci-keystone.c > @@ -178,7 +178,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, > } > > /* interrupt controller is in a child node */ > - *np_temp = of_find_node_by_name(np_pcie, controller); > + *np_temp = of_get_child_by_name(np_pcie, controller); > if (!(*np_temp)) { > dev_err(dev, "Node for %s is absent\n", controller); > return -EINVAL; > @@ -187,6 +187,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, > temp = of_irq_count(*np_temp); > if (!temp) { > dev_err(dev, "No IRQ entries in %s\n", controller); > + of_node_put(*np_temp); > return -EINVAL; > } > > @@ -204,6 +205,8 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, > break; > } > > + of_node_put(*np_temp); > + > if (temp) { > *num_irqs = temp; > return 0; > -- > 2.15.0 >