On Mar 18, 2013, at 8:50 AM, Sergey Gerasimov wrote:
> Signed-off-by: Sergey Gerasimov <[email protected]>
> ---
> arch/powerpc/sysdev/fsl_pci.c | 71 +++++++++++++++++++++----------------------
> 1 file changed, 34 insertions(+), 37 deletions(-)
>
Can you repost with subject and commit log fixed? It appears your subject &
commit message are merged.
> diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
> index 682084d..2e41a68 100644
> --- a/arch/powerpc/sysdev/fsl_pci.c
> +++ b/arch/powerpc/sysdev/fsl_pci.c
> @@ -64,6 +64,34 @@ static int __init fsl_pcie_check_link(struct
> pci_controller *hose)
> return 0;
> }
>
> +void fsl_pcibios_fixup_bus(struct pci_bus *bus)
> +{
> + struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
> + int i;
> +
> +
> + if ((bus->parent == hose->bus)
> + && ((fsl_pcie_bus_fixup
> + && pci_bus_find_capability(bus, 0, PCI_CAP_ID_EXP))
> + || (hose->indirect_type
> + & PPC_INDIRECT_TYPE_NO_PCIE_LINK))) {
> + for (i = 0; i < 4; ++i) {
> + struct resource *res = bus->resource[i];
> + struct resource *par = bus->parent->resource[i];
> + if (res) {
> + res->start = 0;
> + res->end = 0;
> + res->flags = 0;
> + }
> + if (res && par) {
> + res->start = par->start;
> + res->end = par->end;
> + res->flags = par->flags;
> + }
> + }
> + }
> +}
> +
> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx)
>
> #define MAX_PHYS_ADDR_BITS 40
> @@ -384,42 +412,6 @@ static void __init setup_pci_cmd(struct pci_controller
> *hose)
> }
> }
>
> -void fsl_pcibios_fixup_bus(struct pci_bus *bus)
> -{
> - struct pci_controller *hose = pci_bus_to_host(bus);
> - int i, is_pcie = 0, no_link;
> -
> - /* The root complex bridge comes up with bogus resources,
> - * we copy the PHB ones in.
> - *
> - * With the current generic PCI code, the PHB bus no longer
> - * has bus->resource[0..4] set, so things are a bit more
> - * tricky.
> - */
> -
> - if (fsl_pcie_bus_fixup)
> - is_pcie = early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP);
> - no_link = !!(hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK);
> -
> - if (bus->parent == hose->bus && (is_pcie || no_link)) {
> - for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; ++i) {
> - struct resource *res = bus->resource[i];
> - struct resource *par;
> -
> - if (!res)
> - continue;
> - if (i == 0)
> - par = &hose->io_resource;
> - else if (i < 4)
> - par = &hose->mem_resources[i-1];
> - else par = NULL;
> -
> - res->start = par ? par->start : 0;
> - res->end = par ? par->end : 0;
> - res->flags = par ? par->flags : 0;
> - }
> - }
> -}
>
> int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)
> {
> @@ -515,7 +507,8 @@ no_bridge:
> }
> #endif /* CONFIG_FSL_SOC_BOOKE || CONFIG_PPC_86xx */
>
> -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID,
> quirk_fsl_pcie_header);
> +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID,
> + quirk_fsl_pcie_header);
why does this need to be done EARLY?
> #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)
> struct mpc83xx_pcie_priv {
> @@ -813,6 +806,10 @@ u64 fsl_pci_immrbar_base(struct pci_controller *hose)
> }
> #endif
>
> +
> +
> +
> +
don't add extra whitespace
> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx)
> if (!is_mpc83xx_pci) {
> u32 base;
> --
> 1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
