Author: stepan Date: Sun Aug 1 19:22:17 2010 New Revision: 5678 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5678
Log: make early_mtrr_init() invisible for cache as ram targets as it breaks them. Fix up converted mainboards that still used early_mtrr_init() Signed-off-by: Stefan Reinauer <[email protected]> Acked-by: Stefan Reinauer <[email protected]> Modified: trunk/src/cpu/x86/mtrr/earlymtrr.c trunk/src/mainboard/bcom/winnetp680/romstage.c trunk/src/mainboard/via/epia-cn/romstage.c trunk/src/mainboard/via/pc2500e/romstage.c Modified: trunk/src/cpu/x86/mtrr/earlymtrr.c ============================================================================== --- trunk/src/cpu/x86/mtrr/earlymtrr.c Sun Aug 1 19:20:20 2010 (r5677) +++ trunk/src/cpu/x86/mtrr/earlymtrr.c Sun Aug 1 19:22:17 2010 (r5678) @@ -62,6 +62,7 @@ enable_cache(); } +#if !defined(CONFIG_USE_DCACHE_RAM) || (CONFIG_USE_DCACHE_RAM == 0) /* the fixed and variable MTTRs are power-up with random values, * clear them to MTRR_TYPE_UNCACHEABLE for safty. */ @@ -118,6 +119,7 @@ do_early_mtrr_init(mtrr_msrs); enable_cache(); } +#endif static inline int early_mtrr_init_detected(void) { Modified: trunk/src/mainboard/bcom/winnetp680/romstage.c ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/romstage.c Sun Aug 1 19:20:20 2010 (r5677) +++ trunk/src/mainboard/bcom/winnetp680/romstage.c Sun Aug 1 19:22:17 2010 (r5678) @@ -95,11 +95,6 @@ enable_smbus(); smbus_fixup(&ctrl); - if (bist == 0) { - print_debug("doing early_mtrr\n"); - early_mtrr_init(); - } - /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); Modified: trunk/src/mainboard/via/epia-cn/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-cn/romstage.c Sun Aug 1 19:20:20 2010 (r5677) +++ trunk/src/mainboard/via/epia-cn/romstage.c Sun Aug 1 19:22:17 2010 (r5678) @@ -93,11 +93,6 @@ enable_smbus(); smbus_fixup(&ctrl); - if (bist == 0) { - print_debug("doing early_mtrr\n"); - early_mtrr_init(); - } - /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); Modified: trunk/src/mainboard/via/pc2500e/romstage.c ============================================================================== --- trunk/src/mainboard/via/pc2500e/romstage.c Sun Aug 1 19:20:20 2010 (r5677) +++ trunk/src/mainboard/via/pc2500e/romstage.c Sun Aug 1 19:22:17 2010 (r5678) @@ -67,9 +67,6 @@ enable_smbus(); smbus_fixup(&ctrl); - if (bist == 0) - early_mtrr_init(); - /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
