On Thursday, June 26, 2014 2:56 PM, Mohit KUMAR DCG wrote: > On Wednesday, June 25, 2014 11:27 PM, Kishon Vijay Abraham I wrote: > > > > The configuration address space has so far been specified in *ranges*, > > however it should be specified in *reg* making it a platform MEM resource. > > Hence used 'platform_get_resource_*' API to get configuration address > > space in the designware driver. > > > > Cc: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx> > > Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > Cc: Mohit Kumar <mohit.kumar@xxxxxx> > > Cc: Jingoo Han <jg1.han@xxxxxxxxxxx> > > Cc: Marek Vasut <marex@xxxxxxx> > > Cc: Arnd Bergmann <arnd@xxxxxxxx> > > Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx> > > --- > > .../devicetree/bindings/pci/designware-pcie.txt | 4 ++++ > > drivers/pci/host/pcie-designware.c | 17 +++++++++++++++-- > > 2 files changed, 19 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt > > b/Documentation/devicetree/bindings/pci/designware-pcie.txt > > index d0d15ee..ed0d9b9 100644 > > --- a/Documentation/devicetree/bindings/pci/designware-pcie.txt > > +++ b/Documentation/devicetree/bindings/pci/designware-pcie.txt > > @@ -2,6 +2,10 @@ > > > > Required properties: > > - compatible: should contain "snps,dw-pcie" to identify the core. > > +- reg: Should contain the configuration address space. > > +- reg-names: Must be "config" for the PCIe configuration space. > > + (The old way of getting the configuration address space from "ranges" > > + is deprecated and should be avoided.) > > - #address-cells: set to <3> > > - #size-cells: set to <2> > > - device_type: set to "pci" > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie- > > designware.c > > index 1eaf4df..0b7b455 100644 > > --- a/drivers/pci/host/pcie-designware.c > > +++ b/drivers/pci/host/pcie-designware.c > > @@ -20,6 +20,7 @@ > > #include <linux/of_pci.h> > > #include <linux/pci.h> > > #include <linux/pci_regs.h> > > +#include <linux/platform_device.h> > > #include <linux/types.h> > > > > #include "pcie-designware.h" > > @@ -396,11 +397,23 @@ static const struct irq_domain_ops > > msi_domain_ops = { int __init dw_pcie_host_init(struct pcie_port *pp) { > > struct device_node *np = pp->dev->of_node; > > + struct platform_device *pdev = to_platform_device(pp->dev); > > struct of_pci_range range; > > struct of_pci_range_parser parser; > > + struct resource *cfg_res; > > u32 val; > > int i; > > > > + cfg_res = platform_get_resource_byname(pdev, > > IORESOURCE_MEM, "config"); > > + if (cfg_res) { > > + pp->config.cfg0_size = resource_size(cfg_res)/2; > > + pp->config.cfg1_size = resource_size(cfg_res)/2; > > + pp->cfg0_base = cfg_res->start; > > + pp->cfg1_base = cfg_res->start + pp->config.cfg0_size; > > + } else { > > + dev_err(pp->dev, "missing *config* reg space\n"); > > - so this message will remind other platform to comply and specify configuration space > in *reg* property. > > > + } > > + > > if (of_pci_range_parser_init(&parser, np)) { > > dev_err(pp->dev, "missing ranges property\n"); > > return -EINVAL; > > @@ -433,6 +446,8 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > > of_pci_range_to_resource(&range, np, &pp->cfg); > > pp->config.cfg0_size = resource_size(&pp->cfg)/2; > > pp->config.cfg1_size = resource_size(&pp->cfg)/2; > > + pp->cfg0_base = pp->cfg.start; > > + pp->cfg1_base = pp->cfg.start + pp- > > >config.cfg0_size; > > } > > } > > > > @@ -445,8 +460,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > > } > > } > > > > - pp->cfg0_base = pp->cfg.start; > > - pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; > > pp->mem_base = pp->mem.start; > > > > pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, > > Reviewed and Acked-by: Mohit Kumar <mohit.kumar@xxxxxx> Acked-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Best regards, Jingoo Han > > Regards > Mohit > > > -- > > 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html