ppc4xx: Implement is_pci_host() for 405 CPUs
PATCH 1/1 ppc4xx: Implement is_pci_host() for 405 CPUs
This patch implements the is_pci_host() function in a similiar way as it is used on 440 targets.
The former path with CONFIG_PCI_HOST == PCI_HOST_AUTO does not build on 405EP targets because checking the PCI arbiter is different. So putting the fixed code into a separate function makes the code more readable.
Also using is_pci_host() on 405 brings 405 and 440 PCI code a little bit closer.
In preparation for an upcoming 405EP based PMC module I made this function weak so that it can be overwritten from board specific code.
--- cpu/ppc4xx/4xx_pci.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-)
cpu/ppc4xx/4xx_pci.c +16 -3
@@ -99,6 +99,19 @@ ushort pmc405_pci_subsys_deviceid(void);/*#define DEBUG*/ +int __is_pci_host (struct pci_controller *hose) +{ +#if defined(CONFIG_405GP ) +if (mfdcr (strap) &PSR_PCI_ARBIT_EN ) +return 1 ; +#elif defined (CONFIG_405EP ) +if (mfdcr (cpc0_pci) &CPC0_PCI_ARBIT_EN ) +return 1 ; +#endif +return 0 ; +} +int is_pci_host (struct pci_controller *hose) __attribute__((weak,alias ("__is_pci_host" ))); +/*-----------------------------------------------------------------------------+ * pci_init. Initializes the 405GP PCI Configuration regs. *-----------------------------------------------------------------------------*/
@@ -270,7 +283,7 @@ void pci_405gp_init(struct pci_controller *hose)*/ pci_write_config_word (PCIDEVID_405GP ,PCI_SUBSYSTEM_VENDOR_ID ,CONFIG_SYS_PCI_SUBSYS_VENDORID );#ifdef CONFIG_CPCI405 -if (mfdcr (strap) &PSR_PCI_ARBIT_EN ) +if (is_pci_host (hose))pci_write_config_word (PCIDEVID_405GP ,PCI_SUBSYSTEM_ID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID );else pci_write_config_word (PCIDEVID_405GP ,PCI_SUBSYSTEM_ID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID2 );
@@ -295,7 +308,7 @@ void pci_405gp_init(struct pci_controller *hose) #if (CONFIG_PCI_HOST != PCI_HOST_ADAPTER) #if (CONFIG_PCI_HOST == PCI_HOST_AUTO) - if ((mfdcr(strap) & PSR_PCI_ARBIT_EN) || + if (is_pci_host(hose) || (((s = getenv("pciscan")) != NULL) && (strcmp(s, "yes") == 0))) #endif {
@@ -325,7 +338,7 @@ void pci_405gp_init(struct pci_controller *hose)* Scan the PCI bus and configure devices found. *--------------------------------------------------------------------------*/ #if (CONFIG_PCI_HOST ==PCI_HOST_AUTO ) -if ((mfdcr (strap) &PSR_PCI_ARBIT_EN ) || +if (is_pci_host (hose) || (((s = getenv("pciscan")) != NULL) && (strcmp(s, "yes") == 0)))#endif {
Signature · 1 line
1.6.1
Stefan Roese
AppliedPATCH 1/1 ppc4xx: Implement is_pci_host() for 405 CPUs
Quoted 8 lines · On Friday 03 July 2009 16:06:06 Matthias Fuchs wrote:
This patch implements the
is_pci_host()function in a similiar way as it is used on 440 targets.The former path with
CONFIG_PCI_HOST==PCI_HOST_AUTOdoes not build on 405EP targets because checking the PCI arbiter is different. So putting the fixed code into a separate function makes the code more readable.
Quoted 5 lines
Also using
is_pci_host()on 405 brings 405 and 440 PCI code a little bit closer.In preparation for an upcoming 405EP based PMC module I made this function weak so that it can be overwritten from board specific code.
Applied to ppc4xx. Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================