/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple 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@
*/
/*-
* Copyright (c) 1982, 1986, 1989, 1993
#include <machine/machine_routines.h>
#include <machine/cpu_capabilities.h>
-#ifdef __i386__
-#include <i386/cpuid.h> /* for cpuid_info() */
+#include <mach/mach_host.h> /* for host_info() */
+
+#if defined(__i386__) || defined(__x86_64__)
+#include <i386/cpuid.h> /* for cpuid_info() */
#endif
+
+
#ifndef MAX
#define MAX(a,b) (a >= b ? a : b)
#endif
-static int cputype, cpusubtype, cputhreadtype, cpufamily, cacheconfig[10];;
+/* XXX This should be in a BSD accessible Mach header, but isn't. */
+extern unsigned int vm_page_wire_count;
-SYSCTL_NODE(, 0, sysctl, CTLFLAG_RW, 0,
+static int cputype, cpusubtype, cputhreadtype, cpufamily, cpu64bit;
+static uint64_t cacheconfig[10], cachesize[10];
+static int packages;
+
+SYSCTL_NODE(, 0, sysctl, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"Sysctl internal magic");
-SYSCTL_NODE(, CTL_KERN, kern, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_KERN, kern, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"High kernel, proc, limits &c");
-SYSCTL_NODE(, CTL_VM, vm, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_VM, vm, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"Virtual memory");
-SYSCTL_NODE(, CTL_VFS, vfs, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_VFS, vfs, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"File system");
-SYSCTL_NODE(, CTL_NET, net, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_NET, net, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"Network, (see socket.h)");
-SYSCTL_NODE(, CTL_DEBUG, debug, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_DEBUG, debug, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"Debugging");
-SYSCTL_NODE(, CTL_HW, hw, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_HW, hw, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"hardware");
-SYSCTL_NODE(, CTL_MACHDEP, machdep, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_MACHDEP, machdep, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"machine dependent");
-SYSCTL_NODE(, CTL_USER, user, CTLFLAG_RW, 0,
+SYSCTL_NODE(, CTL_USER, user, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
"user-level");
#define SYSCTL_RETURN(r, x) SYSCTL_OUT(r, &x, sizeof(x))
* gather some of that here.
*/
static int
-sysctl_hw_generic SYSCTL_HANDLER_ARGS
+sysctl_hw_generic(__unused struct sysctl_oid *oidp, __unused void *arg1,
+ int arg2, struct sysctl_req *req)
{
char dummy[65];
int epochTemp;
- extern int vm_page_wire_count;
ml_cpu_info_t cpu_info;
int val, doquad;
long long qval;
host_basic_info_data_t hinfo;
kern_return_t kret;
- int count = HOST_BASIC_INFO_COUNT;
+ mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
/*
* Test and mask off the 'return quad' flag.
ml_cpu_get_info(&cpu_info);
#define BSD_HOST 1
- kret = host_info(BSD_HOST, HOST_BASIC_INFO, &hinfo, &count);
+ kret = host_info((host_t)BSD_HOST, HOST_BASIC_INFO, (host_info_t)&hinfo, &count);
/*
* Handle various OIDs.
return(SYSCTL_RETURN(req, val));
}
+/* hw.pagesize and hw.tbfrequency are expected as 64 bit values */
+static int
+sysctl_pagesize
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+ long long l = page_size;
+ return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
+}
+
+static int
+sysctl_tbfrequency
+(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
+{
+ long long l = gPEClockFrequencyInfo.timebase_frequency_hz;
+ return sysctl_io_number(req, l, sizeof(l), NULL, NULL);
+}
+
/*
* hw.* MIB variables.
*/
SYSCTL_PROC (_hw, OID_AUTO, physicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_LOCAL_PHYSICALCPUMAX, sysctl_hw_generic, "I", "");
SYSCTL_PROC (_hw, OID_AUTO, logicalcpu, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_LOCAL_LOGICALCPU, sysctl_hw_generic, "I", "");
SYSCTL_PROC (_hw, OID_AUTO, logicalcpu_max, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_LOCAL_LOGICALCPUMAX, sysctl_hw_generic, "I", "");
-SYSCTL_INT (_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD | CTLFLAG_KERN, NULL, BYTE_ORDER, "");
+SYSCTL_INT (_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD | CTLFLAG_KERN, (int *)NULL, BYTE_ORDER, "");
SYSCTL_INT (_hw, OID_AUTO, cputype, CTLFLAG_RD | CTLFLAG_KERN, &cputype, 0, "");
SYSCTL_INT (_hw, OID_AUTO, cpusubtype, CTLFLAG_RD | CTLFLAG_KERN, &cpusubtype, 0, "");
+SYSCTL_INT (_hw, OID_AUTO, cpu64bit_capable, CTLFLAG_RD | CTLFLAG_KERN, &cpu64bit, 0, "");
SYSCTL_INT (_hw, OID_AUTO, cpufamily, CTLFLAG_RD | CTLFLAG_KERN, &cpufamily, 0, "");
-SYSCTL_OPAQUE (_hw, OID_AUTO, cacheconfig, CTLFLAG_RD, &cacheconfig, sizeof(cacheconfig), "I", "");
-SYSCTL_INT2QUAD(_hw, OID_AUTO, pagesize, CTLFLAG_RD | CTLFLAG_KERN, &page_size, "");
+SYSCTL_OPAQUE (_hw, OID_AUTO, cacheconfig, CTLFLAG_RD, &cacheconfig, sizeof(cacheconfig), "Q", "");
+SYSCTL_OPAQUE (_hw, OID_AUTO, cachesize, CTLFLAG_RD, &cachesize, sizeof(cachesize), "Q", "");
+SYSCTL_PROC (_hw, OID_AUTO, pagesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, 0, sysctl_pagesize, "Q", "");
SYSCTL_QUAD (_hw, OID_AUTO, busfrequency, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.bus_frequency_hz, "");
SYSCTL_QUAD (_hw, OID_AUTO, busfrequency_min, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.bus_frequency_min_hz, "");
SYSCTL_QUAD (_hw, OID_AUTO, busfrequency_max, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.bus_frequency_max_hz, "");
SYSCTL_PROC (_hw, OID_AUTO, l1dcachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_L1DCACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
SYSCTL_PROC (_hw, OID_AUTO, l2cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_L2CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
SYSCTL_PROC (_hw, OID_AUTO, l3cachesize, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, HW_L3CACHESIZE | CTLHW_RETQUAD, sysctl_hw_generic, "Q", "");
-SYSCTL_INT2QUAD(_hw, OID_AUTO, tbfrequency, CTLFLAG_RD | CTLFLAG_KERN, &gPEClockFrequencyInfo.timebase_frequency_hz, "");
+SYSCTL_PROC(_hw, OID_AUTO, tbfrequency, CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_KERN, 0, 0, sysctl_tbfrequency, "Q", "");
SYSCTL_QUAD (_hw, HW_MEMSIZE, memsize, CTLFLAG_RD | CTLFLAG_KERN, &max_mem, "");
+SYSCTL_INT (_hw, OID_AUTO, packages, CTLFLAG_RD | CTLFLAG_KERN, &packages, 0, "");
/*
* Optional features can register nodes below hw.optional.
* 0. If the feature is present and its use is advised, the node should
* return 1.
*/
-SYSCTL_NODE(_hw, OID_AUTO, optional, CTLFLAG_RW, NULL, "optional features");
+SYSCTL_NODE(_hw, OID_AUTO, optional, CTLFLAG_RW|CTLFLAG_LOCKED, NULL, "optional features");
-SYSCTL_INT(_hw_optional, OID_AUTO, floatingpoint, CTLFLAG_RD | CTLFLAG_KERN, 0, 1, ""); /* always set */
+SYSCTL_INT(_hw_optional, OID_AUTO, floatingpoint, CTLFLAG_RD | CTLFLAG_KERN, (int *)NULL, 1, ""); /* always set */
/*
* Deprecated variables. These are supported for backwards compatibility
*
* The *_compat nodes are *NOT* visible within the kernel.
*/
-SYSCTL_INT (_hw, HW_PAGESIZE, pagesize_compat, CTLFLAG_RD | CTLFLAG_MASKED, &page_size, 0, "");
-SYSCTL_INT (_hw, HW_BUS_FREQ, busfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.bus_clock_rate_hz, 0, "");
-SYSCTL_INT (_hw, HW_CPU_FREQ, cpufrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.cpu_clock_rate_hz, 0, "");
+SYSCTL_COMPAT_INT (_hw, HW_PAGESIZE, pagesize_compat, CTLFLAG_RD | CTLFLAG_MASKED, &page_size, 0, "");
+SYSCTL_COMPAT_INT (_hw, HW_BUS_FREQ, busfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.bus_clock_rate_hz, 0, "");
+SYSCTL_COMPAT_INT (_hw, HW_CPU_FREQ, cpufrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.cpu_clock_rate_hz, 0, "");
SYSCTL_PROC(_hw, HW_CACHELINE, cachelinesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_CACHELINE, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_L1ICACHESIZE, l1icachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L1ICACHESIZE, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_L1DCACHESIZE, l1dcachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L1DCACHESIZE, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_L2CACHESIZE, l2cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L2CACHESIZE, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_L3CACHESIZE, l3cachesize_compat, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L3CACHESIZE, sysctl_hw_generic, "I", "");
-SYSCTL_INT (_hw, HW_TB_FREQ, tbfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.timebase_frequency_hz, 0, "");
+SYSCTL_COMPAT_INT (_hw, HW_TB_FREQ, tbfrequency_compat, CTLFLAG_RD | CTLFLAG_MASKED, &gPEClockFrequencyInfo.timebase_frequency_hz, 0, "");
SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_MACHINE, sysctl_hw_generic, "A", "");
SYSCTL_PROC(_hw, HW_MODEL, model, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_MODEL, sysctl_hw_generic, "A", "");
-SYSCTL_UINT(_hw, HW_PHYSMEM, physmem, CTLFLAG_RD | CTLFLAG_MASKED, &mem_size, 0, "");
+SYSCTL_COMPAT_UINT(_hw, HW_PHYSMEM, physmem, CTLFLAG_RD | CTLFLAG_MASKED, &mem_size, 0, "");
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_USERMEM, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_EPOCH, epoch, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_EPOCH, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_VECTORUNIT, vectorunit, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_VECTORUNIT, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_L2SETTINGS, l2settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L2SETTINGS, sysctl_hw_generic, "I", "");
SYSCTL_PROC(_hw, HW_L3SETTINGS, l3settings, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MASKED, 0, HW_L3SETTINGS, sysctl_hw_generic, "I", "");
+SYSCTL_INT (_hw, OID_AUTO, cputhreadtype, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &cputhreadtype, 0, "");
+
+#ifdef __ppc__
+int altivec_flag = -1;
+int graphicsops_flag = -1;
+int x64bitops_flag = -1;
+int fsqrt_flag = -1;
+int stfiwx_flag = -1;
+int dcba_flag = -1;
+int datastreams_flag = -1;
+int dcbtstreams_flag = -1;
+
+SYSCTL_INT(_hw_optional, OID_AUTO, altivec, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &altivec_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, graphicsops, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &graphicsops_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, 64bitops, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &x64bitops_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, fsqrt, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &fsqrt_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, stfiwx, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &stfiwx_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, dcba, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &dcba_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, datastreams, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &datastreams_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, dcbtstreams, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &dcbtstreams_flag, 0, "");
+#elif defined (__i386__) || defined (__x86_64__)
+int mmx_flag = -1;
+int sse_flag = -1;
+int sse2_flag = -1;
+int sse3_flag = -1;
+int sse4_1_flag = -1;
+int sse4_2_flag = -1;
+int x86_64_flag = -1;
+int supplementalsse3_flag = -1;
+
+SYSCTL_INT(_hw_optional, OID_AUTO, mmx, CTLFLAG_RD | CTLFLAG_KERN, &mmx_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, sse, CTLFLAG_RD | CTLFLAG_KERN, &sse_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, sse2, CTLFLAG_RD | CTLFLAG_KERN, &sse2_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, sse3, CTLFLAG_RD | CTLFLAG_KERN, &sse3_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, supplementalsse3, CTLFLAG_RD | CTLFLAG_KERN, &supplementalsse3_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, sse4_1, CTLFLAG_RD | CTLFLAG_KERN, &sse4_1_flag, 0, "");
+SYSCTL_INT(_hw_optional, OID_AUTO, sse4_2, CTLFLAG_RD | CTLFLAG_KERN, &sse4_2_flag, 0, "");
+/* "x86_64" is actually a preprocessor symbol on the x86_64 kernel, so we have to hack this */
+#undef x86_64
+SYSCTL_INT(_hw_optional, OID_AUTO, x86_64, CTLFLAG_RD | CTLFLAG_KERN, &x86_64_flag, 0, "");
+#endif /* __ppc__ */
/*
* Debugging interface to the CPU power management code.
*/
-static void pmsSysctl SYSCTL_HANDLER_ARGS {
-
+static int
+pmsSysctl(__unused struct sysctl_oid *oidp, __unused void *arg1,
+ __unused int arg2, struct sysctl_req *req)
+{
pmsctl_t ctl;
int error;
boolean_t intr;
return(error);
intr = ml_set_interrupts_enabled(FALSE); /* No interruptions in here */
- error = pmsControl(ctl.request, (user_addr_t)ctl.reqaddr, ctl.reqsize);
+ error = pmsControl(ctl.request, (user_addr_t)(uintptr_t)ctl.reqaddr, ctl.reqsize);
(void)ml_set_interrupts_enabled(intr); /* Restore interruptions */
return(error);
cputype = cpu_type();
cpusubtype = cpu_subtype();
cputhreadtype = cpu_threadtype();
+#if defined(__ppc__)
+ cpu64bit = (_cpu_capabilities & k64Bit) == k64Bit;
+#elif defined(__i386__) || defined (__x86_64__)
+ cpu64bit = (_get_cpu_capabilities() & k64Bit) == k64Bit;
+#endif
/*
* Populate the optional portion of the hw.* MIB.
*/
if (cputhreadtype != CPU_THREADTYPE_NONE) {
- static SYSCTL_INT(_hw, OID_AUTO, cputhreadtype, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &cputhreadtype, 0, "");
sysctl_register_oid(&sysctl__hw_cputhreadtype);
}
#ifdef __ppc__
- {
- static int altivec_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, altivec, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &altivec_flag, 0, "");
-
- if (_cpu_capabilities & kHasAltivec) {
- altivec_flag = 1;
- sysctl_register_oid(&sysctl__hw_optional_altivec);
- }
- }
- {
- static int graphicsops_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, graphicsops, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &graphicsops_flag, 0, "");
-
- if (_cpu_capabilities & kHasGraphicsOps) {
- graphicsops_flag = 1;
- sysctl_register_oid(&sysctl__hw_optional_graphicsops);
- }
- }
- {
- static int x64bitops_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, 64bitops, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &x64bitops_flag, 0, "");
-
- if (_cpu_capabilities & k64Bit) {
- x64bitops_flag = 1;
- sysctl_register_oid(&sysctl__hw_optional_64bitops);
- }
- }
- {
- static int fsqrt_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, fsqrt, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &fsqrt_flag, 0, "");
+/*
+ * The convention for these is as follows:
+ * If the sysctl does not exist, the functionality is not present in the CPU.
+ * If the sysctl exists, it will not crash, and should otherwise function
+ * corectly.
+ * If the sysctl exists and returns 0, we advise against using this feature.
+ * If the sysctl exists and returns 1, we advise it's use.
+ */
- if (_cpu_capabilities & kHasFsqrt) {
- fsqrt_flag = 1;
- sysctl_register_oid(&sysctl__hw_optional_fsqrt);
- }
- }
- {
- static int stfiwx_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, stfiwx, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &stfiwx_flag, 0, "");
-
- if (_cpu_capabilities & kHasStfiwx) {
- stfiwx_flag = 1;
- sysctl_register_oid(&sysctl__hw_optional_stfiwx);
- }
- }
- {
- static int dcba_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, dcba, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &dcba_flag, 0, "");
-
- if (_cpu_capabilities & kDcbaAvailable)
- dcba_flag = 0;
- if (_cpu_capabilities & kDcbaRecommended)
- dcba_flag = 1;
- if (dcba_flag >= 0)
- sysctl_register_oid(&sysctl__hw_optional_dcba);
- }
- {
- static int datastreams_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, datastreams, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &datastreams_flag, 0, "");
-
- if (_cpu_capabilities & kDataStreamsAvailable)
- datastreams_flag = 0;
- if (_cpu_capabilities & kDataStreamsRecommended)
- datastreams_flag = 1;
- if (datastreams_flag >= 0)
- sysctl_register_oid(&sysctl__hw_optional_datastreams);
- }
- {
- static int dcbtstreams_flag = -1;
- static SYSCTL_INT(_hw_optional, OID_AUTO, dcbtstreams, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN, &dcbtstreams_flag, 0, "");
-
- if (_cpu_capabilities & kDcbtStreamsAvailable)
- dcbtstreams_flag = 0;
- if (_cpu_capabilities & kDcbtStreamsRecommended)
- dcbtstreams_flag = 1;
- if (dcbtstreams_flag >= 0)
- sysctl_register_oid(&sysctl__hw_optional_dcbtstreams);
+ if (_cpu_capabilities & kHasAltivec) {
+ altivec_flag = 1;
+ sysctl_register_oid(&sysctl__hw_optional_altivec);
}
+ if (_cpu_capabilities & kHasGraphicsOps) {
+ graphicsops_flag = 1;
+ sysctl_register_oid(&sysctl__hw_optional_graphicsops);
+ }
+ if (_cpu_capabilities & k64Bit) {
+ x64bitops_flag = 1;
+ sysctl_register_oid(&sysctl__hw_optional_64bitops);
+ }
+ if (_cpu_capabilities & kHasFsqrt) {
+ fsqrt_flag = 1;
+ sysctl_register_oid(&sysctl__hw_optional_fsqrt);
+ }
+ if (_cpu_capabilities & kHasStfiwx) {
+ stfiwx_flag = 1;
+ sysctl_register_oid(&sysctl__hw_optional_stfiwx);
+ }
+ if (_cpu_capabilities & kDcbaAvailable)
+ dcba_flag = 0;
+ if (_cpu_capabilities & kDcbaRecommended)
+ dcba_flag = 1;
+ if (dcba_flag >= 0)
+ sysctl_register_oid(&sysctl__hw_optional_dcba);
+ if (_cpu_capabilities & kDataStreamsAvailable)
+ datastreams_flag = 0;
+ if (_cpu_capabilities & kDataStreamsRecommended)
+ datastreams_flag = 1;
+ if (datastreams_flag >= 0)
+ sysctl_register_oid(&sysctl__hw_optional_datastreams);
+ if (_cpu_capabilities & kDcbtStreamsAvailable)
+ dcbtstreams_flag = 0;
+ if (_cpu_capabilities & kDcbtStreamsRecommended)
+ dcbtstreams_flag = 1;
+ if (dcbtstreams_flag >= 0)
+ sysctl_register_oid(&sysctl__hw_optional_dcbtstreams);
/* hw.cpufamily */
switch (cpusubtype) {
cpufamily = CPUFAMILY_UNKNOWN;
}
- /* hw.cacheconfig */
- cacheconfig[0] = 0; /* XXX not supported on PowerPC */
-
-#elif defined (__i386__)
-
+ ml_cpu_info_t cpu_info;
+ ml_cpu_get_info(&cpu_info);
-#define DECLARE_X86_HW_OPTIONAL_FLAGS(named, BITS, flags) { \
- static int named##_flag = -1; \
- static SYSCTL_INT(_hw_optional, OID_AUTO, named, CTLFLAG_RD | CTLFLAG_NOAUTO | CTLFLAG_KERN | flags, &named##_flag, 0, ""); \
- named##_flag = ((_get_cpu_capabilities() & BITS) == BITS)? 1 : 0; \
- sysctl_register_oid(&sysctl__hw_optional_##named); \
+ host_basic_info_data_t hinfo;
+ mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
+ kern_return_t kret = host_info((host_t)BSD_HOST, HOST_BASIC_INFO, (host_info_t)&hinfo, &count);
+ if(kret != KERN_SUCCESS)
+ {
+ hinfo.max_cpus = 1;
}
-#define DECLARE_X86_HW_OPTIONAL(named, BITS) \
- DECLARE_X86_HW_OPTIONAL_FLAGS(named, BITS, 0)
-
-#define DECLARE_X86_HW_OPTIONAL_MASKED(named, BITS) \
- DECLARE_X86_HW_OPTIONAL_FLAGS(named, BITS, CTLFLAG_MASKED)
-
- DECLARE_X86_HW_OPTIONAL(mmx, kHasMMX);
- DECLARE_X86_HW_OPTIONAL(sse, kHasSSE);
- DECLARE_X86_HW_OPTIONAL(sse2, kHasSSE2);
- DECLARE_X86_HW_OPTIONAL(sse3, kHasSSE3);
- if (_get_cpu_capabilities() & k64Bit)
- DECLARE_X86_HW_OPTIONAL(x86_64, k64Bit);
- if (_get_cpu_capabilities() & kHasSupplementalSSE3) {
- DECLARE_X86_HW_OPTIONAL_MASKED(mni, kHasSupplementalSSE3); /* XXX */
- DECLARE_X86_HW_OPTIONAL(supplementalsse3, kHasSupplementalSSE3);
- }
+ /* hw.cachesize */
+ cachesize[0] = max_mem;
+ cachesize[1] = cpu_info.l1_dcache_size;
+ cachesize[2] = cpu_info.l2_settings ? cpu_info.l2_cache_size : 0;
+ cachesize[3] = cpu_info.l3_settings ? cpu_info.l3_cache_size : 0;
+ cachesize[4] = 0;
+
+ /* hw.cacheconfig */
+ cacheconfig[0] = hinfo.max_cpus;
+ cacheconfig[1] = 1;
+ cacheconfig[2] = cachesize[2] ? 1 : 0;
+ cacheconfig[3] = cachesize[3] ? 1 : 0;
+ cacheconfig[4] = 0;
+
+ /* hw.packages */
+ if (cpusubtype == CPU_SUBTYPE_POWERPC_970 &&
+ cpu_info.l2_cache_size == 1 * 1024 * 1024)
+ /* The signature of the dual-core G5 */
+ packages = roundup(hinfo.max_cpus, 2) / 2;
+ else
+ packages = hinfo.max_cpus;
+
+#elif defined (__i386__) || defined (__x86_64__)
+ mmx_flag = ((_get_cpu_capabilities() & kHasMMX) == kHasMMX)? 1 : 0;
+ sse_flag = ((_get_cpu_capabilities() & kHasSSE) == kHasSSE)? 1 : 0;
+ sse2_flag = ((_get_cpu_capabilities() & kHasSSE2) == kHasSSE2)? 1 : 0;
+ sse3_flag = ((_get_cpu_capabilities() & kHasSSE3) == kHasSSE3)? 1 : 0;
+ supplementalsse3_flag = ((_get_cpu_capabilities() & kHasSupplementalSSE3) == kHasSupplementalSSE3)? 1 : 0;
+ sse4_1_flag = ((_get_cpu_capabilities() & kHasSSE4_1) == kHasSSE4_1)? 1 : 0;
+ sse4_2_flag = ((_get_cpu_capabilities() & kHasSSE4_2) == kHasSSE4_2)? 1 : 0;
+ x86_64_flag = ((_get_cpu_capabilities() & k64Bit) == k64Bit)? 1 : 0;
/* hw.cpufamily */
switch (cpuid_info()->cpuid_family) {
case 6:
switch (cpuid_info()->cpuid_model) {
+ case 13:
+ cpufamily = CPUFAMILY_INTEL_6_13;
+ break;
case 14:
cpufamily = CPUFAMILY_INTEL_6_14; /* Core Solo/Duo */
break;
case 15:
- cpufamily = CPUFAMILY_INTEL_6_15;
+ cpufamily = CPUFAMILY_INTEL_6_15; /* Core 2 */
+ break;
+ case 23:
+ cpufamily = CPUFAMILY_INTEL_6_23;
+ break;
+ case 26:
+ cpufamily = CPUFAMILY_INTEL_6_26;
break;
default:
cpufamily = CPUFAMILY_UNKNOWN;
cpufamily = CPUFAMILY_UNKNOWN;
}
/* hw.cacheconfig */
- cacheconfig[0] = cpuid_info()->cpuid_cores_per_package;
- cacheconfig[1] = MAX(cpuid_info()->cache_sharing[L1I], cpuid_info()->cache_sharing[L1D]);
- cacheconfig[2] = cpuid_info()->cache_sharing[L2U];
- cacheconfig[3] = cpuid_info()->cache_sharing[L3U];
+ cacheconfig[0] = ml_cpu_cache_sharing(0);
+ cacheconfig[1] = ml_cpu_cache_sharing(1);
+ cacheconfig[2] = ml_cpu_cache_sharing(2);
+ cacheconfig[3] = ml_cpu_cache_sharing(3);
cacheconfig[4] = 0;
-#else /* end __i386 */
+ /* hw.cachesize */
+ cachesize[0] = ml_cpu_cache_size(0);
+ cachesize[1] = ml_cpu_cache_size(1);
+ cachesize[2] = ml_cpu_cache_size(2);
+ cachesize[3] = ml_cpu_cache_size(3);
+ cachesize[4] = 0;
+
+ /* hw.packages */
+ packages = roundup(ml_cpu_cache_sharing(0), cpuid_info()->thread_count)
+ / cpuid_info()->thread_count;
+
+#else /* end __arm__ */
# warning we do not support this platform yet
#endif /* __ppc__ */
-
}
projects / apple / xnu.git / blobdiff