From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu.Dudau@arm.com Subject: Re: [PATCH V1 11/11] arm64, pci, acpi: Support for ACPI based PCI hostbridge init Date: Wed, 28 Oct 2015 11:49:40 +0000 Message-ID: <20151028114940.GL963@e106497-lin.cambridge.arm.com> References: <1445963922-22711-1-git-send-email-tn@semihalf.com> <1445963922-22711-12-git-send-email-tn@semihalf.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from foss.arm.com ([217.140.101.70]:33552 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbbJ1Ltn (ORCPT ); Wed, 28 Oct 2015 07:49:43 -0400 Content-Disposition: inline In-Reply-To: <1445963922-22711-12-git-send-email-tn@semihalf.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Tomasz Nowicki Cc: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, jiang.liu@linux.intel.com, robert.richter@caviumnetworks.com, Narinder.Dhillon@caviumnetworks.com, ddaney@caviumnetworks.com, tglx@linutronix.de, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org On Tue, Oct 27, 2015 at 05:38:42PM +0100, Tomasz Nowicki wrote: > Because of two patch series: > 1. Jiang Liu's common interface to support PCI host bridge init > 2. Refactoring of MMCONFIG, part of this patch set > now we can think about PCI buses enumeration for ARM64 and ACPI table= s. >=20 > This patch introduce ACPI based PCI hostbridge init calls which > use information from MCFG table (PCI config space regions) and > _CRS (IO/irq resources) to initialize PCI hostbridge. >=20 > Signed-off-by: Tomasz Nowicki > Signed-off-by: Hanjun Guo > Signed-off-by: Suravee Suthikulpanit > CC: Arnd Bergmann > CC: Catalin Marinas > CC: Liviu Dudau > CC: Lorenzo Pieralisi > CC: Will Deacon > --- > arch/arm64/Kconfig | 6 ++ > arch/arm64/kernel/pci.c | 208 ++++++++++++++++++++++++++++++++++++++= +++++++--- > 2 files changed, 202 insertions(+), 12 deletions(-) >=20 > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 07d1811..bbcc6b1 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -89,6 +89,7 @@ config ARM64 > select SPARSE_IRQ > select SYSCTL_EXCEPTION_TRACE > select HAVE_CONTEXT_TRACKING > + select HAVE_PCI_ECAM > help > ARM 64-bit (AArch64) Linux support. > =20 > @@ -202,6 +203,11 @@ source "drivers/pci/Kconfig" > source "drivers/pci/pcie/Kconfig" > source "drivers/pci/hotplug/Kconfig" > =20 > +config PCI_MMCONFIG > + def_bool y > + select PCI_ECAM > + depends on ACPI > + > endmenu > =20 > menu "Kernel Features" > diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c > index b3d098b..66cc1ae 100644 > --- a/arch/arm64/kernel/pci.c > +++ b/arch/arm64/kernel/pci.c > @@ -11,12 +11,15 @@ > */ > =20 > #include > +#include > #include > #include > #include > #include > +#include > #include > #include > +#include > #include > =20 > #include > @@ -52,35 +55,216 @@ int pcibios_enable_device(struct pci_dev *dev, i= nt mask) > } > =20 > /* > - * Try to assign the IRQ number from DT when adding a new device > + * Try to assign the IRQ number from DT/ACPI when adding a new devic= e > */ > int pcibios_add_device(struct pci_dev *dev) > { > - dev->irq =3D of_irq_parse_and_map_pci(dev, 0, 0); > + if (acpi_disabled) > + dev->irq =3D of_irq_parse_and_map_pci(dev, 0, 0); > +#ifdef CONFIG_ACPI > + else > + acpi_pci_irq_enable(dev); > +#endif > =20 > return 0; > } > =20 > +#ifdef CONFIG_ACPI > +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) > +{ > + struct acpi_pci_root *root =3D bridge->bus->sysdata; > + > + ACPI_COMPANION_SET(&bridge->dev, root->device); > + return 0; > +} > + > +void pcibios_add_bus(struct pci_bus *bus) > +{ > + acpi_pci_add_bus(bus); > +} > + > +void pcibios_remove_bus(struct pci_bus *bus) > +{ > + acpi_pci_remove_bus(bus); > +} > + > +static int __init pcibios_assign_resources(void) > +{ > + if (acpi_disabled) > + return 0; > + > + pci_assign_unassigned_resources(); > + return 0; You can change this function into: { if (!acpi_disabled) pci_assign_unassigned_resources(); return 0; } as the equivalent but shorter form. > +} > /* > - * raw_pci_read/write - Platform-specific PCI config space access. > + * rootfs_initcall comes after subsys_initcall and fs_initcall_sync, > + * so we know acpi scan and PCI_FIXUP_FINAL quirks have both run. > */ > -int raw_pci_read(unsigned int domain, unsigned int bus, > - unsigned int devfn, int reg, int len, u32 *val) What happened with raw_pci_{read,write} ? Why do you remove them? > +rootfs_initcall(pcibios_assign_resources); Would you be so kind and explain to me why you need this initcall? Can you not set the PCI_REASSIGN_ALL_RSRC flag before calling pci_scan_root_bus() ? I haven't focused on ACPI before so I'm a bit hazy on the init order wh= en that is enabled. That being said, I don't like adding in the architectu= re code initcall hooks just to fix up some dependency orders that could / = should be fixed some other way. > + > +static void __iomem * > +pci_mcfg_dev_base(struct pci_bus *bus, unsigned int devfn, int offse= t) > { > - return -ENXIO; > + struct pci_mmcfg_region *cfg; > + > + cfg =3D pci_mmconfig_lookup(pci_domain_nr(bus), bus->number); > + if (cfg && cfg->virt) > + return cfg->virt + > + (PCI_MMCFG_BUS_OFFSET(bus->number) | (devfn << 12)) + > + offset; > + return NULL; > } > =20 > -int raw_pci_write(unsigned int domain, unsigned int bus, > - unsigned int devfn, int reg, int len, u32 val) > +struct pci_ops pci_root_ops =3D { > + .map_bus =3D pci_mcfg_dev_base, > + .read =3D pci_generic_config_read, > + .write =3D pci_generic_config_write, > +}; > + > +#ifdef CONFIG_PCI_MMCONFIG > +static int pci_add_mmconfig_region(struct acpi_pci_root_info *ci) > { > - return -ENXIO; > + struct pci_mmcfg_region *cfg; > + struct acpi_pci_root *root; > + int seg, start, end, err; > + > + root =3D ci->root; > + seg =3D root->segment; > + start =3D root->secondary.start; > + end =3D root->secondary.end; > + > + cfg =3D pci_mmconfig_lookup(seg, start); > + if (cfg) > + return 0; > + > + cfg =3D pci_mmconfig_alloc(seg, start, end, root->mcfg_addr); > + if (!cfg) > + return -ENOMEM; > + > + err =3D pci_mmconfig_inject(cfg); > + return err; > } > =20 > -#ifdef CONFIG_ACPI > +static void pci_remove_mmconfig_region(struct acpi_pci_root_info *ci= ) > +{ > + struct acpi_pci_root *root =3D ci->root; > + struct pci_mmcfg_region *cfg; > + > + cfg =3D pci_mmconfig_lookup(root->segment, root->secondary.start); > + if (cfg) > + return; > + > + if (cfg->hot_added) > + pci_mmconfig_delete(root->segment, root->secondary.start, > + root->secondary.end); > +} > +#else > +static int pci_add_mmconfig_region(struct acpi_pci_root_info *ci) > +{ > + return 0; > +} > + > +static void pci_remove_mmconfig_region(struct acpi_pci_root_info *ci= ) { } > +#endif > + > +static int pci_acpi_root_init_info(struct acpi_pci_root_info *ci) > +{ > + return pci_add_mmconfig_region(ci); > +} > + > +static void pci_acpi_root_release_info(struct acpi_pci_root_info *ci= ) > +{ > + pci_remove_mmconfig_region(ci); > + kfree(ci); > +} > + > +static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info= *ci) > +{ > + struct resource_entry *entry, *tmp; > + int ret; > + > + ret =3D acpi_pci_probe_root_resources(ci); > + if (ret < 0) > + return ret; > + > + resource_list_for_each_entry_safe(entry, tmp, &ci->resources) { > + struct resource *res =3D entry->res; > + > + /* > + * Special handling for ARM IO range There is nothing ARM specific here. It should apply to any memory mappe= d IO range. > + * TODO: need to move pci_register_io_range() function out > + * of drivers/of/address.c for both used by DT and ACPI > + */ > + if (res->flags & IORESOURCE_IO) { > + unsigned long port; > + int err; > + resource_size_t length =3D res->end - res->start; > + > + err =3D pci_register_io_range(res->start, length); > + if (err) { > + resource_list_destroy_entry(entry); > + continue; > + } > + > + port =3D pci_address_to_pio(res->start); > + if (port =3D=3D (unsigned long)-1) { > + resource_list_destroy_entry(entry); > + continue; > + } > + > + res->start =3D port; > + res->end =3D res->start + length - 1; > + > + if (pci_remap_iospace(res, res->start) < 0) > + resource_list_destroy_entry(entry); > + } > + } > + > + return 0; > +} > + > +static struct acpi_pci_root_ops acpi_pci_root_ops =3D { > + .pci_ops =3D &pci_root_ops, > + .init_info =3D pci_acpi_root_init_info, > + .release_info =3D pci_acpi_root_release_info, > + .prepare_resources =3D pci_acpi_root_prepare_resources, > +}; > + > /* Root bridge scanning */ > struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) > { > - /* TODO: Should be revisited when implementing PCI on ACPI */ > - return NULL; > + int node =3D acpi_get_node(root->device->handle); > + int domain =3D root->segment; > + int busnum =3D root->secondary.start; > + struct acpi_pci_root_info *info; > + struct pci_bus *bus; > + > + if (domain && !pci_domains_supported) { > + pr_warn("PCI %04x:%02x: multiple domains not supported.\n", > + domain, busnum); > + return NULL; > + } > + > + info =3D kzalloc_node(sizeof(*info), GFP_KERNEL, node); > + if (!info) { > + dev_err(&root->device->dev, > + "pci_bus %04x:%02x: ignored (out of memory)\n", > + domain, busnum); > + return NULL; > + } > + > + bus =3D acpi_pci_root_create(root, &acpi_pci_root_ops, info, root); > + > + /* After the PCI-E bus has been walked and all devices discovered, > + * configure any settings of the fabric that might be necessary. > + */ > + if (bus) { > + struct pci_bus *child; > + > + list_for_each_entry(child, &bus->children, node) > + pcie_bus_configure_settings(child); > + } > + > + return bus; > } > #endif > --=20 > 1.9.1 >=20 --=20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- =C2=AF\_(=E3=83=84)_/=C2=AF -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html