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
Kirill Smelkov
linux
Commits
daa74787
Commit
daa74787
authored
20 years ago
by
Len Brown
Committed by
Len Brown
20 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ACPI] include CONFIG_ACPI_RELAXED_AML code always
add acpi=strict option to disable platform workarounds
parent
c86eccb1
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
19 deletions
+20
-19
Documentation/kernel-parameters.txt
Documentation/kernel-parameters.txt
+4
-1
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/acpi/boot.c
+2
-1
arch/i386/kernel/setup.c
arch/i386/kernel/setup.c
+5
-0
arch/x86_64/kernel/acpi/boot.c
arch/x86_64/kernel/acpi/boot.c
+2
-1
drivers/acpi/Kconfig
drivers/acpi/Kconfig
+0
-12
drivers/acpi/executer/exfldio.c
drivers/acpi/executer/exfldio.c
+3
-4
include/asm-i386/acpi.h
include/asm-i386/acpi.h
+1
-0
include/asm-ia64/acpi.h
include/asm-ia64/acpi.h
+2
-0
include/asm-x86_64/acpi.h
include/asm-x86_64/acpi.h
+1
-0
No files found.
Documentation/kernel-parameters.txt
View file @
daa74787
...
...
@@ -86,10 +86,13 @@ running once the system is up.
See also Documentation/scsi/ncr53c7xx.txt.
acpi= [HW,ACPI] Advanced Configuration and Power Interface
Format: { force | off | ht }
Format: { force | off | ht
| strict
}
force -- enables ACPI for systems with default off
off -- disabled ACPI for systems with default on
ht -- run only enough ACPI to enable Hyper Threading
strict -- Be less tolerant of platforms that are not
strictly ACPI specification compliant.
See also Documentation/pm.txt.
acpi_pic_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode
...
...
This diff is collapsed.
Click to expand it.
arch/i386/kernel/acpi/boot.c
View file @
daa74787
...
...
@@ -42,11 +42,12 @@
#define PREFIX "ACPI: "
int
acpi_noirq
__initdata
=
0
;
/* skip ACPI IRQ initialization */
int
acpi_noirq
__initdata
;
/* skip ACPI IRQ initialization */
int
acpi_ht
__initdata
=
1
;
/* enable HT */
int
acpi_lapic
;
int
acpi_ioapic
;
int
acpi_strict
;
/* --------------------------------------------------------------------------
Boot-time Configuration
...
...
This diff is collapsed.
Click to expand it.
arch/i386/kernel/setup.c
View file @
daa74787
...
...
@@ -562,6 +562,11 @@ static void __init parse_cmdline_early (char ** cmdline_p)
acpi_disabled
=
0
;
}
/* acpi=strict disables out-of-spec workarounds */
else
if
(
!
memcmp
(
from
,
"acpi=strict"
,
11
))
{
acpi_strict
=
1
;
}
/* Limit ACPI just to boot-time to enable HT */
else
if
(
!
memcmp
(
from
,
"acpi=ht"
,
7
))
{
acpi_ht
=
1
;
...
...
This diff is collapsed.
Click to expand it.
arch/x86_64/kernel/acpi/boot.c
View file @
daa74787
...
...
@@ -48,11 +48,12 @@
#define PREFIX "ACPI: "
int
acpi_noirq
__initdata
=
0
;
/* skip ACPI IRQ initialization */
int
acpi_noirq
__initdata
;
/* skip ACPI IRQ initialization */
int
acpi_ht
__initdata
=
1
;
/* enable HT */
int
acpi_lapic
;
int
acpi_ioapic
;
int
acpi_strict
;
/* --------------------------------------------------------------------------
Boot-time Configuration
...
...
This diff is collapsed.
Click to expand it.
drivers/acpi/Kconfig
View file @
daa74787
...
...
@@ -251,17 +251,5 @@ config ACPI_SYSTEM
This driver will enable your system to shut down using ACPI, and
dump your ACPI DSDT table using /proc/acpi/dsdt.
config ACPI_RELAXED_AML
bool "Relaxed AML"
depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default n
help
If you say `Y' here, the ACPI interpreter will relax its checking
for valid AML and will ignore some AML mistakes, such as off-by-one
errors in region sizes. Some laptops may require this option. In
particular, many Toshiba laptops require this for correct operation
of the AC module.
endmenu
This diff is collapsed.
Click to expand it.
drivers/acpi/executer/exfldio.c
View file @
daa74787
...
...
@@ -154,8 +154,7 @@ acpi_ex_setup_region (
field_datum_byte_offset
,
obj_desc
->
common_field
.
access_byte_width
,
acpi_ut_get_node_name
(
rgn_desc
->
region
.
node
),
rgn_desc
->
region
.
length
));
#ifdef CONFIG_ACPI_RELAXED_AML
{
if
(
!
acpi_strict
)
{
/*
* Allow access to the field if it is within the region size
* rounded up to a multiple of the access byte width. This
...
...
@@ -186,9 +185,9 @@ acpi_ex_setup_region (
return_ACPI_STATUS
(
AE_OK
);
}
}
#else
else
{
return_ACPI_STATUS
(
AE_AML_REGION_LIMIT
);
#endif
}
}
return_ACPI_STATUS
(
AE_OK
);
...
...
This diff is collapsed.
Click to expand it.
include/asm-i386/acpi.h
View file @
daa74787
...
...
@@ -110,6 +110,7 @@
extern
int
acpi_lapic
;
extern
int
acpi_ioapic
;
extern
int
acpi_noirq
;
extern
int
acpi_strict
;
/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
#define FIX_ACPI_PAGES 4
...
...
This diff is collapsed.
Click to expand it.
include/asm-ia64/acpi.h
View file @
daa74787
...
...
@@ -86,6 +86,8 @@ ia64_acpi_release_global_lock (unsigned int *lock)
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
((Acq) = ia64_acpi_release_global_lock((unsigned int *) GLptr))
#define acpi_strict 1
/* no ACPI spec workarounds on IA64 */
const
char
*
acpi_get_sysname
(
void
);
int
acpi_request_vector
(
u32
int_type
);
int
acpi_register_irq
(
u32
gsi
,
u32
polarity
,
u32
trigger
);
...
...
This diff is collapsed.
Click to expand it.
include/asm-x86_64/acpi.h
View file @
daa74787
...
...
@@ -104,6 +104,7 @@ __acpi_release_global_lock (unsigned int *lock)
extern
int
acpi_lapic
;
extern
int
acpi_ioapic
;
extern
int
acpi_noirq
;
extern
int
acpi_strict
;
/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
#define FIX_ACPI_PAGES 4
...
...
This diff is collapsed.
Click to expand it.
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