Indent-based + manual cleanups for CN700 (trivial). As this will be ported
to v3 sooner or later we cleanup _now_, so we don't have to do it twice. - Whitespace, coding style improvements. - Fix a few typos. - Add a missing #endif in raminit.h. - Drop an unused variable. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3644 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann
parent
c1d06b782f
commit
ea7b518ec0
|
|
@ -33,23 +33,26 @@ static void agp_init(device_t dev)
|
|||
{
|
||||
u32 reg32;
|
||||
|
||||
/* Some of this may not be necessary,
|
||||
* it should be handled by the OS */
|
||||
/* Some of this may not be necessary (should be handled by the OS). */
|
||||
printk_debug("Enabling AGP.\n");
|
||||
|
||||
/* Allow R/W access to AGP registers */
|
||||
/* Allow R/W access to AGP registers. */
|
||||
pci_write_config8(dev, 0x4d, 0x15);
|
||||
|
||||
/* Setup PCI latency timer */
|
||||
/* Setup PCI latency timer. */
|
||||
pci_write_config8(dev, 0xd, 0x8);
|
||||
|
||||
/* Set to AGP 3.0 Mode, which should theoretically render the rest of
|
||||
* the registers set here pointless */
|
||||
/*
|
||||
* Set to AGP 3.0 Mode, which should theoretically render the rest of
|
||||
* the registers set here pointless.
|
||||
*/
|
||||
pci_write_config8(dev, 0x84, 0xb);
|
||||
|
||||
/* AGP Request Queue Size */
|
||||
pci_write_config8(dev, 0x4a, 0x1f);
|
||||
/* AGP Hardware Support (default 0xc4)
|
||||
|
||||
/*
|
||||
* AGP Hardware Support (default 0xc4)
|
||||
* 7: AGP SBA Enable (1 to Enable)
|
||||
* 6: AGP Enable
|
||||
* 5: Reserved
|
||||
|
|
@ -57,21 +60,22 @@ static void agp_init(device_t dev)
|
|||
* 3: AGP8X Mode Enable
|
||||
* 2: AGP4X Mode Enable
|
||||
* 1: AGP2X Mode Enable
|
||||
* 0: AGP1X Mode Enable */
|
||||
* 0: AGP1X Mode Enable
|
||||
*/
|
||||
pci_write_config8(dev, 0x4b, 0xc4);
|
||||
|
||||
/* Enable AGP Backdoor */
|
||||
pci_write_config8(dev, 0xb5, 0x03);
|
||||
|
||||
/* Set aperture to 32MB */
|
||||
/* TODO: Use config option, explain how it works */
|
||||
/* Set aperture to 32 MB. */
|
||||
/* TODO: Use config option, explain how it works. */
|
||||
pci_write_config32(dev, 0x94, 0x00010f38);
|
||||
/* Set GART Table Base Address (31:12) */
|
||||
/* Set GART Table Base Address (31:12). */
|
||||
pci_write_config32(dev, 0x98, (0x1558 << 12));
|
||||
/* Set AGP Aperture Base */
|
||||
/* Set AGP Aperture Base. */
|
||||
pci_write_config32(dev, 0x10, 0xf8000008);
|
||||
|
||||
/* Enable CPU/PMSTR GART Access */
|
||||
/* Enable CPU/PMSTR GART Access. */
|
||||
reg32 = pci_read_config8(dev, 0xbf);
|
||||
reg32 |= 0x80;
|
||||
pci_write_config8(dev, 0xbf, reg32);
|
||||
|
|
@ -85,9 +89,10 @@ static void agp_init(device_t dev)
|
|||
pci_write_config8(dev, 0xbc, 0x21);
|
||||
pci_write_config8(dev, 0xbd, 0xd2);
|
||||
|
||||
/* AGP Pad, driving strength, and delay control */
|
||||
/* All this should be constant, seeing as the
|
||||
* VGA controller is onboard */
|
||||
/*
|
||||
* AGP Pad, driving strength, and delay control. All this should be
|
||||
* constant, seeing as the VGA controller is onboard.
|
||||
*/
|
||||
pci_write_config8(dev, 0x40, 0xc7);
|
||||
pci_write_config8(dev, 0x41, 0xdb);
|
||||
pci_write_config8(dev, 0x42, 0x10);
|
||||
|
|
@ -113,20 +118,23 @@ static const struct pci_driver agp_driver __pci_driver = {
|
|||
.device = PCI_DEVICE_ID_VIA_CN700_AGP,
|
||||
};
|
||||
|
||||
/* This is the AGP 3.0 "bridge" @Bus 0 Device 1 Func 0. When using AGP 3.0, the
|
||||
config in this device takes presidence. We configure both just to be safe. */
|
||||
/*
|
||||
* This is the AGP 3.0 "bridge" @Bus 0 Device 1 Func 0. When using AGP 3.0, the
|
||||
* config in this device takes presidence. We configure both just to be safe.
|
||||
*/
|
||||
static void agp_bridge_init(device_t dev)
|
||||
{
|
||||
printk_debug("Setting up AGP Bridge device\n");
|
||||
printk_debug("Setting up AGP bridge device\n");
|
||||
|
||||
pci_write_config16(dev, 0x4, 0x0007);
|
||||
|
||||
/* Secondary Bus Number */
|
||||
pci_write_config8(dev, 0x19, 0x01);
|
||||
/* Subordinate Bus Number */
|
||||
pci_write_config8(dev, 0x1a, 0x01);
|
||||
/* IO Base */
|
||||
/* I/O Base */
|
||||
pci_write_config8(dev, 0x1c, 0xd0);
|
||||
/* IO Limit */
|
||||
/* I/O Limit */
|
||||
pci_write_config8(dev, 0x1d, 0xd0);
|
||||
|
||||
/* Memory Base */
|
||||
|
|
|
|||
|
|
@ -18,8 +18,7 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
struct northbridge_via_cn700_config
|
||||
{
|
||||
struct northbridge_via_cn700_config {
|
||||
};
|
||||
|
||||
extern struct chip_operations northbridge_via_cn700_ops;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@
|
|||
*/
|
||||
|
||||
#ifndef __ROMCC__
|
||||
static void cn700_noop(){}
|
||||
static void cn700_noop()
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/* VGA stuff */
|
||||
|
|
@ -30,7 +32,7 @@ static void cn700_noop(){}
|
|||
#define CRTC_INDEX 0x3d4
|
||||
#define CRTC_DATA 0x3d5
|
||||
|
||||
/* Memory Controller Registers */
|
||||
/* Memory controller registers */
|
||||
#define RANK0_END 0x40
|
||||
#define RANK1_END 0x41
|
||||
#define RANK2_END 0x42
|
||||
|
|
@ -45,7 +47,7 @@ static void cn700_noop(){}
|
|||
#define CH_A_DQS_OUTPUT_DELAY 0x70
|
||||
#define CH_A_MD_OUTPUT_DELAY 0x71
|
||||
|
||||
/* RAM Init Commands */
|
||||
/* RAM init commands */
|
||||
#define RAM_COMMAND_NORMAL 0x0
|
||||
#define RAM_COMMAND_NOP 0x1
|
||||
#define RAM_COMMAND_PRECHARGE 0x2
|
||||
|
|
|
|||
|
|
@ -38,15 +38,13 @@ static void memctrl_init(device_t dev)
|
|||
{
|
||||
device_t vlink_dev;
|
||||
u16 reg16;
|
||||
u8 ranks;
|
||||
u8 pagec, paged, pagee, pagef;
|
||||
u8 shadowreg;
|
||||
u8 ranks, pagec, paged, pagee, pagef, shadowreg;
|
||||
|
||||
/* Set up the vga framebuffer size */
|
||||
/* Set up the VGA framebuffer size. */
|
||||
reg16 = (log2(CONFIG_VIDEO_MB) << 12) | (1 << 15);
|
||||
pci_write_config16(dev, 0xa0, reg16);
|
||||
|
||||
/* Set up VGA timers */
|
||||
/* Set up VGA timers. */
|
||||
pci_write_config8(dev, 0xa2, 0x44);
|
||||
|
||||
for (ranks = 0x4b; ranks >= 0x48; ranks--) {
|
||||
|
|
@ -64,7 +62,7 @@ static void memctrl_init(device_t dev)
|
|||
/* AGPCINT Misc. */
|
||||
pci_write_config8(dev, 0xb8, 0x08);
|
||||
|
||||
/* shadown ram */
|
||||
/* Shadow RAM */
|
||||
pagec = 0xff, paged = 0xff, pagee = 0xff, pagef = 0x30;
|
||||
/* PAGE C, D, E are all read write enable */
|
||||
pci_write_config8(dev, 0x80, pagec);
|
||||
|
|
@ -75,11 +73,13 @@ static void memctrl_init(device_t dev)
|
|||
shadowreg |= pagef;
|
||||
pci_write_config8(dev, 0x83, shadowreg);
|
||||
/* vlink mirror */
|
||||
vlink_dev = dev_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CN700_VLINK, 0);
|
||||
vlink_dev = dev_find_device(PCI_VENDOR_ID_VIA,
|
||||
PCI_DEVICE_ID_VIA_CN700_VLINK, 0);
|
||||
if (vlink_dev) {
|
||||
pci_write_config8(vlink_dev, 0x61, pagec);
|
||||
pci_write_config8(vlink_dev, 0x62, paged);
|
||||
pci_write_config8(vlink_dev, 0x64, pagee);
|
||||
|
||||
shadowreg = pci_read_config8(vlink_dev, 0x63);
|
||||
shadowreg |= pagef;
|
||||
pci_write_config8(vlink_dev, 0x63, shadowreg);
|
||||
|
|
@ -103,13 +103,13 @@ static void pci_domain_read_resources(device_t dev)
|
|||
|
||||
printk_spew("Entering cn700 pci_domain_read_resources.\n");
|
||||
|
||||
/* Initialize the system wide io space constraints */
|
||||
/* Initialize the system wide I/O space constraints. */
|
||||
resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
|
||||
resource->limit = 0xffffUL;
|
||||
resource->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
|
||||
IORESOURCE_ASSIGNED;
|
||||
|
||||
/* Initialize the system wide memory resources constraints */
|
||||
/* Initialize the system wide memory resources constraints. */
|
||||
resource = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
|
||||
resource->limit = 0xffffffffULL;
|
||||
resource->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
|
||||
|
|
@ -123,13 +123,13 @@ static void ram_resource(device_t dev, unsigned long index,
|
|||
{
|
||||
struct resource *resource;
|
||||
|
||||
if (!sizek) {
|
||||
if (!sizek)
|
||||
return;
|
||||
}
|
||||
|
||||
resource = new_resource(dev, index);
|
||||
resource->base = ((resource_t) basek) << 10;
|
||||
resource->size = ((resource_t) sizek) << 10;
|
||||
resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE | \
|
||||
resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE |
|
||||
IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
|
||||
}
|
||||
|
||||
|
|
@ -137,33 +137,35 @@ static void tolm_test(void *gp, struct device *dev, struct resource *new)
|
|||
{
|
||||
struct resource **best_p = gp;
|
||||
struct resource *best;
|
||||
|
||||
best = *best_p;
|
||||
if (!best || (best->base > new->base)) {
|
||||
if (!best || (best->base > new->base))
|
||||
best = new;
|
||||
}
|
||||
*best_p = best;
|
||||
}
|
||||
|
||||
static u32 find_pci_tolm(struct bus *bus)
|
||||
{
|
||||
print_debug("Entering find_pci_tolm\n");
|
||||
struct resource *min;
|
||||
u32 tolm;
|
||||
|
||||
print_debug("Entering find_pci_tolm\n");
|
||||
|
||||
min = 0;
|
||||
search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM, tolm_test, &min);
|
||||
search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM,
|
||||
tolm_test, &min);
|
||||
tolm = 0xffffffffUL;
|
||||
if (min && tolm > min->base) {
|
||||
if (min && tolm > min->base)
|
||||
tolm = min->base;
|
||||
}
|
||||
|
||||
print_debug("Leaving find_pci_tolm\n");
|
||||
|
||||
return tolm;
|
||||
}
|
||||
|
||||
static void pci_domain_set_resources(device_t dev)
|
||||
{
|
||||
/*
|
||||
* the order is important to find the correct ram size.
|
||||
*/
|
||||
/* The order is important to find the correct RAM size. */
|
||||
static const u8 ramregs[] = { 0x43, 0x42, 0x41, 0x40 };
|
||||
device_t mc_dev;
|
||||
u32 pci_tolm;
|
||||
|
|
@ -180,11 +182,10 @@ static void pci_domain_set_resources(device_t dev)
|
|||
int i, idx;
|
||||
|
||||
/*
|
||||
* once the register value is not zero, the ramsize is
|
||||
* this register's value multiply 64 * 1024 * 1024
|
||||
* Once the register value is not zero, the RAM size is
|
||||
* this register's value multiply 64 * 1024 * 1024.
|
||||
*/
|
||||
for (rambits = 0, i = 0; i < ARRAY_SIZE(ramregs); i++) {
|
||||
unsigned char reg;
|
||||
rambits = pci_read_config8(mc_dev, ramregs[i]);
|
||||
if (rambits != 0)
|
||||
break;
|
||||
|
|
@ -192,18 +193,19 @@ static void pci_domain_set_resources(device_t dev)
|
|||
|
||||
tomk = rambits * 64 * 1024;
|
||||
printk_spew("tomk is 0x%x\n", tomk);
|
||||
/* Compute the Top Of Low Memory, in Kb */
|
||||
/* Compute the Top Of Low Memory (TOLM), in Kb. */
|
||||
tolmk = pci_tolm >> 10;
|
||||
if (tolmk >= tomk) {
|
||||
/* The PCI hole does does not overlap the memory. */
|
||||
tolmk = tomk;
|
||||
}
|
||||
/* Report the memory regions */
|
||||
/* Report the memory regions. */
|
||||
idx = 10;
|
||||
/* TODO: Hole needed? */
|
||||
ram_resource(dev, idx++, 0, 640); /* first 640k */
|
||||
/* Leave a hole for vga, 0xa0000 - 0xc0000 */
|
||||
ram_resource(dev, idx++, 768, (tolmk - 768 - CONFIG_VIDEO_MB * 1024));
|
||||
ram_resource(dev, idx++, 0, 640); /* First 640k */
|
||||
/* Leave a hole for VGA, 0xa0000 - 0xc0000 */
|
||||
ram_resource(dev, idx++, 768,
|
||||
(tolmk - 768 - CONFIG_VIDEO_MB * 1024));
|
||||
}
|
||||
assign_resources(&dev->link[0]);
|
||||
}
|
||||
|
|
@ -245,12 +247,11 @@ static void enable_dev(struct device *dev)
|
|||
{
|
||||
printk_spew("In cn700 enable_dev for device %s.\n", dev_path(dev));
|
||||
|
||||
/* Set the operations if it is a special bus type */
|
||||
/* Set the operations if it is a special bus type. */
|
||||
if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
|
||||
dev->ops = &pci_domain_ops;
|
||||
pci_set_method(dev);
|
||||
}
|
||||
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
|
||||
} else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
|
||||
dev->ops = &cpu_bus_ops;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,16 +60,16 @@ static void do_ram_command(device_t dev, u8 command)
|
|||
}
|
||||
|
||||
/**
|
||||
* Configure the bus between the cpu and the northbridge. This might be able to
|
||||
* Configure the bus between the CPU and the northbridge. This might be able to
|
||||
* be moved to post-ram code in the future. For the most part, these registers
|
||||
* should not be messed around with. These are too complex to explain short of
|
||||
* copying the datasheets into the comments, but most of these values are from
|
||||
* the BIOS Porting Guide, so they should work on any board. If they don't,
|
||||
* try the values from your factory BIOS.
|
||||
*
|
||||
* TODO: Changing the DRAM frequency doesn't work (hard lockup)
|
||||
* TODO: Changing the DRAM frequency doesn't work (hard lockup).
|
||||
*
|
||||
* @param dev The northbridge's CPU Host Interface (D0F2)
|
||||
* @param dev The northbridge's CPU Host Interface (D0F2).
|
||||
*/
|
||||
static void c7_cpu_setup(device_t dev)
|
||||
{
|
||||
|
|
@ -87,11 +87,13 @@ static void c7_cpu_setup(device_t dev)
|
|||
/* Write Policy */
|
||||
pci_write_config8(dev, 0x56, 0x01);
|
||||
/* Miscellaneous Control */
|
||||
/* DRAM Operating Frequency (Bits 7:5)
|
||||
/*
|
||||
* DRAM Operating Frequency (bits 7:5)
|
||||
* 000 : 100MHz 001 : 133MHz
|
||||
* 010 : 166MHz 011 : 200MHz
|
||||
* 100 : 266MHz 101 : 333MHz
|
||||
* 110/111 : Reserved */
|
||||
* 110/111 : Reserved
|
||||
*/
|
||||
/* CPU Miscellaneous Control */
|
||||
pci_write_config8(dev, 0x59, 0x44);
|
||||
/* Write Policy */
|
||||
|
|
@ -113,7 +115,7 @@ static void c7_cpu_setup(device_t dev)
|
|||
pci_write_config8(dev, 0x66, 0xff);
|
||||
pci_write_config8(dev, 0x67, 0x30);
|
||||
|
||||
/* Host Bus IO Circuit (See datasheet) */
|
||||
/* Host Bus I/O Circuit (see datasheet) */
|
||||
/* Host Address Pullup/down Driving */
|
||||
pci_write_config8(dev, 0x70, 0x11);
|
||||
pci_write_config8(dev, 0x71, 0x11);
|
||||
|
|
@ -133,7 +135,7 @@ static void c7_cpu_setup(device_t dev)
|
|||
pci_write_config8(dev, 0x79, 0xaa);
|
||||
/* Address Strobe Input Delay Control */
|
||||
pci_write_config8(dev, 0x7a, 0x24);
|
||||
// Address CKG Rising/Falling Time Control
|
||||
/* Address CKG Rising/Falling Time Control */
|
||||
pci_write_config8(dev, 0x7b, 0xaa);
|
||||
/* Address CKG Clock Rising/Falling Time Control */
|
||||
pci_write_config8(dev, 0x7c, 0x00);
|
||||
|
|
@ -148,10 +150,10 @@ static void c7_cpu_setup(device_t dev)
|
|||
}
|
||||
|
||||
/**
|
||||
* Set up dram size according to spd data. Eventually, DRAM timings should be
|
||||
* Set up DRAM size according to SPD data. Eventually, DRAM timings should be
|
||||
* done in a similar manner.
|
||||
*
|
||||
* @param ctrl The northbridge devices and spd addresses.
|
||||
* @param ctrl The northbridge devices and SPD addresses.
|
||||
*/
|
||||
static void sdram_set_size(const struct mem_controller *ctrl)
|
||||
{
|
||||
|
|
@ -159,9 +161,9 @@ static void sdram_set_size(const struct mem_controller *ctrl)
|
|||
|
||||
ranks = spd_read_byte(ctrl->channel0[0], SPD_NUM_DIMM_BANKS);
|
||||
ranks = (ranks & 0x07) + 1;
|
||||
density = spd_read_byte(ctrl->channel0[0], SPD_DENSITY_OF_EACH_ROW_ON_MODULE);
|
||||
switch (density)
|
||||
{
|
||||
density = spd_read_byte(ctrl->channel0[0],
|
||||
SPD_DENSITY_OF_EACH_ROW_ON_MODULE);
|
||||
switch (density) {
|
||||
case 0x80:
|
||||
result = 0x08; /* 512MB / 64MB = 0x08 */
|
||||
break;
|
||||
|
|
@ -189,7 +191,7 @@ static void sdram_set_size(const struct mem_controller *ctrl)
|
|||
}
|
||||
|
||||
if (result == 0xff)
|
||||
die("dram module size too big, not supported by cn700\r\n");
|
||||
die("DRAM module size too big, not supported by CN700\r\n");
|
||||
|
||||
pci_write_config8(ctrl->d0f3, 0x40, result);
|
||||
pci_write_config8(ctrl->d0f3, 0x48, 0x00);
|
||||
|
|
@ -197,7 +199,7 @@ static void sdram_set_size(const struct mem_controller *ctrl)
|
|||
pci_write_config8(ctrl->d0f3, 0x41, result * ranks);
|
||||
pci_write_config8(ctrl->d0f3, 0x49, result);
|
||||
}
|
||||
/* size mirror */
|
||||
/* Size mirror */
|
||||
pci_write_config8(ctrl->d0f7, 0xe5, (result * ranks) << 2);
|
||||
pci_write_config8(ctrl->d0f7, 0x57, (result * ranks) << 2);
|
||||
/* Low Top Address */
|
||||
|
|
@ -207,19 +209,19 @@ static void sdram_set_size(const struct mem_controller *ctrl)
|
|||
|
||||
/* Physical-Virtual Mapping */
|
||||
if (ranks == 2)
|
||||
pci_write_config8(ctrl->d0f3, 0x54, 1 << 7 | 0 << 4 | 1 << 3 | 1 << 0);
|
||||
pci_write_config8(ctrl->d0f3, 0x54,
|
||||
1 << 7 | 0 << 4 | 1 << 3 | 1 << 0);
|
||||
if (ranks == 1)
|
||||
pci_write_config8(ctrl->d0f3, 0x54, 1 << 7 | 0 << 4);
|
||||
pci_write_config8(ctrl->d0f3, 0x55, 0x00);
|
||||
/* virtual rank interleave, disable */
|
||||
/* Virtual rank interleave, disable */
|
||||
pci_write_config32(ctrl->d0f3, 0x58, 0x00);
|
||||
|
||||
/* MA Map Type */
|
||||
result = spd_read_byte(ctrl->channel0[0], SPD_NUM_BANKS_PER_SDRAM);
|
||||
if (result == 8) {
|
||||
col = spd_read_byte(ctrl->channel0[0], SPD_NUM_COLUMNS);
|
||||
switch (col)
|
||||
{
|
||||
switch (col) {
|
||||
case 10:
|
||||
pci_write_config8(ctrl->d0f3, 0x50, 0xa0);
|
||||
break;
|
||||
|
|
@ -230,11 +232,9 @@ static void sdram_set_size(const struct mem_controller *ctrl)
|
|||
pci_write_config8(ctrl->d0f3, 0x50, 0xe0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (result == 4) {
|
||||
} else if (result == 4) {
|
||||
col = spd_read_byte(ctrl->channel0[0], SPD_NUM_COLUMNS);
|
||||
switch (col)
|
||||
{
|
||||
switch (col) {
|
||||
case 9:
|
||||
pci_write_config8(ctrl->d0f3, 0x50, 0x00);
|
||||
break;
|
||||
|
|
@ -253,9 +253,9 @@ static void sdram_set_size(const struct mem_controller *ctrl)
|
|||
}
|
||||
|
||||
/**
|
||||
* Set up various ram and other control registers statically. Some of these may
|
||||
* not be needed, other should be done with spd info, but that's a project for
|
||||
* the future
|
||||
* Set up various RAM and other control registers statically. Some of these may
|
||||
* not be needed, other should be done with SPD info, but that's a project for
|
||||
* the future.
|
||||
*/
|
||||
static void sdram_set_registers(const struct mem_controller *ctrl)
|
||||
{
|
||||
|
|
@ -265,48 +265,49 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
|
|||
pci_write_config8(ctrl->d0f3, 0x61, 0xe0);
|
||||
/* Set CAS=4 */
|
||||
pci_write_config8(ctrl->d0f3, 0x62, 0xfa);
|
||||
/* dram timing-3 */
|
||||
/* DRAM timing-3 */
|
||||
pci_write_config8(ctrl->d0f3, 0x63, 0xca);
|
||||
/* dram timing-4 */
|
||||
/* DRAM timing-4 */
|
||||
pci_write_config8(ctrl->d0f3, 0x64, 0xcc);
|
||||
/* DIMM command / Address Selection */
|
||||
pci_write_config8(ctrl->d0f3, 0x67, 0x00);
|
||||
/* Disable cross bank/multi page mode */
|
||||
pci_write_config8(ctrl->d0f3, 0x69, 0x00);
|
||||
/* disable refresh now */
|
||||
/* Disable refresh now */
|
||||
pci_write_config8(ctrl->d0f3, 0x6a, 0x00);
|
||||
|
||||
/* frequency 100MHZ */
|
||||
/* Frequency 100 MHz */
|
||||
pci_write_config8(ctrl->d0f3, 0x90, 0x00);
|
||||
pci_write_config8(ctrl->d0f2, 0x57, 0x18);
|
||||
/* Allow manual dll reset */
|
||||
/* Allow manual DLL reset */
|
||||
pci_write_config8(ctrl->d0f3, 0x6b, 0x10);
|
||||
|
||||
/* Bank/Rank Interleave Address Select */
|
||||
pci_write_config8(ctrl->d0f3, 0x52, 0x33);
|
||||
pci_write_config8(ctrl->d0f3, 0x53, 0x3f);
|
||||
|
||||
/* Set to DDR2 sdram, BL=8 (0xc8, 0xc0 for bl=4) */
|
||||
/* Set to DDR2 SDRAM, BL=8 (0xc8, 0xc0 for bl=4) */
|
||||
pci_write_config8(ctrl->d0f3, 0x6c, 0xc8);
|
||||
|
||||
/* DRAM Bus Turn-Around Setting */
|
||||
pci_write_config8(ctrl->d0f3, 0x60, 0x03);
|
||||
/* DRAM Arbitration Control */
|
||||
pci_write_config8(ctrl->d0f3, 0x66, 0x80);
|
||||
/* DQS Tuning: testing on a couple different boards has shown this is
|
||||
/*
|
||||
* DQS Tuning: testing on a couple different boards has shown this is
|
||||
* static, or close enough that it can be. Which is good, because the
|
||||
* tuning function used too many registers
|
||||
* tuning function used too many registers.
|
||||
*/
|
||||
/* DQS Output Delay for CHannel A */
|
||||
/* DQS Output Delay for Channel A */
|
||||
pci_write_config8(ctrl->d0f3, 0x70, 0x00);
|
||||
/* MD Output Delay for Channel A */
|
||||
pci_write_config8(ctrl->d0f3, 0x71, 0x01);
|
||||
pci_write_config8(ctrl->d0f3, 0x73, 0x01);
|
||||
|
||||
/* dram arbitration timer */
|
||||
/* DRAM arbitration timer */
|
||||
pci_write_config8(ctrl->d0f3, 0x65, 0xd9);
|
||||
|
||||
/* dram signal timing control */
|
||||
/* DRAM signal timing control */
|
||||
pci_write_config8(ctrl->d0f3, 0x74, 0x01);
|
||||
pci_write_config8(ctrl->d0f3, 0x75, 0x01);
|
||||
pci_write_config8(ctrl->d0f3, 0x76, 0x06);
|
||||
|
|
@ -316,7 +317,7 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
|
|||
pci_write_config8(ctrl->d0f3, 0x7a, 0x00);
|
||||
pci_write_config8(ctrl->d0f3, 0x7b, 0x10);
|
||||
|
||||
/* dram clocking control */
|
||||
/* DRAM clocking control */
|
||||
pci_write_config8(ctrl->d0f3, 0x91, 0x01);
|
||||
/* CS/CKE Clock Phase Control */
|
||||
pci_write_config8(ctrl->d0f3, 0x92, 0x02);
|
||||
|
|
@ -332,11 +333,11 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
|
|||
pci_write_config8(ctrl->d0f3, 0xdc, 0x54);
|
||||
/* Channel A DQ/DQS CKG Output Delay Control */
|
||||
pci_write_config8(ctrl->d0f3, 0xdd, 0x55);
|
||||
/* odt lookup table */
|
||||
/* ODT lookup table */
|
||||
pci_write_config8(ctrl->d0f3, 0xd8, 0x01);
|
||||
pci_write_config8(ctrl->d0f3, 0xd9, 0x0a);
|
||||
|
||||
/* ddr sdram control */
|
||||
/* DDR SDRAM control */
|
||||
pci_write_config8(ctrl->d0f3, 0x6d, 0xc0);
|
||||
pci_write_config8(ctrl->d0f3, 0x6f, 0x41);
|
||||
|
||||
|
|
@ -344,7 +345,7 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
|
|||
pci_write_config8(ctrl->d0f3, 0xd0, 0xaa);
|
||||
|
||||
/* Compensation Control */
|
||||
pci_write_config8(ctrl->d0f3, 0xd3, 0x01); /*enable auto compensation*/
|
||||
pci_write_config8(ctrl->d0f3, 0xd3, 0x01); /* Enable autocompensation */
|
||||
/* ODT (some are set with driving select above) */
|
||||
pci_write_config8(ctrl->d0f3, 0xd4, 0x80);
|
||||
pci_write_config8(ctrl->d0f3, 0xd5, 0x8a);
|
||||
|
|
@ -363,7 +364,7 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
|
|||
/* DQS CKG Input Delay Control */
|
||||
pci_write_config8(ctrl->d0f3, 0xef, 0x10);
|
||||
|
||||
/* dram duty control */
|
||||
/* DRAM duty control */
|
||||
pci_write_config8(ctrl->d0f3, 0xed, 0x10);
|
||||
|
||||
/* SMM and APIC decoding, we do not use SMM */
|
||||
|
|
@ -372,23 +373,23 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
|
|||
/* SMM and APIC decoding mirror */
|
||||
pci_write_config8(ctrl->d0f7, 0xe6, reg);
|
||||
|
||||
/* dram module configuration */
|
||||
/* DRAM module configuration */
|
||||
pci_write_config8(ctrl->d0f3, 0x6e, 0x89);
|
||||
}
|
||||
|
||||
static void sdram_set_post(const struct mem_controller *ctrl)
|
||||
{
|
||||
device_t dev = ctrl->d0f3;
|
||||
|
||||
/* Enable multipage mode. */
|
||||
pci_write_config8(dev, 0x69, 0x03);
|
||||
|
||||
/* Enable refresh. */
|
||||
pci_write_config8(dev, 0x6a, 0x32);
|
||||
|
||||
// vga device
|
||||
/* VGA device. */
|
||||
pci_write_config16(dev, 0xa0, (1 << 15));
|
||||
pci_write_config16(dev, 0xa4, 0x0010);
|
||||
|
||||
}
|
||||
|
||||
static void sdram_enable(device_t dev, unsigned long rank_address)
|
||||
|
|
@ -410,8 +411,8 @@ static void sdram_enable(device_t dev, unsigned long rank_address)
|
|||
/* 3. Mode register set. */
|
||||
PRINT_DEBUG_MEM("RAM Enable 4: Mode register set\r\n");
|
||||
do_ram_command(dev, RAM_COMMAND_MRS);
|
||||
read32(rank_address + 0x120000);// EMRS DLL Enable
|
||||
read32(rank_address + 0x800); // MRS DLL Reset
|
||||
read32(rank_address + 0x120000); /* EMRS DLL Enable */
|
||||
read32(rank_address + 0x800); /* MRS DLL Reset */
|
||||
|
||||
/* 4. Precharge all again. */
|
||||
PRINT_DEBUG_MEM("RAM Enable 2: Precharge all\r\n");
|
||||
|
|
@ -428,14 +429,16 @@ static void sdram_enable(device_t dev, unsigned long rank_address)
|
|||
|
||||
/* 6. Mode register set. */
|
||||
PRINT_DEBUG_MEM("RAM Enable 4: Mode register set\r\n");
|
||||
//safe value for now, BL=8, WR=5, CAS=4
|
||||
/* (E)MRS values are from the BPG. No direct explanation is given, but
|
||||
/* Safe value for now, BL=8, WR=5, CAS=4 */
|
||||
/*
|
||||
* (E)MRS values are from the BPG. No direct explanation is given, but
|
||||
* they should somehow conform to the JEDEC DDR2 SDRAM Specification
|
||||
* (JESD79-2C). */
|
||||
* (JESD79-2C).
|
||||
*/
|
||||
do_ram_command(dev, RAM_COMMAND_MRS);
|
||||
read32(rank_address + 0x002258); // MRS command
|
||||
read32(rank_address + 0x121c20); // EMRS OCD Default
|
||||
read32(rank_address + 0x120020); // EMRS OCD Calibration Mode Exit
|
||||
read32(rank_address + 0x002258); /* MRS command */
|
||||
read32(rank_address + 0x121c20); /* EMRS OCD Default */
|
||||
read32(rank_address + 0x120020); /* EMRS OCD Calibration Mode Exit */
|
||||
|
||||
/* 8. Normal operation */
|
||||
PRINT_DEBUG_MEM("RAM Enable 5: Normal operation\r\n");
|
||||
|
|
@ -444,7 +447,7 @@ static void sdram_enable(device_t dev, unsigned long rank_address)
|
|||
}
|
||||
|
||||
/*
|
||||
* Support one dimm with up to 2 ranks
|
||||
* Support one DIMM with up to 2 ranks.
|
||||
*/
|
||||
static void ddr_ram_setup(const struct mem_controller *ctrl)
|
||||
{
|
||||
|
|
@ -456,7 +459,7 @@ static void ddr_ram_setup(const struct mem_controller *ctrl)
|
|||
sdram_enable(ctrl->d0f3, 0);
|
||||
reg = pci_read_config8(ctrl->d0f3, 0x41);
|
||||
if (reg != 0)
|
||||
sdram_enable(ctrl->d0f3, pci_read_config8(ctrl->d0f3, 0x40) << 26);
|
||||
sdram_enable(ctrl->d0f3,
|
||||
pci_read_config8(ctrl->d0f3, 0x40) << 26);
|
||||
sdram_set_post(ctrl);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,11 @@
|
|||
#ifndef RAMINIT_H
|
||||
#define RAMINIT_H
|
||||
|
||||
#define DIMM_SOCKETS 1 //Only one works, for now.
|
||||
#define DIMM_SOCKETS 1 /* Only one works, for now. */
|
||||
|
||||
struct mem_controller {
|
||||
device_t d0f0, d0f2, d0f3, d0f4, d0f7, d1f0;
|
||||
u8 channel0[DIMM_SOCKETS];
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -18,8 +18,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
/* Note: Some of the VGA control registers are located on the memory controller.
|
||||
Registers are set both in raminit.c and northbridge.c */
|
||||
/*
|
||||
* Note: Some of the VGA control registers are located on the memory
|
||||
* controller. Registers are set both in raminit.c and northbridge.c.
|
||||
*/
|
||||
|
||||
#include <console/console.h>
|
||||
#include <arch/io.h>
|
||||
|
|
@ -37,21 +39,23 @@
|
|||
|
||||
void write_protect_vgabios(void)
|
||||
{
|
||||
//Don't bother for now
|
||||
/* Don't bother for now. */
|
||||
}
|
||||
|
||||
static void vga_init(device_t dev)
|
||||
{
|
||||
u8 reg8;
|
||||
|
||||
print_debug("Copying BOCHS Bios to 0xf000\n");
|
||||
/* Copy BOCHS BIOS from 4G-ROM_SIZE-64k (in flash) to 0xf0000 (in RAM)
|
||||
* This is for compatibility with the VGA ROM's BIOS callbacks */
|
||||
print_debug("Copying BOCHS BIOS to 0xf000\n");
|
||||
/*
|
||||
* Copy BOCHS BIOS from 4G-ROM_SIZE-64k (in flash) to 0xf0000 (in RAM)
|
||||
* This is for compatibility with the VGA ROM's BIOS callbacks.
|
||||
*/
|
||||
memcpy(0xf0000, (0xffffffff - ROM_SIZE - 0xffff), 0x10000);
|
||||
|
||||
printk_debug("Initializing VGA\n");
|
||||
|
||||
/* Set memory rate to 200MHz */
|
||||
/* Set memory rate to 200 MHz. */
|
||||
outb(0x3d, CRTM_INDEX);
|
||||
reg8 = inb(CRTM_DATA);
|
||||
reg8 &= 0x0f;
|
||||
|
|
@ -59,29 +63,27 @@ static void vga_init(device_t dev)
|
|||
outb(0x3d, CRTM_INDEX);
|
||||
outb(reg8, CRTM_DATA);
|
||||
|
||||
/* Set framebuffer size */
|
||||
/* Set framebuffer size. */
|
||||
reg8 = (CONFIG_VIDEO_MB / 4);
|
||||
outb(0x39, SR_INDEX);
|
||||
outb(reg8, SR_DATA);
|
||||
|
||||
|
||||
pci_write_config8(dev, 0x04, 0x07);
|
||||
pci_write_config8(dev, 0x0d, 0x20);
|
||||
pci_write_config32(dev, 0x10, 0xf4000008);
|
||||
pci_write_config32(dev, 0x14, 0xfb000000);
|
||||
|
||||
|
||||
printk_debug("INSTALL REAL-MODE IDT\n");
|
||||
setup_realmode_idt();
|
||||
printk_debug("DO THE VGA BIOS\n");
|
||||
do_vgabios();
|
||||
/* VGA seems to work without this, but crash & burn with it */
|
||||
/* VGA seems to work without this, but crash & burn with it. */
|
||||
// printk_debug("Enable VGA console\n");
|
||||
// vga_enable_console();
|
||||
|
||||
/* It's not clear if these need to be programmed before or after
|
||||
* the VGA bios runs. Try both, clean up later */
|
||||
/* Set memory rate to 200MHz */
|
||||
* the VGA BIOS runs. Try both, clean up later. */
|
||||
/* Set memory rate to 200 MHz (again). */
|
||||
outb(0x3d, CRTM_INDEX);
|
||||
reg8 = inb(CRTM_DATA);
|
||||
reg8 &= 0x0f;
|
||||
|
|
@ -89,12 +91,12 @@ static void vga_init(device_t dev)
|
|||
outb(0x3d, CRTM_INDEX);
|
||||
outb(reg8, CRTM_DATA);
|
||||
|
||||
/* Set framebuffer size (again) */
|
||||
/* Set framebuffer size (again). */
|
||||
reg8 = (CONFIG_VIDEO_MB / 4);
|
||||
outb(0x39, SR_INDEX);
|
||||
outb(reg8, SR_DATA);
|
||||
|
||||
/* Clear the BOCHs Bios out of memory, so it doesn't confuse linux */
|
||||
/* Clear the BOCHS BIOS out of memory, so it doesn't confuse Linux. */
|
||||
memset(0xf0000, 0, 0x10000);
|
||||
}
|
||||
|
||||
|
|
@ -105,7 +107,6 @@ static void vga_read_resources(device_t dev)
|
|||
pci_dev_read_resources(dev);
|
||||
}
|
||||
|
||||
|
||||
static const struct device_operations vga_operations = {
|
||||
.read_resources = vga_read_resources,
|
||||
.set_resources = pci_dev_set_resources,
|
||||
|
|
|
|||
Loading…
Reference in New Issue