Ingo Molnar wrote:
> * Kevin Winchester <[EMAIL PROTECTED]> wrote:
>
>>> x86: fix ioremap RAM check
>>>
>>> Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
>>> Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
>> Lucky first try - reverting this commit fixes the problem for me. Any
>> ideas?
>
> Could you check the patch below - does that too fix the problem for you?
>
Yes, the patch below fixes the problem. I guess that makes it a:
Tested-by: Kevin Winchester <[EMAIL PROTECTED]>
> Ingo
>
> ----------------->
> Subject: x86: relax RAM check in ioremap()
> From: Ingo Molnar <[EMAIL PROTECTED]>
>
> Kevin Winchester reported the loss of direct rendering, due to:
>
> [ 0.588184] agpgart: Detected AGP bridge 0
> [ 0.588184] agpgart: unable to get memory for graphics translation table.
> [ 0.588184] agpgart: agp_backend_initialize() failed.
> [ 0.588207] agpgart-amd64: probe of 0000:00:00.0 failed with error -12
>
> and bisected it down to:
>
>> commit 266b9f8727976769e2ed2dad77ac9295f37e321e
>> Author: Thomas Gleixner <[EMAIL PROTECTED]>
>> Date: Wed Jan 30 13:34:06 2008 +0100
>>
>> x86: fix ioremap RAM check
>
> this check was too strict and caused an ioremap() failure.
>
> the problem is due to the somewhat unclean way of how the GART code
> reserves a memory range for its aperture, and how it utilizes it
> later on.
>
> Allow RAM pages to be ioremap()-ed too, as long as they are reserved.
>
> Bisected-by: Kevin Winchester <[EMAIL PROTECTED]>
> Acked-by: Thomas Gleixner <[EMAIL PROTECTED]>
> Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
> ---
> arch/x86/mm/ioremap.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Index: linux-x86.q/arch/x86/mm/ioremap.c
> ===================================================================
> --- linux-x86.q.orig/arch/x86/mm/ioremap.c
> +++ linux-x86.q/arch/x86/mm/ioremap.c
> @@ -116,7 +116,7 @@ static void __iomem *__ioremap(unsigned
> {
> void __iomem *addr;
> struct vm_struct *area;
> - unsigned long offset, last_addr;
> + unsigned long pfn, offset, last_addr;
> pgprot_t prot;
>
> /* Don't allow wraparound or zero size */
> @@ -133,9 +133,9 @@ static void __iomem *__ioremap(unsigned
> /*
> * Don't allow anybody to remap normal RAM that we're using..
> */
> - for (offset = phys_addr >> PAGE_SHIFT; offset < max_pfn_mapped &&
> - (offset << PAGE_SHIFT) < last_addr; offset++) {
> - if (page_is_ram(offset))
> + for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped &&
> + (pfn << PAGE_SHIFT) < last_addr; pfn++) {
> + if (pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
> return NULL;
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
