| Message ID | 1389157323-3088-2-git-send-email-Minghuan.Lian@freescale.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, 2014-01-08 at 13:01 +0800, Minghuan Lian wrote: > PowerPC uses structure pci_controller to describe PCI controller, > but ARM uses structure pci_sys_data. In order to support PowerPC > and ARM simultaneously, the patch adds a structure fsl_pci that > contains most of the members of the pci_controller and pci_sys_data. > Meanwhile, it defines a interface fsl_arch_sys_to_pci() which should > be implemented in architecture-specific PCI controller driver to > convert pci_controller or pci_sys_data to fsl_pci. > > Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> > --- > change log: > v4: > Added indirect type macro > v1-v3: > Derived from http://patchwork.ozlabs.org/patch/278965/ > > Based on upstream master. > Based on the discussion of RFC version here > http://patchwork.ozlabs.org/patch/274487/ > > include/linux/fsl/pci-common.h | 48 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) Same comments on this patchset as last time. -Scott -- 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
On Wed, Jan 08, 2014 at 03:58:08PM -0600, Scott Wood wrote: > On Wed, 2014-01-08 at 13:01 +0800, Minghuan Lian wrote: > > PowerPC uses structure pci_controller to describe PCI controller, > > but ARM uses structure pci_sys_data. In order to support PowerPC > > and ARM simultaneously, the patch adds a structure fsl_pci that > > contains most of the members of the pci_controller and pci_sys_data. > > Meanwhile, it defines a interface fsl_arch_sys_to_pci() which should > > be implemented in architecture-specific PCI controller driver to > > convert pci_controller or pci_sys_data to fsl_pci. > > > > Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> > > --- > > change log: > > v4: > > Added indirect type macro > > v1-v3: > > Derived from http://patchwork.ozlabs.org/patch/278965/ > > > > Based on upstream master. > > Based on the discussion of RFC version here > > http://patchwork.ozlabs.org/patch/274487/ > > > > include/linux/fsl/pci-common.h | 48 ++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 48 insertions(+) > > Same comments on this patchset as last time. Minghuan, when you address Scott's comments, can you also add a MAINTAINERS update? Bjorn -- 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
Hi Scott, please see my comments inline. On 01/09/2014 05:58 AM, Scott Wood wrote: > On Wed, 2014-01-08 at 13:01 +0800, Minghuan Lian wrote: >> PowerPC uses structure pci_controller to describe PCI controller, >> but ARM uses structure pci_sys_data. In order to support PowerPC >> and ARM simultaneously, the patch adds a structure fsl_pci that >> contains most of the members of the pci_controller and pci_sys_data. >> Meanwhile, it defines a interface fsl_arch_sys_to_pci() which should >> be implemented in architecture-specific PCI controller driver to >> convert pci_controller or pci_sys_data to fsl_pci. >> >> Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> >> --- >> change log: >> v4: >> Added indirect type macro >> v1-v3: >> Derived from http://patchwork.ozlabs.org/patch/278965/ >> >> Based on upstream master. >> Based on the discussion of RFC version here >> http://patchwork.ozlabs.org/patch/274487/ >> >> include/linux/fsl/pci-common.h | 48 ++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 48 insertions(+) > Same comments on this patchset as last time. [Minghuan] I added the duplicate fields because PPC's struct pci_controller need them. The common PCI driver gets the related information and pass to PowerPC driver. The most fileds are parsed from dts. the common driver need them to initialize the ATMU and access the PCI configuration. If fsl_pci does not contains them, PowerPC driver must parse parse dts or access controller to get the information again. The best way is PowerPC and ARM can use the common pci_controller structure, but currently, it is very hard and needs more effort. So I create fsl_pci that contains most of the members of the pci_controller and pci_sys_data. please see the following code for PowerPC: int fsl_arch_pci_sys_register(struct fsl_pci *pci) +{ + struct pci_controller *hose; + hose = pcibios_alloc_controller(pci->dn); + + hose->private_data = pci; + hose->parent = pci->dev; + hose->first_busno = pci->first_busno; + hose->last_busno = pci->last_busno; + hose->ops = pci->ops; + + hose->io_base_virt = ioremap(pci->io_base_phys + pci->io_resource.start, + pci->pci_io_size); + hose->pci_io_size = pci->io_resource.start + pci->pci_io_size; + hose->io_base_phys = pci->io_base_phys; + hose->io_resource = pci->io_resource; + + memcpy(hose->mem_offset, pci->mem_offset, sizeof(hose->mem_offset)); + memcpy(hose->mem_resources, pci->mem_resources, + sizeof(hose->mem_resources)); + hose->dma_window_base_cur = pci->dma_window_base_cur; + hose->dma_window_size = pci->dma_window_size; + pci->sys = hose; +.... + return 0; +} The following is for ARM, I will submit them after verification: + +static inline struct fsl_pcie *sys_to_pcie(struct pci_sys_data *sys) +{ + return sys->private_data; +} + +static int fsl_pcie_setup(int nr, struct pci_sys_data *sys) +{ + struct fsl_pcie *pcie; + + pcie = sys_to_pcie(sys); + + if (!pcie) + return 0; + + pcie->sys = sys; + + sys->io_offset = pcie->io_base_phys; + pci_ioremap_io(sys->io_offset, pcie->io_resource.start); + pci_add_resource_offset(&sys->resources, &pcie->io_resource, + sys->io_offset); + + sys->mem_offset = pcie->mem_offset; + pci_add_resource_offset(&sys->resources, &pcie->mem_resource, + sys->mem_offset); + + return 1; +} + +static struct pci_bus * +fsl_pcie_scan_bus(int nr, struct pci_sys_data *sys) +{ + struct pci_bus *bus; + struct fsl_pcie *pcie = sys_to_pcie(sys); + + bus = pci_create_root_bus(pcie->dev, sys->busnr, + pcie->ops, sys, &sys->resources); + if (!bus) + return NULL; + + pci_scan_child_bus(bus); + + return bus; +} + +static int fsl_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +{ + struct of_irq oirq; + int ret; + + ret = of_irq_map_pci(dev, &oirq); + if (ret) + return ret; + + return irq_create_of_mapping(oirq.controller, oirq.specifier, + oirq.size); +} + +static struct hw_pci fsl_hw_pcie = { + .ops = &fsl_indirect_pci_ops; + .setup = fsl_pcie_setup, + .scan = fsl_pcie_scan_bus, + .map_irq = fsl_pcie_map_irq, +}; +static struct pci_bus * +fake_pci_bus(struct fsl_pcie *pcie, int busnr) +{ + static struct pci_bus bus; + static struct pci_sys_data sys; + + bus.number = busnr; + bus.sysdata = &sys; + sys.private_data = pcie; + bus.ops = pcie->ops; + return &bus; +} + +static int fsl_pcie_register(struct fsl_pcie *pcie) +{ + pcie->controller = fsl_hw_pcie.nr_controllers; + fsl_hw_pcie.nr_controllers = 1; + fsl_hw_pcie.private_data = (void **)&pcie; + + pci_common_init(&fsl_hw_pcie); + pci_assign_unassigned_resources(); +#ifdef CONFIG_PCI_DOMAINS + fsl_hw_pcie.domain++; +#endif +} > > -Scott > > -- 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
Hi Bjorn, I am very sorry, The mail was filtered to another directory, I did not notice update. The next versions will include these updates. Thanks, Minghuan On 01/09/2014 08:12 AM, Bjorn Helgaas wrote: > On Wed, Jan 08, 2014 at 03:58:08PM -0600, Scott Wood wrote: >> On Wed, 2014-01-08 at 13:01 +0800, Minghuan Lian wrote: >>> PowerPC uses structure pci_controller to describe PCI controller, >>> but ARM uses structure pci_sys_data. In order to support PowerPC >>> and ARM simultaneously, the patch adds a structure fsl_pci that >>> contains most of the members of the pci_controller and pci_sys_data. >>> Meanwhile, it defines a interface fsl_arch_sys_to_pci() which should >>> be implemented in architecture-specific PCI controller driver to >>> convert pci_controller or pci_sys_data to fsl_pci. >>> >>> Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> >>> --- >>> change log: >>> v4: >>> Added indirect type macro >>> v1-v3: >>> Derived from http://patchwork.ozlabs.org/patch/278965/ >>> >>> Based on upstream master. >>> Based on the discussion of RFC version here >>> http://patchwork.ozlabs.org/patch/274487/ >>> >>> include/linux/fsl/pci-common.h | 48 ++++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 48 insertions(+) >> Same comments on this patchset as last time. > Minghuan, when you address Scott's comments, can you also add a > MAINTAINERS update? > > Bjorn > > -- 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/include/linux/fsl/pci-common.h b/include/linux/fsl/pci-common.h index 5e4f683..7ea20a1 100644 --- a/include/linux/fsl/pci-common.h +++ b/include/linux/fsl/pci-common.h @@ -102,5 +102,53 @@ struct ccsr_pci { }; +/* + * Structure of a PCI controller (host bridge) + */ +struct fsl_pci { + struct list_head node; + bool is_pcie; + struct device_node *dn; + struct device *dev; + + int first_busno; + int last_busno; + int self_busno; + struct resource busn; + + struct pci_ops *ops; + struct ccsr_pci __iomem *regs; + +#define INDIRECT_TYPE_SET_CFG_TYPE 0x00000001 +#define INDIRECT_TYPE_EXT_REG 0x00000002 +#define INDIRECT_TYPE_SURPRESS_PRIMARY_BUS 0x00000004 +#define INDIRECT_TYPE_NO_PCIE_LINK 0x00000008 +#define INDIRECT_TYPE_BIG_ENDIAN 0x00000010 +#define INDIRECT_TYPE_BROKEN_MRM 0x00000020 +#define INDIRECT_TYPE_FSL_CFG_REG_LINK 0x00000040 + u32 indirect_type; + + struct resource io_resource; + resource_size_t io_base_phys; + resource_size_t pci_io_size; + + struct resource mem_resources[3]; + resource_size_t mem_offset[3]; + + int global_number; /* PCI domain number */ + + resource_size_t dma_window_base_cur; + resource_size_t dma_window_size; + + void *sys; +}; + +/* + * Convert architecture specific pci controller structure to fsl_pci + * PowerPC uses structure pci_controller and ARM uses structure pci_sys_data + * to describe pci controller. + */ +extern struct fsl_pci *fsl_arch_sys_to_pci(void *sys); + #endif /* __PCI_COMMON_H */ #endif /* __KERNEL__ */
PowerPC uses structure pci_controller to describe PCI controller, but ARM uses structure pci_sys_data. In order to support PowerPC and ARM simultaneously, the patch adds a structure fsl_pci that contains most of the members of the pci_controller and pci_sys_data. Meanwhile, it defines a interface fsl_arch_sys_to_pci() which should be implemented in architecture-specific PCI controller driver to convert pci_controller or pci_sys_data to fsl_pci. Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> --- change log: v4: Added indirect type macro v1-v3: Derived from http://patchwork.ozlabs.org/patch/278965/ Based on upstream master. Based on the discussion of RFC version here http://patchwork.ozlabs.org/patch/274487/ include/linux/fsl/pci-common.h | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)