xnu-1228.tar.gz

[apple/xnu.git] / osfmk / i386 / mtrr.c

diff --git a/osfmk/i386/mtrr.c b/osfmk/i386/mtrr.c
index fe718c39d6fd78ffc30194980f97122d64ed06ce..cd818d51112ba8df9a052f59b6b96bb8220f2fc3 100644 (file)
--- a/osfmk/i386/mtrr.c
+++ b/osfmk/i386/mtrr.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #include <mach/kern_return.h>
@@ -221,8 +227,6 @@ mtrr_msr_dump(void)
 void
 mtrr_init(void)
 {
-       i386_cpu_info_t * infop = cpuid_info();
-
        /* no reason to init more than once */
        if (mtrr_initialized == TRUE)
                return;
@@ -231,41 +235,6 @@ mtrr_init(void)
        if ((cpuid_features() & CPUID_FEATURE_MTRR) == 0)
                return;  /* no MTRR feature */
 
-       /* cpu vendor/model specific handling */
-       if (!strncmp(infop->cpuid_vendor, CPUID_VID_AMD, sizeof(CPUID_VID_AMD)))
-       {
-               /* Check for AMD Athlon 64 and Opteron */
-               if (cpuid_family() == 0xF)
-               {
-                       uint32_t cpuid_result[4];
-
-                       /* check if cpu support Address Sizes function */
-                       do_cpuid(0x80000000, cpuid_result);
-                       if (cpuid_result[0] >= 0x80000008)
-                       {
-                               int bits;
-
-                               do_cpuid(0x80000008, cpuid_result);
-                               DBG("MTRR: AMD 8000_0008 EAX = %08x\n",
-                                       cpuid_result[0]);
-
-                               /*
-                                * Function 8000_0008 (Address Sizes) EAX
-                                * Bits  7-0 : phys address size
-                                * Bits 15-8 : virt address size
-                                */
-                               bits = cpuid_result[0] & 0xFF;
-                               if ((bits < 36) || (bits > 64))
-                               {
-                                       printf("MTRR: bad address size\n");
-                                       return; /* bogus size */
-                               }
-
-                               mtrr_phys_mask = PHYS_BITS_TO_MASK(bits);
-                       }
-               }
-       }
-
        /* use a lock to serialize MTRR changes */
        bzero((void *)&mtrr_state, sizeof(mtrr_state));
        simple_lock_init(&mtrr_lock, 0);