Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6036
2b7e53f0-3cfb-0310-b3e9-
8179ed1497e1
27 files changed:
-//used by incoherent_ht
-//#define K8_ALLOCATE_IO_RANGE 1
-
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
select RAMINIT_SYSINFO
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select QRANK_DIMM_SUPPORT
select RAMINIT_SYSINFO
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
-//used by incoherent_ht
-//#define K8_ALLOCATE_IO_RANGE 1
-
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
-//used by incoherent_ht
-//#define K8_ALLOCATE_IO_RANGE 1
-
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
-//used by incoherent_ht
-//#define K8_ALLOCATE_IO_RANGE 1
-
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
//used by init_cpus and fidvid
#define SET_FIDVID 0
//if we want to wait for core1 done before DQS training, set it to 0
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
// #define DQS_TRAIN_DEBUG 1
// #define RES_DEBUG 1
// #define DQS_TRAIN_DEBUG 1
// #define RES_DEBUG 1
-#define K8_ALLOCATE_IO_RANGE 1
#if CONFIG_LOGICAL_CPUS == 1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS == 1
#define SET_NB_CFG_54 1
#endif
-//used by incoherent_ht
-//#define K8_ALLOCATE_IO_RANGE 1
-
//used by init_cpus and fidvid
#define SET_FIDVID 1
//if we want to wait for core1 done before DQS training, set it to 0
//used by init_cpus and fidvid
#define SET_FIDVID 1
//if we want to wait for core1 done before DQS training, set it to 0
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
select CK804_USE_NIC
select CK804_USE_ACI
select QRANK_DIMM_SUPPORT
select CK804_USE_NIC
select CK804_USE_ACI
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select QRANK_DIMM_SUPPORT
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR
string
config MAINBOARD_DIR
string
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define K8_ALLOCATE_IO_RANGE 1
-
-
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
+config K8_ALLOCATE_IO_RANGE
+ bool
+ default n
+
if K8_REV_F_SUPPORT
config DIMM_DDR2
if K8_REV_F_SUPPORT
config DIMM_DDR2
#define CONFIG_K8_HT_FREQ_1G_SUPPORT 0
#endif
#define CONFIG_K8_HT_FREQ_1G_SUPPORT 0
#endif
-#ifndef K8_ALLOCATE_IO_RANGE
- #define K8_ALLOCATE_IO_RANGE 0
-#endif
-
// Do we need allocate MMIO? Current We direct last 64M to sblink only, We can not lose access to last 4M range to ROM
#ifndef K8_ALLOCATE_MMIO_RANGE
#define K8_ALLOCATE_MMIO_RANGE 0
// Do we need allocate MMIO? Current We direct last 64M to sblink only, We can not lose access to last 4M range to ROM
#ifndef K8_ALLOCATE_MMIO_RANGE
#define K8_ALLOCATE_MMIO_RANGE 0
uint8_t next_busn;
uint8_t ht_c_num;
uint8_t nodes;
uint8_t next_busn;
uint8_t ht_c_num;
uint8_t nodes;
-#if K8_ALLOCATE_IO_RANGE == 1
+#if CONFIG_K8_ALLOCATE_IO_RANGE
unsigned next_io_base;
#endif
unsigned next_io_base;
#endif
next_busn=0x3f+1; /* 0 will be used ht chain with SB we need to keep SB in bus0 in auto stage*/
next_busn=0x3f+1; /* 0 will be used ht chain with SB we need to keep SB in bus0 in auto stage*/
-#if K8_ALLOCATE_IO_RANGE == 1
+#if CONFIG_K8_ALLOCATE_IO_RANGE
/* io range allocation */
tempreg = 0 | (((reg>>8) & 0x3) << 4 )| (0x3<<12); //limit
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xC4, tempreg);
/* io range allocation */
tempreg = 0 | (((reg>>8) & 0x3) << 4 )| (0x3<<12); //limit
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xC4, tempreg);
for(ht_c_num=1;ht_c_num<4; ht_c_num++) {
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xe0 + ht_c_num * 4, 0);
for(ht_c_num=1;ht_c_num<4; ht_c_num++) {
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xe0 + ht_c_num * 4, 0);
-#if K8_ALLOCATE_IO_RANGE == 1
+#if CONFIG_K8_ALLOCATE_IO_RANGE
/* io range allocation */
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xc4 + ht_c_num * 8, 0);
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xc0 + ht_c_num * 8, 0);
/* io range allocation */
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xc4 + ht_c_num * 8, 0);
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xc0 + ht_c_num * 8, 0);
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xe0 + ht_c_num * 4, tempreg);
next_busn+=0x3f+1;
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xe0 + ht_c_num * 4, tempreg);
next_busn+=0x3f+1;
-#if K8_ALLOCATE_IO_RANGE == 1
+#if CONFIG_K8_ALLOCATE_IO_RANGE
/* io range allocation */
tempreg = nodeid | (linkn<<4) | ((next_io_base+0x3)<<12); //limit
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xC4 + ht_c_num * 8, tempreg);
/* io range allocation */
tempreg = nodeid | (linkn<<4) | ((next_io_base+0x3)<<12); //limit
pci_write_config32(PCI_DEV(0, 0x18, 1), 0xC4 + ht_c_num * 8, tempreg);
pci_write_config32(dev, regpos, reg);
}
pci_write_config32(dev, regpos, reg);
}
-#if K8_ALLOCATE_IO_RANGE == 1
+#if CONFIG_K8_ALLOCATE_IO_RANGE
/* io range allocation */
for(i = 0; i< 4; i++) {
unsigned regpos;
/* io range allocation */
for(i = 0; i< 4; i++) {
unsigned regpos;