X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UefiCpuPkg%2FCpuDxe%2FCpuGdt.c;h=87fd6955f24bfa412de9d5d0e9f12dd2aba764e9;hp=35a87a6e453e8bcf85a993df18c678d6c76c9978;hb=0acd869796ded1266e69487dff717cd69d6031f9;hpb=a1e8986d97d8b3ce3ef2ff9d81f2d6ddf9d8dd1f

diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c
index 35a87a6e45..87fd6955f2 100644
--- a/UefiCpuPkg/CpuDxe/CpuGdt.c
+++ b/UefiCpuPkg/CpuDxe/CpuGdt.c
@@ -2,14 +2,8 @@
   C based implemention of IA32 interrupt handling only
   requiring a minimal assembly interrupt entry point.
 
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-  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
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -35,10 +29,10 @@ STATIC GDT_ENTRIES GdtTemplate = {
   // LINEAR_SEL
   //
   {
-    0x0FFFF,        // limit 0xFFFFF
-    0x0,            // base 0
-    0x0,
-    0x092,          // present, ring 0, data, expand-up, writable
+    0x0FFFF,        // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x092,          // present, ring 0, data, read/write
     0x0CF,          // page-granular, 32-bit
     0x0,
   },
@@ -46,10 +40,10 @@ STATIC GDT_ENTRIES GdtTemplate = {
   // LINEAR_CODE_SEL
   //
   {
-    0x0FFFF,        // limit 0xFFFFF
-    0x0,            // base 0
-    0x0,
-    0x09A,          // present, ring 0, data, expand-up, writable
+    0x0FFFF,        // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x09F,          // present, ring 0, code, execute/read, conforming, accessed
     0x0CF,          // page-granular, 32-bit
     0x0,
   },
@@ -57,10 +51,10 @@ STATIC GDT_ENTRIES GdtTemplate = {
   // SYS_DATA_SEL
   //
   {
-    0x0FFFF,        // limit 0xFFFFF
-    0x0,            // base 0
-    0x0,
-    0x092,          // present, ring 0, data, expand-up, writable
+    0x0FFFF,        // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x093,          // present, ring 0, data, read/write, accessed
     0x0CF,          // page-granular, 32-bit
     0x0,
   },
@@ -68,45 +62,56 @@ STATIC GDT_ENTRIES GdtTemplate = {
   // SYS_CODE_SEL
   //
   {
-    0x0FFFF,        // limit 0xFFFFF
-    0x0,            // base 0
-    0x0,
-    0x09A,          // present, ring 0, data, expand-up, writable
+    0x0FFFF,        // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x09A,          // present, ring 0, code, execute/read
     0x0CF,          // page-granular, 32-bit
     0x0,
   },
   //
-  // LINEAR_CODE64_SEL
+  // SPARE4_SEL
   //
   {
-    0x0FFFF,        // limit 0xFFFFF
-    0x0,            // base 0
-    0x0,
-    0x09B,          // present, ring 0, code, expand-up, writable
-    0x0AF,          // LimitHigh (CS.L=1, CS.D=0)
-    0x0,            // base (high)
+    0x0,            // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x0,            // type
+    0x0,            // limit 19:16, flags
+    0x0,            // base 31:24
   },
   //
-  // SPARE4_SEL
+  // LINEAR_DATA64_SEL
   //
   {
-    0x0,            // limit 0
-    0x0,            // base 0
-    0x0,
-    0x0,            // present, ring 0, data, expand-up, writable
-    0x0,            // page-granular, 32-bit
+    0x0FFFF,        // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x092,          // present, ring 0, data, read/write
+    0x0CF,          // page-granular, 32-bit
     0x0,
   },
   //
+  // LINEAR_CODE64_SEL
+  //
+  {
+    0x0FFFF,        // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x09A,          // present, ring 0, code, execute/read
+    0x0AF,          // page-granular, 64-bit code
+    0x0,            // base (high)
+  },
+  //
   // SPARE5_SEL
   //
   {
-    0x0,            // limit 0
-    0x0,            // base 0
-    0x0,
-    0x0,            // present, ring 0, data, expand-up, writable
-    0x0,            // page-granular, 32-bit
-    0x0,
+    0x0,            // limit 15:0
+    0x0,            // base 15:0
+    0x0,            // base 23:16
+    0x0,            // type
+    0x0,            // limit 19:16, flags
+    0x0,            // base 31:24
   },
 };