Author: yhlu Date: 2006-10-05 08:59:56 +0200 (Thu, 05 Oct 2006) New Revision: 2445
Modified: trunk/LinuxBIOSv2/src/mainboard/agami/aruma/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/auto.c trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/auto.c trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2850/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2875/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2880/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s4880/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/auto.c trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/raminit.c Log: K8_4RANK to QRANK
Modified: trunk/LinuxBIOSv2/src/mainboard/agami/aruma/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/agami/aruma/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/agami/aruma/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -8,7 +8,7 @@ #endif
//use by raminit -#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
//used by incoherent_ht //#define K8_SCAN_PCI_BUS 1
Modified: trunk/LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -129,7 +129,7 @@ }
//#include "northbridge/amd/amdk8/setup_resource_map.c" -#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1 #include "northbridge/amd/amdk8/raminit.c"
#if 0
Modified: trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -91,7 +91,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #if 0
Modified: trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/sunw/ultra40/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -6,7 +6,7 @@ //#define K8_SCAN_PCI_BUS 1
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2850/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2850/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2850/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -79,8 +79,6 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 - #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2875/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2875/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2875/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -68,7 +68,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2880/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2880/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2880/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -69,7 +69,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -107,7 +107,7 @@ }
//#include "northbridge/amd/amdk8/setup_resource_map.c" -#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1 #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "sdram/generic_sdram.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -108,7 +108,7 @@ }
#include "northbridge/amd/amdk8/setup_resource_map.c" -#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1 #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2882/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -68,7 +68,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -106,7 +106,7 @@ }
//#include "northbridge/amd/amdk8/setup_resource_map.c" -#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1 #include "northbridge/amd/amdk8/raminit.c"
#if 0
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -69,7 +69,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -69,7 +69,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1 #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "sdram/generic_sdram.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -91,7 +91,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #if 0
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s4880/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s4880/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s4880/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -83,7 +83,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c"
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -115,7 +115,7 @@ }
#include "northbridge/amd/amdk8/setup_resource_map.c" -#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1 #include "northbridge/amd/amdk8/raminit.c" #if 0 #define ENABLE_APIC_EXT_ID 1
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/cache_as_ram_auto.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s4882/cache_as_ram_auto.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -92,7 +92,7 @@ return smbus_read_byte(device, address); }
-#define K8_4RANK_DIMM_SUPPORT 1 +#define QRANK_DIMM_SUPPORT 1
#include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c"
Modified: trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/raminit.c =================================================================== --- trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/raminit.c 2006-10-05 06:24:21 UTC (rev 2444) +++ trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/raminit.c 2006-10-05 06:59:56 UTC (rev 2445) @@ -17,8 +17,8 @@ # error "CONFIG_LB_MEM_TOPK must be a power of 2" #endif
-#ifndef K8_4RANK_DIMM_SUPPORT -#define K8_4RANK_DIMM_SUPPORT 0 +#ifndef QRANK_DIMM_SUPPORT +#define QRANK_DIMM_SUPPORT 0 #endif
#if defined (__GNUC__) @@ -631,7 +631,7 @@ unsigned long side2; unsigned long rows; unsigned long col; -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 unsigned long rank; #endif }; @@ -645,7 +645,7 @@ sz.side2 = 0; sz.rows = 0; sz.col = 0; -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 sz.rank = 0; #endif
@@ -689,7 +689,7 @@ if ((value != 2) && (value != 4 )) { goto val_err; } -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 sz.rank = value; #endif
@@ -718,7 +718,7 @@ sz.side2 = 0; sz.rows = 0; sz.col = 0; -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 sz.rank = 0; #endif out: @@ -766,7 +766,7 @@ /* Set the appropriate DIMM base address register */ pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+0)<<2), base0); pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+1)<<2), base1); -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 if(sz.rank == 4) { pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+4)<<2), base0); pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+5)<<2), base1); @@ -777,7 +777,7 @@ if (base0) { dch = pci_read_config32(ctrl->f2, DRAM_CONFIG_HIGH); dch |= DCH_MEMCLK_EN0 << index; -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 if(sz.rank == 4) { dch |= DCH_MEMCLK_EN0 << (index + 2); } @@ -800,7 +800,7 @@
map = pci_read_config32(ctrl->f2, DRAM_BANK_ADDR_MAP); map &= ~(0xf << (index * 4)); -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 if(sz.rank == 4) { map &= ~(0xf << ( (index + 2) * 4)); } @@ -811,7 +811,7 @@ if (sz.side1 >= (25 +3)) { if(is_cpu_pre_d0()) { map |= (sz.side1 - (25 + 3)) << (index *4); -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 if(sz.rank == 4) { map |= (sz.side1 - (25 + 3)) << ( (index + 2) * 4); } @@ -819,7 +819,7 @@ } else { map |= cs_map_aa[(sz.rows - 12) * 5 + (sz.col - 8) ] << (index*4); -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 if(sz.rank == 4) { map |= cs_map_aa[(sz.rows - 12) * 5 + (sz.col - 8) ] << ( (index + 2) * 4); } @@ -1538,7 +1538,7 @@ } #if 0 //down speed for full load 4 rank support -#if K8_4RANK_DIMM_SUPPORT +#if QRANK_DIMM_SUPPORT if(dimm_mask == (3|(3<<DIMM_SOCKETS)) ) { int ranks = 4; for(i = 0; (i < 4) && (ctrl->channel0[i]); i++) { @@ -1804,7 +1804,7 @@ { uint32_t dcl; int value; -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 int rank; #endif int dimm; @@ -1813,7 +1813,7 @@ return -1; }
-#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 rank = spd_read_byte(ctrl->channel0[i], 5); /* number of physical banks */ if (rank < 0) { return -1; @@ -1821,7 +1821,7 @@ #endif
dimm = 1<<(DCL_x4DIMM_SHIFT+i); -#if K8_4RANK_DIMM_SUPPORT == 1 +#if QRANK_DIMM_SUPPORT == 1 if(rank==4) { dimm |= 1<<(DCL_x4DIMM_SHIFT+i+2); }