Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
5f855a8f
Commit
5f855a8f
authored
Apr 24, 2009
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugzilla-13036' into release
parents
1fe94d37
a38d75fa
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
72 additions
and
14 deletions
+72
-14
drivers/acpi/acpica/hwvalid.c
drivers/acpi/acpica/hwvalid.c
+72
-14
No files found.
drivers/acpi/acpica/hwvalid.c
View file @
5f855a8f
...
@@ -90,6 +90,7 @@ static const struct acpi_port_info acpi_protected_ports[] = {
...
@@ -90,6 +90,7 @@ static const struct acpi_port_info acpi_protected_ports[] = {
{
"PIT2"
,
0x0048
,
0x004B
,
ACPI_OSI_WIN_XP
},
{
"PIT2"
,
0x0048
,
0x004B
,
ACPI_OSI_WIN_XP
},
{
"RTC"
,
0x0070
,
0x0071
,
ACPI_OSI_WIN_XP
},
{
"RTC"
,
0x0070
,
0x0071
,
ACPI_OSI_WIN_XP
},
{
"CMOS"
,
0x0074
,
0x0076
,
ACPI_OSI_WIN_XP
},
{
"CMOS"
,
0x0074
,
0x0076
,
ACPI_OSI_WIN_XP
},
{
"DMA1"
,
0x0081
,
0x0083
,
ACPI_OSI_WIN_XP
},
{
"DMA1L"
,
0x0087
,
0x0087
,
ACPI_OSI_WIN_XP
},
{
"DMA1L"
,
0x0087
,
0x0087
,
ACPI_OSI_WIN_XP
},
{
"DMA2"
,
0x0089
,
0x008B
,
ACPI_OSI_WIN_XP
},
{
"DMA2"
,
0x0089
,
0x008B
,
ACPI_OSI_WIN_XP
},
{
"DMA2L"
,
0x008F
,
0x008F
,
ACPI_OSI_WIN_XP
},
{
"DMA2L"
,
0x008F
,
0x008F
,
ACPI_OSI_WIN_XP
},
...
@@ -151,7 +152,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
...
@@ -151,7 +152,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
ACPI_ERROR
((
AE_INFO
,
ACPI_ERROR
((
AE_INFO
,
"Illegal I/O port address/length above 64K: 0x%p/%X"
,
"Illegal I/O port address/length above 64K: 0x%p/%X"
,
ACPI_CAST_PTR
(
void
,
address
),
byte_width
));
ACPI_CAST_PTR
(
void
,
address
),
byte_width
));
return_ACPI_STATUS
(
AE_
AML_ILLEGAL_ADDRESS
);
return_ACPI_STATUS
(
AE_
LIMIT
);
}
}
/* Exit if requested address is not within the protected port table */
/* Exit if requested address is not within the protected port table */
...
@@ -178,11 +179,12 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
...
@@ -178,11 +179,12 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
/* Port illegality may depend on the _OSI calls made by the BIOS */
/* Port illegality may depend on the _OSI calls made by the BIOS */
if
(
acpi_gbl_osi_data
>=
port_info
->
osi_dependency
)
{
if
(
acpi_gbl_osi_data
>=
port_info
->
osi_dependency
)
{
ACPI_
ERROR
((
AE_INF
O
,
ACPI_
DEBUG_PRINT
((
ACPI_DB_I
O
,
"Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)"
,
"Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)"
,
ACPI_CAST_PTR
(
void
,
address
),
ACPI_CAST_PTR
(
void
,
address
),
byte_width
,
port_info
->
name
,
byte_width
,
port_info
->
name
,
port_info
->
start
,
port_info
->
end
));
port_info
->
start
,
port_info
->
end
));
return_ACPI_STATUS
(
AE_AML_ILLEGAL_ADDRESS
);
return_ACPI_STATUS
(
AE_AML_ILLEGAL_ADDRESS
);
}
}
...
@@ -206,7 +208,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
...
@@ -206,7 +208,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
* Value Where value is placed
* Value Where value is placed
* Width Number of bits
* Width Number of bits
*
*
* RETURN:
V
alue read from port
* RETURN:
Status and v
alue read from port
*
*
* DESCRIPTION: Read data from an I/O port or register. This is a front-end
* DESCRIPTION: Read data from an I/O port or register. This is a front-end
* to acpi_os_read_port that performs validation on both the port
* to acpi_os_read_port that performs validation on both the port
...
@@ -217,14 +219,43 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
...
@@ -217,14 +219,43 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
acpi_status
acpi_hw_read_port
(
acpi_io_address
address
,
u32
*
value
,
u32
width
)
acpi_status
acpi_hw_read_port
(
acpi_io_address
address
,
u32
*
value
,
u32
width
)
{
{
acpi_status
status
;
acpi_status
status
;
u32
one_byte
;
u32
i
;
/* Validate the entire request and perform the I/O */
status
=
acpi_hw_validate_io_request
(
address
,
width
);
status
=
acpi_hw_validate_io_request
(
address
,
width
);
if
(
ACPI_FAILURE
(
status
))
{
if
(
ACPI_SUCCESS
(
status
))
{
status
=
acpi_os_read_port
(
address
,
value
,
width
);
return
status
;
return
status
;
}
}
status
=
acpi_os_read_port
(
address
,
value
,
width
);
if
(
status
!=
AE_AML_ILLEGAL_ADDRESS
)
{
return
status
;
}
/*
* There has been a protection violation within the request. Fall
* back to byte granularity port I/O and ignore the failing bytes.
* This provides Windows compatibility.
*/
for
(
i
=
0
,
*
value
=
0
;
i
<
width
;
i
+=
8
)
{
/* Validate and read one byte */
if
(
acpi_hw_validate_io_request
(
address
,
8
)
==
AE_OK
)
{
status
=
acpi_os_read_port
(
address
,
&
one_byte
,
8
);
if
(
ACPI_FAILURE
(
status
))
{
return
status
;
return
status
;
}
*
value
|=
(
one_byte
<<
i
);
}
address
++
;
}
return
AE_OK
;
}
}
/******************************************************************************
/******************************************************************************
...
@@ -235,7 +266,7 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
...
@@ -235,7 +266,7 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
* Value Value to write
* Value Value to write
* Width Number of bits
* Width Number of bits
*
*
* RETURN:
None
* RETURN:
Status
*
*
* DESCRIPTION: Write data to an I/O port or register. This is a front-end
* DESCRIPTION: Write data to an I/O port or register. This is a front-end
* to acpi_os_write_port that performs validation on both the port
* to acpi_os_write_port that performs validation on both the port
...
@@ -246,12 +277,39 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
...
@@ -246,12 +277,39 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
acpi_status
acpi_hw_write_port
(
acpi_io_address
address
,
u32
value
,
u32
width
)
acpi_status
acpi_hw_write_port
(
acpi_io_address
address
,
u32
value
,
u32
width
)
{
{
acpi_status
status
;
acpi_status
status
;
u32
i
;
/* Validate the entire request and perform the I/O */
status
=
acpi_hw_validate_io_request
(
address
,
width
);
status
=
acpi_hw_validate_io_request
(
address
,
width
);
if
(
ACPI_FAILURE
(
status
))
{
if
(
ACPI_SUCCESS
(
status
))
{
status
=
acpi_os_write_port
(
address
,
value
,
width
);
return
status
;
return
status
;
}
}
status
=
acpi_os_write_port
(
address
,
value
,
width
);
if
(
status
!=
AE_AML_ILLEGAL_ADDRESS
)
{
return
status
;
}
/*
* There has been a protection violation within the request. Fall
* back to byte granularity port I/O and ignore the failing bytes.
* This provides Windows compatibility.
*/
for
(
i
=
0
;
i
<
width
;
i
+=
8
)
{
/* Validate and write one byte */
if
(
acpi_hw_validate_io_request
(
address
,
8
)
==
AE_OK
)
{
status
=
acpi_os_write_port
(
address
,
(
value
>>
i
)
&
0xFF
,
8
);
if
(
ACPI_FAILURE
(
status
))
{
return
status
;
return
status
;
}
}
address
++
;
}
return
AE_OK
;
}
}
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