GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix up amd pistachio and dbm690t. 

- make uma_memory_base and uma_memory_size uint64_t as they may be 64bit BARs
  on some platforms.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3949 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-02-15 02:53:18 +00:00 committed by Stefan Reinauer
parent a175533dc3
commit 5389c7f72b
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mainboard/amd/dbm690t/mainboard.c
View File

@ -44,7 +44,7 @@ extern void lb_add_memory_range(struct lb_memory *mem, uint32_t type,
#define ADT7461_write_byte(address, val) \ #define ADT7461_write_byte(address, val) \
do_smbus_write_byte(SMBUS_IO_BASE, ADT7461_ADDRESS, address, val) do_smbus_write_byte(SMBUS_IO_BASE, ADT7461_ADDRESS, address, val)
unsigned long uma_memory_start, uma_memory_size; uint64_t uma_memory_base, uma_memory_size;
/******************************************************** /********************************************************
* dbm690t uses a BCM5789 as on-board NIC. * dbm690t uses a BCM5789 as on-board NIC.
@ -235,14 +235,14 @@ void dbm690t_enable(device_t dev)
break; break;
} }
uma_memory_start = msr.lo - uma_memory_size; /* TOP_MEM1 */ uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
printk_info("%s: uma size 0x%08x, memory start 0x%08x\n", printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
__func__, uma_memory_size, uma_memory_start); __func__, uma_memory_size, uma_memory_base);
/* TODO: TOP_MEM2 */ /* TODO: TOP_MEM2 */
#else #else
uma_memory_size = 0x8000000; /* 128M recommended UMA */ uma_memory_size = 0x8000000; /* 128M recommended UMA */
uma_memory_start = 0x38000000; /* 1GB system memory supposed */ uma_memory_base = 0x38000000; /* 1GB system memory supposed */
#endif #endif
enable_onboard_nic(); enable_onboard_nic();
@ -256,10 +256,10 @@ int add_mainboard_resources(struct lb_memory *mem)
* in some circumstances we want the memory mentioned as reserved. * in some circumstances we want the memory mentioned as reserved.
*/ */
#if (CONFIG_GFXUMA == 1) #if (CONFIG_GFXUMA == 1)
printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
uma_memory_start, uma_memory_size); uma_memory_base, uma_memory_size);
lb_add_memory_range(mem, LB_MEM_RESERVED, lb_add_memory_range(mem, LB_MEM_RESERVED,
uma_memory_start, uma_memory_size); uma_memory_base, uma_memory_size);
#endif #endif
} }

16
src/mainboard/amd/pistachio/mainboard.c
View File

@ -42,7 +42,7 @@ extern void lb_add_memory_range(struct lb_memory *mem, uint32_t type,
#define ADT7475_write_byte(address, val) \ #define ADT7475_write_byte(address, val) \
do_smbus_write_byte(SMBUS_IO_BASE, ADT7475_ADDRESS, address, val) do_smbus_write_byte(SMBUS_IO_BASE, ADT7475_ADDRESS, address, val)
unsigned long uma_memory_start, uma_memory_size; uint64_t uma_memory_base, uma_memory_size;
/******************************************************** /********************************************************
* pistachio uses a BCM5787 as on-board NIC. * pistachio uses a BCM5787 as on-board NIC.
@ -307,14 +307,14 @@ void pistachio_enable(device_t dev)
break; break;
} }
uma_memory_start = msr.lo - uma_memory_size; /* TOP_MEM1 */ uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
printk_info("%s: uma size 0x%08x, memory start 0x%08x\n", printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
__func__, uma_memory_size, uma_memory_start); __func__, uma_memory_size, uma_memory_base);
/* TODO: TOP_MEM2 */ /* TODO: TOP_MEM2 */
#else #else
uma_memory_size = 0x8000000; /* 128M recommended UMA */ uma_memory_size = 0x8000000; /* 128M recommended UMA */
uma_memory_start = 0x38000000; /* 1GB system memory supposed */ uma_memory_base = 0x38000000; /* 1GB system memory supposed */
#endif #endif
enable_onboard_nic(); enable_onboard_nic();
@ -328,10 +328,10 @@ int add_mainboard_resources(struct lb_memory *mem)
* in some circumstances we want the memory mentioned as reserved. * in some circumstances we want the memory mentioned as reserved.
*/ */
#if (CONFIG_GFXUMA == 1) #if (CONFIG_GFXUMA == 1)
printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
uma_memory_start, uma_memory_size); uma_memory_base, uma_memory_size);
lb_add_memory_range(mem, LB_MEM_RESERVED, lb_add_memory_range(mem, LB_MEM_RESERVED,
uma_memory_start, uma_memory_size); uma_memory_base, uma_memory_size);
#endif #endif
} }

6
src/southbridge/amd/rs690/rs690_cmn.c
View File

@ -307,10 +307,10 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
*/ */
void rs690_set_tom(device_t nb_dev) void rs690_set_tom(device_t nb_dev)
{ {
extern unsigned long uma_memory_start; extern uint64_t uma_memory_base;
/* set TOM */ /* set TOM */
pci_write_config32(nb_dev, 0x90, uma_memory_start); pci_write_config32(nb_dev, 0x90, uma_memory_base);
nbmc_write_index(nb_dev, 0x1e, uma_memory_start); nbmc_write_index(nb_dev, 0x1e, uma_memory_base);
} }