MPC83xx PCI-E support
v5 cover MPC83xx PCI-E support
Hi all,
Here comes another revision...
Changes since v4:
- Corrected PCI-E ranges for MPC837x boards;
- On MPC837XE-MDS boards PCIE2 can be disabled in favour of PCIE1 x2 mode, in that case U-Boot disables PCIE2 via status property.
So, of_device_is_available() check is placed into mpc83xx_add_bridge();
- Rebased on top of galak/powerpc.git next.
Changes since v3:
- TAL register programming changed per new reference manual for 83xx processors;
- dts files no longer specify config window in regs = <>. Instead, PCI-E code reads cfg window BAR to determine config space area;
- dts files no longer disable pcie nodes, now Linux detects unconfigured PCI-E controllers at run-time.
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
PATCH v5 1/2 powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
This patch adds support for PCI-Express controllers as found on the newer MPC83xx chips.
The work is loosely based on the Tony Li's patch[1], but unlike the original patch, this patch implements sliding window for the Type 1 transactions using outbound window translations, so we don't have to ioremap the whole PCI-E configuration space.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-January/049028.html
--- arch/powerpc/sysdev/fsl_pci.c | 243 +++++++++++++++++++++++++++++++++++++---- include/linux/pci_ids.h | 8 ++ 2 files changed, 227 insertions(+), 24 deletions(-)
arch/powerpc/sysdev/fsl_pci.c +219 -24
@@ -1,12 +1,16 @@/* * MPC83xx/85xx/86xx PCI/PCIE support routing. * -* Copyright 2007,2008 Freescale Semiconductor, Inc +* Copyright 2007-2009 Freescale Semiconductor, Inc. +* Copyright 2008-2009 MontaVista Software, Inc. * * Initial author: Xianghua Xiao <[email protected]> * Recode: ZHANG WEI <[email protected]> * Rewrite the routing for Frescale PCI and PCI Express * Roy Zang <[email protected]> +* MPC83xx PCI-Express support: +* Tony Li <[email protected]> +* Anton Vorontsov <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -27,6 +31,29 @@#include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +static int fsl_pcie_bus_fixup; + +static void __init quirk_fsl_pcie_header (struct pci_dev *dev) +{ +/* if we aren't a PCIe don't bother */ +if (!pci_find_capability (dev,PCI_CAP_ID_EXP )) +return ; + + dev->class =PCI_CLASS_BRIDGE_PCI <<8 ; + fsl_pcie_bus_fixup =1 ; +return ; +} + +static int __init fsl_pcie_check_link (struct pci_controller *hose) +{ +u32 val; + +early_read_config_dword (hose,0 ,0 ,PCIE_LTSSM , &val); +if (val <PCIE_LTSSM_L0 ) +return 1 ; +return 0 ; +} +#if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx) static int __init setup_one_atmu(struct ccsr_pci __iomem *pci, unsigned int index, const struct resource *res,
@@ -159,28 +186,6 @@ static void __init setup_pci_pcsrbar(struct pci_controller *hose)#endif } -static int fsl_pcie_bus_fixup; - -static void __init quirk_fsl_pcie_header (struct pci_dev *dev) -{ -/* if we aren't a PCIe don't bother */ -if (!pci_find_capability (dev,PCI_CAP_ID_EXP )) -return ; - - dev->class =PCI_CLASS_BRIDGE_PCI <<8 ; - fsl_pcie_bus_fixup =1 ; -return ; -} - -static int __init fsl_pcie_check_link (struct pci_controller *hose) -{ -u32 val; -early_read_config_dword (hose,0 ,0 ,PCIE_LTSSM , &val); -if (val <PCIE_LTSSM_L0 ) -return 1 ; -return 0 ; -} -void fsl_pcibios_fixup_bus (struct pci_bus *bus) {struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
@@ -294,8 +299,183 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);#endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */ #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x) +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8314E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8314 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8315E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8315 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8377E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8377 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8378E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8378 , quirk_fsl_pcie_header); + +struct mpc83xx_pcie_priv { +void __iomem *cfg_map; +u32 dev_base; +}; + +/* +* With the convention of u-boot, the PCIE outbound window 0 serves +* as configuration transactions outbound. +*/ +#define PEX_OUTWIN0_BAR 0xCA4 +#define PEX_OUTWIN0_TAL 0xCA8 +#define PEX_OUTWIN0_TAH 0xCAC + +static int mpc83xx_pcie_exclude_device (struct pci_bus *bus,unsigned int devfn) +{ +struct pci_controller *hose = bus->sysdata; + +if (hose->indirect_type &PPC_INDIRECT_TYPE_NO_PCIE_LINK ) +return PCIBIOS_DEVICE_NOT_FOUND ; +/* +* Workaround for the HW bug: for Type 0 configure transactions the +* PCI-E controller does not check the device number bits and just +* assumes that the device number bits are 0. +*/ +if (bus->number == hose->first_busno || + bus->primary == hose->first_busno) { +if (devfn &0xf8 ) +return PCIBIOS_DEVICE_NOT_FOUND ; + } + +if (ppc_md.pci_exclude_device) { +if (ppc_md.pci_exclude_device (hose, bus->number, devfn)) +return PCIBIOS_DEVICE_NOT_FOUND ; + } + +return PCIBIOS_SUCCESSFUL ; +} + +static void __iomem *mpc83xx_pcie_remap_cfg (struct pci_bus *bus, +unsigned int devfn,int offset) +{ +struct pci_controller *hose = bus->sysdata; +struct mpc83xx_pcie_priv *pcie = hose->dn->data; +u8 bus_no = bus->number - hose->first_busno; +u32 dev_base = bus_no <<24 | devfn <<16 ; +int ret; + + ret =mpc83xx_pcie_exclude_device (bus, devfn); +if (ret) +return NULL ; + + offset &=0xfff ; + +/* Type 0 */ +if (bus->number == hose->first_busno) +return hose->cfg_data + offset; + +if (pcie->dev_base == dev_base) + goto mapped; + +out_le32 (hose->cfg_data +PEX_OUTWIN0_TAL , dev_base); + + pcie->dev_base = dev_base; +mapped: +return pcie->cfg_map + offset; +} + +static int mpc83xx_pcie_read_config (struct pci_bus *bus,unsigned int devfn, +int offset,int len,u32 *val) +{ +void __iomem *cfg_addr; + + cfg_addr =mpc83xx_pcie_remap_cfg (bus, devfn, offset); +if (!cfg_addr) +return PCIBIOS_DEVICE_NOT_FOUND ; + +switch (len) { +case 1 : + *val =in_8 (cfg_addr); +break ; +case 2 : + *val =in_le16 (cfg_addr); +break ; +default : + *val =in_le32 (cfg_addr); +break ; + } + +return PCIBIOS_SUCCESSFUL ; +} + +static int mpc83xx_pcie_write_config (struct pci_bus *bus,unsigned int devfn, +int offset,int len,u32 val) +{ +void __iomem *cfg_addr; + + cfg_addr =mpc83xx_pcie_remap_cfg (bus, devfn, offset); +if (!cfg_addr) +return PCIBIOS_DEVICE_NOT_FOUND ; + +switch (len) { +case 1 : +out_8 (cfg_addr, val); +break ; +case 2 : +out_le16 (cfg_addr, val); +break ; +default : +out_le32 (cfg_addr, val); +break ; + } + +return PCIBIOS_SUCCESSFUL ; +} + +static struct pci_ops mpc83xx_pcie_ops = { + .read = mpc83xx_pcie_read_config, + .write = mpc83xx_pcie_write_config, +}; + +static int __init mpc83xx_pcie_setup (struct pci_controller *hose, +struct resource *reg) +{ +struct mpc83xx_pcie_priv *pcie; +u32 cfg_bar; +int ret = -ENOMEM ; + + pcie =zalloc_maybe_bootmem (sizeof (*pcie),GFP_KERNEL ); +if (!pcie) +return ret; + + hose->cfg_data =ioremap (reg->start,resource_size (reg)); +if (!hose->cfg_data) + goto err0; + + cfg_bar =in_le32 (hose->cfg_data +PEX_OUTWIN0_BAR ); +if (!cfg_bar) { +/* PCI-E isn't configured. */ + ret = -ENODEV ; + goto err1; + } + + pcie->cfg_map =ioremap (cfg_bar,0x1000 ); +if (!pcie->cfg_map) + goto err1; + +WARN_ON (hose->dn->data); + hose->dn->data = pcie; + hose->ops = &mpc83xx_pcie_ops; + +out_le32 (hose->cfg_data +PEX_OUTWIN0_TAH ,0 ); +out_le32 (hose->cfg_data +PEX_OUTWIN0_TAL ,0 ); + +if (fsl_pcie_check_link (hose)) + hose->indirect_type |=PPC_INDIRECT_TYPE_NO_PCIE_LINK ; + +return 0 ; +err1: +iounmap (hose->cfg_data); +err0: +kfree (pcie); +return ret; + +} +int __init mpc83xx_add_bridge (struct device_node *dev) { +int ret;int len;struct pci_controller *hose;struct resource rsrc_reg;
@@ -303,6 +483,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev)const int *bus_range;int primary; +if (!of_device_is_available (dev)) { +pr_warning ("%s: disabled by the firmware.\n" , + dev->full_name); +return -ENODEV ; + }pr_debug ("Adding PCI host bridge %s\n" , dev->full_name);/* Fetch host bridge registers address */
@@ -350,7 +535,14 @@ int __init mpc83xx_add_bridge(struct device_node *dev) hose->first_busno = bus_range ? bus_range[0 ] :0 ; hose->last_busno = bus_range ? bus_range[1 ] :0xff ; -setup_indirect_pci (hose, rsrc_cfg.start, rsrc_cfg.start +4 ,0 ); +if (of_device_is_compatible (dev,"fsl,mpc8314-pcie" )) { + ret =mpc83xx_pcie_setup (hose, &rsrc_reg); +if (ret) + goto err0; + }else { +setup_indirect_pci (hose, rsrc_cfg.start, + rsrc_cfg.start +4 ,0 ); + } printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " "Firmware bus number: %d->%d\n",
@@ -365,5 +557,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev)pci_process_bridge_OF_ranges (hose, dev, primary);return 0 ; +err0: +pcibios_free_controller (hose); + return ret; }#endif /* CONFIG_PPC_83xx */
include/linux/pci_ids.h +8 -0
@@ -2209,6 +2209,14 @@#define PCI_DEVICE_ID_TDI_EHCI 0x0101#define PCI_VENDOR_ID_FREESCALE 0x1957 +#define PCI_DEVICE_ID_MPC8315E 0x00b4 +#define PCI_DEVICE_ID_MPC8315 0x00b5 +#define PCI_DEVICE_ID_MPC8314E 0x00b6 +#define PCI_DEVICE_ID_MPC8314 0x00b7 +#define PCI_DEVICE_ID_MPC8378E 0x00c4 +#define PCI_DEVICE_ID_MPC8378 0x00c5 +#define PCI_DEVICE_ID_MPC8377E 0x00c6 +#define PCI_DEVICE_ID_MPC8377 0x00c7#define PCI_DEVICE_ID_MPC8548E 0x0012#define PCI_DEVICE_ID_MPC8548 0x0013#define PCI_DEVICE_ID_MPC8543E 0x0014
Signature · 1 line
1.5.6.5
Re: [PATCH 1/2] powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header); · line 314
Quoted 5 lines
arch/powerpc/sysdev/fsl_pci.c +4
-0+struct mpc83xx_pcie_priv { +void __iomem *cfg_map; +u32 dev_base; +};
So was thinking about this and was wondering about doing the following:
hose->cfg_addr /* use instead of dev_base to cache pci bus/dev/fn */ hose->cfg_data /* should be the outbound window used for pci cfg cycles */ hose->dn->data /* for IMMR regs to tweak window */
thoughts?
Doing this means we should be able to get rid of struct mpc83xx_pcie_priv
- k
Re: [PATCH 1/2] powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
Quoted 8 lines · Kumar Gala
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header); · line 314
Quoted 5 lines
arch/powerpc/sysdev/fsl_pci.c +4
-0+struct mpc83xx_pcie_priv { +void __iomem *cfg_map; +u32 dev_base; +};So was thinking about this and was wondering about doing the following:
Quoted 6 lines
hose->cfg_addr/* use instead ofdev_baseto cache pci bus/dev/fn */hose->cfg_data/* should be the outbound window used for pci cfg cycles */hose->dn->data/* for IMMR regs to tweak window */thoughts?
I don't quite like the casts that we'll need to do this.
Quoted 2 lines
Doing this means we should be able to get rid of struct
mpc83xx_pcie_priv
Not sure what benefits this would bring? Saving few bytes of code and data at the cost of losing clean, cast-less, self documented code?..
I was actually thinking of getting rid of hose->cfg_data usage, and replacing it with mpc83xx_pci_priv->cfg_type0 (and rename mpc83xx_pci_priv->cfg_map to cfg_type1).
OTOH, I can surely do that what you described, but to me it doesn't look like a great idea (i.e. using irrelevant struct members for hooking our data)...
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Re: [PATCH 1/2] powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
Quoted 24 lines · Anton Vorontsov
Quoted 8 lines · Kumar Gala
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header); · line 314
Quoted 5 lines
arch/powerpc/sysdev/fsl_pci.c +4
-0+struct mpc83xx_pcie_priv { +void __iomem *cfg_map; +u32 dev_base; +};So was thinking about this and was wondering about doing the following:
Quoted 6 lines
hose->cfg_addr/* use instead ofdev_baseto cache pci bus/dev/fn */hose->cfg_data/* should be the outbound window used for pci cfg cycles */hose->dn->data/* for IMMR regs to tweak window */thoughts?
I don't quite like the casts that we'll need to do this.
Quoted 2 lines
Doing this means we should be able to get rid of struct
mpc83xx_pcie_privNot sure what benefits this would bring? Saving few bytes of code and data at the cost of losing clean, cast-less, self documented code?..
Quoted 7 lines
I was actually thinking of getting rid of
hose->cfg_datausage, and replacing it withmpc83xx_pci_priv->cfg_type0(and renamempc83xx_pci_priv->cfg_maptocfg_type1).OTOH, I can surely do that what you described, but to me it doesn't look like a great idea (i.e. using irrelevant struct members for hooking our data)...
I'm ok if you get rid of cfg_data usage.. than we aren't overloading the indirect variables for 83xx pci cfg cycles
- k
PATCH v6 1/2 powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
This patch adds support for PCI-Express controllers as found on the newer MPC83xx chips.
The work is loosely based on the Tony Li's patch[1], but unlike the original patch, this patch implements sliding window for the Type 1 transactions using outbound window translations, so we don't have to ioremap the whole PCI-E configuration space.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-January/049028.html
---
On Thu, Jan 08, 2009 at 01:24:27PM -0600, Kumar Gala wrote:
[...]
Quoted 2 lines
I'm ok if you get rid of
cfg_datausage.. than we aren't overloading the indirect variables for 83xx pci cfg cycles
Here it is.
Thanks,
arch/powerpc/sysdev/fsl_pci.c | 244 +++++++++++++++++++++++++++++++++++++---- include/linux/pci_ids.h | 8 ++ 2 files changed, 228 insertions(+), 24 deletions(-)
arch/powerpc/sysdev/fsl_pci.c +220 -24
@@ -1,12 +1,16 @@/* * MPC83xx/85xx/86xx PCI/PCIE support routing. * -* Copyright 2007,2008 Freescale Semiconductor, Inc +* Copyright 2007-2009 Freescale Semiconductor, Inc. +* Copyright 2008-2009 MontaVista Software, Inc. * * Initial author: Xianghua Xiao <[email protected]> * Recode: ZHANG WEI <[email protected]> * Rewrite the routing for Frescale PCI and PCI Express * Roy Zang <[email protected]> +* MPC83xx PCI-Express support: +* Tony Li <[email protected]> +* Anton Vorontsov <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -27,6 +31,29 @@#include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +static int fsl_pcie_bus_fixup; + +static void __init quirk_fsl_pcie_header (struct pci_dev *dev) +{ +/* if we aren't a PCIe don't bother */ +if (!pci_find_capability (dev,PCI_CAP_ID_EXP )) +return ; + + dev->class =PCI_CLASS_BRIDGE_PCI <<8 ; + fsl_pcie_bus_fixup =1 ; +return ; +} + +static int __init fsl_pcie_check_link (struct pci_controller *hose) +{ +u32 val; + +early_read_config_dword (hose,0 ,0 ,PCIE_LTSSM , &val); +if (val <PCIE_LTSSM_L0 ) +return 1 ; +return 0 ; +} +#if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx) static int __init setup_one_atmu(struct ccsr_pci __iomem *pci, unsigned int index, const struct resource *res,
@@ -159,28 +186,6 @@ static void __init setup_pci_pcsrbar(struct pci_controller *hose)#endif } -static int fsl_pcie_bus_fixup; - -static void __init quirk_fsl_pcie_header (struct pci_dev *dev) -{ -/* if we aren't a PCIe don't bother */ -if (!pci_find_capability (dev,PCI_CAP_ID_EXP )) -return ; - - dev->class =PCI_CLASS_BRIDGE_PCI <<8 ; - fsl_pcie_bus_fixup =1 ; -return ; -} - -static int __init fsl_pcie_check_link (struct pci_controller *hose) -{ -u32 val; -early_read_config_dword (hose,0 ,0 ,PCIE_LTSSM , &val); -if (val <PCIE_LTSSM_L0 ) -return 1 ; -return 0 ; -} -void fsl_pcibios_fixup_bus (struct pci_bus *bus) {struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
@@ -294,8 +299,184 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);#endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */ #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x) +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8314E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8314 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8315E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8315 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8377E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8377 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8378E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8378 , quirk_fsl_pcie_header); + +struct mpc83xx_pcie_priv { +void __iomem *cfg_type0; +void __iomem *cfg_type1; +u32 dev_base; +}; + +/* +* With the convention of u-boot, the PCIE outbound window 0 serves +* as configuration transactions outbound. +*/ +#define PEX_OUTWIN0_BAR 0xCA4 +#define PEX_OUTWIN0_TAL 0xCA8 +#define PEX_OUTWIN0_TAH 0xCAC + +static int mpc83xx_pcie_exclude_device (struct pci_bus *bus,unsigned int devfn) +{ +struct pci_controller *hose = bus->sysdata; + +if (hose->indirect_type &PPC_INDIRECT_TYPE_NO_PCIE_LINK ) +return PCIBIOS_DEVICE_NOT_FOUND ; +/* +* Workaround for the HW bug: for Type 0 configure transactions the +* PCI-E controller does not check the device number bits and just +* assumes that the device number bits are 0. +*/ +if (bus->number == hose->first_busno || + bus->primary == hose->first_busno) { +if (devfn &0xf8 ) +return PCIBIOS_DEVICE_NOT_FOUND ; + } + +if (ppc_md.pci_exclude_device) { +if (ppc_md.pci_exclude_device (hose, bus->number, devfn)) +return PCIBIOS_DEVICE_NOT_FOUND ; + } + +return PCIBIOS_SUCCESSFUL ; +} + +static void __iomem *mpc83xx_pcie_remap_cfg (struct pci_bus *bus, +unsigned int devfn,int offset) +{ +struct pci_controller *hose = bus->sysdata; +struct mpc83xx_pcie_priv *pcie = hose->dn->data; +u8 bus_no = bus->number - hose->first_busno; +u32 dev_base = bus_no <<24 | devfn <<16 ; +int ret; + + ret =mpc83xx_pcie_exclude_device (bus, devfn); +if (ret) +return NULL ; + + offset &=0xfff ; + +/* Type 0 */ +if (bus->number == hose->first_busno) +return pcie->cfg_type0 + offset; + +if (pcie->dev_base == dev_base) + goto mapped; + +out_le32 (pcie->cfg_type0 +PEX_OUTWIN0_TAL , dev_base); + + pcie->dev_base = dev_base; +mapped: +return pcie->cfg_type1 + offset; +} + +static int mpc83xx_pcie_read_config (struct pci_bus *bus,unsigned int devfn, +int offset,int len,u32 *val) +{ +void __iomem *cfg_addr; + + cfg_addr =mpc83xx_pcie_remap_cfg (bus, devfn, offset); +if (!cfg_addr) +return PCIBIOS_DEVICE_NOT_FOUND ; + +switch (len) { +case 1 : + *val =in_8 (cfg_addr); +break ; +case 2 : + *val =in_le16 (cfg_addr); +break ; +default : + *val =in_le32 (cfg_addr); +break ; + } + +return PCIBIOS_SUCCESSFUL ; +} + +static int mpc83xx_pcie_write_config (struct pci_bus *bus,unsigned int devfn, +int offset,int len,u32 val) +{ +void __iomem *cfg_addr; + + cfg_addr =mpc83xx_pcie_remap_cfg (bus, devfn, offset); +if (!cfg_addr) +return PCIBIOS_DEVICE_NOT_FOUND ; + +switch (len) { +case 1 : +out_8 (cfg_addr, val); +break ; +case 2 : +out_le16 (cfg_addr, val); +break ; +default : +out_le32 (cfg_addr, val); +break ; + } + +return PCIBIOS_SUCCESSFUL ; +} + +static struct pci_ops mpc83xx_pcie_ops = { + .read = mpc83xx_pcie_read_config, + .write = mpc83xx_pcie_write_config, +}; + +static int __init mpc83xx_pcie_setup (struct pci_controller *hose, +struct resource *reg) +{ +struct mpc83xx_pcie_priv *pcie; +u32 cfg_bar; +int ret = -ENOMEM ; + + pcie =zalloc_maybe_bootmem (sizeof (*pcie),GFP_KERNEL ); +if (!pcie) +return ret; + + pcie->cfg_type0 =ioremap (reg->start,resource_size (reg)); +if (!pcie->cfg_type0) + goto err0; + + cfg_bar =in_le32 (pcie->cfg_type0 +PEX_OUTWIN0_BAR ); +if (!cfg_bar) { +/* PCI-E isn't configured. */ + ret = -ENODEV ; + goto err1; + } + + pcie->cfg_type1 =ioremap (cfg_bar,0x1000 ); +if (!pcie->cfg_type1) + goto err1; + +WARN_ON (hose->dn->data); + hose->dn->data = pcie; + hose->ops = &mpc83xx_pcie_ops; + +out_le32 (pcie->cfg_type0 +PEX_OUTWIN0_TAH ,0 ); +out_le32 (pcie->cfg_type0 +PEX_OUTWIN0_TAL ,0 ); + +if (fsl_pcie_check_link (hose)) + hose->indirect_type |=PPC_INDIRECT_TYPE_NO_PCIE_LINK ; + +return 0 ; +err1: +iounmap (pcie->cfg_type0); +err0: +kfree (pcie); +return ret; + +} +int __init mpc83xx_add_bridge (struct device_node *dev) { +int ret;int len;struct pci_controller *hose;struct resource rsrc_reg;
@@ -303,6 +484,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev)const int *bus_range;int primary; +if (!of_device_is_available (dev)) { +pr_warning ("%s: disabled by the firmware.\n" , + dev->full_name); +return -ENODEV ; + }pr_debug ("Adding PCI host bridge %s\n" , dev->full_name);/* Fetch host bridge registers address */
@@ -350,7 +536,14 @@ int __init mpc83xx_add_bridge(struct device_node *dev) hose->first_busno = bus_range ? bus_range[0 ] :0 ; hose->last_busno = bus_range ? bus_range[1 ] :0xff ; -setup_indirect_pci (hose, rsrc_cfg.start, rsrc_cfg.start +4 ,0 ); +if (of_device_is_compatible (dev,"fsl,mpc8314-pcie" )) { + ret =mpc83xx_pcie_setup (hose, &rsrc_reg); +if (ret) + goto err0; + }else { +setup_indirect_pci (hose, rsrc_cfg.start, + rsrc_cfg.start +4 ,0 ); + } printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " "Firmware bus number: %d->%d\n",
@@ -365,5 +558,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev)pci_process_bridge_OF_ranges (hose, dev, primary);return 0 ; +err0: +pcibios_free_controller (hose); + return ret; }#endif /* CONFIG_PPC_83xx */
include/linux/pci_ids.h +8 -0
@@ -2209,6 +2209,14 @@#define PCI_DEVICE_ID_TDI_EHCI 0x0101#define PCI_VENDOR_ID_FREESCALE 0x1957 +#define PCI_DEVICE_ID_MPC8315E 0x00b4 +#define PCI_DEVICE_ID_MPC8315 0x00b5 +#define PCI_DEVICE_ID_MPC8314E 0x00b6 +#define PCI_DEVICE_ID_MPC8314 0x00b7 +#define PCI_DEVICE_ID_MPC8378E 0x00c4 +#define PCI_DEVICE_ID_MPC8378 0x00c5 +#define PCI_DEVICE_ID_MPC8377E 0x00c6 +#define PCI_DEVICE_ID_MPC8377 0x00c7#define PCI_DEVICE_ID_MPC8548E 0x0012#define PCI_DEVICE_ID_MPC8548 0x0013#define PCI_DEVICE_ID_MPC8543E 0x0014
Signature · 1 line
1.5.6.5
Kumar Gala
AppliedRe: [PATCH v6 1/2] powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
Quoted 19 lines · Anton Vorontsov
This patch adds support for PCI-Express controllers as found on the newer MPC83xx chips.
The work is loosely based on the Tony Li's patch[1], but unlike the original patch, this patch implements sliding window for the Type 1 transactions using outbound window translations, so we don't have to ioremap the whole PCI-E configuration space.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-January/049028.html
Signed-off-by Tony Li <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>---
On Thu, Jan 08, 2009 at 01:24:27PM -0600, Kumar Gala wrote:
[...]Quoted 2 lines
I'm ok if you get rid of
cfg_datausage.. than we aren't overloading the indirect variables for 83xx pci cfg cycles
Quoted 8 lines
Here it is.
Thanks,
arch/powerpc/sysdev/fsl_pci.c| 244 ++++++++++++++++++++++++++++++++
+++++----include/linux/pci_ids.h| 8 ++2 files changed, 228 insertions(+), 24 deletions(-)
applied
- k
RE: [PATCH 1/2] powerpc/fsl_pci: Add MPC83xx PCI-E controller RC modesupport
In reply to Anton VorontsovQuoted 2 lines
(quoted diff) +2
-0+static void __iomem *mpc83xx_pcie_remap_cfg(struct pci_bus *bus, + unsigned int devfn,=20
[snip]
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
Quoted 6 lines
arch/powerpc/sysdev/fsl_pci.c +6
-0+ if (pcie->dev_base =3D=3D dev_base) + goto mapped; + +out_le32 (hose->cfg_data +PEX_OUTWIN0_TAL , dev_base); + + pcie->dev_base =3D dev_base;
Do we need local_irq_save/local_irq_restore between them? out_le32(PEX_OUTWIN0_TAL,...) and pcie->dev_base =3D dev_base;
Quoted 3 lines
arch/powerpc/sysdev/fsl_pci.c +3
-0+mapped: +return pcie->cfg_map + offset; +}
Re: [PATCH 1/2] powerpc/fsl_pci: Add MPC83xx PCI-E controller RC modesupport
Quoted 5 lines · Liu Dave
Quoted 2 lines
(quoted diff) +2
-0+static void __iomem *mpc83xx_pcie_remap_cfg(struct pci_bus *bus, + unsigned int devfn,[snip]
Quoted 8 lines
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header); · line 373
Quoted 6 lines
arch/powerpc/sysdev/fsl_pci.c +6
-0+if (pcie->dev_base == dev_base) + goto mapped; + +out_le32 (hose->cfg_data +PEX_OUTWIN0_TAL , dev_base); + + pcie->dev_base = dev_base;Do we need local_irq_save/local_irq_restore between them?
No, I don't think we need it. drivers/pci/access.c hold an irqsave spinlock for ->read and ->write callbacks.
Quoted 5 lines
out_le32(PEX_OUTWIN0_TAL,...)andpcie->dev_base=dev_base;arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header); · line 376
Quoted 3 lines
arch/powerpc/sysdev/fsl_pci.c +3
-0+mapped: +return pcie->cfg_map + offset; +}
Thanks,
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
PATCH v5 2/2 powerpc/83xx: Add PCI-E support for all MPC83xx boards with PCI-E
In reply to Anton VorontsovThis patch adds pcie nodes to the appropriate dts files, plus adds some probing code for the boards.
Also, remove of_device_is_avaliable() check from the mpc837x_mds.c board file, as mpc83xx_add_bridge() has the same check now.
--- arch/powerpc/boot/dts/mpc8315erdb.dts | 64 +++++++++++++++++++++++++++++ arch/powerpc/boot/dts/mpc8377_mds.dts | 64 +++++++++++++++++++++++++++++ arch/powerpc/boot/dts/mpc8377_rdb.dts | 64 +++++++++++++++++++++++++++++ arch/powerpc/boot/dts/mpc8378_mds.dts | 64 +++++++++++++++++++++++++++++ arch/powerpc/boot/dts/mpc8378_rdb.dts | 64 +++++++++++++++++++++++++++++ arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 + arch/powerpc/platforms/83xx/mpc837x_mds.c | 10 +--- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 + 8 files changed, 327 insertions(+), 7 deletions(-)
arch/powerpc/boot/dts/mpc8315erdb.dts +64 -0
@@ -22,6 +22,8 @@ serial0 = &serial0; serial1 = &serial1; pci0 = &pci0; + pci1 = &pci1; + pci2 = &pci2; }; cpus {
@@ -349,4 +351,66 @@ compatible = "fsl,mpc8349-pci"; device_type = "pci"; }; + + pci1: pcie@e0009000 { + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + device_type = "pci"; + compatible = "fsl,mpc8315-pcie", "fsl,mpc8314-pcie"; + reg = <0xe0009000 0x00001000>; + ranges = <0x02000000 0 0xa0000000 0xa0000000 0 0x10000000 + 0x01000000 0 0x00000000 0xb1000000 0 0x00800000>; + bus-range = <0 255>; + interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map = <0 0 0 1 &ipic 1 8 + 0 0 0 2 &ipic 1 8 + 0 0 0 3 &ipic 1 8 + 0 0 0 4 &ipic 1 8>; + clock-frequency = <0>; + + pcie@0 { + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + reg = <0 0 0 0 0>; + ranges = <0x02000000 0 0xa0000000 + 0x02000000 0 0xa0000000 + 0 0x10000000 + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00800000>; + }; + }; + + pci2: pcie@e000a000 { + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + device_type = "pci"; + compatible = "fsl,mpc8315-pcie", "fsl,mpc8314-pcie"; + reg = <0xe000a000 0x00001000>; + ranges = <0x02000000 0 0xc0000000 0xc0000000 0 0x10000000 + 0x01000000 0 0x00000000 0xd1000000 0 0x00800000>; + bus-range = <0 255>; + interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map = <0 0 0 1 &ipic 2 8 + 0 0 0 2 &ipic 2 8 + 0 0 0 3 &ipic 2 8 + 0 0 0 4 &ipic 2 8>; + clock-frequency = <0>; + + pcie@0 { + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + reg = <0 0 0 0 0>; + ranges = <0x02000000 0 0xc0000000 + 0x02000000 0 0xc0000000 + 0 0x10000000 + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00800000>; + }; + }; };
arch/powerpc/boot/dts/mpc8377_mds.dts +64 -0
74 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8377_rdb.dts +64 -0
74 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8378_mds.dts +64 -0
74 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8378_rdb.dts +64 -0
74 lines not on this page · raw message
arch/powerpc/platforms/83xx/mpc831x_rdb.c +2 -0
@@ -38,6 +38,8 @@ static void __init mpc831x_rdb_setup_arch(void)#ifdef CONFIG_PCI for_each_compatible_node (np,"pci" ,"fsl,mpc8349-pci" )mpc83xx_add_bridge (np); +for_each_compatible_node (np,"pci" ,"fsl,mpc8314-pcie" ) +mpc83xx_add_bridge (np);#endif mpc831x_usb_cfg (); }
arch/powerpc/platforms/83xx/mpc837x_mds.c +3 -7
@@ -84,14 +84,10 @@ static void __init mpc837x_mds_setup_arch(void) ppc_md.progress ("mpc837x_mds_setup_arch()" ,0 );#ifdef CONFIG_PCI -for_each_compatible_node (np,"pci" ,"fsl,mpc8349-pci" ) { -if (!of_device_is_available (np)) { -pr_warning ("%s: disabled by the firmware.\n" , - np->full_name); -continue ; - } +for_each_compatible_node (np,"pci" ,"fsl,mpc8349-pci" ) +mpc83xx_add_bridge (np); +for_each_compatible_node (np,"pci" ,"fsl,mpc8314-pcie" )mpc83xx_add_bridge (np); - }#endif mpc837xmds_usb_cfg (); }
arch/powerpc/platforms/83xx/mpc837x_rdb.c +2 -0
@@ -38,6 +38,8 @@ static void __init mpc837x_rdb_setup_arch(void)#ifdef CONFIG_PCI for_each_compatible_node (np,"pci" ,"fsl,mpc8349-pci" )mpc83xx_add_bridge (np); +for_each_compatible_node (np,"pci" ,"fsl,mpc8314-pcie" ) +mpc83xx_add_bridge (np);#endif mpc837x_usb_cfg (); }
Signature · 1 line
1.5.6.5
Kumar Gala
AppliedRe: [PATCH 2/2] powerpc/83xx: Add PCI-E support for all MPC83xx boards with PCI-E
Quoted 18 lines · Anton Vorontsov
This patch adds pcie nodes to the appropriate dts files, plus adds some probing code for the boards.
Also, remove
of_device_is_avaliable()check from thempc837x_mds.cboard file, asmpc83xx_add_bridge()has the same check now.Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/boot/dts/mpc8315erdb.dts| 64 ++++++++++++++++++++
+++++++++arch/powerpc/boot/dts/mpc8377_mds.dts| 64 ++++++++++++++++++++
+++++++++arch/powerpc/boot/dts/mpc8377_rdb.dts| 64 ++++++++++++++++++++
+++++++++arch/powerpc/boot/dts/mpc8378_mds.dts| 64 ++++++++++++++++++++
+++++++++arch/powerpc/boot/dts/mpc8378_rdb.dts| 64 ++++++++++++++++++++
+++++++++
Quoted 4 lines
arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 + arch/powerpc/platforms/83xx/mpc837x_mds.c | 10 +--- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 + 8 files changed, 327 insertions(+), 7 deletions(-)
applied
- k