On 07/15/2015 06:42 AM, Ray Jui wrote:
> This patch enables arm64 support to the iProc PCIe driver
>
> Signed-off-by: Ray Jui <r...@broadcom.com>
> Reviewed-by: Scott Branden <sbran...@broadcom.com>
> ---
> drivers/pci/host/pcie-iproc.c | 15 ++++-----------
> drivers/pci/host/pcie-iproc.h | 8 ++++++--
> 2 files changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
> index d77481e..8a556d5 100644
> --- a/drivers/pci/host/pcie-iproc.c
> +++ b/drivers/pci/host/pcie-iproc.c
> @@ -58,11 +58,6 @@
> #define SYS_RC_INTX_EN 0x330
> #define SYS_RC_INTX_MASK 0xf
>
> -static inline struct iproc_pcie *sys_to_pcie(struct pci_sys_data *sys)
> -{
> - return sys->private_data;
> -}
> -
> /**
> * Note access to the configuration registers are protected at the higher
> layer
> * by 'pci_lock' in drivers/pci/access.c
> @@ -71,8 +66,7 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus
> *bus,
> unsigned int devfn,
> int where)
> {
> - struct pci_sys_data *sys = bus->sysdata;
> - struct iproc_pcie *pcie = sys_to_pcie(sys);
> + struct iproc_pcie *pcie = bus->sysdata;
> unsigned slot = PCI_SLOT(devfn);
> unsigned fn = PCI_FUNC(devfn);
> unsigned busno = bus->number;
> @@ -208,10 +202,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct
> list_head *res)
>
> iproc_pcie_reset(pcie);
>
> - pcie->sysdata.private_data = pcie;
> -
> - bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops,
> - &pcie->sysdata, res);
> + bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops, pcie, res);
> if (!bus) {
> dev_err(pcie->dev, "unable to create PCI root bus\n");
> ret = -ENOMEM;
> @@ -229,7 +220,9 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct
> list_head *res)
>
> pci_scan_child_bus(bus);
> pci_assign_unassigned_bus_resources(bus);
> +#ifdef CONFIG_ARM
> pci_fixup_irqs(pci_common_swizzle, pcie->map_irq);
> +#endif
> pci_bus_add_devices(bus);
>
> return 0;
> diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h
> index ba0a108..0ee9673 100644
> --- a/drivers/pci/host/pcie-iproc.h
> +++ b/drivers/pci/host/pcie-iproc.h
> @@ -18,18 +18,22 @@
>
> /**
> * iProc PCIe device
> + * @sysdata: Per PCI controller data. This needs to be kept at the beginning
> of
> + * struct iproc_pcie, to enable support of both ARM32 and ARM64 platforms
> with
> + * minimal changes in the iProc PCIe core driver
> * @dev: pointer to device data structure
> * @base: PCIe host controller I/O register base
> * @resources: linked list of all PCI resources
> - * @sysdata: Per PCI controller data
> * @root_bus: pointer to root bus
> * @phy: optional PHY device that controls the Serdes
> * @irqs: interrupt IDs
> */
> struct iproc_pcie {
> +#ifdef CONFIG_ARM
> + struct pci_sys_data sysdata;
> +#endif
This looks for me like a dirty hack. Why is the PCIe controller
interface between ARM and ARM64 different?
I do not know if this patch is the right place to fix it but I think we
should come up with a PCI controller interface which works on all archs,
as we see here some drivers are shared between different archs.
> struct device *dev;
> void __iomem *base;
> - struct pci_sys_data sysdata;
> struct pci_bus *root_bus;
> struct phy *phy;
> int irqs[IPROC_PCIE_MAX_NUM_IRQS];
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
