ppc4xx: Dynamic configuration of 4xx PCIe mode as root or endpoint mode

This patch adds support for dynamic configuration of PCIe ports for the
AMCC PPC4xx boards equipped with PCIe interfaces. These are the PPC440SPe
boards Yucca & Katmai and the 405EX board Kilauea.

This dynamic configuration is done via the "pcie_mode" environement
variable. This variable can be set to "EP" or "RP" for endpoint or
rootpoint mode. Multiple values can be joined via the ":" delimiter.
Here an example:

pcie_mode=RP:EP:EP

This way, PCIe port 0 will be configured as rootpoint, PCIe port 1 and 2
as endpoint.

Per default Yucca will be configured as:
pcie_mode=RP:EP:EP

Per default Katmai will be configured as:
pcie_mode=RP:RP:REP

Per default Kilauea will be configured as:
pcie_mode=RP:RP

Signed-off-by: Tirumala R Marri <tmarri@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>

1 files changed, 32 insertions, 34 deletions

diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c
index 8767f75881..b59bd6fc0e 100644
--- a/board/amcc/kilauea/kilauea.c
+++ b/board/amcc/kilauea/kilauea.c
@@ -299,35 +299,29 @@ void pci_target_init(struct pci_controller * hose )
 #endif	/* defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT) */
 
 #ifdef CONFIG_PCI
-static int pcie_port_is_rootpoint(int port)
-{
-	return 1;
-}
-
 static struct pci_controller pcie_hose[2] = {{0},{0}};
 
 void pcie_setup_hoses(int busno)
 {
 	struct pci_controller *hose;
 	int i, bus;
+	int ret = 0;
 	bus = busno;
 	char *env;
 	unsigned int delay;
 
 	for (i = 0; i < 2; i++) {
 
-		if (pcie_port_is_rootpoint(i)) {
-			printf("PORT%d will be configured as root-complex\n", i);
-			if (ppc4xx_init_pcie_rootport(i)) {
-				printf("PCIE%d: initialization failed\n", i);
-				continue;
-			}
+		if (is_end_point(i)) {
+			printf("PCIE%d: will be configured as endpoint\n", i);
+			ret = ppc4xx_init_pcie_endport(i);
 		} else {
-			printf("PORT%d will be configured as endpoint\n", i);
-			if (ppc4xx_init_pcie_endport(i)) {
-				printf("PCIE%d: initialization failed\n", i);
-				continue;
-			}
+			printf("PCIE%d: will be configured as root-complex\n", i);
+			ret = ppc4xx_init_pcie_rootport(i);
+		}
+		if (ret) {
+			printf("PCIE%d: initialization failed\n", i);
+			continue;
 		}
 
 		hose = &pcie_hose[i];
@@ -344,25 +338,29 @@ void pcie_setup_hoses(int busno)
 		hose->region_count = 1;
 		pci_register_hose(hose);
 
-		if (pcie_port_is_rootpoint(i))
-			ppc4xx_setup_pcie_rootpoint(hose, i);
-		else
-			ppc4xx_setup_pcie_endpoint(hose, i);
-
-		env = getenv("pciscandelay");
-		if (env != NULL) {
-			delay = simple_strtoul(env, NULL, 10);
-			if (delay > 5)
-				printf("Warning, expect noticable delay before PCIe"
-				       "scan due to 'pciscandelay' value!\n");
-			mdelay(delay * 1000);
-		}
+		if (is_end_point(i)) {
+		    	ppc4xx_setup_pcie_endpoint(hose, i);
+			/*
+			 * Reson for no scanning is endpoint can not generate
+			 * upstream configuration accesses.
+		    	 */
+		} else {
+		    	ppc4xx_setup_pcie_rootpoint(hose, i);
+			env = getenv ("pciscandelay");
+		    	if (env != NULL) {
+			    	delay = simple_strtoul(env, NULL, 10);
+				if (delay > 5)
+				    	printf("Warning, expect noticable delay before "
+					       "PCIe scan due to 'pciscandelay' value!\n");
+				mdelay(delay * 1000);
+			}
 
-		/*
-		 * Config access can only go down stream
-		 */
-		hose->last_busno = pci_hose_scan(hose);
-		bus = hose->last_busno + 1;
+		    	/*
+		     	 * Config access can only go down stream
+		     	 */
+		    	hose->last_busno = pci_hose_scan(hose);
+		    	bus = hose->last_busno + 1;
+		}
 	}
 }
 #endif