Hi, On Thursday 29 May 2014 12:41 PM, Mohit KUMAR DCG wrote: > Hello Kishon, > >> -----Original Message----- >> From: Kishon Vijay Abraham I [mailto:kishon@xxxxxx] >> Sent: Thursday, May 29, 2014 12:08 PM >> To: devicetree@xxxxxxxxxxxxxxx; linux-doc@xxxxxxxxxxxxxxx; linux-arm- >> kernel@xxxxxxxxxxxxxxxxxxx; linux-omap@xxxxxxxxxxxxxxx; linux- >> pci@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx >> Cc: arnd@xxxxxxxx; tony@xxxxxxxxxxx; jg1.han@xxxxxxxxxxx; >> kishon@xxxxxx; Jason Gunthorpe; Bjorn Helgaas; Mohit KUMAR DCG; Marek >> Vasut >> Subject: [PATCH v2 03/18] PCI: designware: Configuration space should be >> specified in 'reg' >> >> 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 | 1 + >> drivers/pci/host/pcie-designware.c | 17 +++++++++++++++-- >> 2 files changed, 16 insertions(+), 2 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt >> b/Documentation/devicetree/bindings/pci/designware-pcie.txt >> index d6fae13..8314360 100644 >> --- a/Documentation/devicetree/bindings/pci/designware-pcie.txt >> +++ b/Documentation/devicetree/bindings/pci/designware-pcie.txt >> @@ -6,6 +6,7 @@ Required properties: >> as "samsung,exynos5440-pcie" or "fsl,imx6q-pcie". >> - reg: base addresses and lengths of the pcie controller, >> the phy controller, additional register for the phy controller. >> + The configuration address space should also be specified here. >> - interrupts: interrupt values for level interrupt, >> pulse interrupt, special interrupt. >> - clocks: from common clock binding: handle to pci clock. >> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie- >> designware.c >> index c4e3732..603b386 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" >> @@ -392,11 +393,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"); >> + } >> + >> if (of_pci_range_parser_init(&parser, np)) { >> dev_err(pp->dev, "missing ranges property\n"); >> return -EINVAL; >> @@ -429,6 +442,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; > > - As you are getting cfg address space as MEM resource, so remove above code that > gets the configuration space from dt range. Also correct dt for pcie cfg space for the platforms > based on this driver. Ok. Will send that as a separate patch converting all platforms to use MEM resource. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
