i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix the timeout from millisecond to our microsecond spin/ wait functions.

Browse Source 
- The timeout in Wait was ignored because B_RELATIVE_TIMEOUT was missing.
- Some cleanup.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31482 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2009-07-09 16:25:54 +00:00
parent 2f0441f7e3
commit 8c042be3d7
2 changed files with 59 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.cpp
+35 -37
View File
@@ -54,7 +54,7 @@
device_manager_info *gDeviceManager = NULL; device_manager_info *gDeviceManager = NULL;
pci_module_info *gPCIManager = NULL; pci_module_info *gPCIManager = NULL;
// cpu frequency // cpu frequency in Hz
int64 gHz; int64 gHz;
@@ -161,7 +161,7 @@ acpi_PkgInt32(acpi_object_type *res, int idx, uint32 *dst)
static status_t static status_t
embedded_controller_open(void *initCookie, const char *path, int flags, void** cookie) embedded_controller_open(void *initCookie, const char *path, int flags, void** cookie)
{ {
acpi_ec_softc *device = (acpi_ec_softc*)initCookie; acpi_ec_cookie *device = (acpi_ec_cookie*)initCookie;
*cookie = device; *cookie = device;
return B_OK; return B_OK;
@@ -268,9 +268,9 @@ embedded_controller_init_driver(device_node *dev, void **_driverCookie)
return B_ERROR; return B_ERROR;
gHz = systemInfo.cpu_clock_speed; gHz = systemInfo.cpu_clock_speed;
acpi_ec_softc *sc; acpi_ec_cookie *sc;
sc = (acpi_ec_softc*)malloc(sizeof(acpi_ec_softc)); sc = (acpi_ec_cookie*)malloc(sizeof(acpi_ec_cookie));
memset(sc, 0, sizeof(acpi_ec_softc)); memset(sc, 0, sizeof(acpi_ec_cookie));
*_driverCookie = sc; *_driverCookie = sc;
sc->ec_dev = dev; sc->ec_dev = dev;
@@ -366,14 +366,12 @@ embedded_controller_init_driver(device_node *dev, void **_driverCookie)
sc->ec_suspending = FALSE; sc->ec_suspending = FALSE;
/* Attach bus resources for data and command/status ports. */ /* Attach bus resources for data and command/status ports. */
sc->ec_data_rid = 0; if (resourceData.ReadIOPort(&portData) != B_OK)
if (resourceData.ReadIOPort(&portData) != B_OK)
goto error; goto error;
sc->ec_data_pci_address = portData.minimumBase; sc->ec_data_pci_address = portData.minimumBase;
sc->ec_csr_rid = 1; if (resourceData.ReadIOPort(&portData) != B_OK)
if (resourceData.ReadIOPort(&portData) != B_OK)
goto error; goto error;
sc->ec_csr_pci_address = portData.minimumBase; sc->ec_csr_pci_address = portData.minimumBase;
@@ -433,7 +431,7 @@ error:
static void static void
embedded_controller_uninit_driver(void *driverCookie) embedded_controller_uninit_driver(void *driverCookie)
{ {
acpi_ec_softc* sc = (struct acpi_ec_softc *)driverCookie; acpi_ec_cookie* sc = (struct acpi_ec_cookie *)driverCookie;
free(sc); free(sc);
put_module(B_ACPI_MODULE_NAME); put_module(B_ACPI_MODULE_NAME);
put_module(B_DPC_MODULE_NAME); put_module(B_DPC_MODULE_NAME);
@@ -445,7 +443,7 @@ embedded_controller_uninit_driver(void *driverCookie)
static status_t static status_t
embedded_controller_register_child_devices(void *_cookie) embedded_controller_register_child_devices(void *_cookie)
{ {
device_node *node = ((acpi_ec_softc*)_cookie)->ec_dev; device_node *node = ((acpi_ec_cookie*)_cookie)->ec_dev;
int pathID = gDeviceManager->create_id(ACPI_EC_PATHID_GENERATOR); int pathID = gDeviceManager->create_id(ACPI_EC_PATHID_GENERATOR);
if (pathID < 0) { if (pathID < 0) {
@@ -470,7 +468,7 @@ embedded_controller_init_device(void *driverCookie, void **cookie)
static void static void
embedded_controller_uninit_device(void *_cookie) embedded_controller_uninit_device(void *_cookie)
{ {
acpi_ec_softc *device = (acpi_ec_softc*)_cookie; acpi_ec_cookie *device = (acpi_ec_cookie*)_cookie;
free(device); free(device);
} }
@@ -533,7 +531,7 @@ module_info *modules[] = {
static void static void
EcGpeQueryHandler(void *context) EcGpeQueryHandler(void *context)
{ {
struct acpi_ec_softc *sc = (struct acpi_ec_softc *)context; struct acpi_ec_cookie *sc = (struct acpi_ec_cookie *)context;
uint8 data; uint8 data;
status_t status; status_t status;
char qxx[5]; char qxx[5];
@@ -555,7 +553,7 @@ EcGpeQueryHandler(void *context)
* to be queued, we clear the pending flag only after running it. * to be queued, we clear the pending flag only after running it.
*/ */
status = EcCommand(sc, EC_COMMAND_QUERY); status = EcCommand(sc, EC_COMMAND_QUERY);
sc->ec_sci_pend = FALSE; sc->ec_sci_pending = FALSE;
if (status != B_OK) { if (status != B_OK) {
EcUnlock(sc); EcUnlock(sc);
TRACE("GPE query failed.\n"); TRACE("GPE query failed.\n");
@@ -571,7 +569,7 @@ EcGpeQueryHandler(void *context)
EcUnlock(sc); EcUnlock(sc);
/* Ignore the value for "no outstanding event". (13.3.5) */ /* Ignore the value for "no outstanding event". (13.3.5) */
TRACE("ec query ok,%s running _Q%02X\n", data ? "" : " not", data); TRACE("query ok,%s running _Q%02X\n", data ? "" : " not", data);
if (data == 0) if (data == 0)
return; return;
@@ -591,12 +589,12 @@ EcGpeQueryHandler(void *context)
static uint32 static uint32
EcGpeHandler(void *context) EcGpeHandler(void *context)
{ {
struct acpi_ec_softc *sc = (acpi_ec_softc*)context; struct acpi_ec_cookie *sc = (acpi_ec_cookie*)context;
status_t status; status_t status;
EC_STATUS EcStatus; EC_STATUS EcStatus;
ASSERT(context != NULL);//, ("EcGpeHandler called with NULL")); ASSERT(context != NULL);//, ("EcGpeHandler called with NULL"));
TRACE("ec gpe handler start\n"); TRACE("gpe handler start\n");
/* /*
* Notify EcWaitEvent() that the status register is now fresh. If we * Notify EcWaitEvent() that the status register is now fresh. If we
@@ -611,11 +609,11 @@ EcGpeHandler(void *context)
* It will run the query and _Qxx method later, under the lock. * It will run the query and _Qxx method later, under the lock.
*/ */
EcStatus = EC_GET_CSR(sc); EcStatus = EC_GET_CSR(sc);
if ((EcStatus & EC_EVENT_SCI) && !sc->ec_sci_pend) { if ((EcStatus & EC_EVENT_SCI) && !sc->ec_sci_pending) {
TRACE("ec gpe queueing query handler\n"); TRACE("gpe queueing query handler\n");
status = AcpiOsExecute(OSL_GPE_HANDLER, EcGpeQueryHandler, context); status = AcpiOsExecute(OSL_GPE_HANDLER, EcGpeQueryHandler, context);
if (status == B_OK) if (status == B_OK)
sc->ec_sci_pend = TRUE; sc->ec_sci_pending = TRUE;
else else
dprintf("EcGpeHandler: queuing GPE query handler failed\n"); dprintf("EcGpeHandler: queuing GPE query handler failed\n");
} }
@@ -645,7 +643,7 @@ EcSpaceHandler(uint32 function, acpi_physical_address address, uint32 width,
int *value, void *context, void *regionContext) int *value, void *context, void *regionContext)
{ {
TRACE("enter EcSpaceHandler\n"); TRACE("enter EcSpaceHandler\n");
struct acpi_ec_softc *sc = (struct acpi_ec_softc *)context; struct acpi_ec_cookie *sc = (struct acpi_ec_cookie *)context;
status_t status; status_t status;
uint8 ecAddr, ecData; uint8 ecAddr, ecData;
uint32 i; uint32 i;
@@ -702,25 +700,25 @@ EcSpaceHandler(uint32 function, acpi_physical_address address, uint32 width,
} }
static status_t static status_t
EcCheckStatus(struct acpi_ec_softc *sc, const char *msg, EC_EVENT event) EcCheckStatus(struct acpi_ec_cookie *sc, const char *msg, EC_EVENT event)
{ {
status_t status = B_ERROR; status_t status = B_ERROR;
EC_STATUS ec_status; EC_STATUS ec_status;
ec_status = EC_GET_CSR(sc); ec_status = EC_GET_CSR(sc);
if (sc->ec_burstactive && !(ec_status & EC_FLAG_BURST_MODE)) { if (sc->ec_burstactive && !(ec_status & EC_FLAG_BURST_MODE)) {
TRACE("ec burst disabled in waitevent (%s)\n", msg); TRACE("burst disabled in waitevent (%s)\n", msg);
sc->ec_burstactive = false; sc->ec_burstactive = false;
} }
if (EVENT_READY(event, ec_status)) { if (EVENT_READY(event, ec_status)) {
TRACE("ec %s wait ready, status %#x\n", msg, ec_status); TRACE("%s wait ready, status %#x\n", msg, ec_status);
status = B_OK; status = B_OK;
} }
return (status); return (status);
} }
static status_t static status_t
EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT event, int32 gen_count) EcWaitEvent(struct acpi_ec_cookie *sc, EC_EVENT event, int32 gen_count)
{ {
status_t status = B_ERROR; status_t status = B_ERROR;
int32 count, i; int32 count, i;
@@ -754,7 +752,7 @@ EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT event, int32 gen_count)
/* Wait for event by polling or GPE (interrupt). */ /* Wait for event by polling or GPE (interrupt). */
if (need_poll) { if (need_poll) {
count = (ec_timeout * 1000) / EC_POLL_DELAY; count = ec_timeout / EC_POLL_DELAY;
if (count == 0) if (count == 0)
count = 1; count = 1;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
@@ -764,7 +762,7 @@ EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT event, int32 gen_count)
spin(EC_POLL_DELAY); spin(EC_POLL_DELAY);
} }
} else { } else {
bigtime_t slp_ival = gHz / 1000; bigtime_t slp_ival = gHz / 1000000;
if (slp_ival != 0) { if (slp_ival != 0) {
count = ec_timeout; count = ec_timeout;
} else { } else {
@@ -794,7 +792,7 @@ EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT event, int32 gen_count)
if (status == B_OK) if (status == B_OK)
break; break;
} }
sc->ec_condition_var.Wait(0, slp_ival); sc->ec_condition_var.Wait(B_RELATIVE_TIMEOUT, slp_ival);
} }
/* /*
@@ -817,7 +815,7 @@ EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT event, int32 gen_count)
} }
static status_t static status_t
EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd) EcCommand(struct acpi_ec_cookie *sc, EC_COMMAND cmd)
{ {
status_t status; status_t status;
EC_EVENT event; EC_EVENT event;
@@ -845,7 +843,7 @@ EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd)
} }
/* Run the command and wait for the chosen event. */ /* Run the command and wait for the chosen event. */
TRACE("ec running command %#x\n", cmd); TRACE("running command %#x\n", cmd);
gen_count = sc->ec_gencount; gen_count = sc->ec_gencount;
EC_SET_CSR(sc, cmd); EC_SET_CSR(sc, cmd);
status = EcWaitEvent(sc, event, gen_count); status = EcWaitEvent(sc, event, gen_count);
@@ -863,20 +861,20 @@ EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd)
} }
static status_t static status_t
EcRead(struct acpi_ec_softc *sc, uint8 address, uint8 *readData) EcRead(struct acpi_ec_cookie *sc, uint8 address, uint8 *readData)
{ {
status_t status; status_t status;
uint8 data; uint8 data;
u_int gen_count; u_int gen_count;
TRACE("ec read from %#x\n", address); TRACE("read from %#x\n", address);
/* If we can't start burst mode, continue anyway. */ /* If we can't start burst mode, continue anyway. */
status = EcCommand(sc, EC_COMMAND_BURST_ENABLE); status = EcCommand(sc, EC_COMMAND_BURST_ENABLE);
if (status == B_OK) { if (status == B_OK) {
data = EC_GET_DATA(sc); data = EC_GET_DATA(sc);
if (data == EC_BURST_ACK) { if (data == EC_BURST_ACK) {
TRACE("ec burst enabled\n"); TRACE("burst enabled\n");
sc->ec_burstactive = TRUE; sc->ec_burstactive = TRUE;
} }
} }
@@ -900,14 +898,14 @@ EcRead(struct acpi_ec_softc *sc, uint8 address, uint8 *readData)
status = EcCommand(sc, EC_COMMAND_BURST_DISABLE); status = EcCommand(sc, EC_COMMAND_BURST_DISABLE);
if (status != B_OK) if (status != B_OK)
return (status); return (status);
TRACE("ec disabled burst ok\n"); TRACE("disabled burst ok\n");
} }
return (B_OK); return (B_OK);
} }
static status_t static status_t
EcWrite(struct acpi_ec_softc *sc, uint8 address, uint8 *writeData) EcWrite(struct acpi_ec_cookie *sc, uint8 address, uint8 *writeData)
{ {
status_t status; status_t status;
uint8 data; uint8 data;
@@ -918,7 +916,7 @@ EcWrite(struct acpi_ec_softc *sc, uint8 address, uint8 *writeData)
if (status == B_OK) { if (status == B_OK) {
data = EC_GET_DATA(sc); data = EC_GET_DATA(sc);
if (data == EC_BURST_ACK) { if (data == EC_BURST_ACK) {
TRACE("ec burst enabled\n"); TRACE("burst enabled\n");
sc->ec_burstactive = TRUE; sc->ec_burstactive = TRUE;
} }
} }
@@ -948,7 +946,7 @@ EcWrite(struct acpi_ec_softc *sc, uint8 address, uint8 *writeData)
status = EcCommand(sc, EC_COMMAND_BURST_DISABLE); status = EcCommand(sc, EC_COMMAND_BURST_DISABLE);
if (status != B_OK) if (status != B_OK)
return (status); return (status);
TRACE("ec disabled burst ok"); TRACE("disabled burst ok\n");
} }
return (B_OK); return (B_OK);
src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.h
+24 -27
View File
@@ -199,30 +199,27 @@ static int ec_timeout = EC_TIMEOUT;
int32 acpi_get_type(device_node* dev); int32 acpi_get_type(device_node* dev);
/* /*
* Driver softc. * Driver cookie.
*/ */
struct acpi_ec_softc { struct acpi_ec_cookie {
device_node* ec_dev; device_node* ec_dev;
acpi_module_info* ec_acpi_module; acpi_module_info* ec_acpi_module;
acpi_device_module_info* ec_acpi; acpi_device_module_info* ec_acpi;
acpi_device ec_handle; acpi_device ec_handle;
int ec_uid; int ec_uid;
acpi_handle ec_gpehandle; acpi_handle ec_gpehandle;
uint8 ec_gpebit; uint8 ec_gpebit;
int ec_data_rid; int ec_data_pci_address;
int ec_data_pci_address; int ec_csr_pci_address;
int ec_csr_rid;
int ec_csr_pci_address;
int ec_glk; int ec_glk;
uint32 ec_glkhandle; uint32 ec_glkhandle;
int ec_burstactive; int ec_burstactive;
int ec_sci_pend; int ec_sci_pending;
vint32 ec_gencount; vint32 ec_gencount;
ConditionVariable ec_condition_var; ConditionVariable ec_condition_var;
int ec_suspending; int ec_suspending;
}; };
@@ -248,7 +245,7 @@ struct acpi_ec_softc {
static status_t static status_t
EcLock(struct acpi_ec_softc *sc) EcLock(struct acpi_ec_cookie *sc)
{ {
status_t status; status_t status;
@@ -266,7 +263,7 @@ EcLock(struct acpi_ec_softc *sc)
static void static void
EcUnlock(struct acpi_ec_softc *sc) EcUnlock(struct acpi_ec_cookie *sc)
{ {
if (sc->ec_glk) if (sc->ec_glk)
sc->ec_acpi_module->release_global_lock(sc->ec_glkhandle); sc->ec_acpi_module->release_global_lock(sc->ec_glkhandle);
@@ -282,12 +279,12 @@ static status_t EcSpaceHandler(uint32 function,
acpi_physical_address address, acpi_physical_address address,
uint32 width, int *value, uint32 width, int *value,
void *context, void *regionContext); void *context, void *regionContext);
static status_t EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT event, static status_t EcWaitEvent(struct acpi_ec_cookie *sc, EC_EVENT event,
int32 gen_count); int32 gen_count);
static status_t EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd); static status_t EcCommand(struct acpi_ec_cookie *sc, EC_COMMAND cmd);
static status_t EcRead(struct acpi_ec_softc *sc, uint8 address, static status_t EcRead(struct acpi_ec_cookie *sc, uint8 address,
uint8 *readData); uint8 *readData);
static status_t EcWrite(struct acpi_ec_softc *sc, uint8 address, static status_t EcWrite(struct acpi_ec_cookie *sc, uint8 address,
uint8 *writeData); uint8 *writeData);