diff options
| author | Daniel Walker <danielwa@cisco.com> | 2015-11-06 01:31:21 +0100 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-12-23 01:23:21 +0100 |
| commit | 433c858a61ac4192f821b71cd1370886e8395863 (patch) | |
| tree | f6e8e50205dbba5ae90f3ef4691a118ced9a37ea /arch | |
| parent | powerpc/mpc85xx: Update B4 FMan MURAM size (diff) | |
| download | linux-433c858a61ac4192f821b71cd1370886e8395863.tar.xz linux-433c858a61ac4192f821b71cd1370886e8395863.zip | |
powerpc/85xx: mpc85xx ADS: remove pci exclude
This code was reworked in commit,
905e75c46dba5f3061049277e4eb7110beedba43
This change removed the fsl_add_bridge() which originally was above
the addition of the pci_exclude_device function. I think the assumption was that
the pci_exclude_device would prevent changes to the bridge PCI config after
it's been added. It seems it wasn't fully tested on MPC85xx ADS because
if you move the fsl_add_bridge() the pci_exclude_device is set in the machine
description then you can never update the PCI Config since the exclude
prevents it. This disrupts things like DMA.
This issue was extensively debugged by David Beazley.
Cc: xe-kernel@external.cisco.com
Cc: dbeazley@cisco.com
Cc: dwalker@fifo99.com
Signed-off-by: Daniel Walker <danielwa@cisco.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ads.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index 7d12a19aa7ee..de72a5f464b1 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c @@ -36,17 +36,6 @@ #include "mpc85xx.h" -#ifdef CONFIG_PCI -static int mpc85xx_exclude_device(struct pci_controller *hose, - u_char bus, u_char devfn) -{ - if (bus == 0 && PCI_SLOT(devfn) == 0) - return PCIBIOS_DEVICE_NOT_FOUND; - else - return PCIBIOS_SUCCESSFUL; -} -#endif /* CONFIG_PCI */ - static void __init mpc85xx_ads_pic_init(void) { struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN, @@ -145,10 +134,6 @@ static void __init mpc85xx_ads_setup_arch(void) init_ioports(); #endif -#ifdef CONFIG_PCI - ppc_md.pci_exclude_device = mpc85xx_exclude_device; -#endif - fsl_pci_assign_primary(); } |