diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2009-07-21 21:44:24 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2009-07-21 21:44:24 +0000 |
commit | 71a3d96bc487f66c84ac869a1215b8a4a4499bf2 (patch) | |
tree | 97704a40b61a3e8d1f40e3bd0f972b86182cbdaa /src/northbridge/intel/i945/rcven.c | |
parent | 4da810bd53f3e47fe0c5de64b5cec0910237a022 (diff) | |
download | coreboot-staging-71a3d96bc487f66c84ac869a1215b8a4a4499bf2.zip coreboot-staging-71a3d96bc487f66c84ac869a1215b8a4a4499bf2.tar.gz |
* drop ich7 include
* detect more i945 variants
* raminit fixes
* ACPI + PCIe updates
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4455 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/northbridge/intel/i945/rcven.c')
-rw-r--r-- | src/northbridge/intel/i945/rcven.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/northbridge/intel/i945/rcven.c b/src/northbridge/intel/i945/rcven.c index 47b4da7..846af4f 100644 --- a/src/northbridge/intel/i945/rcven.c +++ b/src/northbridge/intel/i945/rcven.c @@ -28,7 +28,7 @@ static u32 sample_strobes(int channel_offset, struct sys_info *sysinfo) int i; MCHBAR32(C0DRC1 + channel_offset) |= (1 << 6); - + MCHBAR32(C0DRC1 + channel_offset) &= ~(1 << 6); addr = 0; @@ -43,7 +43,7 @@ static u32 sample_strobes(int channel_offset, struct sys_info *sysinfo) for (i = 0; i < 28; i++) { read32(addr); - read32(addr + 0x80); + read32(addr + 0x80); } reg32 = MCHBAR32(RCVENMT); @@ -68,12 +68,13 @@ static void set_receive_enable(int channel_offset, u8 medium, u8 coarse) u32 reg32; printk_spew(" set_receive_enable() medium=0x%x, coarse=0x%x\n", medium, coarse); - + reg32 = MCHBAR32(C0DRT1 + channel_offset); reg32 &= 0xf0ffffff; reg32 |= ((u32)coarse & 0x0f) << 24; MCHBAR32(C0DRT1 + channel_offset) = reg32; - + + /* This should never happen: */ if (coarse > 0x0f) printk_debug("set_receive_enable: coarse overflow: 0x%02x.\n", coarse); @@ -87,11 +88,11 @@ static void set_receive_enable(int channel_offset, u8 medium, u8 coarse) reg32 = MCHBAR32(RCVENMT); if (!channel_offset) { - + /* Channel 0 */ reg32 &= ~(3 << 2); reg32 |= medium << 2; } else { - + /* Channel 1 */ reg32 &= ~(3 << 0); reg32 |= medium; } @@ -132,7 +133,6 @@ static int find_preamble(int channel_offset, u8 * mediumcoarse, do { if (*mediumcoarse < 4) { - printk_debug("No Preamble found.\n"); return -1; } @@ -143,10 +143,9 @@ static int find_preamble(int channel_offset, u8 * mediumcoarse, reg32 = sample_strobes(channel_offset, sysinfo); - } while (reg32 & (1 << 19)); + } while (reg32 & (1 << 19)); - if (!(reg32 & (1 << 18))) { - + if (!(reg32 & (1 << 18))) { printk_debug("No Preamble found (neither high nor low).\n"); return -1; } @@ -188,7 +187,7 @@ static int find_strobes_low(int channel_offset, u8 * mediumcoarse, u8 * fine, u32 rcvenmt; printk_spew(" find_strobes_low()\n"); - + for (;;) { MCHBAR8(C0WL0REOST + channel_offset) = *fine; @@ -200,13 +199,12 @@ static int find_strobes_low(int channel_offset, u8 * mediumcoarse, u8 * fine, if (((rcvenmt & (1 << 18)) != 0)) return 0; - *fine -= 0x80; if (*fine == 0) continue; *mediumcoarse -= 2; - if (*mediumcoarse < 0xfe) + if (*mediumcoarse < 0xfe) continue; break; @@ -220,6 +218,7 @@ static int find_strobes_low(int channel_offset, u8 * mediumcoarse, u8 * fine, static int find_strobes_edge(int channel_offset, u8 * mediumcoarse, u8 * fine, struct sys_info *sysinfo) { + int counter; u32 rcvenmt; @@ -249,7 +248,7 @@ static int find_strobes_edge(int channel_offset, u8 * mediumcoarse, u8 * fine, } continue; } - + *fine = 0; *mediumcoarse += 2; if (*mediumcoarse <= 0x40) { @@ -258,25 +257,25 @@ static int find_strobes_edge(int channel_offset, u8 * mediumcoarse, u8 * fine, continue; } - printk_debug("could not find rising edge.\n"); + printk_debug("Could not find rising edge.\n"); return -1; } - + *fine -= 7; - if (*fine >= 0xf9) { + if (*fine >= 0xf9) { *mediumcoarse -= 2; set_receive_enable(channel_offset, *mediumcoarse & 3, *mediumcoarse >> 2); } - *fine &= ~(1 << 3); + *fine &= ~(1 << 3); MCHBAR8(C0WL0REOST + channel_offset) = *fine; return 0; } /** - * Here we use a trick. The RCVEN channel 0 registers are all at an + * Here we use a trick. The RCVEN channel 0 registers are all at an * offset of 0x80 to the channel 0 registers. We don't want to waste * a lot of if()s so let's just pass 0 or 0x80 for the channel offset. */ @@ -291,7 +290,7 @@ static int receive_enable_autoconfig(int channel_offset, channel_offset ? 1 : 0); /* Set initial values */ - mediumcoarse = (sysinfo->cas << 2) | 3; + mediumcoarse = (sysinfo->cas << 2) | 3; fine = 0; if (find_strobes_low(channel_offset, &mediumcoarse, &fine, sysinfo)) @@ -336,3 +335,4 @@ void receive_enable_adjust(struct sys_info *sysinfo) if (receive_enable_autoconfig(0x80, sysinfo)) return; } + |