Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
902b236c
Commit
902b236c
authored
Feb 16, 2007
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Pull bugzilla-7887 into release branch
parents
08e4a10e
aafbcd16
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
12 deletions
+27
-12
drivers/acpi/bus.c
drivers/acpi/bus.c
+8
-5
drivers/acpi/hardware/hwsleep.c
drivers/acpi/hardware/hwsleep.c
+8
-5
drivers/acpi/sleep/main.c
drivers/acpi/sleep/main.c
+1
-2
include/acpi/acpi_drivers.h
include/acpi/acpi_drivers.h
+10
-0
No files found.
drivers/acpi/bus.c
View file @
902b236c
...
@@ -147,7 +147,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state)
...
@@ -147,7 +147,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state)
*
state
=
ACPI_STATE_D0
;
*
state
=
ACPI_STATE_D0
;
}
else
{
}
else
{
/*
/*
* Get the device's power state either directly (via _PSC) or
* Get the device's power state either directly (via _PSC) or
* indirectly (via power resources).
* indirectly (via power resources).
*/
*/
if
(
device
->
power
.
flags
.
explicit_get
)
{
if
(
device
->
power
.
flags
.
explicit_get
)
{
...
@@ -461,7 +461,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
...
@@ -461,7 +461,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
"Received BUS CHECK notification for device [%s]
\n
"
,
"Received BUS CHECK notification for device [%s]
\n
"
,
device
->
pnp
.
bus_id
));
device
->
pnp
.
bus_id
));
result
=
acpi_bus_check_scope
(
device
);
result
=
acpi_bus_check_scope
(
device
);
/*
/*
* TBD: We'll need to outsource certain events to non-ACPI
* TBD: We'll need to outsource certain events to non-ACPI
* drivers via the device manager (device.c).
* drivers via the device manager (device.c).
*/
*/
...
@@ -472,7 +472,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
...
@@ -472,7 +472,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
"Received DEVICE CHECK notification for device [%s]
\n
"
,
"Received DEVICE CHECK notification for device [%s]
\n
"
,
device
->
pnp
.
bus_id
));
device
->
pnp
.
bus_id
));
result
=
acpi_bus_check_device
(
device
,
NULL
);
result
=
acpi_bus_check_device
(
device
,
NULL
);
/*
/*
* TBD: We'll need to outsource certain events to non-ACPI
* TBD: We'll need to outsource certain events to non-ACPI
* drivers via the device manager (device.c).
* drivers via the device manager (device.c).
*/
*/
...
@@ -542,7 +542,7 @@ static int __init acpi_bus_init_irq(void)
...
@@ -542,7 +542,7 @@ static int __init acpi_bus_init_irq(void)
char
*
message
=
NULL
;
char
*
message
=
NULL
;
/*
/*
* Let the system know what interrupt model we are using by
* Let the system know what interrupt model we are using by
* evaluating the \_PIC object, if exists.
* evaluating the \_PIC object, if exists.
*/
*/
...
@@ -683,7 +683,7 @@ static int __init acpi_bus_init(void)
...
@@ -683,7 +683,7 @@ static int __init acpi_bus_init(void)
* the EC device is found in the namespace (i.e. before acpi_initialize_objects()
* the EC device is found in the namespace (i.e. before acpi_initialize_objects()
* is called).
* is called).
*
*
* This is accomplished by looking for the ECDT table, and getting
* This is accomplished by looking for the ECDT table, and getting
* the EC parameters out of that.
* the EC parameters out of that.
*/
*/
status
=
acpi_ec_ecdt_probe
();
status
=
acpi_ec_ecdt_probe
();
...
@@ -698,6 +698,9 @@ static int __init acpi_bus_init(void)
...
@@ -698,6 +698,9 @@ static int __init acpi_bus_init(void)
printk
(
KERN_INFO
PREFIX
"Interpreter enabled
\n
"
);
printk
(
KERN_INFO
PREFIX
"Interpreter enabled
\n
"
);
/* Initialize sleep structures */
acpi_sleep_init
();
/*
/*
* Get the system interrupt model and evaluate \_PIC.
* Get the system interrupt model and evaluate \_PIC.
*/
*/
...
...
drivers/acpi/hardware/hwsleep.c
View file @
902b236c
...
@@ -235,6 +235,14 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
...
@@ -235,6 +235,14 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
"While executing method _SST"
));
"While executing method _SST"
));
}
}
/*
* 1) Disable/Clear all GPEs
*/
status
=
acpi_hw_disable_all_gpes
();
if
(
ACPI_FAILURE
(
status
))
{
return_ACPI_STATUS
(
status
);
}
return_ACPI_STATUS
(
AE_OK
);
return_ACPI_STATUS
(
AE_OK
);
}
}
...
@@ -290,13 +298,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
...
@@ -290,13 +298,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
}
}
/*
/*
* 1) Disable/Clear all GPEs
* 2) Enable all wakeup GPEs
* 2) Enable all wakeup GPEs
*/
*/
status
=
acpi_hw_disable_all_gpes
();
if
(
ACPI_FAILURE
(
status
))
{
return_ACPI_STATUS
(
status
);
}
acpi_gbl_system_awake_and_running
=
FALSE
;
acpi_gbl_system_awake_and_running
=
FALSE
;
status
=
acpi_hw_enable_all_wakeup_gpes
();
status
=
acpi_hw_enable_all_wakeup_gpes
();
...
...
drivers/acpi/sleep/main.c
View file @
902b236c
...
@@ -200,7 +200,7 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
...
@@ -200,7 +200,7 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
{},
{},
};
};
static
int
__init
acpi_sleep_init
(
void
)
int
__init
acpi_sleep_init
(
void
)
{
{
int
i
=
0
;
int
i
=
0
;
...
@@ -229,4 +229,3 @@ static int __init acpi_sleep_init(void)
...
@@ -229,4 +229,3 @@ static int __init acpi_sleep_init(void)
return
0
;
return
0
;
}
}
late_initcall
(
acpi_sleep_init
);
include/acpi/acpi_drivers.h
View file @
902b236c
...
@@ -136,4 +136,14 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
...
@@ -136,4 +136,14 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
{
{
}
}
#endif
#endif
/*--------------------------------------------------------------------------
Suspend/Resume
-------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_SLEEP
extern
int
acpi_sleep_init
(
void
);
#else
#define acpi_sleep_init() do {} while (0)
#endif
#endif
/*__ACPI_DRIVERS_H__*/
#endif
/*__ACPI_DRIVERS_H__*/
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment