From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Subject: Re: [PATCH v9 5/6] PCI: generic: Make pci-host-generic driver numa aware Date: Mon, 18 Jan 2016 09:41:03 -0800 Message-ID: <569D23AF.9050503@gmail.com> References: <1453134965-6125-1-git-send-email-gkulkarni@caviumnetworks.com> <1453134965-6125-6-git-send-email-gkulkarni@caviumnetworks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1453134965-6125-6-git-send-email-gkulkarni@caviumnetworks.com> Sender: linux-ia64-owner@vger.kernel.org To: Ganapatrao Kulkarni Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-ia64@vger.kernel.org, linux-metag@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-arch@vger.kernel.org, Will.Deacon@arm.com, catalin.marinas@arm.com, grant.likely@linaro.org, leif.lindholm@linaro.org, rfranz@cavium.com, ard.biesheuvel@linaro.org, msalter@redhat.com, robh+dt@kernel.org, steve.capper@linaro.org, hanjun.guo@linaro.org, al.stone@linaro.org, arnd@arndb.de, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rjw@rjwysocki.net, lenb@kernel.org, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, bhelgaas@google.com, tony.luck@intel.com, fenghua.yu@intel.com, james.hogan@imgtec.com, benh@kernel.crashing.org, tglx@linutronix.de, mingo@r List-Id: devicetree@vger.kernel.org On 01/18/2016 08:36 AM, Ganapatrao Kulkarni wrote: > update numa_node of device associated with pci bus. > moved down devm_kzalloc to allocate from node memory. > > Signed-off-by: Ganapatrao Kulkarni > --- > drivers/pci/host/pci-host-generic.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c > index 5434c90..0e1ce06 100644 > --- a/drivers/pci/host/pci-host-generic.c > +++ b/drivers/pci/host/pci-host-generic.c > @@ -215,11 +215,9 @@ static int gen_pci_probe(struct platform_device *pdev) > const struct of_device_id *of_id; > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > - struct gen_pci *pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL); > + struct gen_pci *pci; > struct pci_bus *bus, *child; > > - if (!pci) > - return -ENOMEM; > > type = of_get_property(np, "device_type", NULL); > if (!type || strcmp(type, "pci")) { > @@ -230,6 +228,11 @@ static int gen_pci_probe(struct platform_device *pdev) > of_pci_check_probe_only(); > > of_id = of_match_node(gen_pci_of_match, np); > + set_dev_node(dev, of_node_to_nid(np)); This shouldn't be done in individual platform_drivers, but instead in the device probing code. There is code that does this in drivers/of/platform.c and drivers/of/device.c Is that not being called for the pci-host-gweneric devices? If not, we should figure out why, and perhaps attempt to fix it rather than doing it here. > + pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL); > + if (!pci) > + return -ENOMEM; > + > pci->cfg.ops = (struct gen_pci_cfg_bus_ops *)of_id->data; > pci->host.dev.parent = dev; > INIT_LIST_HEAD(&pci->host.windows); >