Jonathan A. Kollasch (jakllsch@kollasch.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/126
-gerrit
commit aad6f2ab566dffc055e7a1403348c3b38c120751 Author: Jonathan A. Kollasch jakllsch@kollasch.net Date: Mon Aug 1 14:24:02 2011 -0500
Add voltage control of southbridge and RAM on ms7135
Change-Id: I5d79b4838f69cad56d58363608b801f8b1d3ab43 Signed-off-by: Jonathan A. Kollasch jakllsch@kollasch.net --- src/mainboard/msi/ms7135/cmos.layout | 16 +++++++++-- src/mainboard/msi/ms7135/romstage.c | 49 ++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/mainboard/msi/ms7135/cmos.layout b/src/mainboard/msi/ms7135/cmos.layout index 53fdef5..694554d 100644 --- a/src/mainboard/msi/ms7135/cmos.layout +++ b/src/mainboard/msi/ms7135/cmos.layout @@ -43,6 +43,8 @@ entries 440 4 e 9 slow_cpu 444 1 e 1 nmi 445 1 e 1 iommu +448 4 e 10 ram_voltage +452 4 e 11 nf4_voltage 728 256 h 0 user_data 984 16 h 0 check_sum # Reserve the extended AMD configuration registers @@ -74,10 +76,10 @@ enumerations 7 0 Network 7 1 HDD 7 2 Floppy +#7 3 ROM 7 8 Fallback_Network 7 9 Fallback_HDD 7 10 Fallback_Floppy -#7 3 ROM 8 0 400Mhz 8 1 333Mhz 8 2 266Mhz @@ -91,8 +93,16 @@ enumerations 9 6 25.0% 9 7 12.5%
-checksums +10 0 2.55 +10 1 2.50 +10 2 2.60 +10 3 2.65 +10 4 2.70
-checksum 392 983 984 +11 0 1.50 +11 1 1.55 +11 2 1.60
+checksums
+checksum 392 983 984 diff --git a/src/mainboard/msi/ms7135/romstage.c b/src/mainboard/msi/ms7135/romstage.c index 8609142..dc01b6a 100644 --- a/src/mainboard/msi/ms7135/romstage.c +++ b/src/mainboard/msi/ms7135/romstage.c @@ -48,6 +48,10 @@ #include "cpu/amd/dualcore/dualcore.c" #include <spd.h>
+#if CONFIG_HAVE_OPTION_TABLE +#include "option_table.h" +#endif + #define SERIAL_DEV PNP_DEV(0x4e, W83627THG_SP1)
static void memreset(int controllers, const struct mem_controller *ctrl) { } @@ -66,6 +70,31 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "cpu/amd/model_fxx/init_cpus.c" #include "northbridge/amd/amdk8/early_ht.c"
+static void ms7135_set_ram_voltage(void) +{ + u8 b; + b = read_option(ram_voltage, 0); + if (b > 4) /* default if above 2.70v */ + b = 0; + print_debug("setting RAM voltage "); + print_debug_hex8(b); + print_debug("\n"); + ck804_smbus_write_byte(1, 0x2f, 0x00, b); +} + +static void ms7135_set_nf4_voltage(void) +{ + u8 b; + b = read_option(nf4_voltage, 0); + if (b > 2) /* default if above 1.60v */ + b = 0; + b |= 0x10; + print_debug("setting NF4 voltage "); + print_debug_hex8(b); + print_debug("\n"); + ck804_smbus_write_byte(1, 0x2f, 0x02, b); +} + static void sio_setup(void) { uint32_t dword; @@ -107,14 +136,19 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) bsp_apicid = init_cpus(cpu_init_detectedx);
w83627thg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); +#if CONFIG_USBDEBUG + ck804_enable_usbdebug(USBDEBUG_DEFAULT_PORT); + early_usbdebug_init(); +#endif console_init();
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
-#if 0 - dump_pci_device(PCI_DEV(0, 0x18, 0)); -#endif + enable_smbus(); + + ms7135_set_nf4_voltage(); + ms7135_set_ram_voltage();
needs_reset = setup_coherent_ht_domain();
@@ -138,19 +172,12 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) //It's the time to set ctrl now; fill_mem_ctrl(nodes, ctrl, spd_addr);
- enable_smbus(); - -#if 0 +#if CONFIG_DEBUG_SMBUS dump_spd_registers(&ctrl[0]); dump_smbus_registers(); #endif
sdram_initialize(nodes, ctrl);
-#if 0 - print_pci_devices(); - dump_pci_devices(); -#endif - post_cache_as_ram(); }
-
Jonathan A. Kollasch