From: Bjorn Helgaas <bhelgaas@google.com> To: Marc Zyngier <marc.zyngier@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de>, Jiang Liu <jiang.liu@linux.intel.com>, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon <Will.Deacon@arm.com>, Yijing Wang <wangyijing@huawei.com>, Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Subject: Re: [PATCH 2/6] PCI/MSI: add hooks to populate the msi_domain field Date: Mon, 26 Jan 2015 18:40:05 -0600 [thread overview] Message-ID: <20150127004005.GC11624@google.com> (raw) In-Reply-To: <1418069543-21969-3-git-send-email-marc.zyngier@arm.com> On Mon, Dec 08, 2014 at 08:12:19PM +0000, Marc Zyngier wrote: > In order to be able to populate the device msi_domain field, > add the necesary hooks to propagate the PHB msi_domain across > secondary busses to devices. > > So far, nobody populates the initial msi_domain. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/pci/probe.c | 24 ++++++++++++++++++++++++ > include/linux/pci.h | 1 + > 2 files changed, 25 insertions(+) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index c8ca98c..d1009a2 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -670,6 +670,20 @@ static void pci_set_bus_speed(struct pci_bus *bus) > } > } > > +void __weak pcibios_set_phb_msi_domain(struct pci_bus *bus) We haven't previously used the "phb" abbreviation in the PCI core, so I'd rather not start now. I'm not really sure how relevant it is anyway -- maybe the name doesn't need to include a reference to the host bridge at all? > +{ > +} > + > +static void pci_set_bus_msi_domain(struct pci_bus *bus) > +{ > + struct pci_dev *bridge = bus->self; > + > + if (!bridge) > + pcibios_set_phb_msi_domain(bus); > + else > + dev_set_msi_domain(&bus->dev, dev_get_msi_domain(&bridge->dev)); > +} > + > static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, > struct pci_dev *bridge, int busnr) > { > @@ -723,6 +737,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, > bridge->subordinate = child; > > add_dev: > + pci_set_bus_msi_domain(child); > ret = device_register(&child->dev); > WARN_ON(ret < 0); > > @@ -1517,6 +1532,11 @@ static void pci_init_capabilities(struct pci_dev *dev) > pci_enable_acs(dev); > } > > +static void pci_set_msi_domain(struct pci_dev *dev) > +{ > + dev_set_msi_domain(&dev->dev, dev_get_msi_domain(&dev->bus->dev)); > +} > + > void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > { > int ret; > @@ -1546,6 +1566,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > /* Initialize various capabilities */ > pci_init_capabilities(dev); > > + /* Setup MSI irq domain */ This is *really* a nitpick, but "setup" suggests that we're doing more than just setting a pointer, i.e., it suggests that we're doing something more involved to get it all ready for use. But here, I think we really are just setting a pointer, so I think the comment is pointless since the function name already says that. > + pci_set_msi_domain(dev); > + > /* > * Add the device to our list of discovered devices > * and the bus list for fixup functions, etc. > @@ -1947,6 +1970,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, > b->bridge = get_device(&bridge->dev); > device_enable_async_suspend(b->bridge); > pci_set_bus_of_node(b); > + pci_set_bus_msi_domain(b); > > if (!parent) > set_dev_node(b->bridge, pcibus_to_node(b)); > diff --git a/include/linux/pci.h b/include/linux/pci.h > index a523cee..3266764 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1637,6 +1637,7 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, > int pcibios_add_device(struct pci_dev *dev); > void pcibios_release_device(struct pci_dev *dev); > void pcibios_penalize_isa_irq(int irq, int active); > +void pcibios_set_phb_msi_domain(struct pci_bus *bus); > > #ifdef CONFIG_HIBERNATE_CALLBACKS > extern struct dev_pm_ops pcibios_pm_ops; > -- > 2.1.3 >
WARNING: multiple messages have this Message-ID (diff)
From: bhelgaas@google.com (Bjorn Helgaas) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/6] PCI/MSI: add hooks to populate the msi_domain field Date: Mon, 26 Jan 2015 18:40:05 -0600 [thread overview] Message-ID: <20150127004005.GC11624@google.com> (raw) In-Reply-To: <1418069543-21969-3-git-send-email-marc.zyngier@arm.com> On Mon, Dec 08, 2014 at 08:12:19PM +0000, Marc Zyngier wrote: > In order to be able to populate the device msi_domain field, > add the necesary hooks to propagate the PHB msi_domain across > secondary busses to devices. > > So far, nobody populates the initial msi_domain. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/pci/probe.c | 24 ++++++++++++++++++++++++ > include/linux/pci.h | 1 + > 2 files changed, 25 insertions(+) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index c8ca98c..d1009a2 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -670,6 +670,20 @@ static void pci_set_bus_speed(struct pci_bus *bus) > } > } > > +void __weak pcibios_set_phb_msi_domain(struct pci_bus *bus) We haven't previously used the "phb" abbreviation in the PCI core, so I'd rather not start now. I'm not really sure how relevant it is anyway -- maybe the name doesn't need to include a reference to the host bridge at all? > +{ > +} > + > +static void pci_set_bus_msi_domain(struct pci_bus *bus) > +{ > + struct pci_dev *bridge = bus->self; > + > + if (!bridge) > + pcibios_set_phb_msi_domain(bus); > + else > + dev_set_msi_domain(&bus->dev, dev_get_msi_domain(&bridge->dev)); > +} > + > static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, > struct pci_dev *bridge, int busnr) > { > @@ -723,6 +737,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, > bridge->subordinate = child; > > add_dev: > + pci_set_bus_msi_domain(child); > ret = device_register(&child->dev); > WARN_ON(ret < 0); > > @@ -1517,6 +1532,11 @@ static void pci_init_capabilities(struct pci_dev *dev) > pci_enable_acs(dev); > } > > +static void pci_set_msi_domain(struct pci_dev *dev) > +{ > + dev_set_msi_domain(&dev->dev, dev_get_msi_domain(&dev->bus->dev)); > +} > + > void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > { > int ret; > @@ -1546,6 +1566,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > /* Initialize various capabilities */ > pci_init_capabilities(dev); > > + /* Setup MSI irq domain */ This is *really* a nitpick, but "setup" suggests that we're doing more than just setting a pointer, i.e., it suggests that we're doing something more involved to get it all ready for use. But here, I think we really are just setting a pointer, so I think the comment is pointless since the function name already says that. > + pci_set_msi_domain(dev); > + > /* > * Add the device to our list of discovered devices > * and the bus list for fixup functions, etc. > @@ -1947,6 +1970,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, > b->bridge = get_device(&bridge->dev); > device_enable_async_suspend(b->bridge); > pci_set_bus_of_node(b); > + pci_set_bus_msi_domain(b); > > if (!parent) > set_dev_node(b->bridge, pcibus_to_node(b)); > diff --git a/include/linux/pci.h b/include/linux/pci.h > index a523cee..3266764 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1637,6 +1637,7 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, > int pcibios_add_device(struct pci_dev *dev); > void pcibios_release_device(struct pci_dev *dev); > void pcibios_penalize_isa_irq(int irq, int active); > +void pcibios_set_phb_msi_domain(struct pci_bus *bus); > > #ifdef CONFIG_HIBERNATE_CALLBACKS > extern struct dev_pm_ops pcibios_pm_ops; > -- > 2.1.3 >
next prev parent reply other threads:[~2015-01-27 0:40 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-08 20:12 [PATCH 0/6] Introducing per-device MSI domain Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` [PATCH 1/6] device core: Introduce per-device MSI domain pointer Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` [PATCH 2/6] PCI/MSI: add hooks to populate the msi_domain field Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-09 2:03 ` Yijing Wang 2014-12-09 2:03 ` Yijing Wang 2014-12-09 10:02 ` Marc Zyngier 2014-12-09 10:02 ` Marc Zyngier 2014-12-09 10:02 ` Marc Zyngier 2014-12-09 11:57 ` Yijing Wang 2014-12-09 11:57 ` Yijing Wang 2014-12-09 11:57 ` Yijing Wang 2014-12-09 12:12 ` Marc Zyngier 2014-12-09 12:12 ` Marc Zyngier 2014-12-09 12:12 ` Marc Zyngier 2014-12-09 12:24 ` Yijing Wang 2014-12-09 12:24 ` Yijing Wang 2014-12-09 12:24 ` Yijing Wang 2014-12-09 12:47 ` Jiang Liu 2014-12-09 12:47 ` Jiang Liu 2014-12-09 12:47 ` Jiang Liu 2014-12-09 14:03 ` Marc Zyngier 2014-12-09 14:03 ` Marc Zyngier 2014-12-09 14:03 ` Marc Zyngier 2014-12-09 14:11 ` Jiang Liu 2014-12-09 14:11 ` Jiang Liu 2014-12-09 14:11 ` Jiang Liu 2014-12-09 14:27 ` Marc Zyngier 2014-12-09 14:27 ` Marc Zyngier 2014-12-09 14:27 ` Marc Zyngier 2014-12-09 14:35 ` Jiang Liu 2014-12-09 14:35 ` Jiang Liu 2014-12-09 14:35 ` Jiang Liu 2014-12-09 14:59 ` Marc Zyngier 2014-12-09 14:59 ` Marc Zyngier 2014-12-09 14:59 ` Marc Zyngier 2014-12-09 15:42 ` Jiang Liu 2014-12-09 15:42 ` Jiang Liu 2014-12-09 15:42 ` Jiang Liu 2014-12-09 12:57 ` Jiang Liu 2014-12-09 12:57 ` Jiang Liu 2015-01-27 0:40 ` Bjorn Helgaas [this message] 2015-01-27 0:40 ` Bjorn Helgaas 2015-01-27 0:43 ` Bjorn Helgaas 2015-01-27 0:43 ` Bjorn Helgaas 2014-12-08 20:12 ` [PATCH 3/6] PCI/MSI: of: add support for OF-provided msi_domain Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2015-01-27 0:41 ` Bjorn Helgaas 2015-01-27 0:41 ` Bjorn Helgaas 2014-12-08 20:12 ` [PATCH 4/6] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` [PATCH 5/6] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` [PATCH 6/6] irqchip: gicv3-its: " Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150127004005.GC11624@google.com \ --to=bhelgaas@google.com \ --cc=Suravee.Suthikulpanit@amd.com \ --cc=Will.Deacon@arm.com \ --cc=jiang.liu@linux.intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=tglx@linutronix.de \ --cc=wangyijing@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.