Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added acpi_shutdown() method. If the ACPI bus manager is installed, this will

Browse Source 
be used now. Tested only with VMware so far.
* apm_shutdown() is now called with interrupts turned on.
* Renamed arch_cpu.c to arch_cpu.cpp.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27404 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-09-10 19:50:08 +00:00
parent a181d013aa
commit cb387cfb2f
4 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/private/kernel/arch/x86/arch_cpu.h
View File

@ -222,7 +222,7 @@ enum x86_vendors {
typedef struct arch_cpu_info {
// saved cpu info
enum x86_vendors vendor;
enum x86_feature_type feature[FEATURE_NUM];
uint32 feature[FEATURE_NUM];
char model_name[49];
const char *vendor_name;
int type;

2
src/system/kernel/arch/x86/Jamfile
View File

@ -14,7 +14,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) timers ] ;
KernelMergeObject kernel_arch_x86.o :
arch_commpage.cpp
arch_cpu.c
arch_cpu.cpp
arch_debug.cpp
arch_debug_console.c
arch_elf.c

9
src/system/kernel/arch/x86/apm.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Copyright 2006-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
@ -256,7 +256,12 @@ apm_shutdown(void)
if (!sAPMEnabled)
return B_NOT_SUPPORTED;
return apm_set_state(APM_ALL_DEVICES, APM_POWER_STATE_OFF);
cpu_status state = disable_interrupts();
status_t status = apm_set_state(APM_ALL_DEVICES, APM_POWER_STATE_OFF);
restore_interrupts(state);
return status;
}

62
src/system/kernel/arch/x86/arch_cpu.c → src/system/kernel/arch/x86/arch_cpu.cpp
View File

@ -13,6 +13,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <ACPI.h>
#include <boot_device.h>
#include <commpage.h>
#include <smp.h>
@ -63,7 +65,7 @@ struct set_mtrr_parameter {
};
extern void reboot(void);
extern "C" void reboot(void);
// from arch_x86.S
void (*gX86SwapFPUFunc)(void *oldState, const void *newState);
@ -81,17 +83,32 @@ static uint32 sDoubleFaultStack[10240];
static x86_cpu_module_info *sCpuModule;
extern void memcpy_generic(void* dest, const void* source, size_t count);
extern int memcpy_generic_end;
extern "C" void memcpy_generic(void* dest, const void* source, size_t count);
extern int memcpy_generic_end;
x86_optimized_functions gOptimizedFunctions = {
.memcpy = memcpy_generic,
.memcpy_end = &memcpy_generic_end
memcpy_generic,
&memcpy_generic_end
};
/** Disable CPU caches, and invalidate them. */
static status_t
acpi_shutdown(void)
{
acpi_module_info* acpi;
if (get_module(B_ACPI_MODULE_NAME, (module_info**)&acpi) != B_OK)
return B_NOT_SUPPORTED;
status_t status = acpi->enter_sleep_state(ACPI_POWER_STATE_OFF);
if (status == B_OK)
status = acpi->enter_sleep_state(ACPI_POWER_STATE_OFF);
put_module(B_ACPI_MODULE_NAME);
return status;
}
/*! Disable CPU caches, and invalidate them. */
static void
disable_caches()
{
@ -101,8 +118,7 @@ disable_caches()
}
/** Invalidate CPU caches, and enable them. */
/*! Invalidate CPU caches, and enable them. */
static void
enable_caches()
{
@ -341,7 +357,6 @@ detect_cpu(int currentCPU)
cpu_ent *cpu = get_cpu_struct();
char vendorString[17];
cpuid_info cpuid;
int i;
// clear out the cpu info data
cpu->arch.vendor = VENDOR_UNKNOWN;
@ -374,14 +389,16 @@ detect_cpu(int currentCPU)
// figure out what vendor we have here
for (i = 0; i < VENDOR_NUM; i++) {
if (vendor_info[i].ident_string[0] && !strcmp(vendorString, vendor_info[i].ident_string[0])) {
cpu->arch.vendor = i;
for (int32 i = 0; i < VENDOR_NUM; i++) {
if (vendor_info[i].ident_string[0]
&& !strcmp(vendorString, vendor_info[i].ident_string[0])) {
cpu->arch.vendor = (x86_vendors)i;
cpu->arch.vendor_name = vendor_info[i].vendor;
break;
}
if (vendor_info[i].ident_string[1] && !strcmp(vendorString, vendor_info[i].ident_string[1])) {
cpu->arch.vendor = i;
if (vendor_info[i].ident_string[1]
&& !strcmp(vendorString, vendor_info[i].ident_string[1])) {
cpu->arch.vendor = (x86_vendors)i;
cpu->arch.vendor_name = vendor_info[i].vendor;
break;
}
@ -404,11 +421,11 @@ detect_cpu(int currentCPU)
memcpy(cpu->arch.model_name + 32, cpuid.as_chars, sizeof(cpuid.as_chars));
// some cpus return a right-justified string
for (i = 0; cpu->arch.model_name[i] == ' '; i++)
;
int32 i = 0;
while (cpu->arch.model_name[i] == ' ')
i++;
if (i > 0) {
memmove(cpu->arch.model_name,
&cpu->arch.model_name[i],
memmove(cpu->arch.model_name, &cpu->arch.model_name[i],
strlen(&cpu->arch.model_name[i]) + 1);
}
@ -693,15 +710,16 @@ error:
status_t
arch_cpu_shutdown(bool rebootSystem)
{
cpu_status state = disable_interrupts();
if (!rebootSystem) {
status_t status = apm_shutdown();
status_t status = acpi_shutdown();
if (status != B_OK)
status = apm_shutdown();
restore_interrupts(state);
return status;
}
cpu_status state = disable_interrupts();
// try to reset the system using the keyboard controller
out8(0xfe, 0x64);