[email protected] wrote:
> http://bugzilla.kernel.org/show_bug.cgi?id=13484
>
>
>
>
>
> --- Comment #3 from Peer Chen <[email protected]> 2009-06-08 05:43:25 ---
> I'm using 64bit CPU, Intel P8400.
>
> Yes, if set CONFIG_PHYS_ADDR_T_64BIT, the problem goes away.
>
please check
---
drivers/firmware/memmap.c | 12 +++++-------
include/linux/firmware-map.h | 12 ++++--------
2 files changed, 9 insertions(+), 15 deletions(-)
Index: linux-2.6/drivers/firmware/memmap.c
===================================================================
--- linux-2.6.orig/drivers/firmware/memmap.c
+++ linux-2.6/drivers/firmware/memmap.c
@@ -31,8 +31,8 @@
* information is necessary as for the resource tree.
*/
struct firmware_map_entry {
- resource_size_t start; /* start of the memory range */
- resource_size_t end; /* end of the memory range (incl.) */
+ u64 start; /* start of the memory range */
+ u64 end; /* end of the memory range (incl.) */
const char *type; /* type of the memory range */
struct list_head list; /* entry for the linked list */
struct kobject kobj; /* kobject for each entry */
@@ -101,7 +101,7 @@ static LIST_HEAD(map_entries);
* Common implementation of firmware_map_add() and firmware_map_add_early()
* which expects a pre-allocated struct firmware_map_entry.
**/
-static int firmware_map_add_entry(resource_size_t start, resource_size_t end,
+static int firmware_map_add_entry(u64 start, u64 end,
const char *type,
struct firmware_map_entry *entry)
{
@@ -132,8 +132,7 @@ static int firmware_map_add_entry(resour
*
* Returns 0 on success, or -ENOMEM if no memory could be allocated.
**/
-int firmware_map_add(resource_size_t start, resource_size_t end,
- const char *type)
+int firmware_map_add(u64 start, u64 end, const char *type)
{
struct firmware_map_entry *entry;
@@ -157,8 +156,7 @@ int firmware_map_add(resource_size_t sta
*
* Returns 0 on success, or -ENOMEM if no memory could be allocated.
**/
-int __init firmware_map_add_early(resource_size_t start, resource_size_t end,
- const char *type)
+int __init firmware_map_add_early(u64 start, u64 end, const char *type)
{
struct firmware_map_entry *entry;
Index: linux-2.6/include/linux/firmware-map.h
===================================================================
--- linux-2.6.orig/include/linux/firmware-map.h
+++ linux-2.6/include/linux/firmware-map.h
@@ -24,21 +24,17 @@
*/
#ifdef CONFIG_FIRMWARE_MEMMAP
-int firmware_map_add(resource_size_t start, resource_size_t end,
- const char *type);
-int firmware_map_add_early(resource_size_t start, resource_size_t end,
- const char *type);
+int firmware_map_add(u64 start, u64 end, const char *type);
+int firmware_map_add_early(u64 start, u64 end, const char *type);
#else /* CONFIG_FIRMWARE_MEMMAP */
-static inline int firmware_map_add(resource_size_t start, resource_size_t end,
- const char *type)
+static inline int firmware_map_add(u64 start, u64 end, const char *type)
{
return 0;
}
-static inline int firmware_map_add_early(resource_size_t start,
- resource_size_t end, const char *type)
+static inline int firmware_map_add_early(u64 start, u64 end, const char *type)
{
return 0;
}
Yinghai,
The patch works, thanks.
BRs
Peer Chen
> -----Original Message-----
> From: Yinghai Lu [mailto:[email protected]]
> Sent: Monday, June 08, 2009 2:50 PM
> To: [email protected]; Ingo Molnar; H. Peter Anvin;
Thomas Gleixner; H. Peter Anvin; [email protected];
> Peer Chen; Bernhard Walle
> Subject: Re: [Bug 13484] System report Int 6 error if E820 table
reserve the memory above 4G
>
> [email protected] wrote:
> > http://bugzilla.kernel.org/show_bug.cgi?id=13484
> >
> >
> >
> >
> >
> > --- Comment #3 from Peer Chen <[email protected]> 2009-06-08
05:43:25 ---
> > I'm using 64bit CPU, Intel P8400.
> >
> > Yes, if set CONFIG_PHYS_ADDR_T_64BIT, the problem goes away.
> >
>
> please check
>
> ---
> drivers/firmware/memmap.c | 12 +++++-------
> include/linux/firmware-map.h | 12 ++++--------
> 2 files changed, 9 insertions(+), 15 deletions(-)
>
> Index: linux-2.6/drivers/firmware/memmap.c
> ===================================================================
> --- linux-2.6.orig/drivers/firmware/memmap.c
> +++ linux-2.6/drivers/firmware/memmap.c
> @@ -31,8 +31,8 @@
> * information is necessary as for the resource tree.
> */
> struct firmware_map_entry {
> - resource_size_t start; /* start of the memory range */
> - resource_size_t end; /* end of the memory range
(incl.) */
> + u64 start; /* start of the memory range */
> + u64 end; /* end of the memory range
(incl.) */
> const char *type; /* type of the memory range */
> struct list_head list; /* entry for the linked list */
> struct kobject kobj; /* kobject for each entry */
> @@ -101,7 +101,7 @@ static LIST_HEAD(map_entries);
> * Common implementation of firmware_map_add() and
firmware_map_add_early()
> * which expects a pre-allocated struct firmware_map_entry.
> **/
> -static int firmware_map_add_entry(resource_size_t start,
resource_size_t end,
> +static int firmware_map_add_entry(u64 start, u64 end,
> const char *type,
> struct firmware_map_entry *entry)
> {
> @@ -132,8 +132,7 @@ static int firmware_map_add_entry(resour
> *
> * Returns 0 on success, or -ENOMEM if no memory could be allocated.
> **/
> -int firmware_map_add(resource_size_t start, resource_size_t end,
> - const char *type)
> +int firmware_map_add(u64 start, u64 end, const char *type)
> {
> struct firmware_map_entry *entry;
>
> @@ -157,8 +156,7 @@ int firmware_map_add(resource_size_t sta
> *
> * Returns 0 on success, or -ENOMEM if no memory could be allocated.
> **/
> -int __init firmware_map_add_early(resource_size_t start,
resource_size_t end,
> - const char *type)
> +int __init firmware_map_add_early(u64 start, u64 end, const char
*type)
> {
> struct firmware_map_entry *entry;
>
> Index: linux-2.6/include/linux/firmware-map.h
> ===================================================================
> --- linux-2.6.orig/include/linux/firmware-map.h
> +++ linux-2.6/include/linux/firmware-map.h
> @@ -24,21 +24,17 @@
> */
> #ifdef CONFIG_FIRMWARE_MEMMAP
>
> -int firmware_map_add(resource_size_t start, resource_size_t end,
> - const char *type);
> -int firmware_map_add_early(resource_size_t start, resource_size_t
end,
> - const char *type);
> +int firmware_map_add(u64 start, u64 end, const char *type);
> +int firmware_map_add_early(u64 start, u64 end, const char *type);
>
> #else /* CONFIG_FIRMWARE_MEMMAP */
>
> -static inline int firmware_map_add(resource_size_t start,
resource_size_t end,
> - const char *type)
> +static inline int firmware_map_add(u64 start, u64 end, const char
*type)
> {
> return 0;
> }
>
> -static inline int firmware_map_add_early(resource_size_t start,
> - resource_size_t end, const char
*type)
> +static inline int firmware_map_add_early(u64 start, u64 end, const
char *type)
> {
> return 0;
> }
-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information. Any unauthorized review, use, disclosure or distribution
is prohibited. If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
http://bugzilla.kernel.org/show_bug.cgi?id=13484
Peer reported:
| The bug is introduced from kernel 2.6.27, if E820 table reserve the memory
| above 4G in 32bit OS(BIOS-e820: 00000000fff80000 - 0000000120000000
| (reserved)), system will report Int 6 error and hang up. The bug is caused by
| the following code in drivers/firmware/memmap.c, the resource_size_t is 32bit
| variable in 32bit OS, the BUG_ON() will be invoked to result in the Int 6
| error. I try the latest 32bit Ubuntu and Fedora distributions, all hit this
| bug.
|======
|static int firmware_map_add_entry(resource_size_t start, resource_size_t end,
| const char *type,
| struct firmware_map_entry *entry)
and it only happen with CONFIG_PHYS_ADDR_T_64BIT is not set.
it turns out we need to pass u64 instead of resource_size_t for that.
Reported-and-tested-by: Peer Chen <[email protected]>
Signed-off-by: Yinghai Lu <[email protected]>
Cc: Bernhard Walle
Cc: [email protected]
---
drivers/firmware/memmap.c | 12 +++++-------
include/linux/firmware-map.h | 12 ++++--------
2 files changed, 9 insertions(+), 15 deletions(-)
Index: linux-2.6/drivers/firmware/memmap.c
===================================================================
--- linux-2.6.orig/drivers/firmware/memmap.c
+++ linux-2.6/drivers/firmware/memmap.c
@@ -31,8 +31,8 @@
* information is necessary as for the resource tree.
*/
struct firmware_map_entry {
- resource_size_t start; /* start of the memory range */
- resource_size_t end; /* end of the memory range (incl.) */
+ u64 start; /* start of the memory range */
+ u64 end; /* end of the memory range (incl.) */
const char *type; /* type of the memory range */
struct list_head list; /* entry for the linked list */
struct kobject kobj; /* kobject for each entry */
@@ -101,7 +101,7 @@ static LIST_HEAD(map_entries);
* Common implementation of firmware_map_add() and firmware_map_add_early()
* which expects a pre-allocated struct firmware_map_entry.
**/
-static int firmware_map_add_entry(resource_size_t start, resource_size_t end,
+static int firmware_map_add_entry(u64 start, u64 end,
const char *type,
struct firmware_map_entry *entry)
{
@@ -132,8 +132,7 @@ static int firmware_map_add_entry(resour
*
* Returns 0 on success, or -ENOMEM if no memory could be allocated.
**/
-int firmware_map_add(resource_size_t start, resource_size_t end,
- const char *type)
+int firmware_map_add(u64 start, u64 end, const char *type)
{
struct firmware_map_entry *entry;
@@ -157,8 +156,7 @@ int firmware_map_add(resource_size_t sta
*
* Returns 0 on success, or -ENOMEM if no memory could be allocated.
**/
-int __init firmware_map_add_early(resource_size_t start, resource_size_t end,
- const char *type)
+int __init firmware_map_add_early(u64 start, u64 end, const char *type)
{
struct firmware_map_entry *entry;
Index: linux-2.6/include/linux/firmware-map.h
===================================================================
--- linux-2.6.orig/include/linux/firmware-map.h
+++ linux-2.6/include/linux/firmware-map.h
@@ -24,21 +24,17 @@
*/
#ifdef CONFIG_FIRMWARE_MEMMAP
-int firmware_map_add(resource_size_t start, resource_size_t end,
- const char *type);
-int firmware_map_add_early(resource_size_t start, resource_size_t end,
- const char *type);
+int firmware_map_add(u64 start, u64 end, const char *type);
+int firmware_map_add_early(u64 start, u64 end, const char *type);
#else /* CONFIG_FIRMWARE_MEMMAP */
-static inline int firmware_map_add(resource_size_t start, resource_size_t end,
- const char *type)
+static inline int firmware_map_add(u64 start, u64 end, const char *type)
{
return 0;
}
-static inline int firmware_map_add_early(resource_size_t start,
- resource_size_t end, const char *type)
+static inline int firmware_map_add_early(u64 start, u64 end, const char *type)
{
return 0;
}