Linus Torvalds <[EMAIL PROTECTED]> wrote:
>
> On Thu, 24 Feb 2005, Andrew Morton wrote:
> >
> > Although a better fix might be to make __iounmap() behave symmetrically:
> >
> > if ((long)addr >= phys_to_virt(0xA0000) &&
> > (long)addr < phys_to_virt(0x100000))
> > return;
> >
> > but that's not quite right, because we're assuming that the range to be
> > unmapped is wholly within the PCI/ISA region. Without a VMA there just
> > isn't enough info to determine that.
> >
> > Does anyone have any preferences?
>
> I think the "as symmetric as possible" thing is probably the thing to do.
> It might not be perfect in theory, but hey, practice is what matters. And
> in practice it's the "right thing", I think.
OK..
Norbert, does this make the warnings go away?
--- 25/arch/i386/mm/ioremap.c~iounmap-isa-special-case 2005-02-24
22:24:24.000000000 -0800
+++ 25-akpm/arch/i386/mm/ioremap.c 2005-02-24 22:32:08.000000000 -0800
@@ -17,6 +17,9 @@
#include <asm/tlbflush.h>
#include <asm/pgtable.h>
+#define ISA_START_ADDRESS 0xa0000
+#define ISA_END_ADDRESS 0x100000
+
static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned
long size,
unsigned long phys_addr, unsigned long flags)
{
@@ -129,7 +132,7 @@ void __iomem * __ioremap(unsigned long p
/*
* Don't remap the low PCI/ISA area, it's always mapped..
*/
- if (phys_addr >= 0xA0000 && last_addr < 0x100000)
+ if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
return (void __iomem *) phys_to_virt(phys_addr);
/*
@@ -230,7 +233,17 @@ void iounmap(volatile void __iomem *addr
{
struct vm_struct *p;
if ((void __force *) addr <= high_memory)
- return;
+ return;
+
+ /*
+ * __ioremap special-cases the PCI/ISA range by not instantiating a
+ * vm_area and by simply returning an address into the kernel mapping
+ * of ISA space. So handle that here.
+ */
+ if (addr >= (void *)virt_to_phys((void *)ISA_START_ADDRESS) &&
+ addr < (void *)virt_to_phys((void *)ISA_END_ADDRESS))
+ return;
+
p = remove_vm_area((void *) (PAGE_MASK & (unsigned long __force) addr));
if (!p) {
printk("__iounmap: bad address %p\n", addr);
@@ -261,7 +274,7 @@ void __init *bt_ioremap(unsigned long ph
/*
* Don't remap the low PCI/ISA area, it's always mapped..
*/
- if (phys_addr >= 0xA0000 && last_addr < 0x100000)
+ if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
return phys_to_virt(phys_addr);
/*
_
-
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/
