Whitespace cleanup (trivial).

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3632 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 384 insertions, 384 deletions

diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c
index c331a1e53d..a224f5d7a6 100644
--- a/src/northbridge/amd/amdk8/coherent_ht.c
+++ b/src/northbridge/amd/amdk8/coherent_ht.c
@@ -1,5 +1,5 @@
-/* coherent hypertransport initialization for AMD64 
- * 
+/* coherent hypertransport initialization for AMD64
+ *
  * written by Stefan Reinauer <stepan@openbios.org>
  * (c) 2003-2004 by SuSE Linux AG
  *
@@ -16,51 +16,51 @@
  * nodes :  1    2    4    6    8
  * org.  :  1x1  2x1  2x2  2x3  2x4
  Ladder:
-			CPU7-------------CPU6 
-			|                |    
+			CPU7-------------CPU6
+			|                |
+			|                |
+			|                |
+			|                |
+			|                |
+			|                |
+			CPU5-------------CPU4
+			|                |
+			|                |
+			|                |
+			|                |
 			|                |
-			|                | 
-			|                |     
-			|                |        
-			|                |    
-			CPU5-------------CPU4                    
-			|                |    
-			|                |   
-			|                |  
-			|                |    
-			|                |         
-			|                |       
-			CPU3-------------CPU2              
-			|                |    
-			|                | 
 			|                |
+			CPU3-------------CPU2
 			|                |
-			|                | 
-			|                |    
-			CPU1-------------CPU0    
+			|                |
+			|                |
+			|                |
+			|                |
+			|                |
+			CPU1-------------CPU0
  CROSS_BAR_47_56:
-			CPU7-------------CPU6 
-			|  \____    ___/ |    
+			CPU7-------------CPU6
+			|  \____    ___/ |
 			|       \  /     |
-			|        \/      | 
-			|        /\      |     
-			|       /  \     |        
-			|  ____/    \___ |    
-			CPU5             CPU4                    
-			|                |    
-			|                |   
-			|                |  
-			|                |    
-			|                |         
-			|                |       
-			CPU3-------------CPU2              
-			|                |    
-			|                | 
+			|        \/      |
+			|        /\      |
+			|       /  \     |
+			|  ____/    \___ |
+			CPU5             CPU4
+			|                |
+			|                |
+			|                |
+			|                |
+			|                |
+			|                |
+			CPU3-------------CPU2
 			|                |
 			|                |
-			|                | 
-			|                |    
-			CPU1-------------CPU0     	
+			|                |
+			|                |
+			|                |
+			|                |
+			CPU1-------------CPU0
  */
 
 #include <device/pci_def.h>
@@ -105,15 +105,15 @@
 #endif
 
 #ifndef ENABLE_APIC_EXT_ID
-        #define ENABLE_APIC_EXT_ID 0
+	#define ENABLE_APIC_EXT_ID 0
 #endif
 
 
-static inline void print_linkn (const char *strval, uint8_t byteval) 
+static inline void print_linkn (const char *strval, uint8_t byteval)
 {
 #if 1
 #if CONFIG_USE_PRINTK_IN_CAR
-	printk_debug("%s%02x\r\n", strval, byteval); 
+	printk_debug("%s%02x\r\n", strval, byteval);
 #else
 	print_debug(strval); print_debug_hex8(byteval); print_debug("\r\n");
 #endif
@@ -126,7 +126,7 @@ static void disable_probes(void)
 	 * they don't make sense if only one cpu is available
 	 */
 
-	/* Hypetransport Transaction Control Register 
+	/* Hypetransport Transaction Control Register
 	 * F0:0x68
 	 * [ 0: 0] Disable read byte probe
 	 *         0 = Probes issues
@@ -151,7 +151,7 @@ static void disable_probes(void)
 
 	val=pci_read_config32(NODE_HT(0), HT_TRANSACTION_CONTROL);
 	val |= HTTC_DIS_FILL_P | HTTC_DIS_RMT_MEM_C | HTTC_DIS_P_MEM_C |
-		HTTC_DIS_MTS | HTTC_DIS_WR_DW_P | HTTC_DIS_WR_B_P | 
+		HTTC_DIS_MTS | HTTC_DIS_WR_DW_P | HTTC_DIS_WR_B_P |
 		HTTC_DIS_RD_DW_P | HTTC_DIS_RD_B_P;
 	pci_write_config32(NODE_HT(0), HT_TRANSACTION_CONTROL, val);
 
@@ -159,16 +159,16 @@ static void disable_probes(void)
 
 }
 
-static void enable_apic_ext_id(u8 node) 
+static void enable_apic_ext_id(u8 node)
 {
 #if ENABLE_APIC_EXT_ID==1
 #warning "FIXME Is the right place to enable apic ext id here?"
 
       u32 val;
 
-        val = pci_read_config32(NODE_HT(node), 0x68);
-        val |= (HTTC_APIC_EXT_SPUR | HTTC_APIC_EXT_ID | HTTC_APIC_EXT_BRD_CST);
-        pci_write_config32(NODE_HT(node), 0x68, val);
+	val = pci_read_config32(NODE_HT(node), 0x68);
+	val |= (HTTC_APIC_EXT_SPUR | HTTC_APIC_EXT_ID | HTTC_APIC_EXT_BRD_CST);
+	pci_write_config32(NODE_HT(node), 0x68, val);
 #endif
 }
 
@@ -228,7 +228,7 @@ static u8 link_to_register(int ldt)
 	if (ldt&0x08) return 0x40;
 	if (ldt&0x04) return 0x20;
 	if (ldt&0x02) return 0x00;
-	
+
 	/* we should never get here */
 	print_spew("Unknown Link\n");
 	return 0;
@@ -253,7 +253,7 @@ static void rename_temp_node(u8 node)
 
 	val=pci_read_config32(NODE_HT(7), 0x60);
 	val &= (~7);  /* clear low bits. */
-        val |= node;   /* new node        */
+	val |= node;  /* new node        */
 	pci_write_config32(NODE_HT(7), 0x60, val);
 
 	print_spew(" done.\r\n");
@@ -263,12 +263,12 @@ static int verify_connection(u8 dest)
 {
 	/* See if we have a valid connection to dest */
 	u32 val;
-	
+
 	/* Verify that the coherent hypertransport link is
 	 * established and actually working by reading the
 	 * remode node's vendor/device id
 	 */
-        val = pci_read_config32(NODE_HT(dest),0);
+	val = pci_read_config32(NODE_HT(dest),0);
 	if(val != 0x11001022)
 		return 0;
 
@@ -287,7 +287,7 @@ static uint16_t read_freq_cap(device_t dev, uint8_t pos)
 #if K8_HT_FREQ_1G_SUPPORT == 1
     #if K8_REV_F_SUPPORT == 0
 	if (!is_cpu_pre_e0())
-    #endif 
+    #endif
 	{
 		return freq_cap;
 	}
@@ -299,7 +299,7 @@ static uint16_t read_freq_cap(device_t dev, uint8_t pos)
 	if (id == (PCI_VENDOR_ID_AMD | (0x1100 << 16))) {
 		freq_cap &= ~(1 << HT_FREQ_1000Mhz);
 	}
-	
+
 	return freq_cap;
 }
 
@@ -353,10 +353,10 @@ static int optimize_connection(device_t node1, uint8_t link1, device_t node2, ui
 		ln_width1 = ln_width2;
 	}
 	width |= pow2_to_link_width[ln_width1] << 4;
-	
+
 	/* See if I am changing node1's width */
 	old_width = pci_read_config8(node1, link1 + PCI_HT_CAP_HOST_WIDTH + 1);
-	old_width &= 0x77;	
+	old_width &= 0x77;
 	needs_reset |= old_width != width;
 
 	/* Set node1's widths */
@@ -378,27 +378,27 @@ static int optimize_connection(device_t node1, uint8_t link1, device_t node2, ui
 
 static uint8_t get_linkn_first(uint8_t byte)
 {
-        if(byte & 0x02) { byte = 0; }
-        else if(byte & 0x04) { byte = 1; }
-        else if(byte & 0x08) { byte = 2; }
-        return byte;
+	if(byte & 0x02) { byte = 0; }
+	else if(byte & 0x04) { byte = 1; }
+	else if(byte & 0x08) { byte = 2; }
+	return byte;
 }
 
 static uint8_t get_linkn_last(uint8_t byte)
 {
-        if(byte & 0x02) { byte &= 0x0f; byte |= 0x00;  }
-        if(byte & 0x04) { byte &= 0x0f; byte |= 0x10;  }
-        if(byte & 0x08) { byte &= 0x0f; byte |= 0x20;  }
-        return byte>>4;
+	if(byte & 0x02) { byte &= 0x0f; byte |= 0x00;  }
+	if(byte & 0x04) { byte &= 0x0f; byte |= 0x10;  }
+	if(byte & 0x08) { byte &= 0x0f; byte |= 0x20;  }
+	return byte>>4;
 }
 
 static uint8_t get_linkn_last_count(uint8_t byte)
 {
-        byte &= 0x0f;
-        if(byte & 0x02) { byte &= 0xcf; byte |= 0x00; byte+=0x40; }
-        if(byte & 0x04) { byte &= 0xcf; byte |= 0x10; byte+=0x40; }
-        if(byte & 0x08) { byte &= 0xcf; byte |= 0x20; byte+=0x40; }
-        return byte>>4;
+	byte &= 0x0f;
+	if(byte & 0x02) { byte &= 0xcf; byte |= 0x00; byte+=0x40; }
+	if(byte & 0x04) { byte &= 0xcf; byte |= 0x10; byte+=0x40; }
+	if(byte & 0x08) { byte &= 0xcf; byte |= 0x20; byte+=0x40; }
+	return byte>>4;
 }
 
 static void setup_row_local(u8 source, u8 row) /* source will be 7 when it is for temp use*/
@@ -406,13 +406,13 @@ static void setup_row_local(u8 source, u8 row) /* source will be 7 when it is fo
 	uint8_t linkn;
 	uint32_t val;
 	val = 1;
-	for(linkn = 0; linkn<3; linkn++) { 
-		uint8_t regpos; 
+	for(linkn = 0; linkn<3; linkn++) {
+		uint8_t regpos;
 		uint32_t reg;
 		regpos = 0x98 + 0x20 * linkn;
 		reg = pci_read_config32(NODE_HT(source), regpos);
 		if ((reg & 0x17) != 3) continue; /* it is not conherent or not connected*/
-		val |= 1<<(linkn+1); 
+		val |= 1<<(linkn+1);
 	}
 	val <<= 16;
 	val |= 0x0101;
@@ -426,17 +426,17 @@ static void setup_row_direct_x(u8 temp, u8 source, u8 dest, u8 linkn)
 	val = 1<<(linkn+1);
 	val |= 1<<(linkn+1+8); /*for direct connect response route should equal to request table*/
 
-	if(((source &1)!=(dest &1)) 
+	if(((source &1)!=(dest &1))
 #if CROSS_BAR_47_56
 		&& ( (source<4)||(source>5) ) //(6,7) (7,6) should still be here
-					       //(6,5) (7,4) should be here	
+					       //(6,5) (7,4) should be here
 #endif
 	){
 		val |= (1<<16);
 	} else {
 		/*for CROSS_BAR_47_56  47, 56, should be here too
-			and for 47, 56, 57, 75, 46, 64 we need to substract another link to 
-				6,  7,  6,  6,  7,  7 
+			and for 47, 56, 57, 75, 46, 64 we need to substract another link to
+				6,  7,  6,  6,  7,  7
 		*/
 		val_s = get_row(temp, source);
 		val |= ((val_s>>16) - (1<<(linkn+1)))<<16;
@@ -454,26 +454,26 @@ static void opt_broadcast_rt(u8 source, u8 dest, u8 kickout) {
 }
 
 static void opt_broadcast_rt_group(const u8 *conn, int num) {
-        int i;
+	int i;
 
-        for(i=0; i<num; i+=3) {
-                opt_broadcast_rt(conn[i], conn[i+1],conn[i+2]);
-        }
+	for(i=0; i<num; i+=3) {
+		opt_broadcast_rt(conn[i], conn[i+1],conn[i+2]);
+	}
 }
 static void opt_broadcast_rt_plus(u8 source, u8 dest, u8 kickout) {
-        uint32_t val;
-        val = get_row(source, dest);
-        val += link_connection(source, kickout)<<16;
-        fill_row(source, dest, val);
-}       
-        
+	uint32_t val;
+	val = get_row(source, dest);
+	val += link_connection(source, kickout)<<16;
+	fill_row(source, dest, val);
+}
+
 static void opt_broadcast_rt_plus_group(const u8 *conn, int num) {
-        int i;  
-                
-        for(i=0; i<num; i+=3) {
-                opt_broadcast_rt_plus(conn[i], conn[i+1],conn[i+2]);
-        }       
-} 
+	int i;
+
+	for(i=0; i<num; i+=3) {
+		opt_broadcast_rt_plus(conn[i], conn[i+1],conn[i+2]);
+	}
+}
 #endif
 
 static void setup_row_direct(u8 source, u8 dest, u8 linkn){
@@ -497,8 +497,8 @@ static void clear_temp_row(u8 source)
 
 static void setup_remote_node(u8 node)
 {
-	static const uint8_t pci_reg[] = { 
-		0x44, 0x4c, 0x54, 0x5c, 0x64, 0x6c, 0x74, 0x7c, 
+	static const uint8_t pci_reg[] = {
+		0x44, 0x4c, 0x54, 0x5c, 0x64, 0x6c, 0x74, 0x7c,
 		0x40, 0x48, 0x50, 0x58, 0x60, 0x68, 0x70, 0x78,
 		0x84, 0x8c, 0x94, 0x9c, 0xa4, 0xac, 0xb4, 0xbc,
 		0x80, 0x88, 0x90, 0x98, 0xa0, 0xa8, 0xb0, 0xb8,
@@ -535,7 +535,7 @@ static void setup_row_indirect_x(u8 temp, u8 source, u8 dest, u8 gateway, u8 dif
 	/*for indirect connection, we need to compute the val from val_s(source, source), and val_g(source, gateway) */
 	uint32_t val_s;
 	uint32_t val;
-#if !CROSS_BAR_47_56	
+#if !CROSS_BAR_47_56
 	u8 gateway;
 	u8 diff;
 	if(source<dest) {
@@ -546,11 +546,11 @@ static void setup_row_indirect_x(u8 temp, u8 source, u8 dest, u8 gateway, u8 dif
 #endif
 	val_s = get_row(temp, source);
 	val = get_row(temp, gateway);
-	
+
 	val &= 0xffff;
 	val_s >>= 16;
 	val_s &= 0xfe;
-	
+
 #if !CROSS_BAR_47_56
 	diff = ((source&1)!=(dest &1));
 #endif
@@ -568,32 +568,32 @@ static void setup_row_indirect_x(u8 temp, u8 source, u8 dest, u8 gateway, u8 dif
 			if(source<dest) {
 				val_s-=link_connection(temp, source-2); /* -down*/
 			} else {
-#if CROSS_BAR_47_56		
-				#if 0		
+#if CROSS_BAR_47_56
+				#if 0
 				if(source==7) {
 					val_s-=link_connection(temp, 6);  // for 7,2 via 5
 				} else if (source==6){
 					val_s-=link_connection(temp, 7);  // for 6,3 via 4
-				} else 
+				} else
 				#endif
 				if (source < gateway) { // for 5, 4 via 7
 				  	val_s-=link_connection(temp, source-2);
 				} else
-#endif					
+#endif
 					val_s-=link_connection(temp, source+2); /* -up*/
 			}
 		}
 #endif
 		val &= 0xff;
 		val |= (val_s<<8);
-	} 
+	}
 
 	if(diff) { /* cross rung?*/
 		val |= (1<<16);
 	}
 	else {
 		val_s = get_row(temp, source);
-		val |= ((val_s>>16) - link_connection(temp, gateway))<<16; 
+		val |= ((val_s>>16) - link_connection(temp, gateway))<<16;
 	}
 
 	fill_row(temp, dest, val);
@@ -602,15 +602,15 @@ static void setup_row_indirect_x(u8 temp, u8 source, u8 dest, u8 gateway, u8 dif
 
 #if !CROSS_BAR_47_56
 static void setup_row_indirect(u8 source, u8 dest)
-{	
+{
 	setup_row_indirect_x(source, source, dest);
 }
-#else           
+#else
 static void setup_row_indirect(u8 source, u8 dest, u8 gateway, u8 diff)
 {
 	setup_row_indirect_x(source, source, dest, gateway, diff);
 }
-#endif   
+#endif
 
 static void setup_row_indirect_group(const u8 *conn, int num)
 {
@@ -674,9 +674,9 @@ static int optimize_connection_group(const u8 *opt_conn, int num) {
 		needs_reset = optimize_connection(
 			NODE_HT(opt_conn[i]), 0x80 + link_to_register(link_connection(opt_conn[i],opt_conn[i+1])),
 			NODE_HT(opt_conn[i+1]), 0x80 + link_to_register(link_connection(opt_conn[i+1],opt_conn[i])) );
-	}               
+	}
 	return needs_reset;
-}  
+}
 #endif
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 1
@@ -688,7 +688,7 @@ static unsigned setup_smp2(void)
 	nodes = 2;
 
 	setup_row_local(0, 0); /* it will update the broadcast RT*/
-	
+
 	val = get_row(0,0);
 	byte = (val>>16) & 0xfe;
 	if(byte<0x2) { /* no coherent connection so get out.*/
@@ -705,7 +705,7 @@ static unsigned setup_smp2(void)
 	print_linkn("(0,1) link=", byte);
 	setup_row_direct(0,1, byte);
 	setup_temp_row(0, 1);
-	
+
 	verify_connection(7);
 
 	/* We found 2 nodes so far */
@@ -715,7 +715,7 @@ static unsigned setup_smp2(void)
 	setup_row_local(7,1);
 	setup_remote_row_direct(1, 0, byte);
 
-#if (CONFIG_MAX_PHYSICAL_CPUS > 4) || (CONFIG_MAX_PHYSICAL_CPUS_4_BUT_MORE_INSTALLED == 1)	
+#if (CONFIG_MAX_PHYSICAL_CPUS > 4) || (CONFIG_MAX_PHYSICAL_CPUS_4_BUT_MORE_INSTALLED == 1)
 	val = get_row(7,1);
 	byte = (val>>16) & 0xfe;
 	byte = get_linkn_last_count(byte);
@@ -730,18 +730,18 @@ static unsigned setup_smp2(void)
 		print_linkn("\t-->(0,1) link=", byte);
 		setup_row_direct(0,1, byte);
 		setup_temp_row(0, 1);
-	
+
 		verify_connection(7);
-			
+
 		/* We found 2 nodes so far */
 		val = pci_read_config32(NODE_HT(7), 0x6c);
 		byte = (val>>2) & 0x3; /* get default link on node7 to node0*/
-		print_linkn("\t-->(1,0) link=", byte); 
+		print_linkn("\t-->(1,0) link=", byte);
 		setup_row_local(7,1);
 		setup_remote_row_direct(1, 0, byte);
 	}
 #endif
-	
+
 	setup_remote_node(1);  /* Setup the regs on the remote node */
 	rename_temp_node(1);    /* Rename Node 7 to Node 1  */
 	enable_routing(1);      /* Enable routing on Node 1 */
@@ -775,7 +775,7 @@ static unsigned setup_smp4(void)
 	}
 
 	byte &= 3; /* bit [3,2] is count-1*/
-	print_linkn("(0,2) link=", byte); 
+	print_linkn("(0,2) link=", byte);
 	setup_row_direct(0, 2, byte);  /*(0,2) direct link done*/
 
 	/* We found 3 nodes so far. Now setup a temporary
@@ -786,7 +786,7 @@ static unsigned setup_smp4(void)
 	val = get_row(1,1);
 	byte = ((val>>16) & 0xfe) - link_connection(1,0);
 	byte = get_linkn_first(byte);
-	print_linkn("(1,3) link=", byte); 
+	print_linkn("(1,3) link=", byte);
 	setup_row_direct(1,3,byte);  /* (1, 3) direct link done*/
 
 	/* We found 4 nodes so far. Now setup all nodes for 4p */
@@ -795,7 +795,7 @@ static unsigned setup_smp4(void)
 	static const u8 conn4_1[] = {
 		0,3,
 		1,2,
-	};	
+	};
 #else
 	static const u8 conn4_1[] = {
 		0,3,2,1,
@@ -809,7 +809,7 @@ static unsigned setup_smp4(void)
 	verify_connection(7);
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 0*/
-	print_linkn("(2,0) link=", byte); 
+	print_linkn("(2,0) link=", byte);
 
 	setup_row_local(7,2);
 	setup_remote_row_direct(2, 0, byte);  /* node 2 to node 0 direct link done */
@@ -824,7 +824,7 @@ static unsigned setup_smp4(void)
 
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 1*/
-	print_linkn("(3,1) link=", byte); 
+	print_linkn("(3,1) link=", byte);
 
 	setup_row_local(7,3);
 	setup_remote_row_direct(3, 1, byte); /* node 3 to node 1 direct link done */
@@ -835,7 +835,7 @@ static unsigned setup_smp4(void)
 	byte = ((val>>16) & 0xfe) - link_connection(2,0);
 	byte = get_linkn_last_count(byte);
 	print_linkn("(2,3) link=", byte & 3);
-	
+
 	setup_row_direct(2,3, byte & 0x3);
 	setup_temp_row(0,2);
 	setup_temp_row(2,3);
@@ -849,68 +849,68 @@ static unsigned setup_smp4(void)
 			val = get_row(2,2);
 			byte = ((val>>16) & 0xfe) - link_connection(2,0);
 			byte = get_linkn_first(byte);
-			print_linkn("\t-->(2,3) link=", byte); 
+			print_linkn("\t-->(2,3) link=", byte);
 			setup_row_direct(2,3,byte);
 			setup_temp_row(2,3);
 			verify_connection(7); /* to 3*/
 		}
-	} 
+	}
 #endif
 
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 2*/
-	print_linkn("(3,2) link=", byte); 
+	print_linkn("(3,2) link=", byte);
 	setup_remote_row_direct(3,2, byte);
 
 #if (CONFIG_MAX_PHYSICAL_CPUS > 4) || (CONFIG_MAX_PHYSICAL_CPUS_4_BUT_MORE_INSTALLED == 1)
 	/* set link from 3 to 5 before enable it*/
-        val = get_row(7,3);
-        byte = ((val>>16) & 0xfe) - link_connection(7,2) - link_connection(7,1);
-        byte = get_linkn_last_count(byte);
-        if((byte>>2)==1) { /* We should have three coherent links on node 3 for 6p and above*/
-        	byte &= 3; /*bit [3,2] is count-2*/
-	        print_linkn("(3,5) link=", byte);
-	        setup_remote_row_direct(3, 5, byte);
+	val = get_row(7,3);
+	byte = ((val>>16) & 0xfe) - link_connection(7,2) - link_connection(7,1);
+	byte = get_linkn_last_count(byte);
+	if((byte>>2)==1) { /* We should have three coherent links on node 3 for 6p and above*/
+		byte &= 3; /*bit [3,2] is count-2*/
+		print_linkn("(3,5) link=", byte);
+		setup_remote_row_direct(3, 5, byte);
 	}
-	
-        val = get_row(2,2);
-        byte = ((val>>16) & 0xfe) - link_connection(2,3) - link_connection(2,0);
-        byte = get_linkn_last_count(byte);
 
-        if((byte>>2)==1) { /* We should have three coherent link on node 2 for 6p and above*/
-	        byte &= 3; /* bit [3,2] is count-2*/
-	        print_linkn("(2,4) link=", byte);
-	        setup_row_direct(2, 4, byte);
-	}	
+	val = get_row(2,2);
+	byte = ((val>>16) & 0xfe) - link_connection(2,3) - link_connection(2,0);
+	byte = get_linkn_last_count(byte);
+
+	if((byte>>2)==1) { /* We should have three coherent link on node 2 for 6p and above*/
+		byte &= 3; /* bit [3,2] is count-2*/
+		print_linkn("(2,4) link=", byte);
+		setup_row_direct(2, 4, byte);
+	}
 #endif
 
 	//Beside 3, 1 is set, We need to make sure 3, 5 is set already in case has three link in 3
 #if !CROSS_BAR_47_56
-        static const u8 conn4_3[] = {
-                3,0,
-        };
+	static const u8 conn4_3[] = {
+		3,0,
+	};
 #else
-        static const u8 conn4_3[] = {
-                3,0,1,1,
-        };
+	static const u8 conn4_3[] = {
+		3,0,1,1,
+	};
 #endif
-        setup_remote_row_indirect_group(conn4_3, ARRAY_SIZE(conn4_3));
+	setup_remote_row_indirect_group(conn4_3, ARRAY_SIZE(conn4_3));
 
 /* ready to enable RT for Node 3 */
 	rename_temp_node(3);
 	enable_routing(3);      /* enable routing on node 3 (temp.) */
 
 	// beside 2, 0 is set, We need to make sure 2, 4 link is set already in case has three link in 2
-#if !CROSS_BAR_47_56    
-        static const u8 conn4_2[] = {
-                2,1,  
-        };      
-#else   
-        static const u8 conn4_2[] = {
-                2,1,0,1,
-        };      
-#endif          
-        setup_row_indirect_group(conn4_2, ARRAY_SIZE(conn4_2));
+#if !CROSS_BAR_47_56
+	static const u8 conn4_2[] = {
+		2,1,
+	};
+#else
+	static const u8 conn4_2[] = {
+		2,1,0,1,
+	};
+#endif
+	setup_row_indirect_group(conn4_2, ARRAY_SIZE(conn4_2));
 
 #if 0
 	/*We need to do sth to reverse work for setup_temp_row (0,1) (1,3) */
@@ -936,27 +936,27 @@ static unsigned setup_smp6(void)
 	nodes=6;
 
 	/* Setup and check temporary connection from Node 0 to Node 4  through 2*/
-        val = get_row(2,2);
-        byte = ((val>>16) & 0xfe) - link_connection(2,3) - link_connection(2,0);
-        byte = get_linkn_last_count(byte);
+	val = get_row(2,2);
+	byte = ((val>>16) & 0xfe) - link_connection(2,3) - link_connection(2,0);
+	byte = get_linkn_last_count(byte);
 
-        if((byte>>2)==0) { /* We should have three coherent link on node 2 for 6p and above*/
-                nodes = 4;
-                return nodes;
-        }
+	if((byte>>2)==0) { /* We should have three coherent link on node 2 for 6p and above*/
+		nodes = 4;
+		return nodes;
+	}
 
 	/* Setup and check temporary connection from Node 0 to Node 5  through 1, 3*/
-        /* set link from 3 to 5 before enable it*/
-        val = get_row(3,3);
-        byte = ((val>>16) & 0xfe) - link_connection(3,2) - link_connection(3,1);
-        byte = get_linkn_last_count(byte);
-        if((byte>>2)==0) { /* We should have three coherent links on node 3 for 6p and above*/
-                nodes = 4;
-                return nodes;
-        }
-	
+	/* set link from 3 to 5 before enable it*/
+	val = get_row(3,3);
+	byte = ((val>>16) & 0xfe) - link_connection(3,2) - link_connection(3,1);
+	byte = get_linkn_last_count(byte);
+	if((byte>>2)==0) { /* We should have three coherent links on node 3 for 6p and above*/
+		nodes = 4;
+		return nodes;
+	}
+
 	/* We found 6 nodes so far. Now setup all nodes for 6p */
-#warning "FIXME we need to find out the correct gateway for 6p"	
+#warning "FIXME we need to find out the correct gateway for 6p"
 	static const u8 conn6_1[] = {
 #if !CROSS_BAR_47_56
 		0, 4,
@@ -973,22 +973,22 @@ static unsigned setup_smp6(void)
 		2, 5, 3, 0,
 		3, 4, 2, 0,
 #endif
-	}; 
+	};
 
 	setup_row_indirect_group(conn6_1, ARRAY_SIZE(conn6_1));
-	
+
 	for(byte=0; byte<4; byte+=2) {
 		setup_temp_row(byte,byte+2);
 	}
 	verify_connection(7);
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /*get default link on 7 to 2*/
-	print_linkn("(4,2) link=", byte); 
-	
+	print_linkn("(4,2) link=", byte);
+
 	setup_row_local(7,4);
 	setup_remote_row_direct(4, 2, byte);
 	setup_remote_node(4);  /* Setup the regs on the remote node */
-	
+
 	/* Set indirect connection to 0, to 3 */
 	//we only need to set 4,0 here
 	static const u8 conn6_2[] = {
@@ -997,10 +997,10 @@ static unsigned setup_smp6(void)
 #else
 		4, 0, 2, 0,
 #endif
-	};      
-	
+	};
+
 	setup_remote_row_indirect_group(conn6_2, ARRAY_SIZE(conn6_2));
-	
+
 	rename_temp_node(4);
 	enable_routing(4);
 
@@ -1012,18 +1012,18 @@ static unsigned setup_smp6(void)
 
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 3*/
-	print_linkn("(5,3) link=", byte); 
+	print_linkn("(5,3) link=", byte);
 	setup_row_local(7,5);
 	setup_remote_row_direct(5, 3, byte);
 	setup_remote_node(5);  /* Setup the regs on the remote node */
-	
+
 #if !CROSS_BAR_47_56
 	/* We need to init link between 4, and 5 direct link */
 	val = get_row(4,4);
 	byte = ((val>>16) & 0xfe) - link_connection(4,2);
 	byte = get_linkn_last_count(byte);
 	print_linkn("(4,5) link=", byte & 3);
-	
+
 	setup_row_direct(4,5, byte & 0x3);
 	setup_temp_row(0,2);
 	setup_temp_row(2,4);
@@ -1032,7 +1032,7 @@ static unsigned setup_smp6(void)
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 6
 	/* We need to find out which link is to node5 */
-	
+
 	if((byte>>2)==2) { /* one to node5, one to node2, one to node6*/
 		val = get_row(7,5);
 		if((val>>16) == 1) { /* that link is to node6, because via node 3 node 5 has been set*/
@@ -1044,37 +1044,37 @@ static unsigned setup_smp6(void)
 			setup_temp_row(4,5);
 			verify_connection(7); /* to 5*/
 		}
-	} 
+	}
 #endif
 
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 4*/
-	print_linkn("(5,4) link=", byte); 
+	print_linkn("(5,4) link=", byte);
 	setup_remote_row_direct(5,4, byte);
-	
+
 	//init 5, 7 here
-        val = get_row(7,5);
-        byte = ((val>>16) & 0xfe) - link_connection(7,4) - link_connection(7,3);
-        byte = get_linkn_last_count(byte);
-        if((byte>>2)==1) { /* We should have three coherent links on node 5 for 6p and above*/
-        	byte &= 3; /*bit [3,2] is count-2*/
-	        print_linkn("(5,7) link=", byte);
-	        setup_remote_row_direct(5, 7, byte);
+	val = get_row(7,5);
+	byte = ((val>>16) & 0xfe) - link_connection(7,4) - link_connection(7,3);
+	byte = get_linkn_last_count(byte);
+	if((byte>>2)==1) { /* We should have three coherent links on node 5 for 6p and above*/
+		byte &= 3; /*bit [3,2] is count-2*/
+		print_linkn("(5,7) link=", byte);
+		setup_remote_row_direct(5, 7, byte);
 	}
-	
+
 	//init 4,6 here
-        val = get_row(4,4);
-        byte = ((val>>16) & 0xfe) - link_connection(4,5) - link_connection(4,2);
-        byte = get_linkn_last_count(byte);
-
-        if((byte>>2)==1) { /* We should have three coherent link on node 4 for 6p and above*/
-	        byte &= 3; /* bit [3,2] is count-2*/
-	        print_linkn("(4,6) link=", byte);
-	        setup_row_direct(4, 6, byte);
-	}	
-	
-#endif	
-	
+	val = get_row(4,4);
+	byte = ((val>>16) & 0xfe) - link_connection(4,5) - link_connection(4,2);
+	byte = get_linkn_last_count(byte);
+
+	if((byte>>2)==1) { /* We should have three coherent link on node 4 for 6p and above*/
+		byte &= 3; /* bit [3,2] is count-2*/
+		print_linkn("(4,6) link=", byte);
+		setup_row_direct(4, 6, byte);
+	}
+
+#endif
+
 	//We need to set 5,0 here only, We need to set up 5, 7 to make 5,0
 	/* Set indirect connection to 0, to 3  for indirect we will use clockwise routing */
 	static const u8 conn6_3[] = {
@@ -1083,8 +1083,8 @@ static unsigned setup_smp6(void)
 #else
 		5, 0, 3, 0,
 #endif
-	};      
-	
+	};
+
 	setup_remote_row_indirect_group(conn6_3, ARRAY_SIZE(conn6_3));
 
 /* ready to enable RT for 5 */
@@ -1095,27 +1095,27 @@ static unsigned setup_smp6(void)
 #if !CROSS_BAR_47_56
 		4, 1,
 		4, 3,
-		
+
 		5, 2,
 		5, 1,
-		
+
 #else
 		4, 1, 2, 0,
 		4, 3, 2, 0,
 		4, 5, 2, 0,
-		
+
 		5, 2, 3, 0,
 		5, 1, 3, 0,
 		5, 4, 3, 0,
-		
+
 #endif
-	};      
-	
+	};
+
 	setup_row_indirect_group(conn6_4, ARRAY_SIZE(conn6_4));
 
 #if 0
 	/* We need to do sth about reverse about setup_temp_row (0,1), (2,4), (1, 3), (3,5)
-	 * It will be done by clear_dead_links 
+	 * It will be done by clear_dead_links
 	 */
 	for(byte=0; byte<4; byte++) {
 		clear_temp_row(byte);
@@ -1140,18 +1140,18 @@ static unsigned setup_smp8(void)
 
 	/* Setup and check temporary connection from Node 0 to Node 6 via 2 and 4 to 7 */
 	val = get_row(4,4);
-#if CROSS_BAR_47_56 
+#if CROSS_BAR_47_56
 	byte = ((val>>16) & 0xfe) - link_connection(4,2);
 #else
 	byte = ((val>>16) & 0xfe) - link_connection(4,5) - link_connection(4,2);
-        byte = get_linkn_last_count(byte); /* Max link to 6*/
-        if((byte>>2)==0) { /* We should have two or three coherent links on node 4 for 8p*/
-                nodes = 6;
-                return nodes;
-        }
+	byte = get_linkn_last_count(byte); /* Max link to 6*/
+	if((byte>>2)==0) { /* We should have two or three coherent links on node 4 for 8p*/
+		nodes = 6;
+		return nodes;
+	}
 #endif
 
-#if CROSS_BAR_47_56 
+#if CROSS_BAR_47_56
 	byte = get_linkn_last_count(byte); /* Max link to 6*/
 	if((byte>>2)<2) { /* We should have two or three coherent links on node 4 for 8p*/
 		nodes = 6;
@@ -1169,13 +1169,13 @@ static unsigned setup_smp8(void)
 
 #if !CROSS_BAR_47_56
 	/* Setup and check temporary connection from Node 0 to Node 7  through 1, 3, 5*/
-        val = get_row(5,5);
-        byte = ((val>>16) & 0xfe) - link_connection(5,4) - link_connection(5,3);
-        byte = get_linkn_last_count(byte);
-        if((byte>>2)==0) { /* We should have three coherent links on node 5 for 6p and above*/
-                nodes = 6;
-                return nodes;
-        }
+	val = get_row(5,5);
+	byte = ((val>>16) & 0xfe) - link_connection(5,4) - link_connection(5,3);
+	byte = get_linkn_last_count(byte);
+	if((byte>>2)==0) { /* We should have three coherent links on node 5 for 6p and above*/
+		nodes = 6;
+		return nodes;
+	}
 #endif
 
 	/* We found 8 nodes so far. Now setup all nodes for 8p */
@@ -1212,12 +1212,12 @@ static unsigned setup_smp8(void)
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 4*/
 	print_linkn("(6,4) link=", byte);
-	
+
 	setup_row_local(7,6);
 	setup_remote_row_direct(6, 4, byte);
 	setup_remote_node(6);  /* Setup the regs on the remote node */
 	/* Set indirect connection to 0, to 3   */
-#warning "FIXME we need to find out the correct gateway for 8p"		
+#warning "FIXME we need to find out the correct gateway for 8p"
 	static const u8 conn8_2[] = {
 #if !CROSS_BAR_47_56
 		6, 0,
@@ -1230,55 +1230,55 @@ static unsigned setup_smp8(void)
 
 #if CROSS_BAR_47_56
 	//init 5, 6 here
-        /* here init 5, 6 */
-        /* Setup and check temporary connection from Node 0 to Node 5  through 1, 3, 5*/
-        val = get_row(5,5);
-        byte = ((val>>16) & 0xfe) - link_connection(5,3);
+	/* here init 5, 6 */
+	/* Setup and check temporary connection from Node 0 to Node 5  through 1, 3, 5*/
+	val = get_row(5,5);
+	byte = ((val>>16) & 0xfe) - link_connection(5,3);
 #if TRY_HIGH_FIRST == 1
 	byte = get_linkn_first(byte);
 #else
-        byte = get_linkn_last(byte);        
+	byte = get_linkn_last(byte);
 #endif
-        print_linkn("(5,6) link=", byte);
-        setup_row_direct(5, 6, byte);
+	print_linkn("(5,6) link=", byte);
+	setup_row_direct(5, 6, byte);
 
-        setup_temp_row(0,1); /* temp. link between nodes 0 and 1 */
-        for(byte=0; byte<4; byte+=2) {
-                setup_temp_row(byte+1,byte+3);
-        }
+	setup_temp_row(0,1); /* temp. link between nodes 0 and 1 */
+	for(byte=0; byte<4; byte+=2) {
+		setup_temp_row(byte+1,byte+3);
+	}
 	setup_temp_row(5,6);
 
-        verify_connection(7);
+	verify_connection(7);
 
 	val = get_row(7,6); // to chect it if it is node6 before renaming
 	if( (val>>16) == 1) { // it is real node 7 so swap it
-                /* We need to recompute link to 6 */
-       	        val = get_row(5,5);
-               	byte = ((val>>16) & 0xfe) - link_connection(5,3);
+		/* We need to recompute link to 6 */
+       		val = get_row(5,5);
+	       	byte = ((val>>16) & 0xfe) - link_connection(5,3);
 #if TRY_HIGH_FIRST == 1
-                byte = get_linkn_first(byte);
+		byte = get_linkn_first(byte);
 #else
-       	        byte = get_linkn_last(byte);
+       		byte = get_linkn_last(byte);
 #endif
-               	print_linkn("\t-->(5,6) link=", byte);
-                setup_row_direct(5, 6, byte);
+	       	print_linkn("\t-->(5,6) link=", byte);
+		setup_row_direct(5, 6, byte);
 #if 0
-               	setup_temp_row(0,1); /* temp. link between nodes 0 and 1 */
-                for(byte=0; byte<4; byte+=2) {
-       	                setup_temp_row(byte+1,byte+3); 
-               	}
+	       	setup_temp_row(0,1); /* temp. link between nodes 0 and 1 */
+		for(byte=0; byte<4; byte+=2) {
+       			setup_temp_row(byte+1,byte+3);
+	       	}
 #endif
 		setup_temp_row(5,6);
 
-       	        verify_connection(7);
+       		verify_connection(7);
 	}
-        val = pci_read_config32(NODE_HT(7), 0x6c);
-        byte = (val>>2) & 0x3; /* get default link on 7 to 5*/
-        print_linkn("(6,5) link=", byte);
-        setup_remote_row_direct(6, 5, byte);
-        /*Till now 56, 65 done */
+	val = pci_read_config32(NODE_HT(7), 0x6c);
+	byte = (val>>2) & 0x3; /* get default link on 7 to 5*/
+	print_linkn("(6,5) link=", byte);
+	setup_remote_row_direct(6, 5, byte);
+	/*Till now 56, 65 done */
 #endif
-	
+
 	rename_temp_node(6);
 	enable_routing(6);
 
@@ -1292,27 +1292,27 @@ static unsigned setup_smp8(void)
 
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 5*/
-	print_linkn("(7,5) link=", byte); 
+	print_linkn("(7,5) link=", byte);
 	setup_row_local(7,7);
 	setup_remote_row_direct(7, 5, byte);
 
 #else
-        val = get_row(4,4);
-        byte = ((val>>16) & 0xfe) - link_connection(4,2) - link_connection(4,6);
-        byte = get_linkn_first(byte); 
-        print_linkn("(4,7) link=", byte); 
-        setup_row_direct(4, 7, byte);
+	val = get_row(4,4);
+	byte = ((val>>16) & 0xfe) - link_connection(4,2) - link_connection(4,6);
+	byte = get_linkn_first(byte);
+	print_linkn("(4,7) link=", byte);
+	setup_row_direct(4, 7, byte);
 
-        /* Setup and check temporary connection from Node 0 to Node 7 through 2, and 4*/
+	/* Setup and check temporary connection from Node 0 to Node 7 through 2, and 4*/
 	for(byte=0; byte<4; byte+=2) {
 		setup_temp_row(byte,byte+2);
 	}
 
-        verify_connection(7);
+	verify_connection(7);
 
 	val = pci_read_config32(NODE_HT(7), 0x6c);
 	byte = (val>>2) & 0x3; /* get default link on 7 to 4*/
-	print_linkn("(7,4) link=", byte); 
+	print_linkn("(7,4) link=", byte);
 	setup_row_local(7,7);
 	setup_remote_row_direct(7, 4, byte);
 	/* till now 4-7, 7-4 done. */
@@ -1325,12 +1325,12 @@ static unsigned setup_smp8(void)
 	val = get_row(5,5);
 	byte = ((val>>16) & 0xfe) - link_connection(5,3) - link_connection(5,6);
 	byte = get_linkn_first(byte);
-	print_linkn("(5,7) link=", byte); 
+	print_linkn("(5,7) link=", byte);
 	setup_row_direct(5, 7, byte);
-	
+
 	setup_temp_row(0,1); /* temp. link between nodes 0 and 1 */
 	for(byte=0; byte<4; byte+=2) {
-		setup_temp_row(byte+1,byte+3); 
+		setup_temp_row(byte+1,byte+3);
 	}
 
 	verify_connection(7);
@@ -1340,7 +1340,7 @@ static unsigned setup_smp8(void)
 	print_linkn("(7,5) link=", byte);
 	setup_remote_row_direct(7, 5, byte);
 	/*Till now 57, 75 done */
-	
+
 #endif
 
 	/* We need to init link between 6, and 7 direct link */
@@ -1372,12 +1372,12 @@ static unsigned setup_smp8(void)
 		2, 7,
 		3, 7,
 		4, 7,
-		
+
 		6, 1,
 		6, 2,
 		6, 3,
 		6, 5,
-		
+
 		7, 0,
 		7, 1,
 		7, 2,
@@ -1385,68 +1385,68 @@ static unsigned setup_smp8(void)
 		7, 4,
 #else
 
-		
-                4, 5, 6, 1,
-                5, 4, 7, 1,
 
-                6, 1, 5, 0, // or 4, 1
-                6, 2, 4, 0,
-                6, 3, 5, 0, // or 4, 1
+		4, 5, 6, 1,
+		5, 4, 7, 1,
+
+		6, 1, 5, 0, // or 4, 1
+		6, 2, 4, 0,
+		6, 3, 5, 0, // or 4, 1
 
-                7, 0, 4, 0, // or 5, 1
-                7, 1, 5, 0,
-                7, 2, 4, 0, // or 5, 1
-                7, 3, 5, 0,
+		7, 0, 4, 0, // or 5, 1
+		7, 1, 5, 0,
+		7, 2, 4, 0, // or 5, 1
+		7, 3, 5, 0,
 
 		0, 7, 2, 0, /* restore it*/
 		1, 7, 3, 0,
 		2, 7, 4, 1,
 		3, 7, 5, 0,
 
-                2, 5, 4, 1, /* reset it */
-                3, 4, 5, 1,
+		2, 5, 4, 1, /* reset it */
+		3, 4, 5, 1,
 
 		4, 1, 2, 1, /* reset it */
 		4, 3, 2, 1,
 
 		5, 2, 3, 1, /* reset it */
 		5, 0, 3, 1,
-		
+
 #endif
 	};
 
 	setup_row_indirect_group(conn8_3, ARRAY_SIZE(conn8_3));
 
 #if CROSS_BAR_47_56
-        /* for 47, 56, 57, 75, 46, 64 we need to substract another link to 
-               6,  7,  6,  6,  7,  7 */
-        static const u8 conn8_4[] = {
+	/* for 47, 56, 57, 75, 46, 64 we need to substract another link to
+	       6,  7,  6,  6,  7,  7 */
+	static const u8 conn8_4[] = {
 //direct
-                4, 7, 6,
-                5, 6, 7, 
-		5, 7, 6, 
-		7, 5, 6,  
-		4, 6, 7, 
-		6, 4, 7, 
+		4, 7, 6,
+		5, 6, 7,
+		5, 7, 6,
+		7, 5, 6,
+		4, 6, 7,
+		6, 4, 7,
 
 //in direct
-		0, 6, 1, 
-		0, 7, 1, 
-		
-		1, 6, 0, 
-		1, 7, 0, 
+		0, 6, 1,
+		0, 7, 1,
+
+		1, 6, 0,
+		1, 7, 0,
 
-		2, 6, 3, 
+		2, 6, 3,
 //		2, 7, 3, +
-		
+
 //		3, 6, 1, +
 		3, 7, 2,
- 
+
 		6, 0, 7,
 		6, 1, 7, // needed for via 5
 			6, 1, 4, // ???
 		6, 2, 7,
-		6, 3, 7, // needed for via 5 
+		6, 3, 7, // needed for via 5
 			6, 3, 4, //???
 		7, 0, 6, // needed for via 4
 			7, 0, 5, //???
@@ -1454,21 +1454,21 @@ static unsigned setup_smp8(void)
 		7, 2, 6, // needed for via 4
 			7, 2, 5, //???
 		7, 3, 6,
-        };
+	};
 
-        opt_broadcast_rt_group(conn8_4, ARRAY_SIZE(conn8_4));
+	opt_broadcast_rt_group(conn8_4, ARRAY_SIZE(conn8_4));
 
-        static const u8 conn8_5[] = {
-                2, 7, 0, 
+	static const u8 conn8_5[] = {
+		2, 7, 0,
 
-                3, 6, 1, 
-        };      
-                
-        opt_broadcast_rt_plus_group(conn8_5, ARRAY_SIZE(conn8_5));
+		3, 6, 1,
+	};
+
+	opt_broadcast_rt_plus_group(conn8_5, ARRAY_SIZE(conn8_5));
 #endif
 
 
-	
+
 /* ready to enable RT for Node 7 */
 	enable_routing(7);      /* enable routing on node 7 (temp.) */
 
@@ -1485,20 +1485,20 @@ static unsigned setup_smp(void)
 	unsigned nodes;
 
 	print_spew("Enabling SMP settings\r\n");
-		
+
 	nodes = setup_smp2();
 #if CONFIG_MAX_PHYSICAL_CPUS > 2
-	if(nodes == 2) 
+	if(nodes == 2)
 		nodes = setup_smp4();
 #endif
-	
+
 #if CONFIG_MAX_PHYSICAL_CPUS > 4
 	if(nodes == 4)
 		nodes = setup_smp6();
 #endif
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 6
-	if(nodes == 6) 
+	if(nodes == 6)
 		nodes = setup_smp8();
 #endif
 
@@ -1508,20 +1508,20 @@ static unsigned setup_smp(void)
 	print_debug_hex8(nodes);
 	print_debug(" nodes initialized.\r\n");
 #endif
-	
+
 	return nodes;
 }
 
 static unsigned verify_mp_capabilities(unsigned nodes)
 {
 	unsigned node, mask;
-	
+
 	mask = 0x06; /* BigMPCap */
 
 	for (node=0; node<nodes; node++) {
 		mask &= pci_read_config32(NODE_MC(node), 0xe8);
 	}
-	
+
 	switch(mask) {
 #if CONFIG_MAX_PHYSICAL_CPUS > 2
 	case 0x02: /* MPCap    */
@@ -1538,7 +1538,7 @@ static unsigned verify_mp_capabilities(unsigned nodes)
 		}
 		break;
 	}
-	
+
 	return nodes;
 
 }
@@ -1560,14 +1560,14 @@ static void clear_dead_routes(unsigned nodes)
 			fill_row(node, row, DEFAULT);
 		}
 	}
-	
+
 	/* Update the local row */
 	for( node=0; node<nodes; node++) {
 		uint32_t val = 0;
 		for(row =0; row<nodes; row++) {
 			val |= get_row(node, row);
 		}
-		fill_row(node, node, (((val & 0xff) | ((val >> 8) & 0xff)) << 16) | 0x0101); 
+		fill_row(node, node, (((val & 0xff) | ((val >> 8) & 0xff)) << 16) | 0x0101);
 	}
 }
 #endif /* CONFIG_MAX_PHYSICAL_CPUS > 1 */
@@ -1584,7 +1584,7 @@ static unsigned verify_dualcore(unsigned nodes)
 	}
 
 	return totalcpus;
-		
+
 }
 #endif
 
@@ -1604,7 +1604,7 @@ static void coherent_ht_finalize(unsigned nodes)
 		total_cpus = nodes;
 	}
 #endif
-	
+
 	/* set up cpu count and node count and enable Limit
 	 * Config Space Range for all available CPUs.
 	 * Also clear non coherent hypertransport bus range
@@ -1631,13 +1631,13 @@ static void coherent_ht_finalize(unsigned nodes)
 		pci_write_config32(dev, 0x60, val);
 
 		/* Only respond to real cpu pci configuration cycles
-		 * and optimize the HT settings 
+		 * and optimize the HT settings
 		 */
 		val=pci_read_config32(dev, HT_TRANSACTION_CONTROL);
 		val &= ~((HTTC_BUF_REL_PRI_MASK << HTTC_BUF_REL_PRI_SHIFT) |
 			(HTTC_MED_PRI_BYP_CNT_MASK << HTTC_MED_PRI_BYP_CNT_SHIFT) |
 			(HTTC_HI_PRI_BYP_CNT_MASK << HTTC_HI_PRI_BYP_CNT_SHIFT));
-		val |= HTTC_LIMIT_CLDT_CFG | 
+		val |= HTTC_LIMIT_CLDT_CFG |
 			(HTTC_BUF_REL_PRI_8 << HTTC_BUF_REL_PRI_SHIFT) |
 			(3 << HTTC_MED_PRI_BYP_CNT_SHIFT) |
 			(3 << HTTC_HI_PRI_BYP_CNT_SHIFT);
@@ -1667,7 +1667,7 @@ static int apply_cpu_errata_fixes(unsigned nodes)
 		if (is_cpu_pre_c0()) {
 
 			/* Errata 66
-			 * Limit the number of downstream posted requests to 1 
+			 * Limit the number of downstream posted requests to 1
 			 */
 			cmd = pci_read_config32(dev, 0x70);
 			if ((cmd & (3 << 0)) != 2) {
@@ -1694,7 +1694,7 @@ static int apply_cpu_errata_fixes(unsigned nodes)
 		}
 		else if (is_cpu_pre_d0()) { // d0 later don't need it
 			uint32_t cmd_ref;
-			/* Errata 98 
+			/* Errata 98
 			 * Set Clk Ramp Hystersis to 7
 			 * Clock Power/Timing Low
 			 */
@@ -1728,8 +1728,8 @@ static int optimize_link_read_pointers(unsigned nodes)
 			reg = 0x98 + (link * 0x20);
 			link_type = pci_read_config32(f0_dev, reg);
 			/* Only handle coherent links */
-			if ((link_type & (LinkConnected | InitComplete|NonCoherent)) == 
-				(LinkConnected|InitComplete)) 
+			if ((link_type & (LinkConnected | InitComplete|NonCoherent)) ==
+				(LinkConnected|InitComplete))
 			{
 				cmd &= ~(0xff << (link *8));
 				cmd |= 0x25 << (link *8);
@@ -1745,70 +1745,70 @@ static int optimize_link_read_pointers(unsigned nodes)
 
 static inline unsigned get_nodes(void)
 {
-        return ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60)>>4) & 7) + 1;
+	return ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60)>>4) & 7) + 1;
 }
 
 static int optimize_link_coherent_ht(void)
 {
-        int needs_reset = 0;
+	int needs_reset = 0;
 
-        unsigned nodes;
+	unsigned nodes;
 
-        nodes = get_nodes();
+	nodes = get_nodes();
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 1
-        if(nodes>1) {
-                needs_reset |= optimize_connection(
-                        NODE_HT(0), 0x80 + link_to_register(link_connection(0,1)),
-                        NODE_HT(1), 0x80 + link_to_register(link_connection(1,0)) );
-        }
+	if(nodes>1) {
+		needs_reset |= optimize_connection(
+			NODE_HT(0), 0x80 + link_to_register(link_connection(0,1)),
+			NODE_HT(1), 0x80 + link_to_register(link_connection(1,0)) );
+	}
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 2
-        if(nodes>2) {
-        /* optimize physical connections - by LYH */
-                static const u8 opt_conn4[] = {
-                        0,2,
-                        1,3,
-                        2,3,
-                };
-                needs_reset |= optimize_connection_group(opt_conn4, ARRAY_SIZE(opt_conn4));
-        }
+	if(nodes>2) {
+	/* optimize physical connections - by LYH */
+		static const u8 opt_conn4[] = {
+			0,2,
+			1,3,
+			2,3,
+		};
+		needs_reset |= optimize_connection_group(opt_conn4, ARRAY_SIZE(opt_conn4));
+	}
 #endif
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 4
-        if(nodes>4) {
-                static const uint8_t opt_conn6[] ={
-                        2, 4,
-                        3, 5,
-        #if !CROSS_BAR_47_56
-                        4, 5,
-        #endif
-                };
-                needs_reset |= optimize_connection_group(opt_conn6, ARRAY_SIZE(opt_conn6));
-        }
+	if(nodes>4) {
+		static const uint8_t opt_conn6[] ={
+			2, 4,
+			3, 5,
+	#if !CROSS_BAR_47_56
+			4, 5,
+	#endif
+		};
+		needs_reset |= optimize_connection_group(opt_conn6, ARRAY_SIZE(opt_conn6));
+	}
 #endif
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 6
-        if(nodes>6) {
-               static const uint8_t opt_conn8[] ={
-                       4, 6,
-        #if CROSS_BAR_47_56
-                       4, 7,
-                       5, 6,
-        #endif
-                       5, 7,
-                       6, 7,
-               };
-                needs_reset |= optimize_connection_group(opt_conn8, ARRAY_SIZE(opt_conn8));
-        }
+	if(nodes>6) {
+	       static const uint8_t opt_conn8[] ={
+		       4, 6,
+	#if CROSS_BAR_47_56
+		       4, 7,
+		       5, 6,
+	#endif
+		       5, 7,
+		       6, 7,
+	       };
+		needs_reset |= optimize_connection_group(opt_conn8, ARRAY_SIZE(opt_conn8));
+	}
 #endif
 
 #endif
 
-        needs_reset |= apply_cpu_errata_fixes(nodes);
-        needs_reset |= optimize_link_read_pointers(nodes);
+	needs_reset |= apply_cpu_errata_fixes(nodes);
+	needs_reset |= optimize_link_read_pointers(nodes);
 
-        return needs_reset;
+	return needs_reset;
 }
 
 #if RAMINIT_SYSINFO == 1
@@ -1823,9 +1823,9 @@ static int setup_coherent_ht_domain(void)
 	enable_bsp_routing();
 
 #if CONFIG_MAX_PHYSICAL_CPUS > 1
-        nodes = setup_smp();
-        nodes = verify_mp_capabilities(nodes);
-        clear_dead_routes(nodes);
+	nodes = setup_smp();
+	nodes = verify_mp_capabilities(nodes);
+	clear_dead_routes(nodes);
 #endif
 
 	if (nodes == 1) {