From: Jeff Fan Date: Mon, 11 Jul 2016 05:21:10 +0000 (+0800) Subject: UefiCpuPkg/CpuMpPei/Ia32: Use CodeSegment and DataSegment fields X-Git-Tag: edk2-stable201903~6319 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=aad5ee4899c43665a19ec8934e51dc6a34186389 UefiCpuPkg/CpuMpPei/Ia32: Use CodeSegment and DataSegment fields Using CodeSegment and DataSegment fields in ExchangeInfo instead of the hardcode MACROs. Cc: Feng Tian Cc: Michael Kinney Cc: Giri Mudusuru Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan Reviewed-by: Giri P Mudusuru --- diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm index ab78bcc07b..97fdd9ef97 100644 --- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm +++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm @@ -1,5 +1,5 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2015, Intel Corporation. All rights reserved.
+; Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at @@ -39,25 +39,34 @@ RendezvousFunnelProcStart:: ; Save BIST information to ebp firstly db 66h, 08bh, 0e8h ; mov ebp, eax ; save BIST information - db 8ch,0c8h ; mov ax,cs - db 8eh,0d8h ; mov ds,ax - db 8eh,0c0h ; mov es,ax - db 8eh,0d0h ; mov ss,ax - db 33h,0c0h ; xor ax,ax - db 8eh,0e0h ; mov fs,ax - db 8eh,0e8h ; mov gs,ax + db 8ch,0c8h ; mov ax, cs + db 8eh,0d8h ; mov ds, ax + db 8eh,0c0h ; mov es, ax + db 8eh,0d0h ; mov ss, ax + db 33h,0c0h ; xor ax, ax + db 8eh,0e0h ; mov fs, ax + db 8eh,0e8h ; mov gs, ax db 0BEh ; opcode of mov si, mem16 dw BufferStartLocation ; mov si, BufferStartLocation - db 66h, 8Bh, 1Ch ; mov ebx,dword ptr [si] + db 66h, 8Bh, 1Ch ; mov ebx, dword ptr [si] - db 0BFh ; opcode of mov di, mem16 - dw PmodeOffsetLocation ; mov di, PmodeOffsetLocation - db 66h, 8Bh, 05h ; mov eax,dword ptr [di] - db 8Bh, 0F8h ; mov di, ax - db 83h, 0EFh,06h ; sub di, 06h - db 66h, 03h, 0C3h ; add eax, ebx - db 66h, 89h, 05h ; mov dword ptr [di],eax + db 0BEh ; opcode of mov si, mem16 + dw PmodeOffsetLocation ; mov si, PmodeOffsetLocation + db 66h, 8Bh, 04h ; mov eax, [si] + db 0BEh ; opcode of mov si, mem16 + dw CodeSegmentLocation ; mov si, CodeSegmentLocation + db 66h, 8Bh, 14h ; mov edx, [si] + db 89h, 0C7h ; mov di, ax + db 83h, 0EFh, 02h ; sub di, 02h + db 89h, 15h ; mov [di], dx + db 83h, 0EFh, 04h ; sub di, 04h + db 66h, 01h, 0D8h ; add eax, ebx + db 66h, 89h, 05h ; mov [di], eax + + db 0BEh ; opcode of mov si, mem16 + dw DataSegmentLocation ; mov si, DataSegmentLocation + db 66h, 8Bh, 14h ; mov edx, [si] db 0BEh ; opcode of mov si, mem16 dw GdtrLocation ; mov si, GdtrLocation @@ -78,15 +87,14 @@ RendezvousFunnelProcStart:: db 66h, 67h, 0EAh ; far jump dd 0h ; 32-bit offset - dw PROTECT_MODE_CS ; 16-bit selector + dw 0h ; 16-bit selector Flat32Start:: ; protected mode entry point - mov ax, PROTECT_MODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax + mov ds, dx + mov es, dx + mov fs, dx + mov gs, dx + mov ss, dx mov esi, ebx mov edi, esi diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm index 2ff16dc297..577ca4e31c 100644 --- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm +++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm @@ -1,5 +1,5 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2015, Intel Corporation. All rights reserved.
+; Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at @@ -48,13 +48,20 @@ BITS 16 mov si, BufferStartLocation mov ebx, [si] - mov di, PmodeOffsetLocation - mov eax, [di] + mov si, PmodeOffsetLocation + mov eax, [si] + mov si, CodeSegmentLocation + mov edx, [si] mov di, ax - sub di, 06h + sub di, 02h + mov [di], dx + sub di, 04h add eax, ebx mov [di],eax + mov si, DataSegmentLocation + mov edx, [si] + mov si, GdtrLocation o32 lgdt [cs:si] @@ -68,15 +75,14 @@ o32 lidt [cs:si] or eax, 000000003h ;Set PE bit (bit #0) & MP mov cr0, eax - jmp PROTECT_MODE_CS:strict dword 0 ; far jump to protected mode + jmp 0:strict dword 0 ; far jump to protected mode BITS 32 Flat32Start: ; protected mode entry point - mov ax, PROTECT_MODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax + mov ds, dx + mov es, dx + mov fs, dx + mov gs, dx + mov ss, dx mov esi, ebx mov edi, esi