[Xen-changelog] Change ISA_IO_BASE to fix_to_virt(FIX_ISAMAP_BEGIN). It used to be

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 1df8b53bdd37dd91e8354a784f790af93f6c57af
# Parent  80b61bdceb26ea5037da9670e5a1d75ab1eaad05
Change ISA_IO_BASE to fix_to_virt(FIX_ISAMAP_BEGIN).  It used to be
PAGE_OFFSET, which was unaltered from vanilla Linux 2.6.12.6 kernels
and caused isa_memcpy_fromio() to not read physical memory from
0xf0000 - 0xfffff correctly.

http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=393

Signed-off-by: Andrew D. Ball <aball@xxxxxxxxxx>

diff -r 80b61bdceb26 -r 1df8b53bdd37 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h        Wed Nov 16 
10:35:26 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h        Wed Nov 16 
10:39:38 2005
@@ -228,7 +228,7 @@
  * used as the IO-area pointer (it can be iounmapped as well, so the
  * analogy with PCI is quite large):
  */
-#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
+#define __ISA_IO_base ((char __iomem *)(fix_to_virt(FIX_ISAMAP_BEGIN)))
 
 #define isa_readb(a) readb(__ISA_IO_base + (a))
 #define isa_readw(a) readw(__ISA_IO_base + (a))
diff -r 80b61bdceb26 -r 1df8b53bdd37 
linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/io.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/io.h      Wed Nov 16 
10:35:26 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/io.h      Wed Nov 16 
10:39:38 2005
@@ -298,7 +298,7 @@
  * used as the IO-area pointer (it can be iounmapped as well, so the
  * analogy with PCI is quite large):
  */
-#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
+#define __ISA_IO_base ((char __iomem *)(fix_to_virt(FIX_ISAMAP_BEGIN)))
 
 #define isa_readb(a) readb(__ISA_IO_base + (a))
 #define isa_readw(a) readw(__ISA_IO_base + (a))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog