PERFORCE change 139705 for review

[Kevin Lo]

http://perforce.freebsd.org/chv.cgi?CH=139705

Change 139705 by kevlo at kevlo_wsl on 2008/04/10 03:46:19

	Add Marvell 88F5181 support
	Reviewed by: raj

Affected files ...

.. //depot/projects/arm/src/sys/arm/orion/5x/5x.c#2 edit
.. //depot/projects/arm/src/sys/arm/orion/orionreg.h#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/orion/5x/5x.c#2 (text+ko) ====

@@ -133,8 +133,8 @@
 	 * System dentifiers are available in the registers range
 	 * of PCIE controller.
 	 */
-	*dev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 0);
-	*rev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 8);
+	*dev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 0) >> 16;
+	*rev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 8) & 0xff;
 }
 
 void
@@ -148,30 +148,24 @@
 
 	printf("SOC: ");
 	if (bootverbose)
-		printf("(0x%8x:0x%08x) ", d, r);
+		printf("(0x%4x:0x%04x) ", d, r);
 	
-	if ((d & 0xffff) == ORION_ID_MV)
-		printf("Marvell 88F");
-	else {
-		printf("Unknown vendor\n");
-		return;
-	}
-	
-	d >>= 16;
-	r &= 0xff;
-	if (d == ORION_ID_88F5182) {
-		dev = "5182";
+	if (d == ORION_ID_88F5181) {
+		dev = "Marvell 88F5181";
+		rev = (r == 3) ? "B1" : "";
+	} else if (d == ORION_ID_88F5182) {
+		dev = "Marvell 88F5182";
 		rev = (r == 2) ? "A2" : "";
-		
 	} else if (d == ORION_ID_88F5281) {
-		dev = "5281";
+		dev = "Marvell 88F5281";
 		if (r == 4)
 			rev = "D0";
 		else if (r == 5)
 			rev = "D1";
+		else if (r == 6)
+			rev = "D2";
 		else
 			rev = "";
-
 	} else {
 		dev = "UNKNOWN";
 		rev = "";
@@ -264,8 +258,9 @@
 {
 
 	/* Depending on the SoC windows 0-1, or 0-3 have remap capability */
-	if (((dev >> 16) == ORION_ID_88F5182 && i < 2) ||
-	    ((dev >> 16) == ORION_ID_88F5281 && i < 4))
+	if ((dev == ORION_ID_88F5181 && i < 2) ||
+	    (dev == ORION_ID_88F5182 && i < 2) ||
+	    (dev == ORION_ID_88F5281 && i < 4))
 		return (1);
 
 	return (0);

==== //depot/projects/arm/src/sys/arm/orion/orionreg.h#4 (text+ko) ====

@@ -216,6 +216,7 @@
  * Chip ID
  */
 #define ORION_ID_MV		0x11ab
+#define ORION_ID_88F5181	0x5181
 #define ORION_ID_88F5182	0x5182
 #define ORION_ID_88F5281	0x5281