Bug#234808: Updated patch for 4.3.0
In message <[EMAIL PROTECTED]> Branden Robinson <[EMAIL PROTECTED]> wrote: > Fabio, should we add this to the -2 TODO? I take non-x86 architecture > support pretty seriously and would vote +1 on this, myself. It doesn't > look disruptive or mysterious. This looks correct, based upon my work on 4.1/2/3, and as Wookey says, all ARM is broken without it. At the very least, this patch is needed, although I may have some other minor changes for ARM PCI systems in the future. -- Peter Naulls - [EMAIL PROTECTED]| http://www.chocky.org/ Drobe - http://www.drobe.co.uk/| The Premier RISC OS News Site
Bug#234808: xserver-xfree86: XFree86 fixes for ARM
Package: xserver-xfree86 Version: 4.1.0-16woody3 Severity: important Tags: patch This is a expanded version of bug #223567, which was not applied to 4.1 These patches allow XFree86 4.1 to work on ARM. In particular, to allow non-framebuffer devices to work. There is one change worthy of note. The open() call for ARM to access DEV_MEM includes O_SYNC i lnx_video.c. This is absolutely required to ensure that memory access to card registers and other device memory is not cached. I didn't put a comment in, because it conflicts with the ia64 comment, and I suggest something suitable is done here. Similar, if not identical, patches are required for 4.2 and 4.3. -- System Information Debian Release: 3.0 Architecture: arm Kernel: Linux puffin 2.4.22-iyonix #9 Thu Feb 19 16:31:32 GMT 2004 armv5l Locale: LANG=C, LC_CTYPE=C Versions of packages xserver-xfree86 depends on: ii debconf1.2.35Debian configuration management sy ii libc6 2.2.5-11.5GNU C Library: Shared libraries an ii xserver-common 4.1.0-16woody3files and utilities common to all ii zlib1g 1:1.1.4-1.0woody0 compression library - runtime --- hw/xfree86/common/xf86Bus.c.old Wed Feb 25 16:05:30 2004 +++ hw/xfree86/common/xf86Bus.c Wed Feb 25 16:06:38 2004 @@ -3123,7 +3123,7 @@ static void CheckGenericGA() { -#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) /* FIXME ?? */ +#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__) /* FIXME ?? */ CARD16 GenericIOBase = VGAHW_GET_IOBASE(); CARD8 CurrentValue, TestValue; --- hw/xfree86/os-support/linux/lnx_video.c.old Wed Feb 25 15:43:32 2004 +++ hw/xfree86/os-support/linux/lnx_video.c Wed Feb 25 15:55:28 2004 @@ -436,7 +436,7 @@ mapflags |= MAP_NONCACHED; #endif -#if defined(__ia64__) +#if defined(__ia64__) || defined(__arm__) /* this will disappear when people upgrade their kernels */ if ((fd = open(DEV_MEM, O_RDWR|O_SYNC)) < 0) #else @@ -519,7 +519,7 @@ #endif } close(fd); -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) +#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) && !defined(__arm__) if (ioperm(0, 1024, 1) || iopl(3)) { if (errno == ENODEV) ErrorF("xf86EnableIOPorts: no I/O ports found\n"); @@ -544,7 +544,7 @@ #if defined(__powerpc__) munmap(ioBase, 0x2); ioBase = NULL; -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) +#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) && !defined(__arm__) iopl(0); ioperm(0, 1024, 0); #endif @@ -562,11 +562,11 @@ xf86DisableInterrupts() { if (!ExtendedEnabled) -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) && !defined(__arm__) if (iopl(3) || ioperm(0, 1024, 1)) return (FALSE); #endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__hppa__) +#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__hppa__) || defined(__arm__) #else #ifdef __GNUC__ #if defined(__ia64__) @@ -580,7 +580,7 @@ asm("cli"); #endif #endif -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) && !defined(__arm__) if (!ExtendedEnabled) { iopl(0); ioperm(0, 1024, 0); @@ -594,11 +594,11 @@ xf86EnableInterrupts() { if (!ExtendedEnabled) -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) && !defined(__arm__) if (iopl(3) || ioperm(0, 1024, 1)) return; #endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__hppa__) +#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__hppa__) || defined(__arm__) #else #ifdef __GNUC__ #if defined(__ia64__) @@ -612,7 +612,7 @@ asm("sti"); #endif #endif -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) &&
Bug#232384: xbase-clients: [xhost] Man page correction
Package: xbase-clients Version: 4.1.0-16woody1 Severity: minor The second paragraph of the xhost man page should read "the options that affect access control". This is still the case in unstable. -- System Information Debian Release: 3.0 Architecture: arm Kernel: Linux puffin 2.4.22-iyonix #2 Mon Jan 26 23:23:07 GMT 2004 armv5l Locale: LANG=C, LC_CTYPE= Versions of packages xbase-clients depends on: ii cpp 2:2.95.4-14 The GNU C preprocessor. ii debconf 1.2.35 Debian configuration management sy ii libc62.2.5-11.5 GNU C Library: Shared libraries an ii libdps1 4.1.0-16woody1 Display PostScript (DPS) client li ii libfreetype6 2.0.9-1 FreeType 2 font engine, shared lib ii libncurses5 5.2.20020112a-7 Shared libraries for terminal hand ii libxaw7 4.1.0-16woody1 X Athena widget set library ii xlibmesa34.1.0-16woody1 XFree86 version of Mesa 3D graphic ii xlibmesa3 [libgl1] 4.1.0-16woody1 XFree86 version of Mesa 3D graphic ii xlibs4.1.0-16woody1 X Window System client libraries
Bug#223567: xserver-xfree86: Patches to allow XFree86 to work on ARM
Package: xserver-xfree86 Version: 4.1.0-16woody1 Severity: important Tags: patch The file programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c requires some checks for ARM to prevent it trying to execute code only for x86. This is consistent with other non-x86 platforms. This patch was made against 4.3 experimental sources, but is just as relevant to 4.1 in woody and 4.2 in unstable. --- lnx_video.old.c Sat Sep 20 09:06:20 2003 +++ lnx_video.c Tue Sep 23 10:53:46 2003 @@ -517,7 +517,7 @@ #endif } close(fd); -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) +#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) if (ioperm(0, 1024, 1) || iopl(3)) { if (errno == ENODEV) ErrorF("xf86EnableIOPorts: no I/O ports found\n"); @@ -542,7 +542,7 @@ #if defined(__powerpc__) munmap(ioBase, 0x2); ioBase = NULL; -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) +#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) iopl(0); ioperm(0, 1024, 0); #endif @@ -561,12 +561,12 @@ Bool xf86DisableInterrupts() { -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) if (!ExtendedEnabled) if (iopl(3) || ioperm(0, 1024, 1)) return (FALSE); #endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) +#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__arm__) #else # ifdef __GNUC__ # if defined(__ia64__) @@ -580,7 +580,7 @@ asm("cli"); # endif #endif -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) if (!ExtendedEnabled) { iopl(0); ioperm(0, 1024, 0); @@ -593,12 +593,12 @@ void xf86EnableInterrupts() { -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) if (!ExtendedEnabled) if (iopl(3) || ioperm(0, 1024, 1)) return; #endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) +#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__arm__) #else # ifdef __GNUC__ # if defined(__ia64__) @@ -612,7 +612,7 @@ asm("sti"); # endif #endif -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) +#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) if (!ExtendedEnabled) { iopl(0); ioperm(0, 1024, 0); -- System Information Debian Release: 3.0 Architecture: arm Kernel: Linux puffin 2.4.21-rmk1-ds3-pn1 #16 Mon Dec 8 21:27:01 GMT 2003 armv5l Locale: LANG=C, LC_CTYPE=C Versions of packages xserver-xfree86 depends on: ii debconf1.0.32Debian configuration management sy ii libc6 2.2.5-11.5GNU C Library: Shared libraries an ii xserver-common 4.1.0-16woody1files and utilities common to all ii zlib1g 1:1.1.4-1.0woody0 compression library - runtime