| Message ID | 20160621164947.GA7603@localhost (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Hi Bjorn, On Tue, Jun 21, 2016 at 6:49 PM, Bjorn Helgaas <helgaas@kernel.org> wrote: > On Tue, Jun 21, 2016 at 06:41:00PM +0300, Valentine Barshak wrote: >> On Tue, Jun 21, 2016 at 09:26:23AM -0500, Bjorn Helgaas wrote: >> > On Tue, Jun 21, 2016 at 12:41:31PM +0200, Geert Uytterhoeven wrote: >> > > On Tue, Jun 7, 2016 at 1:07 AM, Bjorn Helgaas <bhelgaas@google.com> wrote: >> > > > Request host bridge window resources so they appear in ioport_resource and >> > > > iomem_resource and are reflected in /proc/ioports and /proc/iomem. >> > > > >> > > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >> > > > --- >> > > > drivers/pci/host/pci-rcar-gen2.c | 4 ++++ >> > > > 1 file changed, 4 insertions(+) >> > > > >> > > > diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c >> > > > index 9980a4b..617a6b2 100644 >> > > > --- a/drivers/pci/host/pci-rcar-gen2.c >> > > > +++ b/drivers/pci/host/pci-rcar-gen2.c >> > > > @@ -194,6 +194,7 @@ static int rcar_pci_setup(int nr, struct pci_sys_data *sys) >> > > > struct rcar_pci_priv *priv = sys->private_data; >> > > > void __iomem *reg = priv->reg; >> > > > u32 val; >> > > > + int ret; >> > > > >> > > > pm_runtime_enable(priv->dev); >> > > > pm_runtime_get_sync(priv->dev); >> > > > @@ -275,6 +276,9 @@ static int rcar_pci_setup(int nr, struct pci_sys_data *sys) >> > > > /* Add PCI resources */ >> > > > pci_add_resource(&sys->resources, &priv->io_res); >> > > > pci_add_resource(&sys->resources, &priv->mem_res); >> > > > + ret = devm_request_pci_bus_resources(priv->dev, &sys->resources); >> > > > + if (ret < 0) >> > > > + return ret; >> > > > >> > > > /* Setup bus number based on platform device id / of bus-range */ >> > > > sys->busnr = priv->busnr; >> > > >> > > This patch (commit 1bd019707b7c9249d34c5d348f1ef75eb4d83e89 in pci/next) >> > > broke PCI on r8a7791/koelsch. Dmesg differences are: >> > > >> > > pci-rcar-gen2 ee090000.pci: PCI: bus0 revision 11 >> > > -pci-rcar-gen2 ee090000.pci: PCI host bridge to bus 0000:00 >> > > -pci_bus 0000:00: root bus resource [io 0xee080000-0xee0810ff] >> > > -pci_bus 0000:00: root bus resource [mem 0xee080000-0xee0810ff] >> > >> > This is probably a result of this code in drivers/pci/host/pci-rcar-gen2.c: >> > >> > /* >> > * The controller does not support/use port I/O, >> > * so setup a dummy port I/O region here. >> > */ >> > priv->io_res.start = priv->mem_res.start; >> > priv->io_res.end = priv->mem_res.end; >> > priv->io_res.flags = IORESOURCE_IO; >> > >> > We try to avoid adding dummy regions like this, but maybe we missed >> > this one. I haven't found any email discussion about it yet, so I >> > don't know what the reason for this one is. Valentine, do you >> > remember? >> >> I do not, but I think I've found something in my mailbox. >> Below is the quote from the original conversation with: >> (Re: [PATCH] pci: Add R-Car Gen2 internal PCI support) >> >> [quote starts] >> >>+ priv->mem_res = *mem_res; >> >>+ /* >> >>+ * The controller does not support/use port I/O, >> >>+ * so setup a dummy port I/O region here. >> >>+ */ >> >>+ priv->io_res.start = priv->mem_res.start; >> >>+ priv->io_res.end = priv->mem_res.end; >> >>+ priv->io_res.flags = IORESOURCE_IO; >> >> >> > I don't understand this. There's no requirement (at least as far as the >> > PCI core is concerned) to supply an I/O aperture at all, and I think it >> > would be better if you didn't. >> > >> > Oh, I see ... maybe pcibios_init_resources() forces you to have an >> > I/O resource to avoid having it give you a default one? And I >> > suppose that since you have several host bridges, these dummy I/O >> > regions have to be distinct. Ugh. Well, I guess this is something >> > you'd have to fix here or in the ARM code, it's up to you what to do. >> >> Exactly. This is to avoid assigning default I/O resources. >> [quote ends] > > Oh, right, now I remember. Thanks for digging that out. > > I propose the patches below to remove the requirement for having an > I/O space. Any chance one of you could test them? Thanks! PCI seems to be working again on r8a7791/koelsch using today's pci/next, which includes these patches. Lspci shows the USB controllers again. /proc/iomem gained a few entries: ec700000-ec70ffff : /dma-controller@ec700000 ec720000-ec72ffff : /dma-controller@ec720000 ec740000-ec7401ff : audmapp +ee080000-ee0810ff : /pci@ee090000 + ee080000-ee080fff : 0000:00:01.0 + ee081000-ee0810ff : 0000:00:02.0 ee090000-ee090bff : /pci@ee090000 +ee0c0000-ee0c10ff : /pci@ee0d0000 + ee0c0000-ee0c0fff : 0001:01:01.0 + ee0c1000-ee0c10ff : 0001:01:02.0 ee0d0000-ee0d0bff : /pci@ee0d0000 ee300000-ee301fff : /sata@ee300000 ee700000-ee7003ff : /ethernet@ee700000 Hence Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 0070e85..2d88af5 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -22,6 +22,7 @@ struct hw_pci { struct msi_controller *msi_ctrl; struct pci_ops *ops; int nr_controllers; + unsigned int io_optional:1; void **private_data; int (*setup)(int nr, struct pci_sys_data *); struct pci_bus *(*scan)(int nr, struct pci_sys_data *); diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 05e61a2..65f12ef 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -410,7 +410,8 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return irq; } -static int pcibios_init_resources(int busnr, struct pci_sys_data *sys) +static int pcibios_init_resource(int busnr, struct pci_sys_data *sys, + int io_optional) { int ret; struct resource_entry *window; @@ -420,6 +421,14 @@ static int pcibios_init_resources(int busnr, struct pci_sys_data *sys) &iomem_resource, sys->mem_offset); } + /* + * If a platform says I/O port support is optional, we don't add + * the default I/O space. The platform is responsible for adding + * any I/O space it needs. + */ + if (io_optional) + return 0; + resource_list_for_each_entry(window, &sys->resources) if (resource_type(window->res) == IORESOURCE_IO) return 0; @@ -466,7 +475,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, if (ret > 0) { struct pci_host_bridge *host_bridge; - ret = pcibios_init_resources(nr, sys); + ret = pcibios_init_resource(nr, sys, hw->io_optional); if (ret) { kfree(sys); break; commit eeb4d6cdf8960c484c5a6eb9b310145b75a59ec1 Author: Bjorn Helgaas <bhelgaas@google.com> Date: Tue Jun 21 09:19:34 2016 -0500 PCI: rcar: Drop gen2 dummy I/O port region Previously we added a dummy I/O port region even though the R-Car controller doesn't support PCI port I/O. This resulted in bogus root bus resources like this: pci_bus 0000:00: root bus resource [io 0xee080000-0xee0810ff] pci_bus 0000:00: root bus resource [mem 0xee080000-0xee0810ff] Drop the unused dummy I/O port region and set struct hw_pci.io_optional so the ARM PCI code doesn't add a default one for us. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index 9980a4b..ddf7765 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -97,7 +97,6 @@ struct rcar_pci_priv { struct device *dev; void __iomem *reg; - struct resource io_res; struct resource mem_res; struct resource *cfg_res; unsigned busnr; @@ -273,7 +272,6 @@ static int rcar_pci_setup(int nr, struct pci_sys_data *sys) rcar_pci_setup_errirq(priv); /* Add PCI resources */ - pci_add_resource(&sys->resources, &priv->io_res); pci_add_resource(&sys->resources, &priv->mem_res); /* Setup bus number based on platform device id / of bus-range */ @@ -371,14 +369,6 @@ static int rcar_pci_probe(struct platform_device *pdev) return -ENOMEM; priv->mem_res = *mem_res; - /* - * The controller does not support/use port I/O, - * so setup a dummy port I/O region here. - */ - priv->io_res.start = priv->mem_res.start; - priv->io_res.end = priv->mem_res.end; - priv->io_res.flags = IORESOURCE_IO; - priv->cfg_res = cfg_res; priv->irq = platform_get_irq(pdev, 0); @@ -421,6 +411,7 @@ static int rcar_pci_probe(struct platform_device *pdev) hw_private[0] = priv; memset(&hw, 0, sizeof(hw)); hw.nr_controllers = ARRAY_SIZE(hw_private); + hw.io_optional = 1; hw.private_data = hw_private; hw.map_irq = rcar_pci_map_irq; hw.ops = &rcar_pci_ops;