From fb07bf4acaf7a86b2dd5c38beaa43f5d06c54e7b Mon Sep 17 00:00:00 2001 From: "arch import user (historical)" Date: Wed, 6 Jul 2005 18:17:43 +0000 Subject: [PATCH] Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-62 Creator: Yinghai Lu add eswar code in intel car to disable Hyperthreading git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1980 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/x86/car/cache_as_ram.inc | 200 ++++++++++++++----- src/cpu/x86/car/cache_as_ram_post.c | 16 +- src/cpu/x86/car/copy_and_run.c | 2 + src/mainboard/tyan/s2735/cache_as_ram_auto.c | 72 ------- 4 files changed, 164 insertions(+), 126 deletions(-) diff --git a/src/cpu/x86/car/cache_as_ram.inc b/src/cpu/x86/car/cache_as_ram.inc index d610efbb3b..ee569a31a7 100644 --- a/src/cpu/x86/car/cache_as_ram.inc +++ b/src/cpu/x86/car/cache_as_ram.inc @@ -1,6 +1,9 @@ /* We will use 4K bytes only */ +/* disable HyperThreading is done by eswar*/ +/* other's is the same as AMD except remove amd specific msr */ + #define CacheSize DCACHE_RAM_SIZE -#define CacheBase DCACHE_RAM_BASE +#define CacheBase (0xd0000 - CacheSize) #include @@ -11,6 +14,82 @@ CacheAsRam: /* hope we can skip the double set for normal part */ #if USE_FALLBACK_IMAGE == 1 + // Check whether the processor has HT capability + movl $01, %eax + cpuid + btl $28, %edx + jnc NotHtProcessor + bswapl %ebx + cmpb $01, %bh + jbe NotHtProcessor + + // It is a HT processor; Send SIPI to the other logical processor + // within this processor so that the CAR related common system registers + // are programmed accordingly + + // Use some register that is common to both logical processors + // as semaphore. Refer Appendix B, Vol.3 + xorl %eax, %eax + xorl %edx, %edx + movl $0x250, %ecx + wrmsr + + // Figure out the logical AP's APIC ID; the following logic will work + // only for processors with 2 threads + // Refer to Vol 3. Table 7-1 for details about this logic + movl $0xFEE00020, %esi + movl (%esi), %ebx + andl $0xFF000000, %ebx + bswapl %ebx + btl $0, %ebx + jnc LogicalAP0 + andb $0xFE, %bl + jmp Send_SIPI +LogicalAP0: + orb $0x01, %bl +Send_SIPI: + bswapl %ebx // ebx - logical AP's APIC ID + + // Fill up the IPI command registers in the Local APIC mapped to default address + // and issue SIPI to the other logical processor within this processor die. +Retry_SIPI: + movl %ebx, %eax + movl $0xFEE00310, %esi + movl %eax, (%esi) + + // SIPI vector - F900:0000 + movl $0x000006F9, %eax + movl $0xFEE00300, %esi + movl %eax, (%esi) + + movl $0x30, %ecx +SIPI_Delay: + pause + decl %ecx + jnz SIPI_Delay + + movl (%esi), %eax + andl $0x00001000, %eax + jnz Retry_SIPI + + // Wait for the Logical AP to complete initialization +LogicalAP_SIPINotdone: + movl $0x250, %ecx + rdmsr + orl %eax, %eax + jz LogicalAP_SIPINotdone + +NotHtProcessor: + +#if 1 + /* Set the default memory type and enable fixed and variable MTRRs */ + movl $MTRRdefType_MSR, %ecx + xorl %edx, %edx + /* Enable Variable and Fixed MTRRs */ + movl $0x00000c00, %eax + wrmsr +#endif + /*Clear all MTRRs */ xorl %edx, %edx @@ -27,29 +106,39 @@ clear_fixed_var_mtrr: jmp clear_fixed_var_mtrr clear_fixed_var_mtrr_out: - /* enable caching for 64K using variable mtrr */ - movl $0x200, %ecx - xorl %edx, %edx - movl $(CacheBase | MTRR_TYPE_WRBACK), %eax +#if CacheSize == 0x10000 + /* enable caching for 64K using fixed mtrr */ + movl $0x268, %ecx /* fix4k_c0000*/ + movl $0x06060606, %eax /* WB IO type */ + movl %eax, %edx wrmsr - - movl $0x201, %ecx - movl $0x0000000f, %edx - movl $((~((CacheBase + CacheSize) - 1)) | 0x800), %eax - wrmsr - - /* Set the default memory type and enable variable MTRRs */ - movl $MTRRdefType_MSR, %ecx - xorl %edx, %edx - /* Enable Variable MTRRs */ - movl $0x00000800, %eax - wrmsr - - /* Disable fast string operation */ - movl $0x1a0, %ecx - rdmsr - andl $(~0x1), %eax + movl $0x269, %ecx wrmsr +#endif + +#if CacheSize == 0x8000 + /* enable caching for 32K using fixed mtrr */ + movl $0x269, %ecx /* fix4k_c8000*/ + movl $0x06060606, %eax /* WB IO type */ + movl %eax, %edx + wrmsr +#endif + + /* enable caching for 16K/8K/4K using fixed mtrr */ + movl $0x269, %ecx /* fix4k_cc000*/ +#if CacheSize == 0x4000 + movl $0x06060606, %edx /* WB IO type */ +#endif +#if CacheSize == 0x2000 + movl $0x06060000, %edx /* WB IO type */ +#endif +#if CacheSize == 0x1000 + movl $0x06000000, %edx /* WB IO type */ +#endif + xorl %eax, %eax + wrmsr + + #else /* disable cache */ movl %cr0, %eax @@ -58,7 +147,6 @@ clear_fixed_var_mtrr_out: #endif /* USE_FALLBACK_IMAGE == 1*/ -#if 0 #if defined(XIP_ROM_SIZE) && defined(XIP_ROM_BASE) /* enable write base caching so we can do execute in place * on the flash rom. @@ -73,7 +161,6 @@ clear_fixed_var_mtrr_out: movl $(~(XIP_ROM_SIZE - 1) | 0x800), %eax wrmsr #endif /* XIP_ROM_SIZE && XIP_ROM_BASE */ -#endif /* enable cache */ movl %cr0, %eax @@ -82,34 +169,21 @@ clear_fixed_var_mtrr_out: #if USE_FALLBACK_IMAGE == 1 -// intel_chip_post_macro(0x11) /* post 11 */ - /* Read the range with lodsl*/ movl $CacheBase, %esi cld movl $(CacheSize>>2), %ecx rep lodsl - // Disable the cache. This is the trick. Processors - // Pentium Pro and above are designed to respond to cache - // hits with CD=1 and NW=1. That is read hits access the - // cache; write hits update the cache. With the tags - // established above and no snoop hit, the cache will - // behave as RAM. - movl %cr0, %eax - orl $0x60000000, %eax - movl %eax, %cr0 - /* Clear the range */ movl $CacheBase, %edi - cld movl $(CacheSize>>2), %ecx xorl %eax, %eax rep stosl -#if 1 - /* check the cache as ram */ +#if 0 + /* check the cache as ram */ movl $CacheBase, %esi movl $(CacheSize>>2), %ecx .xin1: @@ -123,10 +197,10 @@ clear_fixed_var_mtrr_out: movl $CacheBase, %esi // movl $(CacheSize>>2), %ecx - movl $4, %ecx -.xin1x: + movl $4, %ecx +.xin1x: movl %esi, %eax - + movl $0x4000, %edx movb %ah, %al .testx1: @@ -137,13 +211,13 @@ clear_fixed_var_mtrr_out: movl (%esi), %eax cmpb 0xff, %al je .xin2 /* dont show */ - + movl $0x4000, %edx .testx2: outb %al, $0x80 decl %edx jnz .testx2 - + .xin2: decl %ecx je .xout1x add $4, %esi @@ -153,7 +227,6 @@ clear_fixed_var_mtrr_out: #endif #endif /*USE_FALLBACK_IMAGE == 1*/ -// intel_chip_post_macro(0x12) /* post 12 */ movl $(CacheBase+CacheSize-4), %eax movl %eax, %esp @@ -167,13 +240,12 @@ clear_fixed_var_mtrr_out: #endif lout: -// intel_chip_post_macro(0x13) /* post 13 */ /* Restore the BIST result */ - movl %ebp, %eax + movl %ebp, %eax /* We need to set ebp ? No need */ movl %esp, %ebp - pushl %eax /* bist */ + pushl %eax /* bist */ call amd64_main /* We will not go back */ @@ -189,4 +261,36 @@ var_mtrr_msr: .long 0x208, 0x209, 0x20A, 0x20B .long 0x20C, 0x20D, 0x20E, 0x20F .long 0x000 /* NULL, end of table */ + +#if USE_FALLBACK_IMAGE == 1 + .align 0x1000 + .code16 +.global LogicalAP_SIPI +LogicalAP_SIPI: + // cr0 register is shared among the logical processors; + // so clear CD & NW bits so that the BSP's cr0 register + // controls the cache behavior + // Note: The cache behavior is determined by "OR" result + // of the cr0 registers of the logical processors + + movl %cr0, %eax + andl $0x9FFFFFFF, %eax + movl %eax, %cr0 + + finit + + // Set the semaphore to indicate the Logical AP is done + // with CAR specific initialization + movl $0x250, %ecx + movl $0x06, %eax + xorl %edx, %edx + wrmsr + + // Halt this AP + cli +Halt_LogicalAP: + hlt + jmp Halt_LogicalAP + .code32 +#endif /*USE_FALLBACK_IMAGE == 1*/ .CacheAsRam_out: diff --git a/src/cpu/x86/car/cache_as_ram_post.c b/src/cpu/x86/car/cache_as_ram_post.c index 8cbc1e9cba..a0b6b17851 100644 --- a/src/cpu/x86/car/cache_as_ram_post.c +++ b/src/cpu/x86/car/cache_as_ram_post.c @@ -12,17 +12,21 @@ "movl %eax, %cr0\n\t" /* clear sth */ - "movl $0x200, %ecx\n\t" + "movl $0x269, %ecx\n\t" /* fix4k_c8000*/ "xorl %edx, %edx\n\t" "xorl %eax, %eax\n\t" "wrmsr\n\t" - "movl $0x201, %ecx\n\t" +#if DCACHE_RAM_SIZE > 0x8000 + "movl $0x268, %ecx\n\t" /* fix4k_c0000*/ "wrmsr\n\t" +#endif - /* enable fast string operation */ - "movl $0x1a0, %ecx\n\t" - "rdmsr\n\t" - "orl $1, %eax\n\t" + /* Set the default memory type and disable fixed and enable variable MTRRs */ + "movl $0x2ff, %ecx\n\t" +// "movl $MTRRdefType_MSR, %ecx\n\t" + "xorl %edx, %edx\n\t" + /* Enable Variable and Disable Fixed MTRRs */ + "movl $0x00000800, %eax\n\t" "wrmsr\n\t" #if defined(CLEAR_FIRST_1M_RAM) diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c index 89a864d4fc..ae77e50956 100644 --- a/src/cpu/x86/car/copy_and_run.c +++ b/src/cpu/x86/car/copy_and_run.c @@ -62,6 +62,8 @@ static void copy_and_run(unsigned cpu_reset) print_debug("src="); print_debug_hex32(src); print_debug("\r\n"); print_debug("dst="); print_debug_hex32(dst); print_debug("\r\n"); #endif + +// dump_mem(src, src+0x100); for(;;) { unsigned int m_off, m_len; diff --git a/src/mainboard/tyan/s2735/cache_as_ram_auto.c b/src/mainboard/tyan/s2735/cache_as_ram_auto.c index 4fdf8b5190..80af842f4f 100644 --- a/src/mainboard/tyan/s2735/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2735/cache_as_ram_auto.c @@ -90,46 +90,6 @@ void real_main(unsigned long bist); void amd64_main(unsigned long bist) { -#if 1 -#if 0 - unsigned cmos_result; - int i; - for(i=0;i<2;i++) { - cmos_result = cmos_read(0x10); - outb(cmos_result, 0x80); - } -#endif -__asm__ volatile ( - "movl $(DCACHE_RAM_BASE+DCACHE_RAM_SIZE-4), %esi\n\t" -// "movl $(DCACHE_RAM_SIZE>>2), %ecx\n\t" - "movl $8, %ecx\n\t" -".yin1x:\n\t" - "movl %esi, %eax\n\t" - - "movl $0x2000, %edx\n\t" - "movb %ah, %al\n\t" -".testy1:\n\t" - "outb %al, $0x80\n\t" - "decl %edx\n\t" - "jnz .testy1\n\t" - - "movl (%esi), %eax\n\t" - "cmpb 0xff, %al\n\t" - "je .yin2\n\t" - - "movl $0x2000, %edx\n\t" -".testy2:\n\t" - "outb %al, $0x80\n\t" - "decl %edx\n\t" - "jnz .testy2\n\t" - -".yin2: decl %ecx\n\t" - "je .yout1x\n\t" - "sub $4, %esi\n\t" - "jmp .yin1x\n\t" -".yout1x:\n\t" -); -#endif /* Is this a deliberate reset by the bios */ // post_code(0x22); if (bios_reset_detected() && last_boot_normal()) { @@ -180,38 +140,6 @@ void amd64_main(unsigned long bist) }; unsigned cpu_reset = 0; -#if 1 -__asm__ volatile ( - "movl $(DCACHE_RAM_BASE+DCACHE_RAM_SIZE-4), %esi\n\t" -// "movl $(DCACHE_RAM_SIZE>>2), %ecx\n\t" - "movl $8, %ecx\n\t" -".zin1x:\n\t" - "movl %esi, %eax\n\t" - - "movl $0x2000, %edx\n\t" - "movb %ah, %al\n\t" -".testz1:\n\t" - "outb %al, $0x80\n\t" - "decl %edx\n\t" - "jnz .testz1\n\t" - - "movl (%esi), %eax\n\t" - "cmpb 0xff, %al\n\t" - "je .zin2\n\t" - - "movl $0x2000, %edx\n\t" -".testz2:\n\t" - "outb %al, $0x80\n\t" - "decl %edx\n\t" - "jnz .testz2\n\t" - -".zin2: decl %ecx\n\t" - "je .zout1x\n\t" - "sub $4, %esi\n\t" - "jmp .zin1x\n\t" -".zout1x:\n\t" -); -#endif if (bist == 0) {