| Message ID | 1453134965-6125-6-git-send-email-gkulkarni@caviumnetworks.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <gkulkarni@caviumnetworks.com> > --- > 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); > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jan 18, 2016 at 10:06:04PM +0530, 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 <gkulkarni@caviumnetworks.com> > --- > 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)); I like the idea of this patch, but why do we need to call set_dev_node() here in driver code? Shouldn't that be done by the OF/platform device infrastructure so that all drivers for platform devices get this benefit? > + 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); > -- > 1.8.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arch" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jan 26, 2016 at 02:50:05PM -0600, Bjorn Helgaas wrote: > On Mon, Jan 18, 2016 at 10:06:04PM +0530, 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 <gkulkarni@caviumnetworks.com> > > --- > > 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)); > > I like the idea of this patch, but why do we need to call > set_dev_node() here in driver code? Shouldn't that be done by the > OF/platform device infrastructure so that all drivers for platform devices > get this benefit? Sorry, I'm just a day late and a dollar short. I see David and Lorenzo have already responded about this. > > + 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); > > -- > > 1.8.1.4 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-arch" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)); + 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);
update numa_node of device associated with pci bus. moved down devm_kzalloc to allocate from node memory. Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com> --- drivers/pci/host/pci-host-generic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)