# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/03/17 18:55:48-08:00 akpm@osdl.org # [PATCH] ISDN kernelcapi notifier NULL pointer fix # # From: Armin Schindler # # Fixed NULL pointer reference in recv_handler() # # drivers/isdn/capi/kcapi.c # 2004/03/17 18:43:05-08:00 akpm@osdl.org +3 -3 # ISDN kernelcapi notifier NULL pointer fix # # ChangeSet # 2004/03/17 18:55:39-08:00 akpm@osdl.org # [PATCH] ISDN kernelcapi notifier workqueue re-structured # # From: Armin Schindler # # Use the notifier workqueue in a cleaner way. # # drivers/isdn/capi/kcapi.c # 2004/03/17 18:45:04-08:00 akpm@osdl.org +35 -95 # ISDN kernelcapi notifier workqueue re-structured # # ChangeSet # 2004/03/17 18:55:29-08:00 akpm@osdl.org # [PATCH] ISDN kernelcapi debug message enable # # From: Armin Schindler # # Show debug messages if debug is enabled only. # # drivers/isdn/capi/kcapi.c # 2004/03/17 18:45:04-08:00 akpm@osdl.org +14 -6 # ISDN kernelcapi debug message enable # # ChangeSet # 2004/03/17 18:55:20-08:00 akpm@osdl.org # [PATCH] exportfs - Remove unnecessary locking from find_exported_dentry() # # From: "Jose R. Santos" # # After discussing it with Neil, he fell that the original justification for # taking the kernel_lock on find_exported_dentry() is not longer valid and # should be safe to remove. # # This patch fixes an issue while running SpecSFS where under memory # pressure, shrinking dcache cause find_exported_dentry() to allocate # disconnected dentries that later needed to be properly connected. The # connecting part of the code was done with BKL taken which cause a sharp # drop in performance during iterations and profiles showing 75% time spent # on find_exported_dentry(). After applying the patch, time spent on the # function is reduce to <1%. # # I have tested this on an 8-way machine with 56 filesystems for several days # now with no problems using ext2, ext3, xfs and jfs. # # fs/exportfs/expfs.c # 2004/03/17 18:43:04-08:00 akpm@osdl.org +0 -3 # exportfs - Remove unnecessary locking from find_exported_dentry() # # ChangeSet # 2004/03/17 18:55:11-08:00 akpm@osdl.org # [PATCH] JBD: avoid panic on corrupted journal superblock # # Don't panic if the journal superblock is wrecked: just fail the mount. # # fs/jbd/recovery.c # 2004/03/17 18:43:04-08:00 akpm@osdl.org +4 -1 # JBD: avoid panic on corrupted journal superblock # # ChangeSet # 2004/03/17 18:55:01-08:00 akpm@osdl.org # [PATCH] ppc64: CONFIG_PREEMPT Kconfig help fix # # From: Anton Blanchard # # From: Robert Love # # arch/ppc64/Kconfig's entry for CONFIG_PREEMPT is missing the description # after the "bool" statement, so the entry does not show up. # # Also, the help description mentions a restriction that is not [any longer] # true. # # arch/ppc64/Kconfig # 2004/03/17 18:43:04-08:00 akpm@osdl.org +2 -4 # ppc64: CONFIG_PREEMPT Kconfig help fix # # ChangeSet # 2004/03/17 18:54:52-08:00 akpm@osdl.org # [PATCH] ppc64: xmon oops-the-kernel option # # From: Anton Blanchard # # Sometimes we just want to pass the error up to the kernel and let it oops. # X it is. # # arch/ppc64/xmon/xmon.c # 2004/03/17 18:43:04-08:00 akpm@osdl.org +6 -1 # ppc64: xmon oops-the-kernel option # # ChangeSet # 2004/03/17 18:54:42-08:00 akpm@osdl.org # [PATCH] ppc64: wrap some stuff in __KERNEL__ # # From: Anton Blanchard # # - remove now unused kernel syscalls. # - wrap recently added defines in #ifdef __KERNEL__, fixes glibc # compile issue # - some of our extra syscalls used asmlinkage, some did not. Make them # consistent # # include/asm-ppc64/unistd.h # 2004/03/17 18:43:04-08:00 akpm@osdl.org +13 -22 # ppc64: wrap some stuff in __KERNEL__ # # ChangeSet # 2004/03/17 18:54:33-08:00 akpm@osdl.org # [PATCH] ppc32: Fix booting some IBM PRePs # # From: Tom Rini # # The following patch comes from Paul Mackerras. Earlier on in 2.6, # arch/ppc/boot/utils/mkprep.c was changed slightly so that it would build # and work on Solaris. Doing this required changing from filling out # pointers to an area to filling out a local copy of the struct. However, a # memcpy was left out, and the info is only needed on some machines to boot. # The following adds in the missing memcpy and allows for IBM PRePs to boot # from a raw floppy again. # # arch/ppc/boot/utils/mkprep.c # 2004/03/17 18:43:04-08:00 akpm@osdl.org +2 -0 # ppc32: Fix booting some IBM PRePs # # ChangeSet # 2004/03/17 18:54:23-08:00 akpm@osdl.org # [PATCH] ppc32: fix SMP build # # From: Olaf Hering # # Current Linus tree adds an extra space and dot to the mkprep options. # `make all' with an smp config doesnt work. This patch fixes it. # # arch/ppc/boot/simple/Makefile # 2004/03/17 18:43:04-08:00 akpm@osdl.org +1 -1 # ppc32: fix SMP build # # ChangeSet # 2004/03/17 20:12:15-05:00 brazilnut@us.ibm.com # [PATCH] back out netdev_priv() for loopback # # Please apply this fix to backout an erroneous change in loopback.c # The statistics structure is allocated separately from the # loopback_dev structure, and the current code overwrites something # other than the statistics. In my case the scsi_cmd_pool structure. # # drivers/net/loopback.c # 2004/03/17 11:46:40-05:00 brazilnut@us.ibm.com +1 -1 # 2.6.5-rc1-bk2 loopback.c # # ChangeSet # 2004/03/17 14:32:58-05:00 jgarzik@redhat.com # [netdrvr de2104x] initialize bus mode properly # # drivers/net/tulip/de2104x.c # 2004/03/17 14:32:53-05:00 jgarzik@redhat.com +9 -9 # [netdrvr de2104x] initialize bus mode properly # # ChangeSet # 2004/03/17 10:18:16-08:00 davidm@tiger.hpl.hp.com # ia64: Prevent GCC from clobbering r13. Found by Luming You. # # Without this change, GCC thinks it's OK to clobber r13. It doesn't do it # very often, but it's enough if it does it once and it turns out # acpi_bus_receive_event() had code that would trigger this issue. # Fix by declaring r13 as a global register variable. # # include/asm-ia64/gcc_intrin.h # 2004/03/17 10:18:09-08:00 davidm@tiger.hpl.hp.com +3 -4 # (ia64_r13): Declare as a global register. # # ChangeSet # 2004/03/17 12:54:59-05:00 khc@pm.waw.pl # [netdrvr de2104x] fix ifup/down and promise mode # # The attached patch fixes the problem: de->macmode variable, # meant to shadow MacMode (CSR6) register, was used inconsistently, # causing some updates to this register to be dropped. # # 2.4 kernel doesn't shadow this register at all, so I removed # shadowing from 2.6 as well. # # drivers/net/tulip/de2104x.c # 2004/03/17 12:54:54-05:00 khc@pm.waw.pl +13 -12 # [netdrvr de2104x] fix ifup/down and promise mode # # The attached patch fixes the problem: de->macmode variable, # meant to shadow MacMode (CSR6) register, was used inconsistently, # causing some updates to this register to be dropped. # # 2.4 kernel doesn't shadow this register at all, so I removed # shadowing from 2.6 as well. # # ChangeSet # 2004/03/17 09:54:01-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] ide-dma.c: remove unused/obsoleted code for hwif->mmio == 1 # # All users of hwif->mmio correctly handle resources themselves # (hwif->mmio == 2) so remove ide_mmio_dma() and ide_release_mmio_dma(). # # drivers/ide/ide-dma.c # 2004/03/16 14:10:15-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -46 # ide-dma.c: remove unused/obsoleted code for hwif->mmio == 1 # # ChangeSet # 2004/03/17 09:53:52-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] remove AMIGA/MAC hacks from IDE resource handling code # # Nowadays buddha.c, gayle.c and macide.c handle resources themselves # (hwif->mmio == 2). # # Acked by Geert. # # drivers/ide/ide.c # 2004/03/16 14:03:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +2 -20 # remove AMIGA/MAC hacks from IDE resource handling code # # ChangeSet # 2004/03/17 09:53:42-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] remove ide_hwif_t->initializing # # It's write-only these days. # # include/linux/ide.h # 2004/03/16 14:12:28-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -1 # remove ide_hwif_t->initializing # # drivers/ide/pci/pdc202xx_old.c # 2004/03/16 14:12:28-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -4 # remove ide_hwif_t->initializing # # drivers/ide/pci/pdc202xx_new.c # 2004/03/16 14:12:28-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -4 # remove ide_hwif_t->initializing # # drivers/ide/ide.c # 2004/03/16 14:12:28-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -1 # remove ide_hwif_t->initializing # # drivers/ide/ide-probe.c # 2004/03/16 14:12:28-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -2 # remove ide_hwif_t->initializing # # ChangeSet # 2004/03/17 07:14:24-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] hpt366.c: PLL fix needed for some HPT374 # # From: Boehm Olaf # From: Jindrich Makovicka # # Wider range for 33MHz timing and PLL setup for HPT374 # (using the HPT370A timing table, as it is the same as # used in the "opensource" driver by HighPoint). # # fixes bugzilla bugs #2209 and #2271 # # drivers/ide/pci/hpt366.c # 2004/03/17 05:11:50-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +2 -2 # hpt366.c: PLL fix needed for some HPT374 # # ChangeSet # 2004/03/17 07:12:43-08:00 cieciwa@alpha.zarz.agh.edu.pl # [PATCH] drivers/cdrom/cdu31a - wrong tmp_irq declaration # # cdu31a.c needs tmp_irq outside of the block it is declared in. Move it # to the outer block. # # drivers/cdrom/cdu31a.c # 2004/03/16 23:59:46-08:00 cieciwa@alpha.zarz.agh.edu.pl +2 -1 # drivers/cdrom/cdu31a - wrong tmp_irq declaration # # ChangeSet # 2004/03/17 07:11:07-08:00 akpm@osdl.org # [PATCH] Fix x86_64 compile warning in bad_page() # # On x84_64, page->flags is no longer unsigned long. # # mm/slab.c # 2004/03/17 04:02:30-08:00 akpm@osdl.org +2 -1 # Fix x86_64 compile warning in bad_page() # # mm/page_alloc.c # 2004/03/17 04:02:30-08:00 akpm@osdl.org +1 -1 # Fix x86_64 compile warning in bad_page() # # ChangeSet # 2004/03/17 07:10:56-08:00 akpm@osdl.org # [PATCH] Remove old config options from defconfigs. # # From: Dave Jones # # These options are only ever referenced in the defconfigs of various archs # now. # # arch/sparc64/defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -4 # Remove old config options from defconfigs. # # arch/ppc64/defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -2 # Remove old config options from defconfigs. # # arch/ppc64/configs/pSeries_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -2 # Remove old config options from defconfigs. # # arch/ppc64/configs/g5_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/ppc/configs/rainier_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/ppc/configs/power3_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -4 # Remove old config options from defconfigs. # # arch/ppc/configs/cedar_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/ppc/configs/ash_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/mips/configs/rm200_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/ia64/configs/zx1_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/ia64/configs/generic_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -2 # Remove old config options from defconfigs. # # arch/i386/defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -2 # Remove old config options from defconfigs. # # arch/arm/configs/trizeps_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/shannon_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/arm/configs/rpc_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/pfs168_satft_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/pfs168_sastn_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/pfs168_mqvga_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/pfs168_mqtft_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm26/defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/netwinder_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/arm/configs/neponset_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/footbridge_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/arm/configs/ebsa110_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/arm/configs/clps7500_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # arch/arm/configs/cerfcube_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -1 # Remove old config options from defconfigs. # # arch/arm/configs/badge4_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -4 # Remove old config options from defconfigs. # # arch/arm/configs/a5k_defconfig # 2004/03/17 04:02:30-08:00 akpm@osdl.org +0 -3 # Remove old config options from defconfigs. # # ChangeSet # 2004/03/17 07:10:45-08:00 akpm@osdl.org # [PATCH] SHMLBA compat task alignment fix # # From: Arun Sharma # # The current Linux implementation of shmat() insists on SHMLBA alignment even # when shmflg & SHM_RND == 0. This is not consistent with the man pages and # the single UNIX spec, which require only a page-aligned address. # # However, some architectures require a SHMLBA alignment for correctness in all # cases. Such architectures use __ARCH_FORCE_SHMLBA. # # ipc/shm.c # 2004/03/17 04:02:30-08:00 akpm@osdl.org +4 -1 # SHMLBA compat task alignment fix # # include/asm-sparc64/shmparam.h # 2004/03/17 04:02:30-08:00 akpm@osdl.org +1 -0 # SHMLBA compat task alignment fix # # include/asm-sparc/shmparam.h # 2004/03/17 04:02:30-08:00 akpm@osdl.org +2 -0 # SHMLBA compat task alignment fix # # include/asm-parisc/shmparam.h # 2004/03/17 04:02:30-08:00 akpm@osdl.org +2 -0 # SHMLBA compat task alignment fix # # include/asm-mips/shmparam.h # 2004/03/17 04:02:30-08:00 akpm@osdl.org +2 -0 # SHMLBA compat task alignment fix # # ChangeSet # 2004/03/17 07:10:35-08:00 akpm@osdl.org # [PATCH] cpqarray: check pci_register_driver() return value # # From: # # * Examines rc of pci_register_driver and returns # # drivers/block/cpqarray.c # 2004/03/17 04:02:29-08:00 akpm@osdl.org +7 -6 # cpqarray: check pci_register_driver() return value # # ChangeSet # 2004/03/17 07:10:25-08:00 akpm@osdl.org # [PATCH] cpqarray: use PCI APIs # # From: # # - Change to use pci APIs (change from 2.4.18 to 2.4.19) # # This also includes eisa detection fix during initialization which was # missing from 2.4.19 but fixed in 2.4.25 # # drivers/block/cpqarray.c # 2004/03/17 04:02:29-08:00 akpm@osdl.org +343 -197 # cpqarray: use PCI APIs # # ChangeSet # 2004/03/17 07:10:16-08:00 akpm@osdl.org # [PATCH] cpqarray: I/O address fixes # # From: # # * cpqarray in kernel 2.6.1 seems to be based from 2.4.18 kernel with # specific 2.6.x stuff added. # # * Defines io_mem_addr and io_mem_length to replace ioaddr (change from # 2.4.18 to 2.4.19) # # drivers/block/smart1,2.h # 2004/03/17 04:02:29-08:00 akpm@osdl.org +21 -21 # cpqarray: I/O address fixes # # drivers/block/cpqarray.h # 2004/03/17 04:02:29-08:00 akpm@osdl.org +2 -1 # cpqarray: I/O address fixes # # drivers/block/cpqarray.c # 2004/03/17 04:02:29-08:00 akpm@osdl.org +3 -3 # cpqarray: I/O address fixes # # ChangeSet # 2004/03/17 07:10:06-08:00 akpm@osdl.org # [PATCH] cpqarray: rmmod oops fix # # From: # # * Fix for segmentation fault when calling rmmod # # drivers/block/cpqarray.c # 2004/03/17 04:02:29-08:00 akpm@osdl.org +1 -1 # cpqarray: rmmod oops fix # # ChangeSet # 2004/03/17 07:09:57-08:00 akpm@osdl.org # [PATCH] cpqarray: increment version number # # From: # # The following patch bumps the driver version to 2.6.0. Please apply in # order. # # drivers/block/cpqarray.c # 2004/03/17 04:02:28-08:00 akpm@osdl.org +4 -4 # cpqarray: increment version number # # ChangeSet # 2004/03/17 07:09:48-08:00 akpm@osdl.org # [PATCH] devices.txt: add more devices # # From: "Cagle, John (ISS-Houston)" # # Patch 3 adds all the new official device registrations that weren't already # there. This brings devices.txt up-to-date with LANANA. # # Documentation/devices.txt # 2004/03/17 04:02:28-08:00 akpm@osdl.org +341 -5 # devices.txt: add more devices # # ChangeSet # 2004/03/17 07:09:38-08:00 akpm@osdl.org # [PATCH] devices.txt: typos and removal of dead devices # # From: "Cagle, John (ISS-Houston)" # # Patch 2 fixes some typos in devices.txt and removes ancient devices never # used. Pretty obvious stuff. # # Documentation/devices.txt # 2004/03/17 04:02:28-08:00 akpm@osdl.org +60 -45 # devices.txt: typos and removal of dead devices # # ChangeSet # 2004/03/17 07:09:29-08:00 akpm@osdl.org # [PATCH] clean up devices.txt # # From: "Cagle, John (ISS-Houston)" # # Patch 1 cleans up the format by making devices.txt easily parsable. # Mainly this involved adding the word "block" after all the block major # numbers since the previous format didn't include it. # # Documentation/devices.txt # 2004/03/17 04:02:28-08:00 akpm@osdl.org +120 -114 # clean up devices.txt # # ChangeSet # 2004/03/17 07:09:18-08:00 akpm@osdl.org # [PATCH] hugetlb_zero_setup() race fix # # Make the handling of the hugetlb-backed shm file's name counter SMP-safe. # # (What stops hugetlb_zero_setup() racing with umount?) # # fs/hugetlbfs/inode.c # 2004/03/17 04:02:27-08:00 akpm@osdl.org +16 -5 # hugetlb_zero_setup() race fix # # ChangeSet # 2004/03/17 07:09:08-08:00 akpm@osdl.org # [PATCH] make config_max_raw_devices work # # From: "Kenneth Chen" # # Even though there is a CONFIG_MAX_RAW_DEVS option, it doesn't actually # increase the number of raw devices beyond 256 because during the char # registration, it uses the standard register_chrdev() interface which has # hard coded 256 minor in it. Here is a patch that fix this problem by using # register_chrdev_region() and cdev_(init/add/del) functions. # # drivers/char/raw.c # 2004/03/17 04:02:27-08:00 akpm@osdl.org +23 -2 # make config_max_raw_devices work # # ChangeSet # 2004/03/17 07:08:58-08:00 akpm@osdl.org # [PATCH] x86 vsyscall alignment fix # # From: Andy Whitcroft # # The vsyscall implementation for ia32 provides two different vsyscall pages; # one to use int80 and the other to use sysenter. Each includes a common # signal trailer. The kernel requires the alignment of routines in this # trailer be consistent in both copies. However this is not enforced at # compile time. Failure to maintain this alignment typically leads to an # obscure SIGSEGV in init during boot. This critical alignment requirement # is not well documented. # # Below is a patch to better document the alignment requirements and to # enforce the requirement. # # arch/i386/kernel/vsyscall-sysenter.S # 2004/03/17 04:02:27-08:00 akpm@osdl.org +5 -0 # x86 vsyscall alignment fix # # arch/i386/kernel/vsyscall-sigreturn.S # 2004/03/17 04:02:27-08:00 akpm@osdl.org +3 -3 # x86 vsyscall alignment fix # # arch/i386/kernel/vsyscall-int80.S # 2004/03/17 04:02:27-08:00 akpm@osdl.org +5 -0 # x86 vsyscall alignment fix # # ChangeSet # 2004/03/17 07:08:48-08:00 akpm@osdl.org # [PATCH] s390: tape driver fixes. # # From: Martin Schwidefsky # # tape driver fixes: # - Link from ccw device to class device in sysfs. # - Cosmetic changes. # - Add copyright statements. # # drivers/s390/char/tape_class.h # 2004/03/17 04:02:26-08:00 akpm@osdl.org +24 -17 # s390: tape driver fixes. # # drivers/s390/char/tape_class.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +65 -36 # s390: tape driver fixes. # # drivers/s390/char/tape_char.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +16 -31 # s390: tape driver fixes. # # drivers/s390/char/tape.h # 2004/03/17 04:02:26-08:00 akpm@osdl.org +2 -2 # s390: tape driver fixes. # # drivers/s390/char/Makefile # 2004/03/17 04:02:26-08:00 akpm@osdl.org +2 -2 # s390: tape driver fixes. # # ChangeSet # 2004/03/17 07:08:38-08:00 akpm@osdl.org # [PATCH] s390: z/VM monitor stream. # # From: Martin Schwidefsky # # Fix for z/VM monitor stream: # - Add try_module_get and module_put to the [un]register functions. # - Some code beautification. # # arch/s390/appldata/appldata_base.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +21 -36 # s390: z/VM monitor stream. # # ChangeSet # 2004/03/17 07:08:29-08:00 akpm@osdl.org # [PATCH] s390: dasd driver fixes. # # From: Martin Schwidefsky # # dasd driver fixes: # - Remove additional dasd attributes for a ccw-device if the discipline # (=driver) gets unloaded. # - Fix race of dasd_generic_offline against dasd_open. # - Remove irq_exit calls from diag interrupt handler. The irq_enter/ # irq_exit is done in the external interrupt handler. # # drivers/s390/block/dasd_int.h # 2004/03/17 04:02:26-08:00 akpm@osdl.org +3 -1 # s390: dasd driver fixes. # # drivers/s390/block/dasd_diag.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +1 -3 # s390: dasd driver fixes. # # drivers/s390/block/dasd_devmap.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +8 -1 # s390: dasd driver fixes. # # drivers/s390/block/dasd.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +39 -10 # s390: dasd driver fixes. # # drivers/s390/block/Kconfig # 2004/03/17 04:02:26-08:00 akpm@osdl.org +4 -4 # s390: dasd driver fixes. # # ChangeSet # 2004/03/17 07:08:18-08:00 akpm@osdl.org # [PATCH] s390: network driver fixes. # # From: Martin Schwidefsky # # network driver fixes: # - Use SET_NETDEV_DEV to create the link from the network device to the # physical device. Remove link from physical to network device. # - Remove some unnecessary casts in netiucv. # - Add missing strings to dev_stat_names & dev_event_names. # - Add missing preempt_disable/preempt_enable pairs in iucv. # - Allow to change the peer username in netiucv. # # drivers/s390/net/qeth.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +2 -15 # s390: network driver fixes. # # drivers/s390/net/netiucv.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +85 -43 # s390: network driver fixes. # # drivers/s390/net/lcs.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +4 -18 # s390: network driver fixes. # # drivers/s390/net/iucv.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +9 -7 # s390: network driver fixes. # # drivers/s390/net/ctcmain.c # 2004/03/17 04:02:26-08:00 akpm@osdl.org +6 -21 # s390: network driver fixes. # # ChangeSet # 2004/03/17 07:08:09-08:00 akpm@osdl.org # [PATCH] s390: sclp fix. # # From: Martin Schwidefsky # # sclp console fixes: # - Replace irq_enter/irq_exit pair with Add local_bh_enable/local_bh_disable. # # drivers/s390/char/sclp.c # 2004/03/17 04:02:25-08:00 akpm@osdl.org +3 -3 # s390: sclp fix. # # ChangeSet # 2004/03/17 07:07:59-08:00 akpm@osdl.org # [PATCH] s390: common i/o layer. # # From: Martin Schwidefsky # # Common i/o layer fixes: # - Improve blacklist argument parsing. # - Fix device recognition for devices where SenseID fails. # - Don't try to set a device online that has no driver. # - Chain a release ccw to the unconditional reserve ccw for forced online. # - Fix irb accumulation for pure status pending with eswf set. # - Fix rc handling in qdio_shutdown. # - Improve retry behavious for busy conditions on qdio. # - Fix activity check in ccw_device_start/read_dev_chars and read_conf_data. # # include/asm-s390/cio.h # 2004/03/17 04:02:25-08:00 akpm@osdl.org +1 -0 # s390: common i/o layer. # # drivers/s390/cio/qdio.h # 2004/03/17 04:02:25-08:00 akpm@osdl.org +5 -2 # s390: common i/o layer. # # drivers/s390/cio/qdio.c # 2004/03/17 04:02:25-08:00 akpm@osdl.org +94 -18 # s390: common i/o layer. # # drivers/s390/cio/device_status.c # 2004/03/17 04:02:25-08:00 akpm@osdl.org +1 -1 # s390: common i/o layer. # # drivers/s390/cio/device_ops.c # 2004/03/17 04:02:25-08:00 akpm@osdl.org +31 -9 # s390: common i/o layer. # # drivers/s390/cio/device_fsm.c # 2004/03/17 04:02:25-08:00 akpm@osdl.org +3 -0 # s390: common i/o layer. # # drivers/s390/cio/device.c # 2004/03/17 04:02:25-08:00 akpm@osdl.org +38 -17 # s390: common i/o layer. # # drivers/s390/cio/css.h # 2004/03/17 04:02:25-08:00 akpm@osdl.org +1 -0 # s390: common i/o layer. # # drivers/s390/cio/blacklist.c # 2004/03/17 04:02:25-08:00 akpm@osdl.org +41 -23 # s390: common i/o layer. # # Documentation/s390/driver-model.txt # 2004/03/17 04:02:25-08:00 akpm@osdl.org +1 -1 # s390: common i/o layer. # # ChangeSet # 2004/03/17 07:07:50-08:00 akpm@osdl.org # [PATCH] s390: core # # From: Martin Schwidefsky # # s390 core changes: # - Merge 31 and 64 bit NR_CPUS config option. Default to 32 cpus. # - Remove unused system calls from compat_linux.c. # - Add statfs64 and fstatfs64. Reserve system call number for # remap_file_pages. # - Merge do_signal32 into do_signal. # - Don't remove the per bit and the program mask from the user psw # due to a signal. # - Fix a problem with gdb and interrupted system calls. # - Fix single stepping of interrupted system calls. # - Fix compiler warnings in bitops.h. # # kernel/signal.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +2 -1 # s390: core # # kernel/exit.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +2 -1 # s390: core # # include/asm-s390/unistd.h # 2004/03/17 04:02:24-08:00 akpm@osdl.org +4 -1 # s390: core # # include/asm-s390/ptrace.h # 2004/03/17 04:02:24-08:00 akpm@osdl.org +8 -0 # s390: core # # include/asm-s390/lowcore.h # 2004/03/17 04:02:24-08:00 akpm@osdl.org +4 -0 # s390: core # # include/asm-s390/bitops.h # 2004/03/17 04:02:24-08:00 akpm@osdl.org +8 -8 # s390: core # # arch/s390/kernel/traps.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +1 -21 # s390: core # # arch/s390/kernel/syscalls.S # 2004/03/17 04:02:24-08:00 akpm@osdl.org +3 -1 # s390: core # # arch/s390/kernel/sys_s390.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +1 -46 # s390: core # # arch/s390/kernel/signal.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +56 -48 # s390: core # # arch/s390/kernel/ptrace.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +6 -6 # s390: core # # arch/s390/kernel/entry64.S # 2004/03/17 04:02:24-08:00 akpm@osdl.org +9 -3 # s390: core # # arch/s390/kernel/entry.S # 2004/03/17 04:02:24-08:00 akpm@osdl.org +11 -5 # s390: core # # arch/s390/kernel/compat_wrapper.S # 2004/03/17 04:02:24-08:00 akpm@osdl.org +15 -0 # s390: core # # arch/s390/kernel/compat_signal.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +7 -85 # s390: core # # arch/s390/kernel/compat_linux.h # 2004/03/17 04:02:24-08:00 akpm@osdl.org +5 -0 # s390: core # # arch/s390/kernel/compat_linux.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +0 -50 # s390: core # # arch/s390/kernel/asm-offsets.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +4 -0 # s390: core # # arch/s390/Kconfig # 2004/03/17 04:02:24-08:00 akpm@osdl.org +2 -15 # s390: core # # ChangeSet # 2004/03/17 07:07:38-08:00 akpm@osdl.org # [PATCH] ppc64: run bitops.c through Lindent # # From: Anton Blanchard # # bitops.c was a bit of a mess wrt formatting so run it through Lindent. No # code changes. # # arch/ppc64/kernel/bitops.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +39 -36 # ppc64: run bitops.c through Lindent # # ChangeSet # 2004/03/17 07:07:29-08:00 akpm@osdl.org # [PATCH] ppc32: Fix thinko in PCI_DMA_FOO to DMA_FOO conversion # # From: Tom Rini # # When I converted the use of PCI_DMA_foo constants to DMA_foo constants, I # forgot that it's PCI_DMA_FROMDEVICE and DMA_FROM_DEVICE. The following # fixes that. # # arch/ppc/mm/cachemap.c # 2004/03/17 04:02:24-08:00 akpm@osdl.org +1 -1 # ppc32: Fix thinko in PCI_DMA_FOO to DMA_FOO conversion # # ChangeSet # 2004/03/17 07:07:19-08:00 akpm@osdl.org # [PATCH] ppc32: Update # # From: Tom Rini # # include/asm-ppc/dma-mapping.h was made to be a 'real' header recently and # therefore missed out on the updates that davem did to all of the other # versions. This updates to match what's expected # now. # # include/asm-ppc/dma-mapping.h # 2004/03/17 04:02:24-08:00 akpm@osdl.org +43 -9 # ppc32: Update # # ChangeSet # 2004/03/17 07:07:10-08:00 akpm@osdl.org # [PATCH] ppc32: Fix PCI DMA API changes # # From: Tom Rini # # When Dave Miller updated for the _for_device and _for_cpu # portions of the PCI DMA API, he assumed that on PPC32 consistent_sync* # would also need to be changed for device or cpu. This is not the case, so # what this does is the pci_*_for_{cpu,device} calls call # consistent_sync{,page} again. # # include/asm-ppc/pci.h # 2004/03/17 04:02:23-08:00 akpm@osdl.org +6 -6 # ppc32: Fix PCI DMA API changes # # ChangeSet # 2004/03/17 07:07:00-08:00 akpm@osdl.org # [PATCH] ppc32: Fix c&p error in arch/ppc/syslib/indirect_pci.c # # From: Tom Rini # # Fix a cut & paste error in forward porting from 2.4, we don't reference # dev->bus or dev->devfn, both are passed as arguments. # # arch/ppc/syslib/indirect_pci.c # 2004/03/17 04:02:23-08:00 akpm@osdl.org +4 -4 # ppc32: Fix c&p error in arch/ppc/syslib/indirect_pci.c # # include/linux/proc_fs.h # 2004/03/17 05:43:35-08:00 anton@samba.org +0 -4 # fix ppc rtas compile # # ChangeSet # 2004/03/17 04:45:58-05:00 mcgrof@studorgs.rutgers.edu # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/prism54/oid_mgt.c # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +1 -1 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/prism54/islpci_mgt.h # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +3 -1 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/prism54/islpci_mgt.c # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +2 -1 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/prism54/islpci_hotplug.c # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +11 -3 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/prism54/islpci_eth.c # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +6 -1 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/prism54/isl_oid.h # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +124 -6 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/prism54/isl_ioctl.c # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +64 -9 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # drivers/net/wireless/Kconfig # 2004/03/17 04:45:53-05:00 mcgrof@studorgs.rutgers.edu +8 -7 # [wireless prism54] several minor updates # # Here is the ChangeLog: # # * wireless/Kconfig: fix typos, add SMC2835W-V2 # * islpci_hotplug.c: new version 1.1, authors list, and # module description updated appropriately # * isl_ioctl.c, islpci_dev.c, # islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: # s/ndev->priv/netdev_priv(ndev)/g # * islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card # Patch by Manuel Lauss # * isl_38xx.[ch]: include firmware.h in header, remove # declaration of headers in c file. Fix compiler warnings. # * islpci_dev.c (islpci_alloc_memory), # * islpci_eth.c (islpci_eth_cleanup_transmit, # islpci_eth_transmit, islpci_eth_receive): deal with skb stray # pointer, declare NULL. # * isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and # re-ordered headers per vger.kernel.org - liking. # * isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new # module_param, which is type-safe. Includes the new # . # * isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added. # Not adding ioctls as ajfa is working on moving current private ioctls # to subioctls. # * isl_oid.h (dot11_[maxframeburst|preamblesettings| # slotsettings|nonerpstatus|nonerpprotection]_t): added. # Note: more ioctls can be added here, I believe problems # with mixed modes can be pinpointed here, with these values. # # ChangeSet # 2004/03/17 04:38:28-05:00 mcgrof@studorgs.rutgers.edu # [wireless prism54] use netdev_priv() helper # # drivers/net/wireless/prism54/islpci_mgt.c # 2004/03/17 04:38:23-05:00 mcgrof@studorgs.rutgers.edu +5 -5 # [wireless prism54] use netdev_priv() helper # # drivers/net/wireless/prism54/islpci_hotplug.c # 2004/03/17 04:38:23-05:00 mcgrof@studorgs.rutgers.edu +5 -5 # [wireless prism54] use netdev_priv() helper # # drivers/net/wireless/prism54/islpci_eth.c # 2004/03/17 04:38:23-05:00 mcgrof@studorgs.rutgers.edu +2 -2 # [wireless prism54] use netdev_priv() helper # # drivers/net/wireless/prism54/islpci_dev.c # 2004/03/17 04:38:23-05:00 mcgrof@studorgs.rutgers.edu +3 -3 # [wireless prism54] use netdev_priv() helper # # drivers/net/wireless/prism54/isl_ioctl.c # 2004/03/17 04:38:23-05:00 mcgrof@studorgs.rutgers.edu +49 -48 # [wireless prism54] use netdev_priv() helper # # ChangeSet # 2004/03/16 20:53:43-08:00 ak@suse.de # [PATCH] Fix memory corruption on hyperthreaded x86-64 machines # # Fix memory corruption in the HT init on x86-64 recently introduced by me. # # Fix from from Suresh B. Siddha. # # include/asm-x86_64/smp.h # 2004/03/16 19:01:26-08:00 ak@suse.de +1 -0 # Fix memory corruption on hyperthreaded x86-64 machines # # arch/x86_64/kernel/setup.c # 2004/03/16 19:01:41-08:00 ak@suse.de +0 -3 # Fix memory corruption on hyperthreaded x86-64 machines # # ChangeSet # 2004/03/16 20:53:34-08:00 chyang@clusterfs.com # [PATCH] Make intermezzo work again # # - Chen Yang's fix to work with NGROUPS # - Chen Yang's fix to handle file deletion # - Remove TCGETS handling and return -ENOTTY for unknown ioctl code. # - Removed InterMezzo from BROKEN state # # fs/intermezzo/vfs.c # 2004/03/16 06:30:04-08:00 chyang@clusterfs.com +2 -6 # Make intermezzo work again # # fs/intermezzo/kml_reint.c # 2004/03/15 08:08:48-08:00 chyang@clusterfs.com +4 -4 # Make intermezzo work again # # fs/intermezzo/journal.c # 2004/03/15 08:11:06-08:00 chyang@clusterfs.com +22 -22 # Make intermezzo work again # # fs/intermezzo/intermezzo_kml.h # 2004/03/15 08:10:35-08:00 chyang@clusterfs.com +1 -1 # Make intermezzo work again # # fs/intermezzo/intermezzo_fs.h # 2004/03/15 08:10:20-08:00 chyang@clusterfs.com +13 -11 # Make intermezzo work again # # fs/intermezzo/fileset.c # 2004/03/15 06:29:48-08:00 chyang@clusterfs.com +1 -1 # Make intermezzo work again # # fs/intermezzo/file.c # 2004/03/15 06:25:09-08:00 chyang@clusterfs.com +3 -3 # Make intermezzo work again # # fs/intermezzo/dir.c # 2004/03/16 06:26:24-08:00 chyang@clusterfs.com +1 -5 # Make intermezzo work again # # fs/Kconfig # 2004/03/16 06:17:55-08:00 chyang@clusterfs.com +1 -1 # Make intermezzo work again # # ChangeSet # 2004/03/16 18:54:46-08:00 anton@samba.org # [PATCH] fix ppc rtas compile # # The proc_rtas_init call in procfs was removed (replaced with an # initcall) but the prototype was still hiding. Kill it. # # ChangeSet # 2004/03/16 16:47:04-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] hpt366.c: DMA timeout fix for HPT374 # # From: Andre Hedrick # # Tested on Epox 8K9A3+ and 4PCA3+ by Tomi Orava . # # drivers/ide/pci/hpt366.c # 2004/03/16 13:02:16-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +31 -4 # hpt366.c: DMA timeout fix for HPT374 # # ChangeSet # 2004/03/16 16:46:50-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] ATI IXP IDE support # # It was tested by a few people and has been in -mm since 2.6.4-rc2-mm1. # # drivers/ide/pci/atiixp.c # 2004/03/16 12:49:40-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +512 -0 # ATI IXP IDE support # # include/linux/pci_ids.h # 2004/03/16 12:49:40-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +2 -0 # ATI IXP IDE support # # drivers/ide/pci/atiixp.c # 2004/03/16 12:49:40-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/ide/pci/atiixp.c # # drivers/ide/pci/Makefile # 2004/03/16 12:49:40-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -0 # ATI IXP IDE support # # drivers/ide/Kconfig # 2004/03/16 12:49:40-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +10 -0 # ATI IXP IDE support # # ChangeSet # 2004/03/16 16:46:39-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] remove dead "hdXlun=" kernel parameter # # include/linux/ide.h # 2004/03/16 12:30:15-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -2 # remove dead "hdXlun=" kernel parameter # # drivers/ide/ide.c # 2004/03/16 12:30:15-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -16 # remove dead "hdXlun=" kernel parameter # # drivers/ide/ide-probe.c # 2004/03/16 12:30:15-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -3 # remove dead "hdXlun=" kernel parameter # # Documentation/ide.txt # 2004/03/16 12:30:15-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -2 # remove dead "hdXlun=" kernel parameter # # ChangeSet # 2004/03/16 16:46:25-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] ide-scsi.c: fix ATAPI multi-lun support # # ATAPI multi-lun support has been broken for a long time. # # It used to be that "(drive->id->last_id & 0x7) + 1" was used as # shost->max_lun and the "hdXlun=" kernel parameter could be used to # override this value. # # However it was far from optimal: # - people played with "hdXlun=" and then complained about multiple instances # of the same device (most ATAPI drives respond to each LUN) # - probably some devices return 7 not 0 in id->last_id (=> 7 x same device) # # This patch from Willem Riede fixes it w/o need # for "hdXlun=" option. It was tested by Willem on ATAPI PD/CD drive. # # drivers/scsi/ide-scsi.c # 2004/03/16 12:21:04-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +10 -1 # ide-scsi.c: fix ATAPI multi-lun support # # ChangeSet # 2004/03/16 16:38:36-08:00 rusty@rustcorp.com.au # [PATCH] wait_task_inactive should not return on preempt # # wait_task_inactive is now only used in two non-time-critical places: the # ptrace code to guarantee a schedule and kthread_bind so we can change # the thread CPU. Unfortunately with preempt, the code as stands has a # race: we might return because the thread is preempted, not because it # actually reached schedule(). The ptrace code (probably) doesn't care, # but the kthread code does. # # This patch simplifies the (now over-optimized) code, and does a yield() # for the preemption case. # # kernel/sched.c # 2004/03/16 14:54:38-08:00 rusty@rustcorp.com.au +8 -15 # wait_task_inactive should not return on preempt # # ChangeSet # 2004/03/16 14:57:47-08:00 greg@kroah.com # Merge kroah.com:/home/greg/linux/BK/bleed-2.6 # into kroah.com:/home/greg/linux/BK/usb-2.6 # # drivers/usb/input/wacom.c # 2004/03/16 14:57:44-08:00 greg@kroah.com +0 -4 # Auto merged # # drivers/usb/input/hid-core.c # 2004/03/16 14:57:43-08:00 greg@kroah.com +0 -0 # Auto merged # # ChangeSet # 2004/03/16 14:44:49-08:00 katzj@redhat.com # [PATCH] Fix blkpg ioctl32 handling # # Simple obvious patch so that all calls to blkpg from the non-native # environment don't get -EINVAL # # fs/compat_ioctl.c # 2004/03/16 13:12:40-08:00 katzj@redhat.com +1 -0 # Fix blkpg ioctl32 handling # # ChangeSet # 2004/03/16 16:02:52-05:00 ralf@linux-mips.org # [hamradio 6pack] cleanup # # drivers/net/hamradio/6pack.c # 2004/03/16 16:02:47-05:00 ralf@linux-mips.org +542 -545 # [hamradio 6pack] cleanup # # ChangeSet # 2004/03/16 16:02:01-05:00 jgarzik@redhat.com # [blk carmel] call del_gendisk(), if disk is 'up', at cleanup time # # drivers/block/carmel.c # 2004/03/16 16:01:56-05:00 jgarzik@redhat.com +3 -0 # [blk carmel] call del_gendisk(), if disk is 'up', at cleanup time # # ChangeSet # 2004/03/16 12:44:45-08:00 torvalds@ppc970.osdl.org # Remove bogus linux/irq.h include that fails build on ARM. # # Verified to not break anything on x86 either. # # include/linux/netpoll.h # 2004/03/16 12:44:40-08:00 torvalds@ppc970.osdl.org +0 -1 # Remove bogus linux/irq.h include that fails build on ARM. # # ChangeSet # 2004/03/16 15:36:03-05:00 mpm@selenic.com # [PATCH] fix netpoll warning in tulip # # On Tue, Mar 16, 2004 at 12:36:02PM +0200, Meelis Roos wrote: # > FYI: with netpoll configured out, I get # > # > CC [M] drivers/net/tulip/tulip_core.o # > drivers/net/tulip/tulip_core.c:256: warning: `poll_tulip' declared `static' but never defined # # drivers/net/tulip/tulip_core.c # 2004/03/16 14:22:30-05:00 mpm@selenic.com +2 -1 # Re: netpoll warning in tulip # # ChangeSet # 2004/03/16 15:35:54-05:00 scott.feldman@intel.com # [PATCH] update e100.txt # # * e100.txt needs to refer to the v3 driver and its settings. # Spotted by Calum Mackay [calum.mackay@cdmnet.org] # # Documentation/networking/e100.txt # 2004/03/15 14:19:29-05:00 scott.feldman@intel.com +2 -193 # update e100.txt # # ChangeSet # 2004/03/16 15:15:18-05:00 jgarzik@redhat.com # [netdrvr natsemi] Fix RX DMA mapping # # RX skbs are always considered maximally sized, until actual reception # of the RX frame occurs. So, update this driver to always map and # unmap a maximally sized skb. This fixes this driver on several # non-x86 platforms. # # drivers/net/natsemi.c # 2004/03/16 15:13:56-05:00 jgarzik@redhat.com +13 -9 # [netdrvr natsemi] Fix RX DMA mapping # # RX skbs are always considered maximally sized, until actual reception # of the RX frame occurs. So, update this driver to always map and # unmap a maximally sized skb. This fixes this driver on several # non-x86 platforms. # # ChangeSet # 2004/03/16 14:02:51-06:00 shaggy@austin.ibm.com # JFS: zero new log pages, etc. # # fs/jfs/super.c # 2004/03/16 14:02:36-06:00 shaggy@austin.ibm.com +1 -1 # zero jfs incore inode # # fs/jfs/jfs_metapage.c # 2004/03/16 14:02:36-06:00 shaggy@austin.ibm.com +4 -0 # zero new metadata pages # # fs/jfs/jfs_logmgr.c # 2004/03/16 14:02:36-06:00 shaggy@austin.ibm.com +1 -1 # zero new log pages # # ChangeSet # 2004/03/16 11:55:27-08:00 ahaas@airmail.net # [IPVS]: Add C99 initializers to net/ipv4/ipvs/ip_vs_lblcr.c # # net/ipv4/ipvs/ip_vs_lblcr.c # 2004/03/16 11:55:14-08:00 ahaas@airmail.net +41 -21 # [IPVS]: Add C99 initializers to net/ipv4/ipvs/ip_vs_lblcr.c # # ChangeSet # 2004/03/16 11:54:39-08:00 ahaas@airmail.net # [IPVS]: Add C99 initializers to net/ipv4/ipvs/ip_vs_lblc.c # # net/ipv4/ipvs/ip_vs_lblc.c # 2004/03/16 11:54:26-08:00 ahaas@airmail.net +41 -21 # [IPVS]: Add C99 initializers to net/ipv4/ipvs/ip_vs_lblc.c # # ChangeSet # 2004/03/16 11:53:40-08:00 ahaas@airmail.net # [IPVS]: Add C99 initializers to ip_vs_ctl.c # # net/ipv4/ipvs/ip_vs_ctl.c # 2004/03/16 11:50:24-08:00 ahaas@airmail.net +219 -88 # [IPVS]: Add C99 initializers to ip_vs_ctl.c # # ChangeSet # 2004/03/16 11:28:52-08:00 greg@kroah.com # [PATCH] USB: replace kobject with kref in usb-serial core. # # This saves some memory and is easier to understand what is happening. # # drivers/usb/serial/usb-serial.h # 2004/03/16 02:59:48-08:00 greg@kroah.com +3 -2 # USB: replace kobject with kref in usb-serial core. # # drivers/usb/serial/usb-serial.c # 2004/03/16 03:00:22-08:00 greg@kroah.com +9 -16 # USB: replace kobject with kref in usb-serial core. # # ChangeSet # 2004/03/16 10:22:41-08:00 bjorn_helgaas@hp.com # [PATCH] ia64: fix up DMA API breakage in generic build # # We also need the following patch to build the generic_defconfig # after the DMA API change: # http://linux.bkbits.net:8080/linux-2.5/cset@405490e15inT3T0H2x887j9SaMkYRQ # # include/asm-ia64/machvec.h # 2004/03/15 07:53:54-08:00 bjorn_helgaas@hp.com +4 -4 # ia64: fix up DMA API breakage in generic build # # ChangeSet # 2004/03/16 10:14:07-08:00 greg@kroah.com # Merge kroah.com:/home/linux/BK/bleed-2.6 # into kroah.com:/home/linux/BK/usb-2.6 # # include/linux/usb_gadget.h # 2004/03/16 10:14:00-08:00 greg@kroah.com +0 -0 # Auto merged # # include/linux/usb.h # 2004/03/16 10:14:00-08:00 greg@kroah.com +0 -0 # Auto merged # # drivers/usb/core/usb.c # 2004/03/16 10:14:00-08:00 greg@kroah.com +0 -0 # Auto merged # # MAINTAINERS # 2004/03/16 10:13:59-08:00 greg@kroah.com +0 -0 # Auto merged # # CREDITS # 2004/03/16 10:13:59-08:00 greg@kroah.com +0 -0 # Auto merged # # arch/ppc64/kernel/pmac_iommu.c # 2004/03/16 09:45:10-08:00 benh@kernel.crashing.org +5 -2 # g5: Fix iommu vs. pci_device_to_OF_node # # ChangeSet # 2004/03/16 12:30:29-05:00 jgarzik@redhat.com # [blk carmel] add copyright statement and license mention # # drivers/block/carmel.c # 2004/03/16 12:29:06-05:00 jgarzik@redhat.com +12 -1 # [blk carmel] add copyright statement and license mention # # ChangeSet # 2004/03/16 08:07:17-08:00 torvalds@ppc970.osdl.org # Merge bk://kernel.bkbits.net/vojtech/input # into ppc970.osdl.org:/home/torvalds/v2.5/linux # # Documentation/kernel-parameters.txt # 2004/03/16 08:07:14-08:00 torvalds@ppc970.osdl.org +0 -0 # Auto merged # # ChangeSet # 2004/03/16 07:51:27-08:00 axboe@suse.de # [PATCH] allow random write to cdrom devices with profile 2 (removable disk) # # This patch is from Iomega, and it allows random write opens of CDROM's # that support the feature. # # include/linux/cdrom.h # 2004/03/16 00:39:41-08:00 axboe@suse.de +32 -1 # allow random write to cdrom devices with profile 2 (removable disk) # # drivers/scsi/sr.c # 2004/03/16 00:39:41-08:00 axboe@suse.de +8 -3 # allow random write to cdrom devices with profile 2 (removable disk) # # drivers/ide/ide-cd.c # 2004/03/16 00:39:41-08:00 axboe@suse.de +6 -1 # allow random write to cdrom devices with profile 2 (removable disk) # # drivers/cdrom/cdrom.c # 2004/03/16 00:41:01-08:00 axboe@suse.de +99 -0 # allow random write to cdrom devices with profile 2 (removable disk) # # ChangeSet # 2004/03/16 07:29:37-08:00 akpm@osdl.org # [PATCH] ppc64: fix for massive OF properties # # From: Anton Blanchard # # We have some versions of firmware out there that have huge OF properties. # So huge that we end up overwriting our initrd. # # Place a 1MB limit and warn bitterly if its over this. Also fix a use of # package-to-path where the variable was 64bytes but we would pass in a # length of 255. # # arch/ppc64/kernel/prom.c # 2004/03/16 03:30:39-08:00 akpm@osdl.org +33 -3 # ppc64: fix for massive OF properties # # ChangeSet # 2004/03/16 07:29:25-08:00 akpm@osdl.org # [PATCH] ppc64 defconfig update # # From: Anton Blanchard # # ppc64 defconfig update # # arch/ppc64/defconfig # 2004/03/16 03:30:38-08:00 akpm@osdl.org +27 -15 # ppc64 defconfig update # # arch/ppc64/configs/pSeries_defconfig # 2004/03/16 03:30:39-08:00 akpm@osdl.org +27 -15 # ppc64 defconfig update # # arch/ppc64/configs/iSeries_defconfig # 2004/03/16 03:30:38-08:00 akpm@osdl.org +20 -4 # ppc64 defconfig update # # ChangeSet # 2004/03/16 07:29:15-08:00 akpm@osdl.org # [PATCH] Fix hvc console sleep in spinlock bug # # From: Jeremy Kerr # # This patch fixes the sleep in spinlock hvc bug in hvc_write(). # # The code is a little longer, but protects against large amounts of memory # being kmalloc()ed by userspace, and minimises calls to copy_from_user(). # # drivers/char/hvc_console.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +52 -18 # Fix hvc console sleep in spinlock bug # # ChangeSet # 2004/03/16 07:29:03-08:00 akpm@osdl.org # [PATCH] Clean up xmon backtrace code. # # From: Anton Blanchard # # Clean up xmon backtrace code, it was doing all manner of scary things. # # arch/ppc64/xmon/xmon.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +57 -79 # Clean up xmon backtrace code. # # ChangeSet # 2004/03/16 07:28:51-08:00 akpm@osdl.org # [PATCH] Cleanup ppc64 procfs code # # From: Anton Blanchard # # Cleanup ppc64 procfs code: # # - Use initcalls everywhere. This allowed us to remove the iseries proc # callback interface. # - Kill proc_pmc.c. Most of it wasnt used (and we are planning to export the # PMCs via sysfs). The few things left were iseries specific so they # got moved into iSeries_proc.c. # - Kill pmc.c. We dont use those statistics and the ones that are left # can be gained via PMCs. # - Create /proc/iSeries and /proc/ppc64 very early. This means we no # longer have to call proc_ppc64_init in all the drivers, we can # assume its there. # - Fix some error return cases in rtas-proc.c and rtas-flash # - Dont even try some pseries specific drivers on pmac. # # include/asm-ppc64/iSeries/mf.h # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -2 # Cleanup ppc64 procfs code # # include/asm-ppc64/iSeries/iSeries_proc.h # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -6 # Cleanup ppc64 procfs code # # fs/proc/root.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -3 # Cleanup ppc64 procfs code # # arch/ppc64/mm/init.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -1 # Cleanup ppc64 procfs code # # arch/ppc64/mm/hash_utils.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -1 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/viopath.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +50 -51 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/scanlog.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +1 -11 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/rtasd.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +7 -11 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/rtas_flash.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +62 -32 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/rtas.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -1 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/rtas-proc.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +36 -40 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/ras.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -1 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/proc_ppc64.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +69 -82 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/ppc_ksyms.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -2 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/mf_proc.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +14 -10 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/mf.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -3 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/iSeries_setup.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +0 -4 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/iSeries_proc.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +146 -117 # Cleanup ppc64 procfs code # # arch/ppc64/kernel/Makefile # 2004/03/16 03:30:38-08:00 akpm@osdl.org +2 -2 # Cleanup ppc64 procfs code # # arch/ppc/platforms/proc_rtas.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +7 -3 # Cleanup ppc64 procfs code # # BitKeeper/deleted/.del-proc_pmc.h~fa188a01cdbd56f2 # 2004/03/16 07:28:45-08:00 akpm@osdl.org +0 -0 # Delete: include/asm-ppc64/proc_pmc.h # # BitKeeper/deleted/.del-proc_pmc.c~1b91b529be9350c0 # 2004/03/16 07:28:45-08:00 akpm@osdl.org +0 -0 # Delete: arch/ppc64/kernel/proc_pmc.c # # BitKeeper/deleted/.del-proc_fs.h~68528c7caf0c1ef1 # 2004/03/16 07:28:45-08:00 akpm@osdl.org +0 -0 # Delete: include/asm-ppc64/proc_fs.h # # BitKeeper/deleted/.del-pmc.h~5f711a1118f8f38 # 2004/03/16 07:28:45-08:00 akpm@osdl.org +0 -0 # Delete: include/asm-ppc64/pmc.h # # BitKeeper/deleted/.del-pmc.c~e5a1dd618650f12b # 2004/03/16 07:28:44-08:00 akpm@osdl.org +0 -0 # Delete: arch/ppc64/kernel/pmc.c # # ChangeSet # 2004/03/16 07:28:37-08:00 akpm@osdl.org # [PATCH] Add kernel version to oops. # # From: Anton Blanchard # # Add kernel version to oops. # # arch/ppc64/kernel/process.c # 2004/03/16 03:30:38-08:00 akpm@osdl.org +3 -2 # Add kernel version to oops. # # ChangeSet # 2004/03/16 07:28:25-08:00 akpm@osdl.org # [PATCH] Fixed NULL ptr deref in RTAS syscall ppc_rtas() # # From: John Rose # # Fixed NULL ptr deref in RTAS syscall ppc_rtas() # # arch/ppc64/kernel/rtas.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +8 -5 # Fixed NULL ptr deref in RTAS syscall ppc_rtas() # # ChangeSet # 2004/03/16 07:28:13-08:00 akpm@osdl.org # [PATCH] Added rtas_set_power_level() # # From: John Rose # # Added rtas_set_power_level() # # include/asm-ppc64/rtas.h # 2004/03/16 03:30:38-08:00 akpm@osdl.org +1 -0 # Added rtas_set_power_level() # # arch/ppc64/kernel/rtas.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +28 -0 # Added rtas_set_power_level() # # ChangeSet # 2004/03/16 07:28:03-08:00 akpm@osdl.org # [PATCH] Remove pci DMA exports # # From: Anton Blanchard # # Remove pci DMA exports we now access them via inline functions that # operate on pci_dma_ops. # # arch/ppc64/kernel/ppc_ksyms.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +0 -9 # Remove pci DMA exports # # ChangeSet # 2004/03/16 07:27:52-08:00 akpm@osdl.org # [PATCH] Dont enable interrupts during interrupt processing on iseries # # From: Stephen Rothwell # # Dont enable interrupts during interrupt processing on iseries # # arch/ppc64/kernel/irq.c # 2004/03/16 03:30:37-08:00 akpm@osdl.org +4 -0 # Dont enable interrupts during interrupt processing on iseries # # ChangeSet # 2004/03/16 07:27:40-08:00 akpm@osdl.org # [PATCH] Add slow path lookup in xics_get_irq # # From: Jake Moilanen # # In xics_get_irq(), for a real-to-virt irq lookup, go down the # slowpath by looking through the entire virt_irq_to_real_map array # if take a miss on the radix tree. This is possible, when an # interrupt is taken before the driver has called request_irq() (eg IDE). # # arch/ppc64/kernel/xics.c # 2004/03/16 03:30:37-08:00 akpm@osdl.org +4 -0 # Add slow path lookup in xics_get_irq # # arch/ppc64/kernel/irq.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +33 -0 # Add slow path lookup in xics_get_irq # # ChangeSet # 2004/03/16 07:27:28-08:00 akpm@osdl.org # [PATCH] Export find_next_bit # # From: Anton Blanchard # # - export find_next_bit and move the other exports here # - fix a few minor style issues # # arch/ppc64/kernel/ppc_ksyms.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +0 -3 # Export find_next_bit # # arch/ppc64/kernel/bitops.c # 2004/03/16 03:30:37-08:00 akpm@osdl.org +13 -7 # Export find_next_bit # # ChangeSet # 2004/03/16 07:27:18-08:00 akpm@osdl.org # [PATCH] update iseries default target # # From: Anton Blanchard # # update iseries default target # # arch/ppc64/Makefile # 2004/03/16 03:30:37-08:00 akpm@osdl.org +1 -1 # update iseries default target # # ChangeSet # 2004/03/16 07:27:05-08:00 akpm@osdl.org # [PATCH] Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # From: Stephen Rothwell # # After this the only iSeries specific EXPORT_SYMBOLS in ppc_ksyms.c are # the assembler ones ... # # arch/ppc64/kernel/ppc_ksyms.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +1 -24 # Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # arch/ppc64/kernel/mf.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +3 -0 # Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # arch/ppc64/kernel/iSeries_proc.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +2 -0 # Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # arch/ppc64/kernel/iSeries_pci_reset.c # 2004/03/16 03:30:37-08:00 akpm@osdl.org +2 -0 # Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # arch/ppc64/kernel/iSeries_pci.c # 2004/03/16 03:30:37-08:00 akpm@osdl.org +10 -0 # Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # arch/ppc64/kernel/iSeries_VpdInfo.c # 2004/03/16 03:30:37-08:00 akpm@osdl.org +2 -0 # Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # arch/ppc64/kernel/HvLpConfig.c # 2004/03/16 03:30:37-08:00 akpm@osdl.org +2 -3 # Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c # # ChangeSet # 2004/03/16 07:26:54-08:00 akpm@osdl.org # [PATCH] Add some functions to make vio.h consistant with pci_dma.h and dma_mapping.h # # From: Dave Boutcher # # Add some functions to make vio.h consistant with pci_dma.h and dma_mapping.h # # include/asm-ppc64/vio.h # 2004/03/16 03:30:37-08:00 akpm@osdl.org +31 -0 # Add some functions to make vio.h consistant with pci_dma.h and dma_mapping.h # # ChangeSet # 2004/03/16 07:26:41-08:00 akpm@osdl.org # [PATCH] Fix xics IRQ affinity # # From: Anton Blanchard # # - Merge some whitespace differences with the ameslab tree # - We check for CPU_MASK_ALL in xics to send irqs to all cpus. # In some cases CPU_MASK_ALL is smaller than the cpumask (eg # NR_CPUS == 32 and cpumask is a long), so we mask it here to # be consistent. # # arch/ppc64/kernel/irq.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +19 -9 # Fix xics IRQ affinity # # ChangeSet # 2004/03/16 07:26:29-08:00 akpm@osdl.org # [PATCH] Fix multiple EEH-related bugs # # From: Linas Vepstas # # This patch fixes multiple EEH-related bugs: # # - Fixes the eeh_check_failure() usage in an interrupt context. # This routine is now safe to use in an interrupt. The fix was to # build a cache of IO addresses and check that, instead of using # the pci routines. # - Merges in Olof Johansson's sizeof patch when checking for failure # - Adds EEH tests to array/string reads # - Fixes bugs with address resolution (some i/o addresses were handled # incorrectly, resulting in EEH errors slipping by undetected.) # - Adds EEH support to the PCI Hotplug system (so that devices that # get added/removed get properly registered with the EEH subsystem.) # - Fixes improper use of /proc filesystem. # - Adds some misc statistics. # # While merging Linas' patch I also converted the proc usage to # seq_single, used per cpu variables for the stats and removed the # eeh-force-off option. # # include/asm-ppc64/io.h # 2004/03/16 03:30:36-08:00 akpm@osdl.org +20 -8 # Fix multiple EEH-related bugs # # include/asm-ppc64/eeh.h # 2004/03/16 03:30:36-08:00 akpm@osdl.org +117 -56 # Fix multiple EEH-related bugs # # drivers/pci/hotplug/rpaphp_core.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +1 -0 # Fix multiple EEH-related bugs # # arch/ppc64/kernel/ppc_ksyms.c # 2004/03/16 03:31:51-08:00 akpm@osdl.org +0 -4 # Fix multiple EEH-related bugs # # arch/ppc64/kernel/pci.h # 2004/03/16 03:30:36-08:00 akpm@osdl.org +4 -1 # Fix multiple EEH-related bugs # # arch/ppc64/kernel/pci.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +4 -37 # Fix multiple EEH-related bugs # # arch/ppc64/kernel/eeh.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +536 -139 # Fix multiple EEH-related bugs # # ChangeSet # 2004/03/16 07:26:19-08:00 akpm@osdl.org # [PATCH] Fix for hotplug of multifunction cards. # # From: Linda Xie # # The changes in this patch are for multifunction cards insertions/removals # and bug fixes: # # 1. fix up new nodes' linux_phandle field. # 2. new nodes' phb, devfn(and so on) need to be fixed even the nodes don't # have "interrupts". # 3. change of_remove_node to non-recurisve func. The recursions will be done # by the caller. # 4. add a new function -- of_finish_dynamic_node_interrupts() # # arch/ppc64/kernel/prom.c # 2004/03/16 03:31:49-08:00 akpm@osdl.org +59 -75 # Fix for hotplug of multifunction cards. # # ChangeSet # 2004/03/16 07:26:08-08:00 akpm@osdl.org # [PATCH] Add some missing EXPORT_SYMBOLs # # From: Anton Blanchard # # Add some missing EXPORT_SYMBOLs # # arch/ppc64/kernel/vio.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +1 -2 # Add some missing EXPORT_SYMBOLs # # arch/ppc64/kernel/ppc_ksyms.c # 2004/03/16 03:31:51-08:00 akpm@osdl.org +2 -0 # Add some missing EXPORT_SYMBOLs # # arch/ppc64/kernel/pSeries_lpar.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +6 -0 # Add some missing EXPORT_SYMBOLs # # ChangeSet # 2004/03/16 07:25:57-08:00 akpm@osdl.org # [PATCH] Handle longbusy return codes in IBM VETH driver # # From: Santiago Leon # # Handle longbusy return codes in IBM VETH driver # # drivers/net/ibmveth.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +11 -4 # Handle longbusy return codes in IBM VETH driver # # ChangeSet # 2004/03/16 07:25:46-08:00 akpm@osdl.org # [PATCH] Add hypervisor busy return codes # # From: Dave Boutcher # # Add hypervisor busy return codes # # include/asm-ppc64/hvcall.h # 2004/03/16 03:30:36-08:00 akpm@osdl.org +22 -1 # Add hypervisor busy return codes # # ChangeSet # 2004/03/16 07:25:35-08:00 akpm@osdl.org # [PATCH] Make dma API handle PCI and VIO # # From: Stephen Rothwell # # Make dma API handle PCI and VIO # # arch/ppc64/kernel/dma.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +184 -0 # Make dma API handle PCI and VIO # # include/asm-ppc64/dma-mapping.h # 2004/03/16 03:30:36-08:00 akpm@osdl.org +75 -1 # Make dma API handle PCI and VIO # # arch/ppc64/kernel/dma.c # 2004/03/16 03:30:36-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/arch/ppc64/kernel/dma.c # # arch/ppc64/kernel/Makefile # 2004/03/16 03:31:50-08:00 akpm@osdl.org +1 -1 # Make dma API handle PCI and VIO # # ChangeSet # 2004/03/16 07:25:22-08:00 akpm@osdl.org # [PATCH] Remove some unused ppc64 variables # # From: Anton Blanchard # # Remove some unused ppc64 variables # # arch/ppc64/mm/init.c # 2004/03/16 03:31:50-08:00 akpm@osdl.org +0 -2 # Remove some unused ppc64 variables # # ChangeSet # 2004/03/16 07:25:10-08:00 akpm@osdl.org # [PATCH] Remove bogus sys_oldumount sign extension code # # From: Anton Blanchard # # Remove bogus sys_oldumount sign extension code. We were sign extending # the flags argument which doesnt make sense. # # arch/ppc64/kernel/sys_ppc32.c # 2004/03/16 03:30:35-08:00 akpm@osdl.org +0 -11 # Remove bogus sys_oldumount sign extension code # # arch/ppc64/kernel/misc.S # 2004/03/16 03:30:35-08:00 akpm@osdl.org +1 -1 # Remove bogus sys_oldumount sign extension code # # ChangeSet # 2004/03/16 07:24:59-08:00 akpm@osdl.org # [PATCH] Reduce stack overflow check to 4096 bytes # # From: Anton Blanchard # # Reduce stack overflow check to 4096 bytes free, we were tripping it # too much at 8192. # # arch/ppc64/kernel/irq.c # 2004/03/16 03:31:51-08:00 akpm@osdl.org +2 -2 # Reduce stack overflow check to 4096 bytes # # ChangeSet # 2004/03/16 07:22:49-08:00 akpm@osdl.org # [PATCH] iostats averaging fix # # From: Rick Lindsley # # Fix bug #2230. # # I've corresponded with the submitter and he did find a real bug -- when we # were merging I/O requests we didn't always take the oldest request start # time, which would cause a couple of the calculations like wait time and # average queue size to be too small. He found it mathematically but having # done so, I think logic and inspection makes it easy to verify. # # drivers/block/ll_rw_blk.c # 2004/03/16 02:29:58-08:00 akpm@osdl.org +9 -0 # iostats averaging fix # # ChangeSet # 2004/03/16 07:22:38-08:00 akpm@osdl.org # [PATCH] blk: statically initialise the congestion waitqueue_heads # # On a really small memory machine (or one with a monstrous kernel memory leak) # we can end up calling blk_congestion_wait() before the waitqueue_heads are set # up. # # drivers/block/ll_rw_blk.c # 2004/03/16 02:43:49-08:00 akpm@osdl.org +4 -6 # blk: statically initialise the congestion waitqueue_heads # # ChangeSet # 2004/03/16 07:22:26-08:00 akpm@osdl.org # [PATCH] kill INIT_THREAD_SIZE # # From: Matt Mackall # # This piece of the THREAD_SIZE cleanup got dropped. If you make THREAD_SIZE # > 8k, the init thread overlaps the .init section and gets smashed. I've # gone ahead and killed INIT_THREAD_SIZE throughout as it wasn't doing much. # This also saves 4k when we use 4k stacks. Please apply. Couple more minor # pieces remaining. # # include/linux/sched.h # 2004/03/16 02:29:47-08:00 akpm@osdl.org +1 -5 # kill INIT_THREAD_SIZE # # include/asm-um/processor-generic.h # 2004/03/16 02:29:47-08:00 akpm@osdl.org +0 -2 # kill INIT_THREAD_SIZE # # include/asm-sparc/thread_info.h # 2004/03/16 02:29:47-08:00 akpm@osdl.org +0 -3 # kill INIT_THREAD_SIZE # # include/asm-arm26/thread_info.h # 2004/03/16 02:29:47-08:00 akpm@osdl.org +0 -2 # kill INIT_THREAD_SIZE # # arch/sparc64/kernel/init_task.c # 2004/03/16 02:29:47-08:00 akpm@osdl.org +0 -8 # kill INIT_THREAD_SIZE # # arch/parisc/kernel/process.c # 2004/03/16 02:29:47-08:00 akpm@osdl.org +1 -1 # kill INIT_THREAD_SIZE # # ChangeSet # 2004/03/16 07:22:15-08:00 akpm@osdl.org # [PATCH] kthreads hold files open # # keventd and friends are currently holding /dev/console open three times. # It's all inherited from init. # # Steal the relevant parts of daemonize() to fix that up. # # kernel/kthread.c # 2004/03/16 02:29:47-08:00 akpm@osdl.org +18 -0 # kthreads hold files open # # ChangeSet # 2004/03/16 07:22:03-08:00 akpm@osdl.org # [PATCH] slab: fix display of object length in corruption detector # # From: Manfred Spraul # # print_objinfo() dumps the first few characters of an interesting object for # debugging. It used the wrong object len (including debug padding, instead # of just the data area), which could cause an oops if DEBUG_PAGEALLOC is # enabled. # # mm/slab.c # 2004/03/16 02:29:47-08:00 akpm@osdl.org +1 -1 # slab: fix display of object length in corruption detector # # ChangeSet # 2004/03/16 07:21:52-08:00 akpm@osdl.org # [PATCH] document unchecked do_munmaps in ipc/shm.c # # From: Manfred Spraul # # There are a few unchecked do_munmap()s in the shm code. Manfred's comment # explains why they are OK. # # ipc/shm.c # 2004/03/16 02:29:47-08:00 akpm@osdl.org +15 -0 # document unchecked do_munmaps in ipc/shm.c # # ChangeSet # 2004/03/16 07:21:39-08:00 akpm@osdl.org # [PATCH] do_write_mem() return value check # # From: BlaisorBlade , and me # # - remove unused `file *' arg from do_write_mem() # # - Add checking for copy_from_user() failures in do_write_mem() # # - Return correct value from kmem writes() when a fault is encountered. A # write()-style syscall's return values are: # # 0 when nothing was written and there was no error (someone tried to # write zero bytes) # # >0: the number of bytes copied, whether or not there was an error. # Userspace detects errors by noting that the write() return value is less # than was requested. # # <0: there was an error and no bytes were copied # # drivers/char/mem.c # 2004/03/16 02:29:47-08:00 akpm@osdl.org +26 -9 # do_write_mem() return value check # # ChangeSet # 2004/03/16 07:21:28-08:00 akpm@osdl.org # [PATCH] resierfs: AIO support # # From: Chris Mason # # reiserfs can safely use the generic fs aio functions. # # fs/reiserfs/file.c # 2004/03/16 02:29:47-08:00 akpm@osdl.org +10 -0 # resierfs: AIO support # # ChangeSet # 2004/03/16 07:21:18-08:00 akpm@osdl.org # [PATCH] reiserfs: atomicity fix # # From: Chris Mason # # reiserfs_file_write() can use stale metadata after a schedule. # # Two reiserfs_file_write bugs, where items can change during a schedule. # # fs/reiserfs/file.c # 2004/03/16 02:43:50-08:00 akpm@osdl.org +8 -4 # reiserfs: atomicity fix # # ChangeSet # 2004/03/16 07:21:05-08:00 akpm@osdl.org # [PATCH] reiserfs: fix transaction sizes # # From: Chris Mason # # Make sure reiserfs uses a reasonable number when restarting long unbounded # transactions (creating holes or deleting files). # # Without this patch, the number of blocks requested grows with each # transaction restart, until it hits MAX_BATCH_COUNT and starts forcing # commits with every new transaction. # # Oleg Drokin tracked this bug down # # fs/reiserfs/stree.c # 2004/03/16 02:29:46-08:00 akpm@osdl.org +1 -1 # reiserfs: fix transaction sizes # # fs/reiserfs/inode.c # 2004/03/16 02:29:46-08:00 akpm@osdl.org +1 -1 # reiserfs: fix transaction sizes # # ChangeSet # 2004/03/16 07:20:54-08:00 akpm@osdl.org # [PATCH] reiserfs: search_by_key fix # # From: Chris Mason # # Fix a bug in reiserfs search_by_key call, where it might not properly # detect a change in tree height during a schedule. Originally from # vs@namesys.com # # fs/reiserfs/stree.c # 2004/03/16 02:43:50-08:00 akpm@osdl.org +10 -6 # reiserfs: search_by_key fix # # ChangeSet # 2004/03/16 07:20:41-08:00 akpm@osdl.org # [PATCH] resierfs: scheduling latency improvements # # From: Chris Mason # # Add conditional schedules to reiserfs to help lower latencies. Bits of # this orginated long ago in code akpm sent me. # # include/linux/reiserfs_fs.h # 2004/03/16 02:29:46-08:00 akpm@osdl.org +2 -1 # resierfs: scheduling latency improvements # # fs/reiserfs/stree.c # 2004/03/16 02:43:50-08:00 akpm@osdl.org +6 -7 # resierfs: scheduling latency improvements # # ChangeSet # 2004/03/16 07:20:29-08:00 akpm@osdl.org # [PATCH] reiserfs: fix null pointer deref # # From: Chris Mason # # From: Jeff Mahoney # # fsstress manages to setup a sequence of events that allow an attempt to # perform direct-io on a tail. bh_result->b_page == NULL, which causes the # PageLocked and PageWriteback checks to perform a NULL deref, causing the # oops. # # fs/reiserfs/inode.c # 2004/03/16 02:43:50-08:00 akpm@osdl.org +1 -1 # reiserfs: fix null pointer deref # # ChangeSet # 2004/03/16 07:20:17-08:00 akpm@osdl.org # [PATCH] kernel-doc build fix # # From: Michael Still # # This is needed to get any of the SGML documentation to build with 2.6.4. # # Documentation/DocBook/parportbook.tmpl # 2004/03/16 02:29:46-08:00 akpm@osdl.org +1 -1 # kernel-doc build fix # # ChangeSet # 2004/03/16 07:20:05-08:00 akpm@osdl.org # [PATCH] fbdev: character drawing enhancement. # # From: James Simmons # # This patch merges two of the drawing functions. The patch uses aligned # transfers when possible even on displays where the characters are not byte # align. Tested on my my laptop for 12 bit width fonts and 8 bit wide fonts. # It works very nicely. # # drivers/video/console/fbcon.c # 2004/03/16 02:29:46-08:00 akpm@osdl.org +76 -131 # fbdev: character drawing enhancement. # # ChangeSet # 2004/03/16 07:19:52-08:00 akpm@osdl.org # [PATCH] page_referenced() simplification # # There's no point in calling mark_page_accessed() here. The page is never on # the LRU so all mark_page_accessed() will do is to set PG_referenced, which we # immediately clear again. # # mm/rmap.c # 2004/03/16 02:29:45-08:00 akpm@osdl.org +1 -1 # page_referenced() simplification # # ChangeSet # 2004/03/16 07:19:41-08:00 akpm@osdl.org # [PATCH] flush_workqueue(): detect excessive nesting # # Add a debug check for workqueues nested more than three deep via the # direct-run-workqueue() path. # # kernel/workqueue.c # 2004/03/16 02:29:45-08:00 akpm@osdl.org +10 -0 # flush_workqueue(): detect excessive nesting # # ChangeSet # 2004/03/16 07:19:29-08:00 akpm@osdl.org # [PATCH] flush_scheduled_work() deadlock fix # # Because keventd is a resource which is shared between unrelated parts of the # kernel it is possible for one person's workqueue handler to accidentally call # another person's flush_scheduled_work(). thockin managed it by calling # mntput() from a workqueue handler. It deadlocks. # # It's simple enough to fix: teach flush_scheduled_work() to go direct when it # discovers that the calling thread is the one which should be running the # work. # # Note that this can cause recursion. The depth of that recursion is equal to # the number of currently-queued works which themselves want to call # flush_scheduled_work(). If this ever exceeds three I'll eat my hat. # # kernel/workqueue.c # 2004/03/16 02:43:51-08:00 akpm@osdl.org +8 -0 # flush_scheduled_work() deadlock fix # # ChangeSet # 2004/03/16 07:19:18-08:00 akpm@osdl.org # [PATCH] selinux: fix compute_av bug # # From: Stephen Smalley # # This patch fixes a bug in the SELinux compute_av code; the current code # yields the right access computation but can cause unnecessary (but # harmless) processing to occur when transition permission wasn't granted in # the first place by the TE configuration. Thanks to Chad Hanson of TCS for # reporting the bug. # # security/selinux/ss/services.c # 2004/03/16 02:29:45-08:00 akpm@osdl.org +1 -1 # selinux: fix compute_av bug # # ChangeSet # 2004/03/16 07:19:07-08:00 akpm@osdl.org # [PATCH] kbuild: fix modpost when used with O= # # From: Sam Ravnborg # # modpost or to be more specific sumversion.c was not behaving correct when # used with O= and MODULE_VERSION was used. Previously it failed to use # local .h when calculation the md-sum in case of a O= build. # # The following patch introduces the following: # # - A generic get_next_line() # # - Check that the topmost part of the directory matches # # - Using strrch when checking for file with suffix .o # # - Use NOFAIL for allocations in sumversion # # - Avoid memory leak in new_module # # The generic get_next_line will pay off when Andreas implmentation of # storing symbol addresses in a seperate file is introduced. # # scripts/sumversion.c # 2004/03/16 02:29:45-08:00 akpm@osdl.org +33 -39 # kbuild: fix modpost when used with O= # # scripts/modpost.h # 2004/03/16 02:29:45-08:00 akpm@osdl.org +4 -0 # kbuild: fix modpost when used with O= # # scripts/modpost.c # 2004/03/16 02:29:45-08:00 akpm@osdl.org +42 -9 # kbuild: fix modpost when used with O= # # ChangeSet # 2004/03/16 07:18:55-08:00 akpm@osdl.org # [PATCH] fix modular fb drivers # # From: Arnd Bergmann # # The recent "fbdev: monitor detection fixes" patch broke modular frame # buffer drivers. # # drivers/video/modedb.c # 2004/03/16 02:29:45-08:00 akpm@osdl.org +1 -1 # fix modular fb drivers # # ChangeSet # 2004/03/16 07:18:45-08:00 akpm@osdl.org # [PATCH] move PCIBIOS access help text # # From: "Randy.Dunlap" # # Moves PCI BIOS Access Mode help text to its top level instead of under # PCI_GOBIOS (which is only 1 of 4 possible choices). # # arch/i386/Kconfig # 2004/03/16 02:29:45-08:00 akpm@osdl.org +3 -3 # move PCIBIOS access help text # # ChangeSet # 2004/03/16 07:18:33-08:00 akpm@osdl.org # [PATCH] drivers_cdrom_cdu31c.c check_region() fix # # From: # # check_region() fixes. # # drivers/cdrom/cdu31a.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +29 -42 # drivers_cdrom_cdu31c.c check_region() fix # # ChangeSet # 2004/03/16 07:18:22-08:00 akpm@osdl.org # [PATCH] add warning to DocBook/Makefile # # From: Trivial Patch Monkey # # From: maximilian attems # # Print something friendlier than: # # /bin/sh: fig2dev: command not found # make[1]: *** [Documentation/DocBook/parport-share.eps] Error 127 # make: *** [pdfdocs] Error 2 # # Documentation/DocBook/Makefile # 2004/03/16 02:29:44-08:00 akpm@osdl.org +6 -0 # add warning to DocBook/Makefile # # ChangeSet # 2004/03/16 07:18:09-08:00 akpm@osdl.org # [PATCH] Fix comment in drivers/block/genhd.c # # From: Trivial Patch Monkey # # From: a.othieno@bluewin.ch (Arthur Othieno) # # add_gendisk() was replaced with add_disk(), but the comment suggests # otherwise. Breaks `make *docs'. # # drivers/block/genhd.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +1 -1 # Fix comment in drivers/block/genhd.c # # ChangeSet # 2004/03/16 07:17:58-08:00 akpm@osdl.org # [PATCH] minor credits updates # # From: Trivial Patch Monkey # # From: andersen@codepoet.org # # I've moved... This patch updates my contact info. # # CREDITS # 2004/03/16 02:29:44-08:00 akpm@osdl.org +5 -5 # minor credits updates # # ChangeSet # 2004/03/16 07:17:48-08:00 akpm@osdl.org # [PATCH] chardev module aliases # # From: Trivial Patch Monkey # # From: Steve Youngs Add module aliases for 21285, # amba, anakin, clps711x, mux, and sa1100 serial drivers. # # drivers/serial/sa1100.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +1 -0 # chardev module aliases # # drivers/serial/mux.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +2 -0 # chardev module aliases # # drivers/serial/clps711x.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +2 -0 # chardev module aliases # # drivers/serial/anakin.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +2 -0 # chardev module aliases # # drivers/serial/amba.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +2 -0 # chardev module aliases # # drivers/serial/21285.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +2 -0 # chardev module aliases # # ChangeSet # 2004/03/16 07:17:35-08:00 akpm@osdl.org # [PATCH] Fix scripts/ver_linux # # From: Trivial Patch Monkey # # From: Thomas Molina # # ver_linux hasn't displayed binutils version right for some time. This patch # corrects that and preserves the old behaviour as well, as suggested by Rusty. # # scripts/ver_linux # 2004/03/16 02:29:44-08:00 akpm@osdl.org +3 -2 # Fix scripts/ver_linux # # ChangeSet # 2004/03/16 07:17:23-08:00 akpm@osdl.org # [PATCH] fix for kallsyms module symbol resolution problem # # From: Rusty Russell # # Fix a problem with kallsyms being unable to look up symbols which are in # modules. # # add_kallsyms should be above module_finalize, which means you can just use # the mod->symtab and mod->strtab members. # # kernel/module.c # 2004/03/16 02:29:44-08:00 akpm@osdl.org +11 -5 # fix for kallsyms module symbol resolution problem # # ChangeSet # 2004/03/16 07:17:12-08:00 akpm@osdl.org # [PATCH] filemap.c comment fix # # From: Trivial Patch Monkey # # From: Carl Spalletta # # mm/filemap.c # 2004/03/16 02:29:43-08:00 akpm@osdl.org +1 -1 # filemap.c comment fix # # ChangeSet # 2004/03/16 07:17:01-08:00 akpm@osdl.org # [PATCH] rename one of the acpi_disable() instances # # From: Trivial Patch Monkey # # From: Pavel Machek # # There's acpi_disable somewhere in the acpi interpreter (it disables # interrupts, iirc). Thus blacklisting function needs better name. # # arch/i386/kernel/dmi_scan.c # 2004/03/16 02:29:43-08:00 akpm@osdl.org +2 -2 # rename one of the acpi_disable() instances # # ChangeSet # 2004/03/16 07:16:48-08:00 akpm@osdl.org # [PATCH] drivers_cdrom_sjcd.c check_region() fix # # From: Trivial Patch Monkey # # From: Omkhar Arasaratnam # # drivers/cdrom/sjcd.c # 2004/03/16 02:29:43-08:00 akpm@osdl.org +1 -1 # drivers_cdrom_sjcd.c check_region() fix # # ChangeSet # 2004/03/16 07:16:38-08:00 akpm@osdl.org # [PATCH] Document tricks to get S3_swsusp working # # From: Trivial Patch Monkey # # From: Pavel Machek # # I was sending this to users that had problems with swsusp, then lost it. It # would be nice to have it directly in the tree. # # Documentation/power/tricks.txt # 2004/03/16 02:29:43-08:00 akpm@osdl.org +25 -0 # Document tricks to get S3_swsusp working # # Documentation/power/tricks.txt # 2004/03/16 02:29:43-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/Documentation/power/tricks.txt # # ChangeSet # 2004/03/16 07:16:27-08:00 akpm@osdl.org # [PATCH] ACPI: document acpi_sleep option # # From: Trivial Patch Monkey # # From: Pavel Machek # # acpi_sleep option should be documented. # # Documentation/kernel-parameters.txt # 2004/03/16 02:29:43-08:00 akpm@osdl.org +4 -0 # ACPI: document acpi_sleep option # # ChangeSet # 2004/03/16 07:16:15-08:00 akpm@osdl.org # [PATCH] drivers_cdrom_cm206.c check_region() fix # # From: Trivial Patch Monkey # # From: Omkhar Arasaratnam # # check_region() fix # # drivers/cdrom/cm206.c # 2004/03/16 02:29:43-08:00 akpm@osdl.org +5 -4 # drivers_cdrom_cm206.c check_region() fix # # ChangeSet # 2004/03/16 07:16:02-08:00 akpm@osdl.org # [PATCH] ide-scsi error handling fixes # # From: Willem Riede # # The patch revises the error handling in ide-scsi, fixing the scheduling # while locked issues, and make it work properly, at least for me... # # Specific changes in this patch: # # - introduce idescsi_expiry, a timeout routine for the ide subsystem, # which simply flags the fact that the command timed out, but postpones # any other action until either the command still finishes on its own # (unlikely?) or the scsi error handler kicks in; # # - introduce idescsi_atapi_error and idescsi_atapi_abort, error routines # for the ide subsystem, which are modeled after those of ide-cd, but # take only minimal effort to recover, leaving the heavy lifting for # the scsi error handler; # # - rewrite (and rename for clarity) idescsi_eh_abort and idescsi_eh_error, # the abort/error routines to be called by the scsi error handler -- # this redesign should not have the scheduling while atomic problems # of the old implementation. # # - move ide_cdrom_dump_status() from ide-cd.c to ide-lib.c as # ide_dump_atapi_status() and both ide-cd and ide-scsi call it. # # - replaces BUG() by WARN_ON()/printk in the error handling code. # # - sets TASK_UNINTERRUPTIBLE before schedule_timeout() and moves the host # unlock/lock around the while loop inside the loop in idescsi_eh_reset(). # # include/linux/ide.h # 2004/03/16 02:29:32-08:00 akpm@osdl.org +1 -0 # ide-scsi error handling fixes # # drivers/scsi/ide-scsi.c # 2004/03/16 02:29:32-08:00 akpm@osdl.org +186 -53 # ide-scsi error handling fixes # # drivers/ide/ide-lib.c # 2004/03/16 02:29:32-08:00 akpm@osdl.org +52 -0 # ide-scsi error handling fixes # # drivers/ide/ide-cd.c # 2004/03/16 02:29:32-08:00 akpm@osdl.org +2 -49 # ide-scsi error handling fixes # # ChangeSet # 2004/03/16 07:15:51-08:00 akpm@osdl.org # [PATCH] selinux: Conditional policy extension and MLS detection support # # From: Stephen Smalley # # This patch extends the SELinux policy engine to support conditional policy # logic based on a set of policy booleans, allowing well-formed changes to # the policy to be defined within and mediated by the policy itself. # # The conditional policy extensions were implemented and contributed by # Tresys Technology. # # Userland packages that support these extensions are already available from # nsa.gov/selinux, and backward compatibility is provided for the prior # policy version. # # The patch also includes a small change to enable detection of the optional # MLS policy model on a SELinux system and fixes to the conditional policy # extensions to allow the MLS policy to work correctly with them that were # implemented and contributed by Trusted Computer Solutions. # # security/selinux/ss/services.c # 2004/03/16 02:43:51-08:00 akpm@osdl.org +141 -0 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/policydb.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +31 -2 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/policydb.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +63 -15 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/mls.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +6 -6 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/conditional.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +77 -0 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/conditional.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +487 -0 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/avtab.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +20 -0 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/avtab.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +194 -62 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/Makefile # 2004/03/16 02:29:22-08:00 akpm@osdl.org +1 -1 # selinux: Conditional policy extension and MLS detection support # # security/selinux/selinuxfs.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +426 -8 # selinux: Conditional policy extension and MLS detection support # # security/selinux/include/conditional.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +22 -0 # selinux: Conditional policy extension and MLS detection support # # security/selinux/ss/conditional.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/security/selinux/ss/conditional.h # # security/selinux/ss/conditional.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/security/selinux/ss/conditional.c # # security/selinux/include/security.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +10 -1 # selinux: Conditional policy extension and MLS detection support # # security/selinux/include/conditional.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/security/selinux/include/conditional.h # # security/selinux/include/av_permissions.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +1 -0 # selinux: Conditional policy extension and MLS detection support # # security/selinux/include/av_perm_to_string.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +1 -0 # selinux: Conditional policy extension and MLS detection support # # ChangeSet # 2004/03/16 07:15:39-08:00 akpm@osdl.org # [PATCH] s390: update for altered page_state structure # # From: Gerald Schaefer # # Update s390 to track the new fields in struct page_state. # # include/linux/page-flags.h # 2004/03/16 02:29:22-08:00 akpm@osdl.org +0 -3 # s390: update for altered page_state structure # # arch/s390/appldata/appldata_os.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +9 -0 # s390: update for altered page_state structure # # arch/s390/appldata/appldata_net_sum.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +8 -0 # s390: update for altered page_state structure # # arch/s390/appldata/appldata_mem.c # 2004/03/16 02:29:22-08:00 akpm@osdl.org +13 -12 # s390: update for altered page_state structure # # ChangeSet # 2004/03/16 07:15:28-08:00 akpm@osdl.org # [PATCH] ppc32 compile fix # # From: Tom Rini # # The problem is that on PPC32 (and probably sparc64) 'asmlinkage' is a # useless keyword, and should just be removed from include/asm-ppc/unistd.h. # # include/asm-ppc/unistd.h # 2004/03/16 02:29:21-08:00 akpm@osdl.org +4 -4 # ppc32 compile fix # # ChangeSet # 2004/03/16 07:15:17-08:00 akpm@osdl.org # [PATCH] Save some memory in mem_map on x86-64 # # From: Andi Kleen # # This patch saves 2MB of memory on a 1GB x86-64 machine, 20MB on a 10GB # machine. It does this by eliminating 8 bytes of useless padding in struct # page. # # This resurrects an older patch in a hopefully cleaner form. # # include/linux/rmap-locking.h # 2004/03/16 02:29:21-08:00 akpm@osdl.org +2 -2 # Save some memory in mem_map on x86-64 # # include/linux/mmzone.h # 2004/03/16 02:29:21-08:00 akpm@osdl.org +1 -1 # Save some memory in mem_map on x86-64 # # include/linux/mm.h # 2004/03/16 02:29:21-08:00 akpm@osdl.org +8 -2 # Save some memory in mem_map on x86-64 # # include/asm-x86_64/bitops.h # 2004/03/16 02:29:21-08:00 akpm@osdl.org +2 -0 # Save some memory in mem_map on x86-64 # # ChangeSet # 2004/03/16 07:15:05-08:00 akpm@osdl.org # [PATCH] Fix early parallel make failures # # From: Sam Ravnborg # # Ingo said: # # Starting at around 2.6.4-rc2-mm1, I keep seeing 'scripts/fixdep: Text # file busy' messages when doing a -j10 bzImage build - which seems to # suggest that by the time fixdep is used by the build system it's not # built yet. # # Sam said: # # I was pretty sure it was something I had caused, so I gave it a spin. What # actually happened was that we tried to build the target 'silentoldconfig' # in parrallel with 'scripts'. Since 'silentoldconfig' started a new make # and then the config target needed 'scripts' we saw two parallel runs. # # The way I decided to fix it was to split scripts/ in two parts. The first # part is now the very basic stuff - moved to scripts/basic/. The second # part is dependent on kernel config etc. and kept in scripts/ # # In the 2.7 timeframe i will redo this initial stuff - it's becoming too # messy for anyone to understand today. # # # Description: # # Fix dependencies in early phases of kernel build. This solves a few # problems nively: modpost is no longer rebuild twicewhen reaching the # 'target' state 'make -j10' now works nicely again # # The patch is rather large due to the following file moves: # mkdir scripts/basic # mv scripts/fixdep.c scripts/basic # mv scripts/split-include.c scripts/basic # mv scripts/docproc.c scripts/basic # # scripts/basic/split-include.c # 2004/03/16 02:29:21-08:00 akpm@osdl.org +1 -1 # Fix early parallel make failures # # scripts/basic/fixdep.c # 2004/03/16 02:29:21-08:00 akpm@osdl.org +13 -13 # Fix early parallel make failures # # scripts/basic/docproc.c # 2004/03/16 02:29:21-08:00 akpm@osdl.org +8 -8 # Fix early parallel make failures # # scripts/basic/Makefile # 2004/03/16 07:14:58-08:00 akpm@osdl.org +18 -0 # # scripts/Makefile # 2004/03/16 02:29:21-08:00 akpm@osdl.org +2 -9 # Fix early parallel make failures # # scripts/Makefile.lib # 2004/03/16 02:29:21-08:00 akpm@osdl.org +1 -1 # Fix early parallel make failures # # scripts/Makefile.build # 2004/03/16 02:29:21-08:00 akpm@osdl.org +1 -1 # Fix early parallel make failures # # Makefile # 2004/03/16 02:29:21-08:00 akpm@osdl.org +23 -18 # Fix early parallel make failures # # Documentation/DocBook/Makefile # 2004/03/16 02:43:52-08:00 akpm@osdl.org +1 -1 # Fix early parallel make failures # # scripts/basic/Makefile # 2004/03/16 07:14:58-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/scripts/basic/Makefile # # ChangeSet # 2004/03/16 07:07:38-08:00 benh@kernel.crashing.org # [PATCH] g5: Fix iommu vs. pci_device_to_OF_node # # The g5 iommu code would fill the "iommu_table" member of whatever # device node was pointed to by pcidev->sysdata during boot. However, # the ppc64 kernel fills that with a pointer to the PHB node which is # later replaced "lazily" with a pointer to the real node when calling # pci_device_to_OF_node(). In this case, we were thus "losign" the # iommu_table pointer. Typical symptom: loss of the SATA when looking # at it's /proc entry. # # This fixes it by forcing the update to the final sysdata pointer # when filling up the iommu_table pointers. The "lazy" thing is useless # on pmac anyway. # # ChangeSet # 2004/03/16 11:31:31+01:00 vojtech@suse.cz # Merge bk://dtor.bkbits.net/input into suse.cz:/data/bk/input # # drivers/input/mouse/psmouse-base.c # 2004/03/16 11:31:28+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/03/16 11:10:38+01:00 vojtech@suse.cz # Merge suse.cz:/data/bk/linus into suse.cz:/data/bk/input # # init/main.c # 2004/03/16 11:10:35+01:00 vojtech@suse.cz +0 -0 # Auto merged # # drivers/char/Kconfig # 2004/03/16 11:10:34+01:00 vojtech@suse.cz +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/03/16 11:10:34+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/03/16 00:03:48-08:00 davidm@tiger.hpl.hp.com # ia64: Update defconfig # # arch/ia64/defconfig # 2004/03/16 00:03:41-08:00 davidm@tiger.hpl.hp.com +331 -213 # Update # # ChangeSet # 2004/03/16 02:39:14-05:00 jgarzik@redhat.com # [libata] bump libata and sata_sil driver versions # # drivers/scsi/sata_sil.c # 2004/03/16 02:35:49-05:00 jgarzik@redhat.com +1 -1 # [libata] bump libata and sata_sil driver versions # # drivers/scsi/libata.h # 2004/03/16 02:35:49-05:00 jgarzik@redhat.com +1 -1 # [libata] bump libata and sata_sil driver versions # # ChangeSet # 2004/03/15 23:31:37-08:00 kaos@sgi.com # [PATCH] ia64: Decode salinfo oemdata for SN2 via PROM # # SN2 platforms provide oemdata in salinfo records. The decode of that # oemdata is done via prom routines. This patch provides the interface # from user space through the kernel into the prom to do the oem decode. # # arch/ia64/sn/kernel/mca.c # 2004/03/15 10:05:52-08:00 kaos@sgi.com +66 -29 # ia64: Decode salinfo oemdata for SN2 via PROM # # ChangeSet # 2004/03/15 23:30:13-08:00 davidm@tiger.hpl.hp.com # ia64: Based on patch by Keith Owens: put stop bit to work around GCC problem. # # Apparently GCC sometimes fails to insert a stop-bit when re-using p14 # after the spinlock directives, even though the register is clearly marked # as "clobbered". # # include/asm-ia64/spinlock.h # 2004/03/15 23:30:06-08:00 davidm@tiger.hpl.hp.com +2 -2 # Put stop-bit after brl.cond/brl.call to work around GCC limitation. # # ChangeSet # 2004/03/15 23:21:48-08:00 hch@lst.de # [PATCH] ia64: update simscsi to 2.6 scsi APIs # # Use the proper (and cleaner) probing API instead of the old # scsi_module.c hack, don't use the typedefs I plan to kill in 2.7 and # mark everything static # # arch/ia64/hp/sim/simscsi.c # 2004/03/15 06:20:36-08:00 hch@lst.de +47 -48 # ia64: update simscsi to 2.6 scsi APIs # # BitKeeper/deleted/.del-simscsi.h~7bbe5e65bd3b62b6 # 2004/03/15 23:21:41-08:00 hch@lst.de +0 -0 # Delete: arch/ia64/hp/sim/simscsi.h # # ChangeSet # 2004/03/15 22:39:06-08:00 davidm@tiger.hpl.hp.com # Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5 # into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5 # # arch/ia64/Kconfig # 2004/03/15 22:39:00-08:00 davidm@tiger.hpl.hp.com +0 -0 # Auto merged # # ChangeSet # 2004/03/15 22:34:08-08:00 bjorn.helgaas@hp.com # [PATCH] ia64: update ia64/Kconfig # # This Kconfig patch basically just makes ia64 look a little more like i386: # - moves system type above processor type # - moves PM & ACPI to a new top-level menu # - moves PCI/PCMCIA to a new top-level menu # # arch/ia64/Kconfig # 2004/03/15 09:15:31-08:00 bjorn.helgaas@hp.com +99 -87 # ia64: update ia64/Kconfig # # ChangeSet # 2004/03/15 22:33:05-08:00 davidm@tiger.hpl.hp.com # ia64: Forward-port hp-agp.c fix from 2.4 # # See this ChangeSet: # # http://lia64.bkbits.net:8080/linux-ia64-2.4/cset@40524248tkgE0RDYQL0IyiAdFxo_Ew # # drivers/char/agp/hp-agp.c # 2004/03/15 09:41:03-08:00 davidm@hpl.hp.com +84 -28 # ia64: Forward-port hp-agp.c fixes from 2.4 # # ChangeSet # 2004/03/15 22:24:32-08:00 jbarnes@sgi.com # [PATCH] ia64: kill CONFIG_IA64_MCA # # The MCA code is now slim enough that there isn't much point in keeping # CONFIG_IA64_MCA anymore. # # arch/ia64/sn/kernel/setup.c # 2004/03/15 06:19:50-08:00 jbarnes@sgi.com +0 -3 # ia64: kill CONFIG_IA64_MCA # # arch/ia64/mm/init.c # 2004/03/15 06:20:43-08:00 jbarnes@sgi.com +0 -4 # ia64: kill CONFIG_IA64_MCA # # arch/ia64/kernel/smpboot.c # 2004/03/15 06:20:27-08:00 jbarnes@sgi.com +0 -2 # ia64: kill CONFIG_IA64_MCA # # arch/ia64/kernel/setup.c # 2004/03/15 06:20:19-08:00 jbarnes@sgi.com +0 -2 # ia64: kill CONFIG_IA64_MCA # # arch/ia64/kernel/efi.c # 2004/03/15 06:20:10-08:00 jbarnes@sgi.com +0 -4 # ia64: kill CONFIG_IA64_MCA # # arch/ia64/kernel/Makefile # 2004/03/15 06:17:01-08:00 jbarnes@sgi.com +1 -2 # ia64: kill CONFIG_IA64_MCA # # arch/ia64/Kconfig # 2004/03/15 06:21:32-08:00 jbarnes@sgi.com +0 -7 # ia64: kill CONFIG_IA64_MCA # # ChangeSet # 2004/03/15 22:22:13-08:00 bjorn.helgaas@hp.com # [PATCH] ia64: move consistent_dma_mask to the generic device # # The patch that moved and renamed consistent_dma_mask neglected # to fix up arch/ia64/hp/common/sba_iommu.c. # # arch/ia64/hp/common/sba_iommu.c # 2004/03/15 06:51:33-08:00 bjorn.helgaas@hp.com +3 -3 # ia64: move consistent_dma_mask to the generic device # # ChangeSet # 2004/03/15 22:20:48-08:00 pfg@sgi.com # [PATCH] ia64: fix missing braces in SN2 console code # # The last mod to fix the staircase printing - missed some bracing... # # drivers/char/sn_serial.c # 2004/03/15 06:28:24-08:00 pfg@sgi.com +2 -1 # ia64: fix missing braces in SN2 console code # # ChangeSet # 2004/03/15 22:18:13-08:00 mort@wildopensource.com # [PATCH] ia64: Update SN2 defconfig # # # arch/ia64/configs/sn2_defconfig # 2004/03/15 05:55:41-08:00 mort@wildopensource.com +420 -156 # ia64: Update SN2 defconfig # # ChangeSet # 2004/03/15 22:17:27-08:00 jsm@udlkern.fc.hp.com # yia64: Fix show_mem() panic # # arch/ia64/mm/init.c # 2004/03/14 20:55:08-08:00 jsm@udlkern.fc.hp.com +4 -1 # ia64: Fix show_mem panic # # arch/ia64/mm/discontig.c # 2004/03/11 22:15:26-08:00 jsm@udlkern.fc.hp.com +2 -0 # ia64: Fix show_mem panic # # arch/ia64/mm/contig.c # 2004/03/11 21:59:24-08:00 jsm@udlkern.fc.hp.com +2 -0 # ia64: Fix show_mem panic # # ChangeSet # 2004/03/12 15:09:53-08:00 bjorn.helgaas@hp.com # [PATCH] ia64: clean up ACPI GSI/IRQ conversions (ia64 part) # # Add "acpi_gsi_to_irq()" as a generic replacement for "acpi_irq_to_vector()". # This converts from an ACPI global system interrupt number to a Linux IRQ. # Also, convert ia64-specific terminology to use GSI when appropriate. # # include/asm-ia64/acpi.h # 2004/03/12 04:32:41-08:00 bjorn.helgaas@hp.com +2 -1 # ia64: clean up ACPI GSI/IRQ conversions (ia64 part) # # arch/ia64/kernel/acpi.c # 2004/03/12 04:32:11-08:00 bjorn.helgaas@hp.com +18 -0 # ia64: clean up ACPI GSI/IRQ conversions (ia64 part) # # ChangeSet # 2004/03/12 13:51:14+01:00 oliver@neukum.org # input: fixes in wacom.c # -use GFP_KERNEL where SLAB_ATOMIC is not needed # -fix count bug in open() error path # # drivers/usb/input/wacom.c # 2004/03/12 13:51:09+01:00 oliver@neukum.org +4 -2 # input: fixes in wacom.c # -use GFP_KERNEL where SLAB_ATOMIC is not needed # -fix count bug in open() error path # # ChangeSet # 2004/03/11 16:39:08-08:00 david-b@pacbell.net # [PATCH] USB Gadget: add "gadget_chips.h" # # This adds standard gadget_is_*() calls. Gadget drivers using # those calls can get rid of some inlined #ifdefs, and will also # be able to do more "late binding" to their hardware. # # # Define gadget_is_*() calls, to help do late binding to USB controllers. # # Current gadget drivers expect to know at compile time what hardware # they'll bind to. That's not very friendly to a generic PDA distro, # which might prefer to defer such choices to run time. # # These macros let drivers change that code from inlined #ifdefs (ugh) to # normal C statements (looks much nicer), so making those "what hardware" # policy choices at run time gets easier. # # drivers/usb/gadget/gadget_chips.h # 2004/03/10 17:45:51-08:00 david-b@pacbell.net +57 -0 # USB Gadget: add "gadget_chips.h" # # drivers/usb/gadget/gadget_chips.h # 2004/03/10 17:45:51-08:00 david-b@pacbell.net +0 -0 # BitKeeper file /home/greg/linux/BK/usb-2.6/drivers/usb/gadget/gadget_chips.h # # ChangeSet # 2004/03/12 00:29:52+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # init/main.c # 2004/03/12 00:29:49+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/03/11 02:27:59-05:00 dtor_core@ameritech.net # Input: if Synaptics' absolute mode is disabled make sure that # touchpad is reset back to relative mode and gestures # (taps) are enabled # # drivers/input/mouse/synaptics.h # 2004/03/10 21:27:47-05:00 dtor_core@ameritech.net +1 -0 # Add synaptics_reset() # # drivers/input/mouse/synaptics.c # 2004/03/10 21:27:47-05:00 dtor_core@ameritech.net +7 -1 # Add synaptics_reset() to reset touchpad back into relative mode # # drivers/input/mouse/psmouse-base.c # 2004/03/10 21:27:47-05:00 dtor_core@ameritech.net +4 -0 # If Synaptics' absolute mode is disabled make sure that touchpad # is reset back to relative mode # # ChangeSet # 2004/03/11 02:20:12-05:00 dtor_core@ameritech.net # Input: do a full reset of Synaptics touchpad if extended protocol # probes failed, otherwise trackpoint on the pass-through port # may stop working (reset-disable isn't enough to revive it) # # drivers/input/mouse/synaptics.c # 2004/03/10 21:19:57-05:00 dtor_core@ameritech.net +1 -12 # Use psmouse_reset instead of local function to reset the device # # drivers/input/mouse/psmouse.h # 2004/03/10 21:19:57-05:00 dtor_core@ameritech.net +1 -0 # Add psmouse_reset # # drivers/input/mouse/psmouse-base.c # 2004/03/10 21:19:57-05:00 dtor_core@ameritech.net +21 -2 # - implement psmouse_reset() # - do a full reset if extended protocol probes fail with Synaptics, # otherwise trackpoint on the pass-through port may not work # # ChangeSet # 2004/03/11 02:16:51-05:00 dtor_core@ameritech.net # Input: when disconnecting PS/2 mouse give protocol's disconnect # handler chance to run before starting ignoring mouse data. # Otherwise interrupt handler will discard all ACKs and the # very first command in cleanup sequence will fail (Synaptics # was failing to return to relative mode on module unload). # # drivers/input/mouse/psmouse.h # 2004/03/10 21:16:31-05:00 dtor_core@ameritech.net +2 -2 # Rename PSMOUSE_NEW_DEVICE to PSMOUSE_CMD_MODE, trailing whitespace fix. # # drivers/input/mouse/psmouse-base.c # 2004/03/10 21:16:31-05:00 dtor_core@ameritech.net +5 -3 # When disconnecting mouse give disconnect handler chance to run # before starting ignoring mouse data. # # ChangeSet # 2004/03/10 14:50:30-08:00 pmarques@grupopie.com # [PATCH] USB: usblp.c (Was: usblp_write spins forever after an error) # # Paulo Marques wrote: # # > David Woodhouse wrote: # > # >> On Thu, 2004-03-04 at 12:33 +0000, Paulo Marques wrote: # >> # >>> Yes, unfortunately it did went into 2.6.4-rc1. However it is already # >>> corrected in 2.6.4-rc2. Luckily it didn't went into any "non-rc" # >>> official release. # >>> # >>> Please try 2.6.4-rc2, and check to see if the bug went away... # >>> # >> # >> Seems to work; thanks. Does this need backporting to 2.4 too? # >> # > # > # > Unfortunately this isn't over yet. # > # > I got suspicious about this bug fix, because I *did* test my patch # > before submitting it and the kernel that didn't work before, worked fine # > with my patch. # > # > But now it seems that it is the other way around. After a few digging I # > found out the problem: # > # > The application that I was testing with uses the usblp handle with # > non-blocking I/O . # > # > So my patch does work for non-blocking I/O uses of the port, but wrecks # > the normal blocking mode. # > # > I've already produced a version that works for both cases. I'll just # > clean it up a bit and submit it to 2.4 and 2.6 kernels. # # # Here it is. # # The patch is only one line for 2.6.4-rc2. (I also did a little formatting # adjustment to better comply with CodingStyle) # # For the 2.4.26-pre1 kernel, I also backported the return codes correction patch # from Oliver Neukum. # # # The problem with the write function was that, in non-blocking mode, after # submitting the first urb, the function would return with -EAGAIN, not reporting # to the application that in fact it had already sent "transfer_length" bytes. # This way the application would have to send the data *again* causing lots of # errors. # # It did return the correct amount with my first patch, because the writecount was # being updated on the end of the loop. However this was wrong for blocking I/O. # # The "transfer_length" local variable is still needed because if we used the # transfer_buffer_length field from the urb, then on a second call to write, if # the urb was still pending (in non-blocking mode), the write would return an # incorrect amount of data written. # # Anyway, this time I tested it using blocking and non-blocking I/O and it works # for both cases. Even better, this patch only changes the behaviour for # non-blocking I/O, and keeps the same behaviour for the more usual blocking I/O # (at least on kernel 2.6). # # drivers/usb/class/usblp.c # 2004/03/05 09:10:30-08:00 pmarques@grupopie.com +5 -2 # USB: usblp.c (Was: usblp_write spins forever after an error) # # ChangeSet # 2004/03/10 13:44:37-08:00 stern@rowland.harvard.edu # [PATCH] USB: Altsetting/interface update for USB image drivers # # This patch contains minute updates for the hpusbscsi, mdc800, and microtek # drivers. Only two things are worth noting. In the mdc800 driver I # removed some unnecessary calls to usb_driver_claim_interface(), # usb_driver_release_interface(), and usb_set_interface(). Likewise, in the # microtek driver I removed an unnecessary call to usb_set_interface(). # # drivers/usb/image/microtek.c # 2004/03/09 08:50:21-08:00 stern@rowland.harvard.edu +3 -18 # USB: Altsetting/interface update for USB image drivers # # drivers/usb/image/mdc800.c # 2004/03/09 08:46:49-08:00 stern@rowland.harvard.edu +1 -10 # USB: Altsetting/interface update for USB image drivers # # drivers/usb/image/hpusbscsi.c # 2004/03/09 08:41:37-08:00 stern@rowland.harvard.edu +1 -1 # USB: Altsetting/interface update for USB image drivers # # ChangeSet # 2004/03/10 13:42:31-08:00 henning@wh9.tu-dresden.de # [PATCH] USB: unusual_devs.h update # # *** linux-2.6.3/drivers/usb/storage/unusual_devs.h 2004-02-18 04:59:06.000000000 +0100 # # drivers/usb/storage/unusual_devs.h # 2004/03/04 06:24:56-08:00 henning@wh9.tu-dresden.de +7 -0 # USB: unusual_devs.h update # # ChangeSet # 2004/03/10 13:32:02-08:00 david-b@pacbell.net # [PATCH] USB gadget: gadget zero, simplified controller-specific configuration # # This removes several controller-specific #define, and # converts to using the config_buf utilities. Depends # on the patch I submitted yesterday. Looking simpler! # # # Simplify "gadget zero" compile-time configuration. # # This removes several controller-specific compile-time config options; # the others are about to be autoconfigured. # # - HIGHSPEED replaced by CONFIG_USB_GADGET_DUALSPEED # - Default to self-powered operation # - There's no UI for remote wakeup # # It also uses the new config_buf utilities, so it's a bit easier to see # what's really going on (this driver implements four configurations). # # drivers/usb/gadget/zero.c # 2004/03/09 10:14:18-08:00 david-b@pacbell.net +93 -100 # USB gadget: gadget zero, simplified controller-specific configuration # # drivers/usb/gadget/Makefile # 2004/03/09 09:15:26-08:00 david-b@pacbell.net +1 -1 # USB gadget: gadget zero, simplified controller-specific configuration # # ChangeSet # 2004/03/10 13:31:40-08:00 david-b@pacbell.net # [PATCH] USB: usb buffer allocation shouldn't require DMA # # Deepak's recent dma_pool changes accidentally assumed that # all HCDs use DMA. The fix is simple: use kmalloc/kfree # when there's no DMA. # # drivers/usb/core/buffer.c # 2004/03/09 06:01:10-08:00 david-b@pacbell.net +14 -2 # USB: usb buffer allocation shouldn't require DMA # # ChangeSet # 2004/03/10 13:31:12-08:00 david-b@pacbell.net # [PATCH] USB: usbtest updates (new firmware) # # This includes some small updates to "usbtest", mostly # from Martin Diehl. Please merge. # # # # usbtest updates, supporting new firmware # # - Support the new usbtest_fw-20040305 EZ-USB firmware, # which renumerates and handles full speed ISO transfers. # (From Martin Diehl.) # # - Minor cleanups: use dev_dbg(), let some slightly-off # devices work in the control queueing test. # # - Be pickier about unlink tests: insist that async # and sync unlinks give the appropriate fault code. # # drivers/usb/misc/usbtest.c # 2004/03/05 12:25:56-08:00 david-b@pacbell.net +23 -15 # USB: usbtest updates (new firmware) # # ChangeSet # 2004/03/10 13:30:47-08:00 david-b@pacbell.net # [PATCH] USB: usb_unlink_urb() has distinct "not linked" fault # # This gets rid of an often-bogus diagnostic, and lets # at least the unlink test code recover reasonably when # it hits that brief window while another CPU has gotten # the complete() callback but hasn't yet resubmitted. # # # # Return distinct code when unlinking an urb that's not linked. # # This lets drivers handle this fault sanely, when they need to. # Gets rid of annoying non-error messages about drivers that unlink # in disconnect() even when the urb isn't linked. # # drivers/usb/core/hcd.c # 2004/03/07 11:29:08-08:00 david-b@pacbell.net +2 -2 # USB: usb_unlink_urb() has distinct "not linked" fault # # ChangeSet # 2004/03/10 13:30:20-08:00 david-b@pacbell.net # [PATCH] USB gadget: dualspeed {run,compile}-time flags # # This is the first several autoconfig patches; please merge. # This particular one abstracts dual-speed (high and full) # support. # # # Support some more autoconfiguration for gadget drivers. # # Run-time: # * Add gadget->is_dualspeed flag for controllers to set. # * Tested by "ethernet" gadget, to decide whether certain # operations are errors or not. # * Turned on by net2280. # # Compile-time # * Generic CONFIG_USB_GADGET_DUALSPEED, not net2280-specific. # * Used by "ethernet" gadget, to decide whether to # include extra code and data for dual-speed support. # * Turned on by net2280. # # The basic idea behind this, and other autoconfig patches yet to come, # is minimizing the controller-specific compile-time configuration # needed by gadget drivers. # # include/linux/usb_gadget.h # 2004/03/08 09:51:12-08:00 david-b@pacbell.net +3 -0 # USB gadget: dualspeed {run,compile}-time flags # # drivers/usb/gadget/net2280.c # 2004/03/07 12:37:35-08:00 david-b@pacbell.net +1 -0 # USB gadget: dualspeed {run,compile}-time flags # # drivers/usb/gadget/ether.c # 2004/03/08 10:19:56-08:00 david-b@pacbell.net +15 -13 # USB gadget: dualspeed {run,compile}-time flags # # drivers/usb/gadget/Kconfig # 2004/03/08 10:19:23-08:00 david-b@pacbell.net +8 -0 # USB gadget: dualspeed {run,compile}-time flags # # ChangeSet # 2004/03/10 12:42:44-08:00 david-b@pacbell.net # [PATCH] USB: usbcore doc update # # Some doc updates, mostly from Alan Stern, clarifying # quetions folk have asked recently about unlinking # and about iso transfers. # # include/linux/usb.h # 2004/03/08 09:27:12-08:00 david-b@pacbell.net +14 -13 # USB: usbcore doc update # # drivers/usb/core/urb.c # 2004/03/08 09:33:41-08:00 david-b@pacbell.net +54 -11 # USB: usbcore doc update # # ChangeSet # 2004/03/10 12:42:17-08:00 rddunlap@osdl.org # [PATCH] USB: fix net2280 section usage # # net2280_remove() is called by net2280_probe() so it # shouldn't be marked as __exit; # # drivers/usb/gadget/net2280.c # 2004/03/07 15:59:18-08:00 rddunlap@osdl.org +2 -2 # USB: fix net2280 section usage # # ChangeSet # 2004/03/10 12:23:05-08:00 bunk@fs.tum.de # [PATCH] USB: remove USB_SCANNER MAINTAINERS entry # # When sending the patch to remove USB_SCANNER, I forgot to remove the # MAINTAINERS entry. # # MAINTAINERS # 2004/03/08 17:44:30-08:00 bunk@fs.tum.de +0 -8 # USB: remove USB_SCANNER MAINTAINERS entry # # ChangeSet # 2004/03/10 12:22:42-08:00 bunk@fs.tum.de # [PATCH] USB_STORAGE: remove a comment # # In 2.6, USB_STORAGE selects SCSI, so there's no longer a need for this # comment. # # drivers/usb/storage/Kconfig # 2004/03/08 17:31:42-08:00 bunk@fs.tum.de +0 -2 # USB_STORAGE: remove a comment # # ChangeSet # 2004/03/10 12:22:13-08:00 oliver@neukum.org # [PATCH] USB: wacom driver fixes # # the same error code path as in the other drivers. # In addition I added the endianness macros. They save cycles # in interrupt. # # -use endian macros # -use GFP_KERNEL where SLAB_ATOMIC is not needed # -fix count bug in open() error path # # drivers/usb/input/wacom.c # 2004/03/08 15:36:35-08:00 oliver@neukum.org +13 -9 # USB: wacom driver fixes # # ChangeSet # 2004/03/10 12:21:49-08:00 oliver@neukum.org # [PATCH] USB: bug in error code path of kbtab driver # # this fixes # - a leak in the error code path of open() # - removes SLAB_ATOMIC where it isn't needed # - uses le16_to_cpu (yes Pete, unaligned access is taken care of) # # drivers/usb/input/kbtab.c # 2004/03/08 05:38:44-08:00 oliver@neukum.org +8 -4 # USB: bug in error code path of kbtab driver # # ChangeSet # 2004/03/10 12:21:20-08:00 oliver@neukum.org # [PATCH] USB: fixes for aiptek driver # # - don't pass buffers allocated on stack to the sync helpers # - check errors in probe # - fix count in open # - proper macros # # drivers/usb/input/aiptek.c # 2004/03/08 06:33:36-08:00 oliver@neukum.org +40 -17 # USB: fixes for aiptek driver # # ChangeSet # 2004/03/10 12:20:55-08:00 stern@rowland.harvard.edu # [PATCH] USB: Remove interface/altsetting assumptions from usb-midi # # This patch makes the usb-midi driver use usb_ifnum_to_if(), thereby # removing assumptions about which interface is stored in which array entry. # Similarly, it stores the bAlternateSetting value rather than the array # index for an altsetting entry. # # Like the earlier patch for the audio driver, this also changes the driver # to use the in-memory rawdescriptor buffer rather than reading a # configuration descriptor from the device. Unlike that earlier patch, this # time there's no question that the deallocation of the buffer is done # correctly. (I suspect the audio driver just left out a call to kfree.) # # drivers/usb/class/usb-midi.c # 2004/03/08 08:52:16-08:00 stern@rowland.harvard.edu +28 -65 # USB: Remove interface/altsetting assumptions from usb-midi # # ChangeSet # 2004/03/10 12:20:24-08:00 oliver@neukum.org # [PATCH] USB: locking fix for pid.c # # you forgot to drop a spinlock before you report an error. A deadlock # will occur. # # drivers/usb/input/pid.c # 2004/03/07 19:52:14-08:00 oliver@neukum.org +1 -0 # USB: locking fix for pid.c # # ChangeSet # 2004/03/10 11:55:44-08:00 lists@mdiehl.de # [PATCH] USB: fix stack usage in pl2303 driver # # Arghh - while trying to follow this I just realized the pl2303 is DMA'ing # to the stack - not good! # Could you please just try with the patch below. I'm not sure if this might # cause the MA620 trouble but it's definedly a bug and maybe it improves # things for you... # # drivers/usb/serial/pl2303.c # 2004/03/04 00:42:18-08:00 lists@mdiehl.de +7 -1 # USB: fix stack usage in pl2303 driver # # ChangeSet # 2004/03/10 09:05:31+01:00 davidm@hpl.hp.com # input: When reading input reports from a device via the ctrl pipe, # set idle time of the device. This makes buggy devices which # take the idle time into account for the ctrl pipe work. # # drivers/usb/input/hid-core.c # 2004/03/10 09:05:24+01:00 davidm@hpl.hp.com +21 -2 # input: When reading input reports from a device via the ctrl pipe, # set idle time of the device. This makes buggy devices which # take the idle time into account for the ctrl pipe work. # # ChangeSet # 2004/03/10 09:02:48+01:00 davidm@hpl.hp.com # input: Avoid an endless loop in hid-core.c, if a device has some # empty reports. # # drivers/usb/input/hid-input.c # 2004/03/10 09:02:42+01:00 davidm@hpl.hp.com +3 -1 # input: Avoid an endless loop in hid-core.c, if a device has some # empty reports. # # ChangeSet # 2004/03/09 17:25:56-08:00 david-b@pacbell.net # [PATCH] USB: clarify CONFIG_USB_GADGET # # Marc-Christian Petersen wrote: # > # > I think the attached patch is needed to stop showing us USB Gadget support if # > Support for USB is disabled. # # No it isn't. But maybe the attached patch would clarify what's # really going on: CONFIG_USB is the host side, and CONFIG_USB_GADGET # is the peripheral side. # # drivers/usb/gadget/Kconfig # 2004/03/07 07:05:25-08:00 david-b@pacbell.net +10 -1 # USB: clarify CONFIG_USB_GADGET # # drivers/usb/Kconfig # 2004/03/07 06:42:33-08:00 david-b@pacbell.net +21 -17 # USB: clarify CONFIG_USB_GADGET # # ChangeSet # 2004/03/09 17:25:33-08:00 david-b@pacbell.net # [PATCH] USB: gadget config buf utilities # # Somehow I sent you a version of this code with a misplaced # semicolon ... it makes for awkward failures! # # Please merge. Bad semicolon! # # drivers/usb/gadget/config.c # 2004/03/05 08:00:10-08:00 david-b@pacbell.net +1 -1 # USB: gadget config buf utilities # # ChangeSet # 2004/03/09 17:25:08-08:00 david-b@pacbell.net # [PATCH] USB: usbnet and ALI M5632 # # Some of the 480 Mbit/sec USB host-to-host links have ALI # chips in them. They seem to work with no problem, given # this patch, even when the ends talk different speed. # # drivers/usb/net/usbnet.c # 2004/03/04 06:24:59-08:00 david-b@pacbell.net +24 -0 # USB: usbnet and ALI M5632 # # drivers/usb/net/Kconfig # 2004/03/04 06:21:32-08:00 david-b@pacbell.net +8 -0 # USB: usbnet and ALI M5632 # # ChangeSet # 2004/03/09 14:12:30-08:00 petkan@nucleusys.com # [PATCH] USB: 2.6 pegasus.h updates # # a few more IDs added, could you please apply it? # # drivers/usb/net/pegasus.h # 2004/03/09 10:48:49-08:00 petkan@nucleusys.com +8 -0 # USB: 2.6 pegasus.h updates # # ChangeSet # 2004/03/09 14:12:08-08:00 s.doyon@videotron.ca # [PATCH] USB brlvger: Driver obsoleted by rewrite using usbfs # # We have rewritten the brlvger (Tieman Voyager USB Braille display) driver # so that it works from user-space through usbfs. It appears to work just as # well as the in-kernel driver. # # The brlvger driver in the 2.6.x kernel is now obsolete and should be # removed. The attached patch against 2.6.3 does this. Please apply. # NB: The following files are completely deleted: # Documentation/usb/brlvger.txt # drivers/usb/misc/brlvger.c # include/linux/brlvger.h # # The new Voyager driver is available (stil under GPL) as part of BRLTTY, # starting with version 3.5pre1 (http://mielke.cc/brltty). # Thanks to Dave Mielke who implemented BRLTTY's usbfs functionality, among # lots of other stuff. # # drivers/usb/misc/Makefile # 2004/03/09 01:50:35-08:00 s.doyon@videotron.ca +0 -1 # USB brlvger: Driver obsoleted by rewrite using usbfs # # drivers/usb/misc/Kconfig # 2004/03/09 01:51:14-08:00 s.doyon@videotron.ca +0 -11 # USB brlvger: Driver obsoleted by rewrite using usbfs # # drivers/usb/Makefile # 2004/03/09 01:52:05-08:00 s.doyon@videotron.ca +0 -1 # USB brlvger: Driver obsoleted by rewrite using usbfs # # MAINTAINERS # 2004/03/09 01:48:11-08:00 s.doyon@videotron.ca +0 -7 # USB brlvger: Driver obsoleted by rewrite using usbfs # # CREDITS # 2004/03/09 04:29:41-08:00 s.doyon@videotron.ca +0 -10 # USB brlvger: Driver obsoleted by rewrite using usbfs # # BitKeeper/deleted/.del-brlvger.txt~281c551849400437 # 2004/03/09 14:11:47-08:00 s.doyon@videotron.ca +0 -0 # Delete: Documentation/usb/brlvger.txt # # BitKeeper/deleted/.del-brlvger.h~24510706dc74b0b9 # 2004/03/09 14:11:47-08:00 s.doyon@videotron.ca +0 -0 # Delete: include/linux/brlvger.h # # BitKeeper/deleted/.del-brlvger.c~af9a17941a445cad # 2004/03/09 14:11:47-08:00 s.doyon@videotron.ca +0 -0 # Delete: drivers/usb/misc/brlvger.c # # ChangeSet # 2004/03/09 09:47:21-08:00 greg@kroah.com # [PATCH] USB: fix compiler warning in hfc_usb.c driver. # # drivers/isdn/hisax/hfc_usb.c # 2004/03/09 01:46:18-08:00 greg@kroah.com +1 -1 # USB: fix compiler warning in hfc_usb.c driver. # # ChangeSet # 2004/03/09 09:47:03-08:00 stern@rowland.harvard.edu # [PATCH] USB: Interface/altsetting update for ISDN hisax driver # # On Mon, 8 Mar 2004, Greg KH wrote: # # > Oh, could you look at drivers/isdn/hisax/hfc_usb.c if you get a chance? # > I tried to figure out the mess there with regards to act_altsetting, but # > gave up :( # # You're right, it is a mess. Beats me why they didn't use a plain old # "for" statement to do that altsetting loop. Probably the most confusing # part is where the code needlessly resets intf->act_altsetting. # # Anyway, this patch sets things right. I haven't tried to compile it, but # any errors ought to be pretty small, obvious, and easy to fix. # # My intention was to go through the files under driver/usb (in alphabetical # order!) and then do the ones outside that subtree -- I've got a little # list. But it's no problem to take care of this one first. # # drivers/isdn/hisax/hfc_usb.c # 2004/03/09 02:41:16-08:00 stern@rowland.harvard.edu +16 -13 # USB: Interface/altsetting update for ISDN hisax driver # # ChangeSet # 2004/03/08 15:07:52-08:00 stern@rowland.harvard.edu # [PATCH] USB UHCI: restore more state following PM resume # # Some systems don't save the internal state of the UHCI registers across a # PM suspend/resume cycle very well. This patch saves & restores the # Frame Number and the Framelist Base Address registers (in addition to the # Interrupt Enable register, which was added separately in a recent patch.) # # drivers/usb/host/uhci-hcd.h # 2004/03/08 04:04:32-08:00 stern@rowland.harvard.edu +1 -0 # USB UHCI: restore more state following PM resume # # drivers/usb/host/uhci-hcd.c # 2004/03/08 04:11:22-08:00 stern@rowland.harvard.edu +10 -4 # USB UHCI: restore more state following PM resume # # ChangeSet # 2004/03/08 15:07:27-08:00 stern@rowland.harvard.edu # [PATCH] USB: Remove interface/altsettings assumption from audio driver # # This patch updates the USB audio class driver to use the usb_ifnum_to_if() # and usb_altnum_to_altsetting() routines, thereby removing assumptions # about which interface or altsetting is stored in which array entry. # # It also simplifies the driver's probe() routine by using the raw # configuration descriptor already loaded into memory instead of reading the # descriptor from the device. Now, either the current driver has a bug and # never deallocates the buffer used to hold the descriptor, or else I've # introduced a double-free error. There's no obvious place where the buffer # gets freed, but it's hard to be certain. # # It would be good if someone could try out this patch. I can't test it, # not having any USB audio devices handy. If the double-free error is # present, it will show up when the device is disconnected and the # configuration data is released. # # drivers/usb/class/audio.c # 2004/03/08 03:11:28-08:00 stern@rowland.harvard.edu +61 -74 # USB: Remove interface/altsettings assumption from audio driver # # ChangeSet # 2004/03/08 15:07:07-08:00 stern@rowland.harvard.edu # [PATCH] USB: Update USB class drivers # # This patch makes the necessary updates to the bluetty, cdc-acm, and usblp # class drivers for the new interface/altsetting paradigm. The changes are # quite small. # # Unfortunately, the audio and usb-midi drivers are in much worse shape. # They will require more in-depth hacking, to come later... # # drivers/usb/class/usblp.c # 2004/03/05 03:40:58-08:00 stern@rowland.harvard.edu +6 -3 # USB: Update USB class drivers # # drivers/usb/class/cdc-acm.c # 2004/03/05 03:16:32-08:00 stern@rowland.harvard.edu +3 -3 # USB: Update USB class drivers # # drivers/usb/class/bluetty.c # 2004/03/05 03:11:33-08:00 stern@rowland.harvard.edu +1 -1 # USB: Update USB class drivers # # ChangeSet # 2004/03/08 11:53:44-08:00 greg@kroah.com # USB: fix usb-serial core to look at the proper interface descriptor # # drivers/usb/serial/usb-serial.c # 2004/03/08 11:53:38-08:00 greg@kroah.com +1 -1 # USB: fix usb-serial core to look at the proper interface descriptor # # ChangeSet # 2004/03/08 11:53:02-08:00 greg@kroah.com # USB: fix the pcwd_usb driver due to act_altsetting going away. # # drivers/char/watchdog/pcwd_usb.c # 2004/03/08 11:52:54-08:00 greg@kroah.com +1 -1 # USB: fix the pcwd_usb driver due to act_altsetting going away. # # ChangeSet # 2004/03/08 11:11:32-08:00 greg@kroah.com # merge fixups with irda usb code # # drivers/net/irda/stir4200.c # 2004/03/08 11:11:23-08:00 greg@kroah.com +0 -46 # merge fixups with irda usb code # # ChangeSet # 2004/03/08 11:00:29-08:00 greg@kroah.com # merge # # drivers/net/irda/stir4200.c # 2004/03/08 11:00:22-08:00 greg@kroah.com +46 -0 # merge # # drivers/usb/serial/keyspan.h # 2004/03/08 10:51:45-08:00 greg@kroah.com +0 -13 # Auto merged # # ChangeSet # 2004/03/08 14:32:00+01:00 vojtech@suse.cz # input: Fix oops (NULL pointer dereference) on resume in psmouse.c, # when the mouse goes away while sleeping. # # drivers/input/mouse/psmouse-base.c # 2004/03/08 14:31:55+01:00 vojtech@suse.cz +4 -2 # input: Fix oops (NULL pointer dereference) on resume in psmouse.c, # when the mouse goes away while sleeping. # # ChangeSet # 2004/03/08 14:09:15+01:00 szuk@telusplanet.net # input: Restore LED state in atkbd.c after resume. # # drivers/input/keyboard/atkbd.c # 2004/03/08 14:09:10+01:00 szuk@telusplanet.net +9 -0 # input: Restore LED state in atkbd.c after resume. # # ChangeSet # 2004/03/08 13:30:04+01:00 vojtech@suse.cz # input: Don't define DEBUG in hid-ff by default. It spews messgaes # even when no FF device is present. # # drivers/usb/input/hid-ff.c # 2004/03/08 13:29:59+01:00 vojtech@suse.cz +1 -1 # input: Don't define DEBUG in hid-ff by default. It spews messgaes # even when no FF device is present. # # ChangeSet # 2004/03/08 13:16:03+01:00 vojtech@suse.cz # input: Add a Chic gamepad into badpad quirk list. # # drivers/usb/input/hid-core.c # 2004/03/08 13:15:58+01:00 vojtech@suse.cz +4 -0 # input: Add a Chic gamepad into badpad quirk list. # # ChangeSet # 2004/03/08 12:51:07+01:00 sebek64@post.cz # input: Fix a memory leak in ns558.c # # drivers/input/gameport/ns558.c # 2004/03/08 12:51:01+01:00 sebek64@post.cz +1 -0 # input: Fix a memory leak in ns558.c # # ChangeSet # 2004/03/08 11:20:44+01:00 home@mdiehl.de # input: Add support for devices which need some padding at the # end of a HID report. # # drivers/usb/input/hid.h # 2004/03/08 11:20:39+01:00 home@mdiehl.de +1 -1 # input: Add support for devices which need some padding at the # end of a HID report. # # drivers/usb/input/hid-core.c # 2004/03/08 11:20:39+01:00 home@mdiehl.de +26 -10 # input: Add support for devices which need some padding at the # end of a HID report. # # ChangeSet # 2004/03/08 10:12:10+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # Documentation/kernel-parameters.txt # 2004/03/08 10:12:08+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/03/08 10:09:44+01:00 vojtech@suse.cz # input: Update the Wacom driver to latest version # from Ping Cheng from Wacom. # # drivers/usb/input/wacom.c # 2004/03/08 10:09:39+01:00 vojtech@suse.cz +143 -34 # input: Update the Wacom driver to latest version # from Ping Cheng from Wacom. # # drivers/usb/input/hid-core.c # 2004/03/08 10:09:39+01:00 vojtech@suse.cz +7 -1 # input: Update the Wacom driver to latest version # from Ping Cheng from Wacom. # # ChangeSet # 2004/03/05 09:29:47+01:00 rmk@arm.linux.org.uk # input: Fix i8042 PS/2 mouse on ARM. # # include/asm-arm/arch-shark/irqs.h # 2004/03/05 09:29:42+01:00 rmk@arm.linux.org.uk +2 -1 # input: Fix i8042 PS/2 mouse on ARM. # # include/asm-arm/arch-ebsa285/irqs.h # 2004/03/05 09:29:42+01:00 rmk@arm.linux.org.uk +2 -2 # input: Fix i8042 PS/2 mouse on ARM. # # drivers/input/serio/i8042-io.h # 2004/03/05 09:29:42+01:00 rmk@arm.linux.org.uk +3 -0 # input: Fix i8042 PS/2 mouse on ARM. # # ChangeSet # 2004/03/04 10:58:18+01:00 warp@mercury.d2dc.net # input: HID needs to distinguish between two types of A4Tech # two-wheel mice. # # drivers/usb/input/hid.h # 2004/03/04 10:58:13+01:00 warp@mercury.d2dc.net +10 -9 # input: HID needs to distinguish between two types of A4Tech # two-wheel mice. # # drivers/usb/input/hid-input.c # 2004/03/04 10:58:13+01:00 warp@mercury.d2dc.net +4 -3 # input: HID needs to distinguish between two types of A4Tech # two-wheel mice. # # drivers/usb/input/hid-core.c # 2004/03/04 10:58:13+01:00 warp@mercury.d2dc.net +2 -2 # input: HID needs to distinguish between two types of A4Tech # two-wheel mice. # # ChangeSet # 2004/03/04 09:21:42+01:00 john@fremlin.de # input: Add a NEC USB gamepad to badpad blacklist. # # drivers/usb/input/hid-core.c # 2004/03/04 09:21:37+01:00 john@fremlin.de +4 -0 # input: Add a NEC USB gamepad to badpad blacklist. # # ChangeSet # 2004/03/03 17:01:21-08:00 david-b@pacbell.net # [PATCH] USB: HCD names, for better troubleshooting # # See the attached patch -- which restores the behavior of usbcore # to what it had before "struct device.name" went away, in the # (typical) case of PCI devices. # # It makes the root hubs say what hardware they're actually using, # in the reasonably typical case that PCI names are in use, rather # than being just generic (and hence almost useless) strings. This # sort of information can really help when troubleshooting. # # drivers/usb/core/hcd-pci.c # 2004/02/28 04:16:01-08:00 david-b@pacbell.net +4 -0 # USB: HCD names, for better troubleshooting # # ChangeSet # 2004/03/03 12:54:26-08:00 greg@kroah.com # [PATCH] USB: remove intf->act_altsetting altogether from the USB core and usb.h # # include/linux/usb.h # 2004/03/03 04:48:13-08:00 greg@kroah.com +0 -5 # USB: remove intf->act_altsetting altogether from the USB core and usb.h # # drivers/usb/core/message.c # 2004/03/03 04:48:13-08:00 greg@kroah.com +0 -3 # USB: remove intf->act_altsetting altogether from the USB core and usb.h # # ChangeSet # 2004/03/03 12:54:08-08:00 greg@kroah.com # [PATCH] USB: remove act_altsetting usages in more USB drivers # # drivers/usb/input/usbmouse.c # 2004/03/03 04:48:07-08:00 greg@kroah.com +1 -1 # USB: remove act_altsetting usages in more USB drivers # # drivers/usb/input/usbkbd.c # 2004/03/03 04:48:07-08:00 greg@kroah.com +1 -1 # USB: remove act_altsetting usages in more USB drivers # # drivers/net/irda/stir4200.c # 2004/03/03 04:48:07-08:00 greg@kroah.com +1 -2 # USB: remove act_altsetting usages in more USB drivers # # drivers/input/joystick/iforce/iforce-usb.c # 2004/03/03 04:48:07-08:00 greg@kroah.com +1 -1 # USB: remove act_altsetting usages in more USB drivers # # ChangeSet # 2004/03/03 12:53:48-08:00 greg@kroah.com # [PATCH] USB: remove act_altsetting usages in the remaining drivers/usb/ drivers # # drivers/usb/net/usbnet.c # 2004/03/03 04:47:59-08:00 greg@kroah.com +1 -1 # USB: remove act_altsetting usages in the remaining drivers/usb/ drivers # # drivers/usb/input/mtouchusb.c # 2004/03/03 04:47:59-08:00 greg@kroah.com +1 -1 # USB: remove act_altsetting usages in the remaining drivers/usb/ drivers # # drivers/usb/input/hid-core.c # 2004/03/03 04:47:59-08:00 greg@kroah.com +1 -1 # USB: remove act_altsetting usages in the remaining drivers/usb/ drivers # # drivers/usb/input/ati_remote.c # 2004/03/03 04:47:59-08:00 greg@kroah.com +1 -1 # USB: remove act_altsetting usages in the remaining drivers/usb/ drivers # # ChangeSet # 2004/03/03 12:53:25-08:00 stern@rowland.harvard.edu # [PATCH] USB: Convert usbtest to the new altsetting regime # # This patch converts the usbtest driver to the new way altsettings work. # The largest change is to remove the assumptions that altsetting numbers # lie in the correct range (a debugging message is logged if they don't but # execution doesn't stop) and that the array is sorted by number. # # drivers/usb/misc/usbtest.c # 2004/03/01 03:40:11-08:00 stern@rowland.harvard.edu +10 -14 # USB: Convert usbtest to the new altsetting regime # # ChangeSet # 2004/03/03 12:53:03-08:00 stern@rowland.harvard.edu # [PATCH] USB: Convert usb-storage to use cur_altsetting # # I'm beginning the process of converting device drivers to use # cur_altsetting with usb-storage, the one I know best. Only a few changes # are needed (and the first one isn't even really necessary). # # drivers/usb/storage/usb.c # 2004/03/01 03:40:11-08:00 stern@rowland.harvard.edu +6 -5 # USB: Convert usb-storage to use cur_altsetting # # ChangeSet # 2004/03/03 12:52:40-08:00 stern@rowland.harvard.edu # [PATCH] USB: Small improvements for devio.c # # devio.c doesn't need to be changed to support the new altsetting # mechanism, but while looking through it I noticed a couple of places that # could be improved slightly. Here they are, just removal of some redundant # tests (all altsettings for the same interface are guaranteed to have the # same bInterfaceNumber) and function calls. # # drivers/usb/core/devio.c # 2004/03/01 03:40:11-08:00 stern@rowland.harvard.edu +6 -15 # USB: Small improvements for devio.c # # ChangeSet # 2004/03/03 12:52:13-08:00 stern@rowland.harvard.edu # [PATCH] USB: Convert usbcore to use cur_altsetting # # This patch continues the work of as209 by converting the rest of usbcore # to use cur_altsetting in place of act_altsetting. The changes required # are fairly small, just in the sysfs attributes and hub configuration. # # drivers/usb/core/hub.c # 2004/03/01 03:40:11-08:00 stern@rowland.harvard.edu +6 -6 # USB: Convert usbcore to use cur_altsetting # # drivers/usb/core/driverfs.c # 2004/03/01 03:40:11-08:00 stern@rowland.harvard.edu +2 -6 # USB: Convert usbcore to use cur_altsetting # # ChangeSet # 2004/03/03 12:49:44-08:00 stern@rowland.harvard.edu # [PATCH] USB: Improve handling of altsettings # # On Sat, 21 Feb 2004, Greg KH wrote: # # > > One thing that would be good, whether this change gets made or not, is to # > > remove all assumptions from drivers about the order in which interfaces # > > are stored (use usb_ifnum_to_if()) and the order in which altsettings are # > > stored (replace intf.act_altsetting with a pointer and create # > > usb_altnum_to_alt() analogous to usb_ifnum_to_if()). There are plenty of # > > drivers that will need to be fixed up. # > # > I'd be glad to take patches to fix up any drivers that still have this # > problem right now. # # Here's a start. This patch begins the conversion process by adding # usbcore support for cur_altsetting and deprecating act_altsetting. # # So long as we assumed that altsetting numbers range from 0 to # num_altsetting-1 and that the number matches its index in the altsetting # array, there was no harm in using act_altsetting. But without that # assumption act_altsetting is merely an invitation to errors. Although the # kerneldoc says that act_altsetting is the _index_ of the active # altsetting, it's all too easy to confuse it with the _number_ of the # active altsetting. Using cur_altsetting instead (a pointer rather than a # number) will prevent that confusion. # # Until all the drivers have been converted to use cur_altsetting, the core # will have to maintain act_altsetting in parallel with it. Eventually we # will be able to remove act_altsetting, but fixing all the drivers will # take a while. # # Included in this patch: # # Add cur_altsetting to struct usb_interface and deprecate # act_altsetting. # # Add comments and kerneldoc explaining the changes. Also remove # the comments in front of struct usb_host_config (they seem to # have been left behind when usb_ch9.h was split out) and add # kerneldoc for that structure. # # Add usb_altnum_to_altsetting() to help look up altsettings based # on their number. # # Convert the usb_set_interface(), usb_set_configuration(), and # usb_reset_configuration() routines to support cur_altsetting # and act_altsetting in parallel. Convert a few others to use # cur_altsetting rather than act_altsetting. # # Rename a few local variables to make their meaning a little # clearer. It would be nice to change struct usb_host_interface # to something like usb_host_altsetting, but that's a patch for # another time. # # include/linux/usb.h # 2004/03/01 03:01:40-08:00 stern@rowland.harvard.edu +56 -20 # USB: Improve handling of altsettings # # drivers/usb/core/usb.c # 2004/03/01 03:01:40-08:00 stern@rowland.harvard.edu +35 -7 # USB: Improve handling of altsettings # # drivers/usb/core/message.c # 2004/03/01 03:01:40-08:00 stern@rowland.harvard.edu +44 -24 # USB: Improve handling of altsettings # # ChangeSet # 2004/03/03 11:16:57-08:00 stern@rowland.harvard.edu # [PATCH] USB: Don't add/del interfaces, register/unregister them # # On Fri, 27 Feb 2004, Greg KH wrote: # # > On Wed, Feb 25, 2004 at 10:05:37AM -0500, Alan Stern wrote: # > # > > Why would anyone want to do this, you ask? Well the USB subsystem does it # > > already. Each USB device can have several configurations, only one of # > > which is active at any time. Corresponding to each configuration is a set # > > of struct devices, and they (together with their embedded kobjects) are # > > allocated and initialized when the USB device is first detected. The # > > struct devices are add()'ed and del()'ed as configurations are activated # > > and deactivated, leading to just the sort of call sequence shown above. # > # > Then we need to fix this. # # The driver model does not support repeated device_add(), device_del(), # device_add(), device_del(), ... calls for the same device. But that's # what happens to an interface's embedded struct device when we change # configurations. # # Accordingly, this patch changes the device_add()/device_del() calls for # interfaces to device_register()/device_unregister(). When the interface # is unregistered the new code waits for the release method to run, so that # it will be safe to re-register the interface should the former # configuration be reinstated. # # Greg, please check this out to make sure I haven't made some dumb mistake. # It works on my system and it fixes a memory leak in the USB system. # # include/linux/usb.h # 2004/02/27 08:46:19-08:00 stern@rowland.harvard.edu +3 -0 # USB: Don't add/del interfaces, register/unregister them # # drivers/usb/core/message.c # 2004/02/27 08:46:19-08:00 stern@rowland.harvard.edu +14 -2 # USB: Don't add/del interfaces, register/unregister them # # drivers/usb/core/config.c # 2004/02/27 08:46:19-08:00 stern@rowland.harvard.edu +2 -7 # USB: Don't add/del interfaces, register/unregister them # # ChangeSet # 2004/03/03 10:16:35-08:00 sailer@scs.ch # [PATCH] USB: USB OSS audio driver workaround for buggy descriptors # # drivers/usb/class/audio.c # 2004/02/27 04:10:57-08:00 sailer@scs.ch +13 -9 # USB: USB OSS audio driver workaround for buggy descriptors # # ChangeSet # 2004/03/03 10:00:13-08:00 david-b@pacbell.net # [PATCH] USB Gadget: make usb gadget strings talk utf-8 # # Teach gadget/usbstring to expect UTF-8 strings, not ISO-8859/1 ones. # This just gets rid of an API issue: no hacks needed for non-Western # languages, and multi-language support will be lots easier. # # Current drivers won't notice the API change, they use US-ASCII (which # is a strict superset of both encodings). # # Future drivers may want to teach utf8_to_utf16le() about the four-byte # encodings, so they can emit surrogate pairs for those Unicode characters. # # include/linux/usb_gadget.h # 2004/02/28 01:58:35-08:00 david-b@pacbell.net +1 -1 # USB Gadget: make usb gadget strings talk utf-8 # # drivers/usb/gadget/usbstring.c # 2004/02/27 07:51:38-08:00 david-b@pacbell.net +78 -14 # USB Gadget: make usb gadget strings talk utf-8 # # ChangeSet # 2004/03/03 17:17:09+01:00 jbglaw@lug-owl.de # input: Add driver for DEC VSXXX mice. # # drivers/input/mouse/vsxxxaa.c # 2004/03/03 17:17:04+01:00 jbglaw@lug-owl.de +550 -0 # # drivers/input/mouse/vsxxxaa.c # 2004/03/03 17:17:04+01:00 jbglaw@lug-owl.de +0 -0 # BitKeeper file /home/vojtech/bk/input/drivers/input/mouse/vsxxxaa.c # # drivers/input/mouse/Makefile # 2004/03/03 17:17:04+01:00 jbglaw@lug-owl.de +1 -0 # input: Add driver for DEC VSXXX mice. # # drivers/input/mouse/Kconfig # 2004/03/03 17:17:04+01:00 jbglaw@lug-owl.de +13 -0 # input: Add driver for DEC VSXXX mice. # # ChangeSet # 2004/03/03 17:16:24+01:00 jbglaw@lug-owl.de # input: Add DEC LK201/LK401 keyboard support # # drivers/input/keyboard/lkkbd.c # 2004/03/03 17:16:19+01:00 jbglaw@lug-owl.de +625 -0 # # drivers/input/keyboard/lkkbd.c # 2004/03/03 17:16:19+01:00 jbglaw@lug-owl.de +0 -0 # BitKeeper file /home/vojtech/bk/input/drivers/input/keyboard/lkkbd.c # # drivers/input/keyboard/Makefile # 2004/03/03 17:16:19+01:00 jbglaw@lug-owl.de +1 -0 # input: Add DEC LK201/LK401 keyboard support # # drivers/input/keyboard/Kconfig # 2004/03/03 17:16:19+01:00 jbglaw@lug-owl.de +13 -0 # input: Add DEC LK201/LK401 keyboard support # # ChangeSet # 2004/03/03 15:14:01+01:00 vojtech@suse.cz # input: i8042.c: # Assume the chip always is in XLATE mode, even when it doesn't # have the XLATE bit set - apparently IBM PS/2 model 70 behaves # this way. # # drivers/input/serio/i8042.c # 2004/03/03 15:13:56+01:00 vojtech@suse.cz +0 -8 # input: i8042.c: # Assume the chip always is in XLATE mode, even when it doesn't # have the XLATE bit set - apparently IBM PS/2 model 70 behaves # this way. # # ChangeSet # 2004/03/03 11:50:22+01:00 vojtech@suse.cz # input: Only do hotplug on PS/2 HW when the HW sends 0xaa. This # avoids problems with broken USB->PS/2 legacy emulation # in certain BIOSes. # # drivers/input/serio/serio.c # 2004/03/03 11:50:17+01:00 vojtech@suse.cz +3 -0 # input: Only do hotplug on PS/2 HW when the HW sends 0xaa. This # avoids problems with broken USB->PS/2 legacy emulation # in certain BIOSes. # # ChangeSet # 2004/03/03 11:49:20+01:00 vojtech@suse.cz # input: Workaround i8042 chips with broken MUX mode. # # drivers/input/serio/i8042.c # 2004/03/03 11:49:15+01:00 vojtech@suse.cz +5 -0 # input: Workaround i8042 chips with broken MUX mode. # # ChangeSet # 2004/03/03 10:13:59+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # drivers/input/serio/i8042.c # 2004/03/03 10:13:56+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/03/03 09:59:51+01:00 vojtech@suse.cz # input: Manual merge with Dmitry. # # drivers/input/keyboard/atkbd.c # 2004/03/03 09:59:46+01:00 vojtech@suse.cz +4 -6 # input: Manual merge with Dmitry. # # drivers/input/serio/i8042.c # 2004/03/03 09:57:37+01:00 vojtech@suse.cz +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/03/03 09:57:36+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/03/03 00:36:59-05:00 dtor_core@ameritech.net # Input: use __obsolete_setup to document removed (renamed) # options so users will have a clue why the options # do not work anymore # # drivers/input/serio/i8042.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +7 -0 # Use __obsolete_setup # # drivers/input/mouse/psmouse-base.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +6 -0 # Use __obsolete_setup # # drivers/input/mouse/logibm.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +2 -0 # Use __obsolete_setup # # drivers/input/mouse/inport.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +2 -0 # Use __obsolete_setup # # drivers/input/mouse/98busmouse.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +2 -0 # Use __obsolete_setup # # drivers/input/keyboard/atkbd.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +4 -0 # Use __obsolete_setup # # drivers/input/joystick/turbografx.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +4 -0 # Use __obsolete_setup # # drivers/input/joystick/gamecon.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +6 -0 # Use __obsolete_setup # # drivers/input/joystick/db9.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +4 -0 # Use __obsolete_setup # # drivers/input/joystick/analog.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +2 -0 # Use __obsolete_setup # # drivers/input/joystick/amijoy.c # 2004/03/02 19:36:23-05:00 dtor_core@ameritech.net +2 -0 # Use __obsolete_setup # # ChangeSet # 2004/03/03 00:35:47-05:00 dtor_core@ameritech.net # Setup: introduce __obsolete_setup macro to denote truly obsolete # parameters. Whenever such parameter is specified kernel # will complain that "Parameter %s is obsolete, ignored" # # init/main.c # 2004/03/02 19:35:30-05:00 dtor_core@ameritech.net +5 -2 # If there is no setup function for kernel parameter assume that # the parameter is obsolete and complain # # include/linux/init.h # 2004/03/02 19:35:30-05:00 dtor_core@ameritech.net +17 -5 # Introduce __obsolete_setup macro # # ChangeSet # 2004/03/03 00:34:38-05:00 dtor_core@ameritech.net # Input: Convert joystick modules to the new way of handling parameters and # document them in kernel-parameters.txt # # The new names are: # amijoy.map=, # analog.map=,,... # db9.dev[2|3]=, # gamecon.map[2|3]=,,,... # turbografx.map[2|3]=,,,... # # Also there is a tiny change to mousedev and tsdev descriptions in # kernel-parameters, but no name changes. # # drivers/input/joystick/turbografx.c # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +25 -39 # Convert to use module_param # # drivers/input/joystick/gamecon.c # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +30 -46 # Convert to use module_param # # drivers/input/joystick/db9.c # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +25 -38 # Convert to use module_param # # drivers/input/joystick/analog.c # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +5 -21 # Convert to use module_param # # drivers/input/joystick/amijoy.c # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +5 -12 # Convert to use module_param # # Documentation/kernel-parameters.txt # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +29 -17 # Document new parameter names # # Documentation/input/joystick.txt # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +3 -3 # Document new parameter names # # Documentation/input/joystick-parport.txt # 2004/03/02 19:34:21-05:00 dtor_core@ameritech.net +8 -8 # Document new parameter names # # ChangeSet # 2004/03/03 00:32:43-05:00 dtor_core@ameritech.net # Introduce module_param_array_named to allow for module options with # name different form corresponding array variable. Allows using short # (but descriptive) option names without hurting code readability. # # Modeled after module_param_named. # # include/linux/moduleparam.h # 2004/03/02 19:32:24-05:00 dtor_core@ameritech.net +6 -3 # Add module_param_array_named # # ChangeSet # 2004/03/03 00:31:24-05:00 dtor_core@ameritech.net # Psmouse: some hardware does not ACK "disable streaming mode" command. # Since we already have an idea that it's a mouse device that # is present (from its response to GET ID command), instead of # aborting, issue a warning and continue. # # drivers/input/mouse/psmouse-base.c # 2004/03/02 19:30:50-05:00 dtor_core@ameritech.net +1 -1 # Work around broken hardware # # ChangeSet # 2004/03/03 00:30:04-05:00 dtor_core@ameritech.net # Psmouse: whitespace fixes # # drivers/input/mouse/psmouse-base.c # 2004/03/02 19:29:39-05:00 dtor_core@ameritech.net +7 -7 # Whitespace fixes # # ChangeSet # 2004/03/03 00:29:09-05:00 dtor_core@ameritech.net # Input: Switch between strict/relaxed synaptics protocol checks based on # data in the first full data packet. Having strict checks helps # getting rid of bad data after losing sync, but not all harware # implements strict protocol. # # drivers/input/mouse/synaptics.h # 2004/03/02 19:28:53-05:00 dtor_core@ameritech.net +7 -0 # Packet type added to synaptics structure # # drivers/input/mouse/synaptics.c # 2004/03/02 19:28:53-05:00 dtor_core@ameritech.net +41 -12 # Dynamically switch between strict and relaxed protocol checks # # ChangeSet # 2004/03/03 00:27:15-05:00 dtor_core@ameritech.net # Atkbd: Clean up unclean merge (remove old MODULE_PARMs) # # drivers/input/keyboard/atkbd.c # 2004/03/02 19:26:44-05:00 dtor_core@ameritech.net +1 -5 # Clean up unclean merge # # ChangeSet # 2004/03/03 00:25:49-05:00 dtor_core@ameritech.net # Atkbd: whitespace fixes # # drivers/input/keyboard/atkbd.c # 2004/03/02 19:20:19-05:00 dtor_core@ameritech.net +10 -10 # Whitespace fixes # # ChangeSet # 2004/03/02 13:47:14+01:00 jbglaw@lug-owl.de # input: Add serio entries for LK keyboards. # # include/linux/serio.h # 2004/03/02 13:47:09+01:00 jbglaw@lug-owl.de +2 -0 # input: Add serio entries for LK keyboards. # # ChangeSet # 2004/03/01 15:58:31-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: Revision of as202, Genesys quirk patch # # In the slave_configure routine it's already too late for the host's # max_sector value to affect the scsi_device. It's necessary to set the # queue value directly. This revised patch takes care of that. # # drivers/usb/storage/scsiglue.c # 2004/02/25 01:49:27-08:00 stern@rowland.harvard.edu +13 -1 # USB Storage: Revision of as202, Genesys quirk patch # # ChangeSet # 2004/03/01 15:04:41-08:00 jurgen@botz.org # [PATCH] USB: visor patch for Samsung SPH-i500 # # Hi... here is a patch for the vendor/device codes for the # Samsung SPH-i500 Palm phone. # # drivers/usb/serial/visor.h # 2004/02/16 03:34:06-08:00 jurgen@botz.org +1 -0 # USB: visor patch for Samsung SPH-i500 # # drivers/usb/serial/visor.c # 2004/02/16 03:34:06-08:00 jurgen@botz.org +3 -0 # USB: visor patch for Samsung SPH-i500 # # ChangeSet # 2004/03/01 13:55:09-08:00 brill@fs.math.uni-frankfurt.de # [PATCH] USB Storage: unusual_devs.h entry submission # # here is an unusual_devs.h entry which makes two different USB MP3 players # work with Linux' USB storage driver. They share a core chip, the t33520 USB # flash card controller by Trumpion microelectronics. They also share the same # ID 0x090a:0x1001, which is a "generic" ID for t33520 devices using bulk-only # protocol (0x1002 is for CB). # # About the MP3 players: # - I own an apparently unbranded one (sold in masses on ebay.de) which # needs US_FL_MODE_XLATE (and used to need US_FL_START_STOP before its # removal). # - Theodore Kilgore (who created the 0x090a:0x1001 record in the # Linux-USB device overwiew) has a "Trumpion Digital Research MYMP3" # which needs US_FL_MODE_XLATE and an explicit US_PR_BULK. # Of course the different players report the same firmware rev. 1.00, # despite their obviously different behaviour. Ugh. # # There are more players with this ID, the "Kaser Yofun 100 MP-3" (also # rev. 1.00) being one. The proposed entry may or may not help them, but # it shouldn't break working ones in any case. It is not unlikely they too # will need US_FL_MODE_XLATE. # # Below you'll find my /proc/bus/usb/devices with mounted MP3 player and a # patch against 2.4.25-rc3. Please apply. # # # # ----------------8<-------------------------8<-------------------- # # T: Bus=01 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#= 1 Spd=12 MxCh= 2 # B: Alloc= 0/900 us ( 0%), #Int= 0, #Iso= 0 # D: Ver= 1.00 Cls=09(hub ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 # P: Vendor=0000 ProdID=0000 Rev= 0.00 # S: Product=USB UHCI Root Hub # S: SerialNumber=e400 # C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr= 0mA # I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub # E: Ad=81(I) Atr=03(Int.) MxPS= 8 Ivl=255ms # T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 # D: Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 # P: Vendor=090a ProdID=1001 Rev= 1.00 # C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr= 60mA # I: If#= 0 Alt= 0 #EPs= 3 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage # E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms # E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms # E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=255ms # # ----------------8<-------------------------8<-------------------- # # drivers/usb/storage/unusual_devs.h # 2004/02/17 17:51:03-08:00 brill@fs.math.uni-frankfurt.de +11 -0 # USB Storage: unusual_devs.h entry submission # # ChangeSet # 2004/03/01 13:41:08-08:00 per.winkvist@uk.com # [PATCH] USB Storage: unusual devs fix for Pentax cameras. # # Please apply the attached patches instead. People have tried it on several # different Pentax cameras (including 330 GS) # # drivers/usb/storage/unusual_devs.h # 2004/02/04 00:53:10-08:00 per.winkvist@uk.com +1 -7 # USB Storage: unusual devs fix for Pentax cameras. # # ChangeSet # 2004/03/01 13:30:26-08:00 ahaas@airmail.net # [PATCH] USB: C99 initializers for drivers/usb/serial/keyspan.h # # Here's a small patch changing the GNU-style initializers to C99 # initializers. The patch is against the current BK. # # drivers/usb/serial/keyspan.h # 2004/02/25 23:25:09-08:00 ahaas@airmail.net +13 -13 # USB: C99 initializers for drivers/usb/serial/keyspan.h # # ChangeSet # 2004/03/01 10:38:34-08:00 akpm@osdl.org # [PATCH] USB ati_remote.c: don't be a namespace hog # # `debug', indeed. # # drivers/usb/input/ati_remote.c # 2004/02/29 17:38:20-08:00 akpm@osdl.org +1 -1 # USB ati_remote.c: don't be a namespace hog # # ChangeSet # 2004/03/01 17:00:11+01:00 vojtech@suse.cz # Merge bkbits:input into suse.cz:/home/vojtech/bk/input # # drivers/usb/input/hid-core.c # 2004/03/01 17:00:08+01:00 vojtech@suse.cz +0 -0 # Auto merged # # drivers/char/Kconfig # 2004/03/01 17:00:08+01:00 vojtech@suse.cz +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/03/01 17:00:08+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/03/01 16:52:22+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # drivers/usb/input/hid-core.c # 2004/03/01 16:52:18+01:00 vojtech@suse.cz +0 -0 # Auto merged # # drivers/char/Kconfig # 2004/03/01 16:52:18+01:00 vojtech@suse.cz +0 -0 # Auto merged # # arch/arm26/Kconfig # 2004/03/01 16:52:18+01:00 vojtech@suse.cz +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/03/01 16:52:18+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/27 17:36:56-08:00 thoffman@arnor.net # [PATCH] USB: update driver for ATI USB/RF remotes # # drivers/usb/input/ati_remote.c # 2004/02/25 14:06:51-08:00 thoffman@arnor.net +80 -63 # USB: update driver for ATI USB/RF remotes # # ChangeSet # 2004/02/27 12:53:52-08:00 greg@kroah.com # [PATCH] USB: fix up the input Makefile after these last few drivers were added. # # drivers/usb/input/Makefile # 2004/02/27 04:51:51-08:00 greg@kroah.com +4 -4 # USB: fix up the input Makefile after these last few drivers were added. # # drivers/usb/Makefile # 2004/02/27 04:51:51-08:00 greg@kroah.com +4 -0 # USB: fix up the input Makefile after these last few drivers were added. # # ChangeSet # 2004/02/27 12:53:36-08:00 greg@kroah.com # [PATCH] USB: fix build for older versions of gcc and the mtouchusb driver. # # drivers/usb/input/mtouchusb.c # 2004/02/27 04:51:48-08:00 greg@kroah.com +1 -1 # USB: fix build for older versions of gcc and the mtouchusb driver. # # ChangeSet # 2004/02/27 12:53:21-08:00 tejohnson@yahoo.com # [PATCH] USB: add new USB Touchscreen Driver # # I have attached a patch which contains a driver and documentation for # the MicroTouch (14-206) USB Capacitive Touchscreen controller. It based # on some older code that I have been using for quite some time now (since # 2.4.17). This new version has been completely re-written, and now uses # Linux Input. Greg, It would be great to possibly get it into 2.6.4. # Please let me know if I have it all wrong... # # Unfortunately, the X11 mouse driver only seems capable of handling # relative data rather than absolute. Hopefully some one will create a # suitable X11 driver capable of accepting absolute data from Linux # Input. If anyone is aware of one, please let me know. Otherwise, I # will most likely begin some work on a patch for GPM. # # Calibration support will be on the way soon, but I'm not sure of the # best way to implement. Perhaps some abstract functions could come # available in evdev which can call vendor specific commands for the # calibration within this driver (and perhaps others). # # drivers/usb/input/mtouchusb.c # 2004/02/26 15:31:35-08:00 tejohnson@yahoo.com +391 -0 # USB: add new USB Touchscreen Driver # # drivers/usb/input/mtouchusb.c # 2004/02/26 15:31:35-08:00 tejohnson@yahoo.com +0 -0 # BitKeeper file /home/greg/linux/BK/usb-2.6/drivers/usb/input/mtouchusb.c # # drivers/usb/input/Makefile # 2004/02/26 15:32:30-08:00 tejohnson@yahoo.com +1 -0 # USB: add new USB Touchscreen Driver # # drivers/usb/input/Kconfig # 2004/02/26 15:32:51-08:00 tejohnson@yahoo.com +12 -0 # USB: add new USB Touchscreen Driver # # drivers/usb/Makefile # 2004/02/26 15:32:41-08:00 tejohnson@yahoo.com +1 -0 # USB: add new USB Touchscreen Driver # # Documentation/usb/mtouchusb.txt # 2004/02/26 15:31:42-08:00 tejohnson@yahoo.com +85 -0 # USB: add new USB Touchscreen Driver # # Documentation/usb/mtouchusb.txt # 2004/02/26 15:31:42-08:00 tejohnson@yahoo.com +0 -0 # BitKeeper file /home/greg/linux/BK/usb-2.6/Documentation/usb/mtouchusb.txt # # ChangeSet # 2004/02/27 12:53:04-08:00 u233@shaw.ca # [PATCH] USB: kbtab.c (Jamstudio Tablet) with optional pressure # # I have altered kbtab.c a bit in anticipation of an XFree86 4.3 driver # that can accept the pressure data (as a third axis) by listening on the # event interface. # # I have set it so that if the option kb_pressure_click is -1 it reports # pressure rather than clicks. # # drivers/usb/input/kbtab.c # 2004/02/24 01:07:11-08:00 u233@shaw.ca +6 -3 # USB: kbtab.c (Jamstudio Tablet) with optional pressure # # ChangeSet # 2004/02/27 12:52:43-08:00 thoffman@arnor.net # [PATCH] USB: add driver for ATI USB/RF remotes # # I've taken the old GATOS version of the ati_remote driver and done # some cleanup/rework of it while porting to 2.6 kernels. # # drivers/usb/input/Makefile # 2004/02/20 15:46:14-08:00 thoffman@arnor.net +1 -0 # USB: add driver for ATI USB/RF remotes # # drivers/usb/input/Kconfig # 2004/02/20 15:48:54-08:00 thoffman@arnor.net +14 -0 # USB: add driver for ATI USB/RF remotes # # drivers/usb/input/ati_remote.c # 2004/02/20 15:09:40-08:00 thoffman@arnor.net +834 -0 # USB: add driver for ATI USB/RF remotes # # drivers/usb/input/ati_remote.c # 2004/02/20 15:09:40-08:00 thoffman@arnor.net +0 -0 # BitKeeper file /home/greg/linux/BK/usb-2.6/drivers/usb/input/ati_remote.c # # ChangeSet # 2004/02/27 12:42:07-08:00 greg@kroah.com # USB: delete unneeded scanner documentation. # # BitKeeper/deleted/.del-scanner.txt~180f704d4900732 # 2004/02/27 12:41:50-08:00 greg@kroah.com +0 -0 # Delete: Documentation/usb/scanner.txt # # ChangeSet # 2004/02/27 12:12:45-08:00 david-b@pacbell.net # [PATCH] USB: EHCI and full-speed ISO-OUT # # This is a minor update to the patch I sent out about a week ago. # The key change is to use the I/O watchdog while doing ISO streaming. # Bernd Porr reports that a VT8235 system needs that; it seems like # IDE activity can interfere with the delivery of USB IRQs. # # # EHCI periodic scheduling updates. # # - Initial version of full speed ISO transaction support. This # should handle OUT transactions, such as those for usb speakers. # For now, it's controlled using an EXPERIMENTAL config option: # # * I've run into interesting differences in how different USB 2.0 # hub silicon (the transaction translators) handle some older # audio devices. Needs more investigation. # # * Interrupt transfer scheduling doesn't yet cope well with schedules # where every slot already has activity. For now, don't plug in # devices like hubs, mice, or keyboards while EHCI is streaming. # # - Protect freelist for highspeed ITDs, using spinlock. Could be # an issue for some drivers. # # - Kick in the I/O watchdog timer (5 msec) for periodic transfers. # In this case, IDE activity on a VT8235 lost the IRQs which should # have kept the ISO stream active. Queues shorter than 5 msec are # not going to work on all USB hosts. # # - Simplified the ISO scheduler: doesn't attempt to re-schedule # after lossage, or to short-circuit scanning. (Rescheduling will # probably come back later ... for now, the "hard" error here is # highlighting problems that need attention.) # # drivers/usb/host/ehci.h # 2004/02/27 00:46:23-08:00 david-b@pacbell.net +6 -8 # USB: EHCI and full-speed ISO-OUT # # drivers/usb/host/ehci-sched.c # 2004/02/27 00:46:23-08:00 david-b@pacbell.net +446 -77 # USB: EHCI and full-speed ISO-OUT # # drivers/usb/host/ehci-hcd.c # 2004/02/27 00:46:23-08:00 david-b@pacbell.net +1 -7 # USB: EHCI and full-speed ISO-OUT # # drivers/usb/host/ehci-dbg.c # 2004/02/27 00:46:23-08:00 david-b@pacbell.net +5 -1 # USB: EHCI and full-speed ISO-OUT # # drivers/usb/host/Kconfig # 2004/02/27 00:46:23-08:00 david-b@pacbell.net +9 -0 # USB: EHCI and full-speed ISO-OUT # # ChangeSet # 2004/02/27 12:12:28-08:00 david-b@pacbell.net # [PATCH] USB Gadget: gadget config buffer utilities # # Adds two new gadget-side utility functions, to support a declarative # style of managing usb configuration descriptors. The functions fill # buffers from null-terminated vectors of usb descriptors, which are # simple to build or update. # # The "ethernet" gadget driver currently has the most interesting config # descriptors. This uses those functions to replace some complex code with # simpler static declarations; result, it's cleaner. (And it'll be easier # to add RNDIS configurations later, too.) # # Memory savings (or cost, depending on config) was less than 50 bytes; # nothing worth worrying about. # # drivers/usb/gadget/config.c # 2004/02/23 22:51:29-08:00 david-b@pacbell.net +116 -0 # USB Gadget: gadget config buffer utilities # # include/linux/usb_gadget.h # 2004/02/23 15:43:48-08:00 david-b@pacbell.net +11 -0 # USB Gadget: gadget config buffer utilities # # drivers/usb/gadget/ether.c # 2004/02/23 15:43:48-08:00 david-b@pacbell.net +51 -74 # USB Gadget: gadget config buffer utilities # # drivers/usb/gadget/config.c # 2004/02/23 22:51:29-08:00 david-b@pacbell.net +0 -0 # BitKeeper file /home/greg/linux/BK/usb-2.6/drivers/usb/gadget/config.c # # drivers/usb/gadget/Makefile # 2004/02/23 15:43:48-08:00 david-b@pacbell.net +1 -1 # USB Gadget: gadget config buffer utilities # # Documentation/DocBook/gadget.tmpl # 2004/02/24 00:18:48-08:00 david-b@pacbell.net +1 -0 # USB Gadget: gadget config buffer utilities # # ChangeSet # 2004/02/27 12:12:12-08:00 david-b@pacbell.net # [PATCH] USB: usbnet learns about Zaurus C-860 # # New Zaurus ID, from Sven Trampel # # drivers/usb/net/usbnet.c # 2004/02/26 10:37:44-08:00 david-b@pacbell.net +9 -0 # USB: usbnet learns about Zaurus C-860 # # ChangeSet # 2004/02/27 12:11:54-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: Remove Minolta Dimage 7i from unusual_devs.h # # On Fri, 27 Feb 2004, Lenar Lõhmus wrote: # # > Hi, # > # > Got this: # > # > usb 3-1: new full speed USB device using address 3 # > usb-storage: This device (0686,400b,0001 S 06 P 50) has an unneeded SubClass entry in unusual_devs.h # > Please send a copy of this message to # # Well, Martin Pool notwithstanding (see # # http://marc.theaimsgroup.com/?l=linux-usb-devel&m=107642806303815&w=2 # # ), it sure looks like this doesn't need an unusual_devs.h entry. # # Greg, please apply this patch. # # drivers/usb/storage/unusual_devs.h # 2004/02/27 01:51:43-08:00 stern@rowland.harvard.edu +0 -6 # USB Storage: Remove Minolta Dimage 7i from unusual_devs.h # # ChangeSet # 2004/02/27 12:11:31-08:00 jeffm@suse.com # [PATCH] USB: Fix for kl5kusb105 driver # # I tried using the kl5kusb105 driver for a 3Com PalmConnect USB device I # had lying around. # # It oopses during device detection. There is a nested loop using the same # loop counter as the outer loop - causing the code after the nested loop # is first executed to have an invalid counter. The counter is then used # as an array index, causing a NULL deref. # # Fix attached. # # drivers/usb/serial/kl5kusb105.c # 2004/02/19 14:17:34-08:00 jeffm@suse.com +3 -2 # USB: Fix for kl5kusb105 driver # # ChangeSet # 2004/02/27 12:11:07-08:00 michal_dobrzynski@mac.com # [PATCH] USB: add IRTrans support to ftdi_sio driver # # drivers/usb/serial/ftdi_sio.h # 2004/02/23 04:14:03-08:00 michal_dobrzynski@mac.com +2 -0 # USB: add IRTrans support to ftdi_sio driver # # drivers/usb/serial/ftdi_sio.c # 2004/02/23 04:14:03-08:00 michal_dobrzynski@mac.com +3 -0 # USB: add IRTrans support to ftdi_sio driver # # ChangeSet # 2004/02/26 14:19:13-08:00 greg@kroah.com # [PATCH] USB Storage: remove unneeded debug message # # Nothing in life is assured... # # drivers/usb/storage/usb.c # 2004/02/26 06:17:07-08:00 greg@kroah.com +0 -2 # USB Storage: remove unneeded debug message # # ChangeSet # 2004/02/26 14:18:57-08:00 mdharm-usb@one-eyed-alien.net # [PATCH] USB Storage: tighten sense-clearing code # # This patch tightens up the conditions under which an auto-sense will be # cleared. It also fixes the comment associated with the code. # # drivers/usb/storage/transport.c # 2004/02/21 16:21:34-08:00 mdharm-usb@one-eyed-alien.net +7 -3 # USB Storage: tighten sense-clearing code # # ChangeSet # 2004/02/26 14:18:38-08:00 mdharm-usb@one-eyed-alien.net # [PATCH] USB Storage: Remove unneeded macro # # This one-liner removes an unneeded macro. # # drivers/usb/storage/usb.h # 2004/02/21 16:21:42-08:00 mdharm-usb@one-eyed-alien.net +0 -1 # USB Storage: Remove unneeded macro # # ChangeSet # 2004/02/26 14:18:20-08:00 mdharm-usb@one-eyed-alien.net # [PATCH] USB Storage: Fix for Fuji Finepix 1400 # # This patch changes some error checking so that some bogus devices (like the # Fuji Finepix 1400) will work. # # This is basically relaxing a test on a field that the spec says "should # always be zero" # # drivers/usb/storage/transport.c # 2004/02/21 16:21:51-08:00 mdharm-usb@one-eyed-alien.net +8 -4 # USB Storage: Fix for Fuji Finepix 1400 # # ChangeSet # 2004/02/26 14:17:58-08:00 mdharm-usb@one-eyed-alien.net # [PATCH] USB Storage: DSC-T1 unusual_devs.h entry # # Our friends at sony are at it again. The DSC-T1 needs a new entry. Note # that it's the same VID & PID as the last entry, but different version. # # drivers/usb/storage/unusual_devs.h # 2004/02/21 16:21:59-08:00 mdharm-usb@one-eyed-alien.net +8 -0 # USB Storage: DSC-T1 unusual_devs.h entry # # ChangeSet # 2004/02/26 14:09:37-08:00 stern@rowland.harvard.edu # [PATCH] USB: Use list_splice instead of looping over list elements # # This patch is from Stephen Hemminger. I modified it slightly to place the # new elements at the end of the complete_list instead of at the front. # # On Tue, 24 Feb 2004, Stephen Hemminger wrote: # # > Since the remove_list and complete_list now use the same element for # > linking, it is possible to use the list_splice inline to avoid # > having to loop over all the urb's # # drivers/usb/host/uhci-hcd.c # 2004/02/26 04:13:44-08:00 stern@rowland.harvard.edu +4 -9 # USB: Use list_splice instead of looping over list elements # # ChangeSet # 2004/02/26 14:09:18-08:00 stern@rowland.harvard.edu # [PATCH] USB: Remove name obfuscation in UHCI # # On Mon, 23 Feb 2004, Stephen Hemminger wrote: # > Bulk and interrupt urb's share common irq processing, why does the # > code try to obfuscate it? # # Quite right; this is needless complexity. (But note you left in a couple # of lines that should have been deleted.) # # drivers/usb/host/uhci-hcd.c # 2004/02/24 02:15:52-08:00 stern@rowland.harvard.edu +2 -10 # USB: Remove name obfuscation in UHCI # # ChangeSet # 2004/02/26 14:09:03-08:00 stern@rowland.harvard.edu # [PATCH] USB: Return better result codes in UHCI # # This patch changes the result code returned by the UHCI driver for a # certain class of errors. Under a number of circumstances a USB device is # obliged to send a response packet within a fairly short turn-around time, # typically 1 - 10 microseconds depending on the bus speed. Failure to do # so is a protocol error and should be reported as such, not as a timeout, # which is really a higher-level concept. I believe the EHCI driver already # does this. # # I trust nobody will object to the update this patch adds to # Documentation/usb/error-codes.txt, making this more explicit. # # In a vaguely related change, the patch corrects the terminology in a few # comments. The parts of a control transfer are called "stages", not # "phases". # # drivers/usb/host/uhci-hcd.h # 2004/02/23 02:40:16-08:00 stern@rowland.harvard.edu +1 -1 # USB: Return better result codes in UHCI # # drivers/usb/host/uhci-hcd.c # 2004/02/23 03:01:45-08:00 stern@rowland.harvard.edu +14 -15 # USB: Return better result codes in UHCI # # Documentation/usb/error-codes.txt # 2004/02/23 03:06:03-08:00 stern@rowland.harvard.edu +3 -1 # USB: Return better result codes in UHCI # # ChangeSet # 2004/02/26 14:08:39-08:00 stern@rowland.harvard.edu # [PATCH] USB: Enable interrupts in UHCI after PM resume # # On Mon, 23 Feb 2004, Chip Salzenberg wrote: # # > It works ... perfectly! I can now suspend and resume my A30 with # > impunity, and the USB keyboard works fine after each resume. # > # > Thanks much, Alan. # > # > (Now if I could just get the alsa guys to fix snd-intel8x0...) # # This patch re-initializes the UHCI Interrupt Enable register following a # PM resume. Apparently some systems clear the register during suspend, # which causes obvious problems later on. # # drivers/usb/host/uhci-hcd.c # 2004/02/22 07:23:59-08:00 stern@rowland.harvard.edu +9 -2 # USB: Enable interrupts in UHCI after PM resume # # ChangeSet # 2004/02/26 14:08:22-08:00 stern@rowland.harvard.edu # [PATCH] USB: Fix a bug in the UHCI dequeueing code # # On Mon, 23 Feb 2004, Stephen Hemminger wrote: # # > Great, the kernel with this patch ran successfully all weekend. Looks like no # > more races in the unlink path. # # Wonderful. Thanks a lot for all your SMP testing, it's been a big help. # # # This patch corrects an error in the dequeueing code for UHCI. Improper # locking caused it to hang in the oddball case where an URB was unlinked # even before it had been queued. # # drivers/usb/host/uhci-hcd.c # 2004/02/20 07:04:41-08:00 stern@rowland.harvard.edu +8 -8 # USB: Fix a bug in the UHCI dequeueing code # # ChangeSet # 2004/02/26 14:08:02-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: update unusual_devs.h comments # # On Tue, 24 Feb 2004, Matthew Dharm wrote: # # > We should also put a comment into the unusual_devs.h file to make sure # > nobody tries to remove the protocol override in the future. # # How about this? # # drivers/usb/storage/unusual_devs.h # 2004/02/26 03:48:03-08:00 stern@rowland.harvard.edu +3 -0 # USB Storage: update unusual_devs.h comments # # ChangeSet # 2004/02/26 14:07:42-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: unusual_devs.h update # # On Thu, 19 Feb 2004, Evan Felix wrote: # # > I plugged a Cyclades AlterPath BIO USb device into my linux 2.6.2 laptop # > and it asked me to send you this: # > # > # > hub 1-1.2:1.0: new USB device on port 3, assigned address 6 # > hub 1-1.2.3:1.0: USB hub found # > hub 1-1.2.3:1.0: 4 ports detected # > hub 1-1.2.3:1.0: new USB device on port 1, assigned address 7 # > hub 1-1.2.3:1.0: new USB device on port 2, assigned address 8 # > Initializing USB Mass Storage driver... # > usb-storage: This device (05dc,0001,0001 S 06 P 50) has an unneeded # > SubClass entry in unusual_devs.h # > Please send a copy of this message to # > # > scsi0 : SCSI emulation for USB Mass Storage devices # > Vendor: Lexar Model: Jumpshot USB CF Rev: 0001 # > Type: Direct-Access ANSI SCSI revision: 02 # # Thank you for sending this. Greg, here's the patch. # # drivers/usb/storage/unusual_devs.h # 2004/02/20 06:19:45-08:00 stern@rowland.harvard.edu +1 -1 # USB Storage: unusual_devs.h update # # ChangeSet # 2004/02/19 22:24:53+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # drivers/char/Kconfig # 2004/02/19 22:24:48+01:00 vojtech@suse.cz +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/02/19 22:24:48+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/17 21:05:09+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # drivers/usb/input/hid-core.c # 2004/02/17 21:04:55+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/09 15:17:33+01:00 vojtech@suse.cz # Merge bkbits:input into suse.cz:/home/vojtech/bk/input # # drivers/char/Kconfig # 2004/02/09 15:17:29+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/09 10:07:39+01:00 vojtech@suse.cz # input: Re-add a loop to set the old scancode bit in device key bitmap. # # drivers/input/evdev.c # 2004/02/09 10:07:32+01:00 vojtech@suse.cz +4 -1 # input: Re-add a loop to set the old scancode bit in device key bitmap. # # ChangeSet # 2004/02/09 09:54:13+01:00 vojtech@suse.cz # Manual merge. # # drivers/char/keyboard.c # 2004/02/09 09:54:07+01:00 vojtech@suse.cz +0 -1 # Manual merge. # # drivers/input/serio/i8042.c # 2004/02/09 09:49:42+01:00 vojtech@suse.cz +0 -3 # Auto merged # # ChangeSet # 2004/02/09 02:11:00+01:00 weicht@in.tum.de # input: Fix a bug introduced by Andrew Morton's gcc3.2 fixes. # # drivers/char/keyboard.c # 2004/02/09 02:10:54+01:00 weicht@in.tum.de +1 -1 # input: Fix a bug introduced by Andrew Morton's gcc3.2 fixes. # # ChangeSet # 2004/02/09 02:10:02+01:00 vojtech@suse.cz # input: Fix a warning in i8042.c # # drivers/input/serio/i8042.c # 2004/02/09 02:09:55+01:00 vojtech@suse.cz +1 -1 # input: Fix a warning in i8042.c # # ChangeSet # 2004/02/09 01:47:16+01:00 vojtech@suse.cz # input: Fix "psmouse: Lost sync" problem. It was really losing sync. # # drivers/input/serio/i8042.c # 2004/02/09 01:47:09+01:00 vojtech@suse.cz +4 -2 # input: Fix "psmouse: Lost sync" problem. It was really losing sync. # # ChangeSet # 2004/02/08 23:21:45+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # drivers/char/Makefile # 2004/02/08 23:21:29+01:00 vojtech@suse.cz +0 -0 # Auto merged # # drivers/char/Kconfig # 2004/02/08 23:21:29+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/05 10:21:19+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # drivers/char/Kconfig # 2004/02/05 10:21:15+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/03 21:41:26+01:00 vojtech@suse.cz # Merge bkbits:input into suse.cz:/home/vojtech/bk/input # # Documentation/kernel-parameters.txt # 2004/02/03 21:41:23+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/03 21:38:35+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # Documentation/kernel-parameters.txt # 2004/02/03 21:38:32+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/02/01 11:58:02+01:00 vojtech@suse.cz # Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input # # Documentation/kernel-parameters.txt # 2004/02/01 11:57:59+01:00 vojtech@suse.cz +0 -0 # Auto merged # # ChangeSet # 2004/01/27 21:01:27+01:00 aris@cathedrallabs.org # input: Remove the obsolete "busmouse.c" helper driver. # # include/linux/miscdevice.h # 2004/01/27 21:01:20+01:00 aris@cathedrallabs.org +0 -1 # input: Remove the obsolete "busmouse.c" helper driver. # # drivers/char/Makefile # 2004/01/27 21:01:20+01:00 aris@cathedrallabs.org +0 -1 # input: Remove the obsolete "busmouse.c" helper driver. # # drivers/char/Kconfig # 2004/01/27 21:01:20+01:00 aris@cathedrallabs.org +0 -24 # input: Remove the obsolete "busmouse.c" helper driver. # # arch/arm26/Kconfig # 2004/01/27 21:01:20+01:00 aris@cathedrallabs.org +0 -5 # input: Remove the obsolete "busmouse.c" helper driver. # # ChangeSet # 2004/01/26 18:35:00+01:00 panagiotis.issaris@mech.kuleuven.ac.be # input: Credit to Panagiotis Issaris for Graphire 3 support. # # drivers/usb/input/wacom.c # 2004/01/26 18:34:54+01:00 panagiotis.issaris@mech.kuleuven.ac.be +3 -1 # input: Credit to Panagiotis Issaris for Graphire 3 support. # # ChangeSet # 2004/01/26 13:59:12+01:00 deller@gmx.de # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # drivers/input/serio/gscps2.c # 2004/01/26 13:59:06+01:00 deller@gmx.de +470 -0 # # drivers/input/serio/gscps2.c # 2004/01/26 13:59:06+01:00 deller@gmx.de +0 -0 # BitKeeper file /home/vojtech/bk/input/drivers/input/serio/gscps2.c # # drivers/input/serio/Makefile # 2004/01/26 13:59:06+01:00 deller@gmx.de +1 -0 # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # drivers/input/serio/Kconfig # 2004/01/26 13:59:06+01:00 deller@gmx.de +16 -0 # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # drivers/input/mouse/Kconfig # 2004/01/26 13:59:06+01:00 deller@gmx.de +1 -0 # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # drivers/input/misc/Makefile # 2004/01/26 13:59:06+01:00 deller@gmx.de +0 -1 # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # drivers/input/misc/Kconfig # 2004/01/26 13:59:06+01:00 deller@gmx.de +0 -9 # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # drivers/input/keyboard/hpps2atkbd.h # 2004/01/26 13:59:06+01:00 deller@gmx.de +93 -85 # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # drivers/input/keyboard/Kconfig # 2004/01/26 13:59:06+01:00 deller@gmx.de +1 -0 # input: Convert HP/PARISC Lasi/Dino PS/2 keyboard/mouse driver # from an input driver to a serio driver. # # BitKeeper/deleted/.del-gsc_ps2.c~196a1c58604c6cc1 # 2004/01/26 13:58:06+01:00 vojtech@suse.cz +0 -0 # Delete: drivers/input/misc/gsc_ps2.c # # ChangeSet # 2004/01/26 13:57:19+01:00 vojtech@suse.cz # input: Create an extra option for enabling IBM RapidAccess keyboard # special features (atkbd.extra), instead of abusing the # atkbd.set option for this. # # drivers/input/keyboard/atkbd.c # 2004/01/26 13:57:13+01:00 vojtech@suse.cz +20 -15 # input: Create an extra option for enabling IBM RapidAccess keyboard # special features (atkbd.extra), instead of abusing the # atkbd.set option for this. # # Documentation/kernel-parameters.txt # 2004/01/26 13:57:13+01:00 vojtech@suse.cz +10 -3 # input: Create an extra option for enabling IBM RapidAccess keyboard # special features (atkbd.extra), instead of abusing the # atkbd.set option for this. # # ChangeSet # 2004/01/26 13:56:47+01:00 vojtech@suse.cz # input: Add support for scroll wheel on MS Office and similar keyboards. # # drivers/input/keyboard/atkbd.c # 2004/01/26 13:56:40+01:00 vojtech@suse.cz +58 -7 # input: Add support for scroll wheel on MS Office and similar keyboards. # # ChangeSet # 2004/01/26 13:29:36+01:00 vojtech@suse.cz # input: Bail out in atkbd.c if scancode set is changed, don't # reinitialize scancode map. This is even more anoying than # a new keyboard device in the unlikely case of set change. # # drivers/input/keyboard/atkbd.c # 2004/01/26 13:29:30+01:00 vojtech@suse.cz +6 -32 # input: Bail out in atkbd.c if scancode set is changed, don't # reinitialize scancode map. This is even more anoying than # a new keyboard device in the unlikely case of set change. # # ChangeSet # 2004/01/26 13:25:57+01:00 sebek64@post.cz # input: Use request_region() instead of check_region() in ns558.c # it's both safer and correct. # # drivers/input/gameport/ns558.c # 2004/01/26 13:25:50+01:00 sebek64@post.cz +24 -11 # input: Use request_region() instead of check_region() in ns558.c # it's both safer and correct. # # ChangeSet # 2004/01/26 13:25:24+01:00 vojtech@suse.cz # input: Fix sunkbd.c to work with serport. Must sleep. # # drivers/input/keyboard/sunkbd.c # 2004/01/26 13:25:18+01:00 vojtech@suse.cz +11 -11 # input: Fix sunkbd.c to work with serport. Must sleep. # # ChangeSet # 2004/01/26 13:23:40+01:00 jochen@jochen.org # usb: Minor documentation fix reflecting new USB module names in acm.txt # # Documentation/usb/acm.txt # 2004/01/26 13:23:33+01:00 jochen@jochen.org +4 -4 # usb: Minor documentation fix reflecting new USB module names in acm.txt # # ChangeSet # 2004/01/26 13:18:17+01:00 vojtech@suse.cz # input: Add support for another a4tech 2-wheel USB mouse, with # a Cypress ID this time. Also rearrange the HID blacklist # a bit - it has grown too long. # # drivers/usb/input/hid-input.c # 2004/01/26 13:18:11+01:00 vojtech@suse.cz +4 -3 # input: Add support for another a4tech 2-wheel USB mouse, with # a Cypress ID this time. Also rearrange the HID blacklist # a bit - it has grown too long. # # drivers/usb/input/hid-core.c # 2004/01/26 13:18:11+01:00 vojtech@suse.cz +29 -19 # input: Add support for another a4tech 2-wheel USB mouse, with # a Cypress ID this time. Also rearrange the HID blacklist # a bit - it has grown too long. # # ChangeSet # 2004/01/26 13:17:44+01:00 vojtech@suse.cz # input: It looks like the Saitek RumblePad needs a BADPAD entry. # # drivers/usb/input/hid-core.c # 2004/01/26 13:17:38+01:00 vojtech@suse.cz +4 -0 # input: It looks like the Saitek RumblePad needs a BADPAD entry. # # ChangeSet # 2004/01/26 13:16:54+01:00 jamesl@appliedminds.com # input: Add a new ioctl to hiddev, which allows multiple usages to # be set in a single request. Also fixes sizes of fields # in hiddev structs to use _uXX types. # # include/linux/hiddev.h # 2004/01/26 13:16:48+01:00 jamesl@appliedminds.com +43 -31 # input: Add a new ioctl to hiddev, which allows multiple usages to # be set in a single request. Also fixes sizes of fields # in hiddev structs to use _uXX types. # # drivers/usb/input/hiddev.c # 2004/01/26 13:16:48+01:00 jamesl@appliedminds.com +55 -24 # input: Add a new ioctl to hiddev, which allows multiple usages to # be set in a single request. Also fixes sizes of fields # in hiddev structs to use _uXX types. # # ChangeSet # 2004/01/26 13:15:32+01:00 jamesl@appliedminds.com # input: Fix hid-core for devices that have less usages than values # in a hid report. We could iterate beyond the end of array of # usages before. # # drivers/usb/input/hid-core.c # 2004/01/26 13:13:50+01:00 jamesl@appliedminds.com +9 -2 # input: Fix hid-core for devices that have less usages than values # in a hid report. We could iterate beyond the end of array of # usages before. # diff -Nru a/CREDITS b/CREDITS --- a/CREDITS Wed Mar 17 19:29:09 2004 +++ b/CREDITS Wed Mar 17 19:29:09 2004 @@ -82,13 +82,13 @@ S: USA N: Erik Andersen -E: andersee@debian.org -W: http://www.xmission.com/~andersen -P: 1024/FC4CFFED 78 3C 6A 19 FA 5D 92 5A FB AC 7B A5 A5 E1 FF 8E +E: andersen@codepoet.org +W: http://www.codepoet.org/ +P: 1024D/30D39057 1BC4 2742 E885 E4DE 9301 0C82 5F9B 643E 30D3 9057 D: Maintainer of ide-cd and Uniform CD-ROM driver, D: ATAPI CD-Changer support, Major 2.1.x CD-ROM update. -S: 4538 South Carnegie Tech Street -S: Salt Lake City, Utah 84120 +S: 352 North 525 East +S: Springville, Utah 84663 S: USA N: Michael Ang @@ -673,11 +673,6 @@ S: NN1 3QT S: United Kingdom -N: Stephane Dalton -E: sdalton@videotron.ca -D: Tieman Voyager USB Braille display driver. -S: Québec, Canada - N: Uwe Dannowski E: Uwe.Dannowski@ira.uka.de W: http://i30www.ira.uka.de/~dannowsk/ @@ -796,11 +791,6 @@ E: cort@fsmlabs.com W: http://www.fsmlabs.com/linuxppcbk.html D: PowerPC - -N: Stéphane Doyon -E: s.doyon@videotron.ca -D: Tieman Voyager USB Braille display driver. -S: Québec, Canada N: Oleg Drokin E: green@ccssu.crimea.ua diff -Nru a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile --- a/Documentation/DocBook/Makefile Wed Mar 17 19:29:09 2004 +++ b/Documentation/DocBook/Makefile Wed Mar 17 19:29:09 2004 @@ -47,7 +47,7 @@ ### #External programs used KERNELDOC = scripts/kernel-doc -DOCPROC = scripts/docproc +DOCPROC = scripts/basic/docproc SPLITMAN = $(PERL) $(srctree)/scripts/split-man MAKEMAN = $(PERL) $(srctree)/scripts/makeman @@ -149,12 +149,18 @@ cmd_fig2eps = fig2dev -Leps $< $@ %.eps: %.fig + @(which fig2dev > /dev/null 2>&1) || \ + (echo "*** You need to install transfig ***"; \ + exit 1) $(call cmd,fig2eps) quiet_cmd_fig2png = FIG2PNG $@ cmd_fig2png = fig2dev -Lpng $< $@ %.png: %.fig + @(which fig2dev > /dev/null 2>&1) || \ + (echo "*** You need to install transfig ***"; \ + exit 1) $(call cmd,fig2png) ### diff -Nru a/Documentation/DocBook/gadget.tmpl b/Documentation/DocBook/gadget.tmpl --- a/Documentation/DocBook/gadget.tmpl Wed Mar 17 19:29:09 2004 +++ b/Documentation/DocBook/gadget.tmpl Wed Mar 17 19:29:09 2004 @@ -454,6 +454,7 @@ !Edrivers/usb/gadget/usbstring.c +!Edrivers/usb/gadget/config.c diff -Nru a/Documentation/DocBook/parportbook.tmpl b/Documentation/DocBook/parportbook.tmpl --- a/Documentation/DocBook/parportbook.tmpl Wed Mar 17 19:29:09 2004 +++ b/Documentation/DocBook/parportbook.tmpl Wed Mar 17 19:29:09 2004 @@ -2730,7 +2730,7 @@ diff -Nru a/Documentation/devices.txt b/Documentation/devices.txt --- a/Documentation/devices.txt Wed Mar 17 19:29:09 2004 +++ b/Documentation/devices.txt Wed Mar 17 19:29:09 2004 @@ -1,8 +1,9 @@ LINUX ALLOCATED DEVICES - Maintained by H. Peter Anvin - Last revised: 3 June 2001 + Maintained by John Cagle + + Last revised: 15 March 2004 This list is the Linux Device List, the official registry of allocated device numbers and /dev directory nodes for the Linux operating @@ -85,6 +86,7 @@ 0 Unnamed devices (e.g. non-device mounts) 0 = reserved as null device number + See block major 144, 145, 146 for expansion areas. 1 char Memory devices 1 = /dev/mem Physical memory access @@ -98,7 +100,7 @@ 9 = /dev/urandom Faster, less secure random number gen. 10 = /dev/aio Asyncronous I/O notification interface 11 = /dev/kmsg Writes to this come out as printk's - block RAM disk + 1 block RAM disk 0 = /dev/ram0 First RAM disk 1 = /dev/ram1 Second RAM disk ... @@ -127,7 +129,7 @@ master multiplex (/dev/ptmx) to acquire a PTY on demand. - block Floppy disks + 2 block Floppy disks 0 = /dev/fd0 Controller 0, drive 0, autodetect 1 = /dev/fd1 Controller 0, drive 1, autodetect 2 = /dev/fd2 Controller 0, drive 2, autodetect @@ -193,7 +195,7 @@ These are the old-style (BSD) PTY devices; Unix98 devices are on major 136 and above. - block First MFM, RLL and IDE hard disk/CD-ROM interface + 3 block First MFM, RLL and IDE hard disk/CD-ROM interface 0 = /dev/hda Master: whole disk (or CD-ROM) 64 = /dev/hdb Slave: whole disk (or CD-ROM) @@ -225,6 +227,12 @@ number for BSD PTY devices. As of Linux 2.1.115, this is no longer supported. Use major numbers 2 and 3. + 4 block Aliases for dynamically allocated major devices to be used + when its not possible to create the real device nodes + because the root filesystem is mounted read-only. + + 0 = /dev/root + 5 char Alternate TTY devices 0 = /dev/tty Current TTY device 1 = /dev/console System console @@ -258,7 +266,7 @@ NOTE: These devices permit both read and write access. - block Loopback devices + 7 block Loopback devices 0 = /dev/loop0 First loopback device 1 = /dev/loop1 Second loopback device ... @@ -309,7 +317,7 @@ ioctl()'s can be used to rewind the tape regardless of the device used to access it. - block Metadisk (RAID) devices + 9 block Metadisk (RAID) devices 0 = /dev/md0 First metadisk group 1 = /dev/md1 Second metadisk group ... @@ -355,6 +363,7 @@ 149 = /dev/input/mouse Linux/SGI Irix emulation mouse 150 = /dev/input/keyboard Linux/SGI Irix emulation keyboard 151 = /dev/led Front panel LEDs + 152 = /dev/kpoll Kernel Poll Driver 153 = /dev/mergemem Memory merge device 154 = /dev/pmu Macintosh PowerBook power manager 155 = /dev/isictl MultiTech ISICom serial control @@ -372,7 +381,7 @@ 167 = /dev/specialix_sxctl Specialix serial control 168 = /dev/tcldrv Technology Concepts serial control 169 = /dev/specialix_rioctl Specialix RIO serial control - 170 = /dev/smapi IBM Thinkpad SMAPI + 170 = /dev/thinkpad/thinkpad IBM Thinkpad devices 171 = /dev/srripc QNX4 API IPC manager 172 = /dev/usemaclone Semaphore clone device 173 = /dev/ipmikcs Intelligent Platform Management @@ -385,7 +394,7 @@ 180 = /dev/vrbuttons Vr41xx button input device 181 = /dev/toshiba Toshiba laptop SMM support 182 = /dev/perfctr Performance-monitoring counters - 183 = /dev/intel_rng Intel i8x0 random number generator + 183 = /dev/hwrng Generic random number generator 184 = /dev/cpu/microcode CPU microcode update interface 186 = /dev/atomicps Atomic shapshot of process state data 187 = /dev/irnet IrNET device @@ -421,20 +430,27 @@ 221 = /dev/mvista/hssdsi Montavista PICMG hot swap system driver 222 = /dev/mvista/hasi Montavista PICMG high availability 223 = /dev/input/uinput User level driver support for input - 240-255 Reserved for local use + 224 = /dev/tpm TCPA TPM driver + 225 = /dev/pps Pulse Per Second driver + 226 = /dev/systrace Systrace device + 227 = /dev/mcelog X86_64 Machine Check Exception driver + 240-254 Reserved for local use + 255 Reserved for MISC_DYNAMIC_MINOR - 11 char Raw keyboard device + 11 char Raw keyboard device (Linux/SPARC only) 0 = /dev/kbd Raw keyboard device - The raw keyboard device is used on Linux/SPARC only. + 11 char Serial Mux device (Linux/PA-RISC only) + 0 = /dev/ttyB0 First mux port + 1 = /dev/ttyB1 Second mux port + ... - block SCSI CD-ROM devices - 0 = /dev/sr0 First SCSI CD-ROM - 1 = /dev/sr1 Second SCSI CD-ROM + 11 block SCSI CD-ROM devices + 0 = /dev/scd0 First SCSI CD-ROM + 1 = /dev/scd1 Second SCSI CD-ROM ... - The prefix /dev/scd instead of /dev/sr has been used - as well, and might make more sense. + The prefix /dev/sr (instead of /dev/scd) has been deprecated. 12 char QIC-02 tape 2 = /dev/ntpqic11 QIC-11, no rewind-on-close @@ -449,7 +465,7 @@ The device names specified are proposed -- if there are "standard" names for these devices, please let me know. - block MSCDEX CD-ROM callback support {2.6} + 12 block MSCDEX CD-ROM callback support {2.6} 0 = /dev/dos_cd0 First MSCDEX CD-ROM 1 = /dev/dos_cd1 Second MSCDEX CD-ROM ... @@ -468,7 +484,7 @@ Each device type has 5 bits (32 minors). - block 8-bit MFM/RLL/IDE controller + 13 block 8-bit MFM/RLL/IDE controller 0 = /dev/xda First XT disk whole disk 64 = /dev/xdb Second XT disk whole disk @@ -492,7 +508,7 @@ 33 = /dev/patmgr1 Sequencer patch manager 34 = /dev/midi02 Third MIDI port 50 = /dev/midi03 Fourth MIDI port - block BIOS harddrive callback support {2.6} + 14 block BIOS harddrive callback support {2.6} 0 = /dev/dos_hda First BIOS harddrive whole disk 64 = /dev/dos_hdb Second BIOS harddrive whole disk 128 = /dev/dos_hdc Third BIOS harddrive whole disk @@ -508,33 +524,33 @@ 128 = /dev/djs0 First digital joystick 129 = /dev/djs1 Second digital joystick ... - block Sony CDU-31A/CDU-33A CD-ROM + 15 block Sony CDU-31A/CDU-33A CD-ROM 0 = /dev/sonycd Sony CDU-31a CD-ROM 16 char Non-SCSI scanners 0 = /dev/gs4500 Genius 4500 handheld scanner - block GoldStar CD-ROM + 16 block GoldStar CD-ROM 0 = /dev/gscd GoldStar CD-ROM 17 char Chase serial card 0 = /dev/ttyH0 First Chase port 1 = /dev/ttyH1 Second Chase port ... - block Optics Storage CD-ROM + 17 block Optics Storage CD-ROM 0 = /dev/optcd Optics Storage CD-ROM 18 char Chase serial card - alternate devices 0 = /dev/cuh0 Callout device for ttyH0 1 = /dev/cuh1 Callout device for ttyH1 ... - block Sanyo CD-ROM + 18 block Sanyo CD-ROM 0 = /dev/sjcd Sanyo CD-ROM 19 char Cyclades serial card 0 = /dev/ttyC0 First Cyclades port ... 31 = /dev/ttyC31 32nd Cyclades port - block "Double" compressed disk + 19 block "Double" compressed disk 0 = /dev/double0 First compressed disk ... 7 = /dev/double7 Eighth compressed disk @@ -549,7 +565,7 @@ 0 = /dev/cub0 Callout device for ttyC0 ... 31 = /dev/cub31 Callout device for ttyC31 - block Hitachi CD-ROM (under development) + 20 block Hitachi CD-ROM (under development) 0 = /dev/hitcd Hitachi CD-ROM 21 char Generic SCSI access @@ -562,7 +578,7 @@ the system and is counter to standard Linux device-naming practice. - block Acorn MFM hard drive interface + 21 block Acorn MFM hard drive interface 0 = /dev/mfma First MFM drive whole disk 64 = /dev/mfmb Second MFM drive whole disk @@ -574,7 +590,7 @@ 0 = /dev/ttyD0 First Digiboard port 1 = /dev/ttyD1 Second Digiboard port ... - block Second IDE hard disk/CD-ROM interface + 22 block Second IDE hard disk/CD-ROM interface 0 = /dev/hdc Master: whole disk (or CD-ROM) 64 = /dev/hdd Slave: whole disk (or CD-ROM) @@ -585,7 +601,7 @@ 0 = /dev/cud0 Callout device for ttyD0 1 = /dev/cud1 Callout device for ttyD1 ... - block Mitsumi proprietary CD-ROM + 23 block Mitsumi proprietary CD-ROM 0 = /dev/mcd Mitsumi CD-ROM 24 char Stallion serial card @@ -601,7 +617,7 @@ 192 = /dev/ttyE192 Stallion port 0 card 3 193 = /dev/ttyE193 Stallion port 1 card 3 ... - block Sony CDU-535 CD-ROM + 24 block Sony CDU-535 CD-ROM 0 = /dev/cdu535 Sony CDU-535 CD-ROM 25 char Stallion serial card - alternate devices @@ -617,7 +633,7 @@ 192 = /dev/cue192 Callout device for ttyE192 193 = /dev/cue193 Callout device for ttyE193 ... - block First Matsushita (Panasonic/SoundBlaster) CD-ROM + 25 block First Matsushita (Panasonic/SoundBlaster) CD-ROM 0 = /dev/sbpcd0 Panasonic CD-ROM controller 0 unit 0 1 = /dev/sbpcd1 Panasonic CD-ROM controller 0 unit 1 2 = /dev/sbpcd2 Panasonic CD-ROM controller 0 unit 2 @@ -625,7 +641,7 @@ 26 char Quanta WinVision frame grabber {2.6} 0 = /dev/wvisfgrab Quanta WinVision frame grabber - block Second Matsushita (Panasonic/SoundBlaster) CD-ROM + 26 block Second Matsushita (Panasonic/SoundBlaster) CD-ROM 0 = /dev/sbpcd4 Panasonic CD-ROM controller 1 unit 0 1 = /dev/sbpcd5 Panasonic CD-ROM controller 1 unit 1 2 = /dev/sbpcd6 Panasonic CD-ROM controller 1 unit 2 @@ -656,7 +672,7 @@ 37 = /dev/nrawqft1 Unit 1, no rewind-on-close, no file marks 38 = /dev/nrawqft2 Unit 2, no rewind-on-close, no file marks 39 = /dev/nrawqft3 Unit 3, no rewind-on-close, no file marks - block Third Matsushita (Panasonic/SoundBlaster) CD-ROM + 27 block Third Matsushita (Panasonic/SoundBlaster) CD-ROM 0 = /dev/sbpcd8 Panasonic CD-ROM controller 2 unit 0 1 = /dev/sbpcd9 Panasonic CD-ROM controller 2 unit 1 2 = /dev/sbpcd10 Panasonic CD-ROM controller 2 unit 2 @@ -667,16 +683,16 @@ 1 = /dev/staliomem1 Second Stallion card I/O memory 2 = /dev/staliomem2 Third Stallion card I/O memory 3 = /dev/staliomem3 Fourth Stallion card I/O memory - char Atari SLM ACSI laser printer (68k/Atari) + 28 char Atari SLM ACSI laser printer (68k/Atari) 0 = /dev/slm0 First SLM laser printer 1 = /dev/slm1 Second SLM laser printer ... - block Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM + 28 block Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM 0 = /dev/sbpcd12 Panasonic CD-ROM controller 3 unit 0 1 = /dev/sbpcd13 Panasonic CD-ROM controller 3 unit 1 2 = /dev/sbpcd14 Panasonic CD-ROM controller 3 unit 2 3 = /dev/sbpcd15 Panasonic CD-ROM controller 3 unit 3 - block ACSI disk (68k/Atari) + 28 block ACSI disk (68k/Atari) 0 = /dev/ada First ACSI disk whole disk 16 = /dev/adb Second ACSI disk whole disk 32 = /dev/adc Third ACSI disk whole disk @@ -693,23 +709,41 @@ ... 31 = /dev/fb31 32nd frame buffer - block Aztech/Orchid/Okano/Wearnes CD-ROM + 29 block Aztech/Orchid/Okano/Wearnes CD-ROM 0 = /dev/aztcd Aztech CD-ROM 30 char iBCS-2 compatibility devices 0 = /dev/socksys Socket access 1 = /dev/spx SVR3 local X interface - 2 = /dev/inet/arp Network access - 2 = /dev/inet/icmp Network access - 2 = /dev/inet/ip Network access - 2 = /dev/inet/udp Network access - 2 = /dev/inet/tcp Network access - - Additionally, iBCS-2 requires /dev/nfsd to be a link - to /dev/socksys, and /dev/X0R to be a link to - /dev/null. + 32 = /dev/inet/ip Network access + 33 = /dev/inet/icmp + 34 = /dev/inet/ggp + 35 = /dev/inet/ipip + 36 = /dev/inet/tcp + 37 = /dev/inet/egp + 38 = /dev/inet/pup + 39 = /dev/inet/udp + 40 = /dev/inet/idp + 41 = /dev/inet/rawip + + Additionally, iBCS-2 requires the following links: + + /dev/ip -> /dev/inet/ip + /dev/icmp -> /dev/inet/icmp + /dev/ggp -> /dev/inet/ggp + /dev/ipip -> /dev/inet/ipip + /dev/tcp -> /dev/inet/tcp + /dev/egp -> /dev/inet/egp + /dev/pup -> /dev/inet/pup + /dev/udp -> /dev/inet/udp + /dev/idp -> /dev/inet/idp + /dev/rawip -> /dev/inet/rawip + /dev/inet/arp -> /dev/inet/udp + /dev/inet/rip -> /dev/inet/udp + /dev/nfsd -> /dev/socksys + /dev/X0R -> /dev/null (? apparently not required ?) - block Philips LMS CM-205 CD-ROM + 30 block Philips LMS CM-205 CD-ROM 0 = /dev/cm205cd Philips LMS CM-205 CD-ROM /dev/lmscd is an older name for this device. This @@ -718,7 +752,7 @@ 31 char MPU-401 MIDI 0 = /dev/mpu401data MPU-401 data port 1 = /dev/mpu401stat MPU-401 status port - block ROM/flash memory card + 31 block ROM/flash memory card 0 = /dev/rom0 First ROM card (rw) ... 7 = /dev/rom7 Eighth ROM card (rw) @@ -741,14 +775,14 @@ 0 = /dev/ttyX0 First Specialix port 1 = /dev/ttyX1 Second Specialix port ... - block Philips LMS CM-206 CD-ROM + 32 block Philips LMS CM-206 CD-ROM 0 = /dev/cm206cd Philips LMS CM-206 CD-ROM 33 char Specialix serial card - alternate devices 0 = /dev/cux0 Callout device for ttyX0 1 = /dev/cux1 Callout device for ttyX1 ... - block Third IDE hard disk/CD-ROM interface + 33 block Third IDE hard disk/CD-ROM interface 0 = /dev/hde Master: whole disk (or CD-ROM) 64 = /dev/hdf Slave: whole disk (or CD-ROM) @@ -766,7 +800,7 @@ /dev/sc1 for /dev/scc0, /dev/sc2 for /dev/scc1, and so on. - block Fourth IDE hard disk/CD-ROM interface + 34 block Fourth IDE hard disk/CD-ROM interface 0 = /dev/hdg Master: whole disk (or CD-ROM) 64 = /dev/hdh Slave: whole disk (or CD-ROM) @@ -786,7 +820,7 @@ 129 = /dev/smpte1 Second MIDI port, SMPTE timed 130 = /dev/smpte2 Third MIDI port, SMPTE timed 131 = /dev/smpte3 Fourth MIDI port, SMPTE timed - block Slow memory ramdisk + 35 block Slow memory ramdisk 0 = /dev/slram Slow memory ramdisk 36 char Netlink support @@ -796,7 +830,7 @@ 16 = /dev/tap0 First Ethertap device ... 31 = /dev/tap15 16th Ethertap device - block MCA ESDI hard disk + 36 block MCA ESDI hard disk 0 = /dev/eda First ESDI disk whole disk 64 = /dev/edb Second ESDI disk whole disk ... @@ -814,7 +848,7 @@ Currently, only one IDE tape drive is supported. - block Zorro II ramdisk + 37 block Zorro II ramdisk 0 = /dev/z2ram Zorro II ramdisk 38 char Myricom PCI Myrinet board @@ -826,7 +860,7 @@ and "user level packet I/O." This board is also accessible as a standard networking "eth" device. - block Reserved for Linux/AP+ + 38 block Reserved for Linux/AP+ 39 char ML-16P experimental I/O board 0 = /dev/ml16pa-a0 First card, first analog channel @@ -846,11 +880,11 @@ 50 = /dev/ml16pb-c1 Second card, second counter/timer 51 = /dev/ml16pb-c2 Second card, third counter/timer ... - block Reserved for Linux/AP+ + 39 block Reserved for Linux/AP+ 40 char Matrox Meteor frame grabber {2.6} 0 = /dev/mmetfgrab Matrox Meteor frame grabber - block Syquest EZ135 parallel port removable drive + 40 block Syquest EZ135 parallel port removable drive 0 = /dev/eza Parallel EZ135 drive, whole disk This device is obsolete and will be removed in a @@ -861,14 +895,15 @@ 41 char Yet Another Micro Monitor 0 = /dev/yamm Yet Another Micro Monitor - block MicroSolutions BackPack parallel port CD-ROM + 41 block MicroSolutions BackPack parallel port CD-ROM 0 = /dev/bpcd BackPack CD-ROM This device is obsolete and will be removed in a future version of Linux. It has been replaced with the parallel port ATAPI CD-ROM driver at major number 46. - 42 Demo/sample use + 42 char Demo/sample use + 42 block Demo/sample use This number is intended for use in sample code, as well as a general "example" device number. It @@ -885,7 +920,7 @@ 0 = /dev/ttyI0 First virtual modem ... 63 = /dev/ttyI63 64th virtual modem - block Network block devices + 43 block Network block devices 0 = /dev/nb0 First network block device 1 = /dev/nb1 Second network block device ... @@ -901,7 +936,7 @@ 0 = /dev/cui0 Callout device for ttyI0 ... 63 = /dev/cui63 Callout device for ttyI63 - block Flash Translatio Layer (FTL) filesystems + 44 block Flash Translation Layer (FTL) filesystems 0 = /dev/ftla FTL on first Memory Technology Device 16 = /dev/ftlb FTL on second Memory Technology Device 32 = /dev/ftlc FTL on third Memory Technology Device @@ -925,7 +960,7 @@ 191 = /dev/ippp63 64th SyncPPP device 255 = /dev/isdninfo ISDN monitor interface - block Parallel port IDE disk devices + 45 block Parallel port IDE disk devices 0 = /dev/pda First parallel port IDE disk 16 = /dev/pdb Second parallel port IDE disk 32 = /dev/pdc Third parallel port IDE disk @@ -939,7 +974,7 @@ 0 = /dev/ttyR0 First Rocketport port 1 = /dev/ttyR1 Second Rocketport port ... - block Parallel port ATAPI CD-ROM devices + 46 block Parallel port ATAPI CD-ROM devices 0 = /dev/pcd0 First parallel port ATAPI CD-ROM 1 = /dev/pcd1 Second parallel port ATAPI CD-ROM 2 = /dev/pcd2 Third parallel port ATAPI CD-ROM @@ -949,7 +984,7 @@ 0 = /dev/cur0 Callout device for ttyR0 1 = /dev/cur1 Callout device for ttyR1 ... - block Parallel port ATAPI disk devices + 47 block Parallel port ATAPI disk devices 0 = /dev/pf0 First parallel port ATAPI disk 1 = /dev/pf1 Second parallel port ATAPI disk 2 = /dev/pf2 Third parallel port ATAPI disk @@ -962,7 +997,7 @@ 0 = /dev/ttyL0 First RISCom port 1 = /dev/ttyL1 Second RISCom port ... - block Mylex DAC960 PCI RAID controller; first controller + 48 block Mylex DAC960 PCI RAID controller; first controller 0 = /dev/rd/c0d0 First disk, whole disk 8 = /dev/rd/c0d1 Second disk, whole disk ... @@ -978,7 +1013,7 @@ 0 = /dev/cul0 Callout device for ttyL0 1 = /dev/cul1 Callout device for ttyL1 ... - block Mylex DAC960 PCI RAID controller; second controller + 49 block Mylex DAC960 PCI RAID controller; second controller 0 = /dev/rd/c1d0 First disk, whole disk 8 = /dev/rd/c1d1 Second disk, whole disk ... @@ -988,17 +1023,17 @@ 50 char Reserved for GLINT - block Mylex DAC960 PCI RAID controller; third controller + 50 block Mylex DAC960 PCI RAID controller; third controller 0 = /dev/rd/c2d0 First disk, whole disk 8 = /dev/rd/c2d1 Second disk, whole disk ... 248 = /dev/rd/c2d31 32nd disk, whole disk - 51 char Baycom radio modem + 51 char Baycom radio modem OR Radio Tech BIM-XXX-RS232 radio modem 0 = /dev/bc0 First Baycom radio modem 1 = /dev/bc1 Second Baycom radio modem ... - block Mylex DAC960 PCI RAID controller; fourth controller + 51 block Mylex DAC960 PCI RAID controller; fourth controller 0 = /dev/rd/c3d0 First disk, whole disk 8 = /dev/rd/c3d1 Second disk, whole disk ... @@ -1011,7 +1046,7 @@ 1 = /dev/dcbri1 Second DataComm card 2 = /dev/dcbri2 Third DataComm card 3 = /dev/dcbri3 Fourth DataComm card - block Mylex DAC960 PCI RAID controller; fifth controller + 52 block Mylex DAC960 PCI RAID controller; fifth controller 0 = /dev/rd/c4d0 First disk, whole disk 8 = /dev/rd/c4d1 Second disk, whole disk ... @@ -1033,7 +1068,7 @@ Domain Interface and ICD is the commercial interface by P&E. - block Mylex DAC960 PCI RAID controller; sixth controller + 53 block Mylex DAC960 PCI RAID controller; sixth controller 0 = /dev/rd/c5d0 First disk, whole disk 8 = /dev/rd/c5d1 Second disk, whole disk ... @@ -1050,7 +1085,7 @@ to transfer data from Holter 24-hour heart monitoring equipment. - block Mylex DAC960 PCI RAID controller; seventh controller + 54 block Mylex DAC960 PCI RAID controller; seventh controller 0 = /dev/rd/c6d0 First disk, whole disk 8 = /dev/rd/c6d1 Second disk, whole disk ... @@ -1060,7 +1095,7 @@ 55 char DSP56001 digital signal processor 0 = /dev/dsp56k First DSP56001 - block Mylex DAC960 PCI RAID controller; eigth controller + 55 block Mylex DAC960 PCI RAID controller; eigth controller 0 = /dev/rd/c7d0 First disk, whole disk 8 = /dev/rd/c7d1 Second disk, whole disk ... @@ -1074,7 +1109,7 @@ Additional devices will be added to this number, all starting with /dev/adb. - block Fifth IDE hard disk/CD-ROM interface + 56 block Fifth IDE hard disk/CD-ROM interface 0 = /dev/hdi Master: whole disk (or CD-ROM) 64 = /dev/hdj Slave: whole disk (or CD-ROM) @@ -1086,7 +1121,7 @@ 1 = /dev/ttyP1 Second ESP port ... - block Sixth IDE hard disk/CD-ROM interface + 57 block Sixth IDE hard disk/CD-ROM interface 0 = /dev/hdk Master: whole disk (or CD-ROM) 64 = /dev/hdl Slave: whole disk (or CD-ROM) @@ -1097,12 +1132,12 @@ 0 = /dev/cup0 Callout device for ttyP0 1 = /dev/cup1 Callout device for ttyP1 ... - block Reserved for logical volume manager + 58 block Reserved for logical volume manager 59 char sf firewall package 0 = /dev/firewall Communication with sf kernel module - block Generic PDA filesystem device + 59 block Generic PDA filesystem device 0 = /dev/pda0 First PDA device 1 = /dev/pda1 Second PDA device ... @@ -1115,14 +1150,30 @@ NAMING CONFLICT -- PROPOSED REVISED NAME /dev/rpda0 etc - 60-63 LOCAL/EXPERIMENTAL USE + 60-63 char LOCAL/EXPERIMENTAL USE + 60-63 block LOCAL/EXPERIMENTAL USE Allocated for local/experimental use. For devices not assigned official numbers, these ranges should be - used, in order to avoid conflicting with future assignments. + used in order to avoid conflicting with future assignments. 64 char ENskip kernel encryption package 0 = /dev/enskip Communication with ENskip kernel module + 64 block Scramdisk/DriveCrypt encrypted devices + 0 = /dev/scramdisk/master Master node for ioctls + 1 = /dev/scramdisk/1 First encrypted device + 2 = /dev/scramdisk/2 Second encrypted device + ... + 255 = /dev/scramdisk/255 255th encrypted device + + The filename of the encrypted container and the passwords + are sent via ioctls (using the sdmount tool) to the master + node which then activates them via one of the + /dev/scramdisk/x nodes for loopback mounting (all handled + through the sdmount tool). + + Requested by: andy@scramdisklinux.org + 65 char Sundance "plink" Transputer boards 0 = /dev/plink0 First plink device 1 = /dev/plink1 Second plink device @@ -1144,10 +1195,10 @@ This is a commercial driver; contact James Howes for information. - block SCSI disk devices (16-31) - 0 = /dev/sdq 16th SCSI disk whole disk - 16 = /dev/sdr 17th SCSI disk whole disk - 32 = /dev/sds 18th SCSI disk whole disk + 65 block SCSI disk devices (16-31) + 0 = /dev/sdq 17th SCSI disk whole disk + 16 = /dev/sdr 18th SCSI disk whole disk + 32 = /dev/sds 19th SCSI disk whole disk ... 240 = /dev/sdaf 32nd SCSI disk whole disk @@ -1160,7 +1211,7 @@ 1 = /dev/yppcpci1 Second YARC card ... - block SCSI disk devices (32-47) + 66 block SCSI disk devices (32-47) 0 = /dev/sdag 33th SCSI disk whole disk 16 = /dev/sdah 34th SCSI disk whole disk 32 = /dev/sdai 35th SCSI disk whole disk @@ -1176,7 +1227,7 @@ See http://www.coda.cs.cmu.edu for information about Coda. - block SCSI disk devices (48-63) + 67 block SCSI disk devices (48-63) 0 = /dev/sdaw 49th SCSI disk whole disk 16 = /dev/sdax 50th SCSI disk whole disk 32 = /dev/sday 51st SCSI disk whole disk @@ -1197,10 +1248,10 @@ ISDN CAPI 2.0 driver for use with CAPI 2.0 applications; currently supports the AVM B1 card. - block SCSI disk devices (64-79) - 0 = /dev/sdbm 64th SCSI disk whole disk - 16 = /dev/sdbn 65th SCSI disk whole disk - 32 = /dev/sdbo 66th SCSI disk whole disk + 68 block SCSI disk devices (64-79) + 0 = /dev/sdbm 65th SCSI disk whole disk + 16 = /dev/sdbn 66th SCSI disk whole disk + 32 = /dev/sdbo 67th SCSI disk whole disk ... 240 = /dev/sdcb 80th SCSI disk whole disk @@ -1211,7 +1262,7 @@ 69 char MA16 numeric accelerator card 0 = /dev/ma16 Board memory access - block SCSI disk devices (80-95) + 69 block SCSI disk devices (80-95) 0 = /dev/sdcc 81st SCSI disk whole disk 16 = /dev/sdcd 82nd SCSI disk whole disk 32 = /dev/sdce 83th SCSI disk whole disk @@ -1231,7 +1282,7 @@ 65 = /dev/apsasync Async command interface 128 = /dev/apsmon Monitor interface - block SCSI disk devices (96-111) + 70 block SCSI disk devices (96-111) 0 = /dev/sdcs 97th SCSI disk whole disk 16 = /dev/sdct 98th SCSI disk whole disk 32 = /dev/sdcu 99th SCSI disk whole disk @@ -1260,7 +1311,7 @@ ... 255 = /dev/ttyF255 IntelliPort II board 3, port 63 - block SCSI disk devices (112-127) + 71 block SCSI disk devices (112-127) 0 = /dev/sddi 113th SCSI disk whole disk 16 = /dev/sddj 114th SCSI disk whole disk 32 = /dev/sddk 115th SCSI disk whole disk @@ -1289,7 +1340,7 @@ ... 255 = /dev/cuf255 Callout device for ttyF255 - block Compaq Intelligent Drive Array, first controller + 72 block Compaq Intelligent Drive Array, first controller 0 = /dev/ida/c0d0 First logical drive whole disk 16 = /dev/ida/c0d1 Second logical drive whole disk ... @@ -1309,7 +1360,7 @@ 12 = /dev/ip2ipl3 Loadware device for board 3 13 = /dev/ip2stat3 Status device for board 3 - block Compaq Intelligent Drive Array, second controller + 73 block Compaq Intelligent Drive Array, second controller 0 = /dev/ida/c1d0 First logical drive whole disk 16 = /dev/ida/c1d1 Second logical drive whole disk ... @@ -1327,7 +1378,7 @@ Currently for Dolphin Interconnect Solutions' PCI-SCI bridge. - block Compaq Intelligent Drive Array, third controller + 74 block Compaq Intelligent Drive Array, third controller 0 = /dev/ida/c2d0 First logical drive whole disk 16 = /dev/ida/c2d1 Second logical drive whole disk ... @@ -1344,7 +1395,7 @@ 8 = /dev/ttyW8 First IO8+ port, second card ... - block Compaq Intelligent Drive Array, fourth controller + 75 block Compaq Intelligent Drive Array, fourth controller 0 = /dev/ida/c3d0 First logical drive whole disk 16 = /dev/ida/c3d1 Second logical drive whole disk ... @@ -1361,7 +1412,7 @@ 8 = /dev/cuw8 Callout device for ttyW8 ... - block Compaq Intelligent Drive Array, fifth controller + 76 block Compaq Intelligent Drive Array, fifth controller 0 = /dev/ida/c4d0 First logical drive whole disk 16 = /dev/ida/c4d1 Second logical drive whole disk ... @@ -1375,7 +1426,7 @@ 77 char ComScire Quantum Noise Generator 0 = /dev/qng ComScire Quantum Noise Generator - block Compaq Intelligent Drive Array, sixth controller + 77 block Compaq Intelligent Drive Array, sixth controller 0 = /dev/ida/c5d0 First logical drive whole disk 16 = /dev/ida/c5d1 Second logical drive whole disk ... @@ -1391,7 +1442,7 @@ 1 = /dev/ttyM1 Second PAM modem ... - block Compaq Intelligent Drive Array, seventh controller + 78 block Compaq Intelligent Drive Array, seventh controller 0 = /dev/ida/c6d0 First logical drive whole disk 16 = /dev/ida/c6d1 Second logical drive whole disk ... @@ -1407,7 +1458,7 @@ 1 = /dev/cum1 Callout device for ttyM1 ... - block Compaq Intelligent Drive Array, eigth controller + 79 block Compaq Intelligent Drive Array, eigth controller 0 = /dev/ida/c7d0 First logical drive whole disk 16 = /dev/ida/c7d1 Second logical drive whole disk ... @@ -1421,7 +1472,7 @@ 80 char Photometrics AT200 CCD camera 0 = /dev/at200 Photometrics AT200 CCD camera - block I2O hard disk + 80 block I2O hard disk 0 = /dev/i2o/hda First I2O hard disk, whole disk 16 = /dev/i2o/hdb Second I2O hard disk, whole disk ... @@ -1445,7 +1496,7 @@ ... 255 = /dev/vbi31 Vertical blank interrupt - block I2O hard disk + 81 block I2O hard disk 0 = /dev/i2o/hdq 17th I2O hard disk, whole disk 16 = /dev/i2o/hdr 18th I2O hard disk, whole disk ... @@ -1463,7 +1514,7 @@ The driver and documentation may be obtained from http://www.proximity.com.au/~brian/winradio/ - block I2O hard disk + 82 block I2O hard disk 0 = /dev/i2o/hdag 33rd I2O hard disk, whole disk 16 = /dev/i2o/hdah 34th I2O hard disk, whole disk ... @@ -1480,7 +1531,7 @@ Devices for the driver contained in the VideoteXt package. More information on http://home.pages.de/~videotext/ - block I2O hard disk + 83 block I2O hard disk 0 = /dev/i2o/hdaw 49th I2O hard disk, whole disk 16 = /dev/i2o/hdax 50th I2O hard disk, whole disk ... @@ -1494,7 +1545,7 @@ 0 = /dev/ihcp0 First Greensheet port 1 = /dev/ihcp1 Second Greensheet port - block I2O hard disk + 84 block I2O hard disk 0 = /dev/i2o/hdbm 65th I2O hard disk, whole disk 16 = /dev/i2o/hdbn 66th I2O hard disk, whole disk ... @@ -1510,7 +1561,7 @@ 2 = /dev/qcntl1 Second device pushed ... - block I2O hard disk + 85 block I2O hard disk 0 = /dev/i2o/hdcc 81st I2O hard disk, whole disk 16 = /dev/i2o/hdcd 82nd I2O hard disk, whole disk ... @@ -1525,7 +1576,7 @@ 1 = /dev/sch1 Second SCSI media changer ... - block I2O hard disk + 86 block I2O hard disk 0 = /dev/i2o/hdcs 97th I2O hard disk, whole disk 16 = /dev/i2o/hdct 98th I2O hard disk, whole disk ... @@ -1540,7 +1591,7 @@ 1 = /dev/controla1 Second device on chain ... - block I2O hard disk + 87 block I2O hard disk 0 = /dev/i2o/hddi 113rd I2O hard disk, whole disk 16 = /dev/i2o/hddj 114th I2O hard disk, whole disk ... @@ -1555,7 +1606,7 @@ 1 = /dev/comx1 COMX channel 1 ... - block Seventh IDE hard disk/CD-ROM interface + 88 block Seventh IDE hard disk/CD-ROM interface 0 = /dev/hdm Master: whole disk (or CD-ROM) 64 = /dev/hdn Slave: whole disk (or CD-ROM) @@ -1567,7 +1618,7 @@ 1 = /dev/i2c-1 Second I2C adapter ... - block Eighth IDE hard disk/CD-ROM interface + 89 block Eighth IDE hard disk/CD-ROM interface 0 = /dev/hdo Master: whole disk (or CD-ROM) 64 = /dev/hdp Slave: whole disk (or CD-ROM) @@ -1581,7 +1632,7 @@ 30 = /dev/mtd15 16th MTD (rw) 31 = /dev/mtdr15 16th MTD (ro) - block Ninth IDE hard disk/CD-ROM interface + 90 block Ninth IDE hard disk/CD-ROM interface 0 = /dev/hdq Master: whole disk (or CD-ROM) 64 = /dev/hdr Slave: whole disk (or CD-ROM) @@ -1593,7 +1644,7 @@ 1 = /dev/can1 Second CAN-Bus controller ... - block Tenth IDE hard disk/CD-ROM interface + 91 block Tenth IDE hard disk/CD-ROM interface 0 = /dev/hds Master: whole disk (or CD-ROM) 64 = /dev/hdt Slave: whole disk (or CD-ROM) @@ -1602,7 +1653,7 @@ 92 char Reserved for ith Kommunikationstechnik MIC ISDN card - block PPDD encrypted disk driver + 92 block PPDD encrypted disk driver 0 = /dev/ppdd0 First encrypted disk 1 = /dev/ppdd1 Second encrypted disk ... @@ -1619,7 +1670,7 @@ 129 = /dev/isccctl1 Second Smart Capture Card control ... - block NAND Flash Translation Layer filesystem + 93 block NAND Flash Translation Layer filesystem 0 = /dev/nftla First NFTL layer 16 = /dev/nftlb Second NFTL layer ... @@ -1630,16 +1681,11 @@ 1 = /dev/dcxx1 Second capture card ... - block IBM S/390 DASD block storage - 0 = /dev/dasda First DASD device, major - 1 = /dev/dasda1 First DASD device, block 1 - 2 = /dev/dasda2 First DASD device, block 2 - 3 = /dev/dasda3 First DASD device, block 3 - 4 = /dev/dasdb Second DASD device, major - 5 = /dev/dasdb1 Second DASD device, block 1 - 6 = /dev/dasdb2 Second DASD device, block 2 - 7 = /dev/dasdb3 Second DASD device, block 3 + 94 block Inverse NAND Flash Translation Layer + 0 = /dev/inftla First INFTL layer + 16 = /dev/inftlb Second INFTL layer ... + 240 = /dev/inftlp 16th INTFL layer 95 char IP filter 0 = /dev/ipl Filter control device/log file @@ -1648,9 +1694,15 @@ 3 = /dev/ipauth Authentication control device/log file ... - block IBM S/390 VM/ESA minidisk - 0 = /dev/mnda First VM/ESA minidisk - 1 = /dev/mndb Second VM/ESA minidisk + 95 block IBM S/390 DASD block storage + 0 = /dev/dasd0 First DASD device, major + 1 = /dev/dasd0a First DASD device, block 1 + 2 = /dev/dasd0b First DASD device, block 2 + 3 = /dev/dasd0c First DASD device, block 3 + 4 = /dev/dasd1 Second DASD device, major + 5 = /dev/dasd1a Second DASD device, block 1 + 6 = /dev/dasd1b Second DASD device, block 2 + 7 = /dev/dasd1c Second DASD device, block 3 ... 96 char Parallel port ATAPI tape devices @@ -1661,6 +1713,11 @@ 129 = /dev/npt1 Second p.p. ATAPI tape, no rewind ... + 96 block IBM S/390 VM/ESA minidisk + 0 = /dev/msd0 First VM/ESA minidisk + 1 = /dev/msd1 Second VM/ESA minidisk + ... + 97 char Parallel port generic ATAPI interface 0 = /dev/pg0 First parallel port ATAPI device 1 = /dev/pg1 Second parallel port ATAPI device @@ -1670,7 +1727,7 @@ These devices support the same API as the generic SCSI devices. - block Packet writing for CD/DVD devices + 97 block Packet writing for CD/DVD devices 0 = /dev/pktcdvd0 First packet-writing module 1 = /dev/pktcdvd1 Second packet-writing module ... @@ -1682,7 +1739,7 @@ See http://stm.lbl.gov/comedi or http://www.llp.fu-berlin.de/. - block User-mode virtual block device + 98 block User-mode virtual block device 0 = /dev/ubd0 First user-mode block device 1 = /dev/ubd1 Second user-mode block device ... @@ -1694,7 +1751,7 @@ 1 = /dev/parport1 Second parallel port ... - block JavaStation flash disk + 99 block JavaStation flash disk 0 = /dev/jsfd JavaStation flash disk 100 char Telephony for Linux @@ -1708,7 +1765,7 @@ ... 16 = /dev/mdsp16 16th DSP board I/O controls - block AMI HyperDisk RAID controller +101 block AMI HyperDisk RAID controller 0 = /dev/amiraid/ar0 First array whole disk 16 = /dev/amiraid/ar1 Second array whole disk ... @@ -1727,7 +1784,7 @@ 2 = /dev/tlk2 Third Teletext decoder 3 = /dev/tlk3 Fourth Teletext decoder - block Compressed block device +102 block Compressed block device 0 = /dev/cbd/a First compressed block device, whole device 16 = /dev/cbd/b Second compressed block device, whole device ... @@ -1747,12 +1804,12 @@ to the arla announce mailing list by sending a mail to . - block Audit device +103 block Audit device 0 = /dev/audit Audit device 104 char Flash BIOS support - block Compaq Next Generation Drive Array, first controller +104 block Compaq Next Generation Drive Array, first controller 0 = /dev/cciss/c0d0 First logical drive, whole disk 16 = /dev/cciss/c0d1 Second logical drive, whole disk ... @@ -1767,7 +1824,7 @@ 1 = /dev/ttyV1 Second VS-1000 port ... - block Compaq Next Generation Drive Array, second controller +105 block Compaq Next Generation Drive Array, second controller 0 = /dev/cciss/c1d0 First logical drive, whole disk 16 = /dev/cciss/c1d1 Second logical drive, whole disk ... @@ -1782,7 +1839,7 @@ 1 = /dev/cuv1 Second VS-1000 port ... - block Compaq Next Generation Drive Array, third controller +106 block Compaq Next Generation Drive Array, third controller 0 = /dev/cciss/c2d0 First logical drive, whole disk 16 = /dev/cciss/c2d1 Second logical drive, whole disk ... @@ -1795,7 +1852,7 @@ 107 char 3Dfx Voodoo Graphics device 0 = /dev/3dfx Primary 3Dfx graphics device - block Compaq Next Generation Drive Array, fourth controller +107 block Compaq Next Generation Drive Array, fourth controller 0 = /dev/cciss/c3d0 First logical drive, whole disk 16 = /dev/cciss/c3d1 Second logical drive, whole disk ... @@ -1808,7 +1865,7 @@ 108 char Device independent PPP interface 0 = /dev/ppp Device independent PPP interface - block Compaq Next Generation Drive Array, fifth controller +108 block Compaq Next Generation Drive Array, fifth controller 0 = /dev/cciss/c4d0 First logical drive, whole disk 16 = /dev/cciss/c4d1 Second logical drive, whole disk ... @@ -1820,7 +1877,7 @@ 109 char Reserved for logical volume manager - block Compaq Next Generation Drive Array, sixth controller +109 block Compaq Next Generation Drive Array, sixth controller 0 = /dev/cciss/c5d0 First logical drive, whole disk 16 = /dev/cciss/c5d1 Second logical drive, whole disk ... @@ -1835,7 +1892,7 @@ 1 = /dev/srnd1 Second miroMEDIA Surround board ... - block Compaq Next Generation Drive Array, seventh controller +110 block Compaq Next Generation Drive Array, seventh controller 0 = /dev/cciss/c6d0 First logical drive, whole disk 16 = /dev/cciss/c6d1 Second logical drive, whole disk ... @@ -1850,7 +1907,7 @@ 1 = /dev/av1 Second A/V card ... - block Compaq Next Generation Drive Array, eigth controller +111 block Compaq Next Generation Drive Array, eigth controller 0 = /dev/cciss/c7d0 First logical drive, whole disk 16 = /dev/cciss/c7d1 Second logical drive, whole disk ... @@ -1868,14 +1925,14 @@ There is currently a device-naming conflict between these and PAM multimodems (major 78). - block IBM iSeries virtual disk +112 block IBM iSeries virtual disk 0 = /dev/iseries/vda First virtual disk, whole disk 8 = /dev/iseries/vdb Second virtual disk, whole disk ... 200 = /dev/iseries/vdz 26th virtual disk, whole disk 208 = /dev/iseries/vdaa 27th virtual disk, whole disk ... - 240 = /dev/iseries/vdaf 32nd virtual disk, whole disk + 248 = /dev/iseries/vdaf 32nd virtual disk, whole disk Partitions are handled in the same way as for IDE disks (see major number 3) except that the limit on @@ -1886,7 +1943,7 @@ 1 = /dev/cum1 Callout device for ttyM1 ... - block IBM iSeries virtual CD-ROM +113 block IBM iSeries virtual CD-ROM 0 = /dev/iseries/vcda First virtual CD-ROM 1 = /dev/iseries/vcdb Second virtual CD-ROM @@ -1905,13 +1962,69 @@ I/O access to the board, the /dev/isex0 nodes command nodes used to control the board. -115 char Console driver speaker - 0 = /dev/speaker Speaker device file +114 block IDE BIOS powered software RAID interfaces such as the + Promise Fastrak + + 0 = /dev/ataraid/d0 + 1 = /dev/ataraid/d0p1 + 2 = /dev/ataraid/d0p2 + ... + 16 = /dev/ataraid/d1 + 17 = /dev/ataraid/d1p1 + 18 = /dev/ataraid/d1p2 + ... + 255 = /dev/ataraid/d15p15 + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + +115 char TI link cable devices (115 was formerly the console driver speaker) + 0 = /dev/tipar0 Parallel cable on first parallel port + ... + 7 = /dev/tipar7 Parallel cable on seventh parallel port + + 8 = /dev/tiser0 Serial cable on first serial port + ... + 15 = /dev/tiser7 Serial cable on seventh serial port + + 16 = /dev/tiusb0 First USB cable + ... + 47 = /dev/tiusb31 32nd USB cable - Plays music using IBM BASIC style strings. +115 block NetWare (NWFS) Devices (0-255) + + The NWFS (NetWare) devices are used to present a + collection of NetWare Mirror Groups or NetWare + Partitions as a logical storage segment for + use in mounting NetWare volumes. A maximum of + 256 NetWare volumes can be supported in a single + machine. + + http://www.kernel.org/pub/linux/kernel/people/jmerkey/nwfs + + 0 = /dev/nwfs/v0 First NetWare (NWFS) Logical Volume + 1 = /dev/nwfs/v1 Second NetWare (NWFS) Logical Volume + 2 = /dev/nwfs/v2 Third NetWare (NWFS) Logical Volume + ... + 255 = /dev/nwfs/v255 Last NetWare (NWFS) Logical Volume 116 char Advanced Linux Sound Driver (ALSA) +116 block MicroMemory battery backed RAM adapter (NVRAM) + Supports 16 boards, 15 paritions each. + Requested by neilb at cse.unsw.edu.au. + + 0 = /dev/umem/d0 Whole of first board + 1 = /dev/umem/d0p1 First partition of first board + 2 = /dev/umem/d0p2 Second partition of first board + 15 = /dev/umem/d0p15 15th partition of first board + + 16 = /dev/umem/d1 Whole of second board + 17 = /dev/umem/d1p1 First partition of second board + ... + 255= /dev/umem/d15p15 15th partition of 16th board. + 117 char COSA/SRP synchronous serial card 0 = /dev/cosa0c0 1st board, 1st channel 1 = /dev/cosa0c1 1st board, 2nd channel @@ -1920,6 +2033,32 @@ 17 = /dev/cosa1c1 2nd board, 2nd channel ... +117 block Enterprise Volume Management System (EVMS) + + The EVMS driver uses a layered, plug-in model to provide + unparalleled flexibility and extensibility in managing + storage. This allows for easy expansion or customization + of various levels of volume management. Requested by + Mark Peloquin (peloquin at us.ibm.com). + + Note: EVMS populates and manages all the devnodes in + /dev/evms. + + http://sf.net/projects/evms + + 0 = /dev/evms/block_device EVMS block device + 1 = /dev/evms/legacyname1 First EVMS legacy device + 2 = /dev/evms/legacyname2 Second EVMS legacy device + ... + Both ranges can grow (down or up) until they meet. + ... + 254 = /dev/evms/EVMSname2 Second EVMS native device + 255 = /dev/evms/EVMSname1 First EVMS native device + + Note: legacyname(s) are derived from the normal legacy + device names. For example, /dev/hda5 would become + /dev/evms/hda5. + 118 char Solidum ??? 0 = /dev/solnp0 1 = /dev/solnp1 @@ -1933,14 +2072,114 @@ 1 = /dev/vnet1 2nd virtual network ... -120-127 LOCAL/EXPERIMENTAL USE +120-127 char LOCAL/EXPERIMENTAL USE +120-127 block LOCAL/EXPERIMENTAL USE + Allocated for local/experimental use. For devices not + assigned official numbers, these ranges should be + used in order to avoid conflicting with future assignments. -128-135 char Unix98 PTY masters +128-135 char Unix98 PTY masters These devices should not have corresponding device nodes; instead they should be accessed through the /dev/ptmx cloning interface. + +128 block SCSI disk devices (128-143) + 0 = /dev/sddy 129th SCSI disk whole disk + 16 = /dev/sddz 130th SCSI disk whole disk + 32 = /dev/sdea 131th SCSI disk whole disk + ... + 240 = /dev/sden 144th SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + + +129 block SCSI disk devices (144-159) + 0 = /dev/sdeo 145th SCSI disk whole disk + 16 = /dev/sdep 146th SCSI disk whole disk + 32 = /dev/sdeq 147th SCSI disk whole disk + ... + 240 = /dev/sdfd 160th SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + + +130 block SCSI disk devices (160-175) + 0 = /dev/sdfe 161st SCSI disk whole disk + 16 = /dev/sdff 162nd SCSI disk whole disk + 32 = /dev/sdfg 163rd SCSI disk whole disk + ... + 240 = /dev/sdft 176th SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + +131 block SCSI disk devices (176-191) + 0 = /dev/sdfu 177th SCSI disk whole disk + 16 = /dev/sdfv 178th SCSI disk whole disk + 32 = /dev/sdfw 179th SCSI disk whole disk + ... + 240 = /dev/sdgj 192nd SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + + +132 block SCSI disk devices (192-207) + 0 = /dev/sdgk 193rd SCSI disk whole disk + 16 = /dev/sdgl 194th SCSI disk whole disk + 32 = /dev/sdgm 195th SCSI disk whole disk + ... + 240 = /dev/sdgz 208th SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + + +133 block SCSI disk devices (208-223) + 0 = /dev/sdha 209th SCSI disk whole disk + 16 = /dev/sdhb 210th SCSI disk whole disk + 32 = /dev/sdhc 211th SCSI disk whole disk + ... + 240 = /dev/sdhp 224th SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + + +134 block SCSI disk devices (224-239) + 0 = /dev/sdhq 225th SCSI disk whole disk + 16 = /dev/sdhr 226th SCSI disk whole disk + 32 = /dev/sdhs 227th SCSI disk whole disk + ... + 240 = /dev/sdif 240th SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + + +135 block SCSI disk devices (240-255) + 0 = /dev/sdig 241st SCSI disk whole disk + 16 = /dev/sdih 242nd SCSI disk whole disk + 32 = /dev/sdih 243rd SCSI disk whole disk + ... + 240 = /dev/sdiv 256th SCSI disk whole disk + + Partitions are handled in the same way as for IDE + disks (see major number 3) except that the limit on + partitions is 15. + + 136-143 char Unix98 PTY slaves 0 = /dev/pts/0 First Unix98 pseudo-TTY 1 = /dev/pts/1 Second Unix98 pesudo-TTY @@ -1953,6 +2192,70 @@ *most* distributions the appropriate options are "mode=0620,gid=".) +136 block Mylex DAC960 PCI RAID controller; ninth controller + 0 = /dev/rd/c8d0 First disk, whole disk + 8 = /dev/rd/c8d1 Second disk, whole disk + ... + 248 = /dev/rd/c8d31 32nd disk, whole disk + + Partitions are handled as for major 48. + +137 block Mylex DAC960 PCI RAID controller; tenth controller + 0 = /dev/rd/c9d0 First disk, whole disk + 8 = /dev/rd/c9d1 Second disk, whole disk + ... + 248 = /dev/rd/c9d31 32nd disk, whole disk + + Partitions are handled as for major 48. + +138 block Mylex DAC960 PCI RAID controller; eleventh controller + 0 = /dev/rd/c10d0 First disk, whole disk + 8 = /dev/rd/c10d1 Second disk, whole disk + ... + 248 = /dev/rd/c10d31 32nd disk, whole disk + + Partitions are handled as for major 48. + +139 block Mylex DAC960 PCI RAID controller; twelfth controller + 0 = /dev/rd/c11d0 First disk, whole disk + 8 = /dev/rd/c11d1 Second disk, whole disk + ... + 248 = /dev/rd/c11d31 32nd disk, whole disk + + Partitions are handled as for major 48. + +140 block Mylex DAC960 PCI RAID controller; thirteenth controller + 0 = /dev/rd/c12d0 First disk, whole disk + 8 = /dev/rd/c12d1 Second disk, whole disk + ... + 248 = /dev/rd/c12d31 32nd disk, whole disk + + Partitions are handled as for major 48. + +141 block Mylex DAC960 PCI RAID controller; fourteenth controller + 0 = /dev/rd/c13d0 First disk, whole disk + 8 = /dev/rd/c13d1 Second disk, whole disk + ... + 248 = /dev/rd/c13d31 32nd disk, whole disk + + Partitions are handled as for major 48. + +142 block Mylex DAC960 PCI RAID controller; fifteenth controller + 0 = /dev/rd/c14d0 First disk, whole disk + 8 = /dev/rd/c14d1 Second disk, whole disk + ... + 248 = /dev/rd/c14d31 32nd disk, whole disk + + Partitions are handled as for major 48. + +143 block Mylex DAC960 PCI RAID controller; sixteenth controller + 0 = /dev/rd/c15d0 First disk, whole disk + 8 = /dev/rd/c15d1 Second disk, whole disk + ... + 248 = /dev/rd/c15d31 32nd disk, whole disk + + Partitions are handled as for major 48. + 144 char Encapsulated PPP 0 = /dev/pppox0 First PPP over Ethernet ... @@ -1963,6 +2266,10 @@ The SST 5136-DN DeviceNet interface driver has been relocated to major 183 due to an unfortunate conflict. +144 block Expansion Area #1 for more non-device (e.g. NFS) mounts + 0 = mounted device 256 + 255 = mounted device 511 + 145 char SAM9407-based soundcard 0 = /dev/sam0_mixer 1 = /dev/sam0_sequencer @@ -1984,12 +2291,20 @@ addons, which are sam9407 specific. OSS can be operated simultaneously, taking care of the codec. +145 block Expansion Area #2 for more non-device (e.g. NFS) mounts + 0 = mounted device 512 + 255 = mounted device 767 + 146 char SYSTRAM SCRAMNet mirrored-memory network 0 = /dev/scramnet0 First SCRAMNet device 1 = /dev/scramnet1 Second SCRAMNet device ... -147 char Aueral Semiconductor Vortex Audio device +146 block Expansion Area #3 for more non-device (e.g. NFS) mounts + 0 = mounted device 768 + 255 = mounted device 1023 + +147 char Aureal Semiconductor Vortex Audio device 0 = /dev/aureal0 First Aureal Vortex 1 = /dev/aureal1 Second Aureal Vortex ... @@ -2014,6 +2329,22 @@ 1 = /dev/dpti1 Second DPT I2O adapter ... +152 char EtherDrive Control Device + 0 = /dev/etherd/ctl Connect/Disconnect an EtherDrive + 1 = /dev/etherd/err Monitor errors + 2 = /dev/etherd/raw Raw AoE packet monitor + +152 block EtherDrive Block Devices + 0 = /dev/etherd/0 EtherDrive 0 + ... + 255 = /dev/etherd/255 EtherDrive 255 + +153 char SPI Bus Interface (sometimes referred to as MicroWire) + 0 = /dev/spi0 First SPI device on the bus + 1 = /dev/spi1 Second SPI device on the bus + ... + 15 = /dev/spi15 Sixteenth SPI device on the bus + 154 char Specialix RIO serial card 0 = /dev/ttySR0 First RIO port ... @@ -2090,10 +2421,7 @@ 2 = /dev/raw/raw2 Second raw I/O device ... -163 char Radio Tech BIM-XXX-RS232 radio modem - 0 = /dev/bimrt0 First BIM radio modem - 1 = /dev/bimrt1 Second BIM radio modem - ... +163 char UNASSIGNED (was Radio Tech BIM-XXX-RS232 radio modem - see 51) 164 char Chase Research AT/PCI-Fast serial card 0 = /dev/ttyCH0 AT/PCI-Fast board 0, port 0 @@ -2205,6 +2533,9 @@ ... 63 = /dev/usb/scanner15 16th USB scanner 64 = /dev/usb/rio500 Diamond Rio 500 + 65 = /dev/usb/usblcd USBLCD Interface (info@usblcd.de) + 66 = /dev/usb/cpad0 Synaptics cPad (mouse/LCD) + 181 char Conrad Electronic parallel port radio clocks 0 = /dev/pcfclock0 First Conrad radio clock @@ -2325,9 +2656,10 @@ 0 = /dev/vx/rdsk/*/* First volume 1 = /dev/vx/rdsk/*/* Second volume ... - block Veritas volume manager (VxVM) volumes + +199 block Veritas volume manager (VxVM) volumes 0 = /dev/vx/dsk/*/* First volume - 1 = /dev/vx/dsk/*/* First volume + 1 = /dev/vx/dsk/*/* Second volume ... The namespace in these directories is maintained by @@ -2345,7 +2677,7 @@ 0 = /dev/vx/rdmp/* First multipath device 1 = /dev/vx/rdmp/* Second multipath device ... - block Veritas VxVM dynamic multipathing driver +201 block Veritas VxVM dynamic multipathing driver 0 = /dev/vx/dmp/* First multipath device 1 = /dev/vx/dmp/* Second multipath device ... @@ -2499,6 +2831,26 @@ 1 = /dev/addinum/cpci1500/1 Second CPCI1500 card ... +212 char LinuxTV.org DVB driver subsystem + + 0 = /dev/dvb/adapter0/video0 first video decoder of first card + 1 = /dev/dvb/adapter0/audio0 first audio decoder of first card + 2 = /dev/dvb/adapter0/sec0 (obsolete/unused) + 3 = /dev/dvb/adapter0/frontend0 first frontend device of first card + 4 = /dev/dvb/adapter0/demux0 first demux device of first card + 5 = /dev/dvb/adapter0/dvr0 first digital video recoder device of first card + 6 = /dev/dvb/adapter0/ca0 first common access port of first card + 7 = /dev/dvb/adapter0/net0 first network device of first card + 8 = /dev/dvb/adapter0/osd0 first on-screen-display device of first card + 9 = /dev/dvb/adapter0/video1 second video decoder of first card + ... + 64 = /dev/dvb/adapter1/video0 first video decoder of second card + ... + 128 = /dev/dvb/adapter2/video0 first video decoder of third card + ... + 196 = /dev/dvb/adapter3/video0 first video decoder of fourth card + + 216 char USB BlueTooth devices 0 = /dev/ttyUB0 First USB BlueTooth device 1 = /dev/ttyUB1 Second USB BlueTooth device @@ -2605,9 +2957,14 @@ 231-239 UNASSIGNED -240-254 LOCAL/EXPERIMENTAL USE +240-254 char LOCAL/EXPERIMENTAL USE +240-254 block LOCAL/EXPERIMENTAL USE + Allocated for local/experimental use. For devices not + assigned official numbers, these ranges should be + used in order to avoid conflicting with future assignments. -255 RESERVED +255 char RESERVED +255 block RESERVED This major is reserved to assist the expansion to a larger number space. No device nodes with this major diff -Nru a/Documentation/ide.txt b/Documentation/ide.txt --- a/Documentation/ide.txt Wed Mar 17 19:29:09 2004 +++ b/Documentation/ide.txt Wed Mar 17 19:29:09 2004 @@ -249,8 +249,6 @@ "hdx=scsi" : the return of the ide-scsi flag, this is useful for allowing ide-floppy, ide-tape, and ide-cdrom|writers to use ide-scsi emulation on a device specific option. - - "hdxlun=xx" : set the drive last logical unit "idebus=xx" : inform IDE driver of VESA/PCI bus speed in MHz, where "xx" is between 20 and 66 inclusive, diff -Nru a/Documentation/input/joystick-parport.txt b/Documentation/input/joystick-parport.txt --- a/Documentation/input/joystick-parport.txt Wed Mar 17 19:29:10 2004 +++ b/Documentation/input/joystick-parport.txt Wed Mar 17 19:29:10 2004 @@ -434,7 +434,7 @@ Using gamecon.c you can connect up to five devices to one parallel port. It uses the following kernel/module command line: - gc=port,pad1,pad2,pad3,pad4,pad5 + gamecon.map=port,pad1,pad2,pad3,pad4,pad5 Where 'port' the number of the parport interface (eg. 0 for parport0). @@ -457,15 +457,15 @@ your controller plugged in before initializing. Should you want to use more than one of parallel ports at once, you can use -gc_2 and gc_3 as additional command line parameters for two more parallel -ports. +gamecon.map2 and gamecon.map3 as additional command line parameters for two +more parallel ports. 3.2 db9.c ~~~~~~~~~ Apart from making an interface, there is nothing difficult on using the db9.c driver. It uses the following kernel/module command line: - db9=port,type + db9.dev=port,type Where 'port' is the number of the parport interface (eg. 0 for parport0). @@ -489,14 +489,14 @@ 10 | Amiga CD32 pad Should you want to use more than one of these joysticks/pads at once, you -can use db9_2 and db9_3 as additional command line parameters for two +can use db9.dev2 and db9.dev3 as additional command line parameters for two more joysticks/pads. 3.3 turbografx.c ~~~~~~~~~~~~~~~~ The turbografx.c driver uses a very simple kernel/module command line: - tgfx=port,js1,js2,js3,js4,js5,js6,js7 + turbografx.map=port,js1,js2,js3,js4,js5,js6,js7 Where 'port' is the number of the parport interface (eg. 0 for parport0). @@ -504,8 +504,8 @@ interface ports 1-7 have. For a standard multisystem joystick, this is 1. Should you want to use more than one of these interfaces at once, you can -use tgfx_2 and tgfx_3 as additional command line parameters for two more -interfaces. +use turbografx.map2 and turbografx.map3 as additional command line parameters +for two more interfaces. 3.4 PC parallel port pinout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -Nru a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt --- a/Documentation/input/joystick.txt Wed Mar 17 19:29:10 2004 +++ b/Documentation/input/joystick.txt Wed Mar 17 19:29:10 2004 @@ -111,7 +111,7 @@ alias tty-ldisc-2 serport alias char-major-13 input above input joydev ns558 analog - options analog js=gamepad + options analog map=gamepad,none,2btn 2.5 Verifying that it works ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -185,7 +185,7 @@ module command line, when inserting analog.o into the kernel. The parameters are: - js=type,type,type,.... + analog.map=,,,.... 'type' is type of the joystick from the table below, defining joysticks present on gameports in the system, starting with gameport0, second 'type' @@ -419,7 +419,7 @@ Amiga joysticks, connected to an Amiga, are supported by the amijoy.c driver. Since they can't be autodetected, the driver has a command line. - amijoy=a,b + amijoy.map=, a and b define the joysticks connected to the JOY0DAT and JOY1DAT ports of the Amiga. diff -Nru a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt Wed Mar 17 19:29:10 2004 +++ b/Documentation/kernel-parameters.txt Wed Mar 17 19:29:10 2004 @@ -98,6 +98,10 @@ strictly ACPI specification compliant. See also Documentation/pm.txt. + + acpi_sleep= [HW,ACPI] Sleep options + Format: { s3_bios, s3_mode } + See Documentation/power/video.txt acpi_pic_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode Format: { level | edge } @@ -158,7 +162,15 @@ Format: ,,, See also header of drivers/scsi/AM53C974.c. - amijoy= [HW,JOY] Amiga joystick support + amijoy.map= [HW,JOY] Amiga joystick support + Map of devices attached to JOY0DAT and JOY1DAT + Format: , + See also Documentation/kernel/input/joystick.txt + + analog.map= [HW,JOY] Analog joystick and gamepad support + Specifies type or capabilities of an analog joystick + connected to one of 16 gameports + Format: ,,.. apc= [HW,SPARC] Power management functions (SPARCstation-4/5 + deriv.) Format: noidle @@ -181,11 +193,18 @@ atascsi= [HW,SCSI] Atari SCSI - atkbd.set= [HW] Select keyboard code set - Format: + atkbd.extra= [HW] Enable extra LEDs and keys on IBM RapidAccess, EzKey + and similar keyboards + + atkbd.reset= [HW] Reset keyboard during initialization + + atkbd.set= [HW] Select keyboard code set + Format: (2 = AT (default) 3 = PS/2) + + atkbd.scroll= [HW] Enable scroll wheel on MS Office and similar keyboards + atkbd.softrepeat= [HW] Use software keyboard repeat - atkbd.reset= [HW] Reset keyboard during initialization autotest [IA64] @@ -287,10 +306,11 @@ dasd= [HW,NET] See header of drivers/s390/block/dasd_devmap.c. - db9= [HW,JOY] - db9_2= - db9_3= - + db9.dev[2|3]= [HW,JOY] Multisystem joystick support via parallel port + (one device per port) + Format: , + See also Documentation/input/joystick-parport.txt + debug [KNL] Enable kernel debugging (events log level). decnet= [HW,NET] @@ -384,12 +404,14 @@ ftape= [HW] Floppy Tape subsystem debugging options. See Documentation/ftape.txt. + gamecon.map[2|3]= + [HW,JOY] Multisystem joystick and NES/SNES/PSX pad + support via parallel port (up to 5 devices per port) + Format: ,,,,, + See also Documentation/input/joystick-parport.txt + gamma= [HW,DRM] - gc= [HW,JOY] - gc_2= See Documentation/input/joystick-parport.txt. - gc_3= - gdth= [HW,SCSI] See header of drivers/scsi/gdth.c. @@ -616,9 +638,9 @@ mga= [HW,DRM] - mousedev.xres [MOUSE] Horizontal screen resolution, used for devices + mousedev.xres= [MOUSE] Horizontal screen resolution, used for devices reporting absolute coordinates, such as tablets - mousedev.yres [MOUSE] Vertical screen resolution, used for devices + mousedev.yres= [MOUSE] Vertical screen resolution, used for devices reporting absolute coordinates, such as tablets mpu401= [HW,OSS] @@ -1163,10 +1185,6 @@ See header of drivers/scsi/t128.c. tdfx= [HW,DRM] - - tgfx= [HW,JOY] TurboGraFX parallel port interface - tgfx_2= See Documentation/input/joystick-parport.txt. - tgfx_3= thash_entries= [KNL,NET] Set number of hash buckets for TCP connection @@ -1189,8 +1207,13 @@ trix= [HW,OSS] MediaTrix AudioTrix Pro Format: ,,,,,,,, - tsdev.xres [TS] Horizontal screen resolution. - tsdev.yres [TS] Vertical screen resolution. + tsdev.xres= [TS] Horizontal screen resolution. + tsdev.yres= [TS] Vertical screen resolution. + + turbografx.map[2|3]= + [HW,JOY] TurboGraFX parallel port interface + Format: ,,,,,,, + See also Documentation/input/joystick-parport.txt u14-34f= [HW,SCSI] UltraStor 14F/34F SCSI host adapter See header of drivers/scsi/u14-34f.c. diff -Nru a/Documentation/networking/e100.txt b/Documentation/networking/e100.txt --- a/Documentation/networking/e100.txt Wed Mar 17 19:29:10 2004 +++ b/Documentation/networking/e100.txt Wed Mar 17 19:29:10 2004 @@ -1,7 +1,7 @@ Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters ============================================================== -November 19, 2002 +March 15, 2004 Contents @@ -9,9 +9,6 @@ - In This Release - Supported Adapters -- Command Line Parameters -- CPU Cycle Saver -- Additional Configurations - Support @@ -19,64 +16,13 @@ =============== This file describes the Linux* Base Driver for the Intel(R) PRO/100 Family of -Adapters, version 2.2.x. This driver includes support for Itanium(TM)-based +Adapters, version 3.x.x. This driver includes support for Itanium(TM)-based systems. Supported Adapters ================== -The following Intel network adapters are compatible with the drivers -in this release: - -Controller Adapter Name Board IDs ----------- ------------ --------- - -82558 PRO/100+ PCI Adapter 668081-xxx, 689661-xxx - -82558 PRO/100+ Management Adapter 691334-xxx, 701738-xxx, - 721383-xxx - -82558 PRO/100+ Dual Port Server Adapter 714303-xxx, 711269-xxx, - A28276-xxx - -82558 PRO/100+ PCI Server Adapter 710550-xxx - -82550 PRO/100 S Server Adapter 752438-xxx (82550) -82559 A56831-xxx, A10563-xxx, - A12171-xxx, A12321-xxx, - A12320-xxx, A12170-xxx - 748568-xxx (82559) - 748565-xxx (82559) - - -82550 PRO/100 S Desktop Adapter 751767-xxx (82550) -82559 748592-xxx, A12167-xxx, - A12318-xxx, A12317-xxx, - A12165-xxx - 748569-xxx (82559) - - - -82559 PRO/100+ Server Adapter 729757-xxx - -82559 PRO/100 S Management Adapter 748566-xxx, 748564-xxx - -82550 PRO/100 S Dual Port Server Adapter A56831-xxx - -82551 PRO/100 M Desktop Adapter A80897-xxx - - PRO/100 S Advanced Management Adapter 747842-xxx, 745171-xxx - -CNR PRO/100 VE Desktop Adapter A10386-xxx, A10725-xxx, - A23801-xxx, A19716-xxx - - - PRO/100 VM Desktop Adapter A14323-xxx, A19725-xxx, - A23801-xxx, A22220-xxx, - A23796-xxx - - To verify that your adapter is supported, find the board ID number on the adapter. Look for a label that has a barcode and a number in the format A12345-001. Match this to the list of numbers above. @@ -89,143 +35,6 @@ For the latest Intel PRO/100 network driver for Linux, see: http://downloadfinder.intel.com/scripts-df/support_intel.asp - - -Command Line Parameters -======================= - -If the driver is built as a module, the following optional parameters are -used by entering them on the command line with the modprobe or insmod command -using this syntax: - - modprobe e100 [, (default is 0,1)"); + +__obsolete_setup("amijoy="); + static int amijoy_used[2] = { 0, 0 }; static struct input_dev amijoy_dev[2]; static char *amijoy_phys[2] = { "amijoy/input0", "amijoy/input1" }; @@ -100,17 +106,6 @@ if (!--(*used)) free_irq(IRQ_AMIGA_VERTB, amijoy_interrupt); } - -static int __init amijoy_setup(char *str) -{ - int i; - int ints[4]; - - str = get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 2; i++) amijoy[i] = ints[i+1]; - return 1; -} -__setup("amijoy=", amijoy_setup); static int __init amijoy_init(void) { diff -Nru a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c --- a/drivers/input/joystick/analog.c Wed Mar 17 19:29:10 2004 +++ b/drivers/input/joystick/analog.c Wed Mar 17 19:29:10 2004 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -50,9 +51,12 @@ #define ANALOG_PORTS 16 static char *js[ANALOG_PORTS]; +static int js_nargs; static int analog_options[ANALOG_PORTS]; -MODULE_PARM(js, "1-" __MODULE_STRING(ANALOG_PORTS) "s"); -MODULE_PARM_DESC(js, "Analog joystick options"); +module_param_array_named(map, js, charp, js_nargs, 0); +MODULE_PARM_DESC(map, "Describes analog joysticks type/capabilities"); + +__obsolete_setup("js="); /* * Times, feature definitions. @@ -711,7 +715,7 @@ int i, j; char *end; - for (i = 0; i < ANALOG_PORTS && js[i]; i++) { + for (i = 0; i < js_nargs; i++) { for (j = 0; analog_types[j].name; j++) if (!strcmp(analog_types[j].name, js[i])) { @@ -741,24 +745,6 @@ .connect = analog_connect, .disconnect = analog_disconnect, }; - -#ifndef MODULE -static int __init analog_setup(char *str) -{ - char *s = str; - int i = 0; - - if (!str || !*str) return 0; - - while ((str = s) && (i < ANALOG_PORTS)) { - if ((s = strchr(str,','))) *s++ = 0; - js[i++] = str; - } - - return 1; -} -__setup("js=", analog_setup); -#endif int __init analog_init(void) { diff -Nru a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c --- a/drivers/input/joystick/db9.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/joystick/db9.c Wed Mar 17 19:29:09 2004 @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -42,9 +43,24 @@ MODULE_DESCRIPTION("Atari, Amstrad, Commodore, Amiga, Sega, etc. joystick driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(db9, "2i"); -MODULE_PARM(db9_2, "2i"); -MODULE_PARM(db9_3, "2i"); +static int db9[] __initdata = { -1, 0 }; +static int db9_nargs __initdata = 0; +module_param_array_named(dev, db9, int, db9_nargs, 0); +MODULE_PARM_DESC(dev, "Describes first attached device (,)"); + +static int db9_2[] __initdata = { -1, 0 }; +static int db9_nargs_2 __initdata = 0; +module_param_array_named(dev2, db9_2, int, db9_nargs_2, 0); +MODULE_PARM_DESC(dev2, "Describes second attached device (,)"); + +static int db9_3[] __initdata = { -1, 0 }; +static int db9_nargs_3 __initdata = 0; +module_param_array_named(dev3, db9_3, int, db9_nargs_3, 0); +MODULE_PARM_DESC(dev3, "Describes third attached device (,)"); + +__obsolete_setup("db9="); +__obsolete_setup("db9_2="); +__obsolete_setup("db9_3="); #define DB9_MULTI_STICK 0x01 #define DB9_MULTI2_STICK 0x02 @@ -76,10 +92,6 @@ #define DB9_GENESIS6_DELAY 14 #define DB9_REFRESH_TIME HZ/100 -static int db9[] __initdata = { -1, 0 }; -static int db9_2[] __initdata = { -1, 0 }; -static int db9_3[] __initdata = { -1, 0 }; - struct db9 { struct input_dev dev[DB9_MAX_DEVICES]; struct timer_list timer; @@ -518,7 +530,7 @@ } } -static struct db9 __init *db9_probe(int *config) +static struct db9 __init *db9_probe(int *config, int nargs) { struct db9 *db9; struct parport *pp; @@ -526,6 +538,12 @@ if (config[0] < 0) return NULL; + + if (nargs < 2) { + printk(KERN_ERR "db9.c: Device type must be specified.\n"); + return NULL; + } + if (config[1] < 1 || config[1] >= DB9_MAX_PAD || !db9_buttons[config[1]]) { printk(KERN_ERR "db9.c: bad config\n"); return NULL; @@ -601,38 +619,11 @@ return db9; } -#ifndef MODULE -static int __init db9_setup(char *str) -{ - int i, ints[3]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 2; i++) db9[i] = ints[i + 1]; - return 1; -} -static int __init db9_setup_2(char *str) -{ - int i, ints[3]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 2; i++) db9_2[i] = ints[i + 1]; - return 1; -} -static int __init db9_setup_3(char *str) -{ - int i, ints[3]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 2; i++) db9_3[i] = ints[i + 1]; - return 1; -} -__setup("db9=", db9_setup); -__setup("db9_2=", db9_setup_2); -__setup("db9_3=", db9_setup_3); -#endif - int __init db9_init(void) { - db9_base[0] = db9_probe(db9); - db9_base[1] = db9_probe(db9_2); - db9_base[2] = db9_probe(db9_3); + db9_base[0] = db9_probe(db9, db9_nargs); + db9_base[1] = db9_probe(db9_2, db9_nargs_2); + db9_base[2] = db9_probe(db9_3, db9_nargs_3); if (db9_base[0] || db9_base[1] || db9_base[2]) return 0; diff -Nru a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c --- a/drivers/input/joystick/gamecon.c Wed Mar 17 19:29:10 2004 +++ b/drivers/input/joystick/gamecon.c Wed Mar 17 19:29:10 2004 @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -43,10 +44,26 @@ MODULE_DESCRIPTION("NES, SNES, N64, MultiSystem, PSX gamepad driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(gc, "2-6i"); -MODULE_PARM(gc_2,"2-6i"); -MODULE_PARM(gc_3,"2-6i"); -MODULE_PARM(gc_psx_delay, "i"); +static int gc[] __initdata = { -1, 0, 0, 0, 0, 0 }; +static int gc_nargs __initdata = 0; +module_param_array_named(map, gc, int, gc_nargs, 0); +MODULE_PARM_DESC(map, "Describers first set of devices (,,,..)"); + +static int gc_2[] __initdata = { -1, 0, 0, 0, 0, 0 }; +static int gc_nargs_2 __initdata = 0; +module_param_array_named(map2, gc_2, int, gc_nargs_2, 0); +MODULE_PARM_DESC(map2, "Describers second set of devices"); + +static int gc_3[] __initdata = { -1, 0, 0, 0, 0, 0 }; +static int gc_nargs_3 __initdata = 0; +module_param_array_named(map3, gc_3, int, gc_nargs_3, 0); +MODULE_PARM_DESC(map3, "Describers third set of devices"); + +__obsolete_setup("gc="); +__obsolete_setup("gc_2="); +__obsolete_setup("gc_3="); + +/* see also gs_psx_delay parameter in PSX support section */ #define GC_SNES 1 #define GC_NES 2 @@ -71,10 +88,6 @@ static struct gc *gc_base[3]; -static int gc[] __initdata = { -1, 0, 0, 0, 0, 0 }; -static int gc_2[] __initdata = { -1, 0, 0, 0, 0, 0 }; -static int gc_3[] __initdata = { -1, 0, 0, 0, 0, 0 }; - static int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 }; static char *gc_names[] = { NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick", @@ -232,6 +245,11 @@ #define GC_PSX_LEN(x) ((x) & 0xf) /* Low nibble is length in words */ static int gc_psx_delay = GC_PSX_DELAY; +module_param_named(psx_delay, gc_psx_delay, uint, 0); +MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)"); + +__obsolete_setup("gc_psx_delay="); + static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y }; static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y, BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR }; @@ -468,7 +486,7 @@ } } -static struct gc __init *gc_probe(int *config) +static struct gc __init *gc_probe(int *config, int nargs) { struct gc *gc; struct parport *pp; @@ -478,6 +496,11 @@ if (config[0] < 0) return NULL; + if (nargs < 2) { + printk(KERN_ERR "gamecon.c: at least one device must be specified\n"); + return NULL; + } + pp = parport_find_number(config[0]); if (!pp) { @@ -507,7 +530,7 @@ gc->timer.data = (long) gc; gc->timer.function = gc_timer; - for (i = 0; i < 5; i++) { + for (i = 0; i < nargs - 1; i++) { if (!config[i + 1]) continue; @@ -632,44 +655,11 @@ return gc; } -#ifndef MODULE -static int __init gc_setup(char *str) -{ - int i, ints[7]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 6; i++) gc[i] = ints[i + 1]; - return 1; -} -static int __init gc_setup_2(char *str) -{ - int i, ints[7]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 6; i++) gc_2[i] = ints[i + 1]; - return 1; -} -static int __init gc_setup_3(char *str) -{ - int i, ints[7]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 6; i++) gc_3[i] = ints[i + 1]; - return 1; -} -static int __init gc_psx_setup(char *str) -{ - get_option(&str, &gc_psx_delay); - return 1; -} -__setup("gc=", gc_setup); -__setup("gc_2=", gc_setup_2); -__setup("gc_3=", gc_setup_3); -__setup("gc_psx_delay=", gc_psx_setup); -#endif - int __init gc_init(void) { - gc_base[0] = gc_probe(gc); - gc_base[1] = gc_probe(gc_2); - gc_base[2] = gc_probe(gc_3); + gc_base[0] = gc_probe(gc, gc_nargs); + gc_base[1] = gc_probe(gc_2, gc_nargs_2); + gc_base[2] = gc_probe(gc_3, gc_nargs_3); if (gc_base[0] || gc_base[1] || gc_base[2]) return 0; diff -Nru a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c --- a/drivers/input/joystick/iforce/iforce-usb.c Wed Mar 17 19:29:10 2004 +++ b/drivers/input/joystick/iforce/iforce-usb.c Wed Mar 17 19:29:10 2004 @@ -135,7 +135,7 @@ struct usb_endpoint_descriptor *epirq, *epout; struct iforce *iforce; - interface = &intf->altsetting[intf->act_altsetting]; + interface = intf->cur_altsetting; epirq = &interface->endpoint[0].desc; epout = &interface->endpoint[1].desc; diff -Nru a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c --- a/drivers/input/joystick/turbografx.c Wed Mar 17 19:29:10 2004 +++ b/drivers/input/joystick/turbografx.c Wed Mar 17 19:29:10 2004 @@ -35,15 +35,31 @@ #include #include #include +#include #include MODULE_AUTHOR("Vojtech Pavlik "); MODULE_DESCRIPTION("TurboGraFX parallel port interface driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(tgfx, "2-8i"); -MODULE_PARM(tgfx_2, "2-8i"); -MODULE_PARM(tgfx_3, "2-8i"); +static int tgfx[] __initdata = { -1, 0, 0, 0, 0, 0, 0, 0 }; +static int tgfx_nargs __initdata = 0; +module_param_array_named(map, tgfx, int, tgfx_nargs, 0); +MODULE_PARM_DESC(map, "Describes first set of devices (,,,.."); + +static int tgfx_2[] __initdata = { -1, 0, 0, 0, 0, 0, 0, 0 }; +static int tgfx_nargs_2 __initdata = 0; +module_param_array_named(map2, tgfx_2, int, tgfx_nargs_2, 0); +MODULE_PARM_DESC(map2, "Describes second set of devices"); + +static int tgfx_3[] __initdata = { -1, 0, 0, 0, 0, 0, 0, 0 }; +static int tgfx_nargs_3 __initdata = 0; +module_param_array_named(map3, tgfx_3, int, tgfx_nargs_3, 0); +MODULE_PARM_DESC(map3, "Describes third set of devices"); + +__obsolete_setup("tgfx="); +__obsolete_setup("tgfx_2="); +__obsolete_setup("tgfx_3="); #define TGFX_REFRESH_TIME HZ/100 /* 10 ms */ @@ -58,10 +74,6 @@ #define TGFX_TOP 0x01 #define TGFX_TOP2 0x08 -static int tgfx[] __initdata = { -1, 0, 0, 0, 0, 0, 0, 0 }; -static int tgfx_2[] __initdata = { -1, 0, 0, 0, 0, 0, 0, 0 }; -static int tgfx_3[] __initdata = { -1, 0, 0, 0, 0, 0, 0, 0 }; - static int tgfx_buttons[] = { BTN_TRIGGER, BTN_THUMB, BTN_THUMB2, BTN_TOP, BTN_TOP2 }; static char *tgfx_name = "TurboGraFX Multisystem joystick"; @@ -133,7 +145,7 @@ * tgfx_probe() probes for tg gamepads. */ -static struct tgfx __init *tgfx_probe(int *config) +static struct tgfx __init *tgfx_probe(int *config, int nargs) { struct tgfx *tgfx; struct parport *pp; @@ -142,6 +154,11 @@ if (config[0] < 0) return NULL; + if (nargs < 2) { + printk(KERN_ERR "turbografx.c: at least one joystick must be specified\n"); + return NULL; + } + pp = parport_find_number(config[0]); if (!pp) { @@ -171,7 +188,7 @@ tgfx->sticks = 0; - for (i = 0; i < 7; i++) + for (i = 0; i < nargs - 1; i++) if (config[i+1] > 0 && config[i+1] < 6) { tgfx->sticks |= (1 << i); @@ -212,38 +229,11 @@ return tgfx; } -#ifndef MODULE -static int __init tgfx_setup(char *str) -{ - int i, ints[9]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 8; i++) tgfx[i] = ints[i + 1]; - return 1; -} -static int __init tgfx_setup_2(char *str) -{ - int i, ints[9]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 8; i++) tgfx_2[i] = ints[i + 1]; - return 1; -} -static int __init tgfx_setup_3(char *str) -{ - int i, ints[9]; - get_options(str, ARRAY_SIZE(ints), ints); - for (i = 0; i <= ints[0] && i < 8; i++) tgfx_3[i] = ints[i + 1]; - return 1; -} -__setup("tgfx=", tgfx_setup); -__setup("tgfx_2=", tgfx_setup_2); -__setup("tgfx_3=", tgfx_setup_3); -#endif - int __init tgfx_init(void) { - tgfx_base[0] = tgfx_probe(tgfx); - tgfx_base[1] = tgfx_probe(tgfx_2); - tgfx_base[2] = tgfx_probe(tgfx_3); + tgfx_base[0] = tgfx_probe(tgfx, tgfx_nargs); + tgfx_base[1] = tgfx_probe(tgfx_2, tgfx_nargs_2); + tgfx_base[2] = tgfx_probe(tgfx_3, tgfx_nargs_3); if (tgfx_base[0] || tgfx_base[1] || tgfx_base[2]) return 0; diff -Nru a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig --- a/drivers/input/keyboard/Kconfig Wed Mar 17 19:29:10 2004 +++ b/drivers/input/keyboard/Kconfig Wed Mar 17 19:29:10 2004 @@ -17,6 +17,7 @@ depends on INPUT && INPUT_KEYBOARD select SERIO select SERIO_I8042 if PC + select SERIO_GSCPS2 if GSC help Say Y here if you want to use a standard AT or PS/2 keyboard. Usually you'll need this, unless you have a different type keyboard (USB, ADB @@ -39,6 +40,19 @@ To compile this driver as a module, choose M here: the module will be called sunkbd. + +config KEYBOARD_LKKBD + tristate "DECstation/VAXstation LK201/LK401 keyboard support" + depends on INPUT && INPUT_KEYBOARD + select SERIO + help + Say Y here if you want to use a LK201 or LK401 style serial + keyboard. This keyboard is also useable on PCs if you attach + it with the inputattach program. The connector pinout is + described within lkkbd.c. + + To compile this driver as a module, choose M here: the + module will be called lkkbd. config KEYBOARD_XTKBD tristate "XT Keyboard support" diff -Nru a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile --- a/drivers/input/keyboard/Makefile Wed Mar 17 19:29:10 2004 +++ b/drivers/input/keyboard/Makefile Wed Mar 17 19:29:10 2004 @@ -7,6 +7,7 @@ obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o +obj-$(CONFIG_KEYBOARD_LKKBD) += lkkbd.o obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c --- a/drivers/input/keyboard/atkbd.c Wed Mar 17 19:29:10 2004 +++ b/drivers/input/keyboard/atkbd.c Wed Mar 17 19:29:10 2004 @@ -30,21 +30,17 @@ MODULE_AUTHOR("Vojtech Pavlik "); MODULE_DESCRIPTION("AT and PS/2 keyboard driver"); -MODULE_PARM(atkbd_set, "1i"); -MODULE_PARM(atkbd_reset, "1i"); -MODULE_PARM(atkbd_softrepeat, "1i"); MODULE_LICENSE("GPL"); static int atkbd_set = 2; module_param_named(set, atkbd_set, int, 0); -MODULE_PARM_DESC(set, "Select keyboard code set (2 = default, 3, 4)"); +MODULE_PARM_DESC(set, "Select keyboard code set (2 = default, 3 = PS/2 native)"); + #if defined(__i386__) || defined(__x86_64__) || defined(__hppa__) static int atkbd_reset; #else static int atkbd_reset = 1; #endif -static int atkbd_softrepeat; - module_param_named(reset, atkbd_reset, bool, 0); MODULE_PARM_DESC(reset, "Reset keyboard during initialization"); @@ -52,6 +48,18 @@ module_param_named(softrepeat, atkbd_softrepeat, bool, 0); MODULE_PARM_DESC(softrepeat, "Use software keyboard repeat"); +static int atkbd_scroll; +module_param_named(scroll, atkbd_scroll, bool, 0); +MODULE_PARM_DESC(scroll, "Enable scroll-wheel on MS Office and similar keyboards"); + +static int atkbd_extra; +module_param_named(extra, atkbd_extra, bool, 0); +MODULE_PARM_DESC(extra, "Enable extra LEDs and keys on IBM RapidAcces, EzKey and similar keyboards"); + +__obsolete_setup("atkbd_set="); +__obsolete_setup("atkbd_reset"); +__obsolete_setup("atkbd_softrepeat="); + /* * Scancode to keycode tables. These are just the default setting, and * are loadable via an userland utility. @@ -127,11 +135,11 @@ #define ATKBD_CMD_EX_SETLEDS 0x20eb #define ATKBD_CMD_OK_GETID 0x02e8 + #define ATKBD_RET_ACK 0xfa #define ATKBD_RET_NAK 0xfe #define ATKBD_RET_BAT 0xaa #define ATKBD_RET_EMUL0 0xe0 -#define ATKBD_RET_EMULX 0x80 #define ATKBD_RET_EMUL1 0xe1 #define ATKBD_RET_RELEASE 0xf0 #define ATKBD_RET_HANGUEL 0xf1 @@ -141,6 +149,22 @@ #define ATKBD_KEY_UNKNOWN 0 #define ATKBD_KEY_NULL 255 +#define ATKBD_SCR_1 254 +#define ATKBD_SCR_2 253 +#define ATKBD_SCR_4 252 +#define ATKBD_SCR_8 251 +#define ATKBD_SCR_CLICK 250 + +#define ATKBD_SPECIAL 250 + +static unsigned char atkbd_scroll_keys[5][2] = { + { ATKBD_SCR_1, 0x45 }, + { ATKBD_SCR_2, 0x29 }, + { ATKBD_SCR_4, 0x36 }, + { ATKBD_SCR_8, 0x27 }, + { ATKBD_SCR_CLICK, 0x60 }, +}; + /* * The atkbd control structure */ @@ -155,6 +179,7 @@ unsigned char cmdbuf[4]; unsigned char cmdcnt; unsigned char set; + unsigned char extra; unsigned char release; int lastkey; volatile signed char ack; @@ -189,6 +214,7 @@ { struct atkbd *atkbd = serio->private; unsigned int code = data; + int scroll = 0, click = -1; int value; #ifdef ATKBD_DEBUG @@ -202,7 +228,7 @@ atkbd->resend = 1; goto out; } - + if (!flags && data == ATKBD_RET_ACK) atkbd->resend = 0; #endif @@ -276,7 +302,7 @@ case ATKBD_KEY_UNKNOWN: printk(KERN_WARNING "atkbd.c: Unknown key %s (%s set %d, code %#x on %s).\n", atkbd->release ? "released" : "pressed", - atkbd->translated ? "translated" : "raw", + atkbd->translated ? "translated" : "raw", atkbd->set, code, serio->phys); if (atkbd->translated && atkbd->set == 2 && code == 0x7a) printk(KERN_WARNING "atkbd.c: This is an XFree86 bug. It shouldn't access" @@ -284,6 +310,21 @@ else printk(KERN_WARNING "atkbd.c: Use 'setkeycodes %s%02x ' to make it known.\n", code & 0x80 ? "e0" : "", code & 0x7f); break; + case ATKBD_SCR_1: + scroll = 1 - atkbd->release * 2; + break; + case ATKBD_SCR_2: + scroll = 2 - atkbd->release * 4; + break; + case ATKBD_SCR_4: + scroll = 4 - atkbd->release * 8; + break; + case ATKBD_SCR_8: + scroll = 8 - atkbd->release * 16; + break; + case ATKBD_SCR_CLICK: + click = !atkbd->release; + break; default: value = atkbd->release ? 0 : (1 + (!atkbd_softrepeat && test_bit(atkbd->keycode[code], atkbd->dev.key))); @@ -305,6 +346,13 @@ atkbd_report_key(&atkbd->dev, regs, atkbd->keycode[code], value); } + if (scroll || click != -1) { + input_regs(&atkbd->dev, regs); + input_report_key(&atkbd->dev, BTN_MIDDLE, click); + input_report_rel(&atkbd->dev, REL_WHEEL, scroll); + input_sync(&atkbd->dev); + } + atkbd->release = 0; out: return IRQ_HANDLED; @@ -353,7 +401,7 @@ if (receive && param) for (i = 0; i < receive; i++) atkbd->cmdbuf[(receive - 1) - i] = param[i]; - + if (command & 0xff) if (atkbd_sendbyte(atkbd, command & 0xff)) return (atkbd->cmdcnt = 0) - 1; @@ -373,7 +421,7 @@ atkbd->cmdcnt = 0; break; } - + udelay(1); } @@ -420,7 +468,7 @@ | (test_bit(LED_CAPSL, dev->led) ? 4 : 0); atkbd_command(atkbd, param, ATKBD_CMD_SETLEDS); - if (atkbd->set == 4) { + if (atkbd->extra) { param[0] = 0; param[1] = (test_bit(LED_COMPOSE, dev->led) ? 0x01 : 0) | (test_bit(LED_SLEEP, dev->led) ? 0x02 : 0) @@ -466,7 +514,7 @@ */ if (atkbd_reset) - if (atkbd_command(atkbd, NULL, ATKBD_CMD_RESET_BAT)) + if (atkbd_command(atkbd, NULL, ATKBD_CMD_RESET_BAT)) printk(KERN_WARNING "atkbd.c: keyboard reset failed on %s\n", atkbd->serio->phys); /* @@ -529,20 +577,21 @@ return 3; } - if (atkbd_set != 2) - if (!atkbd_command(atkbd, param, ATKBD_CMD_OK_GETID)) { - atkbd->id = param[0] << 8 | param[1]; + if (atkbd_extra) { + param[0] = 0x71; + if (!atkbd_command(atkbd, param, ATKBD_CMD_EX_ENABLE)) { + atkbd->extra = 1; return 2; } - - if (atkbd_set == 4) { - param[0] = 0x71; - if (!atkbd_command(atkbd, param, ATKBD_CMD_EX_ENABLE)) - return 4; } - if (atkbd_set != 3) + if (atkbd_set != 3) + return 2; + + if (!atkbd_command(atkbd, param, ATKBD_CMD_OK_GETID)) { + atkbd->id = param[0] << 8 | param[1]; return 2; + } param[0] = 3; if (atkbd_command(atkbd, param, ATKBD_CMD_SSCANSET)) @@ -637,7 +686,7 @@ switch (serio->type & SERIO_TYPE) { - case SERIO_8042_XL: + case SERIO_8042_XL: atkbd->translated = 1; case SERIO_8042: if (serio->write) @@ -650,7 +699,7 @@ kfree(atkbd); return; } - + if (atkbd->write) { atkbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP); atkbd->dev.ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL); @@ -687,7 +736,7 @@ kfree(atkbd); return; } - + atkbd->set = atkbd_set_3(atkbd); atkbd_enable(atkbd); @@ -696,24 +745,32 @@ atkbd->id = 0xab00; } - if (atkbd->set == 4) { + if (atkbd->extra) { atkbd->dev.ledbit[0] |= BIT(LED_COMPOSE) | BIT(LED_SUSPEND) | BIT(LED_SLEEP) | BIT(LED_MUTE) | BIT(LED_MISC); - sprintf(atkbd->name, "AT Set 2 Extended keyboard"); + sprintf(atkbd->name, "AT Set 2 Extra keyboard"); } else sprintf(atkbd->name, "AT %s Set %d keyboard", atkbd->translated ? "Translated" : "Raw", atkbd->set); sprintf(atkbd->phys, "%s/input0", serio->phys); + if (atkbd_scroll) { + for (i = 0; i < 5; i++) + atkbd_set2_keycode[atkbd_scroll_keys[i][1]] = atkbd_scroll_keys[i][0]; + atkbd->dev.evbit[0] |= BIT(EV_REL); + atkbd->dev.relbit[0] = BIT(REL_WHEEL); + set_bit(BTN_MIDDLE, atkbd->dev.keybit); + } + if (atkbd->translated) { for (i = 0; i < 128; i++) { atkbd->keycode[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]]; atkbd->keycode[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80]; } - } else if (atkbd->set == 2) { - memcpy(atkbd->keycode, atkbd_set2_keycode, sizeof(atkbd->keycode)); - } else { + } else if (atkbd->set == 3) { memcpy(atkbd->keycode, atkbd_set3_keycode, sizeof(atkbd->keycode)); + } else { + memcpy(atkbd->keycode, atkbd_set2_keycode, sizeof(atkbd->keycode)); } atkbd->dev.name = atkbd->name; @@ -724,7 +781,7 @@ atkbd->dev.id.version = atkbd->id; for (i = 0; i < 512; i++) - if (atkbd->keycode[i] && atkbd->keycode[i] < 255) + if (atkbd->keycode[i] && atkbd->keycode[i] < ATKBD_SPECIAL) set_bit(atkbd->keycode[i], atkbd->dev.keybit); input_register_device(&atkbd->dev); @@ -741,45 +798,28 @@ { struct atkbd *atkbd = serio->private; struct serio_dev *dev = serio->dev; - int i; + unsigned char param[1]; - if (!dev) { - printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n"); - return -1; - } + if (!dev) { + printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n"); + return -1; + } if (atkbd->write) { + param[0] = (test_bit(LED_SCROLLL, atkbd->dev.led) ? 1 : 0) + | (test_bit(LED_NUML, atkbd->dev.led) ? 2 : 0) + | (test_bit(LED_CAPSL, atkbd->dev.led) ? 4 : 0); + if (atkbd_probe(atkbd)) return -1; - - atkbd->set = atkbd_set_3(atkbd); + if (atkbd->set != atkbd_set_3(atkbd)) + return -1; + atkbd_enable(atkbd); - } else { - atkbd->set = 2; - atkbd->id = 0xab00; - } - /* - * Here we probably should check if the keyboard has the same set that - * it had before and bail out if it's different. But this will most likely - * cause new keyboard device be created... and for the user it will look - * like keyboard is lost - */ - - if (atkbd->translated) { - for (i = 0; i < 128; i++) { - atkbd->keycode[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]]; - atkbd->keycode[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80]; - } - } else if (atkbd->set == 2) { - memcpy(atkbd->keycode, atkbd_set2_keycode, sizeof(atkbd->keycode)); - } else { - memcpy(atkbd->keycode, atkbd_set3_keycode, sizeof(atkbd->keycode)); + if (atkbd_command(atkbd, param, ATKBD_CMD_SETLEDS)) + return -1; } - - for (i = 0; i < 512; i++) - if (atkbd->keycode[i] && atkbd->keycode[i] < 255) - set_bit(atkbd->keycode[i], atkbd->dev.keybit); return 0; } diff -Nru a/drivers/input/keyboard/hpps2atkbd.h b/drivers/input/keyboard/hpps2atkbd.h --- a/drivers/input/keyboard/hpps2atkbd.h Wed Mar 17 19:29:09 2004 +++ b/drivers/input/keyboard/hpps2atkbd.h Wed Mar 17 19:29:09 2004 @@ -4,14 +4,9 @@ * Copyright (c) 2004 Helge Deller * Copyright (c) 2002 Laurent Canet * Copyright (c) 2002 Thibaut Varene + * Copyright (c) 2000 Xavier Debacker * - * based on linux-2.4's hp_mouse.c & hp_keyb.c - * Copyright (c) 1999 Alex deVries - * Copyright (c) 1999-2000 Philipp Rumpf - * Copyright (c) 2000 Xavier Debacker - * Copyright (c) 2000-2001 Thomas Marteau - * - * HP PS/2 AT-compatible Keyboard, found in PA/RISC Workstations + * HP PS/2 AT-compatible Keyboard, found in PA/RISC Workstations & Laptops * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -19,87 +14,100 @@ */ -#define KBD_UNKNOWN 0 - -/* Raw SET 2 scancode table */ +/* undefine if you have a RDI PRECISIONBOOK */ +#define STANDARD_KEYBOARD -#if 0 - /* conflicting keys between a RDI Precisionbook keyboard and a normal HP keyboard */ - keytable[0x07] = KEY_F1; /* KEY_F12 */ - keytable[0x11] = KEY_LEFTCTRL; /* KEY_LEFTALT */ - keytable[0x14] = KEY_CAPSLOCK; /* KEY_LEFTCTRL */ - keytable[0x61] = KEY_LEFT; /* KEY_102ND */ +#if defined(STANDARD_KEYBOARD) +# define CONFLICT(x,y) x +#else +# define CONFLICT(x,y) y #endif +/* sadly RDI (Tadpole) decided to ship a different keyboard layout + than HP for their PS/2 laptop keyboard which leads to conflicting + keycodes between a normal HP PS/2 keyboard and a RDI Precisionbook. + HP: RDI: */ +#define C_07 CONFLICT( KEY_F12, KEY_F1 ) +#define C_11 CONFLICT( KEY_LEFTALT, KEY_LEFTCTRL ) +#define C_14 CONFLICT( KEY_LEFTCTRL, KEY_CAPSLOCK ) +#define C_58 CONFLICT( KEY_CAPSLOCK, KEY_RIGHTCTRL ) +#define C_61 CONFLICT( KEY_102ND, KEY_LEFT ) -static unsigned char atkbd_set2_keycode[512] = { +/* Raw SET 2 scancode table */ - /* 00 */ KBD_UNKNOWN, KEY_F9, KBD_UNKNOWN, KEY_F5, KEY_F3, KEY_F1, KEY_F2, KEY_F1, - /* 08 */ KEY_ESC, KEY_F10, KEY_F8, KEY_F6, KEY_F4, KEY_TAB, KEY_GRAVE, KEY_F2, - /* 10 */ KBD_UNKNOWN, KEY_LEFTCTRL, KEY_LEFTSHIFT, KBD_UNKNOWN, KEY_CAPSLOCK, KEY_Q, KEY_1, KEY_F3, - /* 18 */ KBD_UNKNOWN, KEY_LEFTALT, KEY_Z, KEY_S, KEY_A, KEY_W, KEY_2, KEY_F4, - /* 20 */ KBD_UNKNOWN, KEY_C, KEY_X, KEY_D, KEY_E, KEY_4, KEY_3, KEY_F5, - /* 28 */ KBD_UNKNOWN, KEY_SPACE, KEY_V, KEY_F, KEY_T, KEY_R, KEY_5, KEY_F6, - /* 30 */ KBD_UNKNOWN, KEY_N, KEY_B, KEY_H, KEY_G, KEY_Y, KEY_6, KEY_F7, - /* 38 */ KBD_UNKNOWN, KEY_RIGHTALT, KEY_M, KEY_J, KEY_U, KEY_7, KEY_8, KEY_F8, - /* 40 */ KBD_UNKNOWN, KEY_COMMA, KEY_K, KEY_I, KEY_O, KEY_0, KEY_9, KEY_F9, - /* 48 */ KBD_UNKNOWN, KEY_DOT, KEY_SLASH, KEY_L, KEY_SEMICOLON, KEY_P, KEY_MINUS, KEY_F10, - /* 50 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_APOSTROPHE,KBD_UNKNOWN, KEY_LEFTBRACE, KEY_EQUAL, KEY_F11, KEY_SYSRQ, - /* 58 */ KEY_CAPSLOCK, KEY_RIGHTSHIFT,KEY_ENTER, KEY_RIGHTBRACE,KEY_BACKSLASH, KEY_BACKSLASH,KEY_F12, KEY_SCROLLLOCK, - /* 60 */ KEY_DOWN, KEY_LEFT, KEY_PAUSE, KEY_UP, KEY_DELETE, KEY_END, KEY_BACKSPACE, KEY_INSERT, - /* 68 */ KBD_UNKNOWN, KEY_KP1, KEY_RIGHT, KEY_KP4, KEY_KP7, KEY_PAGEDOWN, KEY_HOME, KEY_PAGEUP, - /* 70 */ KEY_KP0, KEY_KPDOT, KEY_KP2, KEY_KP5, KEY_KP6, KEY_KP8, KEY_ESC, KEY_NUMLOCK, - /* 78 */ KEY_F11, KEY_KPPLUS, KEY_KP3, KEY_KPMINUS, KEY_KPASTERISK,KEY_KP9, KEY_SCROLLLOCK,KEY_103RD, - /* 80 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 88 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 90 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 98 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - - /* These are offset for escaped keycodes: */ - - /* 00 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KEY_F7, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 08 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KEY_LEFTMETA, KEY_RIGHTMETA, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 10 */ KBD_UNKNOWN, KEY_RIGHTALT, KBD_UNKNOWN, KBD_UNKNOWN, KEY_RIGHTCTRL, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 18 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 20 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 28 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 30 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 38 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 40 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 48 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_KPSLASH, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 50 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 58 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_KPENTER, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 60 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 68 */ KBD_UNKNOWN, KEY_END, KBD_UNKNOWN, KEY_LEFT, KEY_HOME, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 70 */ KEY_INSERT, KEY_DELETE, KEY_DOWN, KBD_UNKNOWN, KEY_RIGHT, KEY_UP, KBD_UNKNOWN, KBD_UNKNOWN, - /* 78 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_PAGEDOWN, KBD_UNKNOWN, KEY_SYSRQ, KEY_PAGEUP, KBD_UNKNOWN, KBD_UNKNOWN, - /* 80 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 88 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 90 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 98 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN +/* 00 */ KEY_RESERVED, KEY_F9, KEY_RESERVED, KEY_F5, KEY_F3, KEY_F1, KEY_F2, C_07, +/* 08 */ KEY_ESC, KEY_F10, KEY_F8, KEY_F6, KEY_F4, KEY_TAB, KEY_GRAVE, KEY_F2, +/* 10 */ KEY_RESERVED, C_11, KEY_LEFTSHIFT, KEY_RESERVED, C_14, KEY_Q, KEY_1, KEY_F3, +/* 18 */ KEY_RESERVED, KEY_LEFTALT, KEY_Z, KEY_S, KEY_A, KEY_W, KEY_2, KEY_F4, +/* 20 */ KEY_RESERVED, KEY_C, KEY_X, KEY_D, KEY_E, KEY_4, KEY_3, KEY_F5, +/* 28 */ KEY_RESERVED, KEY_SPACE, KEY_V, KEY_F, KEY_T, KEY_R, KEY_5, KEY_F6, +/* 30 */ KEY_RESERVED, KEY_N, KEY_B, KEY_H, KEY_G, KEY_Y, KEY_6, KEY_F7, +/* 38 */ KEY_RESERVED, KEY_RIGHTALT, KEY_M, KEY_J, KEY_U, KEY_7, KEY_8, KEY_F8, +/* 40 */ KEY_RESERVED, KEY_COMMA, KEY_K, KEY_I, KEY_O, KEY_0, KEY_9, KEY_F9, +/* 48 */ KEY_RESERVED, KEY_DOT, KEY_SLASH, KEY_L, KEY_SEMICOLON, KEY_P, KEY_MINUS, KEY_F10, +/* 50 */ KEY_RESERVED, KEY_RESERVED, KEY_APOSTROPHE,KEY_RESERVED, KEY_LEFTBRACE, KEY_EQUAL, KEY_F11, KEY_SYSRQ, +/* 58 */ C_58, KEY_RIGHTSHIFT,KEY_ENTER, KEY_RIGHTBRACE,KEY_BACKSLASH, KEY_BACKSLASH,KEY_F12, KEY_SCROLLLOCK, +/* 60 */ KEY_DOWN, C_61, KEY_PAUSE, KEY_UP, KEY_DELETE, KEY_END, KEY_BACKSPACE, KEY_INSERT, +/* 68 */ KEY_RESERVED, KEY_KP1, KEY_RIGHT, KEY_KP4, KEY_KP7, KEY_PAGEDOWN, KEY_HOME, KEY_PAGEUP, +/* 70 */ KEY_KP0, KEY_KPDOT, KEY_KP2, KEY_KP5, KEY_KP6, KEY_KP8, KEY_ESC, KEY_NUMLOCK, +/* 78 */ KEY_F11, KEY_KPPLUS, KEY_KP3, KEY_KPMINUS, KEY_KPASTERISK,KEY_KP9, KEY_SCROLLLOCK,KEY_103RD, +/* 80 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 88 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 90 */ KEY_RESERVED, KEY_RIGHTALT, KEY_SYSRQ, KEY_RESERVED, KEY_RIGHTCTRL, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 98 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_CAPSLOCK, KEY_RESERVED, KEY_LEFTMETA, +/* a0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RIGHTMETA, +/* a8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_COMPOSE, +/* b0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* b8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* c0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* c8 */ KEY_RESERVED, KEY_RESERVED, KEY_KPSLASH, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* d0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* d8 */ KEY_RESERVED, KEY_RESERVED, KEY_KPENTER, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* e0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* e8 */ KEY_RESERVED, KEY_END, KEY_RESERVED, KEY_LEFT, KEY_HOME, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* f0 */ KEY_INSERT, KEY_DELETE, KEY_DOWN, KEY_RESERVED, KEY_RIGHT, KEY_UP, KEY_RESERVED, KEY_PAUSE, +/* f8 */ KEY_RESERVED, KEY_RESERVED, KEY_PAGEDOWN, KEY_RESERVED, KEY_SYSRQ, KEY_PAGEUP, KEY_RESERVED, KEY_RESERVED, + +/* These are offset for escaped keycodes: */ + +/* 00 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_F7, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 08 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_LEFTMETA, KEY_RIGHTMETA, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 10 */ KEY_RESERVED, KEY_RIGHTALT, KEY_RESERVED, KEY_RESERVED, KEY_RIGHTCTRL, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 18 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 20 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 28 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 30 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 38 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 40 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 48 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 50 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 58 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 60 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 68 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 70 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 78 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 80 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 88 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 90 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* 98 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* a0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* a8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* b0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* b8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* c0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* c8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* d0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* d8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* e0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* e8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* f0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, +/* f8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED + +#undef STANDARD_KEYBOARD +#undef CONFLICT +#undef C_07 +#undef C_11 +#undef C_14 +#undef C_58 +#undef C_61 -}; diff -Nru a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/input/keyboard/lkkbd.c Wed Mar 17 19:29:10 2004 @@ -0,0 +1,625 @@ +/* + * Copyright (C) 2004 by Jan-Benedict Glaw + */ + +/* + * LK keyboard driver for Linux, based on sunkbd.c (C) by Vojtech Pavlik + */ + +/* + * DEC LK201 and LK401 keyboard driver for Linux (primary for DECstations + * and VAXstations, but can also be used on any standard RS232 with an + * adaptor). + * + * DISCLAUNER: This works for _me_. If you break anything by using the + * information given below, I will _not_ be lieable! + * + * RJ11 pinout: To DB9: Or DB25: + * 1 - RxD <----> Pin 3 (TxD) <-> Pin 2 (TxD) + * 2 - GND <----> Pin 5 (GND) <-> Pin 7 (GND) + * 4 - TxD <----> Pin 2 (RxD) <-> Pin 3 (RxD) + * 3 - +12V (from HDD drive connector), DON'T connect to DB9 or DB25!!! + * + * Pin numbers for DB9 and DB25 are noted on the plug (quite small:). For + * RJ11, it's like this: + * + * __=__ Hold the plug in front of you, cable downwards, + * /___/| nose is hidden behind the plug. Now, pin 1 is at + * |1234|| the left side, pin 4 at the right and 2 and 3 are + * |IIII|| in between, of course:) + * | || + * |____|/ + * || So the adaptor consists of three connected cables + * || for data transmission (RxD and TxD) and signal ground. + * Additionally, you have to get +12V from somewhere. + * Most easily, you'll get that from a floppy or HDD power connector. + * It's the yellow cable there (black is ground and red is +5V). + */ + +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Should you need to contact me, the author, you can do so either by + * email or by paper mail: + * Jan-Benedict Glaw, Lilienstraße 16, 33790 Hörste (near Halle/Westf.), + * Germany. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +MODULE_AUTHOR ("Jan-Benedict Glaw "); +MODULE_DESCRIPTION ("LK keyboard driver"); +MODULE_LICENSE ("GPL"); + +/* + * Known parameters: + * bell_volume + * keyclick_volume + * ctrlclick_volume + * + * Please notice that there's not yet an API to set these at runtime. + */ +static int bell_volume = 100; /* % */ +module_param (bell_volume, int, 0); +MODULE_PARM_DESC (bell_volume, "Bell volume (in %). default is 100%"); + +static int keyclick_volume = 100; /* % */ +module_param (keyclick_volume, int, 0); +MODULE_PARM_DESC (keyclick_volume, "Keyclick volume (in %), default is 100%"); + +static int ctrlclick_volume = 100; /* % */ +module_param (ctrlclick_volume, int, 0); +MODULE_PARM_DESC (ctrlclick_volume, "Ctrlclick volume (in %), default is 100%"); + + + +#undef LKKBD_DEBUG +#ifdef LKKBD_DEBUG +#define DBG(x...) printk (x) +#else +#define DBG(x...) do {} while (0) +#endif + +/* LED control */ +#define LK_LED_WAIT 0x81 +#define LK_LED_COMPOSE 0x82 +#define LK_LED_SHIFTLOCK 0x84 +#define LK_LED_SCROLLLOCK 0x88 +#define LK_CMD_LED_ON 0x13 +#define LK_CMD_LED_OFF 0x11 + +/* Mode control */ +#define LK_MODE_DOWN 0x80 +#define LK_MODE_AUTODOWN 0x82 +#define LK_MODE_UPDOWN 0x86 +#define LK_CMD_SET_MODE(mode,div) ((mode) | ((div) << 3)) + +/* Misc commands */ +#define LK_CMD_ENABLE_KEYCLICK 0x1b +#define LK_CMD_DISABLE_KEYCLICK 0x99 +#define LK_CMD_DISABLE_BELL 0xa1 +#define LK_CMD_SOUND_BELL 0xa7 +#define LK_CMD_ENABLE_BELL 0x23 +#define LK_CMD_DISABLE_CTRCLICK 0xb9 +#define LK_CMD_ENABLE_CTRCLICK 0xbb +#define LK_CMD_SET_DEFAULTS 0xd3 +#define LK_CMD_POWERCYCLE_RESET 0xfd +#define LK_CMD_ENABLE_LK401 0xe9 + +/* Misc responses from keyboard */ +#define LK_ALL_KEYS_UP 0xb3 +#define LK_METRONOME 0xb4 +#define LK_OUTPUT_ERROR 0xb5 +#define LK_INPUT_ERROR 0xb6 +#define LK_KBD_LOCKED 0xb7 +#define LK_KBD_TEST_MODE_ACK 0xb8 +#define LK_PREFIX_KEY_DOWN 0xb9 +#define LK_MODE_CHANGE_ACK 0xba +#define LK_RESPONSE_RESERVED 0xbb + +#define LK_NUM_KEYCODES 256 +typedef u_int16_t lk_keycode_t; + + + +static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = { + [0x56] = KEY_F1, + [0x57] = KEY_F2, + [0x58] = KEY_F3, + [0x59] = KEY_F4, + [0x5a] = KEY_F5, + [0x64] = KEY_F6, + [0x65] = KEY_F7, + [0x66] = KEY_F8, + [0x67] = KEY_F9, + [0x68] = KEY_F10, + [0x71] = KEY_F11, + [0x72] = KEY_F12, + [0x73] = KEY_F13, + [0x74] = KEY_F14, + [0x7c] = KEY_F15, + [0x7d] = KEY_F16, + [0x80] = KEY_F17, + [0x81] = KEY_F18, + [0x82] = KEY_F19, + [0x83] = KEY_F20, + [0x8a] = KEY_FIND, + [0x8b] = KEY_INSERT, + [0x8c] = KEY_DELETE, + [0x8d] = KEY_SELECT, + [0x8e] = KEY_PAGEUP, + [0x8f] = KEY_PAGEDOWN, + [0x92] = KEY_KP0, + [0x94] = KEY_KPDOT, + [0x95] = KEY_KPENTER, + [0x96] = KEY_KP1, + [0x97] = KEY_KP2, + [0x98] = KEY_KP3, + [0x99] = KEY_KP4, + [0x9a] = KEY_KP5, + [0x9b] = KEY_KP6, + [0x9c] = KEY_KPCOMMA, + [0x9d] = KEY_KP7, + [0x9e] = KEY_KP8, + [0x9f] = KEY_KP9, + [0xa0] = KEY_KPMINUS, + [0xa1] = KEY_PROG1, + [0xa2] = KEY_PROG2, + [0xa3] = KEY_PROG3, + [0xa4] = KEY_PROG4, + [0xa7] = KEY_LEFT, + [0xa8] = KEY_RIGHT, + [0xa9] = KEY_DOWN, + [0xaa] = KEY_UP, + [0xab] = KEY_RIGHTSHIFT, + [0xac] = KEY_LEFTALT, + [0xad] = KEY_COMPOSE, /* Right Compose, that is. */ + [0xae] = KEY_LEFTSHIFT, /* Same as KEY_RIGHTSHIFT on LK201 */ + [0xaf] = KEY_LEFTCTRL, + [0xb0] = KEY_CAPSLOCK, + [0xb1] = KEY_COMPOSE, /* Left Compose, that is. */ + [0xb2] = KEY_RIGHTALT, + [0xbc] = KEY_BACKSPACE, + [0xbd] = KEY_ENTER, + [0xbe] = KEY_TAB, + [0xbf] = KEY_ESC, + [0xc0] = KEY_1, + [0xc1] = KEY_Q, + [0xc2] = KEY_A, + [0xc3] = KEY_Z, + [0xc5] = KEY_2, + [0xc6] = KEY_W, + [0xc7] = KEY_S, + [0xc8] = KEY_X, + [0xc9] = KEY_102ND, + [0xcb] = KEY_3, + [0xcc] = KEY_E, + [0xcd] = KEY_D, + [0xce] = KEY_C, + [0xd0] = KEY_4, + [0xd1] = KEY_R, + [0xd2] = KEY_F, + [0xd3] = KEY_V, + [0xd4] = KEY_SPACE, + [0xd6] = KEY_5, + [0xd7] = KEY_T, + [0xd8] = KEY_G, + [0xd9] = KEY_B, + [0xdb] = KEY_6, + [0xdc] = KEY_Y, + [0xdd] = KEY_H, + [0xde] = KEY_N, + [0xe0] = KEY_7, + [0xe1] = KEY_U, + [0xe2] = KEY_J, + [0xe3] = KEY_M, + [0xe5] = KEY_8, + [0xe6] = KEY_I, + [0xe7] = KEY_K, + [0xe8] = KEY_COMMA, + [0xea] = KEY_9, + [0xeb] = KEY_O, + [0xec] = KEY_L, + [0xed] = KEY_DOT, + [0xef] = KEY_0, + [0xf0] = KEY_P, + [0xf2] = KEY_SEMICOLON, + [0xf3] = KEY_SLASH, + [0xf5] = KEY_EQUAL, + [0xf6] = KEY_RIGHTBRACE, + [0xf7] = KEY_BACKSLASH, + [0xf9] = KEY_MINUS, + [0xfa] = KEY_LEFTBRACE, + [0xfb] = KEY_APOSTROPHE, +}; + +#define CHECK_LED(LED, BITS) do { \ + if (test_bit (LED, lk->dev.led)) \ + leds_on |= BITS; \ + else \ + leds_off |= BITS; \ + } while (0) + +/* + * Per-keyboard data + */ +struct lkkbd { + lk_keycode_t keycode[LK_NUM_KEYCODES]; + int ignore_bytes; + struct input_dev dev; + struct serio *serio; + struct work_struct tq; + char name[64]; + char phys[32]; + char type; + int bell_volume; + int keyclick_volume; + int ctrlclick_volume; +}; + +/* + * Calculate volume parameter byte for a given volume. + */ +static unsigned char +volume_to_hw (int volume_percent) +{ + unsigned char ret = 0; + + if (volume_percent < 0) + volume_percent = 0; + if (volume_percent > 100) + volume_percent = 100; + + if (volume_percent >= 0) + ret = 7; + if (volume_percent >= 13) /* 12.5 */ + ret = 6; + if (volume_percent >= 25) + ret = 5; + if (volume_percent >= 38) /* 37.5 */ + ret = 4; + if (volume_percent >= 50) + ret = 3; + if (volume_percent >= 63) /* 62.5 */ + ret = 2; /* This is the default volume */ + if (volume_percent >= 75) + ret = 1; + if (volume_percent >= 88) /* 87.5 */ + ret = 0; + + ret |= 0x80; + + return ret; +} + +/* + * lkkbd_interrupt() is called by the low level driver when a character + * is received. + */ +static irqreturn_t +lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags, + struct pt_regs *regs) +{ + struct lkkbd *lk = serio->private; + int i; + + DBG (KERN_INFO "Got byte 0x%02x\n", data); + + if (lk->ignore_bytes > 0) { + DBG (KERN_INFO "Ignoring a byte on %s\n", + lk->name); + lk->ignore_bytes--; + return IRQ_HANDLED; + } + + switch (data) { + case LK_ALL_KEYS_UP: + input_regs (&lk->dev, regs); + for (i = 0; i < ARRAY_SIZE (lkkbd_keycode); i++) + if (lk->keycode[i] != KEY_RESERVED) + input_report_key (&lk->dev, lk->keycode[i], 0); + input_sync (&lk->dev); + break; + case LK_METRONOME: + DBG (KERN_INFO "Got LK_METRONOME and don't " + "know how to handle...\n"); + break; + case LK_OUTPUT_ERROR: + DBG (KERN_INFO "Got LK_OUTPUT_ERROR and don't " + "know how to handle...\n"); + break; + case LK_INPUT_ERROR: + DBG (KERN_INFO "Got LK_INPUT_ERROR and don't " + "know how to handle...\n"); + break; + case LK_KBD_LOCKED: + DBG (KERN_INFO "Got LK_KBD_LOCKED and don't " + "know how to handle...\n"); + break; + case LK_KBD_TEST_MODE_ACK: + DBG (KERN_INFO "Got LK_KBD_TEST_MODE_ACK and don't " + "know how to handle...\n"); + break; + case LK_PREFIX_KEY_DOWN: + DBG (KERN_INFO "Got LK_PREFIX_KEY_DOWN and don't " + "know how to handle...\n"); + break; + case LK_MODE_CHANGE_ACK: + DBG (KERN_INFO "Got LK_MODE_CHANGE_ACK and ignored " + "it properly...\n"); + break; + case LK_RESPONSE_RESERVED: + DBG (KERN_INFO "Got LK_RESPONSE_RESERVED and don't " + "know how to handle...\n"); + break; + case 0x01: + DBG (KERN_INFO "Got 0x01, scheduling re-initialization\n"); + lk->ignore_bytes = 3; + schedule_work (&lk->tq); + break; + + default: + if (lk->keycode[data] != KEY_RESERVED) { + input_regs (&lk->dev, regs); + if (!test_bit (lk->keycode[data], lk->dev.key)) + input_report_key (&lk->dev, lk->keycode[data], 1); + else + input_report_key (&lk->dev, lk->keycode[data], 0); + input_sync (&lk->dev); + } else + printk (KERN_WARNING "%s: Unknown key with " + "scancode %02x on %s.\n", + __FILE__, data, lk->name); + } + + return IRQ_HANDLED; +} + +/* + * lkkbd_event() handles events from the input module. + */ +static int +lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code, + int value) +{ + struct lkkbd *lk = dev->private; + unsigned char leds_on = 0; + unsigned char leds_off = 0; + + switch (type) { + case EV_LED: + CHECK_LED (LED_CAPSL, LK_LED_SHIFTLOCK); + CHECK_LED (LED_COMPOSE, LK_LED_COMPOSE); + CHECK_LED (LED_SCROLLL, LK_LED_SCROLLLOCK); + CHECK_LED (LED_SLEEP, LK_LED_WAIT); + if (leds_on != 0) { + lk->serio->write (lk->serio, LK_CMD_LED_ON); + lk->serio->write (lk->serio, leds_on); + } + if (leds_off != 0) { + lk->serio->write (lk->serio, LK_CMD_LED_OFF); + lk->serio->write (lk->serio, leds_off); + } + return 0; + + case EV_SND: + switch (code) { + case SND_CLICK: + if (value == 0) { + DBG ("%s: Deactivating key clicks\n", __FUNCTION__); + lk->serio->write (lk->serio, LK_CMD_DISABLE_KEYCLICK); + lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK); + } else { + DBG ("%s: Activating key clicks\n", __FUNCTION__); + lk->serio->write (lk->serio, LK_CMD_ENABLE_KEYCLICK); + lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume)); + lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK); + lk->serio->write (lk->serio, volume_to_hw (lk->ctrlclick_volume)); + } + return 0; + + case SND_BELL: + if (value != 0) + lk->serio->write (lk->serio, LK_CMD_SOUND_BELL); + + return 0; + } + break; + + default: + printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n", + __FUNCTION__, type, code, value); + } + + return -1; +} + +/* + * lkkbd_reinit() sets leds and beeps to a state the computer remembers they + * were in. + */ +static void +lkkbd_reinit (void *data) +{ + struct lkkbd *lk = data; + int division; + unsigned char leds_on = 0; + unsigned char leds_off = 0; + + /* Reset parameters */ + lk->serio->write (lk->serio, LK_CMD_SET_DEFAULTS); + + /* Set LEDs */ + CHECK_LED (LED_CAPSL, LK_LED_SHIFTLOCK); + CHECK_LED (LED_COMPOSE, LK_LED_COMPOSE); + CHECK_LED (LED_SCROLLL, LK_LED_SCROLLLOCK); + CHECK_LED (LED_SLEEP, LK_LED_WAIT); + if (leds_on != 0) { + lk->serio->write (lk->serio, LK_CMD_LED_ON); + lk->serio->write (lk->serio, leds_on); + } + if (leds_off != 0) { + lk->serio->write (lk->serio, LK_CMD_LED_OFF); + lk->serio->write (lk->serio, leds_off); + } + + /* + * Try to activate extended LK401 mode. This command will + * only work with a LK401 keyboard and grants access to + * LAlt, RAlt, RCompose and RShift. + */ + lk->serio->write (lk->serio, LK_CMD_ENABLE_LK401); + + /* Set all keys to UPDOWN mode */ + for (division = 1; division <= 14; division++) + lk->serio->write (lk->serio, LK_CMD_SET_MODE (LK_MODE_UPDOWN, + division)); + + /* Enable bell and set volume */ + lk->serio->write (lk->serio, LK_CMD_ENABLE_BELL); + lk->serio->write (lk->serio, volume_to_hw (lk->bell_volume)); + + /* Enable/disable keyclick (and possibly set volume) */ + if (test_bit (SND_CLICK, lk->dev.snd)) { + lk->serio->write (lk->serio, LK_CMD_ENABLE_KEYCLICK); + lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume)); + lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK); + lk->serio->write (lk->serio, volume_to_hw (lk->ctrlclick_volume)); + } else { + lk->serio->write (lk->serio, LK_CMD_DISABLE_KEYCLICK); + lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK); + } + + /* Sound the bell if needed */ + if (test_bit (SND_BELL, lk->dev.snd)) + lk->serio->write (lk->serio, LK_CMD_SOUND_BELL); +} + +/* + * lkkbd_connect() probes for a LK keyboard and fills the necessary structures. + */ +static void +lkkbd_connect (struct serio *serio, struct serio_dev *dev) +{ + struct lkkbd *lk; + int i; + + if ((serio->type & SERIO_TYPE) != SERIO_RS232) + return; + if (!(serio->type & SERIO_PROTO)) + return; + if ((serio->type & SERIO_PROTO) && (serio->type & SERIO_PROTO) != SERIO_LKKBD) + return; + + if (!(lk = kmalloc (sizeof (struct lkkbd), GFP_KERNEL))) + return; + memset (lk, 0, sizeof (struct lkkbd)); + + init_input_dev (&lk->dev); + + lk->dev.evbit[0] = BIT (EV_KEY) | BIT (EV_LED) | BIT (EV_SND) | BIT (EV_REP); + lk->dev.ledbit[0] = BIT (LED_CAPSL) | BIT (LED_COMPOSE) | BIT (LED_SCROLLL) | BIT (LED_SLEEP); + lk->dev.sndbit[0] = BIT (SND_CLICK) | BIT (SND_BELL); + + lk->serio = serio; + + INIT_WORK (&lk->tq, lkkbd_reinit, lk); + + lk->bell_volume = bell_volume; + lk->keyclick_volume = keyclick_volume; + lk->ctrlclick_volume = ctrlclick_volume; + + lk->dev.keycode = lk->keycode; + lk->dev.keycodesize = sizeof (lk_keycode_t); + lk->dev.keycodemax = LK_NUM_KEYCODES; + + lk->dev.event = lkkbd_event; + lk->dev.private = lk; + + serio->private = lk; + + if (serio_open (serio, dev)) { + kfree (lk); + return; + } + + sprintf (lk->name, "LK keyboard"); + + memcpy (lk->keycode, lkkbd_keycode, sizeof (lk_keycode_t) * LK_NUM_KEYCODES); + for (i = 0; i < LK_NUM_KEYCODES; i++) + set_bit (lk->keycode[i], lk->dev.keybit); + + sprintf (lk->name, "%s/input0", serio->phys); + + lk->dev.name = lk->name; + lk->dev.phys = lk->phys; + lk->dev.id.bustype = BUS_RS232; + lk->dev.id.vendor = SERIO_LKKBD; + lk->dev.id.product = 0; + lk->dev.id.version = 0x0100; + + input_register_device (&lk->dev); + + printk (KERN_INFO "input: %s on %s, initiating reset\n", lk->name, serio->phys); + lk->serio->write (lk->serio, LK_CMD_POWERCYCLE_RESET); +} + +/* + * lkkbd_disconnect() unregisters and closes behind us. + */ +static void +lkkbd_disconnect (struct serio *serio) +{ + struct lkkbd *lk = serio->private; + + input_unregister_device (&lk->dev); + serio_close (serio); + kfree (lk); +} + +static struct serio_dev lkkbd_dev = { + .interrupt = lkkbd_interrupt, + .connect = lkkbd_connect, + .disconnect = lkkbd_disconnect, +}; + +/* + * The functions for insering/removing us as a module. + */ +int __init +lkkbd_init (void) +{ + serio_register_device (&lkkbd_dev); + return 0; +} + +void __exit +lkkbd_exit (void) +{ + serio_unregister_device (&lkkbd_dev); +} + +module_init (lkkbd_init); +module_exit (lkkbd_exit); + diff -Nru a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c --- a/drivers/input/keyboard/sunkbd.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/keyboard/sunkbd.c Wed Mar 17 19:29:09 2004 @@ -77,6 +77,7 @@ struct input_dev dev; struct serio *serio; struct work_struct tq; + wait_queue_head_t wait; char name[64]; char phys[32]; char type; @@ -96,11 +97,13 @@ if (sunkbd->reset <= -1) { /* If cp[i] is 0xff, sunkbd->reset will stay -1. */ sunkbd->reset = data; /* The keyboard sends 0xff 0xff 0xID on powerup */ + wake_up_interruptible(&sunkbd->wait); goto out; } if (sunkbd->layout == -1) { sunkbd->layout = data; + wake_up_interruptible(&sunkbd->wait); goto out; } @@ -176,22 +179,19 @@ static int sunkbd_initialize(struct sunkbd *sunkbd) { - int t; - - t = 1000; sunkbd->reset = -2; sunkbd->serio->write(sunkbd->serio, SUNKBD_CMD_RESET); - while (sunkbd->reset < 0 && --t) mdelay(1); - if (!t) return -1; + wait_event_interruptible_timeout(sunkbd->wait, sunkbd->reset >= 0, HZ); + if (sunkbd->reset <0) + return -1; sunkbd->type = sunkbd->reset; if (sunkbd->type == 4) { /* Type 4 keyboard */ - t = 250; sunkbd->layout = -2; sunkbd->serio->write(sunkbd->serio, SUNKBD_CMD_LAYOUT); - while (sunkbd->layout < 0 && --t) mdelay(1); - if (!t) return -1; + wait_event_interruptible_timeout(sunkbd->wait, sunkbd->layout >= 0, HZ/4); + if (sunkbd->layout < 0) return -1; if (sunkbd->layout & SUNKBD_LAYOUT_5_MASK) sunkbd->type = 5; } @@ -206,9 +206,8 @@ static void sunkbd_reinit(void *data) { struct sunkbd *sunkbd = data; - int t = 1000; - while (sunkbd->reset < 0 && --t) mdelay(1); + wait_event_interruptible_timeout(sunkbd->wait, sunkbd->reset >= 0, HZ); sunkbd->serio->write(sunkbd->serio, SUNKBD_CMD_SETLED); sunkbd->serio->write(sunkbd->serio, @@ -239,6 +238,7 @@ memset(sunkbd, 0, sizeof(struct sunkbd)); init_input_dev(&sunkbd->dev); + init_waitqueue_head(&sunkbd->wait); sunkbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_SND) | BIT(EV_REP); sunkbd->dev.ledbit[0] = BIT(LED_CAPSL) | BIT(LED_COMPOSE) | BIT(LED_SCROLLL) | BIT(LED_NUML); @@ -275,7 +275,7 @@ set_bit(sunkbd->keycode[i], sunkbd->dev.keybit); clear_bit(0, sunkbd->dev.keybit); - sprintf(sunkbd->name, "%s/input", serio->phys); + sprintf(sunkbd->phys, "%s/input0", serio->phys); sunkbd->dev.name = sunkbd->name; sunkbd->dev.phys = sunkbd->phys; diff -Nru a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig --- a/drivers/input/misc/Kconfig Wed Mar 17 19:29:09 2004 +++ b/drivers/input/misc/Kconfig Wed Mar 17 19:29:09 2004 @@ -54,12 +54,3 @@ To compile this driver as a module, choose M here: the module will be called uinput. -config INPUT_GSC - tristate "PA-RISC GSC PS/2 keyboard/mouse support" - depends on GSC && INPUT && INPUT_MISC - help - Say Y here if you have a PS/2 keyboard and/or mouse attached - to your PA-RISC box. HP run the keyboard in AT mode rather than - XT mode like everyone else, so we need our own driver. - Furthermore, the GSC PS/2 controller shares IRQ between mouse and - keyboard. diff -Nru a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile --- a/drivers/input/misc/Makefile Wed Mar 17 19:29:09 2004 +++ b/drivers/input/misc/Makefile Wed Mar 17 19:29:09 2004 @@ -9,4 +9,3 @@ obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o obj-$(CONFIG_INPUT_UINPUT) += uinput.o -obj-$(CONFIG_INPUT_GSC) += gsc_ps2.o diff -Nru a/drivers/input/misc/gsc_ps2.c b/drivers/input/misc/gsc_ps2.c --- a/drivers/input/misc/gsc_ps2.c Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,712 +0,0 @@ -/* - * drivers/input/misc/gsc_ps2.c - * - * Copyright (c) 2002 Laurent Canet - * Copyright (c) 2002 Thibaut Varene - * - * Pieces of code based on linux-2.4's hp_mouse.c & hp_keyb.c - * Copyright (c) 1999 Alex deVries - * Copyright (c) 1999-2000 Philipp Rumpf - * Copyright (c) 2000 Xavier Debacker - * Copyright (c) 2000-2001 Thomas Marteau - * - * HP PS/2 Keyboard, found in PA/RISC Workstations - * very similar to AT keyboards, but without i8042 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * STATUS: - * 11/09: lc: Only basic keyboard is supported, mouse still needs to be done. - * 11/12: tv: switching iomapping; cleaning code; improving module stuff. - * 11/13: lc & tv: leds aren't working. auto_repeat/meta are. Generaly good behavior. - * 11/15: tv: 2AM: leds ARE working ! - * 11/16: tv: 3AM: escaped keycodes emulation *handled*, some keycodes are - * still deliberately ignored (18), what are they used for ? - * 11/21: lc: mouse is now working - * 11/29: tv: first try for error handling in init sequence - * - * TODO: - * Error handling in init sequence - * SysRq handling - * Pause key handling - * Intellimouse & other rodents handling (at least send an error when - * such a mouse is plugged : it will totally fault) - * Mouse: set scaling / Dino testing - * Bug chasing... - * - */ - -#include -#include -#include -#include /* interrupt.h wants struct pt_regs defined */ -#include -#include /* for request_irq/free_irq */ -#include -#include -#include -#include -#include - -#include -#include -#include - -/* Debugging stuff */ -#undef KBD_DEBUG -#ifdef KBD_DEBUG - #define DPRINTK(fmt,args...) printk(KERN_DEBUG __FILE__ ":" fmt, ##args) -#else - #define DPRINTK(x,...) -#endif - - -/* - * Driver constants - */ - -/* PS/2 keyboard and mouse constants */ -#define AUX_RECONNECT 0xAA /* PS/2 Mouse end of test successful */ -#define AUX_REPLY_ACK 0xFA -#define AUX_ENABLE_DEV 0xF4 /* Enables aux device */ - -/* Order of the mouse bytes coming to the host */ -#define PACKET_X 1 -#define PACKET_Y 2 -#define PACKET_CTRL 0 - -#define GSC_MOUSE_OFFSET 0x0100 /* offset from keyboard to mouse port */ -#define GSC_DINO_OFFSET 0x800 /* offset for DINO controller versus LASI one */ - -#define GSC_ID 0x00 /* ID and reset port offsets */ -#define GSC_RESET 0x00 -#define GSC_RCVDATA 0x04 /* receive and transmit port offsets */ -#define GSC_XMTDATA 0x04 -#define GSC_CONTROL 0x08 /* see: control register bits */ -#define GSC_STATUS 0x0C /* see: status register bits */ - -/* Control register bits */ -#define GSC_CTRL_ENBL 0x01 /* enable interface */ -#define GSC_CTRL_LPBXR 0x02 /* loopback operation */ -#define GSC_CTRL_DIAG 0x20 /* directly control clock/data line */ -#define GSC_CTRL_DATDIR 0x40 /* data line direct control */ -#define GSC_CTRL_CLKDIR 0x80 /* clock line direct control */ - -/* Status register bits */ -#define GSC_STAT_RBNE 0x01 /* Receive Buffer Not Empty */ -#define GSC_STAT_TBNE 0x02 /* Transmit Buffer Not Empty */ -#define GSC_STAT_TERR 0x04 /* Timeout Error */ -#define GSC_STAT_PERR 0x08 /* Parity Error */ -#define GSC_STAT_CMPINTR 0x10 /* Composite Interrupt */ -#define GSC_STAT_DATSHD 0x40 /* Data Line Shadow */ -#define GSC_STAT_CLKSHD 0x80 /* Clock Line Shadow */ - -/* Keycode map */ -#define KBD_ESCAPE0 0xe0 -#define KBD_ESCAPE1 0xe1 -#define KBD_RELEASE 0xf0 -#define KBD_ACK 0xfa -#define KBD_RESEND 0xfe -#define KBD_UNKNOWN 0 - -#define KBD_TBLSIZE 512 - -/* Mouse */ -#define MOUSE_LEFTBTN 0x1 -#define MOUSE_MIDBTN 0x4 -#define MOUSE_RIGHTBTN 0x2 -#define MOUSE_ALWAYS1 0x8 -#define MOUSE_XSIGN 0x10 -#define MOUSE_YSIGN 0x20 -#define MOUSE_XOVFLOW 0x40 -#define MOUSE_YOVFLOW 0x80 - -/* Remnant of pc_keyb.h */ -#define KBD_CMD_SET_LEDS 0xED /* Sets keyboard leds */ -#define KBD_CMD_SET_RATE 0xF3 /* Sets typematic rate */ -#define KBD_CMD_ENABLE 0xF4 /* Enables scanning */ -#define KBD_CMD_DISABLE 0xF5 -#define KBD_CMD_RESET 0xFF - -static unsigned char hpkeyb_keycode[KBD_TBLSIZE] = -{ - /* 00 */ KBD_UNKNOWN, KEY_F9, KBD_UNKNOWN, KEY_F5, KEY_F3, KEY_F1, KEY_F2, KEY_F12, - /* 08 */ KBD_UNKNOWN, KEY_F10, KEY_F8, KEY_F6, KEY_F4, KEY_TAB, KEY_GRAVE, KBD_UNKNOWN, - /* 10 */ KBD_UNKNOWN, KEY_LEFTALT, KEY_LEFTSHIFT, KBD_UNKNOWN, KEY_LEFTCTRL, KEY_Q, KEY_1, KBD_UNKNOWN, - /* 18 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_Z, KEY_S, KEY_A, KEY_W, KEY_2, KBD_UNKNOWN, - /* 20 */ KBD_UNKNOWN, KEY_C, KEY_X, KEY_D, KEY_E, KEY_4, KEY_3, KBD_UNKNOWN, - /* 28 */ KBD_UNKNOWN, KEY_SPACE, KEY_V, KEY_F, KEY_T, KEY_R, KEY_5, KBD_UNKNOWN, - /* 30 */ KBD_UNKNOWN, KEY_N, KEY_B, KEY_H, KEY_G, KEY_Y, KEY_6, KBD_UNKNOWN, - /* 38 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_M, KEY_J, KEY_U, KEY_7, KEY_8, KBD_UNKNOWN, - /* 40 */ KBD_UNKNOWN, KEY_COMMA, KEY_K, KEY_I, KEY_O, KEY_0, KEY_9, KBD_UNKNOWN, - /* 48 */ KBD_UNKNOWN, KEY_DOT, KEY_SLASH, KEY_L, KEY_SEMICOLON, KEY_P, KEY_MINUS, KBD_UNKNOWN, - /* 50 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_APOSTROPHE,KBD_UNKNOWN, KEY_LEFTBRACE, KEY_EQUAL, KBD_UNKNOWN, KBD_UNKNOWN, - /* 58 */ KEY_CAPSLOCK, KEY_RIGHTSHIFT,KEY_ENTER, KEY_RIGHTBRACE,KBD_UNKNOWN, KEY_BACKSLASH,KBD_UNKNOWN, KBD_UNKNOWN, - /* 60 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KEY_BACKSPACE, KBD_UNKNOWN, - /* 68 */ KBD_UNKNOWN, KEY_KP1, KBD_UNKNOWN, KEY_KP4, KEY_KP7, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 70 */ KEY_KP0, KEY_KPDOT, KEY_KP2, KEY_KP5, KEY_KP6, KEY_KP8, KEY_ESC, KEY_NUMLOCK, - /* 78 */ KEY_F11, KEY_KPPLUS, KEY_KP3, KEY_KPMINUS, KEY_KPASTERISK,KEY_KP9, KEY_SCROLLLOCK,KEY_103RD, - /* 80 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KEY_F7, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 88 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 90 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 98 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e0 */ KBD_ESCAPE0, KBD_ESCAPE1, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f0 */ KBD_RELEASE, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_ACK, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_RESEND, KBD_UNKNOWN, -/* These are offset for escaped keycodes */ - /* 00 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 08 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 10 */ KBD_UNKNOWN, KEY_RIGHTALT, KBD_UNKNOWN, KBD_UNKNOWN, KEY_RIGHTCTRL, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 18 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 20 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 28 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 30 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 38 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 40 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 48 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_KPSLASH, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 50 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 58 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_KPENTER, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 60 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 68 */ KBD_UNKNOWN, KEY_END, KBD_UNKNOWN, KEY_LEFT, KEY_HOME, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 70 */ KEY_INSERT, KEY_DELETE, KEY_DOWN, KBD_UNKNOWN, KEY_RIGHT, KEY_UP, KBD_UNKNOWN, KBD_UNKNOWN, - /* 78 */ KBD_UNKNOWN, KBD_UNKNOWN, KEY_PAGEDOWN, KBD_UNKNOWN, KEY_SYSRQ, KEY_PAGEUP, KBD_UNKNOWN, KBD_UNKNOWN, - /* 80 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 88 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 90 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* 98 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* a8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* b8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* c8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* d8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e0 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* e8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f0 */ KBD_RELEASE, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, - /* f8 */ KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN, KBD_UNKNOWN -}; - - -/* Keyboard struct */ -static struct { - struct input_dev dev; - char * addr; - unsigned int irq; - unsigned int scancode; - unsigned int escaped; - unsigned int released; - unsigned int initialized; -} -hpkeyb = { - .escaped = 0, - .released = 0, - .initialized = 0 -}; - -/* Mouse struct */ -static struct { - struct input_dev dev; - char * addr; - unsigned long irq; - unsigned long initialized; - int nbread; - unsigned char bytes[3]; - unsigned long last; -} -hpmouse = { - .initialized = 0, - .nbread = 0 -}; - -static spinlock_t gscps2_lock = SPIN_LOCK_UNLOCKED; - - -/* - * Various HW level routines - */ - -#define gscps2_readb_input(x) readb(x+GSC_RCVDATA) -#define gscps2_readb_control(x) readb(x+GSC_CONTROL) -#define gscps2_readb_status(x) readb(x+GSC_STATUS) -#define gscps2_writeb_control(x, y) writeb(x, y+GSC_CONTROL) - -static inline void gscps2_writeb_output(u8 val, char * addr) -{ - int wait = 250; /* Keyboard is expected to react within 250ms */ - - while (gscps2_readb_status(addr) & GSC_STAT_TBNE) { - if (!--wait) - return; /* This should not happen */ - mdelay(1); - } - writeb(val, addr+GSC_XMTDATA); -} - -static inline unsigned char gscps2_wait_input(char * addr) -{ - int wait = 250; /* Keyboard is expected to react within 250ms */ - - while (!(gscps2_readb_status(addr) & GSC_STAT_RBNE)) { - if (!--wait) - return 0; /* This should not happen */ - mdelay(1); - } - return gscps2_readb_input(addr); -} - -static int gscps2_writeb_safe_output(u8 val) -{ - /* This function waits for keyboard's ACK */ - u8 scanread = KBD_UNKNOWN; - int loop = 5; - - while (hpkeyb_keycode[scanread]!=KBD_ACK && --loop > 0) { - gscps2_writeb_output(val, hpkeyb.addr); - mdelay(5); - scanread = gscps2_wait_input(hpkeyb.addr); - } - - if (loop <= 0) - return -1; - - return 0; -} - -/* Reset the PS2 port */ -static void __init gscps2_reset(char * addr) -{ - /* reset the interface */ - writeb(0xff, addr+GSC_RESET); - writeb(0x0 , addr+GSC_RESET); - - /* enable it */ - gscps2_writeb_control(gscps2_readb_control(addr) | GSC_CTRL_ENBL, addr); -} - - -/** - * gscps2_kbd_docode() - PS2 Keyboard basic handler - * - * Receives a keyboard scancode, analyses it and sends it to the input layer. - */ - -static void gscps2_kbd_docode(struct pt_regs *regs) -{ - int scancode = gscps2_readb_input(hpkeyb.addr); - DPRINTK("rel=%d scancode=%d, esc=%d ", hpkeyb.released, scancode, hpkeyb.escaped); - - /* Handle previously escaped scancodes */ - if (hpkeyb.escaped == KBD_ESCAPE0) - scancode |= 0x100; /* jump to the next 256 chars of the table */ - - switch (hpkeyb_keycode[scancode]) { - case KBD_RELEASE: - DPRINTK("release\n"); - hpkeyb.released = 1; - break; - case KBD_RESEND: - DPRINTK("resend request\n"); - break; - case KBD_ACK: - DPRINTK("ACK\n"); - break; - case KBD_ESCAPE0: - case KBD_ESCAPE1: - DPRINTK("escape code %d\n", hpkeyb_keycode[scancode]); - hpkeyb.escaped = hpkeyb_keycode[scancode]; - break; - case KBD_UNKNOWN: - DPRINTK("received unknown scancode %d, escape %d.\n", - scancode, hpkeyb.escaped); /* This is a DPRINTK atm since we do not handle escaped scancodes cleanly */ - if (hpkeyb.escaped) - hpkeyb.escaped = 0; - if (hpkeyb.released) - hpkeyb.released = 0; - return; - default: - hpkeyb.scancode = scancode; - DPRINTK("sent=%d, rel=%d\n",hpkeyb.scancode, hpkeyb.released); - /*input_regs(regs);*/ - input_report_key(&hpkeyb.dev, hpkeyb_keycode[hpkeyb.scancode], !hpkeyb.released); - input_sync(&hpkeyb.dev); - if (hpkeyb.escaped) - hpkeyb.escaped = 0; - if (hpkeyb.released) - hpkeyb.released = 0; - break; - } -} - - -/** - * gscps2_mouse_docode() - PS2 Mouse basic handler - * - * Receives mouse codes, processes them by packets of three, and sends - * correct events to the input layer. - */ - -static void gscps2_mouse_docode(struct pt_regs *regs) -{ - int xrel, yrel; - - /* process BAT (end of basic tests) command */ - if ((hpmouse.nbread == 1) && (hpmouse.bytes[0] == AUX_RECONNECT)) - hpmouse.nbread--; - - /* stolen from psmouse.c */ - if (hpmouse.nbread && time_after(jiffies, hpmouse.last + HZ/2)) { - printk(KERN_DEBUG "%s:%d : Lost mouse synchronization, throwing %d bytes away.\n", __FILE__, __LINE__, - hpmouse.nbread); - hpmouse.nbread = 0; - } - - hpmouse.last = jiffies; - hpmouse.bytes[hpmouse.nbread++] = gscps2_readb_input(hpmouse.addr); - - /* process packet */ - if (hpmouse.nbread == 3) { - - if (!(hpmouse.bytes[PACKET_CTRL] & MOUSE_ALWAYS1)) - DPRINTK("Mouse: error on packet always1 bit checking\n"); - /* XXX should exit now, bad data on the line! */ - - if ((hpmouse.bytes[PACKET_CTRL] & (MOUSE_XOVFLOW | MOUSE_YOVFLOW))) - DPRINTK("Mouse: position overflow\n"); - - /*input_regs(regs);*/ - - input_report_key(&hpmouse.dev, BTN_LEFT, hpmouse.bytes[PACKET_CTRL] & MOUSE_LEFTBTN); - input_report_key(&hpmouse.dev, BTN_MIDDLE, hpmouse.bytes[PACKET_CTRL] & MOUSE_MIDBTN); - input_report_key(&hpmouse.dev, BTN_RIGHT, hpmouse.bytes[PACKET_CTRL] & MOUSE_RIGHTBTN); - - xrel = hpmouse.bytes[PACKET_X]; - yrel = hpmouse.bytes[PACKET_Y]; - - /* Data sent by mouse are 9-bit signed, the sign bit is in the control packet */ - if (xrel && (hpmouse.bytes[PACKET_CTRL] & MOUSE_XSIGN)) - xrel = xrel - 0x100; - if (yrel && (hpmouse.bytes[PACKET_CTRL] & MOUSE_YSIGN)) - yrel = yrel - 0x100; - - input_report_rel(&hpmouse.dev, REL_X, xrel); - input_report_rel(&hpmouse.dev, REL_Y, -yrel); /* Y axis is received upside-down */ - - input_sync(&hpmouse.dev); - - hpmouse.nbread = 0; - } -} - - -/** - * gscps2_interrupt() - Interruption service routine - * - * This processes the list of scancodes queued and sends appropriate - * key value to the system. - */ - -static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *reg) -{ - /* process mouse actions */ - while (gscps2_readb_status(hpmouse.addr) & GSC_STAT_RBNE) - gscps2_mouse_docode(reg); - - /* process keyboard scancode */ - while (gscps2_readb_status(hpkeyb.addr) & GSC_STAT_RBNE) - gscps2_kbd_docode(reg); - - return IRQ_HANDLED; -} - - -/** - * gscps2_hpkeyb_event() - Event handler - * @return: success/error report - * - * Currently only updates leds on keyboard - */ - -int gscps2_hpkeyb_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) -{ - DPRINTK("Calling %s, type=%d, code=%d, value=%d\n", - __FUNCTION__, type, code, value); - - if (!hpkeyb.initialized) - return -1; - - if (type == EV_LED) { - u8 leds[2]; - - if (gscps2_writeb_safe_output(KBD_CMD_SET_LEDS)) { - printk(KERN_ERR "gsckbd_leds: timeout\n"); - return -1; - } - DPRINTK("KBD_CMD_SET_LEDS\n"); - - *leds = (test_bit(LED_SCROLLL, dev->led) ? LED_SCR : 0) - | (test_bit(LED_NUML, dev->led) ? LED_NUM : 0) - | (test_bit(LED_CAPSL, dev->led) ? LED_CAP : 0); - DPRINTK("Sending leds=%x\n", *leds); - - if (gscps2_writeb_safe_output(*leds)) { - printk(KERN_ERR "gsckbd_leds: timeout\n"); - return -1; - } - DPRINTK("leds sent\n"); - - if (gscps2_writeb_safe_output(KBD_CMD_ENABLE)) { - printk(KERN_ERR "gsckbd_leds: timeout\n"); - return -1; - } - DPRINTK("End\n"); - - return 0; - - } - return -1; -} - - -/** - * gscps2_kbd_probe() - Probes keyboard device and init input_dev structure - * @return: number of device initialized (1, 0 on error) - */ - -static int __init gscps2_kbd_probe(void) -{ - int i, res = 0; - unsigned long flags; - - if (hpkeyb.initialized) { - printk(KERN_ERR "GSC PS/2 keyboard driver already registered\n"); - return 0; - } - - spin_lock_irqsave(&gscps2_lock, flags); - - if (!gscps2_writeb_safe_output(KBD_CMD_SET_LEDS) && - !gscps2_writeb_safe_output(0) && - !gscps2_writeb_safe_output(KBD_CMD_ENABLE)) - res = 1; - - spin_unlock_irqrestore(&gscps2_lock, flags); - - if (!res) - printk(KERN_ERR "Keyboard initialization sequence failled\n"); - - init_input_dev(&hpkeyb.dev); - - for (i = 0; i < KBD_TBLSIZE; i++) - if (hpkeyb_keycode[i] != KBD_UNKNOWN) - set_bit(hpkeyb_keycode[i], hpkeyb.dev.keybit); - - hpkeyb.dev.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP); - hpkeyb.dev.ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL); - hpkeyb.dev.keycode = hpkeyb_keycode; - hpkeyb.dev.keycodesize = sizeof(unsigned char); - hpkeyb.dev.keycodemax = KBD_TBLSIZE; - hpkeyb.dev.name = "GSC Keyboard"; - hpkeyb.dev.phys = "hpkbd/input0"; - - hpkeyb.dev.event = gscps2_hpkeyb_event; - - /* TODO These need some adjustement, are they really useful ? */ - hpkeyb.dev.id.bustype = BUS_GSC; - hpkeyb.dev.id.vendor = PCI_VENDOR_ID_HP; - hpkeyb.dev.id.product = 0x0001; - hpkeyb.dev.id.version = 0x0010; - hpkeyb.initialized = 1; - - return 1; -} - - -/** - * gscps2_mouse_probe() - Probes mouse device and init input_dev structure - * @return: number of device initialized (1, 0 on error) - * - * Currently no check on initialization is performed - */ - -static int __init gscps2_mouse_probe(void) -{ - if (hpmouse.initialized) { - printk(KERN_ERR "GSC PS/2 Mouse driver already registered\n"); - return 0; - } - - init_input_dev(&hpmouse.dev); - - hpmouse.dev.name = "GSC Mouse"; - hpmouse.dev.phys = "hpmouse/input0"; - hpmouse.dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL); - hpmouse.dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT); - hpmouse.dev.relbit[0] = BIT(REL_X) | BIT(REL_Y); - hpmouse.last = 0; - - gscps2_writeb_output(AUX_ENABLE_DEV, hpmouse.addr); - /* Try it a second time, this will give status if the device is available */ - gscps2_writeb_output(AUX_ENABLE_DEV, hpmouse.addr); - - /* TODO These need some adjustement, are they really useful ? */ - hpmouse.dev.id.bustype = BUS_GSC; - hpmouse.dev.id.vendor = 0x0001; - hpmouse.dev.id.product = 0x0001; - hpmouse.dev.id.version = 0x0010; - hpmouse.initialized = 1; - return 1; /* XXX: we don't check if initialization failed */ -} - - -/** - * gscps2_probe() - Probes PS2 devices - * @return: success/error report - */ - -static int __init gscps2_probe(struct parisc_device *dev) -{ - u8 id; - char *addr, *name; - int ret = 0, device_found = 0; - unsigned long hpa = dev->hpa; - - if (!dev->irq) - goto fail_pitifully; - - /* Offset for DINO PS/2. Works with LASI even */ - if (dev->id.sversion == 0x96) - hpa += GSC_DINO_OFFSET; - - addr = ioremap(hpa, 256); - - if (!hpmouse.initialized || !hpkeyb.initialized) - gscps2_reset(addr); - - ret = -EINVAL; - id = readb(addr+GSC_ID) & 0x0f; - switch (id) { - case 0: /* keyboard */ - hpkeyb.addr = addr; - name = "keyboard"; - device_found = gscps2_kbd_probe(); - break; - case 1: /* mouse */ - hpmouse.addr = addr; - name = "mouse"; - device_found = gscps2_mouse_probe(); - break; - default: - printk(KERN_WARNING "%s: Unsupported PS/2 port (id=%d) ignored\n", - __FUNCTION__, id); - goto fail_miserably; - } - - /* No valid device found */ - ret = -ENODEV; - if (!device_found) - goto fail_miserably; - - /* Here we claim only if we have a device attached */ - /* Allocate the irq and memory region for that device */ - ret = -EBUSY; - if (request_irq(dev->irq, gscps2_interrupt, 0, name, NULL)) - goto fail_miserably; - - if (!request_mem_region(hpa, GSC_STATUS + 4, name)) - goto fail_request_mem; - - /* Finalize input struct and register it */ - switch (id) { - case 0: /* keyboard */ - hpkeyb.irq = dev->irq; - input_register_device(&hpkeyb.dev); - break; - case 1: /* mouse */ - hpmouse.irq = dev->irq; - input_register_device(&hpmouse.dev); - break; - default: - break; - } - - printk(KERN_INFO "input: PS/2 %s port at 0x%08lx (irq %d) found and attached\n", - name, hpa, dev->irq); - - return 0; - -fail_request_mem: free_irq(dev->irq, NULL); -fail_miserably: iounmap(addr); -fail_pitifully: return ret; -} - - - -static struct parisc_device_id gscps2_device_tbl[] = { - { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00084 }, /* LASI PS/2 */ -/* { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00096 }, DINO PS/2 (XXX Not yet tested) */ - { 0, } /* 0 terminated list */ -}; - -static struct parisc_driver gscps2_driver = { - .name = "GSC PS2", - .id_table = gscps2_device_tbl, - .probe = gscps2_probe, -}; - -static int __init gscps2_init(void) -{ - if (register_parisc_driver(&gscps2_driver)) - return -EBUSY; - return 0; -} - -static void __exit gscps2_exit(void) -{ - /* TODO this is probably not very good and needs to be checked */ - if (hpkeyb.initialized) { - free_irq(hpkeyb.irq, gscps2_interrupt); - iounmap(hpkeyb.addr); - hpkeyb.initialized = 0; - input_unregister_device(&hpkeyb.dev); - } - if (hpmouse.initialized) { - free_irq(hpmouse.irq, gscps2_interrupt); - iounmap(hpmouse.addr); - hpmouse.initialized = 0; - input_unregister_device(&hpmouse.dev); - } - unregister_parisc_driver(&gscps2_driver); -} - - -MODULE_AUTHOR("Laurent Canet , Thibaut Varene "); -MODULE_DESCRIPTION("GSC PS/2 keyboard/mouse driver"); -MODULE_LICENSE("GPL"); -MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl); - - -module_init(gscps2_init); -module_exit(gscps2_exit); diff -Nru a/drivers/input/mouse/98busmouse.c b/drivers/input/mouse/98busmouse.c --- a/drivers/input/mouse/98busmouse.c Wed Mar 17 19:29:10 2004 +++ b/drivers/input/mouse/98busmouse.c Wed Mar 17 19:29:10 2004 @@ -74,6 +74,8 @@ module_param_named(irq, pc98bm_irq, uint, 0); MODULE_PARM_DESC(irq, "IRQ number (13=default)"); +__obsolete_setup("pc98bm_irq="); + static int pc98bm_used = 0; static irqreturn_t pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs); diff -Nru a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig --- a/drivers/input/mouse/Kconfig Wed Mar 17 19:29:10 2004 +++ b/drivers/input/mouse/Kconfig Wed Mar 17 19:29:10 2004 @@ -17,6 +17,7 @@ depends on INPUT && INPUT_MOUSE select SERIO select SERIO_I8042 if PC + select SERIO_GSCPS2 if GSC ---help--- Say Y here if you have a PS/2 mouse connected to your system. This includes the standard 2 or 3-button PS/2 mouse, as well as PS/2 @@ -116,6 +117,19 @@ To compile this driver as a module, choose M here: the module will be called rpcmouse. + +config MOUSE_VSXXXAA + tristate "DEC VSXXX-AA/GA mouse and tablet" + depends on INPUT && INPUT_MOUSE + select SERIO + help + Say Y (or M) if you want to use a DEC VSXXX-AA (hockey + puck) or a VSXXX-GA (rectangular) mouse. Theses mice are + typically used on DECstations or VAXstations, but can also + be used on any box capable of RS232 (with some adaptor + described in the source file). This driver should, in theory, + also work with the digitizer DEC produced, but it isn't tested + with that (I don't have the hardware yet). config MOUSE_PC9800 tristate "NEC PC-9800 busmouse" diff -Nru a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile --- a/drivers/input/mouse/Makefile Wed Mar 17 19:29:09 2004 +++ b/drivers/input/mouse/Makefile Wed Mar 17 19:29:09 2004 @@ -13,5 +13,6 @@ obj-$(CONFIG_MOUSE_PC9800) += 98busmouse.o obj-$(CONFIG_MOUSE_PS2) += psmouse.o obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o +obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o psmouse-objs := psmouse-base.o logips2pp.o synaptics.o diff -Nru a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c --- a/drivers/input/mouse/inport.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/mouse/inport.c Wed Mar 17 19:29:09 2004 @@ -85,6 +85,8 @@ module_param_named(irq, inport_irq, uint, 0); MODULE_PARM_DESC(irq, "IRQ number (5=default)"); +__obsolete_setup("inport_irq="); + static int inport_used; static irqreturn_t inport_interrupt(int irq, void *dev_id, struct pt_regs *regs); diff -Nru a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c --- a/drivers/input/mouse/logibm.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/mouse/logibm.c Wed Mar 17 19:29:09 2004 @@ -75,6 +75,8 @@ module_param_named(irq, logibm_irq, uint, 0); MODULE_PARM_DESC(irq, "IRQ number (5=default)"); +__obsolete_setup("logibm_irq="); + static int logibm_used = 0; static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs); diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c --- a/drivers/input/mouse/psmouse-base.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/mouse/psmouse-base.c Wed Mar 17 19:29:09 2004 @@ -47,6 +47,12 @@ module_param_named(resetafter, psmouse_resetafter, uint, 0); MODULE_PARM_DESC(resetafter, "Reset Synaptics Touchpad after so many bad packets (0 = never)."); +__obsolete_setup("psmouse_noext"); +__obsolete_setup("psmouse_resolution="); +__obsolete_setup("psmouse_smartscroll="); +__obsolete_setup("psmouse_resetafter="); +__obsolete_setup("psmouse_rate="); + static char *psmouse_protocols[] = { "None", "PS/2", "PS2++", "PS2T++", "GenPS/2", "ImPS/2", "ImExPS/2", "SynPS/2"}; /* @@ -163,14 +169,14 @@ psmouse->name, psmouse->phys, psmouse->pktcnt); psmouse->pktcnt = 0; } - + psmouse->last = jiffies; psmouse->packet[psmouse->pktcnt++] = data; if (psmouse->packet[0] == PSMOUSE_RET_BAT) { if (psmouse->pktcnt == 1) goto out; - + if (psmouse->pktcnt == 2) { if (psmouse->packet[1] == PSMOUSE_RET_ID) { psmouse->state = PSMOUSE_IGNORE; @@ -258,7 +264,7 @@ return (psmouse->cmdcnt = 0) - 1; while (psmouse->cmdcnt && timeout--) { - + if (psmouse->cmdcnt == 1 && command == PSMOUSE_CMD_RESET_BAT && timeout > 100000) /* do not run in a endless loop */ timeout = 100000; /* 1 sec */ @@ -281,6 +287,24 @@ return 0; } + +/* + * psmouse_reset() resets the mouse into power-on state. + */ +int psmouse_reset(struct psmouse *psmouse) +{ + unsigned char param[2]; + + if (psmouse_command(psmouse, param, PSMOUSE_CMD_RESET_BAT)) + return -1; + + if (param[0] != PSMOUSE_RET_BAT && param[1] != PSMOUSE_RET_ID) + return -1; + + return 0; +} + + /* * Genius NetMouse magic init. */ @@ -365,6 +389,10 @@ */ psmouse_max_proto = PSMOUSE_IMEX; } +/* + * Make sure that touchpad is in relative mode, gestures (taps) are enabled + */ + synaptics_reset(psmouse); } if (psmouse_max_proto > PSMOUSE_IMEX && genius_detect(psmouse)) { @@ -410,6 +438,7 @@ * pass through port it could get disabled while probing for protocol * extensions. */ + psmouse_reset(psmouse); psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS); } @@ -442,7 +471,7 @@ */ if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS)) - return -1; + printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", psmouse->serio->phys); /* * And here we try to determine if it has any extensions over the @@ -497,7 +526,7 @@ static void psmouse_initialize(struct psmouse *psmouse) { unsigned char param[2]; - + /* * We set the mouse report rate, resolution and scaling. */ @@ -534,8 +563,8 @@ static void psmouse_cleanup(struct serio *serio) { struct psmouse *psmouse = serio->private; - unsigned char param[2]; - psmouse_command(psmouse, param, PSMOUSE_CMD_RESET_BAT); + + psmouse_reset(psmouse); } /* @@ -546,7 +575,7 @@ { struct psmouse *psmouse = serio->private; - psmouse->state = PSMOUSE_IGNORE; + psmouse->state = PSMOUSE_CMD_MODE; if (psmouse->ptport) { if (psmouse->ptport->deactivate) @@ -559,6 +588,8 @@ if (psmouse->disconnect) psmouse->disconnect(psmouse); + psmouse->state = PSMOUSE_IGNORE; + input_unregister_device(&psmouse->dev); serio_close(serio); kfree(psmouse); @@ -571,7 +602,7 @@ static void psmouse_connect(struct serio *serio, struct serio_dev *dev) { struct psmouse *psmouse; - + if ((serio->type & SERIO_TYPE) != SERIO_8042 && (serio->type & SERIO_TYPE) != SERIO_PS_PSTHRU) return; @@ -586,7 +617,7 @@ psmouse->dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT); psmouse->dev.relbit[0] = BIT(REL_X) | BIT(REL_Y); - psmouse->state = PSMOUSE_NEW_DEVICE; + psmouse->state = PSMOUSE_CMD_MODE; psmouse->serio = serio; psmouse->dev.private = psmouse; @@ -603,7 +634,7 @@ serio->private = NULL; return; } - + sprintf(psmouse->devname, "%s %s %s", psmouse_protocols[psmouse->type], psmouse->vendor, psmouse->name); sprintf(psmouse->phys, "%s/input0", @@ -617,7 +648,7 @@ psmouse->dev.id.version = psmouse->model; input_register_device(&psmouse->dev); - + printk(KERN_INFO "input: %s on %s\n", psmouse->devname, serio->phys); psmouse_initialize(psmouse); @@ -637,14 +668,16 @@ { struct psmouse *psmouse = serio->private; struct serio_dev *dev = serio->dev; - int old_type = psmouse->type; + int old_type; - if (!dev) { + if (!dev || !psmouse) { printk(KERN_DEBUG "psmouse: reconnect request, but serio is disconnected, ignoring...\n"); return -1; } - psmouse->state = PSMOUSE_NEW_DEVICE; + old_type = psmouse->type; + + psmouse->state = PSMOUSE_CMD_MODE; psmouse->type = psmouse->acking = psmouse->cmdcnt = psmouse->pktcnt = 0; if (psmouse->reconnect) { if (psmouse->reconnect(psmouse)) diff -Nru a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h --- a/drivers/input/mouse/psmouse.h Wed Mar 17 19:29:10 2004 +++ b/drivers/input/mouse/psmouse.h Wed Mar 17 19:29:10 2004 @@ -5,7 +5,7 @@ #define PSMOUSE_CMD_SETRES 0x10e8 #define PSMOUSE_CMD_GETINFO 0x03e9 #define PSMOUSE_CMD_SETSTREAM 0x00ea -#define PSMOUSE_CMD_POLL 0x03eb +#define PSMOUSE_CMD_POLL 0x03eb #define PSMOUSE_CMD_GETID 0x02f2 #define PSMOUSE_CMD_SETRATE 0x10f3 #define PSMOUSE_CMD_ENABLE 0x00f4 @@ -18,7 +18,7 @@ #define PSMOUSE_RET_NAK 0xfe /* psmouse states */ -#define PSMOUSE_NEW_DEVICE 0 +#define PSMOUSE_CMD_MODE 0 #define PSMOUSE_ACTIVATED 1 #define PSMOUSE_IGNORE 2 @@ -65,6 +65,7 @@ #define PSMOUSE_SYNAPTICS 7 int psmouse_command(struct psmouse *psmouse, unsigned char *param, int command); +int psmouse_reset(struct psmouse *psmouse); extern int psmouse_smartscroll; extern unsigned int psmouse_rate; diff -Nru a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c --- a/drivers/input/mouse/synaptics.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/mouse/synaptics.c Wed Mar 17 19:29:09 2004 @@ -92,17 +92,6 @@ return 0; } -static int synaptics_reset(struct psmouse *psmouse) -{ - unsigned char r[2]; - - if (psmouse_command(psmouse, r, PSMOUSE_CMD_RESET_BAT)) - return -1; - if (r[0] == PSMOUSE_RET_BAT && r[1] == PSMOUSE_RET_ID) - return 0; - return -1; -} - /* * Read the model-id bytes from the touchpad * see also SYN_MODEL_* macros @@ -197,7 +186,7 @@ { int retries = 0; - while ((retries++ < 3) && synaptics_reset(psmouse)) + while ((retries++ < 3) && psmouse_reset(psmouse)) printk(KERN_ERR "synaptics reset failed\n"); if (synaptics_identify(psmouse)) @@ -368,9 +357,15 @@ clear_bit(REL_Y, dev->relbit); } -static void synaptics_disconnect(struct psmouse *psmouse) +void synaptics_reset(struct psmouse *psmouse) { + /* reset touchpad back to relative mode, gestures enabled */ synaptics_mode_cmd(psmouse, 0); +} + +static void synaptics_disconnect(struct psmouse *psmouse) +{ + synaptics_reset(psmouse); kfree(psmouse->private); } @@ -435,6 +430,8 @@ goto init_fail; } + priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS; + if (SYN_CAP_EXTENDED(priv->capabilities) && SYN_CAP_PASS_THROUGH(priv->capabilities)) synaptics_pt_create(psmouse); @@ -602,19 +599,42 @@ input_sync(dev); } -static int synaptics_validate_byte(struct psmouse *psmouse) +static int synaptics_validate_byte(unsigned char packet[], int idx, unsigned char pkt_type) { - static unsigned char newabs_mask[] = { 0xC0, 0x00, 0x00, 0xC0, 0x00 }; - static unsigned char newabs_rslt[] = { 0x80, 0x00, 0x00, 0xC0, 0x00 }; - static unsigned char oldabs_mask[] = { 0xC0, 0x60, 0x00, 0xC0, 0x60 }; - static unsigned char oldabs_rslt[] = { 0xC0, 0x00, 0x00, 0x80, 0x00 }; - struct synaptics_data *priv = psmouse->private; - int idx = psmouse->pktcnt - 1; + static unsigned char newabs_mask[] = { 0xC8, 0x00, 0x00, 0xC8, 0x00 }; + static unsigned char newabs_rel_mask[] = { 0xC0, 0x00, 0x00, 0xC0, 0x00 }; + static unsigned char newabs_rslt[] = { 0x80, 0x00, 0x00, 0xC0, 0x00 }; + static unsigned char oldabs_mask[] = { 0xC0, 0x60, 0x00, 0xC0, 0x60 }; + static unsigned char oldabs_rslt[] = { 0xC0, 0x00, 0x00, 0x80, 0x00 }; + + switch (pkt_type) { + case SYN_NEWABS: + case SYN_NEWABS_RELAXED: + return (packet[idx] & newabs_rel_mask[idx]) == newabs_rslt[idx]; - if (SYN_MODEL_NEWABS(priv->model_id)) - return (psmouse->packet[idx] & newabs_mask[idx]) == newabs_rslt[idx]; - else - return (psmouse->packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx]; + case SYN_NEWABS_STRICT: + return (packet[idx] & newabs_mask[idx]) == newabs_rslt[idx]; + + case SYN_OLDABS: + return (packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx]; + + default: + printk(KERN_ERR "synaptics: unknown packet type %d\n", pkt_type); + return 0; + } +} + +static unsigned char synaptics_detect_pkt_type(struct psmouse *psmouse) +{ + int i; + + for (i = 0; i < 5; i++) + if (!synaptics_validate_byte(psmouse->packet, i, SYN_NEWABS_STRICT)) { + printk(KERN_INFO "synaptics: using relaxed packet validation\n"); + return SYN_NEWABS_RELAXED; + } + + return SYN_NEWABS_STRICT; } void synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs) @@ -630,13 +650,17 @@ printk(KERN_NOTICE "Synaptics driver resynced.\n"); } + if (unlikely(priv->pkt_type == SYN_NEWABS)) + priv->pkt_type = synaptics_detect_pkt_type(psmouse); + if (psmouse->ptport && psmouse->ptport->serio.dev && synaptics_is_pt_packet(psmouse->packet)) synaptics_pass_pt_packet(&psmouse->ptport->serio, psmouse->packet); else synaptics_process_packet(psmouse); psmouse->pktcnt = 0; - } else if (psmouse->pktcnt && !synaptics_validate_byte(psmouse)) { + } else if (psmouse->pktcnt && + !synaptics_validate_byte(psmouse->packet, psmouse->pktcnt - 1, priv->pkt_type)) { printk(KERN_WARNING "Synaptics driver lost sync at byte %d\n", psmouse->pktcnt); psmouse->pktcnt = 0; if (++priv->out_of_sync == psmouse_resetafter) { diff -Nru a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h --- a/drivers/input/mouse/synaptics.h Wed Mar 17 19:29:09 2004 +++ b/drivers/input/mouse/synaptics.h Wed Mar 17 19:29:09 2004 @@ -12,6 +12,7 @@ extern void synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs); extern int synaptics_detect(struct psmouse *psmouse); extern int synaptics_init(struct psmouse *psmouse); +extern void synaptics_reset(struct psmouse *psmouse); /* synaptics queries */ #define SYN_QUE_IDENTIFY 0x00 @@ -70,6 +71,12 @@ #define SYN_PS_SET_MODE2 0x14 #define SYN_PS_CLIENT_CMD 0x28 +/* synaptics packet types */ +#define SYN_NEWABS 0 +#define SYN_NEWABS_STRICT 1 +#define SYN_NEWABS_RELAXED 2 +#define SYN_OLDABS 3 + /* * A structure to describe the state of the touchpad hardware (buttons and pad) */ @@ -103,6 +110,7 @@ /* Data for normal processing */ unsigned int out_of_sync; /* # of packets out of sync */ int old_w; /* Previous w value */ + unsigned char pkt_type; /* packet type - old, new, etc */ }; #endif /* _SYNAPTICS_H */ diff -Nru a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/input/mouse/vsxxxaa.c Wed Mar 17 19:29:10 2004 @@ -0,0 +1,550 @@ +/* + * DEC VSXXX-AA and VSXXX-GA mouse driver. + * + * Copyright (C) 2003-2004 by Jan-Benedict Glaw + * + * The packet format was taken from a patch to GPM which is (C) 2001 + * by Karsten Merker + * and Maciej W. Rozycki + */ + +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Building an adaptor to DB9 / DB25 RS232 + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * DISCLAIMER: Use this description AT YOUR OWN RISK! I'll not pay for + * anything if you break your mouse, your computer or whatever! + * + * In theory, this mouse is a simple RS232 device. In practice, it has got + * a quite uncommon plug and the requirement to additionally get a power + * supply at +5V and -12V. + * + * If you look at the socket/jack (_not_ at the plug), we use this pin + * numbering: + * _______ + * / 7 6 5 \ + * | 4 --- 3 | + * \ 2 1 / + * ------- + * + * DEC socket DB9 DB25 Note + * 1 (GND) 5 7 - + * 2 (RxD) 3 3 - + * 3 (TxD) 2 2 - + * 4 (-12V) - - Somewhere from the PSU. At ATX, it's + * the blue wire at pin 12 of the ATX + * power connector. Please note that the + * docs say this should be +12V! However, + * I measured -12V... + * 5 (+5V) - - PSU (red wire of ATX power connector + * on pin 4, 6, 19 or 20) or HDD power + * connector (also red wire) + * 6 (not conn.) - - - + * 7 (dev. avail.) - - The mouse shorts this one to pin 1. + * This way, the host computer can detect + * the mouse. To use it with the adaptor, + * simply don't connect this pin. + * + * So to get a working adaptor, you need to connect the mouse with three + * wires to a RS232 port and two additional wires for +5V and -12V to the + * PSU. + * + * Flow specification for the link is 4800, 8o1. + */ + +/* + * TODO list: + * - Automatically attach to a given serial port (no need for inputattach). + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +MODULE_AUTHOR ("Jan-Benedict Glaw "); +MODULE_DESCRIPTION ("Serial DEC VSXXX-AA/GA mouse / DEC tablet driver"); +MODULE_LICENSE ("GPL"); + +#undef VSXXXAA_DEBUG +#ifdef VSXXXAA_DEBUG +#define DBG(x...) printk (x) +#else +#define DBG(x...) do {} while (0) +#endif + +#define VSXXXAA_INTRO_MASK 0x80 +#define VSXXXAA_INTRO_HEAD 0x80 +#define IS_HDR_BYTE(x) (((x) & VSXXXAA_INTRO_MASK) \ + == VSXXXAA_INTRO_HEAD) + +#define VSXXXAA_PACKET_MASK 0xe0 +#define VSXXXAA_PACKET_REL 0x80 +#define VSXXXAA_PACKET_ABS 0xc0 +#define VSXXXAA_PACKET_POR 0xa0 +#define MATCH_PACKET_TYPE(data, type) (((data) & VSXXXAA_PACKET_MASK) == type) + + + +struct vsxxxaa { + struct input_dev dev; + struct serio *serio; +#define BUFLEN 15 /* At least 5 is needed for a full tablet packet */ + unsigned char buf[BUFLEN]; + unsigned char count; + unsigned char version; + unsigned char country; + unsigned char type; + char phys[32]; +}; + +static void +vsxxxaa_drop_bytes (struct vsxxxaa *mouse, int num) +{ + if (num >= mouse->count) + mouse->count = 0; + else { + memmove (mouse->buf, mouse->buf + num - 1, BUFLEN - num); + mouse->count -= num; + } +} + +static void +vsxxxaa_queue_byte (struct vsxxxaa *mouse, unsigned char byte) +{ + if (mouse->count == BUFLEN) { + printk (KERN_ERR "%s on %s: Dropping a byte of full buffer.\n", + mouse->dev.name, mouse->dev.phys); + vsxxxaa_drop_bytes (mouse, 1); + } + + mouse->buf[mouse->count++] = byte; +} + +static void +vsxxxaa_report_mouse (struct vsxxxaa *mouse) +{ + char *devtype; + + switch (mouse->type) { + case 0x02: devtype = "DEC mouse"; break; + case 0x04: devtype = "DEC tablet"; break; + default: devtype = "unknown DEC device"; break; + } + + printk (KERN_INFO "Found %s version 0x%x from country 0x%x " + "on port %s\n", devtype, mouse->version, + mouse->country, mouse->dev.phys); +} + +/* + * Returns number of bytes to be dropped, 0 if packet is okay. + */ +static int +vsxxxaa_check_packet (struct vsxxxaa *mouse, int packet_len) +{ + int i; + + /* First byte must be a header byte */ + if (!IS_HDR_BYTE (mouse->buf[0])) { + DBG ("vsck: len=%d, 1st=0x%02x\n", packet_len, mouse->buf[0]); + return 1; + } + + /* Check all following bytes */ + if (packet_len > 1) { + for (i = 1; i < packet_len; i++) { + if (IS_HDR_BYTE (mouse->buf[i])) { + printk (KERN_ERR "Need to drop %d bytes " + "of a broken packet.\n", + i - 1); + DBG (KERN_INFO "check: len=%d, b[%d]=0x%02x\n", + packet_len, i, mouse->buf[i]); + return i - 1; + } + } + } + + return 0; +} + +static __inline__ int +vsxxxaa_smells_like_packet (struct vsxxxaa *mouse, unsigned char type, size_t len) +{ + return (mouse->count >= len) && MATCH_PACKET_TYPE (mouse->buf[0], type); +} + +static void +vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse, struct pt_regs *regs) +{ + struct input_dev *dev = &mouse->dev; + unsigned char *buf = mouse->buf; + int left, middle, right; + int dx, dy; + + /* + * Check for normal stream packets. This is three bytes, + * with the first byte's 3 MSB set to 100. + * + * [0]: 1 0 0 SignX SignY Left Middle Right + * [1]: 0 dx dx dx dx dx dx dx + * [2]: 0 dy dy dy dy dy dy dy + */ + + /* + * Low 7 bit of byte 1 are abs(dx), bit 7 is + * 0, bit 4 of byte 0 is direction. + */ + dx = buf[1] & 0x7f; + dx *= ((buf[0] >> 4) & 0x01)? -1: 1; + + /* + * Low 7 bit of byte 2 are abs(dy), bit 7 is + * 0, bit 3 of byte 0 is direction. + */ + dy = buf[2] & 0x7f; + dy *= ((buf[0] >> 3) & 0x01)? -1: 1; + + /* + * Get button state. It's the low three bits + * (for three buttons) of byte 0. + */ + left = (buf[0] & 0x04)? 1: 0; + middle = (buf[0] & 0x02)? 1: 0; + right = (buf[0] & 0x01)? 1: 0; + + vsxxxaa_drop_bytes (mouse, 3); + + DBG (KERN_INFO "%s on %s: dx=%d, dy=%d, buttons=%s%s%s\n", + mouse->dev.name, mouse->dev.phys, dx, dy, + left? "L": "l", middle? "M": "m", right? "R": "r"); + + /* + * Report what we've found so far... + */ + input_regs (dev, regs); + input_report_key (dev, BTN_LEFT, left); + input_report_key (dev, BTN_MIDDLE, middle); + input_report_key (dev, BTN_RIGHT, right); + input_report_rel (dev, REL_X, dx); + input_report_rel (dev, REL_Y, dy); + input_sync (dev); +} + +static void +vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse, struct pt_regs *regs) +{ + struct input_dev *dev = &mouse->dev; + unsigned char *buf = mouse->buf; + int left, middle, right, extra; + int x, y; + + /* + * Tablet position / button packet + * + * [0]: 1 1 0 B4 B3 B2 B1 Pr + * [1]: 0 0 X5 X4 X3 X2 X1 X0 + * [2]: 0 0 X11 X10 X9 X8 X7 X6 + * [3]: 0 0 Y5 Y4 Y3 Y2 Y1 Y0 + * [4]: 0 0 Y11 Y10 Y9 Y8 Y7 Y6 + */ + + /* + * Get X/Y position + */ + x = ((buf[2] & 0x3f) << 6) | (buf[1] & 0x3f); + y = ((buf[4] & 0x3f) << 6) | (buf[3] & 0x3f); + + /* + * Get button state. It's bits <4..1> of byte 0. + */ + left = (buf[0] & 0x02)? 1: 0; + middle = (buf[0] & 0x04)? 1: 0; + right = (buf[0] & 0x08)? 1: 0; + extra = (buf[0] & 0x10)? 1: 0; + + vsxxxaa_drop_bytes (mouse, 5); + + DBG (KERN_INFO "%s on %s: x=%d, y=%d, buttons=%s%s%s%s\n", + mouse->dev.name, mouse->dev.phys, x, y, + left? "L": "l", middle? "M": "m", + right? "R": "r", extra? "E": "e"); + + /* + * Report what we've found so far... + */ + input_regs (dev, regs); + input_report_key (dev, BTN_LEFT, left); + input_report_key (dev, BTN_MIDDLE, middle); + input_report_key (dev, BTN_RIGHT, right); + input_report_key (dev, BTN_EXTRA, extra); + input_report_abs (dev, ABS_X, x); + input_report_abs (dev, ABS_Y, y); + input_sync (dev); +} + +static void +vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs) +{ + struct input_dev *dev = &mouse->dev; + unsigned char *buf = mouse->buf; + int left, middle, right; + unsigned char error; + + /* + * Check for Power-On-Reset packets. These are sent out + * after plugging the mouse in, or when explicitely + * requested by sending 'T'. + * + * [0]: 1 0 1 0 R3 R2 R1 R0 + * [1]: 0 M2 M1 M0 D3 D2 D1 D0 + * [2]: 0 E6 E5 E4 E3 E2 E1 E0 + * [3]: 0 0 0 0 0 Left Middle Right + * + * M: manufacturer location code + * R: revision code + * E: Error code. I'm not sure about these, but gpm's sources, + * which support this mouse, too, tell about them: + * E = [0x00 .. 0x1f]: no error, byte #3 is button state + * E = 0x3d: button error, byte #3 tells which one. + * E = : other error + * D: <0010> == mouse, <0100> == tablet + * + */ + + mouse->version = buf[0] & 0x0f; + mouse->country = (buf[1] >> 4) & 0x07; + mouse->type = buf[1] & 0x07; + error = buf[2] & 0x7f; + + /* + * Get button state. It's the low three bits + * (for three buttons) of byte 0. Maybe even the bit <3> + * has some meaning if a tablet is attached. + */ + left = (buf[0] & 0x04)? 1: 0; + middle = (buf[0] & 0x02)? 1: 0; + right = (buf[0] & 0x01)? 1: 0; + + vsxxxaa_drop_bytes (mouse, 4); + vsxxxaa_report_mouse (mouse); + + if (error <= 0x1f) { + /* No error. Report buttons */ + input_regs (dev, regs); + input_report_key (dev, BTN_LEFT, left); + input_report_key (dev, BTN_MIDDLE, middle); + input_report_key (dev, BTN_RIGHT, right); + input_sync (dev); + } else { + printk (KERN_ERR "Your %s on %s reports an undefined error, " + "please check it...\n", mouse->dev.name, + mouse->dev.phys); + } + + /* + * If the mouse was hot-plugged, we need to + * force differential mode now... + */ + printk (KERN_NOTICE "%s on %s: Forceing standard packet format and " + "streaming mode\n", mouse->dev.name, mouse->dev.phys); + mouse->serio->write (mouse->serio, 'S'); + mouse->serio->write (mouse->serio, 'R'); +} + +static void +vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs) +{ + unsigned char *buf = mouse->buf; + int stray_bytes; + + /* + * Parse buffer to death... + */ + do { + /* + * Out of sync? Throw away what we don't understand. Each + * packet starts with a byte whose bit 7 is set. Unhandled + * packets (ie. which we don't know about or simply b0rk3d + * data...) will get shifted out of the buffer after some + * activity on the mouse. + */ + while (mouse->count > 0 && !IS_HDR_BYTE(buf[0])) { + printk (KERN_ERR "%s on %s: Dropping a byte to regain " + "sync with mouse data stream...\n", + mouse->dev.name, mouse->dev.phys); + vsxxxaa_drop_bytes (mouse, 1); + } + + /* + * Check for packets we know about. + */ + + if (vsxxxaa_smells_like_packet (mouse, VSXXXAA_PACKET_REL, 3)) { + /* Check for broken packet */ + stray_bytes = vsxxxaa_check_packet (mouse, 3); + if (stray_bytes > 0) { + printk (KERN_ERR "Dropping %d bytes now...\n", + stray_bytes); + vsxxxaa_drop_bytes (mouse, stray_bytes); + continue; + } + + vsxxxaa_handle_REL_packet (mouse, regs); + continue; /* More to parse? */ + } + + if (vsxxxaa_smells_like_packet (mouse, VSXXXAA_PACKET_ABS, 5)) { + /* Check for broken packet */ + stray_bytes = vsxxxaa_check_packet (mouse, 5); + if (stray_bytes > 0) { + printk (KERN_ERR "Dropping %d bytes now...\n", + stray_bytes); + vsxxxaa_drop_bytes (mouse, stray_bytes); + continue; + } + + vsxxxaa_handle_ABS_packet (mouse, regs); + continue; /* More to parse? */ + } + + if (vsxxxaa_smells_like_packet (mouse, VSXXXAA_PACKET_POR, 4)) { + /* Check for broken packet */ + stray_bytes = vsxxxaa_check_packet (mouse, 4); + if (stray_bytes > 0) { + printk (KERN_ERR "Dropping %d bytes now...\n", + stray_bytes); + vsxxxaa_drop_bytes (mouse, stray_bytes); + continue; + } + + vsxxxaa_handle_POR_packet (mouse, regs); + continue; /* More to parse? */ + } + + break; /* No REL, ABS or POR packet found */ + } while (1); +} + +static irqreturn_t +vsxxxaa_interrupt (struct serio *serio, unsigned char data, unsigned int flags, + struct pt_regs *regs) +{ + struct vsxxxaa *mouse = serio->private; + + vsxxxaa_queue_byte (mouse, data); + vsxxxaa_parse_buffer (mouse, regs); + + return IRQ_HANDLED; +} + +static void +vsxxxaa_disconnect (struct serio *serio) +{ + struct vsxxxaa *mouse = serio->private; + + input_unregister_device (&mouse->dev); + serio_close (serio); + kfree (mouse); +} + +static void +vsxxxaa_connect (struct serio *serio, struct serio_dev *dev) +{ + struct vsxxxaa *mouse; + + if ((serio->type & SERIO_TYPE) != SERIO_RS232) + return; + + if ((serio->type & SERIO_PROTO) != SERIO_VSXXXAA) + return; + + if (!(mouse = kmalloc (sizeof (struct vsxxxaa), GFP_KERNEL))) + return; + + memset (mouse, 0, sizeof (struct vsxxxaa)); + + init_input_dev (&mouse->dev); + set_bit (EV_KEY, mouse->dev.evbit); /* We have buttons */ + set_bit (EV_REL, mouse->dev.evbit); /* We can move */ + set_bit (BTN_LEFT, mouse->dev.keybit); /* We have 3 buttons */ + set_bit (BTN_MIDDLE, mouse->dev.keybit); + set_bit (BTN_RIGHT, mouse->dev.keybit); + set_bit (BTN_EXTRA, mouse->dev.keybit); /* ...and Tablet */ + set_bit (REL_X, mouse->dev.relbit); /* We can move in */ + set_bit (REL_Y, mouse->dev.relbit); /* two dimensions */ + set_bit (ABS_X, mouse->dev.absbit); /* DEC tablet support */ + set_bit (ABS_Y, mouse->dev.absbit); + + mouse->dev.absmin[ABS_X] = 0; + mouse->dev.absmax[ABS_X] = 1023; + mouse->dev.absmin[ABS_Y] = 0; + mouse->dev.absmax[ABS_Y] = 1023; + + mouse->dev.private = mouse; + serio->private = mouse; + + sprintf (mouse->phys, "%s/input0", serio->phys); + mouse->dev.phys = mouse->phys; + mouse->dev.name = "DEC VSXXX-AA/GA mouse or DEC tablet"; + mouse->dev.id.bustype = BUS_RS232; + mouse->serio = serio; + + if (serio_open (serio, dev)) { + kfree (mouse); + return; + } + + /* + * Request selftest and differential stream mode. + */ + mouse->serio->write (mouse->serio, 'T'); /* Test */ + mouse->serio->write (mouse->serio, 'R'); /* Differential stream */ + + input_register_device (&mouse->dev); + + printk (KERN_INFO "input: %s on %s\n", mouse->dev.name, serio->phys); +} + +static struct serio_dev vsxxxaa_dev = { + .interrupt = vsxxxaa_interrupt, + .connect = vsxxxaa_connect, + .disconnect = vsxxxaa_disconnect +}; + +int __init +vsxxxaa_init (void) +{ + serio_register_device (&vsxxxaa_dev); + return 0; +} + +void __exit +vsxxxaa_exit (void) +{ + serio_unregister_device (&vsxxxaa_dev); +} + +module_init (vsxxxaa_init); +module_exit (vsxxxaa_exit); + diff -Nru a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig --- a/drivers/input/serio/Kconfig Wed Mar 17 19:29:09 2004 +++ b/drivers/input/serio/Kconfig Wed Mar 17 19:29:09 2004 @@ -20,6 +20,7 @@ tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y select SERIO + depends on !PARISC ---help--- i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices, @@ -48,6 +49,7 @@ config SERIO_CT82C710 tristate "ct82c710 Aux port controller" depends on SERIO + depends on !PARISC ---help--- Say Y here if you have a Texas Instruments TravelMate notebook equipped with the ct82c710 chip and want to use a mouse connected @@ -104,6 +106,20 @@ To compile this driver as a module, choose M here: the module will be called 98kbd-io. + +config SERIO_GSCPS2 + tristate "HP GSC PS/2 keyboard and PS/2 mouse controller" + depends on GSC && SERIO + default y + help + This driver provides support for the PS/2 ports on PA-RISC machines + over which HP PS/2 keyboards and PS/2 mice may be connected. + If you use these devices, you'll need to say Y here. + + It's safe to enable this driver, so if unsure, say Y. + + To compile this driver as a module, choose M here: the + module will be called gscps2. config SERIO_PCIPS2 tristate "PCI PS/2 keyboard and PS/2 mouse controller" diff -Nru a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile --- a/drivers/input/serio/Makefile Wed Mar 17 19:29:09 2004 +++ b/drivers/input/serio/Makefile Wed Mar 17 19:29:09 2004 @@ -14,4 +14,5 @@ obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o obj-$(CONFIG_SERIO_98KBD) += 98kbd-io.o +obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o obj-$(CONFIG_SERIO_PCIPS2) += pcips2.o diff -Nru a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/input/serio/gscps2.c Wed Mar 17 19:29:10 2004 @@ -0,0 +1,470 @@ +/* + * drivers/input/serio/gscps2.c + * + * Copyright (c) 2004 Helge Deller + * Copyright (c) 2002 Laurent Canet + * Copyright (c) 2002 Thibaut Varene + * + * Pieces of code based on linux-2.4's hp_mouse.c & hp_keyb.c + * Copyright (c) 1999 Alex deVries + * Copyright (c) 1999-2000 Philipp Rumpf + * Copyright (c) 2000 Xavier Debacker + * Copyright (c) 2000-2001 Thomas Marteau + * + * HP GSC PS/2 port driver, found in PA/RISC Workstations + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * TODO: + * - Dino testing (did HP ever shipped a machine on which this port + * was usable/enabled ?) + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +MODULE_AUTHOR("Laurent Canet , Thibaut Varene , Helge Deller "); +MODULE_DESCRIPTION("HP GSC PS/2 port driver"); +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl); + +#define PFX "gscps2.c: " + +/* + * Driver constants + */ + +/* various constants */ +#define ENABLE 1 +#define DISABLE 0 + +#define GSC_DINO_OFFSET 0x0800 /* offset for DINO controller versus LASI one */ + +/* PS/2 IO port offsets */ +#define GSC_ID 0x00 /* device ID offset (see: GSC_ID_XXX) */ +#define GSC_RESET 0x00 /* reset port offset */ +#define GSC_RCVDATA 0x04 /* receive port offset */ +#define GSC_XMTDATA 0x04 /* transmit port offset */ +#define GSC_CONTROL 0x08 /* see: Control register bits */ +#define GSC_STATUS 0x0C /* see: Status register bits */ + +/* Control register bits */ +#define GSC_CTRL_ENBL 0x01 /* enable interface */ +#define GSC_CTRL_LPBXR 0x02 /* loopback operation */ +#define GSC_CTRL_DIAG 0x20 /* directly control clock/data line */ +#define GSC_CTRL_DATDIR 0x40 /* data line direct control */ +#define GSC_CTRL_CLKDIR 0x80 /* clock line direct control */ + +/* Status register bits */ +#define GSC_STAT_RBNE 0x01 /* Receive Buffer Not Empty */ +#define GSC_STAT_TBNE 0x02 /* Transmit Buffer Not Empty */ +#define GSC_STAT_TERR 0x04 /* Timeout Error */ +#define GSC_STAT_PERR 0x08 /* Parity Error */ +#define GSC_STAT_CMPINTR 0x10 /* Composite Interrupt = irq on any port */ +#define GSC_STAT_DATSHD 0x40 /* Data Line Shadow */ +#define GSC_STAT_CLKSHD 0x80 /* Clock Line Shadow */ + +/* IDs returned by GSC_ID port register */ +#define GSC_ID_KEYBOARD 0 /* device ID values */ +#define GSC_ID_MOUSE 1 + + +static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs); + +#define BUFFER_SIZE 0x0f + +/* GSC PS/2 port device struct */ +struct gscps2port { + struct list_head node; + struct parisc_device *padev; + struct serio port; + spinlock_t lock; + char *addr; + u8 act, append; /* position in buffer[] */ + struct { + u8 data; + u8 str; + } buffer[BUFFER_SIZE+1]; + int id; + char name[32]; +}; + +/* + * Various HW level routines + */ + +#define gscps2_readb_input(x) readb((x)+GSC_RCVDATA) +#define gscps2_readb_control(x) readb((x)+GSC_CONTROL) +#define gscps2_readb_status(x) readb((x)+GSC_STATUS) +#define gscps2_writeb_control(x, y) writeb((x), (y)+GSC_CONTROL) + + +/* + * wait_TBE() - wait for Transmit Buffer Empty + */ + +static int wait_TBE(char *addr) +{ + int timeout = 25000; /* device is expected to react within 250 msec */ + while (gscps2_readb_status(addr) & GSC_STAT_TBNE) { + if (!--timeout) + return 0; /* This should not happen */ + udelay(10); + } + return 1; +} + + +/* + * gscps2_flush() - flush the receive buffer + */ + +static void gscps2_flush(struct gscps2port *ps2port) +{ + while (gscps2_readb_status(ps2port->addr) & GSC_STAT_RBNE) + gscps2_readb_input(ps2port->addr); + ps2port->act = ps2port->append = 0; +} + +/* + * gscps2_writeb_output() - write a byte to the port + * + * returns 1 on sucess, 0 on error + */ + +static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data) +{ + unsigned long flags; + char *addr = ps2port->addr; + + if (!wait_TBE(addr)) { + printk(KERN_DEBUG PFX "timeout - could not write byte %#x\n", data); + return 0; + } + + while (gscps2_readb_status(ps2port->addr) & GSC_STAT_RBNE) + /* wait */; + + spin_lock_irqsave(&ps2port->lock, flags); + writeb(data, addr+GSC_XMTDATA); + spin_unlock_irqrestore(&ps2port->lock, flags); + + /* this is ugly, but due to timing of the port it seems to be necessary. */ + mdelay(6); + + /* make sure any received data is returned as fast as possible */ + /* this is important e.g. when we set the LEDs on the keyboard */ + gscps2_interrupt(0, NULL, NULL); + + return 1; +} + + +/* + * gscps2_enable() - enables or disables the port + */ + +static void gscps2_enable(struct gscps2port *ps2port, int enable) +{ + unsigned long flags; + u8 data; + + /* now enable/disable the port */ + spin_lock_irqsave(&ps2port->lock, flags); + gscps2_flush(ps2port); + data = gscps2_readb_control(ps2port->addr); + if (enable) + data |= GSC_CTRL_ENBL; + else + data &= ~GSC_CTRL_ENBL; + gscps2_writeb_control(data, ps2port->addr); + spin_unlock_irqrestore(&ps2port->lock, flags); + wait_TBE(ps2port->addr); + gscps2_flush(ps2port); +} + +/* + * gscps2_reset() - resets the PS/2 port + */ + +static void gscps2_reset(struct gscps2port *ps2port) +{ + char *addr = ps2port->addr; + unsigned long flags; + + /* reset the interface */ + spin_lock_irqsave(&ps2port->lock, flags); + gscps2_flush(ps2port); + writeb(0xff, addr+GSC_RESET); + gscps2_flush(ps2port); + spin_unlock_irqrestore(&ps2port->lock, flags); + + /* enable it */ + gscps2_enable(ps2port, ENABLE); +} + +static LIST_HEAD(ps2port_list); + +/** + * gscps2_interrupt() - Interruption service routine + * + * This function reads received PS/2 bytes and processes them on + * all interfaces. + * The problematic part here is, that the keyboard and mouse PS/2 port + * share the same interrupt and it's not possible to send data if any + * one of them holds input data. To solve this problem we try to receive + * the data as fast as possible and handle the reporting to the upper layer + * later. + */ + +static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs) +{ + struct gscps2port *ps2port; + + list_for_each_entry(ps2port, &ps2port_list, node) { + + unsigned long flags; + spin_lock_irqsave(&ps2port->lock, flags); + + while ( (ps2port->buffer[ps2port->append].str = + gscps2_readb_status(ps2port->addr)) & GSC_STAT_RBNE ) { + ps2port->buffer[ps2port->append].data = + gscps2_readb_input(ps2port->addr); + ps2port->append = ((ps2port->append+1) & BUFFER_SIZE); + } + + spin_unlock_irqrestore(&ps2port->lock, flags); + + } /* list_for_each_entry */ + + /* all data was read from the ports - now report the data to upper layer */ + + list_for_each_entry(ps2port, &ps2port_list, node) { + + while (ps2port->act != ps2port->append) { + + unsigned int rxflags; + u8 data, status; + + /* Did new data arrived while we read existing data ? + If yes, exit now and let the new irq handler start over again */ + if (gscps2_readb_status(ps2port->addr) & GSC_STAT_CMPINTR) + return IRQ_HANDLED; + + status = ps2port->buffer[ps2port->act].str; + data = ps2port->buffer[ps2port->act].data; + + ps2port->act = ((ps2port->act+1) & BUFFER_SIZE); + rxflags = ((status & GSC_STAT_TERR) ? SERIO_TIMEOUT : 0 ) | + ((status & GSC_STAT_PERR) ? SERIO_PARITY : 0 ); + + serio_interrupt(&ps2port->port, data, rxflags, regs); + + } /* while() */ + + } /* list_for_each_entry */ + + return IRQ_HANDLED; +} + + +/* + * gscps2_write() - send a byte out through the aux interface. + */ + +static int gscps2_write(struct serio *port, unsigned char data) +{ + struct gscps2port *ps2port = port->driver; + + if (!gscps2_writeb_output(ps2port, data)) { + printk(KERN_DEBUG PFX "sending byte %#x failed.\n", data); + return -1; + } + return 0; +} + +/* + * gscps2_open() is called when a port is opened by the higher layer. + * It resets and enables the port. + */ + +static int gscps2_open(struct serio *port) +{ + struct gscps2port *ps2port = port->driver; + + gscps2_reset(ps2port); + + gscps2_interrupt(0, NULL, NULL); + + return 0; +} + +/* + * gscps2_close() disables the port + */ + +static void gscps2_close(struct serio *port) +{ + struct gscps2port *ps2port = port->driver; + gscps2_enable(ps2port, DISABLE); +} + +static struct serio gscps2_serio_port = +{ + .name = "GSC PS/2", + .idbus = BUS_GSC, + .idvendor = PCI_VENDOR_ID_HP, + .idproduct = 0x0001, + .idversion = 0x0010, + .type = SERIO_8042, + .write = gscps2_write, + .open = gscps2_open, + .close = gscps2_close, +}; + +/** + * gscps2_probe() - Probes PS2 devices + * @return: success/error report + */ + +static int __init gscps2_probe(struct parisc_device *dev) +{ + struct gscps2port *ps2port; + unsigned long hpa = dev->hpa; + int ret; + + if (!dev->irq) + return -ENODEV; + + /* Offset for DINO PS/2. Works with LASI even */ + if (dev->id.sversion == 0x96) + hpa += GSC_DINO_OFFSET; + + ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL); + if (!ps2port) + return -ENOMEM; + + dev_set_drvdata(&dev->dev, ps2port); + + memset(ps2port, 0, sizeof(struct gscps2port)); + ps2port->padev = dev; + ps2port->addr = ioremap(hpa, GSC_STATUS + 4); + spin_lock_init(&ps2port->lock); + + gscps2_reset(ps2port); + ps2port->id = readb(ps2port->addr+GSC_ID) & 0x0f; + snprintf(ps2port->name, sizeof(ps2port->name)-1, "%s %s", + gscps2_serio_port.name, + (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse" ); + + memcpy(&ps2port->port, &gscps2_serio_port, sizeof(gscps2_serio_port)); + ps2port->port.driver = ps2port; + ps2port->port.name = ps2port->name; + ps2port->port.phys = dev->dev.bus_id; + + list_add_tail(&ps2port->node, &ps2port_list); + + ret = -EBUSY; + if (request_irq(dev->irq, gscps2_interrupt, SA_SHIRQ, ps2port->name, ps2port)) + goto fail_miserably; + + if ( (ps2port->id != GSC_ID_KEYBOARD) && (ps2port->id != GSC_ID_MOUSE) ) { + printk(KERN_WARNING PFX "Unsupported PS/2 port at 0x%08lx (id=%d) ignored\n", + hpa, ps2port->id); + ret = -ENODEV; + goto fail; + } + +#if 0 + if (!request_mem_region(hpa, GSC_STATUS + 4, ps2port->port.name)) + goto fail; +#endif + + printk(KERN_INFO "serio: %s port at 0x%p irq %d @ %s\n", + ps2port->name, + ps2port->addr, + ps2port->padev->irq, + ps2port->port.phys); + + serio_register_port(&ps2port->port); + + return 0; + +fail: + free_irq(dev->irq, ps2port); + +fail_miserably: + list_del(&ps2port->node); + iounmap(ps2port->addr); + release_mem_region(dev->hpa, GSC_STATUS + 4); + kfree(ps2port); + return ret; +} + +/** + * gscps2_remove() - Removes PS2 devices + * @return: success/error report + */ + +static int __devexit gscps2_remove(struct parisc_device *dev) +{ + struct gscps2port *ps2port = dev_get_drvdata(&dev->dev); + + serio_unregister_port(&ps2port->port); + free_irq(dev->irq, ps2port); + gscps2_flush(ps2port); + list_del(&ps2port->node); + iounmap(ps2port->addr); +#if 0 + release_mem_region(dev->hpa, GSC_STATUS + 4); +#endif + dev_set_drvdata(&dev->dev, NULL); + kfree(ps2port); + return 0; +} + + +static struct parisc_device_id gscps2_device_tbl[] = { + { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00084 }, /* LASI PS/2 */ +#ifdef DINO_TESTED + { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00096 }, /* DINO PS/2 */ +#endif + { 0, } /* 0 terminated list */ +}; + +static struct parisc_driver parisc_ps2_driver = { + .name = "GSC PS/2", + .id_table = gscps2_device_tbl, + .probe = gscps2_probe, + .remove = gscps2_remove, +}; + +static int __init gscps2_init(void) +{ + register_parisc_driver(&parisc_ps2_driver); + return 0; +} + +static void __exit gscps2_exit(void) +{ + unregister_parisc_driver(&parisc_ps2_driver); +} + + +module_init(gscps2_init); +module_exit(gscps2_exit); + diff -Nru a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h --- a/drivers/input/serio/i8042-io.h Wed Mar 17 19:29:09 2004 +++ b/drivers/input/serio/i8042-io.h Wed Mar 17 19:29:09 2004 @@ -25,6 +25,9 @@ #elif defined(__ia64__) # define I8042_KBD_IRQ isa_irq_to_vector(1) # define I8042_AUX_IRQ isa_irq_to_vector(12) +#elif defined(__arm__) +/* defined in include/asm-arm/arch-xxx/irqs.h */ +#include #else # define I8042_KBD_IRQ 1 # define I8042_AUX_IRQ 12 diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c --- a/drivers/input/serio/i8042.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/serio/i8042.c Wed Mar 17 19:29:09 2004 @@ -52,6 +52,13 @@ module_param_named(dumbkbd, i8042_dumbkbd, bool, 0); MODULE_PARM_DESC(dumbkbd, "Pretend that controller can only read data from keyboard"); +__obsolete_setup("i8042_noaux"); +__obsolete_setup("i8042_nomux"); +__obsolete_setup("i8042_unlock"); +__obsolete_setup("i8042_reset"); +__obsolete_setup("i8042_direct"); +__obsolete_setup("i8042_dumbkbd"); + #undef DEBUG #include "i8042.h" @@ -379,6 +386,8 @@ unsigned int dfl; int ret; + mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD); + spin_lock_irqsave(&i8042_lock, flags); str = i8042_read_status(); if (str & I8042_STR_OBF) @@ -433,7 +442,6 @@ irq_ret: ret = 1; out: - mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD); return IRQ_RETVAL(ret); } @@ -522,6 +530,11 @@ if (i8042_enable_mux_mode(values, &mux_version)) return -1; + + /* Workaround for broken chips which seem to support MUX, but in reality don't. */ + /* They all report version 12.10 */ + if (mux_version == 0xCA) + return -1; printk(KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n", (mux_version >> 4) & 0xf, mux_version & 0xf); @@ -707,14 +720,6 @@ else printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n"); } - -/* - * If the chip is configured into nontranslated mode by the BIOS, don't - * bother enabling translating and be happy. - */ - - if (~i8042_ctr & I8042_CTR_XLATE) - i8042_direct = 1; /* * Set nontranslated mode for the kbd interface if requested by an option. diff -Nru a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c --- a/drivers/input/serio/serio.c Wed Mar 17 19:29:09 2004 +++ b/drivers/input/serio/serio.c Wed Mar 17 19:29:09 2004 @@ -195,6 +195,9 @@ ret = serio->dev->interrupt(serio, data, flags, regs); } else { if (!flags) { + if ((serio->type == SERIO_8042 || + serio->type == SERIO_8042_XL) && (data != 0xaa)) + return ret; serio_rescan(serio); ret = IRQ_HANDLED; } diff -Nru a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c --- a/drivers/isdn/capi/kcapi.c Wed Mar 17 19:29:10 2004 +++ b/drivers/isdn/capi/kcapi.c Wed Mar 17 19:29:10 2004 @@ -1,4 +1,4 @@ -/* $Id: kcapi.c,v 1.1.2.4 2004/02/10 01:07:11 keil Exp $ +/* $Id: kcapi.c,v 1.1.2.7 2004/03/16 08:01:47 armin Exp $ * * Kernel CAPI 2.0 Module * @@ -31,7 +31,7 @@ #include #endif -static char *revision = "$Revision: 1.1.2.4 $"; +static char *revision = "$Revision: 1.1.2.7 $"; /* ------------------------------------------------------------- */ @@ -45,7 +45,7 @@ /* ------------------------------------------------------------- */ struct capi_notifier { - struct capi_notifier *next; + struct work_struct work; unsigned int cmd; u32 controller; u16 applid; @@ -69,7 +69,6 @@ static int ncards; static struct sk_buff_head recv_queue; -static struct work_struct tq_state_notify; static struct work_struct tq_recv_notify; /* -------- controller ref counting -------------------------------------- */ @@ -161,79 +160,6 @@ capi_ctr_put(card); } - -/* -------- Notifier handling --------------------------------- */ - -static struct capi_notifier_list{ - struct capi_notifier *head; - struct capi_notifier *tail; -} notifier_list; - -static spinlock_t notifier_lock = SPIN_LOCK_UNLOCKED; - -static inline void notify_enqueue(struct capi_notifier *np) -{ - struct capi_notifier_list *q = ¬ifier_list; - unsigned long flags; - - spin_lock_irqsave(¬ifier_lock, flags); - if (q->tail) { - q->tail->next = np; - q->tail = np; - } else { - q->head = q->tail = np; - } - spin_unlock_irqrestore(¬ifier_lock, flags); -} - -static inline struct capi_notifier *notify_dequeue(void) -{ - struct capi_notifier_list *q = ¬ifier_list; - struct capi_notifier *np = 0; - unsigned long flags; - - spin_lock_irqsave(¬ifier_lock, flags); - if (q->head) { - np = q->head; - if ((q->head = np->next) == 0) - q->tail = 0; - np->next = 0; - } - spin_unlock_irqrestore(¬ifier_lock, flags); - return np; -} - -static int notify_push(unsigned int cmd, u32 controller, - u16 applid, u32 ncci) -{ - struct capi_notifier *np; - - if (!try_module_get(THIS_MODULE)) { - printk(KERN_WARNING "%s: cannot reserve module\n", __FUNCTION__); - return -1; - } - np = (struct capi_notifier *)kmalloc(sizeof(struct capi_notifier), GFP_ATOMIC); - if (!np) { - module_put(THIS_MODULE); - return -1; - } - memset(np, 0, sizeof(struct capi_notifier)); - np->cmd = cmd; - np->controller = controller; - np->applid = applid; - np->ncci = ncci; - notify_enqueue(np); - /* - * The notifier will result in adding/deleteing - * of devices. Devices can only removed in - * user process, not in bh. - */ - __module_get(THIS_MODULE); - if (schedule_work(&tq_state_notify) == 0) - module_put(THIS_MODULE); - return 0; -} - /* -------- KCI_CONTRUP --------------------------------------- */ static void notify_up(u32 contr) @@ -242,7 +168,9 @@ struct capi20_appl *ap; u16 applid; - printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr); + if (showcapimsgs & 1) { + printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr); + } for (applid = 1; applid <= CAPI_MAXAPPL; applid++) { ap = get_capi_appl_by_nr(applid); @@ -258,7 +186,9 @@ struct capi20_appl *ap; u16 applid; - printk(KERN_DEBUG "kcapi: notify down contr %d\n", contr); + if (showcapimsgs & 1) { + printk(KERN_DEBUG "kcapi: notify down contr %d\n", contr); + } for (applid = 1; applid <= CAPI_MAXAPPL; applid++) { ap = get_capi_appl_by_nr(applid); @@ -267,31 +197,43 @@ } } -/* ------------------------------------------------------------ */ - -static inline void notify_doit(struct capi_notifier *np) +static void notify_handler(void *data) { + struct capi_notifier *np = data; + switch (np->cmd) { - case KCI_CONTRUP: - notify_up(np->controller); - break; - case KCI_CONTRDOWN: - notify_down(np->controller); - break; + case KCI_CONTRUP: + notify_up(np->controller); + break; + case KCI_CONTRDOWN: + notify_down(np->controller); + break; } + + kfree(np); } -static void notify_handler(void *dummy) +/* + * The notifier will result in adding/deleteing of devices. Devices can + * only removed in user process, not in bh. + */ +static int notify_push(unsigned int cmd, u32 controller, u16 applid, u32 ncci) { - struct capi_notifier *np; + struct capi_notifier *np = kmalloc(sizeof(*np), GFP_ATOMIC); - while ((np = notify_dequeue()) != 0) { - notify_doit(np); - kfree(np); - module_put(THIS_MODULE); - } - module_put(THIS_MODULE); + if (!np) + return -ENOMEM; + + INIT_WORK(&np->work, notify_handler, np); + np->cmd = cmd; + np->controller = controller; + np->applid = applid; + np->ncci = ncci; + + schedule_work(&np->work); + return 0; } + /* -------- Receiver ------------------------------------------ */ @@ -304,7 +246,7 @@ ap = get_capi_appl_by_nr(CAPIMSG_APPID(skb->data)); if (!ap) { printk(KERN_ERR "kcapi: recv_handler: applid %d ? (%s)\n", - ap->applid, capi_message2str(skb->data)); + CAPIMSG_APPID(skb->data), capi_message2str(skb->data)); kfree_skb(skb); continue; } @@ -565,7 +507,9 @@ continue; register_appl(capi_cards[i], applid, &ap->rparam); } - printk(KERN_DEBUG "kcapi: appl %d up\n", applid); + if (showcapimsgs & 1) { + printk(KERN_DEBUG "kcapi: appl %d up\n", applid); + } return CAPI_NOERROR; } @@ -584,7 +528,9 @@ release_appl(capi_cards[i], ap->applid); } capi_applications[ap->applid - 1] = NULL; - printk(KERN_DEBUG "kcapi: appl %d down\n", ap->applid); + if (showcapimsgs & 1) { + printk(KERN_DEBUG "kcapi: appl %d down\n", ap->applid); + } return CAPI_NOERROR; } @@ -981,7 +927,6 @@ skb_queue_head_init(&recv_queue); - INIT_WORK(&tq_state_notify, notify_handler, NULL); INIT_WORK(&tq_recv_notify, recv_handler, NULL); kcapi_proc_init(); @@ -1001,6 +946,9 @@ static void __exit kcapi_exit(void) { kcapi_proc_exit(); + + /* make sure all notifiers are finished */ + flush_scheduled_work(); } module_init(kcapi_init); diff -Nru a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c --- a/drivers/isdn/hisax/hfc_usb.c Wed Mar 17 19:29:09 2004 +++ b/drivers/isdn/hisax/hfc_usb.c Wed Mar 17 19:29:09 2004 @@ -1349,9 +1349,11 @@ { struct usb_device *dev= interface_to_usbdev(intf); hfcusb_data *context; - struct usb_host_interface *iface = intf->altsetting + intf->act_altsetting; + struct usb_host_interface *iface = intf->cur_altsetting; + struct usb_host_interface *iface_used = NULL; struct usb_host_endpoint *ep; - int i, idx, probe_alt_setting,vend_idx, cfg_used, *vcf, attr, cfg_found, cidx, ep_addr; + int ifnum = iface->desc.bInterfaceNumber; + int i, idx, alt_idx, probe_alt_setting, vend_idx, cfg_used, *vcf, attr, cfg_found, cidx, ep_addr; int cmptbl[16],small_match,iso_packet_size,packet_size,alt_used=0; // usb_show_device(dev); @@ -1366,7 +1368,7 @@ #ifdef VERBOSE_USB_DEBUG printk(KERN_INFO "HFC-USB: probing interface(%d) actalt(%d) minor(%d)\n", - intf->altsetting->desc.bInterfaceNumber, intf->act_altsetting, intf->minor); + ifnum, iface->desc.bAlternateSetting, intf->minor); #endif if (vend_idx != 0xffff) { @@ -1374,14 +1376,15 @@ printk(KERN_INFO "HFC-USB: found vendor idx:%d name:%s\n",vend_idx,vdata[vend_idx].vend_name); #endif /* if vendor and product ID is OK, start probing a matching alternate setting ... */ - probe_alt_setting = 0; + alt_idx = 0; small_match=0xffff; // default settings iso_packet_size=16; packet_size=64; - while(probe_alt_setting < intf->num_altsetting) { - iface = intf->altsetting + probe_alt_setting; + while (alt_idx < intf->num_altsetting) { + iface = intf->altsetting + alt_idx; + probe_alt_setting = iface->desc.bAlternateSetting; cfg_used=0; #ifdef VERBOSE_USB_DEBUG @@ -1395,7 +1398,7 @@ #ifdef VERBOSE_USB_DEBUG printk(KERN_INFO "HFC-USB: (if=%d alt=%d cfg_used=%d)\n", - probe_alt_setting, intf->act_altsetting,cfg_used); + ifnum, probe_alt_setting, cfg_used); #endif // copy table memcpy(cmptbl,vcf,16*sizeof(int)); @@ -1448,6 +1451,7 @@ if (cfg_used < small_match) { small_match = cfg_used; alt_used = probe_alt_setting; + iface_used = iface; } #ifdef VERBOSE_USB_DEBUG printk(KERN_INFO "HFC-USB: small_match=%x %x\n", small_match, alt_used); @@ -1457,15 +1461,14 @@ cfg_used++; } - probe_alt_setting++; - } /* (probe_alt_setting < intf->num_altsetting) */ + alt_idx++; + } /* (alt_idx < intf->num_altsetting) */ #ifdef VERBOSE_USB_DEBUG printk(KERN_INFO "HFC-USB: final small_match=%x alt_used=%x\n",small_match, alt_used); #endif // yiipiee, we found a valid config if (small_match != 0xffff) { - intf->act_altsetting = alt_used; - iface = intf->altsetting + intf->act_altsetting; + iface = iface_used; if (!(context = kmalloc(sizeof(hfcusb_data), GFP_KERNEL))) return(-ENOMEM); /* got no mem */ @@ -1542,8 +1545,8 @@ // now share our luck context->dev = dev; /* save device */ - context->if_used = intf->altsetting->desc.bInterfaceNumber; /* save used interface */ - context->alt_used = intf->act_altsetting; /* and alternate config */ + context->if_used = ifnum; /* save used interface */ + context->alt_used = alt_used; /* and alternate config */ context->ctrl_paksize = dev->descriptor.bMaxPacketSize0; /* control size */ context->cfg_used=vcf[16]; // store used config context->vend_idx=vend_idx; // store found vendor diff -Nru a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c --- a/drivers/net/hamradio/6pack.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/hamradio/6pack.c Wed Mar 17 19:29:09 2004 @@ -3,15 +3,13 @@ * devices like TTY. It interfaces between a raw TTY and the * kernel's AX.25 protocol layers. * - * Version: @(#)6pack.c 0.3.0 04/07/98 - * * Authors: Andreas Könsgen + * Ralf Baechle DO1GRB * - * Quite a lot of stuff "stolen" by Jörg Reuter from slip.c, written by + * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by * * Laurence Culhane, * Fred N. van Kempen, - * */ #include @@ -31,20 +29,23 @@ #include #include #include +#include #include #include #include #include +#include +#include #define SIXPACK_VERSION "Revision: 0.3.0" /* sixpack priority commands */ -#define SIXP_SEOF 0x40 /* start and end of a 6pack frame */ -#define SIXP_TX_URUN 0x48 /* transmit overrun */ -#define SIXP_RX_ORUN 0x50 /* receive overrun */ -#define SIXP_RX_BUF_OVL 0x58 /* receive buffer overflow */ +#define SIXP_SEOF 0x40 /* start and end of a 6pack frame */ +#define SIXP_TX_URUN 0x48 /* transmit overrun */ +#define SIXP_RX_ORUN 0x50 /* receive overrun */ +#define SIXP_RX_BUF_OVL 0x58 /* receive buffer overflow */ -#define SIXP_CHKSUM 0xFF /* valid checksum of a 6pack frame */ +#define SIXP_CHKSUM 0xFF /* valid checksum of a 6pack frame */ /* masks to get certain bits out of the status bytes sent by the TNC */ @@ -78,23 +79,20 @@ #define SIXP_MTU 256 /* Default MTU */ enum sixpack_flags { - SIXPF_INUSE, /* Channel in use */ SIXPF_ERROR, /* Parity, etc. error */ }; struct sixpack { - int magic; - /* Various fields. */ - struct tty_struct *tty; /* ptr to TTY structure */ - struct net_device *dev; /* easy for intr handling */ + struct tty_struct *tty; /* ptr to TTY structure */ + struct net_device *dev; /* easy for intr handling */ /* These are pointers to the malloc()ed frame buffers. */ - unsigned char *rbuff; /* receiver buffer */ - int rcount; /* received chars counter */ - unsigned char *xbuff; /* transmitter buffer */ - unsigned char *xhead; /* pointer to next byte to XMIT */ - int xleft; /* bytes left in XMIT queue */ + unsigned char *rbuff; /* receiver buffer */ + int rcount; /* received chars counter */ + unsigned char *xbuff; /* transmitter buffer */ + unsigned char *xhead; /* next byte to XMIT */ + int xleft; /* bytes left in XMIT queue */ unsigned char raw_buf[4]; unsigned char cooked_buf[400]; @@ -105,11 +103,11 @@ /* 6pack interface statistics. */ struct net_device_stats stats; - int mtu; /* Our mtu (to spot changes!) */ - int buffsize; /* Max buffers sizes */ + int mtu; /* Our mtu (to spot changes!) */ + int buffsize; /* Max buffers sizes */ - unsigned long flags; /* Flag values/ mode etc */ - unsigned char mode; /* 6pack mode */ + unsigned long flags; /* Flag values/ mode etc */ + unsigned char mode; /* 6pack mode */ /* 6pack stuff */ unsigned char tx_delay; @@ -125,112 +123,293 @@ struct timer_list tx_t; struct timer_list resync_t; + + atomic_t refcnt; + struct semaphore dead_sem; + spinlock_t lock; }; #define AX25_6PACK_HEADER_LEN 0 -#define SIXPACK_MAGIC 0x5304 - -typedef struct sixpack_ctrl { - struct sixpack ctrl; /* 6pack things */ - struct net_device dev; /* the device */ -} sixpack_ctrl_t; -static sixpack_ctrl_t **sixpack_ctrls; - -int sixpack_maxdev = SIXP_NRUNIT; /* Can be overridden with insmod! */ -MODULE_PARM(sixpack_maxdev, "i"); -MODULE_PARM_DESC(sixpack_maxdev, "number of 6PACK devices"); static void sp_start_tx_timer(struct sixpack *); -static void sp_xmit_on_air(unsigned long); -static void resync_tnc(unsigned long); static void sixpack_decode(struct sixpack *, unsigned char[], int); static int encode_sixpack(unsigned char *, unsigned char *, int, unsigned char); static int sixpack_init(struct net_device *dev); -static void decode_prio_command(unsigned char, struct sixpack *); -static void decode_std_command(unsigned char, struct sixpack *); -static void decode_data(unsigned char, struct sixpack *); +/* + * perform the persistence/slottime algorithm for CSMA access. If the + * persistence check was successful, write the data to the serial driver. + * Note that in case of DAMA operation, the data is not sent here. + */ + +static void sp_xmit_on_air(unsigned long channel) +{ + struct sixpack *sp = (struct sixpack *) channel; + int actual; + static unsigned char random; -static int tnc_init(struct sixpack *); + random = random * 17 + 41; -/* Find a free 6pack channel, and link in this `tty' line. */ -static inline struct sixpack *sp_alloc(void) + if (((sp->status1 & SIXP_DCD_MASK) == 0) && (random < sp->persistence)) { + sp->led_state = 0x70; + sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); + sp->tx_enable = 1; + actual = sp->tty->driver->write(sp->tty, 0, sp->xbuff, sp->status2); + sp->xleft -= actual; + sp->xhead += actual; + sp->led_state = 0x60; + sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); + sp->status2 = 0; + } else + sp_start_tx_timer(sp); +} + +/* ----> 6pack timer interrupt handler and friends. <---- */ +static void sp_start_tx_timer(struct sixpack *sp) { - sixpack_ctrl_t *spp = NULL; - int i; + int when = sp->slottime; - for (i = 0; i < sixpack_maxdev; i++) { - spp = sixpack_ctrls[i]; + del_timer(&sp->tx_t); + sp->tx_t.data = (unsigned long) sp; + sp->tx_t.function = sp_xmit_on_air; + sp->tx_t.expires = jiffies + ((when + 1) * HZ) / 100; + add_timer(&sp->tx_t); +} - if (spp == NULL) - break; +/* Encapsulate one AX.25 frame and stuff into a TTY queue. */ +static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len) +{ + unsigned char *msg, *p = icp; + int actual, count; - if (!test_and_set_bit(SIXPF_INUSE, &spp->ctrl.flags)) - break; + if (len > sp->mtu) { /* sp->mtu = AX25_MTU = max. PACLEN = 256 */ + msg = "oversized transmit packet!"; + goto out_drop; } - /* Too many devices... */ - if (i >= sixpack_maxdev) - return NULL; + if (p[0] > 5) { + msg = "invalid KISS command"; + goto out_drop; + } - /* If no channels are available, allocate one */ - if (!spp && - (sixpack_ctrls[i] = (sixpack_ctrl_t *)kmalloc(sizeof(sixpack_ctrl_t), - GFP_KERNEL)) != NULL) { - spp = sixpack_ctrls[i]; + if ((p[0] != 0) && (len > 2)) { + msg = "KISS control packet too long"; + goto out_drop; } - memset(spp, 0, sizeof(sixpack_ctrl_t)); - /* Initialize channel control data */ - set_bit(SIXPF_INUSE, &spp->ctrl.flags); - spp->ctrl.tty = NULL; - sprintf(spp->dev.name, "sp%d", i); - spp->dev.base_addr = i; - spp->dev.priv = (void *) &spp->ctrl; - spp->dev.next = NULL; - spp->dev.init = sixpack_init; - - if (spp != NULL) { - /* register device so that it can be ifconfig'ed */ - /* sixpack_init() will be called as a side-effect */ - /* SIDE-EFFECT WARNING: sixpack_init() CLEARS spp->ctrl ! */ - - if (register_netdev(&spp->dev) == 0) { - set_bit(SIXPF_INUSE, &spp->ctrl.flags); - spp->ctrl.dev = &spp->dev; - spp->dev.priv = (void *) &spp->ctrl; - SET_MODULE_OWNER(&spp->dev); - return &spp->ctrl; - } else { - clear_bit(SIXPF_INUSE, &spp->ctrl.flags); - printk(KERN_WARNING "sp_alloc() - register_netdev() failure.\n"); - } + if ((p[0] == 0) && (len < 15)) { + msg = "bad AX.25 packet to transmit"; + goto out_drop; } - return NULL; + count = encode_sixpack(p, sp->xbuff, len, sp->tx_delay); + set_bit(TTY_DO_WRITE_WAKEUP, &sp->tty->flags); + + switch (p[0]) { + case 1: sp->tx_delay = p[1]; + return; + case 2: sp->persistence = p[1]; + return; + case 3: sp->slottime = p[1]; + return; + case 4: /* ignored */ + return; + case 5: sp->duplex = p[1]; + return; + } + + if (p[0] != 0) + return; + + /* + * In case of fullduplex or DAMA operation, we don't take care about the + * state of the DCD or of any timers, as the determination of the + * correct time to send is the job of the AX.25 layer. We send + * immediately after data has arrived. + */ + if (sp->duplex == 1) { + sp->led_state = 0x70; + sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); + sp->tx_enable = 1; + actual = sp->tty->driver->write(sp->tty, 0, sp->xbuff, count); + sp->xleft = count - actual; + sp->xhead = sp->xbuff + actual; + sp->led_state = 0x60; + sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); + } else { + sp->xleft = count; + sp->xhead = sp->xbuff; + sp->status2 = count; + if (sp->duplex == 0) + sp_start_tx_timer(sp); + } + + return; + +out_drop: + sp->stats.tx_dropped++; + netif_start_queue(sp->dev); + printk(KERN_DEBUG "%s: %s - dropped.\n", sp->dev->name, msg); + return; } +/* Encapsulate an IP datagram and kick it into a TTY queue. */ + +static int sp_xmit(struct sk_buff *skb, struct net_device *dev) +{ + struct sixpack *sp = netdev_priv(dev); + + spin_lock_bh(&sp->lock); + /* We were not busy, so we are now... :-) */ + netif_stop_queue(dev); + sp->stats.tx_bytes += skb->len; + sp_encaps(sp, skb->data, skb->len); + spin_unlock_bh(&sp->lock); + + dev_kfree_skb(skb); + + return 0; +} + +static int sp_open_dev(struct net_device *dev) +{ + struct sixpack *sp = netdev_priv(dev); + + if (sp->tty == NULL) + return -ENODEV; + return 0; +} + +/* Close the low-level part of the 6pack channel. */ +static int sp_close(struct net_device *dev) +{ + struct sixpack *sp = netdev_priv(dev); + + spin_lock_bh(&sp->lock); + if (sp->tty) { + /* TTY discipline is running. */ + clear_bit(TTY_DO_WRITE_WAKEUP, &sp->tty->flags); + } + netif_stop_queue(dev); + spin_unlock_bh(&sp->lock); + + return 0; +} + +/* Return the frame type ID */ +static int sp_header(struct sk_buff *skb, struct net_device *dev, + unsigned short type, void *daddr, void *saddr, unsigned len) +{ +#ifdef CONFIG_INET + if (type != htons(ETH_P_AX25)) + return ax25_encapsulate(skb, dev, type, daddr, saddr, len); +#endif + return 0; +} + +static struct net_device_stats *sp_get_stats(struct net_device *dev) +{ + struct sixpack *sp = netdev_priv(dev); + return &sp->stats; +} + +static int sp_set_dev_mac_address(struct net_device *dev, void *addr) +{ + struct sockaddr *sa = addr; + memcpy(dev->dev_addr, sa->sa_data, AX25_ADDR_LEN); + return 0; +} + +static int sp_rebuild_header(struct sk_buff *skb) +{ +#ifdef CONFIG_INET + return ax25_rebuild_header(skb); +#else + return 0; +#endif +} + +static void sp_setup(struct net_device *dev) +{ + static char ax25_bcast[AX25_ADDR_LEN] = + {'Q'<<1,'S'<<1,'T'<<1,' '<<1,' '<<1,' '<<1,'0'<<1}; + static char ax25_test[AX25_ADDR_LEN] = + {'L'<<1,'I'<<1,'N'<<1,'U'<<1,'X'<<1,' '<<1,'1'<<1}; + + /* Finish setting up the DEVICE info. */ + dev->init = sixpack_init; + dev->mtu = SIXP_MTU; + dev->hard_start_xmit = sp_xmit; + dev->open = sp_open_dev; + dev->destructor = free_netdev; + dev->stop = sp_close; + dev->hard_header = sp_header; + dev->get_stats = sp_get_stats; + dev->set_mac_address = sp_set_dev_mac_address; + dev->hard_header_len = AX25_MAX_HEADER_LEN; + dev->addr_len = AX25_ADDR_LEN; + dev->type = ARPHRD_AX25; + dev->tx_queue_len = 10; + dev->rebuild_header = sp_rebuild_header; + dev->tx_timeout = NULL; + + /* Only activated in AX.25 mode */ + memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN); + memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN); + + SET_MODULE_OWNER(dev); + + /* New-style flags. */ + dev->flags = 0; +} + +/* Find a free 6pack channel, and link in this `tty' line. */ +static inline struct sixpack *sp_alloc(void) +{ + struct sixpack *sp = NULL; + struct net_device *dev = NULL; + + dev = alloc_netdev(sizeof(struct sixpack), "sp%d", sp_setup); + if (!dev) + return NULL; + + sp = netdev_priv(dev); + sp->dev = dev; + + spin_lock_init(&sp->lock); + + if (register_netdev(dev)) + goto out_free; + + return sp; + +out_free: + printk(KERN_WARNING "sp_alloc() - register_netdev() failure.\n"); + + free_netdev(dev); + + return NULL; +} /* Free a 6pack channel. */ static inline void sp_free(struct sixpack *sp) { - /* Free all 6pack frame buffers. */ - if (sp->rbuff) - kfree(sp->rbuff); - sp->rbuff = NULL; - if (sp->xbuff) - kfree(sp->xbuff); - sp->xbuff = NULL; + void * tmp; - if (!test_and_clear_bit(SIXPF_INUSE, &sp->flags)) - printk(KERN_WARNING "%s: sp_free for already free unit.\n", sp->dev->name); + /* Free all 6pack frame buffers. */ + if ((tmp = xchg(&sp->rbuff, NULL)) != NULL) + kfree(tmp); + if ((tmp = xchg(&sp->xbuff, NULL)) != NULL) + kfree(tmp); } /* Send one completely decapsulated IP datagram to the IP layer. */ -/* This is the routine that sends the received data to the kernel AX.25. - 'cmd' is the KISS command. For AX.25 data, it is zero. */ +/* + * This is the routine that sends the received data to the kernel AX.25. + * 'cmd' is the KISS command. For AX.25 data, it is zero. + */ static void sp_bump(struct sixpack *sp, char cmd) { @@ -238,98 +417,60 @@ int count; unsigned char *ptr; - count = sp->rcount+1; + count = sp->rcount + 1; sp->stats.rx_bytes += count; - if ((skb = dev_alloc_skb(count)) == NULL) { - printk(KERN_DEBUG "%s: memory squeeze, dropping packet.\n", sp->dev->name); - sp->stats.rx_dropped++; - return; - } + if ((skb = dev_alloc_skb(count)) == NULL) + goto out_mem; skb->dev = sp->dev; ptr = skb_put(skb, count); *ptr++ = cmd; /* KISS command */ - memcpy(ptr, (sp->cooked_buf)+1, count); + memcpy(ptr, sp->cooked_buf + 1, count); skb->mac.raw = skb->data; skb->protocol = htons(ETH_P_AX25); netif_rx(skb); sp->dev->last_rx = jiffies; sp->stats.rx_packets++; + + return; + +out_mem: + sp->stats.rx_dropped++; } /* ----------------------------------------------------------------------- */ -/* Encapsulate one AX.25 frame and stuff into a TTY queue. */ -static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len) +/* + * We have a potential race on dereferencing tty->disc_data, because the tty + * layer provides no locking at all - thus one cpu could be running + * sixpack_receive_buf while another calls sixpack_close, which zeroes + * tty->disc_data and frees the memory that sixpack_receive_buf is using. The + * best way to fix this is to use a rwlock in the tty struct, but for now we + * use a single global rwlock for all ttys in ppp line discipline. + */ +static rwlock_t disc_data_lock = RW_LOCK_UNLOCKED; + +static struct sixpack *sp_get(struct tty_struct *tty) { - unsigned char *p; - int actual, count; - - if (len > sp->mtu) { /* sp->mtu = AX25_MTU = max. PACLEN = 256 */ - printk(KERN_DEBUG "%s: truncating oversized transmit packet!\n", sp->dev->name); - sp->stats.tx_dropped++; - netif_start_queue(sp->dev); - return; - } - - p = icp; - - if (p[0] > 5) { - printk(KERN_DEBUG "%s: invalid KISS command -- dropped\n", sp->dev->name); - netif_start_queue(sp->dev); - return; - } - - if ((p[0] != 0) && (len > 2)) { - printk(KERN_DEBUG "%s: KISS control packet too long -- dropped\n", sp->dev->name); - netif_start_queue(sp->dev); - return; - } - - if ((p[0] == 0) && (len < 15)) { - printk(KERN_DEBUG "%s: bad AX.25 packet to transmit -- dropped\n", sp->dev->name); - netif_start_queue(sp->dev); - sp->stats.tx_dropped++; - return; - } + struct sixpack *sp; - count = encode_sixpack(p, (unsigned char *) sp->xbuff, len, sp->tx_delay); - sp->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP); + read_lock(&disc_data_lock); + sp = tty->disc_data; + if (sp) + atomic_inc(&sp->refcnt); + read_unlock(&disc_data_lock); - switch (p[0]) { - case 1: sp->tx_delay = p[1]; return; - case 2: sp->persistence = p[1]; return; - case 3: sp->slottime = p[1]; return; - case 4: /* ignored */ return; - case 5: sp->duplex = p[1]; return; - } + return sp; +} - if (p[0] == 0) { - /* in case of fullduplex or DAMA operation, we don't take care - about the state of the DCD or of any timers, as the determination - of the correct time to send is the job of the AX.25 layer. We send - immediately after data has arrived. */ - if (sp->duplex == 1) { - sp->led_state = 0x70; - sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); - sp->tx_enable = 1; - actual = sp->tty->driver->write(sp->tty, 0, sp->xbuff, count); - sp->xleft = count - actual; - sp->xhead = sp->xbuff + actual; - sp->led_state = 0x60; - sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); - } else { - sp->xleft = count; - sp->xhead = sp->xbuff; - sp->status2 = count; - if (sp->duplex == 0) - sp_start_tx_timer(sp); - } - } +static void sp_put(struct sixpack *sp) +{ + if (atomic_dec_and_test(&sp->refcnt)) + up(&sp->dead_sem); } /* @@ -338,22 +479,17 @@ */ static void sixpack_write_wakeup(struct tty_struct *tty) { + struct sixpack *sp = sp_get(tty); int actual; - struct sixpack *sp = (struct sixpack *) tty->disc_data; - - /* First make sure we're connected. */ - if (!sp || sp->magic != SIXPACK_MAGIC || - !netif_running(sp->dev)) - return; if (sp->xleft <= 0) { /* Now serial buffer is almost free & we can start * transmission of another packet */ sp->stats.tx_packets++; - tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP); + clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); sp->tx_enable = 0; netif_wake_queue(sp->dev); - return; + goto out; } if (sp->tx_enable == 1) { @@ -361,79 +497,34 @@ sp->xleft -= actual; sp->xhead += actual; } -} - -/* ----------------------------------------------------------------------- */ - -/* Encapsulate an IP datagram and kick it into a TTY queue. */ - -static int sp_xmit(struct sk_buff *skb, struct net_device *dev) -{ - struct sixpack *sp = (struct sixpack *) dev->priv; - - /* We were not busy, so we are now... :-) */ - netif_stop_queue(dev); - sp->stats.tx_bytes += skb->len; - sp_encaps(sp, skb->data, skb->len); - dev_kfree_skb(skb); - return 0; -} - - -/* perform the persistence/slottime algorithm for CSMA access. If the persistence - check was successful, write the data to the serial driver. Note that in case - of DAMA operation, the data is not sent here. */ -static void sp_xmit_on_air(unsigned long channel) -{ - struct sixpack *sp = (struct sixpack *) channel; - int actual; - static unsigned char random; - - random = random * 17 + 41; - - if (((sp->status1 & SIXP_DCD_MASK) == 0) && (random < sp->persistence)) { - sp->led_state = 0x70; - sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); - sp->tx_enable = 1; - actual = sp->tty->driver->write(sp->tty, 0, sp->xbuff, sp->status2); - sp->xleft -= actual; - sp->xhead += actual; - sp->led_state = 0x60; - sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); - sp->status2 = 0; - } else - sp_start_tx_timer(sp); +out: + sp_put(sp); } +/* ----------------------------------------------------------------------- */ -/* Return the frame type ID */ -static int sp_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, - void *daddr, void *saddr, unsigned len) +/* Open the low-level part of the 6pack channel. */ +static int sp_open(struct net_device *dev) { -#ifdef CONFIG_INET - if (type != htons(ETH_P_AX25)) - return ax25_encapsulate(skb, dev, type, daddr, saddr, len); -#endif - return 0; -} + struct sixpack *sp = netdev_priv(dev); + char *rbuff, *xbuff = NULL; + int err = -ENOBUFS; + unsigned long len; + /* !!! length of the buffers. MTU is IP MTU, not PACLEN! */ -static int sp_rebuild_header(struct sk_buff *skb) -{ -#ifdef CONFIG_INET - return ax25_rebuild_header(skb); -#else - return 0; -#endif -} + len = dev->mtu * 2; + rbuff = kmalloc(len + 4, GFP_KERNEL); + if (rbuff == NULL) + goto err_exit; + + xbuff = kmalloc(len + 4, GFP_KERNEL); + if (xbuff == NULL) + goto err_exit; -/* Open the low-level part of the 6pack channel. */ -static int sp_open(struct net_device *dev) -{ - struct sixpack *sp = (struct sixpack *) dev->priv; - unsigned long len; + spin_lock_bh(&sp->lock); if (sp->tty == NULL) return -ENODEV; @@ -445,18 +536,8 @@ * xbuff Transmit buffer. */ - /* !!! length of the buffers. MTU is IP MTU, not PACLEN! - */ - - len = dev->mtu * 2; - - if ((sp->rbuff = kmalloc(len + 4, GFP_KERNEL)) == NULL) - return -ENOMEM; - - if ((sp->xbuff = kmalloc(len + 4, GFP_KERNEL)) == NULL) { - kfree(sp->rbuff); - return -ENOMEM; - } + rbuff = xchg(&sp->rbuff, rbuff); + xbuff = xchg(&sp->xbuff, xbuff); sp->mtu = AX25_MTU + 73; sp->buffsize = len; @@ -465,7 +546,7 @@ sp->rx_count_cooked = 0; sp->xleft = 0; - sp->flags &= (1 << SIXPF_INUSE); /* Clear ESCAPE & ERROR flags */ + sp->flags = 0; /* Clear ESCAPE & ERROR flags */ sp->duplex = 0; sp->tx_delay = SIXP_TXDELAY; @@ -482,49 +563,47 @@ init_timer(&sp->tx_t); init_timer(&sp->resync_t); - return 0; -} + spin_unlock_bh(&sp->lock); -/* Close the low-level part of the 6pack channel. */ -static int sp_close(struct net_device *dev) -{ - struct sixpack *sp = (struct sixpack *) dev->priv; - - if (sp->tty == NULL) - return -EBUSY; + err = 0; - sp->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP); +err_exit: + if (xbuff) + kfree(xbuff); + if (rbuff) + kfree(rbuff); - netif_stop_queue(dev); - return 0; + return err; } + static int sixpack_receive_room(struct tty_struct *tty) { return 65536; /* We can handle an infinite amount of data. :-) */ } -/* !!! receive state machine */ - /* * Handle the 'receiver data ready' interrupt. * This function is called by the 'tty_io' module in the kernel when * a block of 6pack data has been received, which can now be decapsulated * and sent on to some IP layer for further processing. */ -static void sixpack_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) +static void sixpack_receive_buf(struct tty_struct *tty, + const unsigned char *cp, char *fp, int count) { + struct sixpack *sp; unsigned char buf[512]; int count1; - struct sixpack *sp = (struct sixpack *) tty->disc_data; + if (!count) + return; - if (!sp || sp->magic != SIXPACK_MAGIC || - !netif_running(sp->dev) || !count) + sp = sp_get(tty); + if (!sp) return; - memcpy(buf, cp, countflags) + && tty->driver->unthrottle) + tty->driver->unthrottle(tty); +} + +/* + * Try to resync the TNC. Called by the resync timer defined in + * decode_prio_command + */ + +static void resync_tnc(unsigned long channel) +{ + struct sixpack *sp = (struct sixpack *) channel; + struct net_device *dev = sp->dev; + static char resync_cmd = 0xe8; + + printk(KERN_INFO "%s: resyncing TNC\n", dev->name); + + /* clear any data that might have been received */ + + sp->rx_count = 0; + sp->rx_count_cooked = 0; + + /* reset state machine */ + + sp->status = 1; + sp->status1 = 1; + sp->status2 = 0; + sp->tnc_ok = 0; + + /* resync the TNC */ + + sp->led_state = 0x60; + sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); + sp->tty->driver->write(sp->tty, 0, &resync_cmd, 1); + + + /* Start resync timer again -- the TNC might be still absent */ + + del_timer(&sp->resync_t); + sp->resync_t.data = (unsigned long) sp; + sp->resync_t.function = resync_tnc; + sp->resync_t.expires = jiffies + SIXP_RESYNC_TIMEOUT; + add_timer(&sp->resync_t); +} + +static inline int tnc_init(struct sixpack *sp) +{ + unsigned char inbyte = 0xe8; + + sp->tty->driver->write(sp->tty, 0, &inbyte, 1); + + del_timer(&sp->resync_t); + sp->resync_t.data = (unsigned long) sp; + sp->resync_t.function = resync_tnc; + sp->resync_t.expires = jiffies + SIXP_RESYNC_TIMEOUT; + add_timer(&sp->resync_t); + + return 0; } /* @@ -549,37 +689,33 @@ */ static int sixpack_open(struct tty_struct *tty) { - struct sixpack *sp = (struct sixpack *) tty->disc_data; - int err; + struct sixpack *sp; + int err = 0; - /* First make sure we're not already connected. */ + if (!capable(CAP_NET_ADMIN)) + return -EPERM; - if (sp && sp->magic == SIXPACK_MAGIC) - return -EEXIST; + sp = sp_alloc(); + if (!sp) { + err = -ENOMEM; + goto out; + } - /* OK. Find a free 6pack channel to use. */ - if ((sp = sp_alloc()) == NULL) - return -ENFILE; sp->tty = tty; - tty->disc_data = sp; - if (tty->driver->flush_buffer) - tty->driver->flush_buffer(tty); - - if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer(tty); - - /* Restore default settings */ - sp->dev->type = ARPHRD_AX25; + atomic_set(&sp->refcnt, 1); + init_MUTEX_LOCKED(&sp->dead_sem); /* Perform the low-level 6pack initialization. */ if ((err = sp_open(sp->dev))) - return err; + goto out; /* Done. We have linked the TTY line to a channel. */ + tty->disc_data = sp; tnc_init(sp); - return sp->dev->base_addr; +out: + return err; } @@ -593,102 +729,93 @@ { struct sixpack *sp = (struct sixpack *) tty->disc_data; - /* First make sure we're connected. */ - if (!sp || sp->magic != SIXPACK_MAGIC) + write_lock(&disc_data_lock); + sp = tty->disc_data; + tty->disc_data = 0; + write_unlock(&disc_data_lock); + if (sp == 0) return; - rtnl_lock(); - dev_close(sp->dev); + /* + * We have now ensured that nobody can start using ap from now on, but + * we have to wait for all existing users to finish. + */ + if (!atomic_dec_and_test(&sp->refcnt)) + down(&sp->dead_sem); del_timer(&sp->tx_t); del_timer(&sp->resync_t); - tty->disc_data = 0; - sp->tty = NULL; - sp_free(sp); - unregister_netdevice(sp->dev); - rtnl_unlock(); + unregister_netdev(sp->dev); } - -static struct net_device_stats *sp_get_stats(struct net_device *dev) -{ - struct sixpack *sp = (struct sixpack *) dev->priv; - return &sp->stats; -} - - static int sp_set_mac_address(struct net_device *dev, void *addr) { return copy_from_user(dev->dev_addr, addr, AX25_ADDR_LEN) ? -EFAULT : 0; } -static int sp_set_dev_mac_address(struct net_device *dev, void *addr) -{ - struct sockaddr *sa = addr; - memcpy(dev->dev_addr, sa->sa_data, AX25_ADDR_LEN); - return 0; -} - - /* Perform I/O control on an active 6pack channel. */ -static int sixpack_ioctl(struct tty_struct *tty, void *file, int cmd, void *arg) +static int sixpack_ioctl(struct tty_struct *tty, struct file *file, + unsigned int cmd, unsigned long arg) { - struct sixpack *sp = (struct sixpack *) tty->disc_data; - unsigned int tmp; + struct sixpack *sp = sp_get(tty); + unsigned int tmp, err; - /* First make sure we're connected. */ - if (!sp || sp->magic != SIXPACK_MAGIC) - return -EINVAL; + if (!sp) + return -ENXIO; switch(cmd) { case SIOCGIFNAME: - return copy_to_user(arg, sp->dev->name, strlen(sp->dev->name) + 1) ? -EFAULT : 0; + err = copy_to_user((void *) arg, sp->dev->name, + strlen(sp->dev->name) + 1) ? -EFAULT : 0; + break; case SIOCGIFENCAP: - return put_user(0, (int *)arg); + err = put_user(0, (int *)arg); + break; case SIOCSIFENCAP: - if (get_user(tmp, (int *) arg)) - return -EFAULT; + if (get_user(tmp, (int *) arg)) { + err = -EFAULT; + break; + } sp->mode = tmp; sp->dev->addr_len = AX25_ADDR_LEN; /* sizeof an AX.25 addr */ sp->dev->hard_header_len = AX25_KISS_HEADER_LEN + AX25_MAX_HEADER_LEN + 3; sp->dev->type = ARPHRD_AX25; - return 0; + err = 0; + break; case SIOCSIFHWADDR: - return sp_set_mac_address(sp->dev, arg); + err = sp_set_mac_address(sp->dev, (void *) arg); + break; /* Allow stty to read, but not set, the serial port */ case TCGETS: case TCGETA: - return n_tty_ioctl(tty, (struct file *) file, cmd, (unsigned long) arg); + err = n_tty_ioctl(tty, (struct file *) file, cmd, arg); + break; default: return -ENOIOCTLCMD; } -} -static int sp_open_dev(struct net_device *dev) -{ - struct sixpack *sp = (struct sixpack *) dev->priv; - if (sp->tty == NULL) - return -ENODEV; - return 0; + sp_put(sp); + + return err; } /* Fill in our line protocol discipline */ static struct tty_ldisc sp_ldisc = { - .magic = TTY_LDISC_MAGIC, + .owner = THIS_MODULE, + .magic = TTY_LDISC_MAGIC, .name = "6pack", .open = sixpack_open, - .close = sixpack_close, - .ioctl = (int (*)(struct tty_struct *, struct file *, - unsigned int, unsigned long)) sixpack_ioctl, + .close = sixpack_close, + .ioctl = sixpack_ioctl, .receive_buf = sixpack_receive_buf, .receive_room = sixpack_receive_room, .write_wakeup = sixpack_write_wakeup, @@ -696,34 +823,18 @@ /* Initialize 6pack control device -- register 6pack line discipline */ -static char msg_banner[] __initdata = KERN_INFO "AX.25: 6pack driver, " SIXPACK_VERSION " (dynamic channels, max=%d)\n"; -static char msg_nomem[] __initdata = KERN_ERR "6pack: can't allocate sixpack_ctrls[] array! No 6pack available.\n"; +static char msg_banner[] __initdata = KERN_INFO "AX.25: 6pack driver, " SIXPACK_VERSION "\n"; static char msg_regfail[] __initdata = KERN_ERR "6pack: can't register line discipline (err = %d)\n"; static int __init sixpack_init_driver(void) { int status; - /* Do sanity checks on maximum device parameter. */ - if (sixpack_maxdev < 4) - sixpack_maxdev = 4; - - printk(msg_banner, sixpack_maxdev); - - sixpack_ctrls = (sixpack_ctrl_t **) kmalloc(sizeof(void*)*sixpack_maxdev, GFP_KERNEL); - if (sixpack_ctrls == NULL) { - printk(msg_nomem); - return -ENOMEM; - } - - /* Clear the pointer array, we allocate devices when we need them */ - memset(sixpack_ctrls, 0, sizeof(void*)*sixpack_maxdev); /* Pointers */ + printk(msg_banner); /* Register the provided line protocol discipline */ - if ((status = tty_register_ldisc(N_6PACK, &sp_ldisc)) != 0) { + if ((status = tty_register_ldisc(N_6PACK, &sp_ldisc)) != 0) printk(msg_regfail, status); - kfree(sixpack_ctrls); - } return status; } @@ -732,36 +843,16 @@ static void __exit sixpack_exit_driver(void) { - int i; - - if ((i = tty_register_ldisc(N_6PACK, NULL))) - printk(msg_unregfail, i); + int ret; - for (i = 0; i < sixpack_maxdev; i++) { - if (sixpack_ctrls[i]) { - /* - * VSV = if dev->start==0, then device - * unregistered while close proc. - */ - if (netif_running(&sixpack_ctrls[i]->dev)) - unregister_netdev(&sixpack_ctrls[i]->dev); - - kfree(sixpack_ctrls[i]); - } - } - kfree(sixpack_ctrls); + if ((ret = tty_register_ldisc(N_6PACK, NULL))) + printk(msg_unregfail, ret); } - /* Initialize the 6pack driver. Called by DDI. */ static int sixpack_init(struct net_device *dev) { - struct sixpack *sp = (struct sixpack *) dev->priv; - - static char ax25_bcast[AX25_ADDR_LEN] = - {'Q'<<1,'S'<<1,'T'<<1,' '<<1,' '<<1,' '<<1,'0'<<1}; - static char ax25_test[AX25_ADDR_LEN] = - {'L'<<1,'I'<<1,'N'<<1,'U'<<1,'X'<<1,' '<<1,'1'<<1}; + struct sixpack *sp = netdev_priv(dev); if (sp == NULL) /* Allocation failed ?? */ return -ENODEV; @@ -769,52 +860,15 @@ /* Set up the "6pack Control Block". (And clear statistics) */ memset(sp, 0, sizeof (struct sixpack)); - sp->magic = SIXPACK_MAGIC; sp->dev = dev; - /* Finish setting up the DEVICE info. */ - dev->mtu = SIXP_MTU; - dev->hard_start_xmit = sp_xmit; - dev->open = sp_open_dev; - dev->stop = sp_close; - dev->hard_header = sp_header; - dev->get_stats = sp_get_stats; - dev->set_mac_address = sp_set_dev_mac_address; - dev->hard_header_len = AX25_MAX_HEADER_LEN; - dev->addr_len = AX25_ADDR_LEN; - dev->type = ARPHRD_AX25; - dev->tx_queue_len = 10; - dev->rebuild_header = sp_rebuild_header; - dev->tx_timeout = NULL; - - memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN); /* Only activated in AX.25 mode */ - memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN); /* "" "" "" "" */ - - /* New-style flags. */ - dev->flags = 0; - return 0; } - - - -/* ----> 6pack timer interrupt handler and friends. <---- */ -static void sp_start_tx_timer(struct sixpack *sp) -{ - int when = sp->slottime; - - del_timer(&sp->tx_t); - sp->tx_t.data = (unsigned long) sp; - sp->tx_t.function = sp_xmit_on_air; - sp->tx_t.expires = jiffies + ((when+1)*HZ)/100; - add_timer(&sp->tx_t); -} - - /* encode an AX.25 packet into 6pack */ -static int encode_sixpack(unsigned char *tx_buf, unsigned char *tx_buf_raw, int length, unsigned char tx_delay) +static int encode_sixpack(unsigned char *tx_buf, unsigned char *tx_buf_raw, + int length, unsigned char tx_delay) { int count = 0; unsigned char checksum = 0, buf[400]; @@ -849,47 +903,28 @@ return raw_count; } +/* decode 4 sixpack-encoded bytes into 3 data bytes */ -/* decode a 6pack packet */ - -static void -sixpack_decode(struct sixpack *sp, unsigned char pre_rbuff[], int count) -{ - unsigned char inbyte; - int count1; - - for (count1 = 0; count1 < count; count1++) { - inbyte = pre_rbuff[count1]; - if (inbyte == SIXP_FOUND_TNC) { - printk(KERN_INFO "6pack: TNC found.\n"); - sp->tnc_ok = 1; - del_timer(&sp->resync_t); - } - if ((inbyte & SIXP_PRIO_CMD_MASK) != 0) - decode_prio_command(inbyte, sp); - else if ((inbyte & SIXP_STD_CMD_MASK) != 0) - decode_std_command(inbyte, sp); - else if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK) - decode_data(inbyte, sp); - } -} - -static int tnc_init(struct sixpack *sp) +static void decode_data(unsigned char inbyte, struct sixpack *sp) { - unsigned char inbyte = 0xe8; + unsigned char *buf; - sp->tty->driver->write(sp->tty, 0, &inbyte, 1); + if (sp->rx_count != 3) { + sp->raw_buf[sp->rx_count++] = inbyte; - del_timer(&sp->resync_t); - sp->resync_t.data = (unsigned long) sp; - sp->resync_t.function = resync_tnc; - sp->resync_t.expires = jiffies + SIXP_RESYNC_TIMEOUT; - add_timer(&sp->resync_t); + return; + } - return 0; + buf = sp->raw_buf; + sp->cooked_buf[sp->rx_count_cooked++] = + buf[0] | ((buf[1] << 2) & 0xc0); + sp->cooked_buf[sp->rx_count_cooked++] = + (buf[1] & 0x0f) | ((buf[2] << 2) & 0xf0); + sp->cooked_buf[sp->rx_count_cooked++] = + (buf[2] & 0x03) | (inbyte << 2); + sp->rx_count = 0; } - /* identify and execute a 6pack priority command byte */ static void decode_prio_command(unsigned char cmd, struct sixpack *sp) @@ -916,8 +951,7 @@ cmd &= !SIXP_RX_DCD_MASK; } sp->status = cmd & SIXP_PRIO_DATA_MASK; - } - else { /* output watchdog char if idle */ + } else { /* output watchdog char if idle */ if ((sp->status2 != 0) && (sp->duplex == 1)) { sp->led_state = 0x70; sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); @@ -948,46 +982,6 @@ sp->status1 = cmd & SIXP_PRIO_DATA_MASK; } -/* try to resync the TNC. Called by the resync timer defined in - decode_prio_command */ - -static void resync_tnc(unsigned long channel) -{ - static char resync_cmd = 0xe8; - struct sixpack *sp = (struct sixpack *) channel; - - printk(KERN_INFO "6pack: resyncing TNC\n"); - - /* clear any data that might have been received */ - - sp->rx_count = 0; - sp->rx_count_cooked = 0; - - /* reset state machine */ - - sp->status = 1; - sp->status1 = 1; - sp->status2 = 0; - sp->tnc_ok = 0; - - /* resync the TNC */ - - sp->led_state = 0x60; - sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); - sp->tty->driver->write(sp->tty, 0, &resync_cmd, 1); - - - /* Start resync timer again -- the TNC might be still absent */ - - del_timer(&sp->resync_t); - sp->resync_t.data = (unsigned long) sp; - sp->resync_t.function = resync_tnc; - sp->resync_t.expires = jiffies + SIXP_RESYNC_TIMEOUT; - add_timer(&sp->resync_t); -} - - - /* identify and execute a standard 6pack command byte */ static void decode_std_command(unsigned char cmd, struct sixpack *sp) @@ -997,67 +991,70 @@ channel = cmd & SIXP_CHN_MASK; switch (cmd & SIXP_CMD_MASK) { /* normal command */ - case SIXP_SEOF: - if ((sp->rx_count == 0) && (sp->rx_count_cooked == 0)) { - if ((sp->status & SIXP_RX_DCD_MASK) == - SIXP_RX_DCD_MASK) { - sp->led_state = 0x68; - sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); - } - } else { - sp->led_state = 0x60; - /* fill trailing bytes with zeroes */ + case SIXP_SEOF: + if ((sp->rx_count == 0) && (sp->rx_count_cooked == 0)) { + if ((sp->status & SIXP_RX_DCD_MASK) == + SIXP_RX_DCD_MASK) { + sp->led_state = 0x68; sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); - rest = sp->rx_count; - if (rest != 0) - for (i = rest; i <= 3; i++) - decode_data(0, sp); - if (rest == 2) - sp->rx_count_cooked -= 2; - else if (rest == 3) - sp->rx_count_cooked -= 1; - for (i = 0; i < sp->rx_count_cooked; i++) - checksum += sp->cooked_buf[i]; - if (checksum != SIXP_CHKSUM) { - printk(KERN_DEBUG "6pack: bad checksum %2.2x\n", checksum); - } else { - sp->rcount = sp->rx_count_cooked-2; - sp_bump(sp, 0); - } - sp->rx_count_cooked = 0; } - break; - case SIXP_TX_URUN: printk(KERN_DEBUG "6pack: TX underrun\n"); - break; - case SIXP_RX_ORUN: printk(KERN_DEBUG "6pack: RX overrun\n"); - break; - case SIXP_RX_BUF_OVL: - printk(KERN_DEBUG "6pack: RX buffer overflow\n"); + } else { + sp->led_state = 0x60; + /* fill trailing bytes with zeroes */ + sp->tty->driver->write(sp->tty, 0, &sp->led_state, 1); + rest = sp->rx_count; + if (rest != 0) + for (i = rest; i <= 3; i++) + decode_data(0, sp); + if (rest == 2) + sp->rx_count_cooked -= 2; + else if (rest == 3) + sp->rx_count_cooked -= 1; + for (i = 0; i < sp->rx_count_cooked; i++) + checksum += sp->cooked_buf[i]; + if (checksum != SIXP_CHKSUM) { + printk(KERN_DEBUG "6pack: bad checksum %2.2x\n", checksum); + } else { + sp->rcount = sp->rx_count_cooked-2; + sp_bump(sp, 0); + } + sp->rx_count_cooked = 0; + } + break; + case SIXP_TX_URUN: printk(KERN_DEBUG "6pack: TX underrun\n"); + break; + case SIXP_RX_ORUN: printk(KERN_DEBUG "6pack: RX overrun\n"); + break; + case SIXP_RX_BUF_OVL: + printk(KERN_DEBUG "6pack: RX buffer overflow\n"); } } -/* decode 4 sixpack-encoded bytes into 3 data bytes */ +/* decode a 6pack packet */ -static void decode_data(unsigned char inbyte, struct sixpack *sp) +static void +sixpack_decode(struct sixpack *sp, unsigned char pre_rbuff[], int count) { - unsigned char *buf; + unsigned char inbyte; + int count1; - if (sp->rx_count != 3) - sp->raw_buf[sp->rx_count++] = inbyte; - else { - buf = sp->raw_buf; - sp->cooked_buf[sp->rx_count_cooked++] = - buf[0] | ((buf[1] << 2) & 0xc0); - sp->cooked_buf[sp->rx_count_cooked++] = - (buf[1] & 0x0f) | ((buf[2] << 2) & 0xf0); - sp->cooked_buf[sp->rx_count_cooked++] = - (buf[2] & 0x03) | (inbyte << 2); - sp->rx_count = 0; + for (count1 = 0; count1 < count; count1++) { + inbyte = pre_rbuff[count1]; + if (inbyte == SIXP_FOUND_TNC) { + printk(KERN_INFO "6pack: TNC found.\n"); + sp->tnc_ok = 1; + del_timer(&sp->resync_t); + } + if ((inbyte & SIXP_PRIO_CMD_MASK) != 0) + decode_prio_command(inbyte, sp); + else if ((inbyte & SIXP_STD_CMD_MASK) != 0) + decode_std_command(inbyte, sp); + else if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK) + decode_data(inbyte, sp); } } - -MODULE_AUTHOR("Andreas Könsgen "); +MODULE_AUTHOR("Ralf Baechle DO1GRB "); MODULE_DESCRIPTION("6pack driver for AX.25"); MODULE_LICENSE("GPL"); MODULE_ALIAS_LDISC(N_6PACK); diff -Nru a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c --- a/drivers/net/ibmveth.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/ibmveth.c Wed Mar 17 19:29:09 2004 @@ -527,7 +527,10 @@ ibmveth_debug_printk("registering irq 0x%x\n", netdev->irq); if((rc = request_irq(netdev->irq, &ibmveth_interrupt, 0, netdev->name, netdev)) != 0) { ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc); - h_free_logical_lan(adapter->vdev->unit_address); + do { + rc = h_free_logical_lan(adapter->vdev->unit_address); + } while H_isLongBusy(rc); + ibmveth_cleanup(adapter); return rc; } @@ -556,7 +559,9 @@ cancel_delayed_work(&adapter->replenish_task); flush_scheduled_work(); - lpar_rc = h_free_logical_lan(adapter->vdev->unit_address); + do { + lpar_rc = h_free_logical_lan(adapter->vdev->unit_address); + } while H_isLongBusy(lpar_rc); if(lpar_rc != H_Success) { @@ -617,6 +622,8 @@ union ibmveth_buf_desc desc[IbmVethMaxSendFrags]; unsigned long lpar_rc; int nfrags = 0, curfrag; + unsigned long correlator; + unsigned int retry_count; if ((skb_shinfo(skb)->nr_frags + 1) > IbmVethMaxSendFrags) { adapter->stats.tx_dropped++; @@ -674,8 +681,8 @@ } /* send the frame. Arbitrarily set retrycount to 1024 */ - unsigned long correlator = 0; - unsigned int retry_count = 1024; + correlator = 0; + retry_count = 1024; do { lpar_rc = h_send_logical_lan(adapter->vdev->unit_address, desc[0].desc, diff -Nru a/drivers/net/loopback.c b/drivers/net/loopback.c --- a/drivers/net/loopback.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/loopback.c Wed Mar 17 19:29:09 2004 @@ -123,7 +123,7 @@ */ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) { - struct net_device_stats *stats = netdev_priv(dev); + struct net_device_stats *stats = dev->priv; skb_orphan(skb); diff -Nru a/drivers/net/natsemi.c b/drivers/net/natsemi.c --- a/drivers/net/natsemi.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/natsemi.c Wed Mar 17 19:29:09 2004 @@ -175,6 +175,8 @@ #define DRV_VERSION "1.07+LK1.0.17" #define DRV_RELDATE "Sep 27, 2002" +#define RX_OFFSET 2 + /* Updated to recommendations in pci-skeleton v2.03. */ /* The user-configurable values. @@ -1467,13 +1469,14 @@ struct sk_buff *skb; int entry = np->dirty_rx % RX_RING_SIZE; if (np->rx_skbuff[entry] == NULL) { - skb = dev_alloc_skb(np->rx_buf_sz); + unsigned int buflen = np->rx_buf_sz + RX_OFFSET; + skb = dev_alloc_skb(buflen); np->rx_skbuff[entry] = skb; if (skb == NULL) break; /* Better luck next round. */ skb->dev = dev; /* Mark as being used by this device. */ np->rx_dma[entry] = pci_map_single(np->pci_dev, - skb->data, skb->len, PCI_DMA_FROMDEVICE); + skb->tail, buflen, PCI_DMA_FROMDEVICE); np->rx_ring[entry].addr = cpu_to_le32(np->rx_dma[entry]); } np->rx_ring[entry].cmd_status = cpu_to_le32(np->rx_buf_sz); @@ -1543,6 +1546,7 @@ static void drain_ring(struct net_device *dev) { struct netdev_private *np = dev->priv; + unsigned int buflen = np->rx_buf_sz + RX_OFFSET; int i; /* Free all the skbuffs in the Rx queue. */ @@ -1551,7 +1555,7 @@ np->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */ if (np->rx_skbuff[i]) { pci_unmap_single(np->pci_dev, - np->rx_dma[i], np->rx_skbuff[i]->len, + np->rx_dma[i], buflen, PCI_DMA_FROMDEVICE); dev_kfree_skb(np->rx_skbuff[i]); } @@ -1747,6 +1751,7 @@ int entry = np->cur_rx % RX_RING_SIZE; int boguscnt = np->dirty_rx + RX_RING_SIZE - np->cur_rx; s32 desc_status = le32_to_cpu(np->rx_head_desc->cmd_status); + unsigned int buflen = np->rx_buf_sz + RX_OFFSET; /* If the driver owns the next entry it's a new packet. Send it up. */ while (desc_status < 0) { /* e.g. & DescOwn */ @@ -1785,13 +1790,13 @@ /* Check if the packet is long enough to accept * without copying to a minimally-sized skbuff. */ if (pkt_len < rx_copybreak - && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { + && (skb = dev_alloc_skb(pkt_len + RX_OFFSET)) != NULL) { skb->dev = dev; /* 16 byte align the IP header */ - skb_reserve(skb, 2); + skb_reserve(skb, RX_OFFSET); pci_dma_sync_single_for_cpu(np->pci_dev, np->rx_dma[entry], - np->rx_skbuff[entry]->len, + buflen, PCI_DMA_FROMDEVICE); #if HAS_IP_COPYSUM eth_copy_and_sum(skb, @@ -1803,12 +1808,11 @@ #endif pci_dma_sync_single_for_device(np->pci_dev, np->rx_dma[entry], - np->rx_skbuff[entry]->len, + buflen, PCI_DMA_FROMDEVICE); } else { pci_unmap_single(np->pci_dev, np->rx_dma[entry], - np->rx_skbuff[entry]->len, - PCI_DMA_FROMDEVICE); + buflen, PCI_DMA_FROMDEVICE); skb_put(skb = np->rx_skbuff[entry], pkt_len); np->rx_skbuff[entry] = NULL; } diff -Nru a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c --- a/drivers/net/tulip/de2104x.c Wed Mar 17 19:29:10 2004 +++ b/drivers/net/tulip/de2104x.c Wed Mar 17 19:29:10 2004 @@ -28,8 +28,8 @@ */ #define DRV_NAME "de2104x" -#define DRV_VERSION "0.6" -#define DRV_RELDATE "Sep 1, 2003" +#define DRV_VERSION "0.7" +#define DRV_RELDATE "Mar 17, 2004" #include #include @@ -303,7 +303,6 @@ struct net_device_stats net_stats; struct pci_dev *pdev; - u32 macmode; u16 setup_frame[DE_SETUP_FRAME_WORDS]; @@ -732,7 +731,7 @@ struct de_desc *txd; struct de_desc *dummy_txd = NULL; - macmode = de->macmode & ~(AcceptAllMulticast | AcceptAllPhys); + macmode = dr32(MacMode) & ~(AcceptAllMulticast | AcceptAllPhys); if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ macmode |= AcceptAllMulticast | AcceptAllPhys; @@ -805,10 +804,8 @@ dw32(TxPoll, NormalTxPoll); out: - if (macmode != de->macmode) { - dw32 (MacMode, macmode); - de->macmode = macmode; - } + if (macmode != dr32(MacMode)) + dw32(MacMode, macmode); } static void de_set_rx_mode (struct net_device *dev) @@ -923,6 +920,7 @@ static void de_set_media (struct de_private *de) { unsigned media = de->media_type; + u32 macmode = dr32(MacMode); if (de_is_running(de)) BUG(); @@ -940,9 +938,9 @@ mdelay(10); if (media == DE_MEDIA_TP_FD) - de->macmode |= FullDuplex; + macmode |= FullDuplex; else - de->macmode &= ~FullDuplex; + macmode &= ~FullDuplex; if (netif_msg_link(de)) { printk(KERN_INFO "%s: set link %s\n" @@ -951,9 +949,11 @@ de->dev->name, media_name[media], de->dev->name, dr32(MacMode), dr32(SIAStatus), dr32(CSR13), dr32(CSR14), dr32(CSR15), - de->dev->name, de->macmode, de->media[media].csr13, + de->dev->name, macmode, de->media[media].csr13, de->media[media].csr14, de->media[media].csr15); } + if (macmode != dr32(MacMode)) + dw32(MacMode, macmode); } static void de_next_media (struct de_private *de, u32 *media, @@ -1173,18 +1173,18 @@ u32 status, tmp; /* - * Reset MAC. Copied from de4x5.c. + * Reset MAC. de4x5.c and tulip.c examined for "advice" + * in this area. */ - tmp = dr32 (BusMode); - if (tmp == 0xffffffff) - return -ENODEV; - mdelay (1); + if (dr32(BusMode) == 0xffffffff) + return -EBUSY; - dw32 (BusMode, tmp | CmdReset); + /* Reset the chip, holding bit 0 set at least 50 PCI cycles. */ + dw32 (BusMode, CmdReset); mdelay (1); - dw32 (BusMode, tmp); + dw32 (BusMode, de_bus_mode); mdelay (1); for (tmp = 0; tmp < 5; tmp++) { @@ -1235,11 +1235,12 @@ static int de_init_hw (struct de_private *de) { struct net_device *dev = de->dev; + u32 macmode; int rc; de_adapter_wake(de); - de->macmode = dr32(MacMode) & ~MacModeClear; + macmode = dr32(MacMode) & ~MacModeClear; rc = de_reset_mac(de); if (rc) @@ -1250,7 +1251,7 @@ dw32(RxRingAddr, de->ring_dma); dw32(TxRingAddr, de->ring_dma + (sizeof(struct de_desc) * DE_RX_RING_SIZE)); - dw32(MacMode, RxTx | de->macmode); + dw32(MacMode, RxTx | macmode); dr32(RxMissed); /* self-clearing */ @@ -1501,7 +1502,7 @@ break; } - if (de->macmode & FullDuplex) + if (dr32(MacMode) & FullDuplex) ecmd->duplex = DUPLEX_FULL; else ecmd->duplex = DUPLEX_HALF; diff -Nru a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c --- a/drivers/net/tulip/tulip_core.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/tulip/tulip_core.c Wed Mar 17 19:29:09 2004 @@ -253,8 +253,9 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev); static int private_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static void set_rx_mode(struct net_device *dev); +#ifdef CONFIG_NET_POLL_CONTROLLER static void poll_tulip(struct net_device *dev); - +#endif static void tulip_set_power_state (struct tulip_private *tp, int sleep, int snooze) diff -Nru a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig --- a/drivers/net/wireless/Kconfig Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/Kconfig Wed Mar 17 19:29:09 2004 @@ -307,18 +307,18 @@ It has basic support for Linux wireless extensions and initial micro support for ethtool. -comment "Prism GT/Duette 802.11(a/b/g) PCI/PCMCIA support" +comment "Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support" depends on NET_RADIO && PCI config PRISM54 - tristate 'Intersil Prism GT/Duette/Indigo PCI/PCMCIA' + tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus' depends on PCI && NET_RADIO && EXPERIMENTAL && HOTPLUG select FW_LOADER ---help--- Enable PCI and Cardbus support for the following chipset based cards: - ISL3880 - Prism GT 802.11 b/g - ISL3877 - Prism Indigo 802.11 a - ISL3890 - Prism Duette 802.11 a/b/g + ISL3880 - Prism GT 802.11 b/g + ISL3877 - Prism Indigo 802.11 a + ISL3890 - Prism Duette 802.11 a/b/g For a complete list of supported cards visit . Here is the latest confirmed list of supported cards: @@ -335,8 +335,9 @@ Peabird WLG-PCI PCI Card Sitecom WL-100i Cardbus Card Sitecom WL-110i PCI Card - SMC2802W - EZ Connect g 2.4GHz 54 Mbps Wireless PCI Card - SMC2835W - EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card + SMC2802W - EZ Connect g 2.4GHz 54 Mbps Wireless PCI Card + SMC2835W - EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card + SMC2835W-V2 - EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card Z-Com XG-900 PCI Card Zyxel G-100 Cardbus Card diff -Nru a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c --- a/drivers/net/wireless/prism54/isl_ioctl.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/prism54/isl_ioctl.c Wed Mar 17 19:29:09 2004 @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -44,26 +45,26 @@ static int init_conformance = CARD_DEFAULT_CONFORMANCE; static int init_mlme = CARD_DEFAULT_MLME_MODE; -MODULE_PARM(init_mode, "i"); +module_param(init_mode, int, 0); MODULE_PARM_DESC(init_mode, "Set card mode:\n0: Auto\n1: Ad-Hoc\n2: Managed Client (Default)\n3: Master / Access Point\n4: Repeater (Not supported yet)\n5: Secondary (Not supported yet)\n6: Monitor"); -MODULE_PARM(init_channel, "i"); +module_param(init_channel, int, 0); MODULE_PARM_DESC(init_channel, "Check `iwpriv ethx channel` for available channels"); -MODULE_PARM(init_wep, "i"); -MODULE_PARM(init_filter, "i"); +module_param(init_wep, int, 0); +module_param(init_filter, int, 0); -MODULE_PARM(init_authen, "i"); +module_param(init_authen, int, 0); MODULE_PARM_DESC(init_authen, "Authentication method. Can be of seven types:\n0 0x0000: None\n1 0x0001: DOT11_AUTH_OS (Default)\n2 0x0002: DOT11_AUTH_SK\n3 0x0003: DOT11_AUTH_BOTH"); -MODULE_PARM(init_dot1x, "i"); +module_param(init_dot1x, int, 0); MODULE_PARM_DESC(init_dot1x, "\n0: None/not set (Default)\n1: DOT11_DOT1X_AUTHENABLED\n2: DOT11_DOT1X_KEYTXENABLED"); -MODULE_PARM(init_mlme, "i"); +module_param(init_mlme, int, 0); MODULE_PARM_DESC(init_mlme, "Sets the MAC layer management entity (MLME) mode of operation,\n0: DOT11_MLME_AUTO (Default)\n1: DOT11_MLME_INTERMEDIATE\n2: DOT11_MLME_EXTENDED"); @@ -250,7 +251,7 @@ struct iw_statistics * prism54_get_wireless_stats(struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); /* If the stats are being updated return old data */ if (down_trylock(&priv->stats_sem) == 0) { @@ -277,7 +278,7 @@ prism54_commit(struct net_device *ndev, struct iw_request_info *info, char *cwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); /* simply re-set the last set SSID, this should commit most stuff */ @@ -293,7 +294,7 @@ prism54_get_name(struct net_device *ndev, struct iw_request_info *info, char *cwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); char *capabilities; union oid_res_t r; int rvalue; @@ -324,7 +325,7 @@ prism54_set_freq(struct net_device *ndev, struct iw_request_info *info, struct iw_freq *fwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); int rvalue; u32 c = 0; @@ -363,7 +364,7 @@ prism54_get_freq(struct net_device *ndev, struct iw_request_info *info, struct iw_freq *fwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); union oid_res_t r; int rvalue; @@ -379,7 +380,7 @@ prism54_set_mode(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); u32 mlmeautolevel = CARD_DEFAULT_MLME_MODE; /* Let's see if the user passed a valid Linux Wireless mode */ @@ -420,7 +421,7 @@ prism54_get_mode(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); BUG_ON((priv->iw_mode < IW_MODE_AUTO) || (priv->iw_mode > IW_MODE_MONITOR)); @@ -438,7 +439,7 @@ prism54_set_sens(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); u32 sens; /* by default the card sets this to 20. */ @@ -452,7 +453,7 @@ prism54_get_sens(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); union oid_res_t r; int rvalue; @@ -470,7 +471,7 @@ struct iw_point *dwrq, char *extra) { struct iw_range *range = (struct iw_range *) extra; - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); char *data; int i, m, rvalue; struct obj_frequencies *freq; @@ -576,7 +577,7 @@ prism54_set_wap(struct net_device *ndev, struct iw_request_info *info, struct sockaddr *awrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); char bssid[6]; int rvalue; @@ -598,7 +599,7 @@ prism54_get_wap(struct net_device *ndev, struct iw_request_info *info, struct sockaddr *awrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); union oid_res_t r; int rvalue; @@ -630,7 +631,7 @@ { struct iw_event iwe; /* Temporary buffer */ short cap; - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); /* The first entry must be the MAC address */ memcpy(iwe.u.ap_addr.sa_data, bss->address, 6); @@ -721,7 +722,7 @@ prism54_get_scan(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); int i, rvalue; struct obj_bsslist *bsslist; u32 noise = 0; @@ -762,7 +763,7 @@ prism54_set_essid(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct obj_ssid essid; memset(essid.octets, 0, 33); @@ -789,7 +790,7 @@ prism54_get_essid(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct obj_ssid *essid; union oid_res_t r; int rvalue; @@ -819,7 +820,7 @@ prism54_set_nick(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); if (dwrq->length > IW_ESSID_MAX_SIZE) return -E2BIG; @@ -836,7 +837,7 @@ prism54_get_nick(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); dwrq->length = 0; @@ -856,7 +857,7 @@ struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); u32 rate, profile; char *data; int ret, i; @@ -924,7 +925,7 @@ struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); int rvalue; char *data; union oid_res_t r; @@ -948,7 +949,7 @@ prism54_set_rts(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); return mgt_set_request(priv, DOT11_OID_RTSTHRESH, 0, &vwrq->value); } @@ -957,7 +958,7 @@ prism54_get_rts(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); union oid_res_t r; int rvalue; @@ -972,7 +973,7 @@ prism54_set_frag(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); return mgt_set_request(priv, DOT11_OID_FRAGTHRESH, 0, &vwrq->value); } @@ -981,7 +982,7 @@ prism54_get_frag(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); union oid_res_t r; int rvalue; @@ -1004,7 +1005,7 @@ prism54_set_retry(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); u32 slimit = 0, llimit = 0; /* short and long limit */ u32 lifetime = 0; int rvalue = 0; @@ -1048,7 +1049,7 @@ prism54_get_retry(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); union oid_res_t r; int rvalue = 0; vwrq->disabled = 0; /* It cannot be disabled */ @@ -1080,7 +1081,7 @@ prism54_set_encode(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); int rvalue = 0, force = 0; int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0; union oid_res_t r; @@ -1170,7 +1171,7 @@ prism54_get_encode(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct obj_key *key; u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1; u32 authen = 0, invoke = 0, exunencrypt = 0; @@ -1218,7 +1219,7 @@ prism54_get_txpower(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); union oid_res_t r; int rvalue; @@ -1238,7 +1239,7 @@ prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); s32 u = vwrq->value; /* intersil firmware operates in 0.25 dBm (1/4) */ @@ -1264,7 +1265,7 @@ prism54_reset(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - islpci_reset(ndev->priv, 0); + islpci_reset(netdev_priv(ndev), 0); return 0; } @@ -1273,7 +1274,7 @@ prism54_set_beacon(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - int rvalue = mgt_set_request((islpci_private *) ndev->priv, + int rvalue = mgt_set_request((islpci_private *) netdev_priv(ndev), DOT11_OID_BEACONPERIOD, 0, uwrq); return (rvalue ? rvalue : -EINPROGRESS); @@ -1287,7 +1288,7 @@ int rvalue; rvalue = - mgt_get_request((islpci_private *) ndev->priv, + mgt_get_request((islpci_private *) netdev_priv(ndev), DOT11_OID_BEACONPERIOD, 0, NULL, &r); *uwrq = r.u; @@ -1337,7 +1338,7 @@ prism54_add_mac(struct net_device *ndev, struct iw_request_info *info, struct sockaddr *awrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct islpci_acl *acl = &priv->acl; struct mac_entry *entry; struct sockaddr *addr = (struct sockaddr *) extra; @@ -1366,7 +1367,7 @@ prism54_del_mac(struct net_device *ndev, struct iw_request_info *info, struct sockaddr *awrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct islpci_acl *acl = &priv->acl; struct mac_entry *entry; struct list_head *ptr; @@ -1396,7 +1397,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct islpci_acl *acl = &priv->acl; struct mac_entry *entry; struct list_head *ptr; @@ -1427,7 +1428,7 @@ prism54_set_policy(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct islpci_acl *acl = &priv->acl; u32 mlmeautolevel; @@ -1460,7 +1461,7 @@ prism54_get_policy(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct islpci_acl *acl = &priv->acl; *uwrq = acl->policy; @@ -1511,7 +1512,7 @@ /* Tell the card to kick every client */ mlme->id = cpu_to_le16(0); - rvalue = mgt_set_request(ndev->priv, DOT11_OID_DISASSOCIATE, 0, mlme); + rvalue = mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme); kfree(mlme); return rvalue; @@ -1535,7 +1536,7 @@ /* Tell the card to only kick the corresponding bastard */ memcpy(mlme->address, addr->sa_data, ETH_ALEN); mlme->id = cpu_to_le16(-1); - rvalue = mgt_set_request(ndev->priv, DOT11_OID_DISASSOCIATE, 0, mlme); + rvalue = mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme); kfree(mlme); @@ -1595,7 +1596,7 @@ static void link_changed(struct net_device *ndev, u32 bitrate) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); if (le32_to_cpu(bitrate)) { if (priv->iw_mode == IW_MODE_INFRA) { @@ -1604,9 +1605,9 @@ NULL); wireless_send_event(ndev, SIOCGIWAP, &uwrq, NULL); } else - send_simple_event(ndev->priv, "Link established"); + send_simple_event(netdev_priv(ndev), "Link established"); } else - send_simple_event(ndev->priv, "Link lost"); + send_simple_event(netdev_priv(ndev), "Link lost"); } /* Beacon/ProbeResp payload header */ @@ -1889,16 +1890,17 @@ prism54_process_trap(void *data) { struct islpci_mgmtframe *frame = data; + struct net_device *ndev = frame->ndev; enum oid_num_t n = mgt_oidtonum(frame->header->oid); - prism54_process_trap_helper(frame->ndev->priv, n, frame->data); + prism54_process_trap_helper(netdev_priv(ndev), n, frame->data); islpci_mgt_release(frame); } int prism54_set_mac_address(struct net_device *ndev, void *addr) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); int ret; if (ndev->addr_len != 6) @@ -1923,7 +1925,7 @@ prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); down_write(&priv->mib_sem); @@ -1943,16 +1945,70 @@ prism54_get_wpa(struct net_device *ndev, struct iw_request_info *info, __u32 * uwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); *uwrq = priv->wpa; return 0; } int +prism54_set_maxframeburst(struct net_device *ndev, struct iw_request_info *info, + __u32 *uwrq, char *extra) +{ + islpci_private *priv = netdev_priv(ndev); + u32 max_burst; + + max_burst = (*uwrq) ? *uwrq : CARD_DEFAULT_MAXFRAMEBURST; + mgt_set_request(priv, DOT11_OID_MAXFRAMEBURST, 0, &max_burst); + + return -EINPROGRESS; /* Call commit handler */ +} + +int +prism54_get_maxframeburst(struct net_device *ndev, struct iw_request_info *info, + __u32 *uwrq, char *extra) +{ + islpci_private *priv = netdev_priv(ndev); + union oid_res_t r; + int rvalue; + + rvalue = mgt_get_request(priv, DOT11_OID_MAXFRAMEBURST, 0, NULL, &r); + *uwrq = r.u; + + return rvalue; +} + +int +prism54_set_profile(struct net_device *ndev, struct iw_request_info *info, + __u32 *uwrq, char *extra) +{ + islpci_private *priv = netdev_priv(ndev); + u32 profile; + + profile = (*uwrq) ? *uwrq : CARD_DEFAULT_PROFILE; + mgt_set_request(priv, DOT11_OID_PROFILES, 0, &profile); + + return -EINPROGRESS; /* Call commit handler */ +} + +int +prism54_get_profile(struct net_device *ndev, struct iw_request_info *info, + __u32 *uwrq, char *extra) +{ + islpci_private *priv = netdev_priv(ndev); + union oid_res_t r; + int rvalue; + + rvalue = mgt_get_request(priv, DOT11_OID_PROFILES, 0, NULL, &r); + *uwrq = r.u; + + return rvalue; +} + +int prism54_oid(struct net_device *ndev, struct iw_request_info *info, __u32 *uwrq, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); priv->priv_oid = *uwrq; printk("%s: oid 0x%08X\n", ndev->name, *uwrq); @@ -1964,7 +2020,7 @@ prism54_get_oid(struct net_device *ndev, struct iw_request_info *info, struct iw_point *data, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct islpci_mgmtframe *response = NULL; int ret = -EIO, response_op = PIMFOR_OP_ERROR; @@ -1998,7 +2054,7 @@ prism54_set_oid(struct net_device *ndev, struct iw_request_info *info, struct iw_point *data, char *extra) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct islpci_mgmtframe *response = NULL; int ret = 0, response_op = PIMFOR_OP_ERROR; diff -Nru a/drivers/net/wireless/prism54/isl_oid.h b/drivers/net/wireless/prism54/isl_oid.h --- a/drivers/net/wireless/prism54/isl_oid.h Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/prism54/isl_oid.h Wed Mar 17 19:29:09 2004 @@ -1,7 +1,8 @@ /* - * $Id: isl_oid.h,v 1.2 2004/01/30 16:24:00 ajfa Exp $ + * $Id: isl_oid.h,v 1.3 2004/03/09 09:05:27 mcgrof Exp $ * * Copyright (C) 2003 Herbert Valerio Riedel + * Copyright (C) 2004 Luis R. Rodriguez * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -142,15 +143,131 @@ DOT11_PRIV_TKIP = 1 }; +/* Prism "Nitro" / Frameburst / "Packet Frame Grouping" + * Value is in microseconds. Represents the # microseconds + * the firmware will take to group frames before sending out then out + * together with a CSMA contention. Without this all frames are + * sent with a CSMA contention. + * Bibliography: + * http://www.hpl.hp.com/personal/Jean_Tourrilhes/Papers/Packet.Frame.Grouping.html + */ +enum dot11_maxframeburst_t { + /* Values for DOT11_OID_MAXFRAMEBURST */ + DOT11_MAXFRAMEBURST_OFF = 0, /* Card firmware default */ + DOT11_MAXFRAMEBURST_MIXED_SAFE = 650, /* 802.11 a,b,g safe */ + DOT11_MAXFRAMEBURST_IDEAL = 1300, /* Theoretical ideal level */ + DOT11_MAXFRAMEBURST_MAX = 5000, /* Use this as max, + * Note: firmware allows for greater values. This is a + * recommended max. I'll update this as I find + * out what the real MAX is. Also note that you don't necessarily + * get better results with a greater value here. + */ +}; + +/* Support for 802.11 long and short frame preambles. + * Long preamble uses 128-bit sync field, 8-bit CRC + * Short preamble uses 56-bit sync field, 16-bit CRC + * + * 802.11a -- not sure, both optionally ? + * 802.11b supports long and optionally short + * 802.11g supports both */ +enum dot11_preamblesettings_t { + DOT11_PREAMBLESETTING_LONG = 0, + /* Allows *only* long 802.11 preambles */ + DOT11_PREAMBLESETTING_SHORT = 1, + /* Allows *only* short 802.11 preambles */ + DOT11_PREAMBLESETTING_DYNAMIC = 2 + /* AutomatiGically set */ +}; + +/* Support for 802.11 slot timing (time between packets). + * + * Long uses 802.11a slot timing (9 usec ?) + * Short uses 802.11b slot timing (20 use ?) */ +enum dot11_slotsettings_t { + DOT11_SLOTSETTINGS_LONG = 0, + /* Allows *only* long 802.11b slot timing */ + DOT11_SLOTSETTINGS_SHORT = 1, + /* Allows *only* long 802.11a slot timing */ + DOT11_SLOTSETTINGS_DYNAMIC = 2 + /* AutomatiGically set */ +}; + +/* All you need to know, ERP is "Extended Rate PHY". + * An Extended Rate PHY (ERP) STA or AP shall support three different + * preamble and header formats: + * Long preamble (refer to above) + * Short preamble (refer to above) + * OFDM preamble ( ? ) + * + * I'm assuming here Protection tells the AP + * to be careful, a STA which cannot handle the long pre-amble + * has joined. + */ +enum do11_nonerpstatus_t { + DOT11_ERPSTAT_NONEPRESENT = 0, + DOT11_ERPSTAT_USEPROTECTION = 1 +}; + +/* (ERP is "Extended Rate PHY") Way to read NONERP is NON-ERP-* + * The key here is DOT11 NON ERP NEVER protects against + * NON ERP STA's. You *don't* want this unless + * you know what you are doing. It means you will only + * get Extended Rate capabilities */ +enum dot11_nonerpprotection_t { + DOT11_NONERP_NEVER = 0, + DOT11_NONERP_ALWAYS = 1, + DOT11_NONERP_DYNAMIC = 2 +}; + +/* Preset OID configuration for 802.11 modes + * Note: DOT11_OID_CW[MIN|MAX] hold the values of the + * DCS MIN|MAX backoff used */ +enum dot11_profile_t { /* And set/allowed values */ + /* Allowed values for DOT11_OID_PROFILES */ + DOT11_PROFILE_B_ONLY = 0, + /* DOT11_OID_RATES: 1, 2, 5.5, 11Mbps + * DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_DYNAMIC + * DOT11_OID_CWMIN: 31 + * DOT11_OID_NONEPROTECTION: DOT11_NOERP_DYNAMIC + * DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_LONG + */ + DOT11_PROFILE_MIXED_G_WIFI = 1, + /* DOT11_OID_RATES: 1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54Mbs + * DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_DYNAMIC + * DOT11_OID_CWMIN: 15 + * DOT11_OID_NONEPROTECTION: DOT11_NOERP_DYNAMIC + * DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_DYNAMIC + */ + DOT11_PROFILE_MIXED_LONG = 2, /* "Long range" */ + /* Same as Profile MIXED_G_WIFI */ + DOT11_PROFILE_G_ONLY = 3, + /* Same as Profile MIXED_G_WIFI */ + DOT11_PROFILE_TEST = 4, + /* Same as Profile MIXED_G_WIFI except: + * DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_SHORT + * DOT11_OID_NONEPROTECTION: DOT11_NOERP_NEVER + * DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_SHORT + */ + DOT11_PROFILE_B_WIFI = 5, + /* Same as Profile B_ONLY */ + DOT11_PROFILE_A_ONLY = 6, + /* Same as Profile MIXED_G_WIFI except: + * DOT11_OID_RATES: 6, 9, 12, 18, 24, 36, 48, 54Mbs + */ + DOT11_PROFILE_MIXED_SHORT = 7 + /* Same as MIXED_G_WIFI */ +}; + + /* The dot11d conformance level configures the 802.11d conformance levels. * The following conformance levels exist:*/ enum oid_inl_conformance_t { OID_INL_CONFORMANCE_NONE = 0, /* Perform active scanning */ OID_INL_CONFORMANCE_STRICT = 1, /* Strictly adhere to 802.11d */ OID_INL_CONFORMANCE_FLEXIBLE = 2, /* Use passed 802.11d info to - * determine channel AND/OR just make - * assumption that active - * channels are valid channels */ + * determine channel AND/OR just make assumption that active + * channels are valid channels */ }; enum oid_inl_mode_t { @@ -176,6 +293,7 @@ INL_PHYCAP_FAA = 0x80000000, /* Means card supports the FAA switch */ }; + enum oid_num_t { GEN_OID_MACADDRESS = 0, GEN_OID_LINKSTATE, @@ -269,8 +387,8 @@ DOT11_OID_FRAMEABORTSPHY, DOT11_OID_SLOTTIME, - DOT11_OID_CWMIN, - DOT11_OID_CWMAX, + DOT11_OID_CWMIN, /* MIN DCS backoff */ + DOT11_OID_CWMAX, /* MAX DCS backoff */ DOT11_OID_ACKWINDOW, DOT11_OID_ANTENNARX, DOT11_OID_ANTENNATX, diff -Nru a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c --- a/drivers/net/wireless/prism54/islpci_dev.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/prism54/islpci_dev.c Wed Mar 17 19:29:09 2004 @@ -245,7 +245,7 @@ islpci_open(struct net_device *ndev) { u32 rc; - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); printk(KERN_DEBUG "%s: islpci_open()\n", ndev->name); @@ -265,7 +265,7 @@ static int islpci_close(struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); printk(KERN_DEBUG "%s: islpci_close ()\n", ndev->name); @@ -491,7 +491,7 @@ struct net_device_stats * islpci_statistics(struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); #if VERBOSE > SHOW_ERROR_MESSAGES DEBUG(SHOW_FUNCTION_CALLS, "islpci_statistics \n"); diff -Nru a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c --- a/drivers/net/wireless/prism54/islpci_eth.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/prism54/islpci_eth.c Wed Mar 17 19:29:09 2004 @@ -63,6 +63,7 @@ priv->pci_map_tx_address[index], skb->len, PCI_DMA_TODEVICE); dev_kfree_skb_irq(skb); + skb = NULL; } /* increment the free data low queue pointer */ priv->free_data_tx++; @@ -72,7 +73,7 @@ int islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); isl38xx_control_block *cb = priv->control_block; u32 index; dma_addr_t pci_map_address; @@ -238,6 +239,7 @@ drop_free: /* free the skbuf structure before aborting */ dev_kfree_skb(skb); + skb = NULL; priv->statistics.tx_dropped++; spin_unlock_irqrestore(&priv->slock, flags); @@ -346,8 +348,10 @@ skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5]); #endif - if (discard) + if (discard) { dev_kfree_skb(skb); + skb = NULL; + } else netif_rx(skb); @@ -388,6 +392,7 @@ /* free the skbuf structure before aborting */ dev_kfree_skb((struct sk_buff *) skb); + skb = NULL; break; } /* update the fragment address */ @@ -411,7 +416,7 @@ void islpci_eth_tx_timeout(struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); struct net_device_stats *statistics = &priv->statistics; /* increment the transmit error counter */ diff -Nru a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c --- a/drivers/net/wireless/prism54/islpci_hotplug.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/prism54/islpci_hotplug.c Wed Mar 17 19:29:09 2004 @@ -29,10 +29,10 @@ #include "isl_oid.h" #define DRV_NAME "prism54" -#define DRV_VERSION "1.0.2.2" +#define DRV_VERSION "1.1" -MODULE_AUTHOR("W.Termorshuizen, R.Bastings, H.V.Riedel, prism54.org team"); -MODULE_DESCRIPTION("Intersil 802.11 Wireless LAN adapter"); +MODULE_AUTHOR("[Intersil] R.Bastings and W.Termorshuizen, The prism54.org Development Team "); +MODULE_DESCRIPTION("The Prism54 802.11 Wireless LAN adapter"); MODULE_LICENSE("GPL"); /* In this order: vendor, device, subvendor, subdevice, class, class_mask, @@ -97,6 +97,11 @@ 0, 0, (unsigned long) "SMC 2802Wv2"}, { + PCIVENDOR_INTERSIL, PCIDEVICE_ISL3890, + PCIVENDOR_SMC, 0xa835UL, + 0, 0, + (unsigned long) "SMC 2835Wv2"}, + { PCIVENDOR_INTERSIL, PCIDEVICE_ISL3877, PCI_ANY_ID, PCI_ANY_ID, 0, 0, @@ -133,7 +138,7 @@ islpci_private *priv; char *modelp; - priv = ndev->priv; + priv = netdev_priv(ndev); switch (priv->pdev->subsystem_device) { case PCIDEVICE_ISL3877: modelp = "PRISM Indigo"; @@ -159,6 +164,9 @@ case 0x2835UL: modelp = "SMC2835W"; break; + case 0xa835UL: + modelp = "SMC2835W V2"; + break; /* Let's leave this one out for now since it seems bogus/wrong * Even if the manufacturer did use 0x0000UL it may not be correct * by their part, therefore deserving no name ;) */ @@ -269,7 +277,7 @@ goto do_pci_release_regions; } - priv = ndev->priv; + priv = netdev_priv(ndev); islpci_set_state(priv, PRV_STATE_PREBOOT); /* we are attempting to boot */ /* card is in unknown state yet, might have some interrupts pending */ @@ -314,7 +322,7 @@ prism54_remove(struct pci_dev *pdev) { struct net_device *ndev = pci_get_drvdata(pdev); - islpci_private *priv = ndev ? ndev->priv : 0; + islpci_private *priv = ndev ? netdev_priv(ndev) : 0; BUG_ON(!priv); if (!__in_cleanup_module) { @@ -355,7 +363,7 @@ prism54_suspend(struct pci_dev *pdev, u32 state) { struct net_device *ndev = pci_get_drvdata(pdev); - islpci_private *priv = ndev ? ndev->priv : 0; + islpci_private *priv = ndev ? netdev_priv(ndev) : 0; BUG_ON(!priv); printk(KERN_NOTICE "%s: got suspend request (state %d)\n", @@ -380,7 +388,7 @@ prism54_resume(struct pci_dev *pdev) { struct net_device *ndev = pci_get_drvdata(pdev); - islpci_private *priv = ndev ? ndev->priv : 0; + islpci_private *priv = ndev ? netdev_priv(ndev) : 0; BUG_ON(!priv); printk(KERN_NOTICE "%s: got resume request\n", ndev->name); diff -Nru a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c --- a/drivers/net/wireless/prism54/islpci_mgt.c Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/prism54/islpci_mgt.c Wed Mar 17 19:29:09 2004 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -38,7 +39,7 @@ Global variable definition section ******************************************************************************/ int pc_debug = VERBOSE; -MODULE_PARM(pc_debug, "i"); +module_param(pc_debug, int, 0); /****************************************************************************** Driver general functions @@ -106,7 +107,7 @@ int islpci_mgmt_rx_fill(struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); isl38xx_control_block *cb = /* volatile not needed */ (isl38xx_control_block *) priv->control_block; u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]); @@ -165,7 +166,7 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid, void *data, int length) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); isl38xx_control_block *cb = (isl38xx_control_block *) priv->control_block; void *p; @@ -271,7 +272,7 @@ int islpci_mgt_receive(struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); isl38xx_control_block *cb = (isl38xx_control_block *) priv->control_block; u32 curr_frag; @@ -414,7 +415,7 @@ void islpci_mgt_cleanup_transmit(struct net_device *ndev) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); isl38xx_control_block *cb = /* volatile not needed */ (isl38xx_control_block *) priv->control_block; u32 curr_frag; @@ -451,7 +452,7 @@ void *senddata, int sendlen, struct islpci_mgmtframe **recvframe) { - islpci_private *priv = ndev->priv; + islpci_private *priv = netdev_priv(ndev); const long wait_cycle_jiffies = (ISL38XX_WAIT_CYCLE * 10 * HZ) / 1000; long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies; int err; diff -Nru a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h --- a/drivers/net/wireless/prism54/islpci_mgt.h Wed Mar 17 19:29:09 2004 +++ b/drivers/net/wireless/prism54/islpci_mgt.h Wed Mar 17 19:29:09 2004 @@ -87,11 +87,13 @@ #define CARD_DEFAULT_KEY4 "default_key_4" #define CARD_DEFAULT_WEP 0 #define CARD_DEFAULT_FILTER 0 -# define CARD_DEFAULT_WDS 0 +#define CARD_DEFAULT_WDS 0 #define CARD_DEFAULT_AUTHEN DOT11_AUTH_OS #define CARD_DEFAULT_DOT1X 0 #define CARD_DEFAULT_MLME_MODE DOT11_MLME_AUTO #define CARD_DEFAULT_CONFORMANCE OID_INL_CONFORMANCE_NONE +#define CARD_DEFAULT_PROFILE DOT11_PROFILE_MIXED_G_WIFI +#define CARD_DEFAULT_MAXFRAMEBURST DOT11_MAXFRAMEBURST_MIXED_SAFE /* PIMFOR package definitions */ #define PIMFOR_ETHERTYPE 0x8828 diff -Nru a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c --- a/drivers/net/wireless/prism54/oid_mgt.c Wed Mar 17 19:29:10 2004 +++ b/drivers/net/wireless/prism54/oid_mgt.c Wed Mar 17 19:29:10 2004 @@ -97,7 +97,7 @@ [DOT11_OID_ALOFT_CONFIG] = OID_UNKNOWN(0x1d000006), [DOT11_OID_VDCFX] = {0x1b000000, 7, 0, 0}, - [DOT11_OID_MAXFRAMEBURST] = OID_U32(0x1b000008), + [DOT11_OID_MAXFRAMEBURST] = OID_U32(0x1b000008), /* in microseconds */ [DOT11_OID_PSM] = OID_U32(0x14000000), [DOT11_OID_CAMTIMEOUT] = OID_U32(0x14000001), diff -Nru a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c --- a/drivers/pci/hotplug/rpaphp_core.c Wed Mar 17 19:29:10 2004 +++ b/drivers/pci/hotplug/rpaphp_core.c Wed Mar 17 19:29:10 2004 @@ -31,6 +31,7 @@ #include #include #include +#include /* for eeh_add_device() */ #include /* rtas_call */ #include /* for pci_controller */ #include "../pci.h" /* for pci_add_new_bus*/ diff -Nru a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig --- a/drivers/s390/block/Kconfig Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/block/Kconfig Wed Mar 17 19:29:09 2004 @@ -48,12 +48,12 @@ say "Y". config DASD_DIAG - tristate "Support for DIAG access to CMS reserved Disks" + tristate "Support for DIAG access to Disks" depends on DASD && ARCH_S390X = 'n' help - Select this option if you want to use CMS reserved Disks under VM - with the Diagnose250 command. If you are not running under VM or - unsure what it is, say "N". + Select this option if you want to use Diagnose250 command to access + Disks under VM. If you are not running under VM or unsure what it is, + say "N". config DASD_CMB tristate "Compatibility interface for DASD channel measurement blocks" diff -Nru a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c --- a/drivers/s390/block/dasd.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/block/dasd.c Wed Mar 17 19:29:09 2004 @@ -7,7 +7,7 @@ * Bugreports.to..: * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001 * - * $Revision: 1.129 $ + * $Revision: 1.133 $ */ #include @@ -1655,11 +1655,24 @@ { struct gendisk *disk = inp->i_bdev->bd_disk; struct dasd_device *device = disk->private_data; - int rc; + int old_count, rc; + + /* + * We use a negative value in open_count to indicate that + * the device must not be used. + */ + do { + old_count = atomic_read(&device->open_count); + if (old_count < 0) + return -ENODEV; + } while (atomic_compare_and_swap(old_count, old_count + 1, + &device->open_count)); + + if (!try_module_get(device->discipline->owner)) { + rc = -EINVAL; + goto unlock; + } - if (!try_module_get(device->discipline->owner)) - return -EINVAL; - if (dasd_probeonly) { MESSAGE(KERN_INFO, "No access to device %s due to probeonly mode", @@ -1676,11 +1689,12 @@ goto out; } - atomic_inc(&device->open_count); return 0; out: module_put(device->discipline->owner); +unlock: + atomic_dec(&device->open_count); return rc; } @@ -1741,7 +1755,7 @@ ret = dasd_add_sysfs_files(cdev); if (ret) { printk(KERN_WARNING - "dasd_generic_probe: could not add driverfs entries" + "dasd_generic_probe: could not add sysfs entries " "for %s\n", cdev->dev.bus_id); } @@ -1757,8 +1771,15 @@ { struct dasd_device *device; + dasd_remove_sysfs_files(cdev); device = dasd_device_from_cdev(cdev); if (!IS_ERR(device)) { + /* + * This device is removed unconditionally. Set open_count + * to -1 to prevent dasd_open from opening it while it is + * no quite down yet. + */ + atomic_set(&device->open_count,-1); dasd_set_target_state(device, DASD_STATE_NEW); /* dasd_delete_device destroys the device reference. */ dasd_delete_device(device); @@ -1830,15 +1851,23 @@ struct dasd_device *device; device = dasd_device_from_cdev(cdev); - if (atomic_read(&device->open_count) > 0) { + /* + * We must make sure that this device is currently not in use + * (current open_count == 0 ). We set open_count to -1 to indicate + * that from now on set_offline is in progress and the device must + * not be used otherwise. + */ + if (atomic_compare_and_swap(0, -1, &device->open_count)) { printk (KERN_WARNING "Can't offline dasd device with open" " count = %i.\n", atomic_read(&device->open_count)); dasd_put_device(device); return -EBUSY; } - dasd_put_device(device); - dasd_generic_remove (cdev); + dasd_set_target_state(device, DASD_STATE_NEW); + /* dasd_delete_device destroys the device reference. */ + dasd_delete_device(device); + return 0; } diff -Nru a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c --- a/drivers/s390/block/dasd_devmap.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/block/dasd_devmap.c Wed Mar 17 19:29:09 2004 @@ -11,7 +11,7 @@ * functions may not be called from interrupt context. In particular * dasd_get_device is a no-no from interrupt context. * - * $Revision: 1.25 $ + * $Revision: 1.26 $ */ #include @@ -680,6 +680,13 @@ { return sysfs_create_group(&cdev->dev.kobj, &dasd_attr_group); } + +void +dasd_remove_sysfs_files(struct ccw_device *cdev) +{ + sysfs_remove_group(&cdev->dev.kobj, &dasd_attr_group); +} + int dasd_devmap_init(void) diff -Nru a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c --- a/drivers/s390/block/dasd_diag.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/block/dasd_diag.c Wed Mar 17 19:29:09 2004 @@ -6,7 +6,7 @@ * Bugreports.to..: * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 * - * $Revision: 1.33 $ + * $Revision: 1.34 $ */ #include @@ -173,7 +173,6 @@ if (!ip) { /* no intparm: unsolicited interrupt */ MESSAGE(KERN_DEBUG, "%s", "caught unsolicited interrupt"); - irq_exit(); return; } cqr = (struct dasd_ccw_req *)(addr_t) ip; @@ -183,7 +182,6 @@ " magic number of dasd_ccw_req 0x%08X doesn't" " match discipline 0x%08X", cqr->magic, *(int *) (&device->discipline->name)); - irq_exit(); return; } diff -Nru a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h --- a/drivers/s390/block/dasd_int.h Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/block/dasd_int.h Wed Mar 17 19:29:09 2004 @@ -6,7 +6,7 @@ * Bugreports.to..: * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 * - * $Revision: 1.54 $ + * $Revision: 1.55 $ */ #ifndef DASD_INT_H @@ -485,6 +485,8 @@ void dasd_delete_device(struct dasd_device *); int dasd_add_sysfs_files(struct ccw_device *); +void dasd_remove_sysfs_files(struct ccw_device *); + struct dasd_device *dasd_device_from_cdev(struct ccw_device *); struct dasd_device *dasd_device_from_devindex(int); diff -Nru a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile --- a/drivers/s390/char/Makefile Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/char/Makefile Wed Mar 17 19:29:09 2004 @@ -18,6 +18,6 @@ tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o tape-$(CONFIG_PROC_FS) += tape_proc.o -tape-objs := tape_core.o tape_std.o tape_char.o tape_class.o $(tape-y) -obj-$(CONFIG_S390_TAPE) += tape.o +tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y) +obj-$(CONFIG_S390_TAPE) += tape.o tape_class.o obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o diff -Nru a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c --- a/drivers/s390/char/sclp.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/char/sclp.c Wed Mar 17 19:29:09 2004 @@ -335,8 +335,8 @@ unsigned long psw_mask; unsigned long cr0, cr0_sync; - /* Need to irq_enter() to prevent BH from executing. */ - irq_enter(); + /* Prevent BH from executing. */ + local_bh_disable(); /* * save cr0 * enable service signal external interruption (cr0.22) @@ -365,7 +365,7 @@ /* restore cr0 */ __ctl_load(cr0, 0, 0); - irq_exit(); + __local_bh_enable(); } /* diff -Nru a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h --- a/drivers/s390/char/tape.h Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/char/tape.h Wed Mar 17 19:29:09 2004 @@ -199,8 +199,8 @@ struct list_head node; struct ccw_device * cdev; - struct cdev * nt; - struct cdev * rt; + struct tape_class_device * nt; + struct tape_class_device * rt; /* Device discipline information. */ struct tape_discipline * discipline; diff -Nru a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c --- a/drivers/s390/char/tape_char.c Wed Mar 17 19:29:10 2004 +++ b/drivers/s390/char/tape_char.c Wed Mar 17 19:29:10 2004 @@ -48,38 +48,29 @@ static int tapechar_major = TAPECHAR_MAJOR; -struct cdev * -tapechar_register_tape_dev(struct tape_device *device, char *name, int i) -{ - struct cdev * cdev; - char devname[11]; - - sprintf(devname, "%s%i", name, i / 2); - cdev = register_tape_dev( - &device->cdev->dev, - MKDEV(tapechar_major, i), - &tape_fops, - devname - ); - - return ((IS_ERR(cdev)) ? NULL : cdev); -} - /* * This function is called for every new tapedevice */ int tapechar_setup_device(struct tape_device * device) { - device->nt = tapechar_register_tape_dev( - device, - "ntibm", - device->first_minor + char device_name[20]; + + sprintf(device_name, "ntibm%i", device->first_minor / 2); + device->nt = register_tape_dev( + &device->cdev->dev, + MKDEV(tapechar_major, device->first_minor), + &tape_fops, + device_name, + "non-rewinding" ); - device->rt = tapechar_register_tape_dev( - device, - "rtibm", - device->first_minor + 1 + device_name[0] = 'r'; + device->rt = register_tape_dev( + &device->cdev->dev, + MKDEV(tapechar_major, device->first_minor + 1), + &tape_fops, + device_name, + "rewinding" ); return 0; @@ -500,9 +491,6 @@ tapechar_major = MAJOR(dev); PRINT_INFO("tape gets major %d for character devices\n", MAJOR(dev)); -#ifdef TAPE390_INTERNAL_CLASS - tape_setup_class(); -#endif return 0; } @@ -512,9 +500,6 @@ void tapechar_exit(void) { -#ifdef TAPE390_INTERNAL_CLASS - tape_cleanup_class(); -#endif PRINT_INFO("tape releases major %d for character devices\n", tapechar_major); unregister_chrdev_region(MKDEV(tapechar_major, 0), 256); diff -Nru a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c --- a/drivers/s390/char/tape_class.c Wed Mar 17 19:29:10 2004 +++ b/drivers/s390/char/tape_class.c Wed Mar 17 19:29:10 2004 @@ -1,4 +1,7 @@ /* + * (C) Copyright IBM Corp. 2004 + * tape_class.c ($Revision: 1.6 $) + * * Tape class device support * * Author: Stefan Bader @@ -6,11 +9,12 @@ */ #include "tape_class.h" -#ifndef TAPE390_INTERNAL_CLASS MODULE_AUTHOR("Stefan Bader "); -MODULE_DESCRIPTION("Tape class"); +MODULE_DESCRIPTION( + "(C) Copyright IBM Corp. 2004 All Rights Reserved.\n" + "tape_class.c ($Revision: 1.6 $)" +); MODULE_LICENSE("GPL"); -#endif struct class_simple *tape_class; @@ -29,69 +33,94 @@ * devname * The pointer to the name of the character device. */ -struct cdev *register_tape_dev( +struct tape_class_device *register_tape_dev( struct device * device, dev_t dev, struct file_operations *fops, - char * devname -) { - struct cdev * cdev; + char * device_name, + char * mode_name) +{ + struct tape_class_device * tcd; int rc; char * s; - cdev = cdev_alloc(); - if (!cdev) + tcd = kmalloc(sizeof(struct tape_class_device), GFP_KERNEL); + if (!tcd) return ERR_PTR(-ENOMEM); - cdev->owner = fops->owner; - cdev->ops = fops; - cdev->dev = dev; - - rc = cdev_add(cdev, cdev->dev, 1); - if (rc) { - cdev_del(cdev); - return ERR_PTR(rc); + memset(tcd, 0, sizeof(struct tape_class_device)); + strncpy(tcd->device_name, device_name, TAPECLASS_NAME_LEN); + for (s = strchr(tcd->device_name, '/'); s; s = strchr(s, '/')) + *s = '!'; + strncpy(tcd->mode_name, mode_name, TAPECLASS_NAME_LEN); + for (s = strchr(tcd->mode_name, '/'); s; s = strchr(s, '/')) + *s = '!'; + + tcd->char_device = cdev_alloc(); + if (!tcd->char_device) { + rc = -ENOMEM; + goto fail_with_tcd; } - class_simple_device_add(tape_class, cdev->dev, device, "%s", devname); - return cdev; + tcd->char_device->owner = fops->owner; + tcd->char_device->ops = fops; + tcd->char_device->dev = dev; + + rc = cdev_add(tcd->char_device, tcd->char_device->dev, 1); + if (rc) + goto fail_with_cdev; + + tcd->class_device = class_simple_device_add( + tape_class, + tcd->char_device->dev, + device, + "%s", tcd->device_name + ); + sysfs_create_link( + &device->kobj, + &tcd->class_device->kobj, + tcd->mode_name + ); + + return tcd; + +fail_with_cdev: + cdev_del(&tcd->char_device); + +fail_with_tcd: + kfree(tcd); + + return ERR_PTR(rc); } EXPORT_SYMBOL(register_tape_dev); -void unregister_tape_dev(struct cdev *cdev) +void unregister_tape_dev(struct tape_class_device *tcd) { - if (cdev != NULL) { - class_simple_device_remove(cdev->dev); - cdev_del(cdev); + if (tcd != NULL && !IS_ERR(tcd)) { + sysfs_remove_link( + &tcd->class_device->dev->kobj, + tcd->mode_name + ); + class_simple_device_remove(tcd->char_device->dev); + cdev_del(tcd->char_device); + kfree(tcd); } } EXPORT_SYMBOL(unregister_tape_dev); -#ifndef TAPE390_INTERNAL_CLASS static int __init tape_init(void) -#else -int tape_setup_class(void) -#endif { tape_class = class_simple_create(THIS_MODULE, "tape390"); + return 0; } -#ifndef TAPE390_INTERNAL_CLASS static void __exit tape_exit(void) -#else -void tape_cleanup_class(void) -#endif { class_simple_destroy(tape_class); tape_class = NULL; } -#ifndef TAPE390_INTERNAL_CLASS postcore_initcall(tape_init); module_exit(tape_exit); -#else -EXPORT_SYMBOL(tape_setup_class); -EXPORT_SYMBOL(tape_cleanup_class); -#endif diff -Nru a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h --- a/drivers/s390/char/tape_class.h Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/char/tape_class.h Wed Mar 17 19:29:09 2004 @@ -1,4 +1,7 @@ /* + * (C) Copyright IBM Corp. 2004 All Rights Reserved. + * tape_class.h ($Revision: 1.4 $) + * * Tape class device support * * Author: Stefan Bader @@ -7,11 +10,8 @@ #ifndef __TAPE_CLASS_H__ #define __TAPE_CLASS_H__ -#if 0 #include #include -#endif - #include #include #include @@ -21,34 +21,41 @@ #include #include -#define TAPE390_INTERNAL_CLASS +#define TAPECLASS_NAME_LEN 32 + +struct tape_class_device { + struct cdev * char_device; + struct class_device * class_device; + char device_name[TAPECLASS_NAME_LEN]; + char mode_name[TAPECLASS_NAME_LEN]; +}; /* - * Register a tape device and return a pointer to the cdev structure. + * Register a tape device and return a pointer to the tape class device + * created by the call. * * device * The pointer to the struct device of the physical (base) device. - * drivername - * The pointer to the drivers name for it's character devices. * dev * The intended major/minor number. The major number may be 0 to * get a dynamic major number. * fops * The pointer to the drivers file operations for the tape device. - * devname - * The pointer to the name of the character device. + * device_name + * Pointer to the logical device name (will also be used as kobject name + * of the cdev). This can also be called the name of the tape class + * device. + * mode_name + * Points to the name of the tape mode. This creates a link with that + * name from the physical device to the logical device (class). */ -struct cdev *register_tape_dev( +struct tape_class_device *register_tape_dev( struct device * device, dev_t dev, struct file_operations *fops, - char * devname + char * device_name, + char * node_name ); -void unregister_tape_dev(struct cdev *cdev); - -#ifdef TAPE390_INTERNAL_CLASS -int tape_setup_class(void); -void tape_cleanup_class(void); -#endif +void unregister_tape_dev(struct tape_class_device *tcd); #endif /* __TAPE_CLASS_H__ */ diff -Nru a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c --- a/drivers/s390/cio/blacklist.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/cio/blacklist.c Wed Mar 17 19:29:09 2004 @@ -1,7 +1,7 @@ /* * drivers/s390/cio/blacklist.c * S/390 common I/O routines -- blacklisting of specific devices - * $Revision: 1.29 $ + * $Revision: 1.31 $ * * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation @@ -72,7 +72,10 @@ blacklist_busid(char **str, int *id0, int *id1, int *devno) { int val, old_style; - + char *sav; + + sav = *str; + /* check for leading '0x' */ old_style = 0; if ((*str)[0] == '0' && (*str)[1] == 'x') { @@ -80,44 +83,54 @@ old_style = 1; } if (!isxdigit((*str)[0])) /* We require at least one hex digit */ - return -EINVAL; + goto confused; val = simple_strtoul(*str, str, 16); if (old_style || (*str)[0] != '.') { *id0 = *id1 = 0; if (val < 0 || val > 0xffff) - return -EINVAL; + goto confused; *devno = val; + if ((*str)[0] != ',' && (*str)[0] != '-' && + (*str)[0] != '\n' && (*str)[0] != '\0') + goto confused; return 0; } /* New style x.y.z busid */ if (val < 0 || val > 0xff) - return -EINVAL; + goto confused; *id0 = val; (*str)++; if (!isxdigit((*str)[0])) /* We require at least one hex digit */ - return -EINVAL; + goto confused; val = simple_strtoul(*str, str, 16); if (val < 0 || val > 0xff || (*str)++[0] != '.') - return -EINVAL; + goto confused; *id1 = val; if (!isxdigit((*str)[0])) /* We require at least one hex digit */ - return -EINVAL; + goto confused; val = simple_strtoul(*str, str, 16); if (val < 0 || val > 0xffff) - return -EINVAL; + goto confused; *devno = val; + if ((*str)[0] != ',' && (*str)[0] != '-' && + (*str)[0] != '\n' && (*str)[0] != '\0') + goto confused; return 0; +confused: + strsep(str, ",\n"); + printk(KERN_WARNING "Invalid cio_ignore parameter '%s'\n", sav); + return 1; } static inline int blacklist_parse_parameters (char *str, range_action action) { unsigned int from, to, from_id0, to_id0, from_id1, to_id1; - char *sav; - sav = str; while (*str != 0 && *str != '\n') { range_action ra = action; + while(*str == ',') + str++; if (*str == '!') { ra = !action; ++str; @@ -138,32 +151,37 @@ rc = blacklist_busid(&str, &from_id0, &from_id1, &from); if (rc) - goto out_err; + continue; to = from; to_id0 = from_id0; to_id1 = from_id1; if (*str == '-') { str++; - rc = blacklist_busid(&str, &to_id0, &to_id1, - &to); + rc = blacklist_busid(&str, &to_id0, + &to_id1, &to); if (rc) - goto out_err; + continue; + } + if (*str == '-') { + printk(KERN_WARNING "invalid cio_ignore " + "parameter '%s'\n", + strsep(&str, ",\n")); + continue; + } + if ((from_id0 != to_id0) || (from_id1 != to_id1)) { + printk(KERN_WARNING "invalid cio_ignore range " + "%x.%x.%04x-%x.%x.%04x\n", + from_id0, from_id1, from, + to_id0, to_id1, to); + continue; } - if ((from_id0 != to_id0) || (from_id1 != to_id1)) - goto out_err; } /* FIXME: ignoring id0 and id1 here. */ pr_debug("blacklist_setup: adding range " "from 0.0.%04x to 0.0.%04x\n", from, to); blacklist_range (ra, from, to); - - if (*str == ',') - str++; } return 1; -out_err: - printk(KERN_WARNING "blacklist_setup: error parsing \"%s\"\n", sav); - return 0; } /* Parsing the commandline for blacklist parameters, e.g. to blacklist diff -Nru a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h --- a/drivers/s390/cio/css.h Wed Mar 17 19:29:10 2004 +++ b/drivers/s390/cio/css.h Wed Mar 17 19:29:10 2004 @@ -82,6 +82,7 @@ unsigned int dosense:1; /* delayed SENSE required */ unsigned int doverify:1; /* delayed path verification */ unsigned int donotify:1; /* call notify function */ + unsigned int recog_done:1; /* dev. recog. complete */ } __attribute__((packed)) flags; unsigned long intparm; /* user interruption parameter */ struct qdio_irq *qdio_data; diff -Nru a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c --- a/drivers/s390/cio/device.c Wed Mar 17 19:29:10 2004 +++ b/drivers/s390/cio/device.c Wed Mar 17 19:29:10 2004 @@ -1,7 +1,7 @@ /* * drivers/s390/cio/device.c * bus driver for ccw devices - * $Revision: 1.107 $ + * $Revision: 1.110 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation @@ -263,10 +263,10 @@ if (!cdev) return -ENODEV; - if (!cdev->online) + if (!cdev->online || !cdev->drv) return -EINVAL; - if (cdev->drv && cdev->drv->set_offline) { + if (cdev->drv->set_offline) { ret = cdev->drv->set_offline(cdev); if (ret != 0) return ret; @@ -292,7 +292,7 @@ if (!cdev) return -ENODEV; - if (cdev->online) + if (cdev->online || !cdev->drv) return -EINVAL; spin_lock_irq(cdev->ccwlock); @@ -307,8 +307,7 @@ } if (cdev->private->state != DEV_STATE_ONLINE) return -ENODEV; - if (!cdev->drv || !cdev->drv->set_online || - cdev->drv->set_online(cdev) == 0) { + if (!cdev->drv->set_online || cdev->drv->set_online(cdev) == 0) { cdev->online = 1; return 0; } @@ -327,7 +326,7 @@ online_store (struct device *dev, const char *buf, size_t count) { struct ccw_device *cdev = to_ccwdev(dev); - int i, force; + int i, force, ret; char *tmp; if (atomic_compare_and_swap(0, 1, &cdev->private->onoff)) @@ -347,29 +346,46 @@ if (i == 1) { /* Do device recognition, if needed. */ if (cdev->id.cu_type == 0) { - ccw_device_recognition(cdev); + ret = ccw_device_recognition(cdev); + if (ret) { + printk(KERN_WARNING"Couldn't start recognition " + "for device %s (ret=%d)\n", + cdev->dev.bus_id, ret); + goto out; + } wait_event(cdev->private->wait_q, - dev_fsm_final_state(cdev)); + cdev->private->flags.recog_done); } - ccw_device_set_online(cdev); + if (cdev->drv && cdev->drv->set_online) + ccw_device_set_online(cdev); } else if (i == 0) { if (cdev->private->state == DEV_STATE_DISCONNECTED) ccw_device_remove_disconnected(cdev); - else + else if (cdev->drv && cdev->drv->set_offline) ccw_device_set_offline(cdev); } if (force && cdev->private->state == DEV_STATE_BOXED) { - int ret; ret = ccw_device_stlck(cdev); - if (ret) + if (ret) { + printk(KERN_WARNING"ccw_device_stlck for device %s " + "returned %d!\n", cdev->dev.bus_id, ret); goto out; + } /* Do device recognition, if needed. */ if (cdev->id.cu_type == 0) { - ccw_device_recognition(cdev); + cdev->private->state = DEV_STATE_NOT_OPER; + ret = ccw_device_recognition(cdev); + if (ret) { + printk(KERN_WARNING"Couldn't start recognition " + "for device %s (ret=%d)\n", + cdev->dev.bus_id, ret); + goto out; + } wait_event(cdev->private->wait_q, - dev_fsm_final_state(cdev)); + cdev->private->flags.recog_done); } - ccw_device_set_online(cdev); + if (cdev->drv && cdev->drv->set_online) + ccw_device_set_online(cdev); } out: if (cdev->drv) @@ -530,7 +546,9 @@ __func__, sch->dev.bus_id); put_device(&cdev->dev); out: + cdev->private->flags.recog_done = 1; put_device(&sch->dev); + wake_up(&cdev->private->wait_q); } static void @@ -555,10 +573,13 @@ { struct subchannel *sch; - if (css_init_done == 0) + if (css_init_done == 0) { + cdev->private->flags.recog_done = 1; return; + } switch (cdev->private->state) { case DEV_STATE_NOT_OPER: + cdev->private->flags.recog_done = 1; /* Remove device found not operational. */ if (!get_device(&cdev->dev)) break; diff -Nru a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c --- a/drivers/s390/cio/device_fsm.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/cio/device_fsm.c Wed Mar 17 19:29:09 2004 @@ -148,6 +148,7 @@ struct subchannel *sch; sch = to_subchannel(cdev->dev.parent); + cdev->private->flags.recog_done = 1; /* * Check if cu type and device type still match. If * not, it is certainly another device and we have to @@ -217,6 +218,7 @@ __recover_lost_chpids(sch, old_lpm); if (cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID) { if (state == DEV_STATE_NOT_OPER) { + cdev->private->flags.recog_done = 1; cdev->private->state = DEV_STATE_DISCONNECTED; return; } @@ -393,6 +395,7 @@ * timeout (or if sense pgid during path verification detects the device * is locked, as may happen on newer devices). */ + cdev->private->flags.recog_done = 0; cdev->private->state = DEV_STATE_SENSE_ID; ccw_device_sense_id_start(cdev); return 0; diff -Nru a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c --- a/drivers/s390/cio/device_ops.c Wed Mar 17 19:29:10 2004 +++ b/drivers/s390/cio/device_ops.c Wed Mar 17 19:29:10 2004 @@ -79,7 +79,8 @@ if (cdev->private->state == DEV_STATE_NOT_OPER) return -ENODEV; if (cdev->private->state != DEV_STATE_ONLINE || - sch->schib.scsw.actl != 0 || + ((sch->schib.scsw.stctl & SCSW_STCTL_PRIM_STATUS) && + !(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)) || cdev->private->flags.doverify) return -EBUSY; ret = cio_set_options (sch, flags); @@ -347,7 +348,9 @@ cdev->handler = ccw_device_wake_up; if (cdev->private->state != DEV_STATE_ONLINE) ret = -ENODEV; - else if (sch->schib.scsw.actl != 0 || cdev->private->flags.doverify) + else if (((sch->schib.scsw.stctl & SCSW_STCTL_PRIM_STATUS) && + !(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)) || + cdev->private->flags.doverify) ret = -EBUSY; else /* 0x00D9C4C3 == ebcdic "RDC" */ @@ -414,7 +417,9 @@ cdev->handler = ccw_device_wake_up; if (cdev->private->state != DEV_STATE_ONLINE) ret = -ENODEV; - else if (sch->schib.scsw.actl != 0 || cdev->private->flags.doverify) + else if (((sch->schib.scsw.stctl & SCSW_STCTL_PRIM_STATUS) && + !(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)) || + cdev->private->flags.doverify) ret = -EBUSY; else /* 0x00D9C3C4 == ebcdic "RCD" */ @@ -441,12 +446,12 @@ } /* - * Try to issue an unconditional reserve on a boxed device. + * Try to break the lock on a boxed device. */ int ccw_device_stlck(struct ccw_device *cdev) { - char buf[32]; + void *buf, *buf2; unsigned long flags; struct subchannel *sch; int ret; @@ -462,16 +467,30 @@ CIO_TRACE_EVENT(2, "stl lock"); CIO_TRACE_EVENT(2, cdev->dev.bus_id); + buf = kmalloc(32*sizeof(char), GFP_DMA|GFP_KERNEL); + if (!buf) + return -ENOMEM; + buf2 = kmalloc(32*sizeof(char), GFP_DMA|GFP_KERNEL); + if (!buf2) { + kfree(buf); + return -ENOMEM; + } spin_lock_irqsave(&sch->lock, flags); ret = cio_enable_subchannel(sch, 3); if (ret) goto out_unlock; - /* Setup ccw. This cmd code seems not to be in use elsewhere. */ + /* + * Setup ccw. We chain an unconditional reserve and a release so we + * only break the lock. + */ cdev->private->iccws[0].cmd_code = CCW_CMD_STLCK; cdev->private->iccws[0].cda = (__u32) __pa(buf); cdev->private->iccws[0].count = 32; - cdev->private->iccws[0].flags = CCW_FLAG_SLI; - + cdev->private->iccws[0].flags = CCW_FLAG_CC; + cdev->private->iccws[1].cmd_code = CCW_CMD_RELEASE; + cdev->private->iccws[1].cda = (__u32) __pa(buf2); + cdev->private->iccws[1].count = 32; + cdev->private->iccws[1].flags = 0; ret = cio_start(sch, cdev->private->iccws, 0); if (ret) { cio_disable_subchannel(sch); //FIXME: return code? @@ -486,10 +505,13 @@ (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) || (cdev->private->irb.scsw.cstat != 0)) ret = -EIO; - /* Clear irb. */ memset(&cdev->private->irb, 0, sizeof(struct irb)); out_unlock: + if (buf) + kfree(buf); + if (buf2) + kfree(buf2); spin_unlock_irqrestore(&sch->lock, flags); return ret; } diff -Nru a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c --- a/drivers/s390/cio/device_status.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/cio/device_status.c Wed Mar 17 19:29:09 2004 @@ -99,7 +99,7 @@ static inline int ccw_device_accumulate_esw_valid(struct irb *irb) { - if (irb->scsw.eswf && irb->scsw.stctl == SCSW_STCTL_STATUS_PEND) + if (!irb->scsw.eswf && irb->scsw.stctl == SCSW_STCTL_STATUS_PEND) return 0; if (irb->scsw.stctl == (SCSW_STCTL_INTER_STATUS|SCSW_STCTL_STATUS_PEND) && diff -Nru a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c --- a/drivers/s390/cio/qdio.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/cio/qdio.c Wed Mar 17 19:29:09 2004 @@ -56,7 +56,7 @@ #include "ioasm.h" #include "chsc.h" -#define VERSION_QDIO_C "$Revision: 1.74 $" +#define VERSION_QDIO_C "$Revision: 1.78 $" /****************** MODULE PARAMETER VARIABLES ********************/ MODULE_AUTHOR("Utz Bacher "); @@ -545,6 +545,7 @@ qdio_kick_outbound_q(struct qdio_q *q) { int result; + char dbf_text[15]; QDIO_DBF_TEXT4(0,trace,"kickoutq"); QDIO_DBF_HEX4(0,trace,&q,sizeof(void*)); @@ -552,15 +553,75 @@ if (!q->siga_out) return; - result=qdio_siga_output(q); + /* here's the story with cc=2 and busy bit set (thanks, Rick): + * VM's CP could present us cc=2 and busy bit set on SIGA-write + * during reconfiguration of their Guest LAN (only in HIPERS mode, + * QDIO mode is asynchronous -- cc=2 and busy bit there will take + * the queues down immediately; and not being under VM we have a + * problem on cc=2 and busy bit set right away). + * + * Therefore qdio_siga_output will try for a short time constantly, + * if such a condition occurs. If it doesn't change, it will + * increase the busy_siga_counter and save the timestamp, and + * schedule the queue for later processing (via mark_q, using the + * queue tasklet). __qdio_outbound_processing will check out the + * counter. If non-zero, it will call qdio_kick_outbound_q as often + * as the value of the counter. This will attempt further SIGA + * instructions. For each successful SIGA, the counter is + * decreased, for failing SIGAs the counter remains the same, after + * all. + * After some time of no movement, qdio_kick_outbound_q will + * finally fail and reflect corresponding error codes to call + * the upper layer module and have it take the queues down. + * + * Note that this is a change from the original HiperSockets design + * (saying cc=2 and busy bit means take the queues down), but in + * these days Guest LAN didn't exist... excessive cc=2 with busy bit + * conditions will still take the queues down, but the threshold is + * higher due to the Guest LAN environment. + */ - if (!result) - return; - if (q->siga_error) - q->error_status_flags|=QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR; - q->error_status_flags |= QDIO_STATUS_LOOK_FOR_ERROR; - q->siga_error=result; + result=qdio_siga_output(q); + + switch (result) { + case 0: + /* went smooth this time, reset timestamp */ + QDIO_DBF_TEXT3(0,trace,"cc2reslv"); + sprintf(dbf_text,"%4x%2x%2x",q->irq,q->q_no, + atomic_read(&q->busy_siga_counter)); + QDIO_DBF_TEXT3(0,trace,dbf_text); + q->timing.busy_start=0; + break; + case (2|QDIO_SIGA_ERROR_B_BIT_SET): + /* cc=2 and busy bit: */ + atomic_inc(&q->busy_siga_counter); + + /* if the last siga was successful, save + * timestamp here */ + if (!q->timing.busy_start) + q->timing.busy_start=NOW; + + /* if we're in time, don't touch error_status_flags + * and siga_error */ + if (NOW-q->timing.busy_startirq,q->q_no, + atomic_read(&q->busy_siga_counter)); + QDIO_DBF_TEXT3(0,trace,dbf_text); + /* else fallthrough and report error */ + default: + /* for plain cc=1, 2 or 3: */ + if (q->siga_error) + q->error_status_flags|= + QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR; + q->error_status_flags|= + QDIO_STATUS_LOOK_FOR_ERROR; + q->siga_error=result; + } } inline static void @@ -599,6 +660,8 @@ static inline void __qdio_outbound_processing(struct qdio_q *q) { + int siga_attempts; + QDIO_DBF_TEXT4(0,trace,"qoutproc"); QDIO_DBF_HEX4(0,trace,&q,sizeof(void*)); @@ -619,6 +682,14 @@ perf_stats.tl_runs++; #endif /* QDIO_PERFORMANCE_STATS */ + /* see comment in qdio_kick_outbound_q */ + siga_attempts=atomic_read(&q->busy_siga_counter); + while (siga_attempts) { + atomic_dec(&q->busy_siga_counter); + qdio_kick_outbound_q(q); + siga_attempts--; + } + if (qdio_has_outbound_q_moved(q)) qdio_kick_outbound_handler(q); @@ -1368,6 +1439,10 @@ ((irq_ptr->is_thinint_irq)?&tiqdio_inbound_processing: &qdio_inbound_processing); + /* actually this is not used for inbound queues. yet. */ + atomic_set(&q->busy_siga_counter,0); + q->timing.busy_start=0; + /* for (j=0;jtiming.last_transfer_times[j]=(qdio_get_micros()/ QDIO_STATS_NUMBER)*j; @@ -1432,6 +1507,9 @@ q->tasklet.func=(void(*)(unsigned long)) &qdio_outbound_processing; + atomic_set(&q->busy_siga_counter,0); + q->timing.busy_start=0; + /* fill in slib */ if (i>0) irq_ptr->output_qs[i-1]->slib->nsliba= (unsigned long)(q->slib); @@ -2134,7 +2212,7 @@ QDIO_DBF_TEXT0(0,setup,dbf_text); rc = qdio_shutdown(cdev, how); - if (rc == 0) + if ((rc == 0) || (rc == -EINPROGRESS)) rc = qdio_free(cdev); return rc; } @@ -2145,6 +2223,7 @@ struct qdio_irq *irq_ptr; int i; int result = 0; + int rc; unsigned long flags; int timeout; char dbf_text[15]; @@ -2191,27 +2270,23 @@ result=-EINPROGRESS; } - if (result) - goto out; - /* cleanup subchannel */ spin_lock_irqsave(get_ccwdev_lock(cdev),flags); if (how&QDIO_FLAG_CLEANUP_USING_CLEAR) { - result = ccw_device_clear(cdev, QDIO_DOING_CLEANUP); + rc = ccw_device_clear(cdev, QDIO_DOING_CLEANUP); timeout=QDIO_CLEANUP_CLEAR_TIMEOUT; } else if (how&QDIO_FLAG_CLEANUP_USING_HALT) { - result = ccw_device_halt(cdev, QDIO_DOING_CLEANUP); + rc = ccw_device_halt(cdev, QDIO_DOING_CLEANUP); timeout=QDIO_CLEANUP_HALT_TIMEOUT; } else { /* default behaviour */ - result = ccw_device_halt(cdev, QDIO_DOING_CLEANUP); + rc = ccw_device_halt(cdev, QDIO_DOING_CLEANUP); timeout=QDIO_CLEANUP_HALT_TIMEOUT; } - if (result == -ENODEV) { + if (rc == -ENODEV) { /* No need to wait for device no longer present. */ qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE); - result = 0; /* No error. */ spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags); - } else if (result == 0) { + } else if (rc == 0) { qdio_set_state(irq_ptr, QDIO_IRQ_STATE_CLEANUP); ccw_device_set_timeout(cdev, timeout); spin_unlock_irqrestore(get_ccwdev_lock(cdev),flags); @@ -2223,6 +2298,7 @@ QDIO_PRINT_INFO("ccw_device_{halt,clear} returned %d for " "device %s\n", result, cdev->dev.bus_id); spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags); + result = rc; goto out; } if (irq_ptr->is_thinint_irq) { diff -Nru a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h --- a/drivers/s390/cio/qdio.h Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/cio/qdio.h Wed Mar 17 19:29:09 2004 @@ -1,7 +1,7 @@ #ifndef _CIO_QDIO_H #define _CIO_QDIO_H -#define VERSION_CIO_QDIO_H "$Revision: 1.22 $" +#define VERSION_CIO_QDIO_H "$Revision: 1.23 $" //#define QDIO_DBF_LIKE_HELL @@ -33,7 +33,8 @@ #define TIQDIO_THININT_ISC 3 #define TIQDIO_DELAY_TARGET 0 -#define QDIO_BUSY_BIT_PATIENCE 2000 /* in microsecs */ +#define QDIO_BUSY_BIT_PATIENCE 100 /* in microsecs */ +#define QDIO_BUSY_BIT_GIVE_UP 10000000 /* 10 seconds */ #define IQDIO_GLOBAL_LAPS 2 /* GLOBAL_LAPS are not used as we */ #define IQDIO_GLOBAL_LAPS_INT 1 /* don't global summary */ #define IQDIO_LOCAL_LAPS 4 @@ -599,7 +600,9 @@ int last_transfer_index; */ __u64 last_transfer_time; + __u64 busy_start; } timing; + atomic_t busy_siga_counter; unsigned int queue_type; /* leave this member at the end. won't be cleared in qdio_fill_qs */ diff -Nru a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c --- a/drivers/s390/net/ctcmain.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/net/ctcmain.c Wed Mar 17 19:29:09 2004 @@ -1,5 +1,5 @@ /* - * $Id: ctcmain.c,v 1.56 2004/02/27 17:53:26 mschwide Exp $ + * $Id: ctcmain.c,v 1.57 2004/03/02 15:34:01 mschwide Exp $ * * CTC / ESCON network driver * @@ -36,7 +36,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.56 $ + * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.57 $ * */ @@ -319,7 +319,7 @@ print_banner(void) { static int printed = 0; - char vbuf[] = "$Revision: 1.56 $"; + char vbuf[] = "$Revision: 1.57 $"; char *version = vbuf; if (printed) @@ -3043,26 +3043,13 @@ privptr->channel[direction]->protocol = privptr->protocol; privptr->channel[direction]->max_bufsize = CTC_BUFSIZE_DEFAULT; } + /* sysfs magic */ + SET_NETDEV_DEV(dev, &cgdev->dev); + if (ctc_netdev_register(dev) != 0) { ctc_free_netdevice(dev, 1); goto out; } - /* Create symlinks. */ - if (sysfs_create_link(&cgdev->dev.kobj, &dev->class_dev.kobj, - dev->name)) { - ctc_netdev_unregister(dev); - dev->priv = 0; - ctc_free_netdevice(dev, 1); - goto out; - } - if (sysfs_create_link(&dev->class_dev.kobj, &cgdev->dev.kobj, - cgdev->dev.bus_id)) { - sysfs_remove_link(&cgdev->dev.kobj, dev->name); - ctc_netdev_unregister(dev); - dev->priv = 0; - ctc_free_netdevice(dev, 1); - goto out; - } ctc_add_attributes(&cgdev->dev); @@ -3118,8 +3105,6 @@ channel_free(priv->channel[WRITE]); if (ndev) { - sysfs_remove_link(&ndev->class_dev.kobj, cgdev->dev.bus_id); - sysfs_remove_link(&cgdev->dev.kobj, ndev->name); ctc_netdev_unregister(ndev); ndev->priv = NULL; ctc_free_netdevice(ndev, 1); diff -Nru a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c --- a/drivers/s390/net/iucv.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/net/iucv.c Wed Mar 17 19:29:09 2004 @@ -1,5 +1,5 @@ /* - * $Id: iucv.c,v 1.24 2004/02/05 14:16:01 braunu Exp $ + * $Id: iucv.c,v 1.26 2004/03/10 11:55:31 braunu Exp $ * * IUCV network driver * @@ -29,7 +29,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.24 $ + * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.26 $ * */ @@ -351,7 +351,7 @@ static void iucv_banner(void) { - char vbuf[] = "$Revision: 1.24 $"; + char vbuf[] = "$Revision: 1.26 $"; char *version = vbuf; if ((version = strchr(version, ':'))) { @@ -670,10 +670,12 @@ ulong b2f0_result = 0x0deadbeef; iucv_debug(1, "entering"); + preempt_disable(); if (smp_processor_id() == 0) iucv_declare_buffer_cpu0(&b2f0_result); else smp_call_function(iucv_declare_buffer_cpu0, &b2f0_result, 0, 1); + preempt_enable(); iucv_debug(1, "Address of EIB = %p", iucv_external_int_buffer); if (b2f0_result == 0x0deadbeef) b2f0_result = 0xaa; @@ -692,11 +694,13 @@ { iucv_debug(1, "entering"); if (declare_flag) { + preempt_disable(); if (smp_processor_id() == 0) iucv_retrieve_buffer_cpu0(0); else smp_call_function(iucv_retrieve_buffer_cpu0, 0, 0, 1); declare_flag = 0; + preempt_enable(); } iucv_debug(1, "exiting"); return 0; @@ -2216,10 +2220,12 @@ } u; u.param = SetMaskFlag; + preempt_disable(); if (smp_processor_id() == 0) iucv_setmask_cpu0(&u); else smp_call_function(iucv_setmask_cpu0, &u, 0, 1); + preempt_enable(); return u.result; } @@ -2519,10 +2525,6 @@ /** * Export all public stuff - * FIXME: I have commented out all the functions that - * are not used in netiucv. Is anyone else - * using them or should some of them be made - * static / removed? pls review. Arnd */ EXPORT_SYMBOL (iucv_bus); EXPORT_SYMBOL (iucv_root); diff -Nru a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c --- a/drivers/s390/net/lcs.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/net/lcs.c Wed Mar 17 19:29:09 2004 @@ -11,7 +11,7 @@ * Frank Pavlic (pavlic@de.ibm.com) and * Martin Schwidefsky * - * $Revision: 1.67 $ $Date: 2004/02/26 18:26:50 $ + * $Revision: 1.68 $ $Date: 2004/03/02 15:34:01 $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,7 +58,7 @@ /** * initialization string for output */ -#define VERSION_LCS_C "$Revision: 1.67 $" +#define VERSION_LCS_C "$Revision: 1.68 $" static char version[] __initdata = "LCS driver ("VERSION_LCS_C "/" VERSION_LCS_H ")"; @@ -1855,17 +1855,8 @@ if (register_netdev(dev) != 0) goto out; /* Create symlinks. */ - if (sysfs_create_link(&ccwgdev->dev.kobj, &dev->class_dev.kobj, - dev->name)) { - unregister_netdev(dev); - goto out; - } - if (sysfs_create_link(&dev->class_dev.kobj, &ccwgdev->dev.kobj, - ccwgdev->dev.bus_id)) { - sysfs_remove_link(&ccwgdev->dev.kobj, dev->name); - unregister_netdev(dev); - goto out; - } + SET_NETDEV_DEV(dev, &ccwgdev->dev); + netif_stop_queue(dev); lcs_stopcard(card); return 0; @@ -1891,8 +1882,6 @@ ret = lcs_stop_device(card->dev); if (ret) return ret; - sysfs_remove_link(&card->dev->class_dev.kobj, ccwgdev->dev.bus_id); - sysfs_remove_link(&ccwgdev->dev.kobj, card->dev->name); unregister_netdev(card->dev); return 0; } @@ -1911,9 +1900,6 @@ return; if (ccwgdev->state == CCWGROUP_ONLINE) { lcs_stop_device(card->dev); /* Ignore rc. */ - sysfs_remove_link(&card->dev->class_dev.kobj, - ccwgdev->dev.bus_id); - sysfs_remove_link(&ccwgdev->dev.kobj, card->dev->name); unregister_netdev(card->dev); } sysfs_remove_group(&ccwgdev->dev.kobj, &lcs_attr_group); diff -Nru a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c --- a/drivers/s390/net/netiucv.c Wed Mar 17 19:29:09 2004 +++ b/drivers/s390/net/netiucv.c Wed Mar 17 19:29:09 2004 @@ -1,5 +1,5 @@ /* - * $Id: netiucv.c,v 1.38 2004/02/19 13:12:57 mschwide Exp $ + * $Id: netiucv.c,v 1.45 2004/03/15 08:48:48 braunu Exp $ * * IUCV network driver * @@ -30,7 +30,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * RELEASE-TAG: IUCV network driver $Revision: 1.38 $ + * RELEASE-TAG: IUCV network driver $Revision: 1.45 $ * */ @@ -229,6 +229,7 @@ "StartWait", "StopWait", "Running", + "StartRetry", }; /** @@ -251,6 +252,7 @@ "Stop", "Connection up", "Connection down", + "Timer", }; /** @@ -345,11 +347,6 @@ CONN_STATE_TX, /** - * Terminating - */ - CONN_STATE_TERM, - - /** * Error during registration. */ CONN_STATE_REGERR, @@ -495,7 +492,7 @@ netiucv_unpack_skb(struct iucv_connection *conn, struct sk_buff *pskb) { struct net_device *dev = conn->netdev; - struct netiucv_priv *privptr = (struct netiucv_priv *)dev->priv; + struct netiucv_priv *privptr = dev->priv; __u16 offset = 0; skb_put(pskb, NETIUCV_HDRLEN); @@ -1214,7 +1211,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev) { int rc = 0; - struct netiucv_priv *privptr = (struct netiucv_priv *)dev->priv; + struct netiucv_priv *privptr = dev->priv; /** * Some sanity checks ... @@ -1290,7 +1287,6 @@ /** * attributes in sysfs *****************************************************************************/ -#define CTRL_BUFSIZE 40 static ssize_t user_show (struct device *dev, char *buf) @@ -1300,7 +1296,57 @@ return sprintf(buf, "%s\n", netiucv_printname(priv->conn->userid)); } -static DEVICE_ATTR(user, 0444, user_show, NULL); +static ssize_t +user_write (struct device *dev, const char *buf, size_t count) +{ + struct netiucv_priv *priv = dev->driver_data; + struct net_device *ndev = priv->conn->netdev; + char *p; + char *tmp; + char username[10]; + int i; + + if (count>9) { + printk(KERN_WARNING + "netiucv: username too long (%d)!\n", (int)count); + return -EINVAL; + } + + tmp = strsep((char **) &buf, "\n"); + for (i=0, p=tmp; i<8 && *p; i++, p++) { + if (isalnum(*p) || (*p == '$')) + username[i]= *p; + else if (*p == '\n') { + /* trailing lf, grr */ + break; + } else { + printk(KERN_WARNING + "netiucv: Invalid character in username!\n"); + return -EINVAL; + } + } + while (i<9) + username[i++] = ' '; + username[9] = '\0'; + + if (memcmp(username, priv->conn->userid, 8) != 0) { + /* username changed */ + if (ndev->flags & (IFF_UP | IFF_RUNNING)) { + printk(KERN_WARNING + "netiucv: device %s active, connected to %s\n", + dev->bus_id, priv->conn->userid); + printk(KERN_WARNING + "netiucv: user cannot be updated\n"); + return -EBUSY; + } + } + memcpy(priv->conn->userid, username, 9); + + return count; + +} + +static DEVICE_ATTR(user, 0644, user_show, user_write); static ssize_t buffer_show (struct device *dev, char *buf) @@ -1317,26 +1363,30 @@ struct net_device *ndev = priv->conn->netdev; char *e; int bs1; - char tmp[CTRL_BUFSIZE]; if (count >= 39) return -EINVAL; - if (copy_from_user(tmp, buf, count)) - return -EFAULT; - tmp[count+1] = '\0'; - bs1 = simple_strtoul(tmp, &e, 0); + bs1 = simple_strtoul(buf, &e, 0); + + if (e && (!isspace(*e))) { + printk(KERN_WARNING + "netiucv: Invalid character in buffer!\n"); + return -EINVAL; + } + if (bs1 > NETIUCV_BUFSIZE_MAX) { + printk(KERN_WARNING + "netiucv: Given buffer size %d too large.\n", + bs1); - if ((bs1 > NETIUCV_BUFSIZE_MAX) || - (e && (!isspace(*e)))) return -EINVAL; + } if ((ndev->flags & IFF_RUNNING) && (bs1 < (ndev->mtu + NETIUCV_HDRLEN + 2))) return -EINVAL; if (bs1 < (576 + NETIUCV_HDRLEN + NETIUCV_HDRLEN)) return -EINVAL; - priv->conn->max_buffsize = bs1; if (!(ndev->flags & IFF_RUNNING)) ndev->mtu = bs1 - NETIUCV_HDRLEN - NETIUCV_HDRLEN; @@ -1606,20 +1656,10 @@ ret = netiucv_add_files(dev); if (ret) goto out_unreg; - ret = sysfs_create_link(&dev->kobj, &ndev->class_dev.kobj, ndev->name); - if (ret) - goto out_rm_files; - ret = sysfs_create_link(&ndev->class_dev.kobj, &dev->kobj, dev->bus_id); - if (ret) - goto out_rm_link; dev->driver_data = priv; priv->dev = dev; return 0; -out_rm_link: - sysfs_remove_link(&dev->kobj, ndev->name); -out_rm_files: - netiucv_remove_files(dev); out_unreg: device_unregister(dev); return ret; @@ -1628,12 +1668,7 @@ static void netiucv_unregister_device(struct device *dev) { - struct netiucv_priv *priv = dev->driver_data; - struct net_device *ndev = priv->conn->netdev; - pr_debug("%s() called\n", __FUNCTION__); - sysfs_remove_link(&ndev->class_dev.kobj, dev->bus_id); - sysfs_remove_link(&dev->kobj, ndev->name); netiucv_remove_files(dev); device_unregister(dev); } @@ -1814,7 +1849,7 @@ { char *p; char username[10]; - int i; + int i, ret; struct net_device *dev; if (count>9) { @@ -1846,30 +1881,37 @@ return -ENODEV; } - if (register_netdev(dev)) { - printk(KERN_WARNING - "netiucv: Could not register '%s'\n", dev->name); - netiucv_free_netdevice(dev); - return -ENODEV; + if ((ret = netiucv_register_device(dev, ifno))) + goto out_free_ndev; + /* sysfs magic */ + SET_NETDEV_DEV(dev, (struct device*)((struct netiucv_priv*)dev->priv)->dev); + if ((ret = register_netdev(dev))) { + netiucv_unregister_device((struct device*)((struct netiucv_priv*)dev->priv)->dev); + goto out_free_ndev; } printk(KERN_INFO "%s: '%s'\n", dev->name, netiucv_printname(username)); - netiucv_register_device(dev, ifno); ifno++; return count; + +out_free_ndev: + printk(KERN_WARNING + "netiucv: Could not register '%s'\n", dev->name); + netiucv_free_netdevice(dev); + return ret; } DRIVER_ATTR(connection, 0200, NULL, conn_write); static struct device_driver netiucv_driver = { - .name = "NETIUCV", + .name = "netiucv", .bus = &iucv_bus, }; static void netiucv_banner(void) { - char vbuf[] = "$Revision: 1.38 $"; + char vbuf[] = "$Revision: 1.45 $"; char *version = vbuf; if ((version = strchr(version, ':'))) { diff -Nru a/drivers/s390/net/qeth.c b/drivers/s390/net/qeth.c --- a/drivers/s390/net/qeth.c Wed Mar 17 19:29:10 2004 +++ b/drivers/s390/net/qeth.c Wed Mar 17 19:29:10 2004 @@ -6404,6 +6404,8 @@ QETH_DBF_CARD3(0, trace, "rgnd", card); + /* sysfs magic */ + SET_NETDEV_DEV(card->dev, &card->gdev->dev); result = register_netdev(card->dev); return result; @@ -6681,10 +6683,6 @@ hard_start_xmit */ if (atomic_read(&card->is_registered)) { - /* Remove sysfs symlinks. */ - sysfs_remove_link(&card->gdev->dev.kobj, card->dev_name); - sysfs_remove_link(&card->dev->class_dev.kobj, - CARD_BUS_ID(card)); QETH_DBF_TEXT2(0, trace, "unregdev"); qeth_unregister_netdev(card); qeth_wait_nonbusy(QETH_REMOVE_WAIT_TIME); @@ -10694,17 +10692,6 @@ if (qeth_init_netdev(card)) goto out_remove; - if (sysfs_create_link(&card->gdev->dev.kobj, &card->dev->class_dev.kobj, - card->dev_name)) { - qeth_unregister_netdev(card); - goto out_remove; - } - if (sysfs_create_link(&card->dev->class_dev.kobj, &card->gdev->dev.kobj, - CARD_BUS_ID(card))) { - sysfs_remove_link(&card->gdev->dev.kobj, card->dev_name); - qeth_unregister_netdev(card); - goto out_remove; - } return 0; /* success */ out_remove: diff -Nru a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c --- a/drivers/scsi/ide-scsi.c Wed Mar 17 19:29:09 2004 +++ b/drivers/scsi/ide-scsi.c Wed Mar 17 19:29:09 2004 @@ -78,6 +78,7 @@ #define PC_DMA_IN_PROGRESS 0 /* 1 while DMA in progress */ #define PC_WRITING 1 /* Data direction */ #define PC_TRANSFORM 2 /* transform SCSI commands */ +#define PC_TIMEDOUT 3 /* command timed out */ #define PC_DMA_OK 4 /* Use DMA */ /* @@ -307,6 +308,41 @@ return ide_do_drive_cmd(drive, rq, ide_preempt); } +ide_startstop_t idescsi_atapi_error (ide_drive_t *drive, const char *msg, byte stat) +{ + struct request *rq; + byte err; + + err = ide_dump_atapi_status(drive, msg, stat); + + if (drive == NULL || (rq = HWGROUP(drive)->rq) == NULL) + return ide_stopped; + + if (HWIF(drive)->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT)) + /* force an abort */ + HWIF(drive)->OUTB(WIN_IDLEIMMEDIATE,IDE_COMMAND_REG); + + rq->errors++; + DRIVER(drive)->end_request(drive, 0, 0); + return ide_stopped; +} + +ide_startstop_t idescsi_atapi_abort (ide_drive_t *drive, const char *msg) +{ + struct request *rq; + + if (drive == NULL || (rq = HWGROUP(drive)->rq) == NULL) + return ide_stopped; + +#if IDESCSI_DEBUG_LOG + printk(KERN_WARNING "idescsi_atapi_abort called for %lu\n", + ((idescsi_pc_t *) rq->special)->scsi_cmd->serial_number); +#endif + rq->errors |= ERROR_MAX; + DRIVER(drive)->end_request(drive, 0, 0); + return ide_stopped; +} + static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs) { idescsi_scsi_t *scsi = drive_to_idescsi(drive); @@ -334,7 +370,13 @@ kfree(rq); pc = opc; rq = pc->rq; - pc->scsi_cmd->result = (CHECK_CONDITION << 1) | (DID_OK << 16); + pc->scsi_cmd->result = (CHECK_CONDITION << 1) | + ((test_bit(PC_TIMEDOUT, &pc->flags)?DID_TIME_OUT:DID_OK) << 16); + } else if (test_bit(PC_TIMEDOUT, &pc->flags)) { + if (log) + printk (KERN_WARNING "ide-scsi: %s: timed out for %lu\n", + drive->name, pc->scsi_cmd->serial_number); + pc->scsi_cmd->result = DID_TIME_OUT << 16; } else if (rq->errors >= ERROR_MAX) { pc->scsi_cmd->result = DID_ERROR << 16; if (log) @@ -374,6 +416,19 @@ return IDE_MAX(WAIT_CMD, pc->timeout - jiffies); } +static int idescsi_expiry(ide_drive_t *drive) +{ + idescsi_scsi_t *scsi = drive->driver_data; + idescsi_pc_t *pc = scsi->pc; + +#if IDESCSI_DEBUG_LOG + printk(KERN_WARNING "idescsi_expiry called for %lu at %lu\n", pc->scsi_cmd->serial_number, jiffies); +#endif + set_bit(PC_TIMEDOUT, &pc->flags); + + return 0; /* we do not want the ide subsystem to retry */ +} + /* * Our interrupt handler. */ @@ -393,6 +448,15 @@ printk (KERN_INFO "ide-scsi: Reached idescsi_pc_intr interrupt handler\n"); #endif /* IDESCSI_DEBUG_LOG */ + if (test_bit(PC_TIMEDOUT, &pc->flags)){ +#if IDESCSI_DEBUG_LOG + printk(KERN_WARNING "idescsi_pc_intr: got timed out packet %lu at %lu\n", + pc->scsi_cmd->serial_number, jiffies); +#endif + /* end this request now - scsi should retry it*/ + idescsi_end_request (drive, 1, 0); + return ide_stopped; + } if (test_and_clear_bit (PC_DMA_IN_PROGRESS, &pc->flags)) { #if IDESCSI_DEBUG_LOG printk ("ide-scsi: %s: DMA complete\n", drive->name); @@ -442,7 +506,7 @@ pc->actually_transferred += temp; pc->current_position += temp; idescsi_discard_data(drive, bcount.all - temp); - ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), NULL); + ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry); return ide_started; } #if IDESCSI_DEBUG_LOG @@ -467,7 +531,8 @@ pc->actually_transferred += bcount.all; pc->current_position += bcount.all; - ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), NULL); /* And set the interrupt handler again */ + /* And set the interrupt handler again */ + ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry); return ide_started; } @@ -492,7 +557,7 @@ if (HWGROUP(drive)->handler != NULL) BUG(); /* Set the interrupt routine */ - ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), NULL); + ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry); /* Send the actual packet */ atapi_output_bytes(drive, scsi->pc->c, 12); if (test_bit (PC_DMA_OK, &pc->flags)) { @@ -540,7 +605,7 @@ if (HWGROUP(drive)->handler != NULL) BUG(); ide_set_handler(drive, &idescsi_transfer_pc, - get_timeout(pc), NULL); + get_timeout(pc), idescsi_expiry); /* Issue the packet command */ HWIF(drive)->OUTB(WIN_PACKETCMD, IDE_COMMAND_REG); return ide_started; @@ -633,6 +698,8 @@ .cleanup = idescsi_cleanup, .do_request = idescsi_do_request, .end_request = idescsi_end_request, + .error = idescsi_atapi_error, + .abort = idescsi_atapi_abort, .drives = LIST_HEAD_INIT(idescsi_driver.drives), }; @@ -852,66 +919,132 @@ return 1; } -static int idescsi_abort (Scsi_Cmnd *cmd) +static int idescsi_eh_abort (Scsi_Cmnd *cmd) { - int countdown = 8; - unsigned long flags; - idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host); - ide_drive_t *drive = scsi->drive; + idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host); + ide_drive_t *drive = scsi->drive; + int busy; + int ret = FAILED; - printk (KERN_ERR "ide-scsi: abort called for %lu\n", cmd->serial_number); - while (countdown--) { - /* is cmd active? - * need to lock so this stuff doesn't change under us */ - spin_lock_irqsave(&ide_lock, flags); - if (scsi->pc && scsi->pc->scsi_cmd && - scsi->pc->scsi_cmd->serial_number == cmd->serial_number) { - /* yep - let's give it some more time - - * we can do that, we're in _our_ error kernel thread */ - spin_unlock_irqrestore(&ide_lock, flags); - scsi_sleep(HZ); - continue; - } - /* no, but is it queued in the ide subsystem? */ - if (elv_queue_empty(drive->queue)) { - spin_unlock_irqrestore(&ide_lock, flags); - return SUCCESS; - } - spin_unlock_irqrestore(&ide_lock, flags); - schedule_timeout(HZ/10); + /* In idescsi_eh_abort we try to gently pry our command from the ide subsystem */ + + if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) + printk (KERN_WARNING "ide-scsi: abort called for %lu\n", cmd->serial_number); + + if (!drive) { + printk (KERN_WARNING "ide-scsi: Drive not set in idescsi_eh_abort\n"); + WARN_ON(1); + goto no_drive; + } + + /* First give it some more time, how much is "right" is hard to say :-( */ + + busy = ide_wait_not_busy(HWIF(drive), 100); /* FIXME - uses mdelay which causes latency? */ + if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) + printk (KERN_WARNING "ide-scsi: drive did%s become ready\n", busy?" not":""); + + spin_lock_irq(&ide_lock); + + /* If there is no pc running we're done (our interrupt took care of it) */ + if (!scsi->pc) { + ret = SUCCESS; + goto ide_unlock; } - return FAILED; + + /* It's somewhere in flight. Does ide subsystem agree? */ + if (scsi->pc->scsi_cmd->serial_number == cmd->serial_number && !busy && + elv_queue_empty(drive->queue) && HWGROUP(drive)->rq != scsi->pc->rq) { + /* + * FIXME - not sure this condition can ever occur + */ + printk (KERN_ERR "ide-scsi: cmd aborted!\n"); + + idescsi_free_bio(scsi->pc->rq->bio); + if (scsi->pc->rq->flags & REQ_SENSE) + kfree(scsi->pc->buffer); + kfree(scsi->pc->rq); + kfree(scsi->pc); + scsi->pc = NULL; + + ret = SUCCESS; + } + +ide_unlock: + spin_unlock_irq(&ide_lock); +no_drive: + if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) + printk (KERN_WARNING "ide-scsi: abort returns %s\n", ret == SUCCESS?"success":"failed"); + + return ret; } -static int idescsi_reset (Scsi_Cmnd *cmd) +static int idescsi_eh_reset (Scsi_Cmnd *cmd) { - unsigned long flags; struct request *req; - idescsi_scsi_t *idescsi = scsihost_to_idescsi(cmd->device->host); - ide_drive_t *drive = idescsi->drive; + idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host); + ide_drive_t *drive = scsi->drive; + int ready = 0; + int ret = SUCCESS; + + /* In idescsi_eh_reset we forcefully remove the command from the ide subsystem and reset the device. */ + + if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) + printk (KERN_WARNING "ide-scsi: reset called for %lu\n", cmd->serial_number); + + if (!drive) { + printk (KERN_WARNING "ide-scsi: Drive not set in idescsi_eh_reset\n"); + WARN_ON(1); + return FAILED; + } + + spin_lock_irq(&ide_lock); + + if (!scsi->pc || (req = scsi->pc->rq) != HWGROUP(drive)->rq || !HWGROUP(drive)->handler) { + printk (KERN_WARNING "ide-scsi: No active request in idescsi_eh_reset\n"); + spin_unlock(&ide_lock); + return FAILED; + } + + /* kill current request */ + blkdev_dequeue_request(req); + end_that_request_last(req); + idescsi_free_bio(req->bio); + if (req->flags & REQ_SENSE) + kfree(scsi->pc->buffer); + kfree(scsi->pc); + scsi->pc = NULL; + kfree(req); - printk (KERN_ERR "ide-scsi: reset called for %lu\n", cmd->serial_number); - /* first null the handler for the drive and let any process - * doing IO (on another CPU) run to (partial) completion - * the lock prevents processing new requests */ - spin_lock_irqsave(&ide_lock, flags); - while (HWGROUP(drive)->handler) { - HWGROUP(drive)->handler = NULL; - schedule_timeout(1); - } /* now nuke the drive queue */ while ((req = elv_next_request(drive->queue))) { blkdev_dequeue_request(req); end_that_request_last(req); } - /* FIXME - this will probably leak memory */ + HWGROUP(drive)->rq = NULL; - if (drive_to_idescsi(drive)) - drive_to_idescsi(drive)->pc = NULL; - spin_unlock_irqrestore(&ide_lock, flags); - /* finally, reset the drive (and its partner on the bus...) */ - ide_do_reset (drive); - return SUCCESS; + HWGROUP(drive)->handler = NULL; + HWGROUP(drive)->busy = 1; /* will set this to zero when ide reset finished */ + spin_unlock_irq(&ide_lock); + + ide_do_reset(drive); + + /* ide_do_reset starts a polling handler which restarts itself every 50ms until the reset finishes */ + + do { + set_current_state(TASK_UNINTERRUPTIBLE); + spin_unlock_irq(cmd->device->host->host_lock); + schedule_timeout(HZ/20); + spin_lock_irq(cmd->device->host->host_lock); + } while ( HWGROUP(drive)->handler ); + + ready = drive_is_ready(drive); + HWGROUP(drive)->busy--; + if (!ready) { + printk (KERN_ERR "ide-scsi: reset failed!\n"); + ret = FAILED; + } + + return ret; } static int idescsi_bios(struct scsi_device *sdev, struct block_device *bdev, @@ -935,8 +1068,8 @@ .slave_configure = idescsi_slave_configure, .ioctl = idescsi_ioctl, .queuecommand = idescsi_queue, - .eh_abort_handler = idescsi_abort, - .eh_device_reset_handler = idescsi_reset, + .eh_abort_handler = idescsi_eh_abort, + .eh_host_reset_handler = idescsi_eh_reset, .bios_param = idescsi_bios, .can_queue = 40, .this_id = -1, @@ -967,7 +1100,16 @@ return 1; host->max_id = 1; - host->max_lun = 1; + +#if IDESCSI_DEBUG_LOG + if (drive->id->last_lun) + printk(KERN_NOTICE "%s: id->last_lun=%u\n", drive->name, drive->id->last_lun); +#endif + if ((drive->id->last_lun & 0x7) != 7) + host->max_lun = (drive->id->last_lun & 0x7) + 1; + else + host->max_lun = 1; + drive->driver_data = host; idescsi = scsihost_to_idescsi(host); idescsi->drive = drive; diff -Nru a/drivers/scsi/libata.h b/drivers/scsi/libata.h --- a/drivers/scsi/libata.h Wed Mar 17 19:29:09 2004 +++ b/drivers/scsi/libata.h Wed Mar 17 19:29:09 2004 @@ -26,7 +26,7 @@ #define __LIBATA_H__ #define DRV_NAME "libata" -#define DRV_VERSION "1.01" /* must be exactly four chars */ +#define DRV_VERSION "1.02" /* must be exactly four chars */ struct ata_scsi_args { struct ata_port *ap; diff -Nru a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c --- a/drivers/scsi/sata_sil.c Wed Mar 17 19:29:09 2004 +++ b/drivers/scsi/sata_sil.c Wed Mar 17 19:29:09 2004 @@ -35,7 +35,7 @@ #include #define DRV_NAME "sata_sil" -#define DRV_VERSION "0.53" +#define DRV_VERSION "0.54" enum { sil_3112 = 0, diff -Nru a/drivers/scsi/sr.c b/drivers/scsi/sr.c --- a/drivers/scsi/sr.c Wed Mar 17 19:29:09 2004 +++ b/drivers/scsi/sr.c Wed Mar 17 19:29:09 2004 @@ -698,7 +698,7 @@ static void get_capabilities(struct scsi_cd *cd) { unsigned char *buffer; - int rc, n, mrw_write = 0, mrw = 1; + int rc, n, mrw_write = 0, mrw = 1,ram_write=0; struct scsi_mode_data data; struct scsi_request *SRpnt; unsigned char cmd[MAX_COMMAND_SIZE]; @@ -783,6 +783,11 @@ if (!mrw_write) cd->cdi.mask |= CDC_MRW_W; + if (cdrom_is_random_writable(&cd->cdi, &ram_write)) + cd->cdi.mask |= CDC_RAM; + if (!ram_write) + cd->cdi.mask |= CDC_RAM; + n = data.header_length + data.block_descriptor_length; cd->cdi.speed = ((buffer[n + 8] << 8) + buffer[n + 9]) / 176; cd->readcd_known = 1; @@ -832,8 +837,8 @@ /* * if DVD-RAM of MRW-W, we are randomly writeable */ - if ((cd->cdi.mask & (CDC_DVD_RAM | CDC_MRW_W)) != - (CDC_DVD_RAM | CDC_MRW_W)) { + if ((cd->cdi.mask & (CDC_DVD_RAM | CDC_MRW_W | CDC_RAM)) != + (CDC_DVD_RAM | CDC_MRW_W | CDC_RAM)) { cd->device->writeable = 1; set_disk_ro(cd->disk, 0); } diff -Nru a/drivers/serial/21285.c b/drivers/serial/21285.c --- a/drivers/serial/21285.c Wed Mar 17 19:29:10 2004 +++ b/drivers/serial/21285.c Wed Mar 17 19:29:10 2004 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -543,3 +544,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.37 $"); +MODULE_ALIAS_CHARDEV(SERIAL_21285_MAJOR, SERIAL_21285_MINOR); diff -Nru a/drivers/serial/amba.c b/drivers/serial/amba.c --- a/drivers/serial/amba.c Wed Mar 17 19:29:09 2004 +++ b/drivers/serial/amba.c Wed Mar 17 19:29:09 2004 @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -758,3 +759,4 @@ MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd"); MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.41 $"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CHARDEV(SERIAL_AMBA_MAJOR, SERIAL_AMBA_MINOR); diff -Nru a/drivers/serial/anakin.c b/drivers/serial/anakin.c --- a/drivers/serial/anakin.c Wed Mar 17 19:29:09 2004 +++ b/drivers/serial/anakin.c Wed Mar 17 19:29:09 2004 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -541,3 +542,4 @@ MODULE_AUTHOR("Tak-Shing Chan "); MODULE_SUPPORTED_DEVICE("ttyAN"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CHARDEV(SERIAL_ANAKIN_MAJOR, SERIAL_ANAKIN_MINOR); diff -Nru a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c --- a/drivers/serial/clps711x.c Wed Mar 17 19:29:09 2004 +++ b/drivers/serial/clps711x.c Wed Mar 17 19:29:09 2004 @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -611,3 +612,4 @@ MODULE_AUTHOR("Deep Blue Solutions Ltd"); MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.42 $"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CHARDEV(SERIAL_CLPS711X_MAJOR, SERIAL_CLPS711X_MINOR); diff -Nru a/drivers/serial/mux.c b/drivers/serial/mux.c --- a/drivers/serial/mux.c Wed Mar 17 19:29:10 2004 +++ b/drivers/serial/mux.c Wed Mar 17 19:29:10 2004 @@ -25,6 +25,7 @@ #include #include #include /* for udelay */ +#include #include #include @@ -535,3 +536,4 @@ MODULE_AUTHOR("Ryan Bradetich"); MODULE_DESCRIPTION("Serial MUX driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CHARDEV_MAJOR(MUX_MAJOR); diff -Nru a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c --- a/drivers/serial/sa1100.c Wed Mar 17 19:29:09 2004 +++ b/drivers/serial/sa1100.c Wed Mar 17 19:29:09 2004 @@ -953,3 +953,4 @@ MODULE_AUTHOR("Deep Blue Solutions Ltd"); MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.50 $"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_SA1100_MAJOR); diff -Nru a/drivers/usb/Kconfig b/drivers/usb/Kconfig --- a/drivers/usb/Kconfig Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/Kconfig Wed Mar 17 19:29:09 2004 @@ -6,32 +6,36 @@ # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. config USB - tristate "Support for USB" + tristate "Support for Host-side USB" depends on PCI || SA1111 || ARCH_OMAP1510 || ARCH_OMAP1610 ---help--- Universal Serial Bus (USB) is a specification for a serial bus subsystem which offers higher speeds and more features than the traditional PC serial port. The bus supplies power to peripherals and allows for hot swapping. Up to 127 USB peripherals can be - connected to a single USB port in a tree structure. The USB port is - the root of the tree, the peripherals are the leaves and the inner - nodes are special USB devices called hubs. Many newer PC's have USB - ports and newer peripherals such as scanners, keyboards, mice, - modems, and printers support the USB protocol and can be connected - to the PC via those ports. + connected to a single USB host in a tree structure. + + The USB host is the root of the tree, the peripherals are the + leaves and the inner nodes are special USB devices called hubs. + Most PCs now have USB host ports, used to connect peripherals + such as scanners, keyboards, mice, modems, cameras, disks, + flash memory, network links, and printers to the PC. - Say Y here if your computer has a USB port and you want to use USB - devices. You then need to say Y to at least one of "UHCI HCD support" - or "OHCI HCD support" below (the type of interface that the USB hardware - in your computer provides to the operating system) and then choose - from amongst the drivers for USB peripherals. You may want to check - out the information provided in and - especially the links given in . + Say Y here if your computer has a host-side USB port and you want + to use USB devices. You then need to say Y to at least one of the + Host Controller Driver (HCD) options below. Choose a USB 1.1 + controller, such as "UHCI HCD support" or "OHCI HCD support", + and "EHCI HCD (USB 2.0) support" except for older systems that + do not have USB 2.0 support. It doesn't normally hurt to select + them all if you are not certain. - If you have a new USB 2.0 High Speed system, you should also choose - "EHCI HCD (USB 2.0) support" as well as at least one of UHCI or OHCI. + If your system has a device-side USB port, used in the peripheral + side of the USB protocol, see the "USB Gadget" framework instead. - It doesn't normally hurt to select them all if you are not certain. + After choosing your HCD, then select drivers for the USB peripherals + you'll be using. You may want to check out the information provided + in and especially the links given in + . To compile this driver as a module, choose M here: the module will be called usbcore. diff -Nru a/drivers/usb/Makefile b/drivers/usb/Makefile --- a/drivers/usb/Makefile Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/Makefile Wed Mar 17 19:29:10 2004 @@ -20,10 +20,15 @@ obj-$(CONFIG_USB_STORAGE) += storage/ obj-$(CONFIG_USB_AIPTEK) += input/ +obj-$(CONFIG_USB_ATI_REMOTE) += input/ obj-$(CONFIG_USB_HID) += input/ obj-$(CONFIG_USB_KBD) += input/ +obj-$(CONFIG_USB_KBTAB) += input/ obj-$(CONFIG_USB_MOUSE) += input/ +obj-$(CONFIG_USB_MTOUCH) += input/ +obj-$(CONFIG_USB_POWERMATE) += input/ obj-$(CONFIG_USB_WACOM) += input/ +obj-$(CONFIG_USB_XPAD) += input/ obj-$(CONFIG_USB_DABUSB) += media/ obj-$(CONFIG_USB_DSBR) += media/ @@ -50,7 +55,6 @@ obj-$(CONFIG_USB_SERIAL) += serial/ obj-$(CONFIG_USB_AUERSWALD) += misc/ -obj-$(CONFIG_USB_BRLVGER) += misc/ obj-$(CONFIG_USB_EMI26) += misc/ obj-$(CONFIG_USB_LCD) += misc/ obj-$(CONFIG_USB_LEGOTOWER) += misc/ diff -Nru a/drivers/usb/class/audio.c b/drivers/usb/class/audio.c --- a/drivers/usb/class/audio.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/class/audio.c Wed Mar 17 19:29:10 2004 @@ -3,7 +3,7 @@ /* * audio.c -- USB Audio Class driver * - * Copyright (C) 1999, 2000, 2001 + * Copyright (C) 1999, 2000, 2001, 2003, 2004 * Alan Cox (alan@lxorguk.ukuu.org.uk) * Thomas Sailer (sailer@ife.ee.ethz.ch) * @@ -101,6 +101,11 @@ * Fix SNDCTL_DSP_STEREO API violation * 2003-04-08: Oliver Neukum (oliver@neukum.name): * Setting a configuration is done by usbcore and must not be overridden + * 2004-02-27: Workaround for broken synch descriptors + * 2004-03-07: Alan Stern + * Add usb_ifnum_to_if() and usb_altnum_to_altsetting() support. + * Use the in-memory descriptors instead of reading them from the device. + * */ /* @@ -141,8 +146,8 @@ * * How does the parsing work? First, all interfaces are searched * for an AudioControl class interface. If found, the config descriptor - * that belongs to the current configuration is fetched from the device. - * Then the HEADER descriptor is fetched. It contains a list of + * that belongs to the current configuration is searched and + * the HEADER descriptor is found. It contains a list of * all AudioStreaming and MIDIStreaming devices. This list is then walked, * and all AudioStreaming interfaces are classified into input and output * interfaces (according to the endpoint0 direction in altsetting1) (MIDIStreaming @@ -1512,7 +1517,6 @@ static int set_format_in(struct usb_audiodev *as) { struct usb_device *dev = as->state->usbdev; - struct usb_host_config *config = dev->actconfig; struct usb_host_interface *alts; struct usb_interface *iface; struct usbin *u = &as->usbin; @@ -1522,9 +1526,9 @@ unsigned char data[3]; int fmtnr, ret; - if (u->interface < 0 || u->interface >= config->desc.bNumInterfaces) + iface = usb_ifnum_to_if(dev, u->interface); + if (!iface) return 0; - iface = config->interface[u->interface]; fmtnr = find_format(as->fmtin, as->numfmtin, d->format, d->srate); if (fmtnr < 0) { @@ -1533,7 +1537,7 @@ } fmt = as->fmtin + fmtnr; - alts = &iface->altsetting[fmt->altsetting]; + alts = usb_altnum_to_altsetting(iface, fmt->altsetting); u->format = fmt->format; u->datapipe = usb_rcvisocpipe(dev, alts->endpoint[0].desc.bEndpointAddress & 0xf); u->syncpipe = u->syncinterval = 0; @@ -1542,18 +1546,20 @@ alts->endpoint[1].desc.bmAttributes != 0x01 || alts->endpoint[1].desc.bSynchAddress != 0 || alts->endpoint[1].desc.bEndpointAddress != (alts->endpoint[0].desc.bSynchAddress & 0x7f)) { - printk(KERN_ERR "usbaudio: device %d interface %d altsetting %d invalid synch pipe\n", + printk(KERN_WARNING "usbaudio: device %d interface %d altsetting %d claims adaptive in " + "but has invalid synch pipe; treating as asynchronous in\n", dev->devnum, u->interface, fmt->altsetting); - return -1; + } else { + u->syncpipe = usb_sndisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf); + u->syncinterval = alts->endpoint[1].desc.bRefresh; } - u->syncpipe = usb_sndisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf); - u->syncinterval = alts->endpoint[1].desc.bRefresh; } if (d->srate < fmt->sratelo) d->srate = fmt->sratelo; if (d->srate > fmt->sratehi) d->srate = fmt->sratehi; - dprintk((KERN_DEBUG "usbaudio: set_format_in: usb_set_interface %u %u\n", alts->desc.bInterfaceNumber, fmt->altsetting)); + dprintk((KERN_DEBUG "usbaudio: set_format_in: usb_set_interface %u %u\n", + u->interface, fmt->altsetting)); if (usb_set_interface(dev, alts->desc.bInterfaceNumber, fmt->altsetting) < 0) { printk(KERN_WARNING "usbaudio: usb_set_interface failed, device %d interface %d altsetting %d\n", dev->devnum, u->interface, fmt->altsetting); @@ -1600,7 +1606,6 @@ static int set_format_out(struct usb_audiodev *as) { struct usb_device *dev = as->state->usbdev; - struct usb_host_config *config = dev->actconfig; struct usb_host_interface *alts; struct usb_interface *iface; struct usbout *u = &as->usbout; @@ -1610,9 +1615,9 @@ unsigned char data[3]; int fmtnr, ret; - if (u->interface < 0 || u->interface >= config->desc.bNumInterfaces) + iface = usb_ifnum_to_if(dev, u->interface); + if (!iface) return 0; - iface = config->interface[u->interface]; fmtnr = find_format(as->fmtout, as->numfmtout, d->format, d->srate); if (fmtnr < 0) { @@ -1622,7 +1627,7 @@ fmt = as->fmtout + fmtnr; u->format = fmt->format; - alts = &iface->altsetting[fmt->altsetting]; + alts = usb_altnum_to_altsetting(iface, fmt->altsetting); u->datapipe = usb_sndisocpipe(dev, alts->endpoint[0].desc.bEndpointAddress & 0xf); u->syncpipe = u->syncinterval = 0; if ((alts->endpoint[0].desc.bmAttributes & 0x0c) == 0x04) { @@ -1637,18 +1642,20 @@ alts->endpoint[1].desc.bmAttributes != 0x01 || alts->endpoint[1].desc.bSynchAddress != 0 || alts->endpoint[1].desc.bEndpointAddress != (alts->endpoint[0].desc.bSynchAddress | 0x80)) { - printk(KERN_ERR "usbaudio: device %d interface %d altsetting %d invalid synch pipe\n", + printk(KERN_WARNING "usbaudio: device %d interface %d altsetting %d claims asynch out " + "but has invalid synch pipe; treating as adaptive out\n", dev->devnum, u->interface, fmt->altsetting); - return -1; + } else { + u->syncpipe = usb_rcvisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf); + u->syncinterval = alts->endpoint[1].desc.bRefresh; } - u->syncpipe = usb_rcvisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf); - u->syncinterval = alts->endpoint[1].desc.bRefresh; } if (d->srate < fmt->sratelo) d->srate = fmt->sratelo; if (d->srate > fmt->sratehi) d->srate = fmt->sratehi; - dprintk((KERN_DEBUG "usbaudio: set_format_out: usb_set_interface %u %u\n", alts->desc.bInterfaceNumber, fmt->altsetting)); + dprintk((KERN_DEBUG "usbaudio: set_format_out: usb_set_interface %u %u\n", + u->interface, fmt->altsetting)); if (usb_set_interface(dev, u->interface, fmt->altsetting) < 0) { printk(KERN_WARNING "usbaudio: usb_set_interface failed, device %d interface %d altsetting %d\n", dev->devnum, u->interface, fmt->altsetting); @@ -2697,7 +2704,6 @@ struct usb_audiodev *as = (struct usb_audiodev *)file->private_data; struct usb_audio_state *s; struct usb_device *dev; - struct usb_interface *iface; lock_kernel(); s = as->state; @@ -2707,19 +2713,15 @@ down(&open_sem); if (file->f_mode & FMODE_WRITE) { usbout_stop(as); - if (dev && as->usbout.interface >= 0) { - iface = dev->actconfig->interface[as->usbout.interface]; - usb_set_interface(dev, iface->altsetting->desc.bInterfaceNumber, 0); - } + if (dev && as->usbout.interface >= 0) + usb_set_interface(dev, as->usbout.interface, 0); dmabuf_release(&as->usbout.dma); usbout_release(as); } if (file->f_mode & FMODE_READ) { usbin_stop(as); - if (dev && as->usbin.interface >= 0) { - iface = dev->actconfig->interface[as->usbin.interface]; - usb_set_interface(dev, iface->altsetting->desc.bInterfaceNumber, 0); - } + if (dev && as->usbin.interface >= 0) + usb_set_interface(dev, as->usbin.interface, 0); dmabuf_release(&as->usbin.dma); usbin_release(as); } @@ -2824,12 +2826,11 @@ { struct usb_device *dev = s->usbdev; struct usb_audiodev *as; - struct usb_host_config *config = dev->actconfig; struct usb_host_interface *alts; struct usb_interface *iface; struct audioformat *fp; unsigned char *fmt, *csep; - unsigned int i, j, k, format; + unsigned int i, j, k, format, idx; if (!(as = kmalloc(sizeof(struct usb_audiodev), GFP_KERNEL))) return; @@ -2870,9 +2871,10 @@ /* search for input formats */ if (asifin >= 0) { as->usbin.flags = FLG_CONNECTED; - iface = config->interface[asifin]; - for (i = 0; i < iface->num_altsetting; i++) { - alts = &iface->altsetting[i]; + iface = usb_ifnum_to_if(dev, asifin); + for (idx = 0; idx < iface->num_altsetting; idx++) { + alts = &iface->altsetting[idx]; + i = alts->desc.bAlternateSetting; if (alts->desc.bInterfaceClass != USB_CLASS_AUDIO || alts->desc.bInterfaceSubClass != 2) continue; if (alts->desc.bNumEndpoints < 1) { @@ -2951,14 +2953,15 @@ /* search for output formats */ if (asifout >= 0) { as->usbout.flags = FLG_CONNECTED; - iface = config->interface[asifout]; - for (i = 0; i < iface->num_altsetting; i++) { - alts = &iface->altsetting[i]; + iface = usb_ifnum_to_if(dev, asifout); + for (idx = 0; idx < iface->num_altsetting; idx++) { + alts = &iface->altsetting[idx]; + i = alts->desc.bAlternateSetting; if (alts->desc.bInterfaceClass != USB_CLASS_AUDIO || alts->desc.bInterfaceSubClass != 2) continue; if (alts->desc.bNumEndpoints < 1) { /* altsetting 0 should never have iso EPs */ - if (alts->desc.bAlternateSetting != 0) + if (i != 0) printk(KERN_ERR "usbaudio: device %u interface %u altsetting %u does not have an endpoint\n", dev->devnum, asifout, i); continue; @@ -3655,8 +3658,8 @@ static struct usb_audio_state *usb_audio_parsecontrol(struct usb_device *dev, unsigned char *buffer, unsigned int buflen, unsigned int ctrlif) { struct usb_audio_state *s; - struct usb_host_config *config = dev->actconfig; struct usb_interface *iface; + struct usb_host_interface *alt; unsigned char ifin[USB_MAXINTERFACES], ifout[USB_MAXINTERFACES]; unsigned char *p1; unsigned int i, j, k, numifin = 0, numifout = 0; @@ -3685,54 +3688,63 @@ dev->devnum, ctrlif); for (i = 0; i < p1[7]; i++) { j = p1[8+i]; - if (j >= config->desc.bNumInterfaces) { + iface = usb_ifnum_to_if(dev, j); + if (!iface) { printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u does not exist\n", dev->devnum, ctrlif, j); continue; } - iface = config->interface[j]; - if (iface->altsetting[0].desc.bInterfaceClass != USB_CLASS_AUDIO) { - printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u is not an AudioClass interface\n", - dev->devnum, ctrlif, j); + if (iface->num_altsetting == 1) { + printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u has only 1 altsetting.\n", dev->devnum, ctrlif); continue; } - if (iface->altsetting[0].desc.bInterfaceSubClass == 3) { - printk(KERN_INFO "usbaudio: device %d audiocontrol interface %u interface %u MIDIStreaming not supported\n", + alt = usb_altnum_to_altsetting(iface, 0); + if (!alt) { + printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u has no altsetting 0\n", dev->devnum, ctrlif, j); continue; } - if (iface->altsetting[0].desc.bInterfaceSubClass != 2) { - printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u invalid AudioClass subtype\n", + if (alt->desc.bInterfaceClass != USB_CLASS_AUDIO) { + printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u is not an AudioClass interface\n", dev->devnum, ctrlif, j); continue; } - if (iface->num_altsetting == 0) { - printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u has no working interface.\n", dev->devnum, ctrlif); + if (alt->desc.bInterfaceSubClass == 3) { + printk(KERN_INFO "usbaudio: device %d audiocontrol interface %u interface %u MIDIStreaming not supported\n", + dev->devnum, ctrlif, j); continue; } - if (iface->num_altsetting == 1) { - printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u has only 1 altsetting.\n", dev->devnum, ctrlif); + if (alt->desc.bInterfaceSubClass != 2) { + printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u invalid AudioClass subtype\n", + dev->devnum, ctrlif, j); continue; } - if (iface->altsetting[0].desc.bNumEndpoints > 0) { + if (alt->desc.bNumEndpoints > 0) { /* Check all endpoints; should they all have a bandwidth of 0 ? */ - for (k = 0; k < iface->altsetting[0].desc.bNumEndpoints; k++) { - if (iface->altsetting[0].endpoint[k].desc.wMaxPacketSize > 0) { + for (k = 0; k < alt->desc.bNumEndpoints; k++) { + if (alt->endpoint[k].desc.wMaxPacketSize > 0) { printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u endpoint %d does not have 0 bandwidth at alt[0]\n", dev->devnum, ctrlif, k); break; } } - if (k < iface->altsetting[0].desc.bNumEndpoints) + if (k < alt->desc.bNumEndpoints) continue; } - if (iface->altsetting[1].desc.bNumEndpoints < 1) { + + alt = usb_altnum_to_altsetting(iface, 1); + if (!alt) { + printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u has no altsetting 1\n", + dev->devnum, ctrlif, j); + continue; + } + if (alt->desc.bNumEndpoints < 1) { printk(KERN_ERR "usbaudio: device %d audiocontrol interface %u interface %u has no endpoint\n", dev->devnum, ctrlif, j); continue; } /* note: this requires the data endpoint to be ep0 and the optional sync ep to be ep1, which seems to be the case */ - if (iface->altsetting[1].endpoint[0].desc.bEndpointAddress & USB_DIR_IN) { + if (alt->endpoint[0].desc.bEndpointAddress & USB_DIR_IN) { if (numifin < USB_MAXINTERFACES) { ifin[numifin++] = j; usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1); @@ -3779,12 +3791,9 @@ const struct usb_device_id *id) { struct usb_device *dev = interface_to_usbdev (intf); - struct usb_host_config *config = dev->actconfig; struct usb_audio_state *s; unsigned char *buffer; - unsigned char buf[8]; - unsigned int i, buflen; - int ret; + unsigned int buflen; #if 0 printk(KERN_DEBUG "usbaudio: Probing if %i: IC %x, ISC %x\n", ifnum, @@ -3796,26 +3805,8 @@ * audiocontrol interface found * find which configuration number is active */ - i = dev->actconfig - config; - - ret = usb_get_descriptor(dev, USB_DT_CONFIG, i, buf, 8); - if (ret < 0) { - printk(KERN_ERR "usbaudio: cannot get first 8 bytes of config descriptor %d of device %d (error %d)\n", i, dev->devnum, ret); - return -EIO; - } - if (buf[1] != USB_DT_CONFIG || buf[0] < 9) { - printk(KERN_ERR "usbaudio: invalid config descriptor %d of device %d\n", i, dev->devnum); - return -EIO; - } - buflen = buf[2] | (buf[3] << 8); - if (!(buffer = kmalloc(buflen, GFP_KERNEL))) - return -ENOMEM; - ret = usb_get_descriptor(dev, USB_DT_CONFIG, i, buffer, buflen); - if (ret < 0) { - kfree(buffer); - printk(KERN_ERR "usbaudio: cannot get config descriptor %d of device %d (error %d)\n", i, dev->devnum, ret); - return -EIO; - } + buffer = dev->rawdescriptors[dev->actconfig - dev->config]; + buflen = dev->actconfig->desc.wTotalLength; s = usb_audio_parsecontrol(dev, buffer, buflen, intf->altsetting->desc.bInterfaceNumber); if (s) { usb_set_intfdata (intf, s); diff -Nru a/drivers/usb/class/bluetty.c b/drivers/usb/class/bluetty.c --- a/drivers/usb/class/bluetty.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/class/bluetty.c Wed Mar 17 19:29:10 2004 @@ -1025,7 +1025,7 @@ int num_bulk_in = 0; int num_bulk_out = 0; - interface = &intf->altsetting[0]; + interface = intf->cur_altsetting; control_out_endpoint = interface->desc.bInterfaceNumber; /* find the endpoints that we need */ diff -Nru a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c --- a/drivers/usb/class/cdc-acm.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/class/cdc-acm.c Wed Mar 17 19:29:09 2004 @@ -595,12 +595,12 @@ * is there it's not for call management ... so use * the cdc union descriptor whenever there is one. */ - ifcom = intf->altsetting + 0; + ifcom = intf->cur_altsetting; if (intf == cfacm->interface[j]) { - ifdata = cfacm->interface[j + 1]->altsetting + 0; + ifdata = cfacm->interface[j + 1]->cur_altsetting; data = cfacm->interface[j + 1]; } else if (intf == cfacm->interface[j + 1]) { - ifdata = cfacm->interface[j]->altsetting + 0; + ifdata = cfacm->interface[j]->cur_altsetting; data = cfacm->interface[j]; } else continue; diff -Nru a/drivers/usb/class/usb-midi.c b/drivers/usb/class/usb-midi.c --- a/drivers/usb/class/usb-midi.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/class/usb-midi.c Wed Mar 17 19:29:09 2004 @@ -39,9 +39,6 @@ #include #include -/** This declaration is missing from linux/usb.h **/ -extern int usb_get_string(struct usb_device *dev, unsigned short langid, unsigned char index, void *buf, int size); - #include "usb-midi.h" /* ------------------------------------------------------------------------- */ @@ -1519,15 +1516,17 @@ static int get_alt_setting( struct usb_device *d, int ifnum ) { int alts, alt=0; + struct usb_interface *iface; struct usb_host_interface *interface; struct usb_endpoint_descriptor *ep; int epin, epout; int i; - alts = d->actconfig->interface[ifnum]->num_altsetting; + iface = usb_ifnum_to_if( d, ifnum ); + alts = iface->num_altsetting; for ( alt=0 ; altactconfig->interface[ifnum]->altsetting[alt]; + interface = &iface->altsetting[alt]; epin = -1; epout = -1; @@ -1542,7 +1541,7 @@ epout = i; } if ( epin >= 0 && epout >= 0 ) { - return alt; + return interface->desc.bAlternateSetting; } } } @@ -1780,12 +1779,13 @@ * Called by usb_midi_probe(); **/ -static int detect_yamaha_device( struct usb_device *d, unsigned int ifnum, struct usb_midi_state *s) +static int detect_yamaha_device( struct usb_device *d, + struct usb_interface *iface, unsigned int ifnum, + struct usb_midi_state *s) { - struct usb_host_config *c = d->actconfig; struct usb_host_interface *interface; struct usb_midi_device *u; - unsigned char buf[USB_DT_CONFIG_SIZE], *buffer; + unsigned char *buffer; int bufSize; int i; int alts=-1; @@ -1795,13 +1795,13 @@ return -EINVAL; } - for ( i=0 ; i < c->interface[ifnum]->num_altsetting; i++ ) { - interface = c->interface[ifnum]->altsetting + i; + for ( i=0 ; i < iface->num_altsetting; i++ ) { + interface = iface->altsetting + i; if ( interface->desc.bInterfaceClass != 255 || interface->desc.bInterfaceSubClass != 0 ) continue; - alts = i; + alts = interface->desc.bAlternateSetting; } if ( alts == -1 ) { return -EINVAL; @@ -1810,30 +1810,11 @@ printk(KERN_INFO "usb-midi: Found YAMAHA USB-MIDI device on dev %04x:%04x, iface %d\n", d->descriptor.idVendor, d->descriptor.idProduct, ifnum); - ret = usb_get_descriptor( d, USB_DT_CONFIG, i, buf, USB_DT_CONFIG_SIZE ); - if ( ret < 0 ) { - printk(KERN_INFO "usb-midi: Could not get config (error=%d).\n", ret); - return -EINVAL; - } - if ( buf[1] != USB_DT_CONFIG || buf[0] < USB_DT_CONFIG_SIZE ) { - printk(KERN_INFO "usb-midi: config not as expected.\n"); - return -EINVAL; - } - bufSize = buf[2] | buf[3]<<8; - buffer = (unsigned char *)kmalloc(sizeof(unsigned char)*bufSize, GFP_KERNEL); - if ( !buffer ) { - printk(KERN_INFO "usb-midi: Could not allocate memory.\n"); - return -EINVAL; - } - ret = usb_get_descriptor( d, USB_DT_CONFIG, i, buffer, bufSize ); - if ( ret < 0 ) { - printk(KERN_INFO "usb-midi: Could not get full config (error=%d).\n", ret); - kfree(buffer); - return -EINVAL; - } + i = d->actconfig - d->config; + buffer = d->rawdescriptors[i]; + bufSize = d->actconfig->desc.wTotalLength; u = parse_descriptor( d, buffer, bufSize, ifnum, alts, 1); - kfree(buffer); if ( u == NULL ) { return -EINVAL; } @@ -1878,24 +1859,25 @@ * Returns 0 on success, negative on failure. * Called by usb_midi_probe(); **/ -static int detect_midi_subclass(struct usb_device *d, unsigned int ifnum, struct usb_midi_state *s) +static int detect_midi_subclass(struct usb_device *d, + struct usb_interface *iface, unsigned int ifnum, + struct usb_midi_state *s) { - struct usb_host_config *c = d->actconfig; struct usb_host_interface *interface; struct usb_midi_device *u; - unsigned char buf[USB_DT_CONFIG_SIZE], *buffer; + unsigned char *buffer; int bufSize; int i; int alts=-1; int ret; - for ( i=0 ; i < c->interface[ifnum]->num_altsetting; i++ ) { - interface = c->interface[ifnum]->altsetting + i; + for ( i=0 ; i < iface->num_altsetting; i++ ) { + interface = iface->altsetting + i; if ( interface->desc.bInterfaceClass != USB_CLASS_AUDIO || interface->desc.bInterfaceSubClass != USB_SUBCLASS_MIDISTREAMING ) continue; - alts = i; + alts = interface->desc.bAlternateSetting; } if ( alts == -1 ) { return -EINVAL; @@ -1915,30 +1897,11 @@ descriptor they modify or extend. */ - ret = usb_get_descriptor( d, USB_DT_CONFIG, i, buf, USB_DT_CONFIG_SIZE ); - if ( ret < 0 ) { - printk(KERN_INFO "usb-midi: Could not get config (error=%d).\n", ret); - return -EINVAL; - } - if ( buf[1] != USB_DT_CONFIG || buf[0] < USB_DT_CONFIG_SIZE ) { - printk(KERN_INFO "usb-midi: config not as expected.\n"); - return -EINVAL; - } - bufSize = buf[2] | buf[3]<<8; - buffer = (unsigned char *)kmalloc(sizeof(unsigned char)*bufSize, GFP_KERNEL); - if ( !buffer ) { - printk(KERN_INFO "usb-midi: Could not allocate memory.\n"); - return -EINVAL; - } - ret = usb_get_descriptor( d, USB_DT_CONFIG, i, buffer, bufSize ); - if ( ret < 0 ) { - printk(KERN_INFO "usb-midi: Could not get full config (error=%d).\n", ret); - kfree(buffer); - return -EINVAL; - } + i = d->actconfig - d->config; + buffer = d->rawdescriptors[i]; + bufSize = d->actconfig->desc.wTotalLength; u = parse_descriptor( d, buffer, bufSize, ifnum, alts, 0); - kfree(buffer); if ( u == NULL ) { return -EINVAL; } @@ -2002,7 +1965,7 @@ { struct usb_midi_state *s; struct usb_device *dev = interface_to_usbdev(intf); - int ifnum = intf->altsetting->desc.bInterfaceNumber; + int ifnum = intf->cur_altsetting->desc.bInterfaceNumber; s = (struct usb_midi_state *)kmalloc(sizeof(struct usb_midi_state), GFP_KERNEL); if ( !s ) @@ -2018,9 +1981,9 @@ if ( detect_by_hand( dev, ifnum, s ) && - detect_midi_subclass( dev, ifnum, s ) && + detect_midi_subclass( dev, intf, ifnum, s ) && detect_vendor_specific_device( dev, ifnum, s ) && - detect_yamaha_device( dev, ifnum, s) ) { + detect_yamaha_device( dev, intf, ifnum, s) ) { kfree(s); return -EIO; } diff -Nru a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c --- a/drivers/usb/class/usblp.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/class/usblp.c Wed Mar 17 19:29:09 2004 @@ -133,6 +133,7 @@ wait_queue_head_t wait; /* Zzzzz ... */ int readcount; /* Counter for reads */ int ifnum; /* Interface number */ + struct usb_interface *intf; /* The interface */ /* Alternate-setting numbers and endpoints for each protocol * (7/1/{index=1,2,3}) that the device supports: */ struct { @@ -609,8 +610,10 @@ while (writecount < count) { if (!usblp->wcomplete) { barrier(); - if (file->f_flags & O_NONBLOCK) + if (file->f_flags & O_NONBLOCK) { + writecount += transfer_length; return writecount ? writecount : -EAGAIN; + } timeout = USBLP_WRITE_TIMEOUT; add_wait_queue(&usblp->wait, &wait); @@ -670,7 +673,8 @@ usblp->writeurb->transfer_buffer_length = transfer_length; - if (copy_from_user(usblp->writeurb->transfer_buffer, buffer + writecount, transfer_length)) { + if (copy_from_user(usblp->writeurb->transfer_buffer, + buffer + writecount, transfer_length)) { up(&usblp->sem); return writecount ? writecount : -EFAULT; } @@ -837,7 +841,8 @@ usblp->dev = dev; init_MUTEX (&usblp->sem); init_waitqueue_head(&usblp->wait); - usblp->ifnum = intf->altsetting->desc.bInterfaceNumber; + usblp->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; + usblp->intf = intf; usblp->writeurb = usb_alloc_urb(0, GFP_KERNEL); if (!usblp->writeurb) { @@ -973,7 +978,7 @@ struct usb_endpoint_descriptor *epd, *epwrite, *epread; int p, i, e; - if_alt = usblp->dev->actconfig->interface[usblp->ifnum]; + if_alt = usblp->intf; for (p = 0; p < USBLP_MAX_PROTOCOLS; p++) usblp->protocol[p].alt_setting = -1; @@ -1022,7 +1027,8 @@ epread = NULL; } - usblp->protocol[ifd->desc.bInterfaceProtocol].alt_setting = i; + usblp->protocol[ifd->desc.bInterfaceProtocol].alt_setting = + ifd->desc.bAlternateSetting; usblp->protocol[ifd->desc.bInterfaceProtocol].epwrite = epwrite; usblp->protocol[ifd->desc.bInterfaceProtocol].epread = epread; } diff -Nru a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c --- a/drivers/usb/core/buffer.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/core/buffer.c Wed Mar 17 19:29:10 2004 @@ -51,8 +51,8 @@ * @hcd: the bus whose buffer pools are to be initialized * Context: !in_interrupt() * - * Call this as part of initializing a host controller that uses the pci dma - * memory allocators. It initializes some pools of dma-consistent memory that + * Call this as part of initializing a host controller that uses the dma + * memory allocators. It initializes some pools of dma-coherent memory that * will be shared by all drivers using that controller, or returns a negative * errno value on error. * @@ -115,6 +115,12 @@ struct usb_hcd *hcd = bus->hcpriv; int i; + /* some USB hosts just use PIO */ + if (!bus->controller->dma_mask) { + *dma = ~(dma_addr_t) 0; + return kmalloc (size, mem_flags); + } + for (i = 0; i < HCD_BUFFER_POOLS; i++) { if (size <= pool_max [i]) return dma_pool_alloc (hcd->pool [i], mem_flags, dma); @@ -134,6 +140,12 @@ if (!addr) return; + + if (!bus->controller->dma_mask) { + kfree (addr); + return; + } + for (i = 0; i < HCD_BUFFER_POOLS; i++) { if (size <= pool_max [i]) { dma_pool_free (hcd->pool [i], addr, dma); diff -Nru a/drivers/usb/core/config.c b/drivers/usb/core/config.c --- a/drivers/usb/core/config.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/config.c Wed Mar 17 19:29:09 2004 @@ -72,13 +72,10 @@ return buffer - buffer0; } -static void usb_release_intf(struct device *dev) +static void usb_free_intf(struct usb_interface *intf) { - struct usb_interface *intf; int j; - intf = to_usb_interface(dev); - if (intf->altsetting) { for (j = 0; j < intf->num_altsetting; j++) { struct usb_host_interface *as = &intf->altsetting[j]; @@ -235,8 +232,6 @@ return -ENOMEM; } memset(interface, 0, sizeof(struct usb_interface)); - interface->dev.release = usb_release_intf; - device_initialize(&interface->dev); } /* Go through the descriptors, checking their length and counting the @@ -374,7 +369,7 @@ struct usb_interface *ifp = cf->interface[i]; if (ifp) - put_device(&ifp->dev); + usb_free_intf(ifp); } } kfree(dev->config); diff -Nru a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c --- a/drivers/usb/core/devio.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/devio.c Wed Mar 17 19:29:09 2004 @@ -430,19 +430,14 @@ static int findintfif(struct usb_device *dev, unsigned int ifn) { - unsigned int i, j; - struct usb_interface *iface; - struct usb_host_interface *alts; + unsigned int i; if (ifn & ~0xff) return -EINVAL; for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) { - iface = dev->actconfig->interface[i]; - for (j = 0; j < iface->num_altsetting; j++) { - alts = &iface->altsetting[j]; - if (alts->desc.bInterfaceNumber == ifn) - return i; - } + if (dev->actconfig->interface[i]-> + altsetting[0].desc.bInterfaceNumber == ifn) + return i; } return -ENOENT; } @@ -688,9 +683,7 @@ return -EFAULT; if ((ret = findintfif(ps->dev, gd.interface)) < 0) return ret; - interface = usb_ifnum_to_if(ps->dev, gd.interface); - if (!interface) - return -EINVAL; + interface = ps->dev->actconfig->interface[ret]; if (!interface->driver) return -ENODATA; strcpy(gd.driver, interface->driver->name); @@ -744,9 +737,7 @@ return -EFAULT; if ((ret = findintfif(ps->dev, setintf.interface)) < 0) return ret; - interface = usb_ifnum_to_if(ps->dev, setintf.interface); - if (!interface) - return -EINVAL; + interface = ps->dev->actconfig->interface[ret]; if (interface->driver) { if ((ret = checkintf(ps, ret))) return ret; diff -Nru a/drivers/usb/core/driverfs.c b/drivers/usb/core/driverfs.c --- a/drivers/usb/core/driverfs.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/driverfs.c Wed Mar 17 19:29:09 2004 @@ -166,13 +166,9 @@ static ssize_t \ show_##field (struct device *dev, char *buf) \ { \ - struct usb_interface *intf; \ - int alt; \ + struct usb_interface *intf = to_usb_interface (dev); \ \ - intf = to_usb_interface (dev); \ - alt = intf->act_altsetting; \ - \ - return sprintf (buf, format_string, intf->altsetting[alt].desc.field); \ + return sprintf (buf, format_string, intf->cur_altsetting->desc.field); \ } \ static DEVICE_ATTR(field, S_IRUGO, show_##field, NULL); diff -Nru a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c --- a/drivers/usb/core/hcd-pci.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/hcd-pci.c Wed Mar 17 19:29:09 2004 @@ -147,8 +147,12 @@ hcd->driver = driver; hcd->description = driver->description; hcd->self.bus_name = pci_name(dev); +#ifdef CONFIG_PCI_NAMES + hcd->product_desc = dev->pretty_name; +#else if (hcd->product_desc == NULL) hcd->product_desc = "USB Host Controller"; +#endif hcd->self.controller = &dev->dev; if ((retval = hcd_buffer_create (hcd)) != 0) { diff -Nru a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c --- a/drivers/usb/core/hcd.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/hcd.c Wed Mar 17 19:29:09 2004 @@ -1213,7 +1213,7 @@ break; } if (tmp != &urb->urb_list) { - retval = -EINVAL; + retval = -EIDRM; goto done; } @@ -1294,7 +1294,7 @@ spin_unlock (&hcd_data_lock); spin_unlock_irqrestore (&urb->lock, flags); bye: - if (retval && sys && sys->driver) + if (retval != -EIDRM && sys && sys->driver) dev_dbg (sys, "hcd_unlink_urb %p fail %d\n", urb, retval); return retval; } diff -Nru a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/hub.c Wed Mar 17 19:29:09 2004 @@ -560,7 +560,7 @@ struct usb_hub *hub; unsigned long flags; - desc = intf->altsetting + intf->act_altsetting; + desc = intf->cur_altsetting; dev = interface_to_usbdev(intf); /* Some hubs have a subclass of 1, which AFAICT according to the */ @@ -1344,15 +1344,15 @@ for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) { struct usb_interface *intf = dev->actconfig->interface[i]; - struct usb_interface_descriptor *as; + struct usb_interface_descriptor *desc; - as = &intf->altsetting[intf->act_altsetting].desc; - ret = usb_set_interface(dev, as->bInterfaceNumber, - as->bAlternateSetting); + desc = &intf->cur_altsetting->desc; + ret = usb_set_interface(dev, desc->bInterfaceNumber, + desc->bAlternateSetting); if (ret < 0) { err("failed to set active alternate setting " "for dev %s interface %d (error=%d)", - dev->devpath, i, ret); + dev->devpath, desc->bInterfaceNumber, ret); return ret; } } diff -Nru a/drivers/usb/core/message.c b/drivers/usb/core/message.c --- a/drivers/usb/core/message.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/message.c Wed Mar 17 19:29:09 2004 @@ -783,16 +783,22 @@ */ void usb_disable_interface(struct usb_device *dev, struct usb_interface *intf) { - struct usb_host_interface *hintf = - &intf->altsetting[intf->act_altsetting]; + struct usb_host_interface *alt = intf->cur_altsetting; int i; - for (i = 0; i < hintf->desc.bNumEndpoints; ++i) { + for (i = 0; i < alt->desc.bNumEndpoints; ++i) { usb_disable_endpoint(dev, - hintf->endpoint[i].desc.bEndpointAddress); + alt->endpoint[i].desc.bEndpointAddress); } } +static void release_interface(struct device *dev) +{ + struct usb_interface *interface = to_usb_interface(dev); + + complete(interface->released); +} + /* * usb_disable_device - Disable all the endpoints for a USB device * @dev: the device whose endpoints are being disabled @@ -822,12 +828,16 @@ if (dev->actconfig) { for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) { struct usb_interface *interface; + struct completion intf_completion; /* remove this interface */ interface = dev->actconfig->interface[i]; dev_dbg (&dev->dev, "unregistering interface %s\n", interface->dev.bus_id); - device_del(&interface->dev); + init_completion (&intf_completion); + interface->released = &intf_completion; + device_unregister (&interface->dev); + wait_for_completion (&intf_completion); } dev->actconfig = 0; if (dev->state == USB_STATE_CONFIGURED) @@ -876,12 +886,11 @@ void usb_enable_interface(struct usb_device *dev, struct usb_interface *intf) { - struct usb_host_interface *hintf = - &intf->altsetting[intf->act_altsetting]; + struct usb_host_interface *alt = intf->cur_altsetting; int i; - for (i = 0; i < hintf->desc.bNumEndpoints; ++i) - usb_enable_endpoint(dev, &hintf->endpoint[i].desc); + for (i = 0; i < alt->desc.bNumEndpoints; ++i) + usb_enable_endpoint(dev, &alt->endpoint[i].desc); } /** @@ -920,6 +929,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) { struct usb_interface *iface; + struct usb_host_interface *alt; int ret; int manual = 0; @@ -929,14 +939,15 @@ return -EINVAL; } - if (alternate < 0 || alternate >= iface->num_altsetting) + alt = usb_altnum_to_altsetting(iface, alternate); + if (!alt) { + warn("selecting invalid altsetting %d", alternate); return -EINVAL; + } ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE, - iface->altsetting[alternate] - .desc.bAlternateSetting, - interface, NULL, 0, HZ * 5); + alternate, interface, NULL, 0, HZ * 5); /* 9.4.10 says devices don't need this and are free to STALL the * request if the interface only has one alternate setting. @@ -957,7 +968,7 @@ /* prevent submissions using previous endpoint settings */ usb_disable_interface(dev, iface); - iface->act_altsetting = alternate; + iface->cur_altsetting = alt; /* If the interface only has one altsetting and the device didn't * accept the request, we attempt to carry out the equivalent action @@ -965,13 +976,11 @@ * new altsetting. */ if (manual) { - struct usb_host_interface *iface_as = - &iface->altsetting[alternate]; int i; - for (i = 0; i < iface_as->desc.bNumEndpoints; i++) { + for (i = 0; i < alt->desc.bNumEndpoints; i++) { unsigned int epaddr = - iface_as->endpoint[i].desc.bEndpointAddress; + alt->endpoint[i].desc.bEndpointAddress; unsigned int pipe = __create_pipe(dev, USB_ENDPOINT_NUMBER_MASK & epaddr) | (usb_endpoint_out(epaddr) ? USB_DIR_OUT : USB_DIR_IN); @@ -1045,8 +1054,19 @@ /* re-init hc/hcd interface/endpoint state */ for (i = 0; i < config->desc.bNumInterfaces; i++) { struct usb_interface *intf = config->interface[i]; + struct usb_host_interface *alt; + + alt = usb_altnum_to_altsetting(intf, 0); - intf->act_altsetting = 0; + /* No altsetting 0? We'll assume the first altsetting. + * We could use a GetInterface call, but if a device is + * so non-compliant that it doesn't have altsetting 0 + * then I wouldn't trust its reply anyway. + */ + if (!alt) + alt = &intf->altsetting[0]; + + intf->cur_altsetting = alt; usb_enable_interface(dev, intf); } return 0; @@ -1135,25 +1155,34 @@ */ for (i = 0; i < cp->desc.bNumInterfaces; ++i) { struct usb_interface *intf = cp->interface[i]; - struct usb_interface_descriptor *desc; + struct usb_host_interface *alt; - intf->act_altsetting = 0; - desc = &intf->altsetting [0].desc; - usb_enable_interface(dev, intf); + alt = usb_altnum_to_altsetting(intf, 0); + /* No altsetting 0? We'll assume the first altsetting. + * We could use a GetInterface call, but if a device is + * so non-compliant that it doesn't have altsetting 0 + * then I wouldn't trust its reply anyway. + */ + if (!alt) + alt = &intf->altsetting[0]; + + intf->cur_altsetting = alt; + usb_enable_interface(dev, intf); intf->dev.parent = &dev->dev; intf->dev.driver = NULL; intf->dev.bus = &usb_bus_type; intf->dev.dma_mask = dev->dev.dma_mask; + intf->dev.release = release_interface; sprintf (&intf->dev.bus_id[0], "%d-%s:%d.%d", dev->bus->busnum, dev->devpath, configuration, - desc->bInterfaceNumber); + alt->desc.bInterfaceNumber); dev_dbg (&dev->dev, "registering %s (config #%d, interface %d)\n", intf->dev.bus_id, configuration, - desc->bInterfaceNumber); - device_add (&intf->dev); + alt->desc.bInterfaceNumber); + device_register (&intf->dev); usb_create_driverfs_intf_files (intf); } } diff -Nru a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c --- a/drivers/usb/core/urb.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/urb.c Wed Mar 17 19:29:09 2004 @@ -116,7 +116,8 @@ * describing that request to the USB subsystem. Request completion will * be indicated later, asynchronously, by calling the completion handler. * The three types of completion are success, error, and unlink - * (also called "request cancellation"). + * (a software-induced fault, also called "request cancelation"). + * * URBs may be submitted in interrupt context. * * The caller must have correctly initialized the URB before submitting @@ -127,12 +128,23 @@ * * Successful submissions return 0; otherwise this routine returns a * negative error number. If the submission is successful, the complete() - * callback from the urb will be called exactly once, when the USB core and - * host controller driver are finished with the urb. When the completion + * callback from the URB will be called exactly once, when the USB core and + * Host Controller Driver (HCD) are finished with the URB. When the completion * function is called, control of the URB is returned to the device * driver which issued the request. The completion handler may then * immediately free or reuse that URB. * + * With few exceptions, USB device drivers should never access URB fields + * provided by usbcore or the HCD until its complete() is called. + * The exceptions relate to periodic transfer scheduling. For both + * interrupt and isochronous urbs, as part of successful URB submission + * urb->interval is modified to reflect the actual transfer period used + * (normally some power of two units). And for isochronous urbs, + * urb->start_frame is modified to reflect when the URB's transfers were + * scheduled to start. Not all isochronous transfer scheduling policies + * will work, but most host controller drivers should easily handle ISO + * queues going from now until 10-200 msec into the future. + * * For control endpoints, the synchronous usb_control_msg() call is * often used (in non-interrupt context) instead of this call. * That is often used through convenience wrappers, for the requests @@ -143,15 +155,17 @@ * * URBs may be submitted to endpoints before previous ones complete, to * minimize the impact of interrupt latencies and system overhead on data - * throughput. This is required for continuous isochronous data streams, + * throughput. With that queuing policy, an endpoint's queue would never + * be empty. This is required for continuous isochronous data streams, * and may also be required for some kinds of interrupt transfers. Such - * queueing also maximizes bandwidth utilization by letting USB controllers + * queuing also maximizes bandwidth utilization by letting USB controllers * start work on later requests before driver software has finished the - * completion processing for earlier requests. + * completion processing for earlier (successful) requests. * - * Bulk and Isochronous URBs may always be queued. At this writing, all - * mainstream host controller drivers support queueing for control and - * interrupt transfer requests. + * As of Linux 2.6, all USB endpoint transfer queues support depths greater + * than one. This was previously a HCD-specific behavior, except for ISO + * transfers. Non-isochronous endpoint queues are inactive during cleanup + * after faults (transfer errors or cancelation). * * Reserved Bandwidth Transfers: * @@ -389,7 +403,7 @@ * When the URB_ASYNC_UNLINK transfer flag for the URB is clear, this * request is synchronous. Success is indicated by returning zero, * at which time the urb will have been unlinked and its completion - * handler will have been called with urb->status -ENOENT. Failure is + * handler will have been called with urb->status == -ENOENT. Failure is * indicated by any other return value. * * The synchronous cancelation mode may not be used @@ -400,8 +414,37 @@ * When the URB_ASYNC_UNLINK transfer flag for the URB is set, this * request is asynchronous. Success is indicated by returning -EINPROGRESS, * at which time the urb will normally not have been unlinked. - * The completion function will see urb->status -ECONNRESET. Failure + * The completion function will see urb->status == -ECONNRESET. Failure * is indicated by any other return value. + * + * Unlinking and Endpoint Queues: + * + * Host Controller Driver (HCDs) place all the URBs for a particular + * endpoint in a queue. Normally the queue advances as the controller + * hardware processes each request. But when an URB terminates with any + * fault (such as an error, or being unlinked) its queue stops, at least + * until that URB's completion routine returns. It is guaranteed that + * the queue will not restart until all its unlinked URBs have been fully + * retired, with their completion routines run, even if that's not until + * some time after the original completion handler returns. + * + * This means that USB device drivers can safely build deep queues for + * large or complex transfers, and clean them up reliably after any sort + * of aborted transfer by unlinking all pending URBs at the first fault. + * + * Note that an URB terminating early because a short packet was received + * will count as an error if and only if the URB_SHORT_NOT_OK flag is set. + * Also, that all unlinks performed in any URB completion handler must + * be asynchronous. + * + * Queues for isochronous endpoints are treated differently, because they + * advance at fixed rates. Such queues do not stop when an URB is unlinked. + * An unlinked URB may leave a gap in the stream of packets. It is undefined + * whether such gaps can be filled in. + * + * When control URBs terminates with an error, it is likely that the + * status stage of the transfer will not take place, even if it is merely + * a soft error resulting from a short-packet with URB_SHORT_NOT_OK set. */ int usb_unlink_urb(struct urb *urb) { diff -Nru a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c --- a/drivers/usb/core/usb.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/core/usb.c Wed Mar 17 19:29:09 2004 @@ -189,7 +189,7 @@ } /** - * usb_ifnum_to_if - get the interface object with a given interface number (usbcore-internal) + * usb_ifnum_to_if - get the interface object with a given interface number * @dev: the device whose current configuration is considered * @ifnum: the desired interface * @@ -220,6 +220,33 @@ } /** + * usb_altnum_to_altsetting - get the altsetting structure with a given + * alternate setting number. + * @intf: the interface containing the altsetting in question + * @altnum: the desired alternate setting number + * + * This searches the altsetting array of the specified interface for + * an entry with the correct bAlternateSetting value and returns a pointer + * to that entry, or null. + * + * Note that altsettings need not be stored sequentially by number, so + * it would be incorrect to assume that the first altsetting entry in + * the array corresponds to altsetting zero. This routine helps device + * drivers avoid such mistakes. + */ +struct usb_host_interface *usb_altnum_to_altsetting(struct usb_interface *intf, + unsigned int altnum) +{ + int i; + + for (i = 0; i < intf->num_altsetting; i++) { + if (intf->altsetting[i].desc.bAlternateSetting == altnum) + return &intf->altsetting[i]; + } + return NULL; +} + +/** * usb_epnum_to_ep_desc - get the endpoint object with a given endpoint number * @dev: the device whose current configuration+altsettings is considered * @epnum: the desired endpoint, masked with USB_DIR_IN as appropriate. @@ -247,7 +274,7 @@ /* only endpoints in current altsetting are active */ intf = config->interface[i]; - alt = intf->altsetting + intf->act_altsetting; + alt = intf->cur_altsetting; for (k = 0; k < alt->desc.bNumEndpoints; k++) if (epnum == alt->endpoint[k].desc.bEndpointAddress) @@ -421,7 +448,7 @@ if (id == NULL) return NULL; - intf = &interface->altsetting [interface->act_altsetting]; + intf = interface->cur_altsetting; dev = interface_to_usbdev(interface); /* It is important to check that id->driver_info is nonzero, @@ -624,7 +651,7 @@ scratch += length; if (usb_dev->descriptor.bDeviceClass == 0) { - int alt = intf->act_altsetting; + struct usb_host_interface *alt = intf->cur_altsetting; /* 2.4 only exposed interface zero. in 2.5, hotplug * agents are called for all interfaces, and can use @@ -633,9 +660,9 @@ envp [i++] = scratch; length += snprintf (scratch, buffer_size - length, "INTERFACE=%d/%d/%d", - intf->altsetting[alt].desc.bInterfaceClass, - intf->altsetting[alt].desc.bInterfaceSubClass, - intf->altsetting[alt].desc.bInterfaceProtocol); + alt->desc.bInterfaceClass, + alt->desc.bInterfaceSubClass, + alt->desc.bInterfaceProtocol); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; ++length; @@ -1598,6 +1625,7 @@ EXPORT_SYMBOL(usb_match_id); EXPORT_SYMBOL(usb_find_interface); EXPORT_SYMBOL(usb_ifnum_to_if); +EXPORT_SYMBOL(usb_altnum_to_altsetting); EXPORT_SYMBOL(usb_reset_device); EXPORT_SYMBOL(usb_disconnect); diff -Nru a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig --- a/drivers/usb/gadget/Kconfig Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/gadget/Kconfig Wed Mar 17 19:29:09 2004 @@ -3,6 +3,15 @@ # (a) a peripheral controller, and # (b) the gadget driver using it. # +# NOTE: Gadget support ** DOES NOT ** depend on host-side CONFIG_USB !! +# +# - Host systems (like PCs) need CONFIG_USB (with "A" jacks). +# - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks). +# - Some systems have both kinds of of controller. +# +# With help from a special transceiver and a "Mini-AB" jack, systems with +# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG). +# menu "USB Gadget Support" config USB_GADGET @@ -11,7 +20,7 @@ USB is a master/slave protocol, organized with one master host (such as a PC) controlling up to 127 peripheral devices. The USB hardware is asymmetric, which makes it easier to set up: - you can't connect two "to-the-host" connectors to each other. + you can't connect a "to-the-host" connector to a peripheral. Linux can run in the host, or in the peripheral. In both cases you need a low level bus controller driver, and some software @@ -43,6 +52,7 @@ config USB_GADGET_NET2280 boolean "NetChip 2280" depends on PCI + select USB_GADGET_DUALSPEED help NetChip 2280 is a PCI based USB peripheral controller which supports both full and high speed USB 2.0 data transfers. @@ -126,6 +136,13 @@ endchoice +config USB_GADGET_DUALSPEED + bool + depends on USB_GADGET + default n + help + Means that gadget drivers should include extra descriptors + and code to handle dual-speed controllers. # # USB Gadget Drivers diff -Nru a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile --- a/drivers/usb/gadget/Makefile Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/gadget/Makefile Wed Mar 17 19:29:09 2004 @@ -8,8 +8,8 @@ # # USB gadget drivers # -g_zero-objs := zero.o usbstring.o -g_ether-objs := ether.o usbstring.o +g_zero-objs := zero.o usbstring.o config.o +g_ether-objs := ether.o usbstring.o config.o g_serial-objs := serial.o usbstring.o gadgetfs-objs := inode.o usbstring.o g_file_storage-objs := file_storage.o usbstring.o diff -Nru a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/usb/gadget/config.c Wed Mar 17 19:29:10 2004 @@ -0,0 +1,116 @@ +/* + * usb/gadget/config.c -- simplify building config descriptors + * + * Copyright (C) 2003 David Brownell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include + +#include + + +/** + * usb_descriptor_fillbuf - fill buffer with descriptors + * @buf: Buffer to be filled + * @buflen: Size of buf + * @src: Array of descriptor pointers, terminated by null pointer. + * + * Copies descriptors into the buffer, returning the length or a + * negative error code if they can't all be copied. Useful when + * assembling descriptors for an associated set of interfaces used + * as part of configuring a composite device; or in other cases where + * sets of descriptors need to be marshaled. + */ +int +usb_descriptor_fillbuf(void *buf, unsigned buflen, + const struct usb_descriptor_header **src) +{ + u8 *dest = buf; + + if (!src) + return -EINVAL; + + /* fill buffer from src[] until null descriptor ptr */ + for (; 0 != *src; src++) { + unsigned len = (*src)->bLength; + + if (len > buflen) + return -EINVAL; + memcpy(dest, *src, len); + buflen -= len; + dest += len; + } + return dest - (u8 *)buf; +} + + +/** + * usb_gadget_config_buf - builts a complete configuration descriptor + * @config: Header for the descriptor, including characteristics such + * as power requirements and number of interfaces. + * @desc: Null-terminated vector of pointers to the descriptors (interface, + * endpoint, etc) defining all functions in this device configuration. + * @buf: Buffer for the resulting configuration descriptor. + * @length: Length of buffer. If this is not big enough to hold the + * entire configuration descriptor, an error code will be returned. + * + * This copies descriptors into the response buffer, building a descriptor + * for that configuration. It returns the buffer length or a negative + * status code. The config.wTotalLength field is set to match the length + * of the result, but other descriptor fields (including power usage and + * interface count) must be set by the caller. + * + * Gadget drivers could use this when constructing a config descriptor + * in response to USB_REQ_GET_DESCRIPTOR. They will need to patch the + * resulting bDescriptorType value if USB_DT_OTHER_SPEED_CONFIG is needed. + */ +int usb_gadget_config_buf( + const struct usb_config_descriptor *config, + void *buf, + unsigned length, + const struct usb_descriptor_header **desc +) +{ + struct usb_config_descriptor *cp = buf; + int len; + + /* config descriptor first */ + if (length < USB_DT_CONFIG_SIZE || !desc) + return -EINVAL; + *cp = *config; + + /* then interface/endpoint/class/vendor/... */ + len = usb_descriptor_fillbuf(USB_DT_CONFIG_SIZE + (u8*)buf, + length - USB_DT_CONFIG_SIZE, desc); + if (len < 0) + return len; + len += USB_DT_CONFIG_SIZE; + if (len > 0xffff) + return -EINVAL; + + /* patch up the config descriptor */ + cp->bLength = USB_DT_CONFIG_SIZE; + cp->bDescriptorType = USB_DT_CONFIG; + cp->wTotalLength = cpu_to_le16(len); + cp->bmAttributes |= USB_CONFIG_ATT_ONE; + return len; +} + diff -Nru a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c --- a/drivers/usb/gadget/ether.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/gadget/ether.c Wed Mar 17 19:29:10 2004 @@ -124,7 +124,6 @@ * DRIVER_VERSION_NUM ... alerts the host side driver to differences * EP_*_NAME ... which endpoints do we use for which purpose? * EP_*_NUM ... numbers for them (often limited by hardware) - * HIGHSPEED ... define if ep0 and descriptors need high speed support * WAKEUP ... if hardware supports remote wakeup AND we will issue the * usb_gadget_wakeup() call to initiate it, USB_CONFIG_ATT_WAKEUP * @@ -162,7 +161,6 @@ #define EP_IN_NUM 2 static const char EP_STATUS_NAME [] = "ep-f"; #define EP_STATUS_NUM 3 -#define HIGHSPEED /* supports remote wakeup, but this driver doesn't */ extern int net2280_set_fifo_mode (struct usb_gadget *gadget, int mode); @@ -311,7 +309,7 @@ #define DEFAULT_QLEN 2 /* double buffering by default */ #endif -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED static unsigned qmult = 5; module_param (qmult, uint, S_IRUGO|S_IWUSR); @@ -324,7 +322,7 @@ /* also defer IRQs on highspeed TX */ #define TX_DELAY DEFAULT_QLEN -#else /* !HIGHSPEED ... full speed: */ +#else /* full speed (low speed doesn't do bulk) */ #define qlen(gadget) DEFAULT_QLEN #endif @@ -607,7 +605,26 @@ .wMaxPacketSize = __constant_cpu_to_le16 (64), }; -#ifdef HIGHSPEED +static const struct usb_descriptor_header *fs_function [] = { +#ifdef DEV_CONFIG_CDC + /* "cdc" mode descriptors */ + (struct usb_descriptor_header *) &control_intf, + (struct usb_descriptor_header *) &header_desc, + (struct usb_descriptor_header *) &union_desc, + (struct usb_descriptor_header *) ðer_desc, +#ifdef EP_STATUS_NUM + (struct usb_descriptor_header *) &fs_status_desc, +#endif + (struct usb_descriptor_header *) &data_nop_intf, +#endif /* DEV_CONFIG_CDC */ + /* minimalist core */ + (struct usb_descriptor_header *) &data_intf, + (struct usb_descriptor_header *) &fs_source_desc, + (struct usb_descriptor_header *) &fs_sink_desc, + 0, +}; + +#ifdef CONFIG_USB_GADGET_DUALSPEED /* * usb 2.0 devices need to expose both high speed and full speed @@ -660,6 +677,25 @@ .bNumConfigurations = 1, }; +static const struct usb_descriptor_header *hs_function [] = { +#ifdef DEV_CONFIG_CDC + /* "cdc" mode descriptors */ + (struct usb_descriptor_header *) &control_intf, + (struct usb_descriptor_header *) &header_desc, + (struct usb_descriptor_header *) &union_desc, + (struct usb_descriptor_header *) ðer_desc, +#ifdef EP_STATUS_NUM + (struct usb_descriptor_header *) &hs_status_desc, +#endif + (struct usb_descriptor_header *) &data_nop_intf, +#endif /* DEV_CONFIG_CDC */ + /* minimalist core */ + (struct usb_descriptor_header *) &data_intf, + (struct usb_descriptor_header *) &hs_source_desc, + (struct usb_descriptor_header *) &hs_sink_desc, + 0, +}; + /* maxpacket and other transfer characteristics vary by speed. */ #define ep_desc(g,hs,fs) (((g)->speed==USB_SPEED_HIGH)?(hs):(fs)) @@ -669,7 +705,7 @@ /* if there's no high speed support, maxpacket doesn't change. */ #define ep_desc(g,hs,fs) fs -#endif /* !HIGHSPEED */ +#endif /* !CONFIG_USB_GADGET_DUALSPEED */ /*-------------------------------------------------------------------------*/ @@ -704,86 +740,25 @@ static int config_buf (enum usb_device_speed speed, u8 *buf, u8 type, unsigned index) { - const unsigned config_len = USB_DT_CONFIG_SIZE -#ifdef DEV_CONFIG_CDC - + 2 * USB_DT_INTERFACE_SIZE - + sizeof header_desc - + sizeof union_desc - + sizeof ether_desc -#ifdef EP_STATUS_NUM - + USB_DT_ENDPOINT_SIZE -#endif -#endif /* DEV_CONFIG_CDC */ - + USB_DT_INTERFACE_SIZE - + 2 * USB_DT_ENDPOINT_SIZE; + int len; + const struct usb_descriptor_header **function = fs_function; +#ifdef CONFIG_USB_GADGET_DUALSPEED + int hs = (speed == USB_SPEED_HIGH); -#ifdef HIGHSPEED - int hs; -#endif - /* a single configuration must always be index 0 */ - if (index > 0) - return -EINVAL; - if (config_len > USB_BUFSIZ) - return -EDOM; - - /* config (or other speed config) */ - memcpy (buf, ð_config, USB_DT_CONFIG_SIZE); - buf [1] = type; - ((struct usb_config_descriptor *) buf)->wTotalLength - = __constant_cpu_to_le16 (config_len); - buf += USB_DT_CONFIG_SIZE; -#ifdef HIGHSPEED - hs = (speed == USB_SPEED_HIGH); if (type == USB_DT_OTHER_SPEED_CONFIG) hs = !hs; -#endif - -#ifdef DEV_CONFIG_CDC - /* control interface, class descriptors, optional status endpoint */ - memcpy (buf, &control_intf, USB_DT_INTERFACE_SIZE); - buf += USB_DT_INTERFACE_SIZE; - - memcpy (buf, &header_desc, sizeof header_desc); - buf += sizeof header_desc; - memcpy (buf, &union_desc, sizeof union_desc); - buf += sizeof union_desc; - memcpy (buf, ðer_desc, sizeof ether_desc); - buf += sizeof ether_desc; - -#ifdef EP_STATUS_NUM -#ifdef HIGHSPEED if (hs) - memcpy (buf, &hs_status_desc, USB_DT_ENDPOINT_SIZE); - else -#endif /* HIGHSPEED */ - memcpy (buf, &fs_status_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; -#endif /* EP_STATUS_NUM */ - - /* default data altsetting has no endpoints */ - memcpy (buf, &data_nop_intf, USB_DT_INTERFACE_SIZE); - buf += USB_DT_INTERFACE_SIZE; -#endif /* DEV_CONFIG_CDC */ - - /* the "real" data interface has two endpoints */ - memcpy (buf, &data_intf, USB_DT_INTERFACE_SIZE); - buf += USB_DT_INTERFACE_SIZE; -#ifdef HIGHSPEED - if (hs) { - memcpy (buf, &hs_source_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - memcpy (buf, &hs_sink_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - } else + function = hs_function; #endif - { - memcpy (buf, &fs_source_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - memcpy (buf, &fs_sink_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - } - return config_len; + /* a single configuration must always be index 0 */ + if (index > 0) + return -EINVAL; + len = usb_gadget_config_buf (ð_config, buf, USB_BUFSIZ, function); + if (len < 0) + return len; + ((struct usb_config_descriptor *) buf)->bDescriptorType = type; + return len; } /*-------------------------------------------------------------------------*/ @@ -992,7 +967,7 @@ switch (gadget->speed) { case USB_SPEED_FULL: speed = "full"; break; -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED case USB_SPEED_HIGH: speed = "high"; break; #endif default: speed = "?"; break; @@ -1163,15 +1138,19 @@ value = min (ctrl->wLength, (u16) sizeof device_desc); memcpy (req->buf, &device_desc, value); break; -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED case USB_DT_DEVICE_QUALIFIER: + if (!gadget->is_dualspeed) + break; value = min (ctrl->wLength, (u16) sizeof dev_qualifier); memcpy (req->buf, &dev_qualifier, value); break; case USB_DT_OTHER_SPEED_CONFIG: + if (!gadget->is_dualspeed) + break; // FALLTHROUGH -#endif /* HIGHSPEED */ +#endif /* CONFIG_USB_GADGET_DUALSPEED */ case USB_DT_CONFIG: value = config_buf (gadget->speed, req->buf, ctrl->wValue >> 8, @@ -1675,7 +1654,7 @@ #endif req->length = length; -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED /* throttle highspeed IRQ rate back slightly */ req->no_interrupt = (dev->gadget->speed == USB_SPEED_HIGH) ? ((atomic_read (&dev->tx_qlen) % TX_DELAY) != 0) @@ -1798,7 +1777,7 @@ #endif device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket; -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED /* assumes ep0 uses the same value for both speeds ... */ dev_qualifier.bMaxPacketSize0 = device_desc.bMaxPacketSize0; #endif @@ -1894,7 +1873,7 @@ /*-------------------------------------------------------------------------*/ static struct usb_gadget_driver eth_driver = { -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED .speed = USB_SPEED_HIGH, #else .speed = USB_SPEED_FULL, diff -Nru a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/usb/gadget/gadget_chips.h Wed Mar 17 19:29:10 2004 @@ -0,0 +1,57 @@ +/* + * USB device controllers have lots of quirks. Use these macros in + * gadget drivers or other code that needs to deal with them, and which + * autoconfigures instead of using early binding to the hardware. + * + * This could eventually work like the ARM mach_is_*() stuff, driven by + * some config file that gets updated as new hardware is supported. + * + * NOTE: some of these controller drivers may not be available yet. + */ +#ifdef CONFIG_USB_GADGET_NET2280 +#define gadget_is_net2280(g) !strcmp("net2280", (g)->name) +#else +#define gadget_is_net2280(g) 0 +#endif + +#ifdef CONFIG_USB_GADGET_PXA +#define gadget_is_pxa(g) !strcmp("pxa2xx_udc", (g)->name) +#else +#define gadget_is_pxa(g) 0 +#endif + +#ifdef CONFIG_USB_GADGET_GOKU +#define gadget_is_goku(g) !strcmp("goku_udc", (g)->name) +#else +#define gadget_is_goku(g) 0 +#endif + +#ifdef CONFIG_USB_GADGET_SUPERH +#define gadget_is_sh(g) !strcmp("sh_udc", (g)->name) +#else +#define gadget_is_sh(g) 0 +#endif + +#ifdef CONFIG_USB_GADGET_SA1100 +#define gadget_is_sa1100(g) !strcmp("sa1100_udc", (g)->name) +#else +#define gadget_is_sa1100(g) 0 +#endif + +#ifdef CONFIG_USB_GADGET_MQ11XX +#define gadget_is_mq11xx(g) !strcmp("mq11xx_udc", (g)->name) +#else +#define gadget_is_mq11xx(g) 0 +#endif + +#ifdef CONFIG_USB_GADGET_OMAP +#define gadget_is_omap(g) !strcmp("omap_udc", (g)->name) +#else +#define gadget_is_omap(g) 0 +#endif + +// CONFIG_USB_GADGET_AT91RM9200 +// CONFIG_USB_GADGET_SX2 +// CONFIG_USB_GADGET_AU1X00 +// ... + diff -Nru a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c --- a/drivers/usb/gadget/net2280.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/gadget/net2280.c Wed Mar 17 19:29:09 2004 @@ -2663,7 +2663,7 @@ /* tear down the binding between this driver and the pci device */ -static void __exit net2280_remove (struct pci_dev *pdev) +static void net2280_remove (struct pci_dev *pdev) { struct net2280 *dev = pci_get_drvdata (pdev); @@ -2736,6 +2736,7 @@ spin_lock_init (&dev->lock); dev->pdev = pdev; dev->gadget.ops = &net2280_ops; + dev->gadget.is_dualspeed = 1; /* the "gadget" abstracts/virtualizes the controller */ strcpy (dev->gadget.dev.bus_id, "gadget"); @@ -2884,7 +2885,7 @@ .id_table = pci_ids, .probe = net2280_probe, - .remove = __exit_p(net2280_remove), + .remove = net2280_remove, /* FIXME add power management support */ }; diff -Nru a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c --- a/drivers/usb/gadget/usbstring.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/gadget/usbstring.c Wed Mar 17 19:29:09 2004 @@ -16,24 +16,89 @@ #include #include +#include + + +static int utf8_to_utf16le(const char *s, u16 *cp, unsigned len) +{ + int count = 0; + u8 c; + u16 uchar; + + /* this insists on correct encodings, though not minimal ones. + * BUT it currently rejects legit 4-byte UTF-8 code points, + * which need surrogate pairs. (Unicode 3.1 can use them.) + */ + while (len != 0 && (c = (u8) *s++) != 0) { + if (unlikely(c & 0x80)) { + // 2-byte sequence: + // 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx + if ((c & 0xe0) == 0xc0) { + uchar = (c & 0x1f) << 6; + + c = (u8) *s++; + if ((c & 0xc0) != 0xc0) + goto fail; + c &= 0x3f; + uchar |= c; + + // 3-byte sequence (most CJKV characters): + // zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx + } else if ((c & 0xf0) == 0xe0) { + uchar = (c & 0x0f) << 12; + + c = (u8) *s++; + if ((c & 0xc0) != 0xc0) + goto fail; + c &= 0x3f; + uchar |= c << 6; + + c = (u8) *s++; + if ((c & 0xc0) != 0xc0) + goto fail; + c &= 0x3f; + uchar |= c; + + /* no bogus surrogates */ + if (0xd800 <= uchar && uchar <= 0xdfff) + goto fail; + + // 4-byte sequence (surrogate pairs, currently rare): + // 11101110wwwwzzzzyy + 110111yyyyxxxxxx + // = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx + // (uuuuu = wwww + 1) + // FIXME accept the surrogate code points (only) + + } else + goto fail; + } else + uchar = c; + put_unaligned (cpu_to_le16 (uchar), cp++); + count++; + len--; + } + return count; +fail: + return -1; +} + /** * usb_gadget_get_string - fill out a string descriptor - * @table: of c strings using iso latin/1 characters + * @table: of c strings encoded using UTF-8 * @id: string id, from low byte of wValue in get string descriptor * @buf: at least 256 bytes * - * Finds the iso latin/1 string matching the ID, and converts it into a + * Finds the UTF-8 string matching the ID, and converts it into a * string descriptor in utf16-le. * Returns length of descriptor (always even) or negative errno * - * If your driver needs stings in multiple languages, you'll need to - * to use some alternate solution for languages where the ISO 8859/1 - * (latin/1) character set can't be used. For example, they can't be - * used with Chinese (Big5, GB2312, etc), Japanese, Korean, or many other - * languages. You'd likely "switch (wIndex) { ... }" in your ep0 - * string descriptor logic, using this routine in cases where "western - * european" characters suffice for the strings being returned. + * If your driver needs stings in multiple languages, you'll probably + * "switch (wIndex) { ... }" in your ep0 string descriptor logic, + * using this routine after choosing which set of UTF-8 strings to use. + * Note that US-ASCII is a strict subset of UTF-8; any string bytes with + * the eighth bit set will be multibyte UTF-8 characters, not ISO-8859/1 + * characters (which are also widely used in C strings). */ int usb_gadget_get_string (struct usb_gadget_strings *table, int id, u8 *buf) @@ -59,13 +124,12 @@ /* string descriptors have length, tag, then UTF16-LE text */ len = min ((size_t) 126, strlen (s->s)); + memset (buf + 2, 0, 2 * len); /* zero all the bytes */ + len = utf8_to_utf16le(s->s, (u16 *)&buf[2], len); + if (len < 0) + return -EINVAL; buf [0] = (len + 1) * 2; buf [1] = USB_DT_STRING; - memset (buf + 2, 0, 2 * len); /* zero all the high bytes */ - while (len) { - buf [2 * len] = s->s [len - 1]; - len--; - } return buf [0]; } diff -Nru a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c --- a/drivers/usb/gadget/zero.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/gadget/zero.c Wed Mar 17 19:29:09 2004 @@ -1,7 +1,7 @@ /* * zero.c -- Gadget Zero, for USB development * - * Copyright (C) 2003 David Brownell + * Copyright (C) 2003-2004 David Brownell * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -103,6 +103,11 @@ /*-------------------------------------------------------------------------*/ /* + * driver assumes self-powered hardware, and + * has no way for users to trigger remote wakeup. + */ + +/* * hardware-specific configuration, controlled by which device * controller driver was configured. * @@ -110,11 +115,6 @@ * DRIVER_VERSION_NUM ... alerts the host side driver to differences * EP_*_NAME ... which endpoints do we use for which purpose? * EP_*_NUM ... numbers for them (often limited by hardware) - * HIGHSPEED ... define if ep0 and descriptors need high speed support - * MAX_USB_POWER ... define if we use other than 100 mA bus current - * SELFPOWER ... if we can run on bus power, zero - * WAKEUP ... if hardware supports remote wakeup AND we will issue the - * usb_gadget_wakeup() call to initiate it, USB_CONFIG_ATT_WAKEUP * * add other defines for other portability issues, like hardware that * for some reason doesn't handle full speed bulk maxpacket of 64. @@ -138,9 +138,6 @@ #define EP_OUT_NUM 2 static const char EP_IN_NAME [] = "ep-b"; #define EP_IN_NUM 2 -#define HIGHSPEED -/* specific hardware configs could be bus-powered */ -/* supports remote wakeup, but this driver doesn't */ #endif /* @@ -161,8 +158,6 @@ #define EP_OUT_NUM 12 static const char EP_IN_NAME [] = "ep11in-bulk"; #define EP_IN_NUM 11 -/* doesn't support bus-powered operation */ -/* supports remote wakeup, but this driver doesn't */ #endif /* @@ -183,8 +178,6 @@ #define EP_OUT_NUM 1 static const char EP_IN_NAME [] = "ep2in-bulk"; #define EP_IN_NUM 2 -/* doesn't support bus-powered operation */ -/* doesn't support remote wakeup? */ #endif /* @@ -199,7 +192,6 @@ #define EP_OUT_NUM 1 static const char EP_IN_NAME [] = "ep2-bulk"; #define EP_IN_NUM 2 -/* doesn't support remote wakeup */ #endif /*-------------------------------------------------------------------------*/ @@ -208,30 +200,6 @@ # error Configure some USB peripheral controller driver! #endif -/* power usage is config specific. - * hardware that supports remote wakeup defaults to disabling it. - */ - -#ifndef SELFPOWER -/* default: say we're self-powered */ -#define SELFPOWER USB_CONFIG_ATT_SELFPOWER -/* else: - * - SELFPOWER value must be zero - * - MAX_USB_POWER may be nonzero. - */ -#endif - -#ifndef MAX_USB_POWER -/* any hub supports this steady state bus power consumption */ -#define MAX_USB_POWER 100 /* mA */ -#endif - -#ifndef WAKEUP -/* default: this driver won't do remote wakeup */ -#define WAKEUP 0 -/* else value must be USB_CONFIG_ATT_WAKEUP */ -#endif - /*-------------------------------------------------------------------------*/ /* big enough to hold our biggest descriptor */ @@ -290,8 +258,8 @@ /* * Normally the "loopback" configuration is second (index 1) so * it's not the default. Here's where to change that order, to - * work better with hosts (like Linux ... for now!) where config - * changes are problematic. + * work better with hosts where config changes are problematic. + * Or controllers (like superh) that only support one config. */ static int loopdefault = 0; @@ -301,7 +269,7 @@ /* Thanks to NetChip Technologies for donating this product ID. * - * DO NOT REUSE THESE IDs with any other driver!! Ever!! + * DO NOT REUSE THESE IDs with a protocol-incompatible driver!! Ever!! * Instead: allocate your own, using normal USB-IF procedures. */ #define DRIVER_VENDOR_NUM 0x0525 /* NetChip */ @@ -353,8 +321,8 @@ .bNumInterfaces = 1, .bConfigurationValue = CONFIG_SOURCE_SINK, .iConfiguration = STRING_SOURCE_SINK, - .bmAttributes = USB_CONFIG_ATT_ONE | SELFPOWER | WAKEUP, - .bMaxPower = (MAX_USB_POWER + 1) / 2, + .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, + .bMaxPower = 1, /* self-powered */ }; static const struct usb_config_descriptor @@ -366,8 +334,8 @@ .bNumInterfaces = 1, .bConfigurationValue = CONFIG_LOOPBACK, .iConfiguration = STRING_LOOPBACK, - .bmAttributes = USB_CONFIG_ATT_ONE | SELFPOWER | WAKEUP, - .bMaxPower = (MAX_USB_POWER + 1) / 2, + .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, + .bMaxPower = 1, /* self-powered */ }; /* one interface in each configuration */ @@ -414,7 +382,21 @@ .wMaxPacketSize = __constant_cpu_to_le16 (64), }; -#ifdef HIGHSPEED +static const struct usb_descriptor_header *fs_source_sink_function [] = { + (struct usb_descriptor_header *) &source_sink_intf, + (struct usb_descriptor_header *) &fs_sink_desc, + (struct usb_descriptor_header *) &fs_source_desc, + 0, +}; + +static const struct usb_descriptor_header *fs_loopback_function [] = { + (struct usb_descriptor_header *) &loopback_intf, + (struct usb_descriptor_header *) &fs_sink_desc, + (struct usb_descriptor_header *) &fs_source_desc, + 0, +}; + +#ifdef CONFIG_USB_GADGET_DUALSPEED /* * usb 2.0 devices need to expose both high speed and full speed @@ -425,22 +407,20 @@ * for the config descriptor. */ -static const struct usb_endpoint_descriptor +static struct usb_endpoint_descriptor hs_source_desc = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, - .bEndpointAddress = EP_IN_NUM | USB_DIR_IN, .bmAttributes = USB_ENDPOINT_XFER_BULK, .wMaxPacketSize = __constant_cpu_to_le16 (512), }; -static const struct usb_endpoint_descriptor +static struct usb_endpoint_descriptor hs_sink_desc = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, - .bEndpointAddress = EP_OUT_NUM, .bmAttributes = USB_ENDPOINT_XFER_BULK, .wMaxPacketSize = __constant_cpu_to_le16 (512), }; @@ -456,6 +436,20 @@ .bNumConfigurations = 2, }; +static const struct usb_descriptor_header *hs_source_sink_function [] = { + (struct usb_descriptor_header *) &source_sink_intf, + (struct usb_descriptor_header *) &hs_source_desc, + (struct usb_descriptor_header *) &hs_sink_desc, + 0, +}; + +static const struct usb_descriptor_header *hs_loopback_function [] = { + (struct usb_descriptor_header *) &loopback_intf, + (struct usb_descriptor_header *) &hs_source_desc, + (struct usb_descriptor_header *) &hs_sink_desc, + 0, +}; + /* maxpacket and other transfer characteristics vary by speed. */ #define ep_desc(g,hs,fs) (((g)->speed==USB_SPEED_HIGH)?(hs):(fs)) @@ -464,13 +458,14 @@ /* if there's no high speed support, maxpacket doesn't change. */ #define ep_desc(g,hs,fs) fs -#endif /* !HIGHSPEED */ +#endif /* !CONFIG_USB_GADGET_DUALSPEED */ +static char manufacturer [40]; static char serial [40]; /* static strings, in iso 8859/1 */ static struct usb_string strings [] = { - { STRING_MANUFACTURER, UTS_SYSNAME " " UTS_RELEASE " with " CHIP, }, + { STRING_MANUFACTURER, manufacturer, }, { STRING_PRODUCT, longname, }, { STRING_SERIAL, serial, }, { STRING_LOOPBACK, loopback, }, @@ -502,60 +497,42 @@ * device?) */ static int -config_buf (enum usb_device_speed speed, +config_buf (struct usb_gadget *gadget, u8 *buf, u8 type, unsigned index) { - int is_source_sink; - const unsigned config_len = USB_DT_CONFIG_SIZE - + USB_DT_INTERFACE_SIZE - + 2 * USB_DT_ENDPOINT_SIZE; -#ifdef HIGHSPEED - int hs; + int is_source_sink; + int len; + const struct usb_descriptor_header **function; +#ifdef CONFIG_USB_GADGET_DUALSPEED + int hs = (gadget->speed == USB_SPEED_HIGH); #endif + /* two configurations will always be index 0 and index 1 */ if (index > 1) return -EINVAL; - if (config_len > USB_BUFSIZ) - return -EDOM; is_source_sink = loopdefault ? (index == 1) : (index == 0); - /* config (or other speed config) */ - if (is_source_sink) - memcpy (buf, &source_sink_config, USB_DT_CONFIG_SIZE); - else - memcpy (buf, &loopback_config, USB_DT_CONFIG_SIZE); - buf [1] = type; - ((struct usb_config_descriptor *) buf)->wTotalLength - = __constant_cpu_to_le16 (config_len); - buf += USB_DT_CONFIG_SIZE; - - /* one interface */ - if (is_source_sink) - memcpy (buf, &source_sink_intf, USB_DT_INTERFACE_SIZE); - else - memcpy (buf, &loopback_intf, USB_DT_INTERFACE_SIZE); - buf += USB_DT_INTERFACE_SIZE; - - /* the endpoints in that interface (at that speed) */ -#ifdef HIGHSPEED - hs = (speed == USB_SPEED_HIGH); +#ifdef CONFIG_USB_GADGET_DUALSPEED if (type == USB_DT_OTHER_SPEED_CONFIG) hs = !hs; - if (hs) { - memcpy (buf, &hs_source_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - memcpy (buf, &hs_sink_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - } else + if (hs) + function = is_source_sink + ? hs_source_sink_function + : hs_loopback_function; + else #endif - { - memcpy (buf, &fs_source_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - memcpy (buf, &fs_sink_desc, USB_DT_ENDPOINT_SIZE); - buf += USB_DT_ENDPOINT_SIZE; - } - - return config_len; + function = is_source_sink + ? fs_source_sink_function + : fs_loopback_function; + + len = usb_gadget_config_buf (is_source_sink + ? &source_sink_config + : &loopback_config, + buf, USB_BUFSIZ, function); + if (len < 0) + return len; + ((struct usb_config_descriptor *) buf)->bDescriptorType = type; + return len; } /*-------------------------------------------------------------------------*/ @@ -1019,17 +996,21 @@ value = min (ctrl->wLength, (u16) sizeof device_desc); memcpy (req->buf, &device_desc, value); break; -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED case USB_DT_DEVICE_QUALIFIER: + if (!gadget->is_dualspeed) + break; value = min (ctrl->wLength, (u16) sizeof dev_qualifier); memcpy (req->buf, &dev_qualifier, value); break; case USB_DT_OTHER_SPEED_CONFIG: + if (!gadget->is_dualspeed) + break; // FALLTHROUGH -#endif /* HIGHSPEED */ +#endif /* CONFIG_USB_GADGET_DUALSPEED */ case USB_DT_CONFIG: - value = config_buf (gadget->speed, req->buf, + value = config_buf (gadget, req->buf, ctrl->wValue >> 8, ctrl->wValue & 0xff); if (value >= 0) @@ -1212,14 +1193,26 @@ dev->req->complete = zero_setup_complete; device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket; -#ifdef HIGHSPEED + +#ifdef CONFIG_USB_GADGET_DUALSPEED /* assume ep0 uses the same value for both speeds ... */ dev_qualifier.bMaxPacketSize0 = device_desc.bMaxPacketSize0; + + /* and that all endpoints are dual-speed */ + hs_source_desc.bEndpointAddress = fs_source_desc.bEndpointAddress; + hs_sink_desc.bEndpointAddress = fs_sink_desc.bEndpointAddress; #endif gadget->ep0->driver_data = dev; INFO (dev, "%s, version: " DRIVER_VERSION "\n", longname); + INFO (dev, "using %s, OUT %s IN %s\n", gadget->name, + EP_OUT_NAME, EP_IN_NAME); + + snprintf (manufacturer, sizeof manufacturer, + UTS_SYSNAME " " UTS_RELEASE " with %s", + gadget->name); + return 0; enomem: @@ -1230,7 +1223,7 @@ /*-------------------------------------------------------------------------*/ static struct usb_gadget_driver zero_driver = { -#ifdef HIGHSPEED +#ifdef CONFIG_USB_GADGET_DUALSPEED .speed = USB_SPEED_HIGH, #else .speed = USB_SPEED_FULL, diff -Nru a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig --- a/drivers/usb/host/Kconfig Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/host/Kconfig Wed Mar 17 19:29:10 2004 @@ -29,6 +29,15 @@ To compile this driver as a module, choose M here: the module will be called ehci-hcd. +config USB_EHCI_SPLIT_ISO + bool "Full speed ISO transactions (EXPERIMENTAL)" + depends on USB_EHCI_HCD && EXPERIMENTAL + default n + ---help--- + This code is new and hasn't been used with many different + EHCI or USB 2.0 transaction translator implementations. + It should work for ISO-OUT transfers, like audio. + config USB_OHCI_HCD tristate "OHCI HCD support" depends on USB diff -Nru a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c --- a/drivers/usb/host/ehci-dbg.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/host/ehci-dbg.c Wed Mar 17 19:29:10 2004 @@ -579,7 +579,11 @@ break; case Q_TYPE_SITD: temp = scnprintf (next, size, - " sitd/%p", p.sitd); + " sitd%d-%04x/%p", + p.sitd->stream->interval, + le32_to_cpup (&p.sitd->hw_uframe) + & 0x0000ffff, + p.sitd); tag = Q_NEXT_TYPE (p.sitd->hw_next); p = p.sitd->sitd_next; break; diff -Nru a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/host/ehci-hcd.c Wed Mar 17 19:29:09 2004 @@ -106,8 +106,6 @@ #undef EHCI_VERBOSE_DEBUG #undef EHCI_URB_TRACE -// #define have_split_iso - #ifdef DEBUG #define EHCI_STATS #endif @@ -676,6 +674,7 @@ /* the IO watchdog guards against hardware or driver bugs that * misplace IRQs, and should let us run completely without IRQs. + * such lossage has been observed on both VT6202 and VT8235. */ if ((ehci->async->qh_next.ptr != 0) || (ehci->periodic_sched != 0)) timer_action (ehci, TIMER_IO_WATCHDOG); @@ -796,13 +795,8 @@ case PIPE_ISOCHRONOUS: if (urb->dev->speed == USB_SPEED_HIGH) return itd_submit (ehci, urb, mem_flags); -#ifdef have_split_iso else return sitd_submit (ehci, urb, mem_flags); -#else - dbg ("no split iso support yet"); - return -ENOSYS; -#endif /* have_split_iso */ } } diff -Nru a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c --- a/drivers/usb/host/ehci-sched.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/host/ehci-sched.c Wed Mar 17 19:29:09 2004 @@ -53,14 +53,10 @@ return &periodic->fstn->fstn_next; case Q_TYPE_ITD: return &periodic->itd->itd_next; -#ifdef have_split_iso - case Q_TYPE_SITD: + // case Q_TYPE_SITD: + default: return &periodic->sitd->sitd_next; -#endif /* have_split_iso */ } - dbg ("BAD shadow %p tag %d", periodic->ptr, tag); - // BUG (); - return 0; } /* returns true after successful unlink */ @@ -133,7 +129,6 @@ hw_p = &q->itd->hw_next; q = &q->itd->itd_next; break; -#ifdef have_split_iso case Q_TYPE_SITD: /* is it in the S-mask? (count SPLIT, DATA) */ if (q->sitd->hw_uframe & cpu_to_le32 (1 << uframe)) { @@ -154,7 +149,6 @@ hw_p = &q->sitd->hw_next; q = &q->sitd->sitd_next; break; -#endif /* have_split_iso */ default: BUG (); } @@ -229,7 +223,8 @@ if (same_tt (dev, here.itd->urb->dev)) { u16 mask; - mask = le32_to_cpu (here.sitd->hw_uframe); + mask = le32_to_cpu (here.sitd + ->hw_uframe); /* FIXME assumes no gap for IN! */ mask |= mask >> 8; if (mask & uf_mask) @@ -237,7 +232,7 @@ } type = Q_NEXT_TYPE (here.qh->hw_next); here = here.sitd->sitd_next; - break; + continue; // case Q_TYPE_FSTN: default: ehci_dbg (ehci, @@ -698,12 +693,27 @@ // BUG_ON (!list_empty(&stream->td_list)); while (!list_empty (&stream->free_list)) { - struct ehci_itd *itd; + struct list_head *entry; - itd = list_entry (stream->free_list.next, - struct ehci_itd, itd_list); - list_del (&itd->itd_list); - dma_pool_free (ehci->itd_pool, itd, itd->itd_dma); + entry = stream->free_list.next; + list_del (entry); + + /* knows about ITD vs SITD */ + if (stream->highspeed) { + struct ehci_itd *itd; + + itd = list_entry (entry, struct ehci_itd, + itd_list); + dma_pool_free (ehci->itd_pool, itd, + itd->itd_dma); + } else { + struct ehci_sitd *sitd; + + sitd = list_entry (entry, struct ehci_sitd, + sitd_list); + dma_pool_free (ehci->sitd_pool, sitd, + sitd->sitd_dma); + } } is_in = (stream->bEndpointAddress & USB_DIR_IN) ? 0x10 : 0; @@ -858,6 +868,7 @@ int i; unsigned num_itds; struct ehci_iso_sched *sched; + unsigned long flags; sched = iso_sched_alloc (urb->number_of_packets, mem_flags); if (unlikely (sched == 0)) @@ -871,6 +882,7 @@ num_itds = urb->number_of_packets; /* allocate/init ITDs */ + spin_lock_irqsave (&ehci->lock, flags); for (i = 0; i < num_itds; i++) { /* free_list.next might be cache-hot ... but maybe @@ -884,8 +896,14 @@ list_del (&itd->itd_list); itd_dma = itd->itd_dma; } else + itd = 0; + + if (!itd) { + spin_unlock_irqrestore (&ehci->lock, flags); itd = dma_pool_alloc (ehci->itd_pool, mem_flags, &itd_dma); + spin_lock_irqsave (&ehci->lock, flags); + } if (unlikely (0 == itd)) { iso_sched_free (stream, sched); @@ -895,6 +913,7 @@ itd->itd_dma = itd_dma; list_add (&itd->itd_list, &sched->td_list); } + spin_unlock_irqrestore (&ehci->lock, flags); /* temporarily store schedule info in hcpriv */ urb->hcpriv = sched; @@ -909,11 +928,11 @@ struct ehci_hcd *ehci, u32 mod, u32 uframe, - u32 end, u8 usecs, u32 period ) { + uframe %= period; do { /* can't commit more than 80% periodic == 100 usec */ if (periodic_usecs (ehci, uframe >> 3, uframe & 0x7) @@ -922,8 +941,7 @@ /* we know urb->interval is 2^N uframes */ uframe += period; - uframe %= mod; - } while (uframe != end); + } while (uframe < mod); return 1; } @@ -933,7 +951,6 @@ u32 mod, struct ehci_iso_stream *stream, u32 uframe, - u32 end, struct ehci_iso_sched *sched, u32 period_uframes ) @@ -952,12 +969,20 @@ */ /* check bandwidth */ + uframe %= period_uframes; do { u32 max_used; frame = uframe >> 3; uf = uframe & 7; + /* tt must be idle for start(s), any gap, and csplit. + * assume scheduling slop leaves 10+% for control/bulk. + */ + if (!tt_no_collision (ehci, period_uframes << 3, + stream->udev, frame, mask)) + return 0; + /* check starts (OUT uses more than one) */ max_used = 100 - stream->usecs; for (tmp = stream->raw_mask & 0xff; tmp; tmp >>= 1, uf++) { @@ -969,25 +994,19 @@ if (stream->c_usecs) { max_used = 100 - stream->c_usecs; do { - /* tt is busy in the gap before CSPLIT */ tmp = 1 << uf; - mask |= tmp; tmp <<= 8; - if (stream->raw_mask & tmp) - break; + if ((stream->raw_mask & tmp) == 0) + continue; + if (periodic_usecs (ehci, frame, uf) + > max_used) + return 0; } while (++uf < 8); - if (periodic_usecs (ehci, frame, uf) > max_used) - return 0; } /* we know urb->interval is 2^N uframes */ uframe += period_uframes; - uframe %= mod; - } while (uframe != end); - - /* tt must be idle for start(s), any gap, and csplit */ - if (!tt_no_collision (ehci, period_uframes, stream->udev, frame, mask)) - return 0; + } while (uframe < mod); stream->splits = stream->raw_mask << (uframe & 7); cpu_to_le32s (&stream->splits); @@ -1014,7 +1033,7 @@ struct ehci_iso_stream *stream ) { - u32 now, start, end, max, period; + u32 now, start, max, period; int status; unsigned mod = ehci->periodic_size << 3; struct ehci_iso_sched *sched = urb->hcpriv; @@ -1036,8 +1055,6 @@ /* when's the last uframe this urb could start? */ max = now + mod; - max -= sched->span; - max -= 8 * SCHEDULE_SLOP; /* typical case: reuse current schedule. stream is still active, * and no gaps from host falling behind (irq delays etc) @@ -1046,9 +1063,11 @@ start = stream->next_uframe; if (start < now) start += mod; - if (likely (start < max)) + if (likely ((start + sched->span) < max)) goto ready; - /* else fell behind; try to reschedule */ + /* else fell behind; someday, try to reschedule */ + status = -EL2NSYNC; + goto fail; } /* need to schedule; when's the next (u)frame we could start? @@ -1059,63 +1078,40 @@ */ start = SCHEDULE_SLOP * 8 + (now & ~0x07); start %= mod; - end = start; + stream->next_uframe = start; /* NOTE: assumes URB_ISO_ASAP, to limit complexity/bugs */ period = urb->interval; if (!stream->highspeed) period <<= 3; - if (max > (start + period)) - max = start + period; - /* hack: account for itds already scheduled to this endpoint */ - if (list_empty (&stream->td_list)) - end = max; - - /* within [start..max] find a uframe slot with enough bandwidth */ - end %= mod; - do { + /* find a uframe slot with enough bandwidth */ + for (; start < (stream->next_uframe + period); start++) { int enough_space; /* check schedule: enough space? */ if (stream->highspeed) - enough_space = itd_slot_ok (ehci, mod, start, end, + enough_space = itd_slot_ok (ehci, mod, start, stream->usecs, period); else { if ((start % 8) >= 6) continue; enough_space = sitd_slot_ok (ehci, mod, stream, - start, end, sched, period); + start, sched, period); } - /* (re)schedule it here if there's enough bandwidth */ + /* schedule it here if there's enough bandwidth */ if (enough_space) { - start %= mod; - if (unlikely (!list_empty (&stream->td_list))) { - /* host fell behind ... maybe irq latencies - * delayed this request queue for too long. - */ - stream->rescheduled++; - dev_dbg (&urb->dev->dev, - "iso%d%s %d.%d skip %d.%d\n", - stream->bEndpointAddress & 0x0f, - (stream->bEndpointAddress & USB_DIR_IN) - ? "in" : "out", - stream->next_uframe >> 3, - stream->next_uframe & 0x7, - start >> 3, start & 0x7); - } - stream->next_uframe = start; + stream->next_uframe = start % mod; goto ready; } - - } while (++start < max); + } /* no room in the schedule */ - ehci_dbg (ehci, "iso %ssched full %p (now %d end %d max %d)\n", + ehci_dbg (ehci, "iso %ssched full %p (now %d max %d)\n", list_empty (&stream->td_list) ? "" : "re", - urb, now, end, max); + urb, now, max); status = -ENOSPC; fail: @@ -1260,6 +1256,7 @@ iso_sched_free (stream, iso_sched); urb->hcpriv = 0; + timer_action (ehci, TIMER_IO_WATCHDOG); if (unlikely (!ehci->periodic_sched++)) return enable_periodic (ehci); return 0; @@ -1404,18 +1401,392 @@ return status; } -#ifdef have_split_iso +#ifdef CONFIG_USB_EHCI_SPLIT_ISO /*-------------------------------------------------------------------------*/ /* - * "Split ISO TDs" ... used for USB 1.1 devices going through - * the TTs in USB 2.0 hubs. - * - * FIXME not yet implemented + * "Split ISO TDs" ... used for USB 1.1 devices going through the + * TTs in USB 2.0 hubs. These need microframe scheduling. */ -#endif /* have_split_iso */ +static inline void +sitd_sched_init ( + struct ehci_iso_sched *iso_sched, + struct ehci_iso_stream *stream, + struct urb *urb +) +{ + unsigned i; + dma_addr_t dma = urb->transfer_dma; + + /* how many frames are needed for these transfers */ + iso_sched->span = urb->number_of_packets * stream->interval; + + /* figure out per-frame sitd fields that we'll need later + * when we fit new sitds into the schedule. + */ + for (i = 0; i < urb->number_of_packets; i++) { + struct ehci_iso_packet *packet = &iso_sched->packet [i]; + unsigned length; + dma_addr_t buf; + u32 trans; + + length = urb->iso_frame_desc [i].length & 0x03ff; + buf = dma + urb->iso_frame_desc [i].offset; + + trans = SITD_STS_ACTIVE; + if (((i + 1) == urb->number_of_packets) + && !(urb->transfer_flags & URB_NO_INTERRUPT)) + trans |= SITD_IOC; + trans |= length << 16; + packet->transaction = cpu_to_le32 (trans); + + /* might need to cross a buffer page within a td */ + packet->bufp = buf; + buf += length; + packet->buf1 = buf & ~0x0fff; + if (packet->buf1 != (buf & ~(u64)0x0fff)) + packet->cross = 1; + + /* OUT uses multiple start-splits */ + if (stream->bEndpointAddress & USB_DIR_IN) + continue; + length = 1 + (length / 188); + packet->buf1 |= length; + if (length > 1) /* BEGIN vs ALL */ + packet->buf1 |= 1 << 3; + } +} + +static int +sitd_urb_transaction ( + struct ehci_iso_stream *stream, + struct ehci_hcd *ehci, + struct urb *urb, + int mem_flags +) +{ + struct ehci_sitd *sitd; + dma_addr_t sitd_dma; + int i; + struct ehci_iso_sched *iso_sched; + unsigned long flags; + + iso_sched = iso_sched_alloc (urb->number_of_packets, mem_flags); + if (iso_sched == 0) + return -ENOMEM; + + sitd_sched_init (iso_sched, stream, urb); + + /* allocate/init sITDs */ + spin_lock_irqsave (&ehci->lock, flags); + for (i = 0; i < urb->number_of_packets; i++) { + + /* NOTE: for now, we don't try to handle wraparound cases + * for IN (using sitd->hw_backpointer, like a FSTN), which + * means we never need two sitds for full speed packets. + */ + + /* free_list.next might be cache-hot ... but maybe + * the HC caches it too. avoid that issue for now. + */ + + /* prefer previously-allocated sitds */ + if (!list_empty(&stream->free_list)) { + sitd = list_entry (stream->free_list.prev, + struct ehci_sitd, sitd_list); + list_del (&sitd->sitd_list); + sitd_dma = sitd->sitd_dma; + } else + sitd = 0; + + if (!sitd) { + spin_unlock_irqrestore (&ehci->lock, flags); + sitd = dma_pool_alloc (ehci->sitd_pool, mem_flags, + &sitd_dma); + spin_lock_irqsave (&ehci->lock, flags); + } + + if (!sitd) { + iso_sched_free (stream, iso_sched); + spin_unlock_irqrestore (&ehci->lock, flags); + return -ENOMEM; + } + memset (sitd, 0, sizeof *sitd); + sitd->sitd_dma = sitd_dma; + list_add (&sitd->sitd_list, &iso_sched->td_list); + } + + /* temporarily store schedule info in hcpriv */ + urb->hcpriv = iso_sched; + urb->error_count = 0; + + spin_unlock_irqrestore (&ehci->lock, flags); + return 0; +} + +/*-------------------------------------------------------------------------*/ + +static inline void +sitd_patch ( + struct ehci_iso_stream *stream, + struct ehci_sitd *sitd, + struct ehci_iso_sched *iso_sched, + unsigned index +) +{ + struct ehci_iso_packet *uf = &iso_sched->packet [index]; + u64 bufp = uf->bufp; + + sitd->hw_next = EHCI_LIST_END; + sitd->hw_fullspeed_ep = stream->address; + sitd->hw_uframe = stream->splits; + sitd->hw_results = uf->transaction; + sitd->hw_backpointer = EHCI_LIST_END; + + bufp = uf->bufp; + sitd->hw_buf [0] = cpu_to_le32 (bufp); + sitd->hw_buf_hi [0] = cpu_to_le32 (bufp >> 32); + + sitd->hw_buf [1] = cpu_to_le32 (uf->buf1); + if (uf->cross) { + bufp += 4096; + sitd->hw_buf_hi [1] = cpu_to_le32 (bufp >> 32); + } + sitd->index = index; +} + +static inline void +sitd_link (struct ehci_hcd *ehci, unsigned frame, struct ehci_sitd *sitd) +{ + /* note: sitd ordering could matter (CSPLIT then SSPLIT) */ + sitd->sitd_next = ehci->pshadow [frame]; + sitd->hw_next = ehci->periodic [frame]; + ehci->pshadow [frame].sitd = sitd; + sitd->frame = frame; + wmb (); + ehci->periodic [frame] = cpu_to_le32 (sitd->sitd_dma) | Q_TYPE_SITD; +} + +/* fit urb's sitds into the selected schedule slot; activate as needed */ +static int +sitd_link_urb ( + struct ehci_hcd *ehci, + struct urb *urb, + unsigned mod, + struct ehci_iso_stream *stream +) +{ + int packet; + unsigned next_uframe; + struct ehci_iso_sched *sched = urb->hcpriv; + struct ehci_sitd *sitd; + + next_uframe = stream->next_uframe; + + if (list_empty(&stream->td_list)) { + /* usbfs ignores TT bandwidth */ + hcd_to_bus (&ehci->hcd)->bandwidth_allocated + += stream->bandwidth; + ehci_vdbg (ehci, + "sched dev%s ep%d%s-iso [%d] %dms/%04x\n", + urb->dev->devpath, stream->bEndpointAddress & 0x0f, + (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out", + (next_uframe >> 3) % ehci->periodic_size, + stream->interval, le32_to_cpu (stream->splits)); + stream->start = jiffies; + } + hcd_to_bus (&ehci->hcd)->bandwidth_isoc_reqs++; + + /* fill sITDs frame by frame */ + for (packet = 0, sitd = 0; + packet < urb->number_of_packets; + packet++) { + + /* ASSERT: we have all necessary sitds */ + BUG_ON (list_empty (&sched->td_list)); + + /* ASSERT: no itds for this endpoint in this frame */ + + sitd = list_entry (sched->td_list.next, + struct ehci_sitd, sitd_list); + list_move_tail (&sitd->sitd_list, &stream->td_list); + sitd->stream = iso_stream_get (stream); + sitd->urb = usb_get_urb (urb); + + sitd_patch (stream, sitd, sched, packet); + sitd_link (ehci, (next_uframe >> 3) % ehci->periodic_size, + sitd); + + next_uframe += stream->interval << 3; + stream->depth += stream->interval << 3; + } + stream->next_uframe = next_uframe % mod; + + /* don't need that schedule data any more */ + iso_sched_free (stream, sched); + urb->hcpriv = 0; + + timer_action (ehci, TIMER_IO_WATCHDOG); + if (!ehci->periodic_sched++) + return enable_periodic (ehci); + return 0; +} + +/*-------------------------------------------------------------------------*/ + +#define SITD_ERRS (SITD_STS_ERR | SITD_STS_DBE | SITD_STS_BABBLE \ + | SITD_STS_XACT | SITD_STS_MMF | SITD_STS_STS) + +static unsigned +sitd_complete ( + struct ehci_hcd *ehci, + struct ehci_sitd *sitd, + struct pt_regs *regs +) { + struct urb *urb = sitd->urb; + struct usb_iso_packet_descriptor *desc; + u32 t; + int urb_index = -1; + struct ehci_iso_stream *stream = sitd->stream; + struct usb_device *dev; + + urb_index = sitd->index; + desc = &urb->iso_frame_desc [urb_index]; + t = le32_to_cpup (&sitd->hw_results); + + /* report transfer status */ + if (t & SITD_ERRS) { + urb->error_count++; + if (t & SITD_STS_DBE) + desc->status = usb_pipein (urb->pipe) + ? -ENOSR /* hc couldn't read */ + : -ECOMM; /* hc couldn't write */ + else if (t & SITD_STS_BABBLE) + desc->status = -EOVERFLOW; + else /* XACT, MMF, etc */ + desc->status = -EPROTO; + } else { + desc->status = 0; + desc->actual_length = desc->length - SITD_LENGTH (t); + } + + usb_put_urb (urb); + sitd->urb = 0; + sitd->stream = 0; + list_move (&sitd->sitd_list, &stream->free_list); + stream->depth -= stream->interval << 3; + iso_stream_put (ehci, stream); + + /* handle completion now? */ + if ((urb_index + 1) != urb->number_of_packets) + return 0; + + /* ASSERT: it's really the last sitd for this urb + list_for_each_entry (sitd, &stream->td_list, sitd_list) + BUG_ON (sitd->urb == urb); + */ + + /* give urb back to the driver */ + dev = usb_get_dev (urb->dev); + ehci_urb_done (ehci, urb, regs); + urb = 0; + + /* defer stopping schedule; completion can submit */ + ehci->periodic_sched--; + if (!ehci->periodic_sched) + (void) disable_periodic (ehci); + hcd_to_bus (&ehci->hcd)->bandwidth_isoc_reqs--; + + if (list_empty (&stream->td_list)) { + hcd_to_bus (&ehci->hcd)->bandwidth_allocated + -= stream->bandwidth; + ehci_vdbg (ehci, + "deschedule devp %s ep%d%s-iso\n", + dev->devpath, stream->bEndpointAddress & 0x0f, + (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out"); + } + iso_stream_put (ehci, stream); + usb_put_dev (dev); + + return 1; +} + + +static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb, int mem_flags) +{ + int status = -EINVAL; + unsigned long flags; + struct ehci_iso_stream *stream; + + // FIXME remove when csplits behave + if (usb_pipein(urb->pipe)) { + ehci_dbg (ehci, "no iso-IN split transactions yet\n"); + return -ENOMEM; + } + + /* Get iso_stream head */ + stream = iso_stream_find (ehci, urb); + if (stream == 0) { + ehci_dbg (ehci, "can't get iso stream\n"); + return -ENOMEM; + } + if (urb->interval != stream->interval) { + ehci_dbg (ehci, "can't change iso interval %d --> %d\n", + stream->interval, urb->interval); + goto done; + } + +#ifdef EHCI_URB_TRACE + ehci_dbg (ehci, + "submit %p dev%s ep%d%s-iso len %d\n", + urb, urb->dev->devpath, + usb_pipeendpoint (urb->pipe), + usb_pipein (urb->pipe) ? "in" : "out", + urb->transfer_buffer_length); +#endif + + /* allocate SITDs */ + status = sitd_urb_transaction (stream, ehci, urb, mem_flags); + if (status < 0) { + ehci_dbg (ehci, "can't init sitds\n"); + goto done; + } + + /* schedule ... need to lock */ + spin_lock_irqsave (&ehci->lock, flags); + status = iso_stream_schedule (ehci, urb, stream); + if (status == 0) + sitd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); + spin_unlock_irqrestore (&ehci->lock, flags); + +done: + if (status < 0) + iso_stream_put (ehci, stream); + return status; +} + +#else + +static inline int +sitd_submit (struct ehci_hcd *ehci, struct urb *urb, int mem_flags) +{ + ehci_dbg (ehci, "split iso support is disabled\n"); + return -ENOSYS; +} + +static inline unsigned +sitd_complete ( + struct ehci_hcd *ehci, + struct ehci_sitd *sitd, + struct pt_regs *regs +) { + ehci_err (ehci, "sitd_complete %p?\n", sitd); + return 0; +} + +#endif /* USB_EHCI_SPLIT_ISO */ /*-------------------------------------------------------------------------*/ @@ -1513,7 +1884,6 @@ modified = itd_complete (ehci, q.itd, regs); q = *q_p; break; -#ifdef have_split_iso case Q_TYPE_SITD: if (q.sitd->hw_results & SITD_ACTIVE) { q_p = &q.sitd->sitd_next; @@ -1529,7 +1899,6 @@ modified = sitd_complete (ehci, q.sitd, regs); q = *q_p; break; -#endif /* have_split_iso */ default: dbg ("corrupt type %d frame %d shadow %p", type, frame, q.ptr); diff -Nru a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h --- a/drivers/usb/host/ehci.h Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/host/ehci.h Wed Mar 17 19:29:10 2004 @@ -492,16 +492,16 @@ /* * EHCI Specification 0.95 Section 3.4 * siTD, aka split-transaction isochronous Transfer Descriptor - * ... describe low/full speed iso xfers through TT in hubs + * ... describe full speed iso xfers through TT in hubs * see Figure 3-5 "Split-transaction Isochronous Transaction Descriptor (siTD) */ struct ehci_sitd { /* first part defined by EHCI spec */ u32 hw_next; /* uses bit field macros above - see EHCI 0.95 Table 3-8 */ - u32 hw_fullspeed_ep; /* see EHCI table 3-9 */ - u32 hw_uframe; /* see EHCI table 3-10 */ - u32 hw_results; /* see EHCI table 3-11 */ + u32 hw_fullspeed_ep; /* EHCI table 3-9 */ + u32 hw_uframe; /* EHCI table 3-10 */ + u32 hw_results; /* EHCI table 3-11 */ #define SITD_IOC (1 << 31) /* interrupt on completion */ #define SITD_PAGE (1 << 30) /* buffer 0/1 */ #define SITD_LENGTH(x) (0x3ff & ((x)>>16)) @@ -515,8 +515,8 @@ #define SITD_ACTIVE __constant_cpu_to_le32(SITD_STS_ACTIVE) - u32 hw_buf [2]; /* see EHCI table 3-12 */ - u32 hw_backpointer; /* see EHCI table 3-13 */ + u32 hw_buf [2]; /* EHCI table 3-12 */ + u32 hw_backpointer; /* EHCI table 3-13 */ u32 hw_buf_hi [2]; /* Appendix B */ /* the rest is HCD-private */ @@ -551,8 +551,6 @@ } __attribute__ ((aligned (32))); /*-------------------------------------------------------------------------*/ - -#define SUBMIT_URB(urb,mem_flags) usb_submit_urb(urb,mem_flags) #ifndef DEBUG #define STUB_DEBUG_FILES diff -Nru a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c --- a/drivers/usb/host/uhci-hcd.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/host/uhci-hcd.c Wed Mar 17 19:29:10 2004 @@ -781,7 +781,8 @@ /* * Map status to standard result codes * - * is (td->status & 0xFE0000) [a.k.a. uhci_status_bits(td->status)] + * is (td->status & 0xF60000) [a.k.a. uhci_status_bits(td->status)] + * Note: status does not include the TD_CTRL_NAK bit. * is True for output TDs and False for input TDs. */ static int uhci_map_status(int status, int dir_out) @@ -792,22 +793,18 @@ return -EPROTO; if (status & TD_CTRL_CRCTIMEO) { /* CRC/Timeout */ if (dir_out) - return -ETIMEDOUT; + return -EPROTO; else return -EILSEQ; } - if (status & TD_CTRL_NAK) /* NAK */ - return -ETIMEDOUT; if (status & TD_CTRL_BABBLE) /* Babble */ return -EOVERFLOW; if (status & TD_CTRL_DBUFERR) /* Buffer error */ return -ENOSR; if (status & TD_CTRL_STALLED) /* Stalled */ return -EPIPE; - if (status & TD_CTRL_ACTIVE) /* Active */ - return 0; - - return -EINVAL; + WARN_ON(status & TD_CTRL_ACTIVE); /* Active */ + return 0; } /* @@ -832,7 +829,7 @@ status |= TD_CTRL_LS; /* - * Build the TD for the control request + * Build the TD for the control request setup packet */ td = uhci_alloc_td(uhci, urb->dev); if (!td) @@ -990,13 +987,13 @@ if (urbp->short_control_packet) { tmp = head->prev; - goto status_phase; + goto status_stage; } tmp = head->next; td = list_entry(tmp, struct uhci_td, list); - /* The first TD is the SETUP phase, check the status, but skip */ + /* The first TD is the SETUP stage, check the status, but skip */ /* the count */ status = uhci_status_bits(td_status(td)); if (status & TD_CTRL_ACTIVE) @@ -1037,10 +1034,10 @@ } } -status_phase: +status_stage: td = list_entry(tmp, struct uhci_td, list); - /* Control status phase */ + /* Control status stage */ status = td_status(td); #ifdef I_HAVE_BUGGY_APC_BACKUPS @@ -1053,10 +1050,11 @@ return 0; #endif + status = uhci_status_bits(status); if (status & TD_CTRL_ACTIVE) return -EINPROGRESS; - if (uhci_status_bits(status)) + if (status) goto td_error; return 0; @@ -1273,12 +1271,6 @@ } /* - * Bulk and interrupt use common result - */ -#define uhci_result_bulk uhci_result_common -#define uhci_result_interrupt uhci_result_common - -/* * Isochronous transfers */ static int isochronous_find_limits(struct uhci_hcd *uhci, struct urb *urb, unsigned int *start, unsigned int *end) @@ -1403,7 +1395,8 @@ urb->iso_frame_desc[i].actual_length = actlength; urb->actual_length += actlength; - status = uhci_map_status(uhci_status_bits(td_status(td)), usb_pipeout(urb->pipe)); + status = uhci_map_status(uhci_status_bits(td_status(td)), + usb_pipeout(urb->pipe)); urb->iso_frame_desc[i].status = status; if (status) { urb->error_count++; @@ -1508,12 +1501,9 @@ struct urb_priv *urbp = urb->hcpriv; list_del_init(&urbp->urb_list); - spin_unlock_irqrestore(&uhci->urb_list_lock, flags); - uhci_destroy_urb_priv (uhci, urb); - - return ret; - } - ret = 0; + uhci_destroy_urb_priv(uhci, urb); + } else + ret = 0; out: spin_unlock_irqrestore(&uhci->urb_list_lock, flags); @@ -1541,11 +1531,9 @@ case PIPE_CONTROL: ret = uhci_result_control(uhci, urb); break; - case PIPE_INTERRUPT: - ret = uhci_result_interrupt(uhci, urb); - break; case PIPE_BULK: - ret = uhci_result_bulk(uhci, urb); + case PIPE_INTERRUPT: + ret = uhci_result_common(uhci, urb); break; case PIPE_ISOCHRONOUS: ret = uhci_result_isochronous(uhci, urb); @@ -1649,10 +1637,12 @@ { struct uhci_hcd *uhci = hcd_to_uhci(hcd); unsigned long flags; - struct urb_priv *urbp = urb->hcpriv; + struct urb_priv *urbp; spin_lock_irqsave(&uhci->urb_list_lock, flags); - + urbp = urb->hcpriv; + if (!urbp) /* URB was never linked! */ + goto done; list_del_init(&urbp->urb_list); uhci_unlink_generic(uhci, urb); @@ -1665,6 +1655,7 @@ list_add_tail(&urbp->urb_list, &uhci->urb_remove_list); spin_unlock(&uhci->urb_remove_list_lock); +done: spin_unlock_irqrestore(&uhci->urb_list_lock, flags); return 0; } @@ -1861,17 +1852,12 @@ static void uhci_remove_pending_urbps(struct uhci_hcd *uhci) { - struct list_head *tmp, *head; - spin_lock(&uhci->urb_remove_list_lock); - head = &uhci->urb_remove_list; - tmp = head->next; - while (tmp != head) { - struct urb_priv *urbp = list_entry(tmp, struct urb_priv, urb_list); + spin_lock(&uhci->complete_list_lock); - tmp = tmp->next; - uhci_moveto_complete(uhci, urbp); - } + /* Splice the urb_remove_list onto the end of the complete_list */ + list_splice_init(&uhci->urb_remove_list, uhci->complete_list.prev); + spin_unlock(&uhci->complete_list_lock); spin_unlock(&uhci->urb_remove_list_lock); } @@ -2458,9 +2444,11 @@ struct uhci_hcd *uhci = hcd_to_uhci(hcd); /* Don't try to suspend broken motherboards, reset instead */ - if (suspend_allowed(uhci)) + if (suspend_allowed(uhci)) { suspend_hc(uhci); - else + uhci->saved_framenumber = + inw(uhci->io_addr + USBFRNUM) & 0x3ff; + } else reset_hc(uhci); return 0; } @@ -2471,9 +2459,20 @@ pci_set_master(to_pci_dev(uhci_dev(uhci))); - if (uhci->state == UHCI_SUSPENDED) + if (uhci->state == UHCI_SUSPENDED) { + + /* + * Some systems don't maintain the UHCI register values + * during a PM suspend/resume cycle, so reinitialize + * the Frame Number, the Framelist Base Address, and the + * Interrupt Enable registers. + */ + outw(uhci->saved_framenumber, uhci->io_addr + USBFRNUM); + outl(uhci->fl->dma_handle, uhci->io_addr + USBFLBASEADD); + outw(USBINTR_TIMEOUT | USBINTR_RESUME | USBINTR_IOC | + USBINTR_SP, uhci->io_addr + USBINTR); uhci->resume_detect = 1; - else { + } else { reset_hc(uhci); start_hc(uhci); } diff -Nru a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h --- a/drivers/usb/host/uhci-hcd.h Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/host/uhci-hcd.h Wed Mar 17 19:29:10 2004 @@ -141,7 +141,7 @@ TD_CTRL_BABBLE | TD_CTRL_CRCTIME | TD_CTRL_BITSTUFF) #define uhci_maxerr(err) ((err) << TD_CTRL_C_ERR_SHIFT) -#define uhci_status_bits(ctrl_sts) ((ctrl_sts) & 0xFE0000) +#define uhci_status_bits(ctrl_sts) ((ctrl_sts) & 0xF60000) #define uhci_actual_length(ctrl_sts) (((ctrl_sts) + 1) & TD_CTRL_ACTLEN_MASK) /* 1-based */ /* @@ -350,6 +350,7 @@ enum uhci_state state; /* FIXME: needs a spinlock */ unsigned long state_end; /* Time of next transition */ int resume_detect; /* Need a Global Resume */ + unsigned int saved_framenumber; /* Save during PM suspend */ /* Main list of URB's currently controlled by this HC */ spinlock_t urb_list_lock; diff -Nru a/drivers/usb/image/hpusbscsi.c b/drivers/usb/image/hpusbscsi.c --- a/drivers/usb/image/hpusbscsi.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/image/hpusbscsi.c Wed Mar 17 19:29:10 2004 @@ -42,7 +42,7 @@ const struct usb_device_id *id) { struct usb_device *dev = interface_to_usbdev(intf); - struct usb_host_interface *altsetting = intf->altsetting; + struct usb_host_interface *altsetting = intf->cur_altsetting; struct hpusbscsi *new; int error = -ENOMEM; int i; diff -Nru a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c --- a/drivers/usb/image/mdc800.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/image/mdc800.c Wed Mar 17 19:29:09 2004 @@ -431,7 +431,7 @@ err ("probe fails -> wrong Number of Configuration"); return -ENODEV; } - intf_desc = &intf->altsetting[0]; + intf_desc = intf->cur_altsetting; if ( ( intf_desc->desc.bInterfaceClass != 0xff ) @@ -469,13 +469,6 @@ } - usb_driver_claim_interface (&mdc800_usb_driver, intf, mdc800); - if (usb_set_interface (dev, intf_desc->desc.bInterfaceNumber, 0) < 0) - { - err ("MDC800 Configuration fails."); - return -ENODEV; - } - info ("Found Mustek MDC800 on USB."); down (&mdc800->io_lock); @@ -550,8 +543,6 @@ usb_unlink_urb (mdc800->irq_urb); usb_unlink_urb (mdc800->write_urb); usb_unlink_urb (mdc800->download_urb); - - usb_driver_release_interface (&mdc800_usb_driver, intf); mdc800->dev=0; usb_set_intfdata(intf, NULL); diff -Nru a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c --- a/drivers/usb/image/microtek.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/image/microtek.c Wed Mar 17 19:29:10 2004 @@ -693,7 +693,6 @@ const struct usb_device_id *id) { int i; - int result; int ep_out = -1; int ep_in_set[3]; /* this will break if we have more than three endpoints which is why we check */ @@ -703,7 +702,7 @@ struct vendor_product const* p; struct usb_device *dev = interface_to_usbdev (intf); - /* the altsettting 0 on the interface we're probing */ + /* the current altsetting on the interface we're probing */ struct usb_host_interface *altsetting; MTS_DEBUG_GOT_HERE(); @@ -724,8 +723,8 @@ MTS_MESSAGE( "model %s is not known to be fully supported, reports welcome!\n", p->name ); - /* the altsettting 0 on the interface we're probing */ - altsetting = &(intf->altsetting[0]); + /* the current altsetting on the interface we're probing */ + altsetting = intf->cur_altsetting; /* Check if the config is sane */ @@ -765,20 +764,6 @@ if ( ep_out == -1 ) { MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" ); return -ENODEV; - } - - result = usb_set_interface(dev, altsetting->desc.bInterfaceNumber, 0); - - MTS_DEBUG("usb_set_interface returned %d.\n",result); - switch( result ) - { - case 0: /* no error */ - break; - - default: - MTS_DEBUG( "unknown error %d from usb_set_interface\n", - (int)result ); - return -ENODEV; } diff -Nru a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig --- a/drivers/usb/input/Kconfig Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/input/Kconfig Wed Mar 17 19:29:10 2004 @@ -179,6 +179,18 @@ To compile this driver as a module, choose M here: the module will be called powermate. +config USB_MTOUCH + tristate "MicroTouch USB Touchscreen Driver" + depends on USB && INPUT + ---help--- + Say Y here if you want to use a MicroTouch (Now 3M) USB + Touchscreen controller. + + See for additional information. + + To compile this driver as a module, choose M here: the + module will be called mtouchusb. + config USB_XPAD tristate "X-Box gamepad support" depends on USB && INPUT @@ -192,3 +204,17 @@ To compile this driver as a module, choose M here: the module will be called xpad. + +config USB_ATI_REMOTE + tristate "ATI USB RF remote control" + depends on USB && INPUT + ---help--- + Say Y here if you want to use one of ATI's USB remote controls. + These are RF remotes with USB receivers. They come with many of ATI's + All-In-Wonder video cards. This driver provides mouse pointer, left + and right mouse buttons, and maps all the other remote buttons to + keypress events. + + To compile this driver as a module, choose M here: the module will be + called ati_remote. + diff -Nru a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile --- a/drivers/usb/input/Makefile Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/Makefile Wed Mar 17 19:29:09 2004 @@ -27,10 +27,12 @@ endif obj-$(CONFIG_USB_AIPTEK) += aiptek.o +obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o obj-$(CONFIG_USB_HID) += hid.o obj-$(CONFIG_USB_KBD) += usbkbd.o -obj-$(CONFIG_USB_MOUSE) += usbmouse.o -obj-$(CONFIG_USB_WACOM) += wacom.o obj-$(CONFIG_USB_KBTAB) += kbtab.o +obj-$(CONFIG_USB_MOUSE) += usbmouse.o +obj-$(CONFIG_USB_MTOUCH) += mtouchusb.o obj-$(CONFIG_USB_POWERMATE) += powermate.o +obj-$(CONFIG_USB_WACOM) += wacom.o obj-$(CONFIG_USB_XPAD) += xpad.o diff -Nru a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c --- a/drivers/usb/input/aiptek.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/input/aiptek.c Wed Mar 17 19:29:10 2004 @@ -43,7 +43,8 @@ #include #include #include - +#include +#include /* * Version Information */ @@ -160,9 +161,9 @@ proximity = data[5] & 0x01; input_report_key(dev, BTN_TOOL_PEN, proximity); - x = ((__u32) data[1]) | ((__u32) data[2] << 8); - y = ((__u32) data[3]) | ((__u32) data[4] << 8); - pressure = ((__u32) data[6]) | ((__u32) data[7] << 8); + x = le16_to_cpu(get_unaligned((u16 *) &data[1])); + y = le16_to_cpu(get_unaligned((u16 *) &data[3])); + pressure = le16_to_cpu(*(u16 *) &data[6]); pressure -= aiptek->features->pressure_min; if (pressure < 0) { @@ -209,8 +210,10 @@ return 0; aiptek->irq->dev = aiptek->usbdev; - if (usb_submit_urb(aiptek->irq, GFP_KERNEL)) + if (usb_submit_urb(aiptek->irq, GFP_KERNEL)) { + aiptek->open--; return -EIO; + } return 0; } @@ -234,19 +237,27 @@ (type << 8) + id, inter->desc.bInterfaceNumber, buf, size, HZ); } -static void +static int aiptek_command(struct usb_device *dev, struct usb_host_interface *inter, unsigned char command, unsigned char data) { - __u8 buf[3]; + u8 *buf; + int err; + + buf = kmalloc(3, GFP_KERNEL); + if (!buf) + return -ENOMEM; buf[0] = 4; buf[1] = command; buf[2] = data; - if (usb_set_report(dev, inter, 3, 2, buf, 3) != 3) { + if ((err = usb_set_report(dev, inter, 3, 2, buf, 3)) != 3) { dbg("aiptek_command: 0x%x 0x%x\n", command, data); } + + kfree(buf); + return err < 0 ? err : 0; } static int @@ -257,30 +268,32 @@ struct usb_host_interface *interface = intf->altsetting + 0; struct usb_endpoint_descriptor *endpoint; struct aiptek *aiptek; + int err = -ENOMEM; if (!(aiptek = kmalloc(sizeof (struct aiptek), GFP_KERNEL))) - return -ENOMEM; + goto error_out_noalloc; memset(aiptek, 0, sizeof (struct aiptek)); - aiptek->data = usb_buffer_alloc(dev, 10, SLAB_ATOMIC, &aiptek->data_dma); + aiptek->data = usb_buffer_alloc(dev, 10, GFP_KERNEL, &aiptek->data_dma); if (!aiptek->data) { - kfree(aiptek); - return -ENOMEM; + goto error_out_nobuf; } aiptek->irq = usb_alloc_urb(0, GFP_KERNEL); if (!aiptek->irq) { - usb_buffer_free(dev, 10, aiptek->data, aiptek->data_dma); - kfree(aiptek); - return -ENOMEM; + goto error_out_nourb; } /* Resolution500LPI */ - aiptek_command(dev, interface, 0x18, 0x04); + err = aiptek_command(dev, interface, 0x18, 0x04); + if (err) + goto error_out; /* SwitchToTablet */ - aiptek_command(dev, interface, 0x10, 0x01); + err = aiptek_command(dev, interface, 0x10, 0x01); + if (err) + goto error_out; aiptek->features = aiptek_features + id->driver_info; @@ -340,6 +353,16 @@ usb_set_intfdata(intf, aiptek); return 0; + +error_out: + usb_free_urb(aiptek->irq); +error_out_nourb: + usb_buffer_free(dev, 10, aiptek->data, aiptek->data_dma); +error_out_nobuf: + kfree(aiptek); +error_out_noalloc: + return err; + } static void diff -Nru a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/usb/input/ati_remote.c Wed Mar 17 19:29:10 2004 @@ -0,0 +1,851 @@ +/* + * USB ATI Remote support + * + * Version 2.2.0 Copyright (c) 2004 Torrey Hoffman + * Version 2.1.1 Copyright (c) 2002 Vladimir Dergachev + * + * This 2.2.0 version is a rewrite / cleanup of the 2.1.1 driver, including + * porting to the 2.6 kernel interfaces, along with other modification + * to better match the style of the existing usb/input drivers. However, the + * protocol and hardware handling is essentially unchanged from 2.1.1. + * + * The 2.1.1 driver was derived from the usbati_remote and usbkbd drivers by + * Vojtech Pavlik. + * + * Changes: + * + * Feb 2004: Torrey Hoffman + * Version 2.2.0 + * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Hardware & software notes + * + * These remote controls are distributed by ATI as part of their + * "All-In-Wonder" video card packages. The receiver self-identifies as a + * "USB Receiver" with manufacturer "X10 Wireless Technology Inc". + * + * It is possible to use multiple receivers and remotes on multiple computers + * simultaneously by configuring them to use specific channels. + * + * The RF protocol used by the remote supports 16 distinct channels, 1 to 16. + * Actually, it may even support more, at least in some revisions of the + * hardware. + * + * Each remote can be configured to transmit on one channel as follows: + * - Press and hold the "hand icon" button. + * - When the red LED starts to blink, let go of the "hand icon" button. + * - When it stops blinking, input the channel code as two digits, from 01 + * to 16, and press the hand icon again. + * + * The timing can be a little tricky. Try loading the module with debug=1 + * to have the kernel print out messages about the remote control number + * and mask. Note: debugging prints remote numbers as zero-based hexadecimal. + * + * The driver has a "channel_mask" parameter. This bitmask specifies which + * channels will be ignored by the module. To mask out channels, just add + * all the 2^channel_number values together. + * + * For instance, set channel_mask = 2^4 = 16 (binary 10000) to make ati_remote + * ignore signals coming from remote controls transmitting on channel 4, but + * accept all other channels. + * + * Or, set channel_mask = 65533, (0xFFFD), and all channels except 1 will be + * ignored. + * + * The default is 0 (respond to all channels). Bit 0 and bits 17-32 of this + * parameter are unused. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Module and Version Information, Module Parameters + */ + +#define ATI_REMOTE_VENDOR_ID 0x0bc7 +#define ATI_REMOTE_PRODUCT_ID 0x004 + +#define DRIVER_VERSION "2.2.0" +#define DRIVER_AUTHOR "Torrey Hoffman " +#define DRIVER_DESC "ATI/X10 RF USB Remote Control" + +#define NAME_BUFSIZE 80 /* size of product name, path buffers */ +#define DATA_BUFSIZE 63 /* size of URB data buffers */ +#define ATI_INPUTNUM 1 /* Which input device to register as */ + +unsigned long channel_mask = 0; +module_param(channel_mask, ulong, 444); +MODULE_PARM_DESC(channel_mask, "Bitmask of remote control channels to ignore"); + +static int debug = 0; +module_param(debug, int, 444); +MODULE_PARM_DESC(debug, "Enable extra debug messages and information"); + +#define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0) +#undef err +#define err(format, arg...) printk(KERN_ERR format , ## arg) + +static struct usb_device_id ati_remote_table[] = { + { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) }, + {} /* Terminating entry */ +}; + +MODULE_DEVICE_TABLE(usb, ati_remote_table); + +/* Get hi and low bytes of a 16-bits int */ +#define HI(a) ((unsigned char)((a) >> 8)) +#define LO(a) ((unsigned char)((a) & 0xff)) + +#define SEND_FLAG_IN_PROGRESS 1 +#define SEND_FLAG_COMPLETE 2 + +/* Device initialization strings */ +static char init1[] = { 0x01, 0x00, 0x20, 0x14 }; +static char init2[] = { 0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20 }; + +/* Acceleration curve for directional control pad */ +static char accel[] = { 1, 2, 4, 6, 9, 13, 20 }; + +/* Duplicate event filtering time. + * Sequential, identical KIND_FILTERED inputs with less than + * FILTER_TIME jiffies between them are dropped. + * (HZ >> 4) == 1/16th of a second and works well for me. + */ +#define FILTER_TIME (HZ >> 4) + +struct ati_remote { + struct input_dev idev; + struct usb_device *udev; + struct usb_interface *interface; + + struct urb *irq_urb; + struct urb *out_urb; + struct usb_endpoint_descriptor *endpoint_in; + struct usb_endpoint_descriptor *endpoint_out; + unsigned char *inbuf; + unsigned char *outbuf; + dma_addr_t inbuf_dma; + dma_addr_t outbuf_dma; + + int open; /* open counter */ + int present; /* device plugged in? */ + + unsigned char old_data[2]; /* Detect duplicate events */ + unsigned long old_jiffies; + unsigned long acc_jiffies; /* handle acceleration */ + + char name[NAME_BUFSIZE]; + char phys[NAME_BUFSIZE]; + + wait_queue_head_t wait; + int send_flags; +}; + +/* "Kinds" of messages sent from the hardware to the driver. */ +#define KIND_END 0 +#define KIND_LITERAL 1 /* Simply pass to input system */ +#define KIND_FILTERED 2 /* Add artificial key-up events, drop keyrepeats */ +#define KIND_LU 3 /* Directional keypad diagonals - left up, */ +#define KIND_RU 4 /* right up, */ +#define KIND_LD 5 /* left down, */ +#define KIND_RD 6 /* right down */ +#define KIND_ACCEL 7 /* Directional keypad - left, right, up, down.*/ + +/* Translation table from hardware messages to input events. */ +static struct +{ + short kind; + unsigned char data1, data2; + int type; + unsigned int code; + int value; +} ati_remote_tbl[] = +{ + /* Directional control pad axes */ + {KIND_ACCEL, 0x35, 0x70, EV_REL, REL_X, -1}, /* left */ + {KIND_ACCEL, 0x36, 0x71, EV_REL, REL_X, 1}, /* right */ + {KIND_ACCEL, 0x37, 0x72, EV_REL, REL_Y, -1}, /* up */ + {KIND_ACCEL, 0x38, 0x73, EV_REL, REL_Y, 1}, /* down */ + /* Directional control pad diagonals */ + {KIND_LU, 0x39, 0x74, EV_REL, 0, 0}, /* left up */ + {KIND_RU, 0x3a, 0x75, EV_REL, 0, 0}, /* right up */ + {KIND_LD, 0x3c, 0x77, EV_REL, 0, 0}, /* left down */ + {KIND_RD, 0x3b, 0x76, EV_REL, 0, 0}, /* right down */ + + /* "Mouse button" buttons */ + {KIND_LITERAL, 0x3d, 0x78, EV_KEY, BTN_LEFT, 1}, /* left btn down */ + {KIND_LITERAL, 0x3e, 0x79, EV_KEY, BTN_LEFT, 0}, /* left btn up */ + {KIND_LITERAL, 0x41, 0x7c, EV_KEY, BTN_RIGHT, 1},/* right btn down */ + {KIND_LITERAL, 0x42, 0x7d, EV_KEY, BTN_RIGHT, 0},/* right btn up */ + + /* Artificial "doubleclick" events are generated by the hardware. + * They are mapped to the "side" and "extra" mouse buttons here. */ + {KIND_FILTERED, 0x3f, 0x7a, EV_KEY, BTN_SIDE, 1}, /* left dblclick */ + {KIND_FILTERED, 0x43, 0x7e, EV_KEY, BTN_EXTRA, 1},/* right dblclick */ + + /* keyboard. */ + {KIND_FILTERED, 0xd2, 0x0d, EV_KEY, KEY_1, 1}, + {KIND_FILTERED, 0xd3, 0x0e, EV_KEY, KEY_2, 1}, + {KIND_FILTERED, 0xd4, 0x0f, EV_KEY, KEY_3, 1}, + {KIND_FILTERED, 0xd5, 0x10, EV_KEY, KEY_4, 1}, + {KIND_FILTERED, 0xd6, 0x11, EV_KEY, KEY_5, 1}, + {KIND_FILTERED, 0xd7, 0x12, EV_KEY, KEY_6, 1}, + {KIND_FILTERED, 0xd8, 0x13, EV_KEY, KEY_7, 1}, + {KIND_FILTERED, 0xd9, 0x14, EV_KEY, KEY_8, 1}, + {KIND_FILTERED, 0xda, 0x15, EV_KEY, KEY_9, 1}, + {KIND_FILTERED, 0xdc, 0x17, EV_KEY, KEY_0, 1}, + {KIND_FILTERED, 0xc5, 0x00, EV_KEY, KEY_A, 1}, + {KIND_FILTERED, 0xc6, 0x01, EV_KEY, KEY_B, 1}, + {KIND_FILTERED, 0xde, 0x19, EV_KEY, KEY_C, 1}, + {KIND_FILTERED, 0xe0, 0x1b, EV_KEY, KEY_D, 1}, + {KIND_FILTERED, 0xe6, 0x21, EV_KEY, KEY_E, 1}, + {KIND_FILTERED, 0xe8, 0x23, EV_KEY, KEY_F, 1}, + + /* "special" keys */ + {KIND_FILTERED, 0xdd, 0x18, EV_KEY, KEY_KPENTER, 1}, /* "check" */ + {KIND_FILTERED, 0xdb, 0x16, EV_KEY, KEY_MENU, 1}, /* "menu" */ + {KIND_FILTERED, 0xc7, 0x02, EV_KEY, KEY_POWER, 1}, /* Power */ + {KIND_FILTERED, 0xc8, 0x03, EV_KEY, KEY_PROG1, 1}, /* TV */ + {KIND_FILTERED, 0xc9, 0x04, EV_KEY, KEY_PROG2, 1}, /* DVD */ + {KIND_FILTERED, 0xca, 0x05, EV_KEY, KEY_WWW, 1}, /* WEB */ + {KIND_FILTERED, 0xcb, 0x06, EV_KEY, KEY_BOOKMARKS, 1}, /* "book" */ + {KIND_FILTERED, 0xcc, 0x07, EV_KEY, KEY_EDIT, 1}, /* "hand" */ + {KIND_FILTERED, 0xe1, 0x1c, EV_KEY, KEY_COFFEE, 1}, /* "timer" */ + {KIND_FILTERED, 0xe5, 0x20, EV_KEY, KEY_FRONT, 1}, /* "max" */ + {KIND_FILTERED, 0xe2, 0x1d, EV_KEY, KEY_LEFT, 1}, /* left */ + {KIND_FILTERED, 0xe4, 0x1f, EV_KEY, KEY_RIGHT, 1}, /* right */ + {KIND_FILTERED, 0xe7, 0x22, EV_KEY, KEY_DOWN, 1}, /* down */ + {KIND_FILTERED, 0xdf, 0x1a, EV_KEY, KEY_UP, 1}, /* up */ + {KIND_FILTERED, 0xe3, 0x1e, EV_KEY, KEY_ENTER, 1}, /* "OK" */ + {KIND_FILTERED, 0xce, 0x09, EV_KEY, KEY_VOLUMEDOWN, 1}, /* VOL + */ + {KIND_FILTERED, 0xcd, 0x08, EV_KEY, KEY_VOLUMEUP, 1}, /* VOL - */ + {KIND_FILTERED, 0xcf, 0x0a, EV_KEY, KEY_MUTE, 1}, /* MUTE */ + {KIND_FILTERED, 0xd1, 0x0c, EV_KEY, KEY_CHANNELUP, 1}, /* CH + */ + {KIND_FILTERED, 0xd0, 0x0b, EV_KEY, KEY_CHANNELDOWN, 1},/* CH - */ + {KIND_FILTERED, 0xec, 0x27, EV_KEY, KEY_RECORD, 1}, /* ( o) red */ + {KIND_FILTERED, 0xea, 0x25, EV_KEY, KEY_PLAYCD, 1}, /* ( >) */ + {KIND_FILTERED, 0xe9, 0x24, EV_KEY, KEY_REWIND, 1}, /* (<<) */ + {KIND_FILTERED, 0xeb, 0x26, EV_KEY, KEY_FORWARD, 1}, /* (>>) */ + {KIND_FILTERED, 0xed, 0x28, EV_KEY, KEY_STOP, 1}, /* ([]) */ + {KIND_FILTERED, 0xee, 0x29, EV_KEY, KEY_PAUSE, 1}, /* ('') */ + + {KIND_END, 0x00, 0x00, EV_MAX + 1, 0, 0} +}; + +/* Local function prototypes */ +static void ati_remote_dump (unsigned char *data, unsigned int actual_length); +static void ati_remote_delete (struct ati_remote *dev); +static int ati_remote_open (struct input_dev *inputdev); +static void ati_remote_close (struct input_dev *inputdev); +static int ati_remote_sendpacket (struct ati_remote *ati_remote, u16 cmd, unsigned char *data); +static void ati_remote_irq_out (struct urb *urb, struct pt_regs *regs); +static void ati_remote_irq_in (struct urb *urb, struct pt_regs *regs); +static void ati_remote_input_report (struct urb *urb, struct pt_regs *regs); +static int ati_remote_initialize (struct ati_remote *ati_remote); +static int ati_remote_probe (struct usb_interface *interface, const struct usb_device_id *id); +static void ati_remote_disconnect (struct usb_interface *interface); + +/* usb specific object to register with the usb subsystem */ +static struct usb_driver ati_remote_driver = { + .owner = THIS_MODULE, + .name = "ati_remote", + .probe = ati_remote_probe, + .disconnect = ati_remote_disconnect, + .id_table = ati_remote_table, +}; + +/* + * ati_remote_dump_input + */ +static void ati_remote_dump(unsigned char *data, unsigned int len) +{ + if ((len == 1) && (data[0] != (unsigned char)0xff) && (data[0] != 0x00)) + warn("Weird byte 0x%02x\n", data[0]); + else if (len == 4) + warn("Weird key %02x %02x %02x %02x\n", + data[0], data[1], data[2], data[3]); + else + warn("Weird data, len=%d %02x %02x %02x %02x %02x %02x ...\n", + len, data[0], data[1], data[2], data[3], data[4], data[5]); +} + +/* + * ati_remote_open + */ +static int ati_remote_open(struct input_dev *inputdev) +{ + struct ati_remote *ati_remote = inputdev->private; + + if (ati_remote->open++) + return 0; + + /* On first open, submit the read urb which was set up previously. */ + ati_remote->irq_urb->dev = ati_remote->udev; + if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) { + dev_err(&ati_remote->interface->dev, + "%s: usb_submit_urb failed!\n", __FUNCTION__); + ati_remote->open--; + return -EIO; + } + + return 0; +} + +/* + * ati_remote_close + */ +static void ati_remote_close(struct input_dev *inputdev) +{ + struct ati_remote *ati_remote = inputdev->private; + + if (ati_remote == NULL) { + err("ati_remote: %s: object is NULL!\n", __FUNCTION__); + return; + } + + if (ati_remote->open <= 0) + dev_dbg(&ati_remote->interface->dev, "%s: Not open.\n", __FUNCTION__); + else + --ati_remote->open; + + /* If still present, disconnect will call delete. */ + if (!ati_remote->present && !ati_remote->open) + ati_remote_delete(ati_remote); +} + +/* + * ati_remote_irq_out + */ +static void ati_remote_irq_out(struct urb *urb, struct pt_regs *regs) +{ + struct ati_remote *ati_remote = urb->context; + + if (urb->status) { + dev_dbg(&ati_remote->interface->dev, "%s: status %d\n", + __FUNCTION__, urb->status); + return; + } + + ati_remote->send_flags |= SEND_FLAG_COMPLETE; + wmb(); + if (waitqueue_active(&ati_remote->wait)) + wake_up(&ati_remote->wait); +} + +/* + * ati_remote_sendpacket + * + * Used to send device initialization strings + */ +static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigned char *data) +{ + DECLARE_WAITQUEUE(wait, current); + int timeout = HZ; /* 1 second */ + int retval = 0; + + /* Set up out_urb */ + memcpy(ati_remote->out_urb->transfer_buffer + 1, data, LO(cmd)); + ((char *) ati_remote->out_urb->transfer_buffer)[0] = HI(cmd); + + ati_remote->out_urb->transfer_buffer_length = LO(cmd) + 1; + ati_remote->out_urb->dev = ati_remote->udev; + ati_remote->send_flags = SEND_FLAG_IN_PROGRESS; + + set_current_state(TASK_INTERRUPTIBLE); + add_wait_queue(&ati_remote->wait, &wait); + + retval = usb_submit_urb(ati_remote->out_urb, GFP_KERNEL); + if (retval) { + set_current_state(TASK_RUNNING); + remove_wait_queue(&ati_remote->wait, &wait); + dev_dbg(&ati_remote->interface->dev, + "sendpacket: usb_submit_urb failed: %d\n", retval); + return retval; + } + + while (timeout && (ati_remote->out_urb->status == -EINPROGRESS) + && !(ati_remote->send_flags & SEND_FLAG_COMPLETE)) { + timeout = schedule_timeout(timeout); + rmb(); + } + + set_current_state(TASK_RUNNING); + remove_wait_queue(&ati_remote->wait, &wait); + usb_unlink_urb(ati_remote->out_urb); + + return retval; +} + +/* + * ati_remote_event_lookup + */ +static int ati_remote_event_lookup(int rem, unsigned char d1, unsigned char d2) +{ + int i; + + for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) { + /* + * Decide if the table entry matches the remote input. + */ + if ((((ati_remote_tbl[i].data1 & 0x0f) == (d1 & 0x0f))) && + ((((ati_remote_tbl[i].data1 >> 4) - + (d1 >> 4) + rem) & 0x0f) == 0x0f) && + (ati_remote_tbl[i].data2 == d2)) + return i; + + } + return -1; +} + +/* + * ati_remote_report_input + */ +static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) +{ + struct ati_remote *ati_remote = urb->context; + unsigned char *data= ati_remote->inbuf; + struct input_dev *dev = &ati_remote->idev; + int index, acc; + int remote_num; + + /* Deal with strange looking inputs */ + if ( (urb->actual_length != 4) || (data[0] != 0x14) || + ((data[3] & 0x0f) != 0x00) ) { + ati_remote_dump(data, urb->actual_length); + return; + } + + /* Mask unwanted remote channels. */ + /* note: remote_num is 0-based, channel 1 on remote == 0 here */ + remote_num = (data[3] >> 4) & 0x0f; + if (channel_mask & (1 << (remote_num + 1))) { + dbginfo(&ati_remote->interface->dev, + "Masked input from channel 0x%02x: data %02x,%02x, mask= 0x%02lx\n", + remote_num, data[1], data[2], channel_mask); + return; + } + + /* Look up event code index in translation table */ + index = ati_remote_event_lookup(remote_num, data[1], data[2]); + if (index < 0) { + dev_warn(&ati_remote->interface->dev, + "Unknown input from channel 0x%02x: data %02x,%02x\n", + remote_num, data[1], data[2]); + return; + } + dbginfo(&ati_remote->interface->dev, + "channel 0x%02x; data %02x,%02x; index %d; keycode %d\n", + remote_num, data[1], data[2], index, ati_remote_tbl[index].code); + + if (ati_remote_tbl[index].kind == KIND_LITERAL) { + input_regs(dev, regs); + input_event(dev, ati_remote_tbl[index].type, + ati_remote_tbl[index].code, + ati_remote_tbl[index].value); + input_sync(dev); + + ati_remote->old_jiffies = jiffies; + return; + } + + if (ati_remote_tbl[index].kind == KIND_FILTERED) { + /* Filter duplicate events which happen "too close" together. */ + if ((ati_remote->old_data[0] == data[1]) && + (ati_remote->old_data[1] == data[2]) && + ((ati_remote->old_jiffies + FILTER_TIME) > jiffies)) { + ati_remote->old_jiffies = jiffies; + return; + } + + input_regs(dev, regs); + input_event(dev, ati_remote_tbl[index].type, + ati_remote_tbl[index].code, 1); + input_event(dev, ati_remote_tbl[index].type, + ati_remote_tbl[index].code, 0); + input_sync(dev); + + ati_remote->old_data[0] = data[1]; + ati_remote->old_data[1] = data[2]; + ati_remote->old_jiffies = jiffies; + return; + } + + /* + * Other event kinds are from the directional control pad, and have an + * acceleration factor applied to them. Without this acceleration, the + * control pad is mostly unusable. + * + * If elapsed time since last event is > 1/4 second, user "stopped", + * so reset acceleration. Otherwise, user is probably holding the control + * pad down, so we increase acceleration, ramping up over two seconds to + * a maximum speed. The acceleration curve is #defined above. + */ + if ((jiffies - ati_remote->old_jiffies) > (HZ >> 2)) { + acc = 1; + ati_remote->acc_jiffies = jiffies; + } + else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 3)) acc = accel[0]; + else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 2)) acc = accel[1]; + else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 1)) acc = accel[2]; + else if ((jiffies - ati_remote->acc_jiffies) < HZ ) acc = accel[3]; + else if ((jiffies - ati_remote->acc_jiffies) < HZ+(HZ>>1)) acc = accel[4]; + else if ((jiffies - ati_remote->acc_jiffies) < (HZ << 1)) acc = accel[5]; + else acc = accel[6]; + + input_regs(dev, regs); + switch (ati_remote_tbl[index].kind) { + case KIND_ACCEL: + input_event(dev, ati_remote_tbl[index].type, + ati_remote_tbl[index].code, + ati_remote_tbl[index].value * acc); + break; + case KIND_LU: + input_report_rel(dev, REL_X, -acc); + input_report_rel(dev, REL_Y, -acc); + break; + case KIND_RU: + input_report_rel(dev, REL_X, acc); + input_report_rel(dev, REL_Y, -acc); + break; + case KIND_LD: + input_report_rel(dev, REL_X, -acc); + input_report_rel(dev, REL_Y, acc); + break; + case KIND_RD: + input_report_rel(dev, REL_X, acc); + input_report_rel(dev, REL_Y, acc); + break; + default: + dev_dbg(&ati_remote->interface->dev, "ati_remote kind=%d\n", + ati_remote_tbl[index].kind); + } + input_sync(dev); + + ati_remote->old_jiffies = jiffies; + ati_remote->old_data[0] = data[1]; + ati_remote->old_data[1] = data[2]; +} + +/* + * ati_remote_irq_in + */ +static void ati_remote_irq_in(struct urb *urb, struct pt_regs *regs) +{ + struct ati_remote *ati_remote = urb->context; + int retval; + + switch (urb->status) { + case 0: /* success */ + ati_remote_input_report(urb, regs); + break; + case -ECONNRESET: /* unlink */ + case -ENOENT: + case -ESHUTDOWN: + dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n", + __FUNCTION__); + return; + default: /* error */ + dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n", + __FUNCTION__, urb->status); + } + + retval = usb_submit_urb(urb, SLAB_ATOMIC); + if (retval) + dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n", + __FUNCTION__, retval); +} + +/* + * ati_remote_delete + */ +static void ati_remote_delete(struct ati_remote *ati_remote) +{ + if (!ati_remote) return; + + if (ati_remote->irq_urb) + usb_unlink_urb(ati_remote->irq_urb); + + if (ati_remote->out_urb) + usb_unlink_urb(ati_remote->out_urb); + + if (ati_remote->irq_urb) + usb_free_urb(ati_remote->irq_urb); + + if (ati_remote->out_urb) + usb_free_urb(ati_remote->out_urb); + + if (ati_remote->inbuf) + usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, + ati_remote->inbuf, ati_remote->inbuf_dma); + + if (ati_remote->outbuf) + usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, + ati_remote->inbuf, ati_remote->outbuf_dma); + + kfree(ati_remote); +} + +static void ati_remote_input_init(struct ati_remote *ati_remote) +{ + struct input_dev *idev = &(ati_remote->idev); + int i; + + idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); + idev->keybit[LONG(BTN_MOUSE)] = ( BIT(BTN_LEFT) | BIT(BTN_RIGHT) | + BIT(BTN_SIDE) | BIT(BTN_EXTRA) ); + idev->relbit[0] = BIT(REL_X) | BIT(REL_Y); + for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) + if (ati_remote_tbl[i].type == EV_KEY) + set_bit(ati_remote_tbl[i].code, idev->keybit); + + idev->private = ati_remote; + idev->open = ati_remote_open; + idev->close = ati_remote_close; + + idev->name = ati_remote->name; + idev->phys = ati_remote->phys; + + idev->id.bustype = BUS_USB; + idev->id.vendor = ati_remote->udev->descriptor.idVendor; + idev->id.product = ati_remote->udev->descriptor.idProduct; + idev->id.version = ati_remote->udev->descriptor.bcdDevice; +} + +static int ati_remote_initialize(struct ati_remote *ati_remote) +{ + struct usb_device *udev = ati_remote->udev; + int pipe, maxp; + + init_waitqueue_head(&ati_remote->wait); + + /* Set up irq_urb */ + pipe = usb_rcvintpipe(udev, ati_remote->endpoint_in->bEndpointAddress); + maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe)); + maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp; + + usb_fill_int_urb(ati_remote->irq_urb, udev, pipe, ati_remote->inbuf, + maxp, ati_remote_irq_in, ati_remote, + ati_remote->endpoint_in->bInterval); + ati_remote->irq_urb->transfer_dma = ati_remote->inbuf_dma; + ati_remote->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + + /* Set up out_urb */ + pipe = usb_sndintpipe(udev, ati_remote->endpoint_out->bEndpointAddress); + maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe)); + maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp; + + usb_fill_int_urb(ati_remote->out_urb, udev, pipe, ati_remote->outbuf, + maxp, ati_remote_irq_out, ati_remote, + ati_remote->endpoint_out->bInterval); + ati_remote->out_urb->transfer_dma = ati_remote->outbuf_dma; + ati_remote->out_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + + /* send initialization strings */ + if ((ati_remote_sendpacket(ati_remote, 0x8004, init1)) || + (ati_remote_sendpacket(ati_remote, 0x8007, init2))) { + dev_err(&ati_remote->interface->dev, + "Initializing ati_remote hardware failed.\n"); + return 1; + } + + return 0; +} + +/* + * ati_remote_probe + */ +static int ati_remote_probe(struct usb_interface *interface, const struct usb_device_id *id) +{ + struct usb_device *udev = interface_to_usbdev(interface); + struct ati_remote *ati_remote = NULL; + struct usb_host_interface *iface_host; + int retval = -ENOMEM; + char path[64]; + char *buf = NULL; + + /* See if the offered device matches what we can accept */ + if ((udev->descriptor.idVendor != ATI_REMOTE_VENDOR_ID) || + (udev->descriptor.idProduct != ATI_REMOTE_PRODUCT_ID)) { + return -ENODEV; + } + + /* Allocate and clear an ati_remote struct */ + if (!(ati_remote = kmalloc(sizeof (struct ati_remote), GFP_KERNEL))) + return -ENOMEM; + memset(ati_remote, 0x00, sizeof (struct ati_remote)); + + iface_host = interface->cur_altsetting; + if (iface_host->desc.bNumEndpoints != 2) { + err("%s: Unexpected desc.bNumEndpoints\n", __FUNCTION__); + retval = -ENODEV; + goto error; + } + + ati_remote->endpoint_in = &(iface_host->endpoint[0].desc); + ati_remote->endpoint_out = &(iface_host->endpoint[1].desc); + ati_remote->udev = udev; + ati_remote->interface = interface; + + if (!(ati_remote->endpoint_in->bEndpointAddress & 0x80)) { + err("%s: Unexpected endpoint_in->bEndpointAddress\n", __FUNCTION__); + retval = -ENODEV; + goto error; + } + if ((ati_remote->endpoint_in->bmAttributes & 3) != 3) { + err("%s: Unexpected endpoint_in->bmAttributes\n", __FUNCTION__); + retval = -ENODEV; + goto error; + } + if (ati_remote->endpoint_in->wMaxPacketSize == 0) { + err("%s: endpoint_in message size==0? \n", __FUNCTION__); + retval = -ENODEV; + goto error; + } + if (!(buf = kmalloc(NAME_BUFSIZE, GFP_KERNEL))) + goto error; + + /* Allocate URB buffers, URBs */ + ati_remote->inbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, SLAB_ATOMIC, + &ati_remote->inbuf_dma); + if (!ati_remote->inbuf) + goto error; + + ati_remote->outbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, SLAB_ATOMIC, + &ati_remote->outbuf_dma); + if (!ati_remote->outbuf) + goto error; + + ati_remote->irq_urb = usb_alloc_urb(0, GFP_KERNEL); + if (!ati_remote->irq_urb) + goto error; + + ati_remote->out_urb = usb_alloc_urb(0, GFP_KERNEL); + if (!ati_remote->out_urb) + goto error; + + usb_make_path(udev, path, NAME_BUFSIZE); + sprintf(ati_remote->phys, "%s/input%d", path, ATI_INPUTNUM); + if (udev->descriptor.iManufacturer && + (usb_string(udev, udev->descriptor.iManufacturer, buf, + NAME_BUFSIZE) > 0)) + strcat(ati_remote->name, buf); + + if (udev->descriptor.iProduct && + (usb_string(udev, udev->descriptor.iProduct, buf, NAME_BUFSIZE) > 0)) + sprintf(ati_remote->name, "%s %s", ati_remote->name, buf); + + if (!strlen(ati_remote->name)) + sprintf(ati_remote->name, DRIVER_DESC "(%04x,%04x)", + ati_remote->udev->descriptor.idVendor, + ati_remote->udev->descriptor.idProduct); + + /* Device Hardware Initialization - fills in ati_remote->idev from udev. */ + retval = ati_remote_initialize(ati_remote); + if (retval) + goto error; + + /* Set up and register input device */ + ati_remote_input_init(ati_remote); + input_register_device(&ati_remote->idev); + + dev_info(&ati_remote->interface->dev, "Input registered: %s on %s\n", + ati_remote->name, path); + + usb_set_intfdata(interface, ati_remote); + ati_remote->present = 1; + kfree(buf); + return 0; + +error: + if (buf) + kfree(buf); + + ati_remote_delete(ati_remote); + return retval; +} + +/* + * ati_remote_disconnect + */ +static void ati_remote_disconnect(struct usb_interface *interface) +{ + struct ati_remote *ati_remote; + + ati_remote = usb_get_intfdata(interface); + usb_set_intfdata(interface, NULL); + if (!ati_remote) { + warn("%s - null device?\n", __FUNCTION__); + return; + } + + input_unregister_device(&ati_remote->idev); + + /* Mark device as unplugged */ + ati_remote->present = 0; + + /* If device is still open, ati_remote_close will call delete. */ + if (!ati_remote->open) + ati_remote_delete(ati_remote); +} + +/* + * ati_remote_init + */ +static int __init ati_remote_init(void) +{ + int result; + + result = usb_register(&ati_remote_driver); + if (result) + err("usb_register error #%d\n", result); + else + info("Registered USB driver " DRIVER_DESC " v. " DRIVER_VERSION); + + return result; +} + +/* + * ati_remote_exit + */ +static void __exit ati_remote_exit(void) +{ + usb_deregister(&ati_remote_driver); +} + +/* + * module specification + */ + +module_init(ati_remote_init); +module_exit(ati_remote_exit); + +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("GPL"); + diff -Nru a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c --- a/drivers/usb/input/hid-core.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/hid-core.c Wed Mar 17 19:29:09 2004 @@ -224,6 +224,9 @@ offset = report->size; report->size += parser->global.report_size * parser->global.report_count; + if (usages < parser->global.report_count) + usages = parser->global.report_count; + if (usages == 0) return 0; /* ignore padding fields */ @@ -235,9 +238,13 @@ field->application = hid_lookup_collection(parser, HID_COLLECTION_APPLICATION); for (i = 0; i < usages; i++) { - field->usage[i].hid = parser->local.usage[i]; + int j = i; + /* Duplicate the last usage we parsed if we have excess values */ + if (i >= parser->local.usage_index) + j = parser->local.usage_index - 1; + field->usage[i].hid = parser->local.usage[j]; field->usage[i].collection_index = - parser->local.collection_index[i]; + parser->local.collection_index[j]; } field->maxusage = usages; @@ -1069,24 +1076,41 @@ { struct hid_report *report; unsigned char dir; + int len; report = hid->ctrl[hid->ctrltail].report; dir = hid->ctrl[hid->ctrltail].dir; - if (dir == USB_DIR_OUT) + len = ((report->size - 1) >> 3) + 1 + (report->id > 0); + if (dir == USB_DIR_OUT) { hid_output_report(report, hid->ctrlbuf); - - hid->urbctrl->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0); - hid->urbctrl->pipe = (dir == USB_DIR_OUT) ? usb_sndctrlpipe(hid->dev, 0) : usb_rcvctrlpipe(hid->dev, 0); + hid->urbctrl->pipe = usb_sndctrlpipe(hid->dev, 0); + hid->urbctrl->transfer_buffer_length = len; + } else { + int maxpacket, padlen; + + hid->urbctrl->pipe = usb_rcvctrlpipe(hid->dev, 0); + maxpacket = usb_maxpacket(hid->dev, hid->urbctrl->pipe, 0); + if (maxpacket > 0) { + padlen = (len + maxpacket - 1) / maxpacket; + padlen *= maxpacket; + if (padlen > HID_BUFFER_SIZE) + padlen = HID_BUFFER_SIZE; + } else + padlen = 0; + hid->urbctrl->transfer_buffer_length = padlen; + } hid->urbctrl->dev = hid->dev; hid->cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir; hid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT; hid->cr->wValue = cpu_to_le16(((report->type + 1) << 8) | report->id); hid->cr->wIndex = cpu_to_le16(hid->ifnum); - hid->cr->wLength = cpu_to_le16(hid->urbctrl->transfer_buffer_length); + hid->cr->wLength = cpu_to_le16(len); - dbg("submitting ctrl urb"); + dbg("submitting ctrl urb: %s wValue=0x%04x wIndex=0x%04x wLength=%u", + hid->cr->bRequest == HID_REQ_SET_REPORT ? "Set_Report" : "Get_Report", + hid->cr->wValue, hid->cr->wIndex, hid->cr->wLength); if (usb_submit_urb(hid->urbctrl, GFP_ATOMIC)) { err("usb_submit_urb(ctrl) failed"); @@ -1262,9 +1286,25 @@ struct hid_report_enum *report_enum; struct hid_report *report; struct list_head *list; - int len; int err, ret; + /* + * The Set_Idle request is supposed to affect only the + * "Interrupt In" pipe. Unfortunately, buggy devices such as + * the BTC keyboard (ID 046e:5303) the request also affects + * Get_Report requests on the control pipe. In the worst + * case, if the device was put on idle for an indefinite + * amount of time (as we do below) and there are no input + * events to report, the Get_Report requests will just hang + * until we get a USB timeout. To avoid this, we temporarily + * establish a minimal idle time of 1ms. This shouldn't hurt + * bugfree devices and will cause a worst-case extra delay of + * 1ms for buggy ones. + */ + usb_control_msg(hid->dev, usb_sndctrlpipe(hid->dev, 0), + HID_REQ_SET_IDLE, USB_TYPE_CLASS | USB_RECIP_INTERFACE, (1 << 8), + hid->ifnum, NULL, 0, HZ * USB_CTRL_SET_TIMEOUT); + report_enum = hid->report_enum + HID_INPUT_REPORT; list = report_enum->report_list.next; while (list != &report_enum->report_list) { @@ -1297,11 +1337,8 @@ list = report_enum->report_list.next; while (list != &report_enum->report_list) { report = (struct hid_report *) list; - len = ((report->size - 1) >> 3) + 1 + report_enum->numbered; - if (len > hid->urbin->transfer_buffer_length) - hid->urbin->transfer_buffer_length = len < HID_BUFFER_SIZE ? len : HID_BUFFER_SIZE; usb_control_msg(hid->dev, usb_sndctrlpipe(hid->dev, 0), - 0x0a, USB_TYPE_CLASS | USB_RECIP_INTERFACE, report->id, + HID_REQ_SET_IDLE, USB_TYPE_CLASS | USB_RECIP_INTERFACE, report->id, hid->ifnum, NULL, 0, HZ * USB_CTRL_SET_TIMEOUT); list = list->next; } @@ -1313,11 +1350,12 @@ #define USB_DEVICE_ID_WACOM_INTUOS 0x0020 #define USB_DEVICE_ID_WACOM_PL 0x0030 #define USB_DEVICE_ID_WACOM_INTUOS2 0x0040 +#define USB_DEVICE_ID_WACOM_VOLITO 0x0060 +#define USB_DEVICE_ID_WACOM_PTU 0x0003 #define USB_VENDOR_ID_KBGEAR 0x084e #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO 0x1001 - #define USB_VENDOR_ID_AIPTEK 0x08ca #define USB_DEVICE_ID_AIPTEK_6000 0x0020 @@ -1356,22 +1394,52 @@ #define USB_VENDOR_ID_A4TECH 0x09DA #define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006 +#define USB_VENDOR_ID_CYPRESS 0x04b4 +#define USB_DEVICE_ID_CYPRESS_MOUSE 0x0001 + #define USB_VENDOR_ID_BERKSHIRE 0x0c98 #define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 #define USB_VENDOR_ID_ALPS 0x0433 #define USB_DEVICE_ID_IBM_GAMEPAD 0x1101 +#define USB_VENDOR_ID_SAITEK 0x06a3 +#define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17 + +#define USB_VENDOR_ID_NEC 0x073e +#define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301 + +#define USB_VENDOR_ID_CHIC 0x05fe +#define USB_DEVICE_ID_CHIC_GAMEPAD 0x0014 + struct hid_blacklist { __u16 idVendor; __u16 idProduct; unsigned quirks; } hid_blacklist[] = { + + { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_6000, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1, HID_QUIRK_IGNORE }, + + { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 100, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 200, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PENPARTNER, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 1, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 2, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 3, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 4, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 1, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 2, HID_QUIRK_IGNORE }, @@ -1383,37 +1451,34 @@ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 3, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 4, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 5, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 1, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 2, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 3, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 4, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_6000, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 5, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 7, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PTU, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, - { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD }, - { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD|HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD|HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD|HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 100, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 200, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET }, - { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK }, - { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE }, + + { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_BACK }, + { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE, HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA }, + { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, + { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD }, + { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD }, + { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD }, + { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD }, + { 0, 0 } }; @@ -1445,7 +1510,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) { - struct usb_host_interface *interface = intf->altsetting + intf->act_altsetting; + struct usb_host_interface *interface = intf->cur_altsetting; struct usb_device *dev = interface_to_usbdev (intf); struct hid_descriptor *hdesc; struct hid_device *hid; @@ -1518,12 +1583,17 @@ continue; if (endpoint->bEndpointAddress & USB_DIR_IN) { + int len; + if (hid->urbin) continue; if (!(hid->urbin = usb_alloc_urb(0, GFP_KERNEL))) goto fail; pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); - usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, 0, + len = usb_maxpacket(dev, pipe, 0); + if (len > HID_BUFFER_SIZE) + len = HID_BUFFER_SIZE; + usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, len, hid_irq_in, hid, endpoint->bInterval); hid->urbin->transfer_dma = hid->inbuf_dma; hid->urbin->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; diff -Nru a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c --- a/drivers/usb/input/hid-ff.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/hid-ff.c Wed Mar 17 19:29:09 2004 @@ -29,7 +29,7 @@ #include -#define DEBUG +#undef DEBUG #include #include "hid.h" diff -Nru a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c --- a/drivers/usb/input/hid-input.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/hid-input.c Wed Mar 17 19:29:09 2004 @@ -377,7 +377,8 @@ set_bit(usage->type, input->evbit); if ((usage->type == EV_REL) - && (device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK) + && (device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_BACK + | HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA)) && (usage->code == REL_WHEEL)) { set_bit(REL_HWHEEL, bit); } @@ -431,21 +432,22 @@ input_regs(input, regs); - if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK) - && (usage->code == BTN_BACK)) { + if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA) && (usage->code == BTN_EXTRA)) + || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK))) { if (value) hid->quirks |= HID_QUIRK_2WHEEL_MOUSE_HACK_ON; else hid->quirks &= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON; return; } + if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_ON) && (usage->code == REL_WHEEL)) { input_event(input, usage->type, REL_HWHEEL, value); return; } - if (usage->hat_min != usage->hat_max) { + if (usage->hat_min != usage->hat_max ) { /* FIXME: hat_max can be 0 and hat_min 1 */ value = (value - usage->hat_min) * 8 / (usage->hat_max - usage->hat_min + 1) + 1; if (value < 0 || value > 8) value = 0; input_event(input, usage->type, usage->code , hid_hat_to_axis[value].x); @@ -484,7 +486,7 @@ return; } - if((usage->type == EV_KEY) && (usage->code == 0)) /* Key 0 is "unassigned", not KEY_UKNOWN */ + if((usage->type == EV_KEY) && (usage->code == 0)) /* Key 0 is "unassigned", not KEY_UNKNOWN */ return; input_event(input, usage->type, usage->code, value); @@ -567,8 +569,10 @@ while (list != &report_enum->report_list) { report = (struct hid_report *) list; - if (!report->maxfield) + if (!report->maxfield) { + list = list->next; continue; + } if (!hidinput) { hidinput = kmalloc(sizeof(*hidinput), GFP_KERNEL); diff -Nru a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h --- a/drivers/usb/input/hid.h Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/hid.h Wed Mar 17 19:29:09 2004 @@ -201,15 +201,16 @@ * HID device quirks. */ -#define HID_QUIRK_INVERT 0x001 -#define HID_QUIRK_NOTOUCH 0x002 -#define HID_QUIRK_IGNORE 0x004 -#define HID_QUIRK_NOGET 0x008 -#define HID_QUIRK_HIDDEV 0x010 -#define HID_QUIRK_BADPAD 0x020 -#define HID_QUIRK_MULTI_INPUT 0x040 -#define HID_QUIRK_2WHEEL_MOUSE_HACK 0x080 -#define HID_QUIRK_2WHEEL_MOUSE_HACK_ON 0x100 +#define HID_QUIRK_INVERT 0x001 +#define HID_QUIRK_NOTOUCH 0x002 +#define HID_QUIRK_IGNORE 0x004 +#define HID_QUIRK_NOGET 0x008 +#define HID_QUIRK_HIDDEV 0x010 +#define HID_QUIRK_BADPAD 0x020 +#define HID_QUIRK_MULTI_INPUT 0x040 +#define HID_QUIRK_2WHEEL_MOUSE_HACK_BACK 0x080 +#define HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA 0x100 +#define HID_QUIRK_2WHEEL_MOUSE_HACK_ON 0x200 /* * This is the global environment of the parser. This information is @@ -309,7 +310,7 @@ #define HID_REPORT_TYPES 3 -#define HID_BUFFER_SIZE 32 +#define HID_BUFFER_SIZE 64 /* use 64 for compatibility with all possible packetlen */ #define HID_CONTROL_FIFO_SIZE 256 /* to init devices with >100 reports */ #define HID_OUTPUT_FIFO_SIZE 64 diff -Nru a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c --- a/drivers/usb/input/hiddev.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/hiddev.c Wed Mar 17 19:29:09 2004 @@ -403,7 +403,8 @@ struct hiddev_collection_info cinfo; struct hiddev_report_info rinfo; struct hiddev_field_info finfo; - struct hiddev_usage_ref uref; + struct hiddev_usage_ref_multi uref_multi; + struct hiddev_usage_ref *uref = &uref_multi.uref; struct hiddev_devinfo dinfo; struct hid_report *report; struct hid_field *field; @@ -575,68 +576,98 @@ return 0; case HIDIOCGUCODE: - if (copy_from_user(&uref, (void *) arg, sizeof(uref))) + if (copy_from_user(uref, (void *) arg, sizeof(*uref))) return -EFAULT; - rinfo.report_type = uref.report_type; - rinfo.report_id = uref.report_id; + rinfo.report_type = uref->report_type; + rinfo.report_id = uref->report_id; if ((report = hiddev_lookup_report(hid, &rinfo)) == NULL) return -EINVAL; - if (uref.field_index >= report->maxfield) + if (uref->field_index >= report->maxfield) return -EINVAL; - field = report->field[uref.field_index]; - if (uref.usage_index >= field->maxusage) + field = report->field[uref->field_index]; + if (uref->usage_index >= field->maxusage) return -EINVAL; - uref.usage_code = field->usage[uref.usage_index].hid; + uref->usage_code = field->usage[uref->usage_index].hid; - if (copy_to_user((void *) arg, &uref, sizeof(uref))) + if (copy_to_user((void *) arg, uref, sizeof(*uref))) return -EFAULT; return 0; case HIDIOCGUSAGE: case HIDIOCSUSAGE: + case HIDIOCGUSAGES: + case HIDIOCSUSAGES: case HIDIOCGCOLLECTIONINDEX: - if (copy_from_user(&uref, (void *) arg, sizeof(uref))) - return -EFAULT; + if (cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) { + if (copy_from_user(&uref_multi, (void *) arg, + sizeof(uref_multi))) + return -EFAULT; + } else { + if (copy_from_user(uref, (void *) arg, sizeof(*uref))) + return -EFAULT; + } - if (cmd != HIDIOCGUSAGE && uref.report_type == HID_REPORT_TYPE_INPUT) - return -EINVAL; + if (cmd != HIDIOCGUSAGE && + cmd != HIDIOCGUSAGES && + uref->report_type == HID_REPORT_TYPE_INPUT) + return -EINVAL; - if (uref.report_id == HID_REPORT_ID_UNKNOWN) { - field = hiddev_lookup_usage(hid, &uref); + if (uref->report_id == HID_REPORT_ID_UNKNOWN) { + field = hiddev_lookup_usage(hid, uref); if (field == NULL) return -EINVAL; } else { - rinfo.report_type = uref.report_type; - rinfo.report_id = uref.report_id; + rinfo.report_type = uref->report_type; + rinfo.report_id = uref->report_id; if ((report = hiddev_lookup_report(hid, &rinfo)) == NULL) return -EINVAL; - if (uref.field_index >= report->maxfield) + if (uref->field_index >= report->maxfield) return -EINVAL; - field = report->field[uref.field_index]; - if (uref.usage_index >= field->maxusage) + field = report->field[uref->field_index]; + if (uref->usage_index >= field->maxusage) return -EINVAL; + + if (cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) { + if (uref_multi.num_values >= HID_MAX_USAGES || + uref->usage_index >= field->maxusage || + (uref->usage_index + uref_multi.num_values) >= field->maxusage) + return -EINVAL; + } } switch (cmd) { case HIDIOCGUSAGE: - uref.value = field->value[uref.usage_index]; - if (copy_to_user((void *) arg, &uref, sizeof(uref))) + uref->value = field->value[uref->usage_index]; + if (copy_to_user((void *) arg, uref, sizeof(*uref))) return -EFAULT; return 0; case HIDIOCSUSAGE: - field->value[uref.usage_index] = uref.value; + field->value[uref->usage_index] = uref->value; return 0; case HIDIOCGCOLLECTIONINDEX: - return field->usage[uref.usage_index].collection_index; + return field->usage[uref->usage_index].collection_index; + case HIDIOCGUSAGES: + for (i = 0; i < uref_multi.num_values; i++) + uref_multi.values[i] = + field->value[uref->usage_index + i]; + if (copy_to_user((void *) arg, &uref_multi, + sizeof(uref_multi))) + return -EFAULT; + return 0; + case HIDIOCSUSAGES: + for (i = 0; i < uref_multi.num_values; i++) + field->value[uref->usage_index + i] = + uref_multi.values[i]; + return 0; } return 0; diff -Nru a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c --- a/drivers/usb/input/kbtab.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/kbtab.c Wed Mar 17 19:29:09 2004 @@ -4,6 +4,8 @@ #include #include #include +#include +#include /* * Version Information @@ -65,8 +67,8 @@ goto exit; } - kbtab->x = (data[2] << 8) + data[1]; - kbtab->y = (data[4] << 8) + data[3]; + kbtab->x = le16_to_cpu(get_unaligned((u16 *) &data[1])); + kbtab->y = le16_to_cpu(get_unaligned((u16 *) &data[3])); kbtab->pressure = (data[5]); @@ -74,12 +76,15 @@ input_report_abs(dev, ABS_X, kbtab->x); input_report_abs(dev, ABS_Y, kbtab->y); - /*input_report_abs(dev, ABS_PRESSURE, kbtab->pressure);*/ /*input_report_key(dev, BTN_TOUCH , data[0] & 0x01);*/ input_report_key(dev, BTN_RIGHT, data[0] & 0x02); - - input_report_key(dev, BTN_LEFT, (kbtab->pressure > kb_pressure_click) ? 1 : 0); + + if( -1 == kb_pressure_click){ + input_report_abs(dev, ABS_PRESSURE, kbtab->pressure); + } else { + input_report_key(dev, BTN_LEFT, (kbtab->pressure > kb_pressure_click) ? 1 : 0); + }; input_sync(dev); @@ -105,8 +110,10 @@ return 0; kbtab->irq->dev = kbtab->usbdev; - if (usb_submit_urb(kbtab->irq, GFP_KERNEL)) + if (usb_submit_urb(kbtab->irq, GFP_KERNEL)) { + kbtab->open--; return -EIO; + } return 0; } @@ -130,7 +137,7 @@ return -ENOMEM; memset(kbtab, 0, sizeof(struct kbtab)); - kbtab->data = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &kbtab->data_dma); + kbtab->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &kbtab->data_dma); if (!kbtab->data) { kfree(kbtab); return -ENOMEM; diff -Nru a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/usb/input/mtouchusb.c Wed Mar 17 19:29:10 2004 @@ -0,0 +1,391 @@ +/****************************************************************************** + * mtouchusb.c -- Driver for Microtouch (Now 3M) USB Touchscreens + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Based upon original work by Radoslaw Garbacz (usb-support@ite.pl) + * (http://freshmeat.net/projects/3mtouchscreendriver) + * + * History + * + * 0.3 & 0.4 2002 (TEJ) tejohnson@yahoo.com + * Updated to 2.4.18, then 2.4.19 + * Old version still relied on stealing a minor + * + * 0.5 02/26/2004 (TEJ) tejohnson@yahoo.com + * Complete rewrite using Linux Input in 2.6.3 + * Unfortunately no calibration support at this time + * + *****************************************************************************/ + +#include + +#ifdef CONFIG_USB_DEBUG + #define DEBUG +#else + #undef DEBUG +#endif + +#include +#include +#include +#include +#include +#include + +#define MTOUCHUSB_MIN_XC 0xc8 +#define MTOUCHUSB_MAX_XC 0xff78 +#define MTOUCHUSB_XC_FUZZ 0x0 +#define MTOUCHUSB_XC_FLAT 0x0 +#define MTOUCHUSB_MIN_YC 0x0 +#define MTOUCHUSB_MAX_YC 0xff78 +#define MTOUCHUSB_YC_FUZZ 0x0 +#define MTOUCHUSB_YC_FLAT 0x0 +#define MTOUCHUSB_ASYC_REPORT 1 +#define MTOUCHUSB_REPORT_SIZE_DATA 11 +#define MTOUCHUSB_REQ_CTRLLR_ID 10 + +#define MTOUCHUSB_GET_XC(data) (data[4]<<8 | data[3]) +#define MTOUCHUSB_GET_YC(data) (data[6]<<8 | data[5]) +#define MTOUCHUSB_GET_TOUCHED(data) ((data[2] & 0x40) ? 1:0) + +#define DRIVER_VERSION "v0.1" +#define DRIVER_AUTHOR "Todd E. Johnson, tejohnson@yahoo.com" +#define DRIVER_DESC "Microtouch USB HID Touchscreen Driver" + +struct mtouch_usb { + unsigned char *data; + dma_addr_t data_dma; + struct urb *irq; + struct usb_device *udev; + struct input_dev input; + int open; + char name[128]; + char phys[64]; +}; + +static __s32 vendor=-1, product=-1; + +static struct usb_device_id mtouchusb_devices [] = { + { USB_DEVICE(0x0596, 0x0001) }, /* 3M (Formerly MicroTouch) 14-206 */ + { } /* Terminating entry */ +}; + +static void mtouchusb_irq(struct urb *urb, struct pt_regs *regs) +{ + struct mtouch_usb *mtouch = urb->context; + int retval; + + switch (urb->status) { + case 0: + /* success */ + break; + case -ETIMEDOUT: + /* this urb is timing out */ + dbg("%s - urb timed out - was the device unplugged?", + __FUNCTION__); + return; + case -ECONNRESET: + case -ENOENT: + case -ESHUTDOWN: + /* this urb is terminated, clean up */ + dbg("%s - urb shutting down with status: %d", + __FUNCTION__, urb->status); + return; + default: + dbg("%s - nonzero urb status received: %d", + __FUNCTION__, urb->status); + goto exit; + } + + input_regs(&mtouch->input, regs); + input_report_key(&mtouch->input, BTN_TOUCH, + MTOUCHUSB_GET_TOUCHED(mtouch->data)); + input_report_abs(&mtouch->input, ABS_X, + MTOUCHUSB_GET_XC(mtouch->data)); + input_report_abs(&mtouch->input, ABS_Y, + MTOUCHUSB_GET_YC(mtouch->data)); + input_sync(&mtouch->input); + +exit: + retval = usb_submit_urb (urb, GFP_ATOMIC); + if (retval) + err ("%s - usb_submit_urb failed with result: %d", + __FUNCTION__, retval); +} + +static int mtouchusb_open (struct input_dev *input) +{ + struct mtouch_usb *mtouch = input->private; + + if (mtouch->open++) + return 0; + + mtouch->irq->dev = mtouch->udev; + + if (usb_submit_urb (mtouch->irq, GFP_ATOMIC)) + return -EIO; + + return 0; +} + +static void mtouchusb_close (struct input_dev *input) +{ + struct mtouch_usb *mtouch = input->private; + + if (!--mtouch->open) + usb_unlink_urb (mtouch->irq); +} + +static int mtouchusb_alloc_buffers(struct usb_device *udev, struct mtouch_usb *mtouch) +{ + dbg("%s - called", __FUNCTION__); + + mtouch->data = usb_buffer_alloc(udev, MTOUCHUSB_REPORT_SIZE_DATA, + SLAB_ATOMIC, &mtouch->data_dma); + + if (!mtouch->data) + return -1; + + return 0; +} + +static void mtouchusb_free_buffers(struct usb_device *udev, struct mtouch_usb *mtouch) +{ + dbg("%s - called", __FUNCTION__); + + if (mtouch->data) + usb_buffer_free(udev, MTOUCHUSB_REPORT_SIZE_DATA, + mtouch->data, mtouch->data_dma); +} + +static int mtouchusb_probe(struct usb_interface *intf, const struct usb_device_id *id) +{ + struct mtouch_usb *mtouch; + struct usb_host_interface *interface; + struct usb_endpoint_descriptor *endpoint; + struct usb_device *udev = interface_to_usbdev (intf); + char path[64]; + char *buf; + int nRet; + int ix; + char valid_device = 0; + + dbg("%s - called", __FUNCTION__); + if (vendor != -1 && product != -1) { + info("%s - User specified USB Touch -- Vend:Prod - %x:%x", + __FUNCTION__, vendor, product); + } + + for (ix = 0; ix < sizeof (mtouchusb_devices) / + sizeof (struct usb_device_id); ix++) { + if ((udev->descriptor.idVendor == + mtouchusb_devices [ix].idVendor) && + (udev->descriptor.idProduct == + mtouchusb_devices [ix].idProduct)) { + valid_device = 1; + break; + } + } + + if (udev->descriptor.idVendor == vendor && + udev->descriptor.idProduct == product) { /* User specified */ + valid_device = 1; + } + + if (!valid_device) { + err("%s - No valid device!", __FUNCTION__); + return -EIO; + } + + if (udev->descriptor.bNumConfigurations != 1) { + err("%s - Only one device configuration is supported.", + __FUNCTION__); + return -EIO; + } + + dbg("%s - setting interface", __FUNCTION__); + interface = intf->cur_altsetting; + + dbg("%s - setting endpoint", __FUNCTION__); + endpoint = &interface->endpoint[0].desc; + + if (interface->desc.bNumEndpoints != 1) { + err("%s - Only one endpoint is supported.", __FUNCTION__); + return -EIO; + } + + if (!(mtouch = kmalloc (sizeof (struct mtouch_usb), GFP_KERNEL))) { + err("%s - Out of memory.", __FUNCTION__); + return -ENOMEM; + } + + memset(mtouch, 0, sizeof(struct mtouch_usb)); + mtouch->udev = udev; + + dbg("%s - allocating buffers", __FUNCTION__); + if (mtouchusb_alloc_buffers(udev, mtouch)) { + mtouchusb_free_buffers(udev, mtouch); + kfree(mtouch); + return -ENOMEM; + } + + mtouch->input.private = mtouch; + mtouch->input.open = mtouchusb_open; + mtouch->input.close = mtouchusb_close; + + usb_make_path(udev, path, 64); + sprintf(mtouch->phys, "%s/input0", path); + + mtouch->input.name = mtouch->name; + mtouch->input.phys = mtouch->phys; + mtouch->input.id.bustype = BUS_USB; + mtouch->input.id.vendor = udev->descriptor.idVendor; + mtouch->input.id.product = udev->descriptor.idProduct; + mtouch->input.id.version = udev->descriptor.bcdDevice; + mtouch->input.dev = &intf->dev; + + mtouch->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); + mtouch->input.absbit[0] = BIT(ABS_X) | BIT(ABS_Y); + mtouch->input.keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); + + /* Used to Scale Compensated Data and Flip Y */ + mtouch->input.absmin[ABS_X] = MTOUCHUSB_MIN_XC; + mtouch->input.absmax[ABS_X] = MTOUCHUSB_MAX_XC; + mtouch->input.absfuzz[ABS_X] = MTOUCHUSB_XC_FUZZ; + mtouch->input.absflat[ABS_X] = MTOUCHUSB_XC_FLAT; + mtouch->input.absmin[ABS_Y] = MTOUCHUSB_MAX_YC; + mtouch->input.absmax[ABS_Y] = MTOUCHUSB_MIN_YC; + mtouch->input.absfuzz[ABS_Y] = MTOUCHUSB_YC_FUZZ; + mtouch->input.absflat[ABS_Y] = MTOUCHUSB_YC_FLAT; + + if (!(buf = kmalloc(63, GFP_KERNEL))) { + kfree(mtouch); + return -ENOMEM; + } + + if (udev->descriptor.iManufacturer && + usb_string(udev, udev->descriptor.iManufacturer, buf, 63) > 0) + strcat(mtouch->name, buf); + if (udev->descriptor.iProduct && + usb_string(udev, udev->descriptor.iProduct, buf, 63) > 0) + sprintf(mtouch->name, "%s %s", mtouch->name, buf); + + if (!strlen(mtouch->name)) + sprintf(mtouch->name, "USB Touchscreen %04x:%04x", + mtouch->input.id.vendor, mtouch->input.id.product); + + kfree(buf); + + nRet = usb_control_msg(mtouch->udev, + usb_rcvctrlpipe(udev, 0x80), + USB_REQ_GET_CONFIGURATION, + USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE, + 0, + 0x81, + NULL, + 0, + HZ * USB_CTRL_SET_TIMEOUT); + dbg("%s - usb_control_msg - USB_REQ_GET_CONFIGURATION - bytes|err: %d", + __FUNCTION__, nRet); + + dbg("%s - usb_alloc_urb: mtouch->irq", __FUNCTION__); + mtouch->irq = usb_alloc_urb(0, GFP_KERNEL); + if (!mtouch->irq) { + dbg("%s - usb_alloc_urb failed: mtouch->irq", __FUNCTION__); + mtouchusb_free_buffers(udev, mtouch); + kfree(mtouch); + return -ENOMEM; + } + + dbg("%s - usb_fill_int_urb", __FUNCTION__); + usb_fill_int_urb(mtouch->irq, + mtouch->udev, + usb_rcvintpipe(mtouch->udev, 0x81), + mtouch->data, + MTOUCHUSB_REPORT_SIZE_DATA, + mtouchusb_irq, + mtouch, + endpoint->bInterval); + + dbg("%s - input_register_device", __FUNCTION__); + input_register_device(&mtouch->input); + + nRet = usb_control_msg(mtouch->udev, + usb_rcvctrlpipe(udev, 0x80), + MTOUCHUSB_ASYC_REPORT, + USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, + MTOUCHUSB_ASYC_REPORT, + MTOUCHUSB_ASYC_REPORT, + NULL, + 0, + HZ * USB_CTRL_SET_TIMEOUT); + dbg("%s - usb_control_msg - MTOUCHUSB_ASYC_REPORT - bytes|err: %d", + __FUNCTION__, nRet); + + printk(KERN_INFO "input: %s on %s\n", mtouch->name, path); + usb_set_intfdata(intf, mtouch); + + return 0; +} + +static void mtouchusb_disconnect(struct usb_interface *intf) +{ + struct mtouch_usb *mtouch = usb_get_intfdata (intf); + + dbg("%s - called", __FUNCTION__); + usb_set_intfdata(intf, NULL); + if (mtouch) { + dbg("%s - mtouch is initialized, cleaning up", __FUNCTION__); + usb_unlink_urb(mtouch->irq); + input_unregister_device(&mtouch->input); + usb_free_urb(mtouch->irq); + mtouchusb_free_buffers(interface_to_usbdev(intf), mtouch); + kfree(mtouch); + } +} + +MODULE_DEVICE_TABLE (usb, mtouchusb_devices); + +static struct usb_driver mtouchusb_driver = { + .owner = THIS_MODULE, + .name = "mtouchusb", + .probe = mtouchusb_probe, + .disconnect = mtouchusb_disconnect, + .id_table = mtouchusb_devices, +}; + +static int __init mtouchusb_init(void) { + dbg("%s - called", __FUNCTION__); + return usb_register(&mtouchusb_driver); +} + +static void __exit mtouchusb_cleanup(void) { + dbg("%s - called", __FUNCTION__); + usb_deregister(&mtouchusb_driver); +} + +module_init(mtouchusb_init); +module_exit(mtouchusb_cleanup); + +MODULE_AUTHOR( DRIVER_AUTHOR ); +MODULE_DESCRIPTION( DRIVER_DESC ); +MODULE_LICENSE("GPL"); +MODULE_PARM(vendor, "i"); +MODULE_PARM_DESC(vendor, "User specified USB idVendor"); +MODULE_PARM(product, "i"); +MODULE_PARM_DESC(product, "User specified USB idProduct"); + + diff -Nru a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c --- a/drivers/usb/input/pid.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/input/pid.c Wed Mar 17 19:29:10 2004 @@ -200,6 +200,7 @@ break; if ( id == FF_EFFECTS_MAX) { + spin_unlock_irqrestore(&pid_private->lock,flags); // TEMP - We need to get ff_effects_max correctly first: || id >= dev->ff_effects_max) { dev_dbg(&pid_private->hid->dev->dev, "Not enough device memory\n"); return -ENOMEM; diff -Nru a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c --- a/drivers/usb/input/usbkbd.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/input/usbkbd.c Wed Mar 17 19:29:10 2004 @@ -240,7 +240,7 @@ char path[64]; char *buf; - interface = &iface->altsetting[iface->act_altsetting]; + interface = iface->cur_altsetting; if (interface->desc.bNumEndpoints != 1) return -ENODEV; diff -Nru a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c --- a/drivers/usb/input/usbmouse.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/input/usbmouse.c Wed Mar 17 19:29:10 2004 @@ -131,7 +131,7 @@ char path[64]; char *buf; - interface = &intf->altsetting[intf->act_altsetting]; + interface = intf->cur_altsetting; if (interface->desc.bNumEndpoints != 1) return -ENODEV; diff -Nru a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c --- a/drivers/usb/input/wacom.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/input/wacom.c Wed Mar 17 19:29:09 2004 @@ -1,14 +1,15 @@ /* * USB Wacom Graphire and Wacom Intuos tablet support * - * Copyright (c) 2000-2002 Vojtech Pavlik + * Copyright (c) 2000-2004 Vojtech Pavlik * Copyright (c) 2000 Andreas Bach Aaen * Copyright (c) 2000 Clifford Wolf * Copyright (c) 2000 Sam Mosel * Copyright (c) 2000 James E. Blair * Copyright (c) 2000 Daniel Egger * Copyright (c) 2001 Frederic Lepied - * Copyright (c) 2002 Ping Cheng + * Copyright (c) 2004 Panagiotis Issaris + * Copyright (c) 2002-2004 Ping Cheng * * ChangeLog: * v0.1 (vp) - Initial release @@ -48,6 +49,8 @@ * v1.30 (vp) - Merge 2.4 and 2.5 drivers * - Since 2.5 now has input_sync(), remove MSC_SERIAL abuse * - Cleanups here and there + * v1.30.1 (pi) - Added Graphire3 support + * v1.40 (pc) - Add support for several new devices, fix eraser reporting, ... */ /* @@ -63,6 +66,8 @@ #include #include #include +#include +#include /* * Version Information @@ -106,7 +111,7 @@ static int usb_set_report(struct usb_interface *intf, unsigned char type, unsigned char id, void *buf, int size) { - return usb_control_msg(interface_to_usbdev(intf), + return usb_control_msg(interface_to_usbdev(intf), usb_sndctrlpipe(interface_to_usbdev(intf), 0), USB_REQ_SET_REPORT, USB_TYPE_CLASS | USB_RECIP_INTERFACE, (type << 8) + id, intf->altsetting[0].desc.bInterfaceNumber, @@ -137,14 +142,12 @@ } if (data[0] != 2) - dbg("received unknown report #%d", data[0]); + dbg("wacom_pl_irq: received unknown report #%d", data[0]); prox = data[1] & 0x40; input_regs(dev, regs); - input_report_key(dev, BTN_TOOL_PEN, prox); - if (prox) { pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1)); @@ -152,15 +155,103 @@ pressure = (pressure << 1) | ((data[4] >> 6) & 1); pressure += (wacom->features->pressure_max + 1) / 2; + /* + * if going from out of proximity into proximity select between the eraser + * and the pen based on the state of the stylus2 button, choose eraser if + * pressed else choose pen. if not a proximity change from out to in, send + * an out of proximity for previous tool then a in for new tool. + */ + if (!wacom->tool[0]) { + /* Going into proximity select tool */ + wacom->tool[1] = (data[4] & 0x20)? BTN_TOOL_RUBBER : BTN_TOOL_PEN; + } + else { + /* was entered with stylus2 pressed */ + if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[4] & 0x20) ) { + /* report out proximity for previous tool */ + input_report_key(dev, wacom->tool[1], 0); + input_sync(dev); + wacom->tool[1] = BTN_TOOL_PEN; + goto exit; + } + } + if (wacom->tool[1] != BTN_TOOL_RUBBER) { + /* Unknown tool selected default to pen tool */ + wacom->tool[1] = BTN_TOOL_PEN; + } + input_report_key(dev, wacom->tool[1], prox); /* report in proximity for tool */ input_report_abs(dev, ABS_X, data[3] | ((__u32)data[2] << 7) | ((__u32)(data[1] & 0x03) << 14)); input_report_abs(dev, ABS_Y, data[6] | ((__u32)data[5] << 7) | ((__u32)(data[4] & 0x03) << 14)); input_report_abs(dev, ABS_PRESSURE, pressure); input_report_key(dev, BTN_TOUCH, data[4] & 0x08); input_report_key(dev, BTN_STYLUS, data[4] & 0x10); - input_report_key(dev, BTN_STYLUS2, data[4] & 0x20); + /* Only allow the stylus2 button to be reported for the pen tool. */ + input_report_key(dev, BTN_STYLUS2, (wacom->tool[1] == BTN_TOOL_PEN) && (data[4] & 0x20)); } - + else { + /* report proximity-out of a (valid) tool */ + if (wacom->tool[1] != BTN_TOOL_RUBBER) { + /* Unknown tool selected default to pen tool */ + wacom->tool[1] = BTN_TOOL_PEN; + } + input_report_key(dev, wacom->tool[1], prox); + } + + wacom->tool[0] = prox; /* Save proximity state */ + input_sync(dev); + +exit: + retval = usb_submit_urb (urb, GFP_ATOMIC); + if (retval) + err ("%s - usb_submit_urb failed with result %d", + __FUNCTION__, retval); +} + +static void wacom_ptu_irq(struct urb *urb, struct pt_regs *regs) +{ + struct wacom *wacom = urb->context; + unsigned char *data = wacom->data; + struct input_dev *dev = &wacom->dev; + int retval; + + switch (urb->status) { + case 0: + /* success */ + break; + case -ECONNRESET: + case -ENOENT: + case -ESHUTDOWN: + /* this urb is terminated, clean up */ + dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); + return; + default: + dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); + goto exit; + } + + if (data[0] != 2) + { + printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]); + } + + input_regs(dev, regs); + if (data[1] & 0x04) + { + input_report_key(dev, BTN_TOOL_RUBBER, data[1] & 0x20); + input_report_key(dev, BTN_TOUCH, data[1] & 0x08); + } + else + { + input_report_key(dev, BTN_TOOL_PEN, data[1] & 0x20); + input_report_key(dev, BTN_TOUCH, data[1] & 0x01); + } + input_report_abs(dev, ABS_X, data[3] << 8 | data[2]); + input_report_abs(dev, ABS_Y, data[5] << 8 | data[4]); + input_report_abs(dev, ABS_PRESSURE, (data[6]|data[7] << 8)); + input_report_key(dev, BTN_STYLUS, data[1] & 0x02); + input_report_key(dev, BTN_STYLUS2, data[1] & 0x10); + input_sync(dev); exit: @@ -194,8 +285,8 @@ input_regs(dev, regs); input_report_key(dev, BTN_TOOL_PEN, 1); - input_report_abs(dev, ABS_X, data[2] << 8 | data[1]); - input_report_abs(dev, ABS_Y, data[4] << 8 | data[3]); + input_report_abs(dev, ABS_X, le16_to_cpu(get_unaligned((u16 *) &data[1]))); + input_report_abs(dev, ABS_Y, le16_to_cpu(get_unaligned((u16 *) &data[3]))); input_report_abs(dev, ABS_PRESSURE, (signed char)data[6] + 127); input_report_key(dev, BTN_TOUCH, ((signed char)data[6] > -80) && !(data[5] & 0x20)); input_report_key(dev, BTN_STYLUS, (data[5] & 0x40)); @@ -231,11 +322,15 @@ goto exit; } + /* check if we can handle the data */ + if (data[0] == 99) + goto exit; + if (data[0] != 2) - dbg("received unknown report #%d", data[0]); + dbg("wacom_graphire_irq: received unknown report #%d", data[0]); - x = data[2] | ((__u32)data[3] << 8); - y = data[4] | ((__u32)data[5] << 8); + x = le16_to_cpu(*(u16 *) &data[2]); + y = le16_to_cpu(*(u16 *) &data[4]); input_regs(dev, regs); @@ -249,13 +344,16 @@ input_report_key(dev, BTN_TOOL_RUBBER, data[1] & 0x80); break; - case 2: /* Mouse */ + case 2: /* Mouse with wheel */ + input_report_key(dev, BTN_MIDDLE, data[1] & 0x04); + input_report_rel(dev, REL_WHEEL, (signed char) data[6]); + /* fall through */ + + case 3: /* Mouse without wheel */ input_report_key(dev, BTN_TOOL_MOUSE, data[7] > 24); input_report_key(dev, BTN_LEFT, data[1] & 0x01); input_report_key(dev, BTN_RIGHT, data[1] & 0x02); - input_report_key(dev, BTN_MIDDLE, data[1] & 0x04); input_report_abs(dev, ABS_DISTANCE, data[7]); - input_report_rel(dev, REL_WHEEL, (signed char) data[6]); input_report_abs(dev, ABS_X, x); input_report_abs(dev, ABS_Y, y); @@ -269,7 +367,7 @@ input_report_abs(dev, ABS_Y, y); } - input_report_abs(dev, ABS_PRESSURE, data[6] | ((__u32)data[7] << 8)); + input_report_abs(dev, ABS_PRESSURE, le16_to_cpu(*(u16 *) &data[6])); input_report_key(dev, BTN_TOUCH, data[1] & 0x01); input_report_key(dev, BTN_STYLUS, data[1] & 0x02); input_report_key(dev, BTN_STYLUS2, data[1] & 0x04); @@ -308,7 +406,7 @@ } if (data[0] != 2) - dbg("received unknown report #%d", data[0]); + dbg("wacom_intuos_irq: received unknown report #%d", data[0]); input_regs(dev, regs); @@ -317,18 +415,18 @@ if ((data[1] & 0xfc) == 0xc0) { /* Enter report */ - wacom->serial[idx] = ((__u32)(data[3] & 0x0f) << 4) + /* serial number of the tool */ - ((__u32)data[4] << 16) + ((__u32)data[5] << 12) + + wacom->serial[idx] = ((__u32)(data[3] & 0x0f) << 28) + /* serial number of the tool */ + ((__u32)data[4] << 20) + ((__u32)data[5] << 12) + ((__u32)data[6] << 4) + (data[7] >> 4); switch (((__u32)data[2] << 4) | (data[3] >> 4)) { - case 0x832: + case 0x812: case 0x012: wacom->tool[idx] = BTN_TOOL_PENCIL; break; /* Inking pen */ case 0x822: case 0x842: case 0x852: case 0x022: wacom->tool[idx] = BTN_TOOL_PEN; break; /* Pen */ - case 0x812: + case 0x832: case 0x032: wacom->tool[idx] = BTN_TOOL_BRUSH; break; /* Stroke pen */ case 0x007: case 0x09c: @@ -337,7 +435,10 @@ case 0x82a: case 0x85a: case 0x91a: + case 0xd1a: case 0x0fa: wacom->tool[idx] = BTN_TOOL_RUBBER; break; /* Eraser */ + case 0xd12: + case 0x912: case 0x112: wacom->tool[idx] = BTN_TOOL_AIRBRUSH; break; /* Airbrush */ default: wacom->tool[idx] = BTN_TOOL_PEN; break; /* Unknown tool */ } @@ -350,13 +451,14 @@ if ((data[1] & 0xfe) == 0x80) { /* Exit report */ input_report_key(dev, wacom->tool[idx], 0); + input_event(dev, EV_MSC, MSC_SERIAL, wacom->serial[idx]); input_sync(dev); goto exit; } - input_report_abs(dev, ABS_X, ((__u32)data[2] << 8) | data[3]); - input_report_abs(dev, ABS_Y, ((__u32)data[4] << 8) | data[5]); - input_report_abs(dev, ABS_DISTANCE, data[9] >> 4); + input_report_abs(dev, ABS_X, be16_to_cpu(*(u16 *) &data[2])); + input_report_abs(dev, ABS_Y, be16_to_cpu(*(u16 *) &data[4])); + input_report_abs(dev, ABS_DISTANCE, data[9]); if ((data[1] & 0xb8) == 0xa0) { /* general pen packet */ input_report_abs(dev, ABS_PRESSURE, t = ((__u32)data[6] << 2) | ((data[7] >> 6) & 3)); @@ -378,8 +480,8 @@ if (data[1] & 0x02) { /* Rotation packet */ input_report_abs(dev, ABS_RZ, (data[7] & 0x20) ? - ((__u32)data[6] << 2) | ((data[7] >> 6) & 3): - (-(((__u32)data[6] << 2) | ((data[7] >> 6) & 3))) - 1); + ((__u32)data[6] << 3) | ((data[7] >> 5) & 7): + (-(((__u32)data[6] << 3) | ((data[7] >> 5) & 7))) - 1); } else { @@ -391,17 +493,17 @@ input_report_key(dev, BTN_SIDE, data[8] & 0x20); input_report_key(dev, BTN_EXTRA, data[8] & 0x10); - input_report_abs(dev, ABS_THROTTLE, (data[8] & 0x08) ? + input_report_abs(dev, ABS_THROTTLE, -((data[8] & 0x08) ? ((__u32)data[6] << 2) | ((data[7] >> 6) & 3) : - -((__u32)data[6] << 2) | ((data[7] >> 6) & 3)); + -((__u32)data[6] << 2) | ((data[7] >> 6) & 3))); } else { if (wacom->tool[idx] == BTN_TOOL_MOUSE) { /* 2D mouse packets */ input_report_key(dev, BTN_LEFT, data[8] & 0x04); input_report_key(dev, BTN_MIDDLE, data[8] & 0x08); input_report_key(dev, BTN_RIGHT, data[8] & 0x10); - input_report_abs(dev, REL_WHEEL, - ((__u32)(data[8] & 0x01) - (__u32)((data[8] & 0x02) >> 1))); + input_report_rel(dev, REL_WHEEL, + (-(__u32)(data[8] & 0x01) + (__u32)((data[8] & 0x02) >> 1))); } else { /* Lens cursor packets */ input_report_key(dev, BTN_LEFT, data[8] & 0x01); @@ -414,6 +516,8 @@ } } + input_report_key(dev, wacom->tool[idx], 1); + input_event(dev, EV_MSC, MSC_SERIAL, wacom->serial[idx]); input_sync(dev); exit: @@ -429,22 +533,26 @@ { "Wacom Graphire2 4x5", 8, 10206, 7422, 511, 32, 1, wacom_graphire_irq }, { "Wacom Graphire2 5x7", 8, 13918, 10206, 511, 32, 1, wacom_graphire_irq }, { "Wacom Graphire3", 8, 10208, 7424, 511, 32, 1, wacom_graphire_irq }, - { "Wacom Intuos 4x5", 10, 12700, 10360, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos 6x8", 10, 20600, 16450, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos 9x12", 10, 30670, 24130, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos 12x12", 10, 30670, 31040, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos 12x18", 10, 45860, 31040, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 32, 1, wacom_graphire_irq }, + { "Wacom Intuos 4x5", 10, 12700, 10600, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos 6x8", 10, 20320, 16240, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos 9x12", 10, 30480, 24060, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos 12x12", 10, 30480, 31680, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos 12x18", 10, 45720, 31680, 1023, 15, 2, wacom_intuos_irq }, { "Wacom PL400", 8, 5408, 4056, 255, 32, 3, wacom_pl_irq }, { "Wacom PL500", 8, 6144, 4608, 255, 32, 3, wacom_pl_irq }, { "Wacom PL600", 8, 6126, 4604, 255, 32, 3, wacom_pl_irq }, { "Wacom PL600SX", 8, 6260, 5016, 255, 32, 3, wacom_pl_irq }, { "Wacom PL550", 8, 6144, 4608, 511, 32, 3, wacom_pl_irq }, { "Wacom PL800", 8, 7220, 5780, 511, 32, 3, wacom_pl_irq }, - { "Wacom Intuos2 4x5", 10, 12700, 10360, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos2 6x8", 10, 20600, 16450, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos2 9x12", 10, 30670, 24130, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos2 12x12", 10, 30670, 31040, 1023, 15, 2, wacom_intuos_irq }, - { "Wacom Intuos2 12x18", 10, 45860, 31040, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos2 4x5", 10, 12700, 10600, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos2 9x12", 10, 30480, 24060, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 15, 2, wacom_intuos_irq }, + { "Wacom Volito", 8, 5104, 3712, 511, 32, 1, wacom_graphire_irq }, + { "Wacom Cintiq Partner",8, 20480, 15360, 511, 32, 3, wacom_ptu_irq }, + { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 15, 2, wacom_intuos_irq }, { } }; @@ -454,6 +562,7 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x11) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x13) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x14) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) }, @@ -470,6 +579,9 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x43) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x44) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x45) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, { } }; @@ -483,8 +595,10 @@ return 0; wacom->irq->dev = wacom->usbdev; - if (usb_submit_urb(wacom->irq, GFP_KERNEL)) + if (usb_submit_urb(wacom->irq, GFP_KERNEL)) { + wacom->open--; return -EIO; + } return 0; } @@ -509,7 +623,7 @@ return -ENOMEM; memset(wacom, 0, sizeof(struct wacom)); - wacom->data = usb_buffer_alloc(dev, 10, SLAB_ATOMIC, &wacom->data_dma); + wacom->data = usb_buffer_alloc(dev, 10, GFP_KERNEL, &wacom->data_dma); if (!wacom->data) { kfree(wacom); return -ENOMEM; @@ -538,8 +652,9 @@ break; case 2: - wacom->dev.evbit[0] |= BIT(EV_MSC); + wacom->dev.evbit[0] |= BIT(EV_MSC) | BIT(EV_REL); wacom->dev.mscbit[0] |= BIT(MSC_SERIAL); + wacom->dev.relbit[0] |= BIT(REL_WHEEL); wacom->dev.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE) | BIT(BTN_SIDE) | BIT(BTN_EXTRA); wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER) | BIT(BTN_TOOL_MOUSE) | BIT(BTN_TOOL_BRUSH) | BIT(BTN_TOOL_PENCIL) | BIT(BTN_TOOL_AIRBRUSH) | BIT(BTN_TOOL_LENS) | BIT(BTN_STYLUS2); diff -Nru a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig --- a/drivers/usb/misc/Kconfig Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/misc/Kconfig Wed Mar 17 19:29:10 2004 @@ -86,17 +86,6 @@ a module, say M here and read . -config USB_BRLVGER - tristate "Tieman Voyager USB Braille display support (EXPERIMENTAL)" - depends on USB && EXPERIMENTAL - help - Say Y here if you want to use the Voyager USB Braille display from - Tieman. See for more - information. - - To compile this driver as a module, choose M here: the - module will be called brlvger. - config USB_LCD tristate "USB LCD driver support" depends on USB diff -Nru a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile --- a/drivers/usb/misc/Makefile Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/misc/Makefile Wed Mar 17 19:29:09 2004 @@ -4,7 +4,6 @@ # obj-$(CONFIG_USB_AUERSWALD) += auerswald.o -obj-$(CONFIG_USB_BRLVGER) += brlvger.o obj-$(CONFIG_USB_EMI62) += emi62.o obj-$(CONFIG_USB_EMI26) += emi26.o obj-$(CONFIG_USB_LCD) += usblcd.o diff -Nru a/drivers/usb/misc/brlvger.c b/drivers/usb/misc/brlvger.c --- a/drivers/usb/misc/brlvger.c Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,1016 +0,0 @@ -/* - * Tieman Voyager braille display USB driver. - * - * Copyright 2001-2002 Stephane Dalton - * and Stéphane Doyon - * Maintained by Stéphane Doyon . - */ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* History: - * 0.8 April 2002: Integration into the kernel tree. - * 0.7 October 2001: First public release as a module, distributed with - * the BRLTTY package (beta versions around 2.99y). - */ - -#define DRIVER_VERSION "v0.8" -#define DATE "April 2002" -#define DRIVER_AUTHOR \ - "Stephane Dalton " \ - "and Stéphane Doyon " -#define DRIVER_DESC "Tieman Voyager braille display USB driver for Linux 2.4" -#define DRIVER_SHORTDESC "Voyager" - -#define BANNER \ - KERN_INFO DRIVER_SHORTDESC " " DRIVER_VERSION " (" DATE ")\n" \ - KERN_INFO " by " DRIVER_AUTHOR "\n" - -static const char longbanner[] = { - DRIVER_DESC ", " DRIVER_VERSION " (" DATE "), by " DRIVER_AUTHOR -}; - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -MODULE_AUTHOR( DRIVER_AUTHOR ); -MODULE_DESCRIPTION( DRIVER_DESC ); -MODULE_LICENSE("GPL"); - -/* Module parameters */ - -static int debug = 1; -MODULE_PARM(debug, "i"); -MODULE_PARM_DESC(debug, "Debug level, 0-3"); - -static int write_repeats = 2; -MODULE_PARM(write_repeats, "i"); -MODULE_PARM_DESC(write_repeats, "Hack: repetitions for command to " - "display braille pattern"); - /* to get rid of weird extra dots (perhaps only on - early hardware versions?) */ - -static int stall_tries = 3; -MODULE_PARM(stall_tries, "i"); -MODULE_PARM_DESC(stall_tries, "Hack: retransmits of stalled USB " - "control messages"); - /* broken early hardware versions? */ - -#define BRLVGER_RAW_VOLTAGE 89 -/* from 0->300V to 255->200V, we are told 265V is normal operating voltage, - but we don't know the scale. Assuming it is linear. */ -static int raw_voltage = BRLVGER_RAW_VOLTAGE; -MODULE_PARM(raw_voltage, "i"); -MODULE_PARM_DESC(raw_voltage, "Parameter for the call to SET_DISPLAY_VOLTAGE"); - - -/* protocol and display type defines */ -#define MAX_BRLVGER_CELLS 72 -#define MAX_INTERRUPT_DATA 8 -/* control message request types */ -#define BRLVGER_READ_REQ 0xC2 -#define BRLVGER_WRITE_REQ 0x42 -/* control message request codes */ -#define BRLVGER_SET_DISPLAY_ON 0 -#define BRLVGER_SET_DISPLAY_VOLTAGE 1 -#define BRLVGER_GET_SERIAL 3 -#define BRLVGER_GET_HWVERSION 4 -#define BRLVGER_GET_FWVERSION 5 -#define BRLVGER_GET_LENGTH 6 -#define BRLVGER_SEND_BRAILLE 7 -#define BRLVGER_BEEP 9 -#if 0 /* not used and not sure they're working */ -#define BRLVGER_GET_DISPLAY_VOLTAGE 2 -#define BRLVGER_GET_CURRENT 8 -#endif - -/* Prototypes */ -static int brlvger_probe (struct usb_interface *intf, - const struct usb_device_id *id); -static void brlvger_disconnect(struct usb_interface *intf); -static int brlvger_open(struct inode *inode, struct file *file); -static int brlvger_release(struct inode *inode, struct file *file); -static ssize_t brlvger_write(struct file *file, const char __user *buffer, - size_t count, loff_t *pos); -static ssize_t brlvger_read(struct file *file, char __user *buffer, - size_t count, loff_t *unused_pos); -static int brlvger_ioctl(struct inode *inode, struct file *file, - unsigned cmd, unsigned long arg); -static unsigned brlvger_poll(struct file *file, poll_table *wait); -static loff_t brlvger_llseek(struct file * file, loff_t offset, int orig); -static void intr_callback(struct urb *urb, struct pt_regs *regs); -struct brlvger_priv; -static int brlvger_get_hw_version(struct brlvger_priv *priv, - unsigned char *verbuf); -static int brlvger_get_fw_version(struct brlvger_priv *priv, - unsigned char *buf); -static int brlvger_get_serial(struct brlvger_priv *priv, - unsigned char *buf); -static int brlvger_get_display_length(struct brlvger_priv *priv); -static int brlvger_set_display_on_off(struct brlvger_priv *priv, __u16 on); -static int brlvger_beep(struct brlvger_priv *priv, __u16 duration); -static int brlvger_set_display_voltage(struct brlvger_priv *priv, - __u16 voltage); -static int mycontrolmsg(const char *funcname, - struct brlvger_priv *priv, unsigned pipe_dir, - __u8 request, __u8 requesttype, __u16 value, - __u16 index, void *data, __u16 size); - -#define controlmsg(priv,pipe_dir,a,b,c,d,e,f) \ - mycontrolmsg(__FUNCTION__, priv, pipe_dir, \ - a,b,c,d,e,f) -#define sndcontrolmsg(priv,a,b,c,d,e,f) \ - controlmsg(priv, 0, a,b,c,d,e,f) -#define rcvcontrolmsg(priv,a,b,c,d,e,f) \ - controlmsg(priv, USB_DIR_IN, a,b,c,d,e,f) - -/* ----------------------------------------------------------------------- */ - -/* Data */ - -/* key event queue size */ -#define MAX_INTERRUPT_BUFFER 10 - -/* private state */ -struct brlvger_priv { - struct usb_device *dev; /* USB device handle */ - struct usb_endpoint_descriptor *in_interrupt; - struct urb *intr_urb; - - int subminor; /* which minor dev #? */ - - unsigned char hwver[BRLVGER_HWVER_SIZE]; /* hardware version */ - unsigned char fwver[BRLVGER_FWVER_SIZE]; /* firmware version */ - unsigned char serialnum[BRLVGER_SERIAL_SIZE]; - - int llength; /* logical length */ - int plength; /* physical length */ - - __u8 obuf[MAX_BRLVGER_CELLS]; - __u8 intr_buff[MAX_INTERRUPT_DATA]; - __u8 event_queue[MAX_INTERRUPT_BUFFER][MAX_INTERRUPT_DATA]; - atomic_t intr_idx, read_idx; - spinlock_t intr_idx_lock; /* protects intr_idx */ - wait_queue_head_t read_wait; - - int opened; - struct semaphore open_sem; /* protects ->opened */ - struct semaphore dev_sem; /* protects ->dev */ -}; - -/* Globals */ - -/* For blocking open */ -static DECLARE_WAIT_QUEUE_HEAD(open_wait); - -/* Some print macros */ -#ifdef dbg -#undef dbg -#endif -#ifdef info -#undef info -#endif -#ifdef err -#undef err -#endif -#define info(args...) \ - ({ printk(KERN_INFO "Voyager: " args); \ - printk("\n"); }) -#define err(args...) \ - ({ printk(KERN_ERR "Voyager: " args); \ - printk("\n"); }) -#define dbgprint(fmt, args...) \ - ({ printk(KERN_DEBUG "Voyager: %s: " fmt, __FUNCTION__ , ##args); \ - printk("\n"); }) -#define dbg(args...) \ - ({ if(debug >= 1) dbgprint(args); }) -#define dbg2(args...) \ - ({ if(debug >= 2) dbgprint(args); }) -#define dbg3(args...) \ - ({ if(debug >= 3) dbgprint(args); }) - -/* ----------------------------------------------------------------------- */ - -/* Driver registration */ - -static struct usb_device_id brlvger_ids [] = { - { USB_DEVICE(0x0798, 0x0001) }, - { } /* Terminating entry */ -}; -MODULE_DEVICE_TABLE (usb, brlvger_ids); - -static struct file_operations brlvger_fops = -{ - .owner = THIS_MODULE, - .llseek = brlvger_llseek, - .read = brlvger_read, - .write = brlvger_write, - .ioctl = brlvger_ioctl, - .open = brlvger_open, - .release = brlvger_release, - .poll = brlvger_poll, -}; - -static struct usb_class_driver brlvger_class = { - .name = "usb/brlvger%d", - .fops = &brlvger_fops, - .mode = S_IFCHR | S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP, - .minor_base = BRLVGER_MINOR, -}; - -static struct usb_driver brlvger_driver = -{ - .owner = THIS_MODULE, - .name = "brlvger", - .probe = brlvger_probe, - .disconnect = brlvger_disconnect, - .id_table = brlvger_ids, -}; - -static int -__init brlvger_init (void) -{ - int retval; - printk(BANNER); - - if(stall_tries < 1 || write_repeats < 1) - return -EINVAL; - - retval = usb_register(&brlvger_driver); - if (retval) { - err("USB registration failed"); - goto out; - } - -out: - return retval; -} - -static void -__exit brlvger_cleanup (void) -{ - usb_deregister (&brlvger_driver); - dbg("Driver unregistered"); -} - -module_init (brlvger_init); -module_exit (brlvger_cleanup); - -/* ----------------------------------------------------------------------- */ - -/* Probe and disconnect functions */ - -static int -brlvger_probe (struct usb_interface *intf, - const struct usb_device_id *id) -{ - struct usb_device *dev = interface_to_usbdev(intf); - struct brlvger_priv *priv = NULL; - int retval; - struct usb_endpoint_descriptor *endpoint; - struct usb_host_interface *actifsettings; - /* protects against reentrance: once we've found a free slot - we reserve it.*/ - static DECLARE_MUTEX(reserve_sem); - - actifsettings = dev->actconfig->interface[0]->altsetting; - - if( dev->descriptor.bNumConfigurations != 1 - || dev->config->desc.bNumInterfaces != 1 - || actifsettings->desc.bNumEndpoints != 1 ) { - err ("Bogus braille display config info"); - return -ENODEV; - } - - endpoint = &actifsettings->endpoint [0].desc; - if (!(endpoint->bEndpointAddress & 0x80) || - ((endpoint->bmAttributes & 3) != 0x03)) { - err ("Bogus braille display config info, wrong endpoints"); - return -ENODEV; - } - - down(&reserve_sem); - - retval = usb_register_dev(intf, &brlvger_class); - if (retval) { - err("Not able to get a minor for this device."); - goto error; - } - - if( !(priv = kmalloc (sizeof *priv, GFP_KERNEL)) ){ - err("No more memory"); - goto error; - } - - memset(priv, 0, sizeof(*priv)); - atomic_set(&priv->intr_idx, 0); - atomic_set(&priv->read_idx, MAX_INTERRUPT_BUFFER-1); - spin_lock_init(&priv->intr_idx_lock); - init_waitqueue_head(&priv->read_wait); - /* opened is memset'ed to 0 */ - init_MUTEX(&priv->open_sem); - init_MUTEX(&priv->dev_sem); - - priv->subminor = intf->minor; - - /* we found a interrupt in endpoint */ - priv->in_interrupt = endpoint; - - priv->dev = dev; - - if(brlvger_get_hw_version(priv, priv->hwver) <0) { - err("Unable to get hardware version"); - goto error; - } - dbg("Hw ver %d.%d", priv->hwver[0], priv->hwver[1]); - if(brlvger_get_fw_version(priv, priv->fwver) <0) { - err("Unable to get firmware version"); - goto error; - } - dbg("Fw ver: %s", priv->fwver); - - if(brlvger_get_serial(priv, priv->serialnum) <0) { - err("Unable to get serial number"); - goto error; - } - dbg("Serial number: %s", priv->serialnum); - - if( (priv->llength = brlvger_get_display_length(priv)) <0 ){ - err("Unable to get display length"); - goto error; - } - switch(priv->llength) { - case 48: - priv->plength = 44; - break; - case 72: - priv->plength = 70; - break; - default: - err("Unsupported display length: %d", priv->llength); - goto error; - }; - dbg("Display length: %d", priv->plength); - - usb_set_intfdata (intf, priv); - info( "Braille display %d is device major %d minor %d", - intf->minor, USB_MAJOR, BRLVGER_MINOR + intf->minor); - - /* Tell anyone waiting on a blocking open */ - wake_up_interruptible(&open_wait); - - goto out; - - error: - if(priv) { - kfree( priv ); - priv = NULL; - } - - out: - up(&reserve_sem); - if (priv) { - usb_set_intfdata (intf, priv); - return 0; - } - return -EIO; -} - -static void -brlvger_disconnect(struct usb_interface *intf) -{ - struct brlvger_priv *priv = usb_get_intfdata (intf); - int r; - - usb_set_intfdata (intf, NULL); - if(priv){ - info("Display %d disconnecting", priv->subminor); - - usb_deregister_dev(intf, &brlvger_class); - - down(&priv->open_sem); - down(&priv->dev_sem); - if(priv->opened) { - /* Disable interrupts */ - if((r = usb_unlink_urb(priv->intr_urb)) <0) - err("usb_unlink_urb returns %d", r); - usb_free_urb(priv->intr_urb); - /* mark device as dead and prevent control - messages to it */ - priv->dev = NULL; - /* Tell anyone hung up on a read that it - won't be coming */ - wake_up_interruptible(&priv->read_wait); - up(&priv->dev_sem); - up(&priv->open_sem); - }else - /* no corresponding up()s */ - kfree(priv); - } -} - -/* ----------------------------------------------------------------------- */ - -/* fops implementation */ - -static int -brlvger_open(struct inode *inode, struct file *file) -{ - int devnum = iminor(inode); - struct usb_interface *intf = NULL; - struct brlvger_priv *priv = NULL; - int n, ret; - - if (devnum < 0) - return -ENXIO; - - n = devnum - BRLVGER_MINOR; - - do { - intf = usb_find_interface(&brlvger_driver, devnum); - if (!intf) { - if (file->f_flags & O_NONBLOCK) { - dbg3("Failing non-blocking open: " - "device %d not connected", n); - return -EAGAIN; - } - /* Blocking open. One global wait queue will - suffice. We wait until a device for the selected - minor is connected. */ - dbg2("Waiting for device %d to be connected", n); - ret = wait_event_interruptible(open_wait, - (intf = usb_find_interface(&brlvger_driver, devnum))); - if (ret) { - dbg2("Interrupted wait for device %d", n); - return ret; - } - } - } while(!intf); - priv = usb_get_intfdata(intf); - - /* We grabbed an existing device. */ - if(down_interruptible(&priv->open_sem)) - return -ERESTARTSYS; - - /* Only one process can open each device, no sharing. */ - ret = -EBUSY; - if(priv->opened) - goto out; - - dbg("Opening display %d", priv->subminor); - - /* Setup interrupt handler for receiving key input */ - priv->intr_urb = usb_alloc_urb(0, GFP_KERNEL); - if(!priv->intr_urb) { - err("Unable to allocate URB"); - goto out; - } - usb_fill_int_urb( priv->intr_urb, priv->dev, - usb_rcvintpipe(priv->dev, - priv->in_interrupt->bEndpointAddress), - priv->intr_buff, sizeof(priv->intr_buff), - intr_callback, priv, priv->in_interrupt->bInterval); - if((ret = usb_submit_urb(priv->intr_urb, GFP_KERNEL)) <0){ - err("Error %d while submitting URB", ret); - goto out; - } - - /* Set voltage */ - if(brlvger_set_display_voltage(priv, raw_voltage) <0) { - err("Unable to set voltage"); - goto out; - } - - /* Turn display on */ - if((ret = brlvger_set_display_on_off(priv, 1)) <0) { - err("Error %d while turning display on", ret); - goto out; - } - - /* Mark as opened, so disconnect cannot free priv. */ - priv->opened = 1; - - file->private_data = priv; - - ret = 0; - goto out; - - out: - up(&priv->open_sem); - return ret; -} - -static int -brlvger_release(struct inode *inode, struct file *file) -{ - struct brlvger_priv *priv = file->private_data; - int r; - - /* Turn display off. Safe even if disconnected. */ - brlvger_set_display_on_off(priv, 0); - - /* mutex with disconnect and with open */ - down(&priv->open_sem); - - if(!priv->dev) { - dbg("Releasing disconnected device %d", priv->subminor); - /* no up(&priv->open_sem) */ - kfree(priv); - }else{ - dbg("Closing display %d", priv->subminor); - /* Disable interrupts */ - if((r = usb_unlink_urb(priv->intr_urb)) <0) - err("usb_unlink_urb returns %d", r); - usb_free_urb(priv->intr_urb); - priv->opened = 0; - up(&priv->open_sem); - } - - return 0; -} - -static ssize_t -brlvger_write(struct file *file, const char __user *buffer, - size_t count, loff_t *pos) -{ - struct brlvger_priv *priv = file->private_data; - char buf[MAX_BRLVGER_CELLS]; - int ret; - size_t rs; - loff_t off; - __u16 written; - - if(!priv->dev) - return -ENOLINK; - - off = *pos; - - if(off > priv->plength) - return -ESPIPE;; - - rs = priv->plength - off; - - if(count > rs) - count = rs; - written = count; - - if (copy_from_user (buf, buffer, count ) ) - return -EFAULT; - - memset(priv->obuf, 0xaa, sizeof(priv->obuf)); - - /* Firmware supports multiples of 8cells, so some cells are absent - and for some reason there actually are holes! euurkkk! */ - - if( priv->plength == 44 ) { - /* Two ghost cells at the beginning of the display, plus - two more after the sixth physical cell. */ - if(off > 5) { - off +=4; - memcpy(priv->obuf, buf, count); - }else{ - int firstpart = 6 - off; - -#ifdef WRITE_DEBUG - dbg3("off: %lld, rs: %d, count: %d, firstpart: %d", - off, rs, count, firstpart); -#endif - - firstpart = (firstpart < count) ? firstpart : count; - -#ifdef WRITE_DEBUG - dbg3("off: %lld", off); - dbg3("firstpart: %d", firstpart); -#endif - - memcpy(priv->obuf, buf, firstpart); - - if(firstpart != count) { - int secondpart = count - firstpart; -#ifdef WRITE_DEBUG - dbg3("secondpart: %d", secondpart); -#endif - - memcpy(priv->obuf+(firstpart+2), - buf+firstpart, secondpart); - written +=2; - } - - off +=2; - -#ifdef WRITE_DEBUG - dbg3("off: %lld, rs: %d, count: %d, firstpart: %d, " - "written: %d", off, rs, count, firstpart, written); -#endif - } - }else{ - /* Two ghost cells at the beginningg of the display. */ - memcpy(priv->obuf, buf, count); - off += 2; - } - - { - int repeat = write_repeats; - /* Dirty hack: sometimes some of the dots are wrong and somehow - right themselves if the command is repeated. */ - while(repeat--) { - ret = sndcontrolmsg(priv, - BRLVGER_SEND_BRAILLE, BRLVGER_WRITE_REQ, 0, - off, priv->obuf, written); - if(ret <0) - return ret; - } - } - - return count; -} - -static int -read_index(struct brlvger_priv *priv) -{ - int intr_idx, read_idx; - - read_idx = atomic_read(&priv->read_idx); - read_idx = ++read_idx == MAX_INTERRUPT_BUFFER ? 0 : read_idx; - - intr_idx = atomic_read(&priv->intr_idx); - - return(read_idx == intr_idx ? -1 : read_idx); -} - -static ssize_t -brlvger_read(struct file *file, char __user *buffer, - size_t count, loff_t *unused_pos) -{ - struct brlvger_priv *priv = file->private_data; - int read_idx; - - if(count != MAX_INTERRUPT_DATA) - return -EINVAL; - - if(!priv->dev) - return -ENOLINK; - - if((read_idx = read_index(priv)) == -1) { - /* queue empty */ - if (file->f_flags & O_NONBLOCK) - return -EAGAIN; - else{ - int r = wait_event_interruptible(priv->read_wait, - (!priv->dev || (read_idx = read_index(priv)) != -1)); - if(!priv->dev) - return -ENOLINK; - if(r) - return r; - if(read_idx == -1) - /* should not happen */ - return 0; - } - } - - if (copy_to_user (buffer, priv->event_queue[read_idx], count) ) - return( -EFAULT); - - atomic_set(&priv->read_idx, read_idx); - /* Multiple opens are not allowed. Yet on SMP, two processes could - read at the same time (on a shared file descriptor); then it is not - deterministic whether or not they will get duplicates of a key - event. */ - return MAX_INTERRUPT_DATA; -} - -static int -brlvger_ioctl(struct inode *inode, struct file *file, - unsigned cmd, unsigned long arg) -{ - struct brlvger_priv *priv = file->private_data; - - if(!priv->dev) - return -ENOLINK; - - switch(cmd) { - case BRLVGER_GET_INFO: { - struct brlvger_info vi; - - memset(&vi, 0, sizeof(vi)); - strlcpy(vi.driver_version, DRIVER_VERSION, - sizeof(vi.driver_version)); - strlcpy(vi.driver_banner, longbanner, - sizeof(vi.driver_banner)); - - vi.display_length = priv->plength; - - memcpy(&vi.hwver, priv->hwver, BRLVGER_HWVER_SIZE); - memcpy(&vi.fwver, priv->fwver, BRLVGER_FWVER_SIZE); - memcpy(&vi.serialnum, priv->serialnum, BRLVGER_SERIAL_SIZE); - - if(copy_to_user((void __user *)arg, &vi, sizeof(vi))) - return -EFAULT; - return 0; - } - case BRLVGER_DISPLAY_ON: - return brlvger_set_display_on_off(priv, 1); - case BRLVGER_DISPLAY_OFF: - return brlvger_set_display_on_off(priv, 0); - case BRLVGER_BUZZ: { - __u16 duration; - if(get_user(duration, (__u16 *)arg)) - return -EFAULT; - return brlvger_beep(priv, duration); - } - -#if 0 /* Underlying commands don't seem to work for some reason; not clear if - we'd want to export these anyway. */ - case BRLVGER_SET_VOLTAGE: { - __u16 voltage; - if(get_user(voltage, (__u16 *)arg)) - return -EFAULT; - return brlvger_set_display_voltage(priv, voltage); - } - case BRLVGER_GET_VOLTAGE: { - __u8 voltage; - int r = brlvger_get_display_voltage(priv); - if(r <0) - return r; - voltage = r; - if(put_user(voltage, (__u8 *)arg)) - return -EFAULT; - return 0; - } -#endif - default: - return -EINVAL; - }; -} - -static loff_t -brlvger_llseek(struct file *file, loff_t offset, int orig) -{ - struct brlvger_priv *priv = file->private_data; - - if(!priv->dev) - return -ENOLINK; - - switch (orig) { - case 0: - /* nothing to do */ - break; - case 1: - offset +=file->f_pos; - break; - case 2: - offset += priv->plength; - default: - return -EINVAL; - } - - if((offset >= priv->plength) || (offset < 0)) - return -EINVAL; - - return (file->f_pos = offset); -} - -static unsigned -brlvger_poll(struct file *file, poll_table *wait) -{ - struct brlvger_priv *priv = file->private_data; - - if(!priv->dev) - return POLLERR | POLLHUP; - - poll_wait(file, &priv->read_wait, wait); - - if(!priv->dev) - return POLLERR | POLLHUP; - if(read_index(priv) != -1) - return POLLIN | POLLRDNORM; - - return 0; -} - -static void -intr_callback(struct urb *urb, struct pt_regs *regs) -{ - struct brlvger_priv *priv = urb->context; - int intr_idx, read_idx; - int status; - - switch (urb->status) { - case 0: - /* success */ - break; - case -ECONNRESET: - case -ENOENT: - case -ESHUTDOWN: - /* this urb is terminated, clean up */ - dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); - return; - default: - dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); - goto exit; - } - - read_idx = atomic_read(&priv->read_idx); - spin_lock(&priv->intr_idx_lock); - intr_idx = atomic_read(&priv->intr_idx); - if(read_idx == intr_idx) { - dbg2("Queue full, dropping braille display input"); - spin_unlock(&priv->intr_idx_lock); - goto exit; /* queue full */ - } - - memcpy(priv->event_queue[intr_idx], urb->transfer_buffer, - MAX_INTERRUPT_DATA); - - intr_idx = (++intr_idx == MAX_INTERRUPT_BUFFER)? 0 : intr_idx; - atomic_set(&priv->intr_idx, intr_idx); - spin_unlock(&priv->intr_idx_lock); - - wake_up_interruptible(&priv->read_wait); - -exit: - status = usb_submit_urb (urb, GFP_ATOMIC); - if (status) - err ("%s - usb_submit_urb failed with result %d", - __FUNCTION__, status); -} - -/* ----------------------------------------------------------------------- */ - -/* Hardware access functions */ - -static int -mycontrolmsg(const char *funcname, - struct brlvger_priv *priv, unsigned pipe_dir, - __u8 request, __u8 requesttype, __u16 value, - __u16 index, void *data, __u16 size) -{ - int ret=0, tries = stall_tries; - - /* Make sure the device was not disconnected */ - if(down_interruptible(&priv->dev_sem)) - return -ERESTARTSYS; - if(!priv->dev) { - up(&priv->dev_sem); - return -ENOLINK; - } - - /* Dirty hack for retransmission: stalls and fails all the time - without this on the hardware we tested. */ - while(tries--) { - ret = usb_control_msg(priv->dev, - usb_sndctrlpipe(priv->dev,0) |pipe_dir, - request, requesttype, value, - index, data, size, - HZ); - if(ret != -EPIPE) - break; - dbg2("Stalled, remaining %d tries", tries); - } - up(&priv->dev_sem); - if(ret <0) { - err("%s: usb_control_msg returns %d", - funcname, ret); - return -EIO; - } - return 0; -} - -static int -brlvger_get_hw_version(struct brlvger_priv *priv, unsigned char *verbuf) -{ - return rcvcontrolmsg(priv, - BRLVGER_GET_HWVERSION, BRLVGER_READ_REQ, 0, - 0, verbuf, BRLVGER_HWVER_SIZE); - /* verbuf should be 2 bytes */ -} - -static int -brlvger_get_fw_version(struct brlvger_priv *priv, unsigned char *buf) -{ - unsigned char rawbuf[(BRLVGER_FWVER_SIZE-1)*2+2]; - int i, len; - int r = rcvcontrolmsg(priv, - BRLVGER_GET_FWVERSION, BRLVGER_READ_REQ, 0, - 0, rawbuf, sizeof(rawbuf)); - if(r<0) - return r; - - /* If I guess correctly: succession of 16bit words, the string is - formed of the first byte of each of these words. First byte in - buffer indicates total length of data; not sure what second byte is - for. */ - len = rawbuf[0]-2; - if(len<0) - len = 0; - else if(len+1 > BRLVGER_FWVER_SIZE) - len = BRLVGER_FWVER_SIZE-1; - for(i=0; i9) ? (n)+'A' : (n)+'0') - buf[2*i] = NUM_TO_HEX(rawserial[i] >>4); - buf[2*i+1] = NUM_TO_HEX(rawserial[i] &0xf); - } - buf[2*i] = 0; - return 0; -} - -static int -brlvger_get_display_length(struct brlvger_priv *priv) -{ - unsigned char data[2]; - int ret = rcvcontrolmsg(priv, - BRLVGER_GET_LENGTH, BRLVGER_READ_REQ, 0, - 0, data, 2); - if(ret<0) - return ret; - return data[1]; -} - -static int -brlvger_beep(struct brlvger_priv *priv, __u16 duration) -{ - return sndcontrolmsg(priv, - BRLVGER_BEEP, BRLVGER_WRITE_REQ, duration, - 0, NULL, 0); -} - -static int -brlvger_set_display_on_off(struct brlvger_priv *priv, __u16 on) -{ - dbg2("Turning display %s", ((on) ? "on" : "off")); - return sndcontrolmsg(priv, - BRLVGER_SET_DISPLAY_ON, BRLVGER_WRITE_REQ, on, - 0, NULL, 0); -} - -static int -brlvger_set_display_voltage(struct brlvger_priv *priv, __u16 voltage) -{ - dbg("SET_DISPLAY_VOLTAGE to %u", voltage); - return sndcontrolmsg(priv, - BRLVGER_SET_DISPLAY_VOLTAGE, BRLVGER_WRITE_REQ, voltage, - 0, NULL, 0); -} - -#if 0 /* Had problems testing these commands. Not particularly useful anyway.*/ - -static int -brlvger_get_display_voltage(struct brlvger_priv *priv) -{ - __u8 voltage = 0; - int ret = rcvcontrolmsg(priv, - BRLVGER_GET_DISPLAY_VOLTAGE, BRLVGER_READ_REQ, 0, - 0, &voltage, 1); - if(ret<0) - return ret; - return voltage; -} - -static int -brlvger_get_current(struct brlvger_priv *priv) -{ - unsigned char data; - int ret = rcvcontrolmsg(priv, - BRLVGER_GET_CURRENT, BRLVGER_READ_REQ, 0, - 0, &data, 1); - if(ret<0) - return ret; - return data; -} -#endif diff -Nru a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c --- a/drivers/usb/misc/usbtest.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/misc/usbtest.c Wed Mar 17 19:29:10 2004 @@ -149,8 +149,6 @@ if (!out) out = e; } - if (in && out) - goto found; continue; try_iso: if (e->desc.bEndpointAddress & USB_DIR_IN) { @@ -160,9 +158,9 @@ if (!iso_out) iso_out = e; } - if (iso_in && iso_out) - goto found; } + if ((in && out) || (iso_in && iso_out)) + goto found; } return -EINVAL; @@ -181,7 +179,8 @@ in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); dev->out_pipe = usb_sndbulkpipe (udev, out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); - } else if (iso_in) { + } + if (iso_in) { dev->iso_in = &iso_in->desc; dev->in_iso_pipe = usb_rcvisocpipe (udev, iso_in->desc.bEndpointAddress @@ -211,7 +210,7 @@ static struct urb *simple_alloc_urb ( struct usb_device *udev, int pipe, - long bytes + unsigned long bytes ) { struct urb *urb; @@ -490,7 +489,7 @@ struct usb_interface *iface = dev->intf; struct usb_device *udev; - if (alternate < 0 || alternate >= iface->num_altsetting) + if (alternate < 0 || alternate >= 256) return -EINVAL; udev = interface_to_usbdev (iface); @@ -556,23 +555,19 @@ { struct usb_interface *iface = dev->intf; struct usb_device *udev = interface_to_usbdev (iface); - int i, retval; + int i, alt, retval; /* [9.2.3] if there's more than one altsetting, we need to be able to * set and get each one. mostly trusts the descriptors from usbcore. */ for (i = 0; i < iface->num_altsetting; i++) { - /* 9.2.3 constrains the range here, and Linux ensures - * they're ordered meaningfully in this array - */ - if (iface->altsetting [i].desc.bAlternateSetting != i) { + /* 9.2.3 constrains the range here */ + alt = iface->altsetting [i].desc.bAlternateSetting; + if (alt < 0 || alt >= iface->num_altsetting) { dev_dbg (&iface->dev, "invalid alt [%d].bAltSetting = %d\n", - i, - iface->altsetting [i].desc - .bAlternateSetting); - return -EDOM; + i, alt); } /* [real world] get/set unimplemented if there's only one */ @@ -580,18 +575,18 @@ continue; /* [9.4.10] set_interface */ - retval = set_altsetting (dev, i); + retval = set_altsetting (dev, alt); if (retval) { dev_dbg (&iface->dev, "can't set_interface = %d, %d\n", - i, retval); + alt, retval); return retval; } /* [9.4.4] get_interface always works */ retval = get_altsetting (dev); - if (retval != i) { + if (retval != alt) { dev_dbg (&iface->dev, "get alt should be %d, was %d\n", - i, retval); + alt, retval); return (retval < 0) ? retval : -EDOM; } @@ -916,7 +911,7 @@ req.wValue = cpu_to_le16 (USB_DT_INTERFACE << 8); // interface == 0 len = sizeof (struct usb_interface_descriptor); - expected = -EPIPE; + expected = EPIPE; break; // NOTE: two consecutive stalls in the queue here. // that tests fault recovery a bit more aggressively. @@ -945,7 +940,7 @@ req.wValue = cpu_to_le16 (USB_DT_ENDPOINT << 8); // endpoint == 0 len = sizeof (struct usb_interface_descriptor); - expected = -EPIPE; + expected = EPIPE; break; // NOTE: sometimes even a third fault in the queue! case 12: // get string 0 descriptor (MAY STALL) @@ -1072,7 +1067,7 @@ * due to errors, or is just NAKing requests. */ if ((retval = usb_submit_urb (urb, SLAB_KERNEL)) != 0) { - dbg ("submit/unlink fail %d", retval); + dev_dbg (&dev->intf->dev, "submit fail %d\n", retval); return retval; } @@ -1087,18 +1082,22 @@ * "normal" drivers would prevent resubmission, but * since we're testing unlink paths, we can't. */ - dbg ("unlink retry"); + dev_dbg (&dev->intf->dev, "unlink retry\n"); goto retry; } if (!(retval == 0 || retval == -EINPROGRESS)) { - dbg ("submit/unlink fail %d", retval); + dev_dbg (&dev->intf->dev, "unlink fail %d\n", retval); return retval; } wait_for_completion (&completion); retval = urb->status; simple_free_urb (urb); - return retval; + + if (async) + return (retval != -ECONNRESET) ? -ECONNRESET : 0; + else + return (retval != -ENOENT) ? -ENOENT : 0; } static int unlink_simple (struct usbtest_dev *dev, int pipe, int len) @@ -1723,7 +1722,8 @@ retval = unlink_simple (dev, dev->in_pipe, param->length); if (retval) - dbg ("unlink reads failed, iterations left %d", i); + dev_dbg (&intf->dev, "unlink reads failed %d, " + "iterations left %d\n", retval, i); break; case 12: if (dev->out_pipe == 0 || !param->length) @@ -1735,7 +1735,8 @@ retval = unlink_simple (dev, dev->out_pipe, param->length); if (retval) - dbg ("unlink writes failed, iterations left %d", i); + dev_dbg (&intf->dev, "unlink writes failed %d, " + "iterations left %d\n", retval, i); break; /* ep halt tests */ @@ -1965,7 +1966,10 @@ .name = "usb test device", .ep_in = 2, .ep_out = 2, - .alt = 0, + .alt = 1, + .autoconf = 1, // iso and ctrl_out need autoconf + .ctrl_out = 1, + .iso = 1, // iso_ep's are #8 in/out }; /* peripheral running Linux and 'zero.c' test firmware, or diff -Nru a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig --- a/drivers/usb/net/Kconfig Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/net/Kconfig Wed Mar 17 19:29:10 2004 @@ -131,6 +131,14 @@ comment "USB Host-to-Host Cables" depends on USB_USBNET +config USB_ALI_M5632 + boolean "ALi M5632 based 'USB 2.0 Data Link' cables" + depends on USB_USBNET + default y + help + Choose this option if you're using a host-to-host cable + based on this design, which supports USB 2.0 high speed. + config USB_AN2720 boolean "AnchorChips 2720 based cables (Xircom PGUNET, ...)" depends on USB_USBNET diff -Nru a/drivers/usb/net/pegasus.h b/drivers/usb/net/pegasus.h --- a/drivers/usb/net/pegasus.h Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/net/pegasus.h Wed Mar 17 19:29:10 2004 @@ -128,6 +128,7 @@ #define VENDOR_DLINK 0x2001 #define VENDOR_ELCON 0x0db7 #define VENDOR_ELSA 0x05cc +#define VENDOR_GIGABYTE 0x1044 #define VENDOR_HAWKING 0x0e66 #define VENDOR_HP 0x03f0 #define VENDOR_IODATA 0x04bb @@ -178,6 +179,9 @@ PEGASUS_DEV( "ADMtek ADM8513 \"Pegasus II\" USB Ethernet", VENDOR_ADMTEK, 0x8513, DEFAULT_GPIO_RESET | PEGASUS_II ) +PEGASUS_DEV( "ADMtek ADM8515 \"Pegasus II\" USB-2.0 Ethernet", + VENDOR_ADMTEK, 0x8515, + DEFAULT_GPIO_RESET | PEGASUS_II ) PEGASUS_DEV( "ADMtek AN986 \"Pegasus\" USB Ethernet (evaluation board)", VENDOR_ADMTEK, 0x0986, DEFAULT_GPIO_RESET | HAS_HOME_PNA ) @@ -223,6 +227,8 @@ DEFAULT_GPIO_RESET ) PEGASUS_DEV( "Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000, DEFAULT_GPIO_RESET ) +PEGASUS_DEV( "GIGABYTE GN-BR402W Wireless Router", VENDOR_GIGABYTE, 0x8002, + DEFAULT_GPIO_RESET ) PEGASUS_DEV( "Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c, DEFAULT_GPIO_RESET | PEGASUS_II ) PEGASUS_DEV( "HP hn210c Ethernet USB", VENDOR_HP, 0x811c, @@ -262,6 +268,8 @@ PEGASUS_DEV( "NETGEAR FA101", VENDOR_NETGEAR, 0x1020, DEFAULT_GPIO_RESET | PEGASUS_II ) PEGASUS_DEV( "OCT Inc.", VENDOR_OCT, 0x0109, + DEFAULT_GPIO_RESET | PEGASUS_II ) +PEGASUS_DEV( "OCT USB TO Ethernet", VENDOR_OCT, 0x0901, DEFAULT_GPIO_RESET | PEGASUS_II ) PEGASUS_DEV( "smartNIC 2 PnP Adapter", VENDOR_SMARTBRIDGES, 0x0003, DEFAULT_GPIO_RESET | PEGASUS_II ) diff -Nru a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c --- a/drivers/usb/net/usbnet.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/net/usbnet.c Wed Mar 17 19:29:09 2004 @@ -384,6 +384,23 @@ } +#ifdef CONFIG_USB_ALI_M5632 +#define HAVE_HARDWARE + +/*------------------------------------------------------------------------- + * + * ALi M5632 driver ... does high speed + * + *-------------------------------------------------------------------------*/ + +static const struct driver_info ali_m5632_info = { + .description = "ALi M5632", +}; + + +#endif + + #ifdef CONFIG_USB_AN2720 #define HAVE_HARDWARE @@ -3009,7 +3026,7 @@ return -ENODEV; } xdev = interface_to_usbdev (udev); - interface = &udev->altsetting [udev->act_altsetting]; + interface = udev->cur_altsetting; usb_get_dev (xdev); @@ -3133,6 +3150,13 @@ static const struct usb_device_id products [] = { +#ifdef CONFIG_USB_ALI_M5632 +{ + USB_DEVICE (0x0402, 0x5632), // ALi defaults + .driver_info = (unsigned long) &ali_m5632_info, +}, +#endif + #ifdef CONFIG_USB_AN2720 { USB_DEVICE (0x0547, 0x2720), // AnchorChips defaults @@ -3310,6 +3334,15 @@ | USB_DEVICE_ID_MATCH_DEVICE, .idVendor = 0x04DD, .idProduct = 0x9032, /* SL-6000 */ + .bInterfaceClass = 0x02, + .bInterfaceSubClass = 0x0a, + .bInterfaceProtocol = 0x00, + .driver_info = (unsigned long) &zaurus_pxa_info, +}, { + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO + | USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x04DD, + .idProduct = 0x9050, /* C-860 */ .bInterfaceClass = 0x02, .bInterfaceSubClass = 0x0a, .bInterfaceProtocol = 0x00, diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c --- a/drivers/usb/serial/ftdi_sio.c Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/serial/ftdi_sio.c Wed Mar 17 19:29:10 2004 @@ -286,6 +286,7 @@ static struct usb_device_id id_table_8U232AM [] = { + { USB_DEVICE_VER(FTDI_VID, FTDI_IRTRANS_PID, 0, 0x3ff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_PID, 0, 0x3ff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_ALT_PID, 0, 0x3ff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_RELAIS_PID, 0, 0x3ff) }, @@ -358,6 +359,7 @@ static struct usb_device_id id_table_FT232BM [] = { + { USB_DEVICE_VER(FTDI_VID, FTDI_IRTRANS_PID, 0x400, 0xffff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_PID, 0x400, 0xffff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_ALT_PID, 0x400, 0xffff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_RELAIS_PID, 0x400, 0xffff) }, @@ -451,6 +453,7 @@ static struct usb_device_id id_table_combined [] = { + { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, diff -Nru a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h --- a/drivers/usb/serial/ftdi_sio.h Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/serial/ftdi_sio.h Wed Mar 17 19:29:10 2004 @@ -30,6 +30,8 @@ #define FTDI_NF_RIC_VID 0x0DCD /* Vendor Id */ #define FTDI_NF_RIC_PID 0x0001 /* Product Id */ +/* www.irtrans.de device */ +#define FTDI_IRTRANS_PID 0xFC60 /* Product Id */ /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */ /* they use the ftdi chipset for the USB interface and the vendor id is the same */ diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c --- a/drivers/usb/serial/kl5kusb105.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/serial/kl5kusb105.c Wed Mar 17 19:29:09 2004 @@ -273,6 +273,7 @@ /* allocate the private data structure */ for (i=0; inum_ports; i++) { + int j; priv = kmalloc(sizeof(struct klsi_105_private), GFP_KERNEL); if (!priv) { @@ -293,10 +294,10 @@ usb_set_serial_port_data(serial->port[i], priv); spin_lock_init (&priv->lock); - for (i=0; iwrite_urb_pool[i] = urb; + priv->write_urb_pool[j] = urb; if (urb == NULL) { err("No more urbs???"); continue; diff -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c --- a/drivers/usb/serial/pl2303.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/serial/pl2303.c Wed Mar 17 19:29:09 2004 @@ -403,7 +403,7 @@ { struct termios tmp_termios; struct usb_serial *serial = port->serial; - unsigned char buf[10]; + unsigned char *buf; int result; if (port_paranoia_check (port, __FUNCTION__)) @@ -414,6 +414,10 @@ usb_clear_halt(serial->dev, port->write_urb->pipe); usb_clear_halt(serial->dev, port->read_urb->pipe); + buf = kmalloc(10, GFP_KERNEL); + if (buf==NULL) + return -ENOMEM; + #define FISH(a,b,c,d) \ result=usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev,0), \ b, a, c, d, buf, 1, 100); \ @@ -432,6 +436,8 @@ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 0x0404, 1); FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8484, 0); FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8383, 0); + + kfree(buf); /* Setup termios */ if (port->tty) { diff -Nru a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c --- a/drivers/usb/serial/usb-serial.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/serial/usb-serial.c Wed Mar 17 19:29:09 2004 @@ -391,7 +391,7 @@ struct usb_serial *serial = serial_table[index]; if (serial) - kobject_get (&serial->kobj); + kref_get(&serial->kref); return serial; } @@ -486,7 +486,7 @@ if (retval) { port->open_count = 0; module_put(serial->type->owner); - kobject_put(&serial->kobj); + kref_put(&serial->kref); } } bailout: @@ -518,7 +518,7 @@ } module_put(port->serial->type->owner); - kobject_put(&port->serial->kobj); + kref_put(&port->serial->kref); } static int serial_write (struct tty_struct * tty, int from_user, const unsigned char *buf, int count) @@ -748,7 +748,7 @@ begin += length; length = 0; } - kobject_put(&serial->kobj); + kref_put(&serial->kref); } *eof = 1; done: @@ -830,15 +830,15 @@ wake_up_interruptible(&tty->write_wait); } -static void destroy_serial (struct kobject *kobj) +static void destroy_serial(struct kref *kref) { struct usb_serial *serial; struct usb_serial_port *port; int i; - dbg ("%s - %s", __FUNCTION__, kobj->name); + serial = to_usb_serial(kref); - serial = to_usb_serial(kobj); + dbg ("%s - %s", __FUNCTION__, serial->type->name); serial_shutdown (serial); /* return the minor range that this device had */ @@ -886,10 +886,6 @@ kfree (serial); } -static struct kobj_type usb_serial_kobj_type = { - .release = destroy_serial, -}; - static void port_release(struct device *dev) { struct usb_serial_port *port = to_usb_serial_port(dev); @@ -930,10 +926,7 @@ serial->interface = interface; serial->vendor = dev->descriptor.idVendor; serial->product = dev->descriptor.idProduct; - - /* initialize the kobject portion of the usb_device */ - kobject_init(&serial->kobj); - serial->kobj.ktype = &usb_serial_kobj_type; + kref_init(&serial->kref, destroy_serial); return serial; } @@ -1006,7 +999,7 @@ /* descriptor matches, let's find the endpoints needed */ /* check out the endpoints */ - iface_desc = &interface->altsetting[0]; + iface_desc = interface->cur_altsetting; for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; @@ -1284,7 +1277,7 @@ if (serial) { /* let the last holder of this object * cause it to be cleaned up */ - kobject_put (&serial->kobj); + kref_put(&serial->kref); } dev_info(dev, "device disconnected\n"); } diff -Nru a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h --- a/drivers/usb/serial/usb-serial.h Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/serial/usb-serial.h Wed Mar 17 19:29:10 2004 @@ -55,6 +55,7 @@ #define __LINUX_USB_SERIAL_H #include +#include #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ #define SERIAL_TTY_MINORS 255 /* loads of devices :) */ @@ -163,10 +164,10 @@ __u16 vendor; __u16 product; struct usb_serial_port * port[MAX_NUM_PORTS]; - struct kobject kobj; + struct kref kref; void * private; }; -#define to_usb_serial(d) container_of(d, struct usb_serial, kobj) +#define to_usb_serial(d) container_of(d, struct usb_serial, kref) #define NUM_DONT_CARE (-1) diff -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c --- a/drivers/usb/serial/visor.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/serial/visor.c Wed Mar 17 19:29:09 2004 @@ -239,6 +239,8 @@ .driver_info = (kernel_ulong_t)&palm_os_4_probe }, { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID), .driver_info = (kernel_ulong_t)&palm_os_4_probe }, + { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID), + .driver_info = (kernel_ulong_t)&palm_os_4_probe }, { USB_DEVICE(GARMIN_VENDOR_ID, GARMIN_IQUE_3600_ID), .driver_info = (kernel_ulong_t)&palm_os_4_probe }, { USB_DEVICE(ACEECA_VENDOR_ID, ACEECA_MEZ1000_ID), @@ -275,6 +277,7 @@ { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_UX50_ID) }, { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_TJ25_ID) }, { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID) }, + { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID) }, { USB_DEVICE(GARMIN_VENDOR_ID, GARMIN_IQUE_3600_ID) }, { USB_DEVICE(ACEECA_VENDOR_ID, ACEECA_MEZ1000_ID) }, { }, /* optional parameter entry */ diff -Nru a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h --- a/drivers/usb/serial/visor.h Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/serial/visor.h Wed Mar 17 19:29:10 2004 @@ -46,6 +46,7 @@ #define SAMSUNG_VENDOR_ID 0x04E8 #define SAMSUNG_SCH_I330_ID 0x8001 +#define SAMSUNG_SPH_I500_ID 0x6601 #define GARMIN_VENDOR_ID 0x091E #define GARMIN_IQUE_3600_ID 0x0004 diff -Nru a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig --- a/drivers/usb/storage/Kconfig Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/storage/Kconfig Wed Mar 17 19:29:10 2004 @@ -1,8 +1,6 @@ # # USB Storage driver configuration # -comment "SCSI support is needed for USB Storage" - depends on USB && SCSI=n config USB_STORAGE tristate "USB Mass Storage support" diff -Nru a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c --- a/drivers/usb/storage/scsiglue.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/storage/scsiglue.c Wed Mar 17 19:29:09 2004 @@ -64,8 +64,10 @@ return "SCSI emulation for USB Mass Storage devices"; } -static int slave_configure (struct scsi_device *sdev) +static int slave_configure(struct scsi_device *sdev) { + struct us_data *us = (struct us_data *) sdev->host->hostdata[0]; + /* Scatter-gather buffers (all but the last) must have a length * divisible by the bulk maxpacket size. Otherwise a data packet * would end up being short, causing a premature end to the data @@ -75,6 +77,16 @@ * have the desired effect because, except at the beginning and * the end, scatter-gather buffers follow page boundaries. */ blk_queue_dma_alignment(sdev->request_queue, (512 - 1)); + + /* Devices using Genesys Logic chips cause a lot of trouble for + * high-speed transfers; they die unpredictably when given more + * than 64 KB of data at a time. If we detect such a device, + * reduce the maximum transfer size to 64 KB = 128 sectors. */ + +#define USB_VENDOR_ID_GENESYS 0x05e3 // Needs a standard location + if (us->pusb_dev->descriptor.idVendor == USB_VENDOR_ID_GENESYS && + us->pusb_dev->speed == USB_SPEED_HIGH) + blk_queue_max_sectors(sdev->request_queue, 128); /* this is to satisify the compiler, tho I don't think the * return code is ever checked anywhere. */ diff -Nru a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c --- a/drivers/usb/storage/transport.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/storage/transport.c Wed Mar 17 19:29:09 2004 @@ -563,9 +563,9 @@ /* * If we're running the CB transport, which is incapable - * of determining status on its own, we need to auto-sense + * of determining status on its own, we will auto-sense * unless the operation involved a data-in transfer. Devices - * can signal data-in errors by stalling the bulk-in pipe. + * can signal most data-in errors by stalling the bulk-in pipe. */ if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) && srb->sc_data_direction != SCSI_DATA_READ) { @@ -698,7 +698,11 @@ * out the sense buffer so the higher layers won't realize * we did an unsolicited auto-sense. */ if (result == USB_STOR_TRANSPORT_GOOD && - (srb->sense_buffer[2] & 0xf) == 0x0) { + /* Filemark 0, ignore EOM, ILI 0, no sense */ + (srb->sense_buffer[2] & 0xaf) == 0 && + /* No ASC or ASCQ */ + srb->sense_buffer[12] == 0 && + srb->sense_buffer[13] == 0) { srb->result = SAM_STAT_GOOD; srb->sense_buffer[0] = 0x0; } @@ -809,15 +813,19 @@ } /* If not UFI, we interpret the data as a result code - * The first byte should always be a 0x0 - * The second byte & 0x0F should be 0x0 for good, otherwise error + * The first byte should always be a 0x0. + * + * Some bogus devices don't follow that rule. They stuff the ASC + * into the first byte -- so if it's non-zero, call it a failure. */ if (us->iobuf[0]) { - US_DEBUGP("CBI IRQ data showed reserved bType %d\n", + US_DEBUGP("CBI IRQ data showed reserved bType 0x%x\n", us->iobuf[0]); - return USB_STOR_TRANSPORT_ERROR; + goto Failed; + } + /* The second byte & 0x0F should be 0x0 for good, otherwise error */ switch (us->iobuf[1] & 0x0F) { case 0x00: return USB_STOR_TRANSPORT_GOOD; diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h --- a/drivers/usb/storage/unusual_devs.h Wed Mar 17 19:29:10 2004 +++ b/drivers/usb/storage/unusual_devs.h Wed Mar 17 19:29:10 2004 @@ -261,6 +261,14 @@ US_SC_SCSI, US_PR_DEVICE, NULL, US_FL_SINGLE_LUN | US_FL_MODE_XLATE ), +/* This entry is needed because the device reports Sub=ff */ +UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0500, + "Sony", + "DSC-T1", + US_SC_8070, US_PR_DEVICE, NULL, + US_FL_SINGLE_LUN | US_FL_MODE_XLATE ), + + /* Reported by wim@geeks.nl */ UNUSUAL_DEV( 0x054c, 0x0025, 0x0100, 0x0100, "Sony", @@ -368,7 +376,7 @@ UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x0001, "Lexar", "Jumpshot USB CF Reader", - US_SC_SCSI, US_PR_JUMPSHOT, NULL, + US_SC_DEVICE, US_PR_JUMPSHOT, NULL, US_FL_MODE_XLATE ), #endif @@ -409,6 +417,13 @@ US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY ), +/* Reported by Henning Schild */ +UNUSUAL_DEV( 0x05e3, 0x0702, 0x0113, 0x0113, + "EagleTec", + "External Hard Disk", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), + /* Reported by Hanno Boeck * Taken from the Lycoris Kernel */ UNUSUAL_DEV( 0x0636, 0x0003, 0x0000, 0x9999, @@ -440,12 +455,6 @@ US_SC_SCSI, US_PR_DEVICE, NULL, 0 ), -UNUSUAL_DEV( 0x0686, 0x400b, 0x0001, 0x0001, - "Minolta", - "DiMAGE 7i", - US_SC_SCSI, US_PR_DEVICE, NULL, - 0 ), - UNUSUAL_DEV( 0x0686, 0x400f, 0x0001, 0x0001, "Minolta", "DiMAGE 7Hi", @@ -619,6 +628,9 @@ * are using transport protocol CB. * - They don't like the INQUIRY command. So we must handle this command * of the SCSI layer ourselves. + * - Some cameras with idProduct=0x1001 and bcdDevice=0x1000 have + * bInterfaceProtocol=0x00 (US_PR_CBI) while others have 0x01 (US_PR_CB). + * So don't remove the US_PR_CB override! */ UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9009, "Casio", @@ -649,6 +661,17 @@ US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_MODE_XLATE ), +/* Entry needed for flags. Moreover, all devices with this ID use + * bulk-only transport, but _some_ falsely report Control/Bulk instead. + * One example is "Trumpion Digital Research MYMP3". + * Submitted by Bjoern Brill + */ +UNUSUAL_DEV( 0x090a, 0x1001, 0x0100, 0x0100, + "Trumpion", + "t33520 USB Flash Card Controller", + US_SC_DEVICE, US_PR_BULK, NULL, + US_FL_MODE_XLATE), + /* Trumpion Microelectronics MP3 player (felipe_alfaro@linuxmail.org) */ UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999, "Trumpion", @@ -688,15 +711,9 @@ US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY ), -/* This entry from in the Debian mailing list */ -UNUSUAL_DEV( 0x0a17, 0x0006, 0x0000, 0xffff, - "Pentax", - "Optio 330GS", - US_SC_8070, US_PR_CB, NULL, - US_FL_MODE_XLATE | US_FL_FIX_INQUIRY ), /* Submitted by Per Winkvist */ -UNUSUAL_DEV( 0x0a17, 0x006, 0x1000, 0x9009, +UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff, "Pentax", "Optio S/S4", US_SC_DEVICE, US_PR_DEVICE, NULL, diff -Nru a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c --- a/drivers/usb/storage/usb.c Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/storage/usb.c Wed Mar 17 19:29:09 2004 @@ -423,7 +423,7 @@ /* Fill in the device-related fields */ us->pusb_dev = interface_to_usbdev(intf); us->pusb_intf = intf; - us->ifnum = intf->altsetting->desc.bInterfaceNumber; + us->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; /* Store our private data in the interface and increment the * device's reference count */ @@ -452,7 +452,7 @@ { struct usb_device *dev = us->pusb_dev; struct usb_interface_descriptor *idesc = - &us->pusb_intf->altsetting[us->pusb_intf->act_altsetting].desc; + &us->pusb_intf->cur_altsetting->desc; struct us_unusual_dev *unusual_dev = &us_unusual_dev_list[id_index]; struct usb_device_id *id = &storage_usb_ids[id_index]; @@ -686,7 +686,7 @@ static int get_pipes(struct us_data *us) { struct usb_host_interface *altsetting = - &us->pusb_intf->altsetting[us->pusb_intf->act_altsetting]; + us->pusb_intf->cur_altsetting; int i; struct usb_endpoint_descriptor *ep; struct usb_endpoint_descriptor *ep_in = NULL; @@ -877,8 +877,9 @@ int result; US_DEBUGP("USB Mass Storage device detected\n"); - US_DEBUGP("act_altsetting is %d, id_index is %d\n", - intf->act_altsetting, id_index); + US_DEBUGP("altsetting is %d, id_index is %d\n", + intf->cur_altsetting->desc.bAlternateSetting, + id_index); /* Allocate the us_data structure and initialize the mutexes */ us = (struct us_data *) kmalloc(sizeof(*us), GFP_KERNEL); @@ -953,8 +954,6 @@ scsi_scan_host(us->host); - printk(KERN_DEBUG - "WARNING: USB Mass Storage data integrity not assured\n"); printk(KERN_DEBUG "USB Mass Storage device found at %d\n", us->pusb_dev->devnum); return 0; diff -Nru a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h --- a/drivers/usb/storage/usb.h Wed Mar 17 19:29:09 2004 +++ b/drivers/usb/storage/usb.h Wed Mar 17 19:29:09 2004 @@ -176,6 +176,5 @@ * single queue element srb for write access */ #define scsi_unlock(host) spin_unlock_irq(host->host_lock) #define scsi_lock(host) spin_lock_irq(host->host_lock) -#define sg_address(psg) (page_address((psg).page) + (psg).offset) #endif diff -Nru a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c --- a/drivers/video/console/fbcon.c Wed Mar 17 19:29:09 2004 +++ b/drivers/video/console/fbcon.c Wed Mar 17 19:29:09 2004 @@ -309,94 +309,6 @@ } /* - * drawing helpers - */ -static void putcs_unaligned(struct vc_data *vc, struct fb_info *info, - struct fb_image *image, int count, - const unsigned short *s) -{ - unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; - unsigned int width = (vc->vc_font.width + 7) >> 3; - unsigned int cellsize = vc->vc_font.height * width; - unsigned int maxcnt = info->pixmap.size/cellsize; - unsigned int shift_low = 0, mod = vc->vc_font.width % 8; - unsigned int shift_high = 8, size, pitch, cnt, k; - unsigned int buf_align = info->pixmap.buf_align - 1; - unsigned int scan_align = info->pixmap.scan_align - 1; - unsigned int idx = vc->vc_font.width >> 3; - u8 *src, *dst, *dst0; - - while (count) { - if (count > maxcnt) - cnt = k = maxcnt; - else - cnt = k = count; - - image->width = vc->vc_font.width * cnt; - pitch = ((image->width + 7) >> 3) + scan_align; - pitch &= ~scan_align; - size = pitch * vc->vc_font.height + buf_align; - size &= ~buf_align; - dst0 = fb_get_buffer_offset(info, &info->pixmap, size); - image->data = dst0; - while (k--) { - src = vc->vc_font.data + (scr_readw(s++) & charmask)* - cellsize; - dst = dst0; - fb_move_buf_unaligned(info, &info->pixmap, dst, pitch, src, - idx, image->height, shift_high, - shift_low, mod); - shift_low += mod; - dst0 += (shift_low >= 8) ? width : width - 1; - shift_low &= 7; - shift_high = 8 - shift_low; - } - info->fbops->fb_imageblit(info, image); - image->dx += cnt * vc->vc_font.width; - count -= cnt; - } -} - -static void putcs_aligned(struct vc_data *vc, struct fb_info *info, - struct fb_image *image, int count, - const unsigned short *s) -{ - unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; - unsigned int width = vc->vc_font.width >> 3; - unsigned int cellsize = vc->vc_font.height * width; - unsigned int maxcnt = info->pixmap.size/cellsize; - unsigned int scan_align = info->pixmap.scan_align - 1; - unsigned int buf_align = info->pixmap.buf_align - 1; - unsigned int pitch, cnt, size, k; - u8 *src, *dst, *dst0; - - while (count) { - if (count > maxcnt) - cnt = k = maxcnt; - else - cnt = k = count; - - pitch = width * cnt + scan_align; - pitch &= ~scan_align; - size = pitch * vc->vc_font.height + buf_align; - size &= ~buf_align; - image->width = vc->vc_font.width * cnt; - dst0 = fb_get_buffer_offset(info, &info->pixmap, size); - image->data = dst0; - while (k--) { - src = vc->vc_font.data + (scr_readw(s++)&charmask)*cellsize; - dst = dst0; - fb_move_buf_aligned(info, &info->pixmap, dst, pitch, src, - width, image->height); - dst0 += width; - } - info->fbops->fb_imageblit(info, image); - image->dx += cnt * vc->vc_font.width; - count -= cnt; - } -} - -/* * Accelerated handlers. */ void accel_bmove(struct vc_data *vc, struct fb_info *info, int sy, @@ -430,48 +342,23 @@ info->fbops->fb_fillrect(info, ®ion); } -static void accel_putc(struct vc_data *vc, struct fb_info *info, - int c, int ypos, int xpos) +void accel_putcs(struct vc_data *vc, struct fb_info *info, + const unsigned short *s, int count, int yy, int xx) { unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; unsigned int width = (vc->vc_font.width + 7) >> 3; + unsigned int cellsize = vc->vc_font.height * width; + unsigned int maxcnt = info->pixmap.size/cellsize; unsigned int scan_align = info->pixmap.scan_align - 1; unsigned int buf_align = info->pixmap.buf_align - 1; + unsigned int shift_low = 0, mod = vc->vc_font.width % 8; + unsigned int shift_high = 8, pitch, cnt, size, k; int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; int fgshift = (vc->vc_hi_font_mask) ? 9 : 8; - unsigned int size, pitch; - struct fb_image image; - u8 *src, *dst; - - image.dx = xpos * vc->vc_font.width; - image.dy = ypos * vc->vc_font.height; - image.width = vc->vc_font.width; - image.height = vc->vc_font.height; - image.fg_color = attr_fgcol(fgshift, c); - image.bg_color = attr_bgcol(bgshift, c); - image.depth = 1; - - pitch = width + scan_align; - pitch &= ~scan_align; - size = pitch * vc->vc_font.height; - size += buf_align; - size &= ~buf_align; - dst = fb_get_buffer_offset(info, &info->pixmap, size); - image.data = dst; - src = vc->vc_font.data + (c & charmask) * vc->vc_font.height * width; - - fb_move_buf_aligned(info, &info->pixmap, dst, pitch, src, width, image.height); - - info->fbops->fb_imageblit(info, &image); -} - -void accel_putcs(struct vc_data *vc, struct fb_info *info, - const unsigned short *s, int count, int yy, int xx) -{ - int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; - int fgshift = (vc->vc_hi_font_mask) ? 9 : 8; + unsigned int idx = vc->vc_font.width >> 3; struct fb_image image; u16 c = scr_readw(s); + u8 *src, *dst, *dst0; image.fg_color = attr_fgcol(fgshift, c); image.bg_color = attr_bgcol(bgshift, c); @@ -480,10 +367,41 @@ image.height = vc->vc_font.height; image.depth = 1; - if (!(vc->vc_font.width & 7)) - putcs_aligned(vc, info, &image, count, s); - else - putcs_unaligned(vc, info, &image, count, s); + while (count) { + if (count > maxcnt) + cnt = k = maxcnt; + else + cnt = k = count; + + image.width = vc->vc_font.width * cnt; + pitch = ((image.width + 7) >> 3) + scan_align; + pitch &= ~scan_align; + size = pitch * image.height + buf_align; + size &= ~buf_align; + dst0 = fb_get_buffer_offset(info, &info->pixmap, size); + image.data = dst0; + while (k--) { + src = vc->vc_font.data + (scr_readw(s++) & charmask)*cellsize; + dst = dst0; + + if (mod) { + fb_move_buf_unaligned(info, &info->pixmap, dst, pitch, + src, idx, image.height, shift_high, + shift_low, mod); + shift_low += mod; + dst0 += (shift_low >= 8) ? width : width - 1; + shift_low &= 7; + shift_high = 8 - shift_low; + } else { + fb_move_buf_aligned(info, &info->pixmap, dst, pitch, + src, idx, image.height); + dst0 += width; + } + } + info->fbops->fb_imageblit(info, &image); + image.dx += cnt * vc->vc_font.width; + count -= cnt; + } } void accel_clear_margins(struct vc_data *vc, struct fb_info *info, @@ -724,15 +642,13 @@ static void fbcon_set_display(struct vc_data *vc, int init, int logo) { struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]]; + int nr_rows, nr_cols, old_rows, old_cols, i, charcnt = 256; struct display *p = &fb_display[vc->vc_num]; - int nr_rows, nr_cols; - int old_rows, old_cols; unsigned short *save = NULL, *r, *q; - int i, charcnt = 256; struct font_desc *font; if (vc->vc_num != fg_console || (info->flags & FBINFO_FLAG_MODULE) || - info->fix.type == FB_TYPE_TEXT) + (info->fix.type == FB_TYPE_TEXT)) logo = 0; info->var.xoffset = info->var.yoffset = p->yscroll = 0; /* reset wrap/pan */ @@ -958,11 +874,19 @@ accel_clear(vc, info, real_y(p, sy), sx, height, width); } - static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) { struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]]; + unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; + unsigned int scan_align = info->pixmap.scan_align - 1; + unsigned int buf_align = info->pixmap.buf_align - 1; + unsigned int width = (vc->vc_font.width + 7) >> 3; + int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; + int fgshift = (vc->vc_hi_font_mask) ? 9 : 8; struct display *p = &fb_display[vc->vc_num]; + unsigned int size, pitch; + struct fb_image image; + u8 *src, *dst; if (!info->fbops->fb_blank && console_blanked) return; @@ -972,7 +896,28 @@ if (vt_cons[vc->vc_num]->vc_mode != KD_TEXT) return; - accel_putc(vc, info, c, real_y(p, ypos), xpos); + image.dx = xpos * vc->vc_font.width; + image.dy = real_y(p, ypos) * vc->vc_font.height; + image.width = vc->vc_font.width; + image.height = vc->vc_font.height; + image.fg_color = attr_fgcol(fgshift, c); + image.bg_color = attr_bgcol(bgshift, c); + image.depth = 1; + + src = vc->vc_font.data + (c & charmask) * vc->vc_font.height * width; + + pitch = width + scan_align; + pitch &= ~scan_align; + size = pitch * vc->vc_font.height; + size += buf_align; + size &= ~buf_align; + + dst = fb_get_buffer_offset(info, &info->pixmap, size); + image.data = dst; + + fb_move_buf_aligned(info, &info->pixmap, dst, pitch, src, width, image.height); + + info->fbops->fb_imageblit(info, &image); } static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, diff -Nru a/drivers/video/modedb.c b/drivers/video/modedb.c --- a/drivers/video/modedb.c Wed Mar 17 19:29:09 2004 +++ b/drivers/video/modedb.c Wed Mar 17 19:29:09 2004 @@ -554,5 +554,5 @@ return 0; } -EXPORT_SYMBOL(__fb_try_mode); EXPORT_SYMBOL(vesa_modes); +EXPORT_SYMBOL(fb_find_mode); diff -Nru a/fs/Kconfig b/fs/Kconfig --- a/fs/Kconfig Wed Mar 17 19:29:09 2004 +++ b/fs/Kconfig Wed Mar 17 19:29:09 2004 @@ -1587,7 +1587,7 @@ # config INTERMEZZO_FS tristate "InterMezzo file system support (replicating fs) (EXPERIMENTAL)" - depends on INET && EXPERIMENTAL && BROKEN + depends on INET && EXPERIMENTAL help InterMezzo is a networked file system with disconnected operation and kernel level write back caching. It is most often used for diff -Nru a/fs/compat_ioctl.c b/fs/compat_ioctl.c --- a/fs/compat_ioctl.c Wed Mar 17 19:29:10 2004 +++ b/fs/compat_ioctl.c Wed Mar 17 19:29:10 2004 @@ -1952,6 +1952,7 @@ set_fs (KERNEL_DS); err = sys_ioctl(fd, cmd, (unsigned long)&a); set_fs (old_fs); + break; default: return -EINVAL; } diff -Nru a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c --- a/fs/exportfs/expfs.c Wed Mar 17 19:29:10 2004 +++ b/fs/exportfs/expfs.c Wed Mar 17 19:29:10 2004 @@ -135,7 +135,6 @@ * the noprogress counter. If we go through the loop 10 times (2 is * probably enough) without getting anywhere, we just give up */ - lock_kernel(); noprogress= 0; while (target_dir->d_flags & DCACHE_DISCONNECTED && noprogress++ < 10) { struct dentry *pd = target_dir; @@ -232,7 +231,6 @@ /* something went wrong - oh-well */ if (!err) err = -ESTALE; - unlock_kernel(); goto err_target; } /* if we weren't after a directory, have one more step to go */ @@ -254,7 +252,6 @@ } } dput(target_dir); - unlock_kernel(); /* now result is properly connected, it is our best bet */ if (acceptable(context, result)) return result; diff -Nru a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c --- a/fs/hugetlbfs/inode.c Wed Mar 17 19:29:10 2004 +++ b/fs/hugetlbfs/inode.c Wed Mar 17 19:29:10 2004 @@ -683,11 +683,24 @@ static struct vfsmount *hugetlbfs_vfsmount; -static atomic_t hugetlbfs_counter = ATOMIC_INIT(0); +/* + * Return the next identifier for a shm file + */ +static unsigned long hugetlbfs_counter(void) +{ + static spinlock_t lock = SPIN_LOCK_UNLOCKED; + static unsigned long counter; + unsigned long ret; + + spin_lock(&lock); + ret = ++counter; + spin_unlock(&lock); + return ret; +} struct file *hugetlb_zero_setup(size_t size) { - int error, n; + int error; struct file *file; struct inode *inode; struct dentry *dentry, *root; @@ -699,11 +712,9 @@ if (!is_hugepage_mem_enough(size)) return ERR_PTR(-ENOMEM); - n = atomic_read(&hugetlbfs_counter); - atomic_inc(&hugetlbfs_counter); root = hugetlbfs_vfsmount->mnt_root; - snprintf(buf, 16, "%d", n); + snprintf(buf, 16, "%lu", hugetlbfs_counter()); quick_string.name = buf; quick_string.len = strlen(quick_string.name); quick_string.hash = 0; diff -Nru a/fs/intermezzo/dir.c b/fs/intermezzo/dir.c --- a/fs/intermezzo/dir.c Wed Mar 17 19:29:09 2004 +++ b/fs/intermezzo/dir.c Wed Mar 17 19:29:09 2004 @@ -1300,13 +1300,9 @@ return rc; } - case TCGETS: - EXIT; - return -EINVAL; - default: EXIT; - return -EINVAL; + return -ENOTTY; } EXIT; diff -Nru a/fs/intermezzo/file.c b/fs/intermezzo/file.c --- a/fs/intermezzo/file.c Wed Mar 17 19:29:09 2004 +++ b/fs/intermezzo/file.c Wed Mar 17 19:29:09 2004 @@ -217,9 +217,9 @@ fdata->fd_mode = file->f_dentry->d_inode->i_mode; fdata->fd_uid = file->f_dentry->d_inode->i_uid; fdata->fd_gid = file->f_dentry->d_inode->i_gid; - fdata->fd_ngroups = current->ngroups; - for (i=0 ; i < current->ngroups ; i++) - fdata->fd_groups[i] = current->groups[i]; + fdata->fd_ngroups = current->group_info->ngroups; + for (i=0 ; i < current->group_info->ngroups ; i++) + fdata->fd_groups[i] = GROUP_AT(current->group_info,i); if (!ISLENTO(minor)) fdata->fd_info.flags = LENTO_FL_KML; else { diff -Nru a/fs/intermezzo/fileset.c b/fs/intermezzo/fileset.c --- a/fs/intermezzo/fileset.c Wed Mar 17 19:29:09 2004 +++ b/fs/intermezzo/fileset.c Wed Mar 17 19:29:09 2004 @@ -418,7 +418,7 @@ new.fsgid = 0; new.fs = get_fs(); /* XXX where can we get the groups from? */ - new.ngroups = 0; + new.group_info = groups_alloc(0); push_ctxt(save, &new); } diff -Nru a/fs/intermezzo/intermezzo_fs.h b/fs/intermezzo/intermezzo_fs.h --- a/fs/intermezzo/intermezzo_fs.h Wed Mar 17 19:29:09 2004 +++ b/fs/intermezzo/intermezzo_fs.h Wed Mar 17 19:29:09 2004 @@ -152,14 +152,14 @@ uid_t fsuid; gid_t fsgid; mm_segment_t fs; - int ngroups; - gid_t groups[NGROUPS]; + struct group_info * group_info; +/* int ngroups; + gid_t groups[NGROUPS];*/ }; static inline void push_ctxt(struct run_ctxt *save, struct run_ctxt *new) { - int i; save->fs = get_fs(); save->pwd = dget(current->fs->pwd); save->pwdmnt = mntget(current->fs->pwdmnt); @@ -167,9 +167,10 @@ save->fsuid = current->fsuid; save->root = current->fs->root; save->rootmnt = current->fs->rootmnt; - save->ngroups = current->ngroups; + save->group_info = current->group_info; +/* save->ngroups = current->ngroups; for (i = 0; i< current->ngroups; i++) - save->groups[i] = current->groups[i]; + save->groups[i] = current->groups[i];*/ set_fs(new->fs); lock_kernel(); @@ -179,18 +180,17 @@ unlock_kernel(); current->fsuid = new->fsuid; current->fsgid = new->fsgid; - if (new->ngroups > 0) { + /*if (new->ngroups > 0) { current->ngroups = new->ngroups; for (i = 0; i< new->ngroups; i++) current->groups[i] = new->groups[i]; - } + }*/ + current->group_info = new->group_info; } static inline void pop_ctxt(struct run_ctxt *saved) { - int i; - set_fs(saved->fs); lock_kernel(); set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd); @@ -199,10 +199,12 @@ unlock_kernel(); current->fsuid = saved->fsuid; current->fsgid = saved->fsgid; + current->group_info = saved->group_info; +/* current->ngroups = saved->ngroups; for (i = 0; i< saved->ngroups; i++) current->groups[i] = saved->groups[i]; - +*/ mntput(saved->pwdmnt); dput(saved->pwd); } @@ -392,7 +394,7 @@ uid_t fd_fsuid; gid_t fd_fsgid; int fd_ngroups; - gid_t fd_groups[NGROUPS_MAX]; + gid_t fd_groups[NGROUPS_SMALL]; /* information how to complete the close operation */ struct lento_vfs_context fd_info; struct presto_version fd_version; diff -Nru a/fs/intermezzo/intermezzo_kml.h b/fs/intermezzo/intermezzo_kml.h --- a/fs/intermezzo/intermezzo_kml.h Wed Mar 17 19:29:10 2004 +++ b/fs/intermezzo/intermezzo_kml.h Wed Mar 17 19:29:10 2004 @@ -41,7 +41,7 @@ u32 fsgid; u32 opcode; u32 ngroups; - u32 groups[NGROUPS_MAX]; + u32 groups[NGROUPS_SMALL]; }; enum kml_opcode { diff -Nru a/fs/intermezzo/journal.c b/fs/intermezzo/journal.c --- a/fs/intermezzo/journal.c Wed Mar 17 19:29:09 2004 +++ b/fs/intermezzo/journal.c Wed Mar 17 19:29:09 2004 @@ -309,7 +309,7 @@ __u32 fsuid, __u32 fsgid) { struct kml_prefix_hdr p; - u32 loggroups[NGROUPS_MAX]; + u32 loggroups[NGROUPS_SMALL]; int i; @@ -332,15 +332,15 @@ static inline char * journal_log_prefix(char *buf, int opcode, struct rec_info *rec) { - __u32 groups[NGROUPS_MAX]; + __u32 groups[NGROUPS_SMALL]; int i; /* convert 16 bit gid's to 32 bit gid's */ - for (i=0; ingroups; i++) - groups[i] = (__u32) current->groups[i]; + for (i=0; igroup_info->ngroups; i++) + groups[i] = GROUP_AT(current->group_info,i); return journal_log_prefix_with_groups_and_ids(buf, opcode, rec, - (__u32)current->ngroups, + (__u32)current->group_info->ngroups, groups, (__u32)current->fsuid, (__u32)current->fsgid); @@ -1319,7 +1319,7 @@ pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); ino = cpu_to_le64(dentry->d_inode->i_ino); generation = cpu_to_le32(dentry->d_inode->i_generation); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + sizeof(*new_file_ver) + sizeof(ino) + sizeof(generation) + sizeof(pathlen) + sizeof(remote_ino) + sizeof(remote_generation) + @@ -1529,7 +1529,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dentry, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + sizeof(*old_ver) + sizeof(valid) + sizeof(mode) + sizeof(uid) + sizeof(gid) + sizeof(fsize) + sizeof(mtime) + sizeof(ctime) + sizeof(flags) + @@ -1600,7 +1600,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dentry, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + sizeof(pathlen) + size_round(le32_to_cpu(pathlen)) + sizeof(struct kml_suffix); @@ -1659,7 +1659,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dentry, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) + sizeof(lmode) + sizeof(uid) + sizeof(gid) + sizeof(pathlen) + sizeof(struct kml_suffix); @@ -1715,7 +1715,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dentry, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) + sizeof(uid) + sizeof(gid) + sizeof(pathlen) + sizeof(targetlen) + sizeof(struct kml_suffix); @@ -1773,7 +1773,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dentry, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) + sizeof(lmode) + sizeof(uid) + sizeof(gid) + sizeof(pathlen) + sizeof(struct kml_suffix); @@ -1828,7 +1828,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dir, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) + sizeof(pathlen) + sizeof(llen) + sizeof(*rb) + sizeof(struct kml_suffix); @@ -1891,7 +1891,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dentry, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) + sizeof(lmode) + sizeof(uid) + sizeof(gid) + sizeof(lmajor) + sizeof(lminor) + sizeof(pathlen) + @@ -1951,7 +1951,7 @@ BUFF_ALLOC(buffer, srcbuffer); path = presto_path(tgt, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) + sizeof(srcpathlen) + sizeof(pathlen) + sizeof(struct kml_suffix); @@ -2009,7 +2009,7 @@ BUFF_ALLOC(buffer, srcbuffer); path = presto_path(tgt, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 4 * sizeof(*src_dir_ver) + sizeof(srcpathlen) + sizeof(pathlen) + sizeof(struct kml_suffix); @@ -2069,7 +2069,7 @@ BUFF_ALLOC(buffer, NULL); path = presto_path(dir, root, buffer, PAGE_SIZE); pathlen = cpu_to_le32(MYPATHLEN(buffer, path)); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) + sizeof(pathlen) + sizeof(llen) + sizeof(*rb) + sizeof(old_targetlen) + sizeof(struct kml_suffix); @@ -2116,7 +2116,7 @@ __u32 open_fsuid; __u32 open_fsgid; __u32 open_ngroups; - __u32 open_groups[NGROUPS_MAX]; + __u32 open_groups[NGROUPS_SMALL]; __u32 open_mode; __u32 open_uid; __u32 open_gid; @@ -2146,9 +2146,9 @@ open_fsuid = fd->fd_fsuid; open_fsgid = fd->fd_fsgid; } else { - open_ngroups = current->ngroups; - for (i=0; ingroups; i++) - open_groups[i] = (__u32) current->groups[i]; + open_ngroups = current->group_info->ngroups; + for (i=0; igroup_info->ngroups; i++) + open_groups[i] = (__u32) GROUP_AT(current->group_info,i); open_mode = dentry->d_inode->i_mode; open_uid = dentry->d_inode->i_uid; open_gid = dentry->d_inode->i_gid; @@ -2246,7 +2246,7 @@ /* write closes for the local close records in the LML */ int presto_complete_lml(struct presto_file_set *fset) { - __u32 groups[NGROUPS_MAX]; + __u32 groups[NGROUPS_SMALL]; loff_t lml_offset; loff_t read_offset; char *buffer; @@ -2408,7 +2408,7 @@ */ mode=cpu_to_le32(dentry->d_inode->i_mode); - size = sizeof(__u32) * current->ngroups + + size = sizeof(__u32) * current->group_info->ngroups + sizeof(struct kml_prefix_hdr) + 2 * sizeof(struct presto_version) + sizeof(flags) + sizeof(mode) + sizeof(namelen) + diff -Nru a/fs/intermezzo/kml_reint.c b/fs/intermezzo/kml_reint.c --- a/fs/intermezzo/kml_reint.c Wed Mar 17 19:29:10 2004 +++ b/fs/intermezzo/kml_reint.c Wed Mar 17 19:29:10 2004 @@ -53,11 +53,11 @@ ctxt.root = ctxt.pwd; ctxt.rootmnt = ctxt.pwdmnt; if (rec->prefix.hdr->ngroups > 0) { - ctxt.ngroups = rec->prefix.hdr->ngroups; - for (i = 0; i< ctxt.ngroups; i++) - ctxt.groups[i] = rec->prefix.groups[i]; + ctxt.group_info = groups_alloc(rec->prefix.hdr->ngroups); + for (i = 0; i< ctxt.group_info->ngroups; i++) + GROUP_AT(ctxt.group_info,i)= rec->prefix.groups[i]; } else - ctxt.ngroups = 0; + ctxt.group_info = groups_alloc(0); push_ctxt(saved, &ctxt); } diff -Nru a/fs/intermezzo/vfs.c b/fs/intermezzo/vfs.c --- a/fs/intermezzo/vfs.c Wed Mar 17 19:29:09 2004 +++ b/fs/intermezzo/vfs.c Wed Mar 17 19:29:09 2004 @@ -965,8 +965,6 @@ do_rcvd = presto_do_rcvd(info, dir); error = iops->unlink(dir->d_inode, dentry); unlock_kernel(); - if (!error) - d_delete(dentry); } if (linkno > 1) { @@ -988,10 +986,6 @@ } // up(&dir->d_inode->i_zombie); - if (error) { - EXIT; - goto exit; - } presto_debug_fail_blkdev(fset, KML_OPCODE_UNLINK | 0x10); if ( do_kml ) @@ -1048,6 +1042,8 @@ if (nd.last.name[nd.last.len]) goto slashes; error = presto_do_unlink(fset, nd.dentry, dentry, info); + if (!error) + d_delete(dentry); exit2: EXIT; dput(dentry); diff -Nru a/fs/jbd/recovery.c b/fs/jbd/recovery.c --- a/fs/jbd/recovery.c Wed Mar 17 19:29:10 2004 +++ b/fs/jbd/recovery.c Wed Mar 17 19:29:10 2004 @@ -137,7 +137,10 @@ *bhp = NULL; - J_ASSERT (offset < journal->j_maxlen); + if (offset >= journal->j_maxlen) { + printk(KERN_ERR "JBD: corrupted journal superblock\n"); + return -EIO; + } err = journal_bmap(journal, offset, &blocknr); diff -Nru a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c --- a/fs/jfs/jfs_logmgr.c Wed Mar 17 19:29:09 2004 +++ b/fs/jfs/jfs_logmgr.c Wed Mar 17 19:29:09 2004 @@ -1811,7 +1811,7 @@ lbuf = kmalloc(sizeof(struct lbuf), GFP_KERNEL); if (lbuf == 0) goto error; - lbuf->l_ldata = (char *) __get_free_page(GFP_KERNEL); + lbuf->l_ldata = (char *) get_zeroed_page(GFP_KERNEL); if (lbuf->l_ldata == 0) { kfree(lbuf); goto error; diff -Nru a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c --- a/fs/jfs/jfs_metapage.c Wed Mar 17 19:29:09 2004 +++ b/fs/jfs/jfs_metapage.c Wed Mar 17 19:29:09 2004 @@ -341,6 +341,10 @@ } mp->data = kmap(mp->page) + page_offset; } + + if (new) + memset(mp->data, 0, PSIZE); + jfs_info("__get_metapage: returning = 0x%p", mp); return mp; diff -Nru a/fs/jfs/super.c b/fs/jfs/super.c --- a/fs/jfs/super.c Wed Mar 17 19:29:09 2004 +++ b/fs/jfs/super.c Wed Mar 17 19:29:09 2004 @@ -548,11 +548,11 @@ if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) == SLAB_CTOR_CONSTRUCTOR) { + memset(jfs_ip, 0, sizeof(struct jfs_inode_info)); INIT_LIST_HEAD(&jfs_ip->anon_inode_list); init_rwsem(&jfs_ip->rdwrlock); init_MUTEX(&jfs_ip->commit_sem); init_rwsem(&jfs_ip->xattr_sem); - jfs_ip->atlhead = 0; jfs_ip->active_ag = -1; #ifdef CONFIG_JFS_POSIX_ACL jfs_ip->i_acl = JFS_ACL_NOT_CACHED; diff -Nru a/fs/proc/root.c b/fs/proc/root.c --- a/fs/proc/root.c Wed Mar 17 19:29:10 2004 +++ b/fs/proc/root.c Wed Mar 17 19:29:10 2004 @@ -74,9 +74,6 @@ #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); #endif -#ifdef CONFIG_PPC_RTAS - proc_rtas_init(); -#endif proc_bus = proc_mkdir("bus", 0); } diff -Nru a/fs/reiserfs/file.c b/fs/reiserfs/file.c --- a/fs/reiserfs/file.c Wed Mar 17 19:29:09 2004 +++ b/fs/reiserfs/file.c Wed Mar 17 19:29:09 2004 @@ -365,7 +365,7 @@ // it means there are no existing in-tree representation for file area // we are going to overwrite, so there is nothing to scan through for holes. for ( curr_block = 0, itempos = path.pos_in_item ; curr_block < blocks_to_allocate && res == POSITION_FOUND ; ) { - +retry: if ( itempos >= ih_item_len(ih)/UNFM_P_SIZE ) { /* We run out of data in this indirect item, let's look for another one. */ @@ -422,8 +422,8 @@ bh=get_last_bh(&path); ih=get_ih(&path); item = get_item(&path); - // Itempos is still the same - continue; + itempos = path.pos_in_item; + goto retry; } modifying_this_item = 1; } @@ -856,8 +856,12 @@ /* Try to find next item */ res = search_for_position_by_key(inode->i_sb, &key, &path); /* Abort if no more items */ - if ( res != POSITION_FOUND ) + if ( res != POSITION_FOUND ) { + /* make sure later loops don't use this item */ + itembuf = NULL; + item = NULL; break; + } /* Update information about current indirect item */ itembuf = get_last_bh( &path ); @@ -1191,6 +1195,14 @@ return res; } +static ssize_t reiserfs_aio_write(struct kiocb *iocb, const char __user *buf, + size_t count, loff_t pos) +{ + return generic_file_aio_write(iocb, buf, count, pos); +} + + + struct file_operations reiserfs_file_operations = { .read = generic_file_read, .write = reiserfs_file_write, @@ -1199,6 +1211,8 @@ .release = reiserfs_file_release, .fsync = reiserfs_sync_file, .sendfile = generic_file_sendfile, + .aio_read = generic_file_aio_read, + .aio_write = reiserfs_aio_write, }; diff -Nru a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c --- a/fs/reiserfs/inode.c Wed Mar 17 19:29:09 2004 +++ b/fs/reiserfs/inode.c Wed Mar 17 19:29:09 2004 @@ -209,7 +209,7 @@ pathrelse(path) ; reiserfs_update_sd(th, inode) ; journal_end(th, s, len) ; - journal_begin(th, s, len) ; + journal_begin(th, s, JOURNAL_PER_BALANCE_CNT * 6) ; reiserfs_update_inode_transaction(inode) ; } @@ -444,7 +444,7 @@ /* make sure future calls to the direct io funcs for this offset ** in the file fail by unmapping the buffer */ - reiserfs_unmap_buffer(bh_result); + clear_buffer_mapped(bh_result); ret = -EINVAL ; } /* Possible unpacked tail. Flush the data before pages have diff -Nru a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c --- a/fs/reiserfs/stree.c Wed Mar 17 19:29:09 2004 +++ b/fs/reiserfs/stree.c Wed Mar 17 19:29:09 2004 @@ -652,8 +652,8 @@ stop at leaf level - set to DISK_LEAF_NODE_LEVEL */ ) { - int n_block_number = SB_ROOT_BLOCK (p_s_sb), - expected_level = SB_TREE_HEIGHT (p_s_sb); + int n_block_number; + int expected_level; struct buffer_head * p_s_bh; struct path_element * p_s_last_element; int n_node_level, n_retval; @@ -677,6 +677,8 @@ /* With each iteration of this loop we search through the items in the current node, and calculate the next current node(next path element) for the next iteration of this loop.. */ + n_block_number = SB_ROOT_BLOCK (p_s_sb); + expected_level = -1; while ( 1 ) { #ifdef CONFIG_REISERFS_CHECK @@ -690,7 +692,6 @@ /* prep path to have another element added to it. */ p_s_last_element = PATH_OFFSET_PELEMENT(p_s_search_path, ++p_s_search_path->path_length); fs_gen = get_generation (p_s_sb); - expected_level --; #ifdef SEARCH_BY_KEY_READA /* schedule read of right neighbor */ @@ -705,25 +706,26 @@ pathrelse(p_s_search_path); return IO_ERROR; } - - if( fs_changed (fs_gen, p_s_sb) ) { - PROC_INFO_INC( p_s_sb, search_by_key_fs_changed ); - PROC_INFO_INC( p_s_sb, sbk_fs_changed[ expected_level - 1 ] ); - } + if (expected_level == -1) + expected_level = SB_TREE_HEIGHT (p_s_sb); + expected_level --; /* It is possible that schedule occurred. We must check whether the key to search is still in the tree rooted from the current buffer. If not then repeat search from the root. */ if ( fs_changed (fs_gen, p_s_sb) && - (!B_IS_IN_TREE (p_s_bh) || !key_in_buffer(p_s_search_path, p_s_key, p_s_sb)) ) { - PROC_INFO_INC( p_s_sb, search_by_key_restarted ); + (!B_IS_IN_TREE (p_s_bh) || + B_LEVEL(p_s_bh) != expected_level || + !key_in_buffer(p_s_search_path, p_s_key, p_s_sb))) { + PROC_INFO_INC( p_s_sb, search_by_key_fs_changed ); + PROC_INFO_INC( p_s_sb, search_by_key_restarted ); PROC_INFO_INC( p_s_sb, sbk_restarted[ expected_level - 1 ] ); decrement_counters_in_path(p_s_search_path); /* Get the root block number so that we can repeat the search - starting from the root. */ + starting from the root. */ n_block_number = SB_ROOT_BLOCK (p_s_sb); - expected_level = SB_TREE_HEIGHT (p_s_sb); + expected_level = -1; right_neighbor_of_leaf_node = 0; /* repeat search from the root */ @@ -1103,6 +1105,7 @@ for (n_counter = *p_n_removed; n_counter < n_unfm_number; n_counter++, p_n_unfm_pointer-- ) { + cond_resched(); if (item_moved (&s_ih, p_s_path)) { need_research = 1 ; break; @@ -1754,7 +1757,7 @@ reiserfs_update_sd(th, p_s_inode) ; journal_end(th, p_s_inode->i_sb, orig_len_alloc) ; - journal_begin(th, p_s_inode->i_sb, orig_len_alloc) ; + journal_begin(th, p_s_inode->i_sb, JOURNAL_PER_BALANCE_CNT * 6) ; reiserfs_update_inode_transaction(p_s_inode) ; } } while ( n_file_size > ROUND_UP (n_new_file_size) && diff -Nru a/include/asm-arm/arch-ebsa285/irqs.h b/include/asm-arm/arch-ebsa285/irqs.h --- a/include/asm-arm/arch-ebsa285/irqs.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-arm/arch-ebsa285/irqs.h Wed Mar 17 19:29:09 2004 @@ -91,8 +91,8 @@ #undef RTC_IRQ #define RTC_IRQ IRQ_ISA_RTC_ALARM -#undef AUX_IRQ -#define AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE) +#define I8042_KBD_IRQ IRQ_ISA_KEYBOARD +#define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE) #define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY #define irq_canonicalize(_i) (((_i) == IRQ_ISA_CASCADE) ? IRQ_ISA_2 : _i) diff -Nru a/include/asm-arm/arch-shark/irqs.h b/include/asm-arm/arch-shark/irqs.h --- a/include/asm-arm/arch-shark/irqs.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-arm/arch-shark/irqs.h Wed Mar 17 19:29:10 2004 @@ -8,5 +8,6 @@ #define IRQ_ISA_KEYBOARD 1 #define RTC_IRQ 8 -#define AUX_IRQ 12 +#define I8042_KBD_IRQ 1 +#define I8042_AUX_IRQ 12 #define IRQ_HARDDISK 14 diff -Nru a/include/asm-arm26/thread_info.h b/include/asm-arm26/thread_info.h --- a/include/asm-arm26/thread_info.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-arm26/thread_info.h Wed Mar 17 19:29:09 2004 @@ -81,8 +81,6 @@ /* FIXME - PAGE_SIZE < 32K */ #define THREAD_SIZE (8192) -/*FIXME INIT_THREAD_SIZE - how big? */ -//#define INIT_THREAD_SIZE (65536) #define __get_user_regs(x) (((struct pt_regs *)((unsigned long)(x) + THREAD_SIZE - 8)) - 1) extern struct thread_info *alloc_thread_info(struct task_struct *task); diff -Nru a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h --- a/include/asm-ia64/acpi.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-ia64/acpi.h Wed Mar 17 19:29:10 2004 @@ -93,7 +93,8 @@ const char *acpi_get_sysname (void); int acpi_request_vector (u32 int_type); int acpi_register_irq (u32 gsi, u32 polarity, u32 trigger); -int acpi_irq_to_vector (u32 irq); +int acpi_irq_to_vector (u32 irq); /* deprecated in favor of acpi_gsi_to_irq */ +int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); #ifdef CONFIG_ACPI_NUMA /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/ diff -Nru a/include/asm-ia64/gcc_intrin.h b/include/asm-ia64/gcc_intrin.h --- a/include/asm-ia64/gcc_intrin.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ia64/gcc_intrin.h Wed Mar 17 19:29:09 2004 @@ -23,6 +23,8 @@ extern void ia64_bad_param_for_setreg (void); extern void ia64_bad_param_for_getreg (void); +register unsigned long ia64_r13 asm ("r13"); + #define ia64_setreg(regnum, val) \ ({ \ switch (regnum) { \ @@ -67,10 +69,7 @@ asm volatile ("mov %0=psr" : "=r"(ia64_intri_res)); \ break; \ case _IA64_REG_TP: /* for current() */ \ - { \ - register __u64 ia64_r13 asm ("r13"); \ - ia64_intri_res = ia64_r13; \ - } \ + ia64_intri_res = ia64_r13; \ break; \ case _IA64_REG_AR_KR0 ... _IA64_REG_AR_EC: \ asm volatile ("mov %0=ar%1" : "=r" (ia64_intri_res) \ diff -Nru a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h --- a/include/asm-ia64/machvec.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ia64/machvec.h Wed Mar 17 19:29:09 2004 @@ -154,10 +154,10 @@ ia64_mv_dma_unmap_single *dma_unmap_single; ia64_mv_dma_map_sg *dma_map_sg; ia64_mv_dma_unmap_sg *dma_unmap_sg; - ia64_mv_dma_sync_single *dma_sync_single_for_cpu; - ia64_mv_dma_sync_sg *dma_sync_sg_for_cpu; - ia64_mv_dma_sync_single *dma_sync_single_for_device; - ia64_mv_dma_sync_sg *dma_sync_sg_for_device; + ia64_mv_dma_sync_single_for_cpu *dma_sync_single_for_cpu; + ia64_mv_dma_sync_sg_for_cpu *dma_sync_sg_for_cpu; + ia64_mv_dma_sync_single_for_device *dma_sync_single_for_device; + ia64_mv_dma_sync_sg_for_device *dma_sync_sg_for_device; ia64_mv_dma_supported *dma_supported; ia64_mv_irq_desc *irq_desc; ia64_mv_irq_to_vector *irq_to_vector; diff -Nru a/include/asm-ia64/spinlock.h b/include/asm-ia64/spinlock.h --- a/include/asm-ia64/spinlock.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ia64/spinlock.h Wed Mar 17 19:29:09 2004 @@ -61,7 +61,7 @@ "}\n\t" "cmpxchg4.acq r30 = [%1], r30, ar.ccv;;\n\t" "cmp4.ne p14, p0 = r30, r0\n" - "(p14) brl.cond.spnt.many ia64_spinlock_contention_pre3_4" + "(p14) brl.cond.spnt.many ia64_spinlock_contention_pre3_4;;" : "=r"(ptr) : "r"(ptr) : IA64_SPINLOCK_CLOBBERS); # endif /* CONFIG_MCKINLEY */ #else @@ -81,7 +81,7 @@ "mov ar.ccv = r0;;\n\t" "cmpxchg4.acq r30 = [%0], r30, ar.ccv;;\n\t" "cmp4.ne p14, p0 = r30, r0\n\t" - "(p14) brl.call.spnt.many b6=ia64_spinlock_contention" + "(p14) brl.call.spnt.many b6=ia64_spinlock_contention;;" : "=r"(ptr) : "r"(ptr) : IA64_SPINLOCK_CLOBBERS); # endif /* CONFIG_MCKINLEY */ #endif diff -Nru a/include/asm-mips/shmparam.h b/include/asm-mips/shmparam.h --- a/include/asm-mips/shmparam.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-mips/shmparam.h Wed Mar 17 19:29:10 2004 @@ -6,6 +6,8 @@ #ifndef _ASM_SHMPARAM_H #define _ASM_SHMPARAM_H +#define __ARCH_FORCE_SHMLBA 1 + #define SHMLBA 0x40000 /* attach addr a multiple of this */ #endif /* _ASM_SHMPARAM_H */ diff -Nru a/include/asm-parisc/shmparam.h b/include/asm-parisc/shmparam.h --- a/include/asm-parisc/shmparam.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-parisc/shmparam.h Wed Mar 17 19:29:09 2004 @@ -1,6 +1,8 @@ #ifndef _ASMPARISC_SHMPARAM_H #define _ASMPARISC_SHMPARAM_H +#define __ARCH_FORCE_SHMLBA 1 + #define SHMLBA 0x00400000 /* attach addr needs to be 4 Mb aligned */ #endif /* _ASMPARISC_SHMPARAM_H */ diff -Nru a/include/asm-ppc/dma-mapping.h b/include/asm-ppc/dma-mapping.h --- a/include/asm-ppc/dma-mapping.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-ppc/dma-mapping.h Wed Mar 17 19:29:10 2004 @@ -100,17 +100,42 @@ /* We don't do anything here. */ #define dma_unmap_sg(dev, sg, nents, dir) do { } while (0) -static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle, - size_t size, - enum dma_data_direction direction) +static inline void +dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, + size_t size, + enum dma_data_direction direction) { BUG_ON(direction == DMA_NONE); consistent_sync(bus_to_virt(dma_handle), size, direction); } -static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg, - int nelems, enum dma_data_direction direction) +static inline void +dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, + size_t size, + enum dma_data_direction direction) +{ + BUG_ON(direction == DMA_NONE); + + consistent_sync(bus_to_virt(dma_handle), size, direction); +} + +static inline void +dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, + int nelems, enum dma_data_direction direction) +{ + int i; + + BUG_ON(direction == DMA_NONE); + + for (i = 0; i < nelems; i++, sg++) + consistent_sync_page(sg->page, sg->offset, + sg->length, direction); +} + +static inline void +dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, + int nelems, enum dma_data_direction direction) { int i; @@ -137,12 +162,21 @@ } static inline void -dma_sync_single_range(struct device *dev, dma_addr_t dma_handle, - unsigned long offset, size_t size, - enum dma_data_direction direction) +dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + /* just sync everything, that's all the pci API can do */ + dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction); +} + +static inline void +dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) { /* just sync everything, that's all the pci API can do */ - dma_sync_single(dev, dma_handle, offset + size, direction); + dma_sync_single_for_device(dev, dma_handle, offset + size, direction); } static inline void dma_cache_sync(void *vaddr, size_t size, diff -Nru a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h --- a/include/asm-ppc/pci.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-ppc/pci.h Wed Mar 17 19:29:10 2004 @@ -200,7 +200,7 @@ { BUG_ON(direction == PCI_DMA_NONE); - consistent_sync_for_cpu(bus_to_virt(dma_handle), size, direction); + consistent_sync(bus_to_virt(dma_handle), size, direction); } static inline void pci_dma_sync_single_for_device(struct pci_dev *hwdev, @@ -209,7 +209,7 @@ { BUG_ON(direction == PCI_DMA_NONE); - consistent_sync_for_device(bus_to_virt(dma_handle), size, direction); + consistent_sync(bus_to_virt(dma_handle), size, direction); } /* Make physical memory consistent for a set of streaming @@ -227,8 +227,8 @@ BUG_ON(direction == PCI_DMA_NONE); for (i = 0; i < nelems; i++, sg++) - consistent_sync_page_for_cpu(sg->page, sg->offset, - sg->length, direction); + consistent_sync_page(sg->page, sg->offset, + sg->length, direction); } static inline void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, @@ -240,8 +240,8 @@ BUG_ON(direction == PCI_DMA_NONE); for (i = 0; i < nelems; i++, sg++) - consistent_sync_page_for_device(sg->page, sg->offset, - sg->length, direction); + consistent_sync_page(sg->page, sg->offset, + sg->length, direction); } /* Return whether the given PCI device DMA address mask can diff -Nru a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h --- a/include/asm-ppc/unistd.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ppc/unistd.h Wed Mar 17 19:29:09 2004 @@ -415,10 +415,10 @@ int sys_pipe(int __user *fildes); int sys_ptrace(long request, long pid, long addr, long data); struct sigaction; -asmlinkage long sys_rt_sigaction(int sig, - const struct sigaction __user *act, - struct sigaction __user *oact, - size_t sigsetsize); +long sys_rt_sigaction(int sig, + const struct sigaction __user *act, + struct sigaction __user *oact, + size_t sigsetsize); #endif /* __KERNEL_SYSCALLS__ */ diff -Nru a/include/asm-ppc64/dma-mapping.h b/include/asm-ppc64/dma-mapping.h --- a/include/asm-ppc64/dma-mapping.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-ppc64/dma-mapping.h Wed Mar 17 19:29:10 2004 @@ -1 +1,75 @@ -#include +/* Copyright (C) 2004 IBM + * + * Implements the generic device dma API for ppc64. Handles + * the pci and vio busses + */ + +#ifndef _ASM_DMA_MAPPING_H +#define _ASM_DMA_MAPPING_H + +#include +#include +#include +/* need struct page definitions */ +#include +#include +#include + +extern int dma_supported(struct device *dev, u64 mask); +extern int dma_set_mask(struct device *dev, u64 dma_mask); +extern void *dma_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *dma_handle, int flag); +extern void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, + dma_addr_t dma_handle); +extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, + size_t size, enum dma_data_direction direction); +extern void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, + size_t size, enum dma_data_direction direction); +extern dma_addr_t dma_map_page(struct device *dev, struct page *page, + unsigned long offset, size_t size, + enum dma_data_direction direction); +extern void dma_unmap_page(struct device *dev, dma_addr_t dma_address, + size_t size, enum dma_data_direction direction); +extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, + enum dma_data_direction direction); +extern void dma_unmap_sg(struct device *dev, struct scatterlist *sg, + int nhwentries, enum dma_data_direction direction); +extern void dma_sync_single(struct device *dev, dma_addr_t dma_handle, + size_t size, enum dma_data_direction direction); +extern void dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems, + enum dma_data_direction direction); + +/* Now for the API extensions over the pci_ one */ + +#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) +#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) +#define dma_is_consistent(d) (1) + +static inline int +dma_get_cache_alignment(void) +{ + /* no easy way to get cache size on all processors, so return + * the maximum possible, to be safe */ + return (1 << L1_CACHE_SHIFT_MAX); +} + +static inline void +dma_sync_single_range(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + /* just sync everything, that's all the pci API can do */ + dma_sync_single(dev, dma_handle, offset+size, direction); +} + +static inline void +dma_cache_sync(void *vaddr, size_t size, + enum dma_data_direction direction) +{ + /* could define this in terms of the dma_cache ... operations, + * but if you get this on a platform, you should convert the platform + * to using the generic device DMA API */ + BUG(); +} + +#endif /* _ASM_DMA_MAPPING_H */ diff -Nru a/include/asm-ppc64/eeh.h b/include/asm-ppc64/eeh.h --- a/include/asm-ppc64/eeh.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-ppc64/eeh.h Wed Mar 17 19:29:10 2004 @@ -17,15 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Start Change Log - * 2001/10/27 : engebret : Created. - * End Change Log - */ - -#ifndef _EEH_H -#define _EEH_H +#ifndef _PPC64_EEH_H +#define _PPC64_EEH_H #include +#include struct pci_dev; @@ -33,22 +29,43 @@ * a bad page fault if the address is used directly (i.e. these addresses are * never actually mapped. Translation between IO <-> EEH region is 1 to 1. */ -#define IO_TOKEN_TO_ADDR(token) (((unsigned long)(token) & ~(0xfUL << REGION_SHIFT)) | \ - (IO_REGION_ID << REGION_SHIFT)) -#define IO_ADDR_TO_TOKEN(addr) (((unsigned long)(addr) & ~(0xfUL << REGION_SHIFT)) | \ - (EEH_REGION_ID << REGION_SHIFT)) +#define IO_TOKEN_TO_ADDR(token) \ + (((unsigned long)(token) & ~(0xfUL << REGION_SHIFT)) | \ + (IO_REGION_ID << REGION_SHIFT)) + +#define IO_ADDR_TO_TOKEN(addr) \ + (((unsigned long)(addr) & ~(0xfUL << REGION_SHIFT)) | \ + (EEH_REGION_ID << REGION_SHIFT)) /* Values for eeh_mode bits in device_node */ #define EEH_MODE_SUPPORTED (1<<0) #define EEH_MODE_NOCHECK (1<<1) -/* This is for profiling only */ -extern unsigned long eeh_total_mmio_ffs; - -void eeh_init(void); -int eeh_get_state(unsigned long ea); +extern void __init eeh_init(void); unsigned long eeh_check_failure(void *token, unsigned long val); void *eeh_ioremap(unsigned long addr, void *vaddr); +void __init pci_addr_cache_build(void); + +/** + * eeh_add_device - perform EEH initialization for the indicated pci device + * @dev: pci device for which to set up EEH + * + * This routine can be used to perform EEH initialization for PCI + * devices that were added after system boot (e.g. hotplug, dlpar). + * Whether this actually enables EEH or not for this device depends + * on the type of the device, on earlier boot command-line + * arguments & etc. + */ +void eeh_add_device(struct pci_dev *); + +/** + * eeh_remove_device - undo EEH setup for the indicated pci device + * @dev: pci device to be removed + * + * This routine should be when a device is removed from a running + * system (e.g. by hotplug or dlpar). + */ +void eeh_remove_device(struct pci_dev *); #define EEH_DISABLE 0 #define EEH_ENABLE 1 @@ -56,18 +73,8 @@ #define EEH_RELEASE_DMA 3 int eeh_set_option(struct pci_dev *dev, int options); -/* Given a PCI device check if eeh should be configured or not. - * This may look at firmware properties and/or kernel cmdline options. - */ -int is_eeh_configured(struct pci_dev *dev); - -/* Translate a (possible) eeh token to a physical addr. - * If "token" is not an eeh token it is simply returned under - * the assumption that it is already a physical addr. - */ -unsigned long eeh_token_to_phys(unsigned long token); - -/* EEH_POSSIBLE_ERROR() -- test for possible MMIO failure. +/* + * EEH_POSSIBLE_ERROR() -- test for possible MMIO failure. * * Order this macro for performance. * If EEH is off for a device and it is a memory BAR, ioremap will @@ -78,30 +85,22 @@ * If this macro yields TRUE, the caller relays to eeh_check_failure() * which does further tests out of line. */ -/* #define EEH_POSSIBLE_IO_ERROR(val) (~(val) == 0) */ -/* #define EEH_POSSIBLE_ERROR(addr, vaddr, val) ((vaddr) != (addr) && EEH_POSSIBLE_IO_ERROR(val) */ -/* This version is rearranged to collect some profiling data */ -#define EEH_POSSIBLE_IO_ERROR(val) (~(val) == 0 && ++eeh_total_mmio_ffs) -#define EEH_POSSIBLE_ERROR(addr, vaddr, val) (EEH_POSSIBLE_IO_ERROR(val) && (vaddr) != (addr)) +#define EEH_POSSIBLE_IO_ERROR(val, type) ((val) == (type)~0) + +/* The vaddr will equal the addr if EEH checking is disabled for + * this device. This is because eeh_ioremap() will not have + * remapped to 0xA0, and thus both vaddr and addr will be 0xE0... + */ +#define EEH_POSSIBLE_ERROR(addr, vaddr, val, type) \ + ((vaddr) != (addr) && EEH_POSSIBLE_IO_ERROR(val, type)) /* * MMIO read/write operations with EEH support. - * - * addr: 64b token of the form 0xA0PPBBDDyyyyyyyy - * 0xA0 : Unmapped MMIO region - * PP : PHB index (starting at zero) - * BB : PCI Bus number under given PHB - * DD : PCI devfn under given bus - * yyyyyyyy : Virtual address offset - * - * An actual virtual address is produced from this token - * by masking into the form: - * 0xE0000000yyyyyyyy */ static inline u8 eeh_readb(void *addr) { volatile u8 *vaddr = (volatile u8 *)IO_TOKEN_TO_ADDR(addr); u8 val = in_8(vaddr); - if (EEH_POSSIBLE_ERROR(addr, vaddr, val)) + if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u8)) return eeh_check_failure(addr, val); return val; } @@ -109,10 +108,11 @@ volatile u8 *vaddr = (volatile u8 *)IO_TOKEN_TO_ADDR(addr); out_8(vaddr, val); } + static inline u16 eeh_readw(void *addr) { volatile u16 *vaddr = (volatile u16 *)IO_TOKEN_TO_ADDR(addr); u16 val = in_le16(vaddr); - if (EEH_POSSIBLE_ERROR(addr, vaddr, val)) + if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u16)) return eeh_check_failure(addr, val); return val; } @@ -120,10 +120,22 @@ volatile u16 *vaddr = (volatile u16 *)IO_TOKEN_TO_ADDR(addr); out_le16(vaddr, val); } +static inline u16 eeh_raw_readw(void *addr) { + volatile u16 *vaddr = (volatile u16 *)IO_TOKEN_TO_ADDR(addr); + u16 val = in_be16(vaddr); + if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u16)) + return eeh_check_failure(addr, val); + return val; +} +static inline void eeh_raw_writew(u16 val, void *addr) { + volatile u16 *vaddr = (volatile u16 *)IO_TOKEN_TO_ADDR(addr); + out_be16(vaddr, val); +} + static inline u32 eeh_readl(void *addr) { volatile u32 *vaddr = (volatile u32 *)IO_TOKEN_TO_ADDR(addr); u32 val = in_le32(vaddr); - if (EEH_POSSIBLE_ERROR(addr, vaddr, val)) + if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u32)) return eeh_check_failure(addr, val); return val; } @@ -131,10 +143,22 @@ volatile u32 *vaddr = (volatile u32 *)IO_TOKEN_TO_ADDR(addr); out_le32(vaddr, val); } +static inline u32 eeh_raw_readl(void *addr) { + volatile u32 *vaddr = (volatile u32 *)IO_TOKEN_TO_ADDR(addr); + u32 val = in_be32(vaddr); + if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u32)) + return eeh_check_failure(addr, val); + return val; +} +static inline void eeh_raw_writel(u32 val, void *addr) { + volatile u32 *vaddr = (volatile u32 *)IO_TOKEN_TO_ADDR(addr); + out_be32(vaddr, val); +} + static inline u64 eeh_readq(void *addr) { volatile u64 *vaddr = (volatile u64 *)IO_TOKEN_TO_ADDR(addr); u64 val = in_le64(vaddr); - if (EEH_POSSIBLE_ERROR(addr, vaddr, val)) + if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u64)) return eeh_check_failure(addr, val); return val; } @@ -142,6 +166,17 @@ volatile u64 *vaddr = (volatile u64 *)IO_TOKEN_TO_ADDR(addr); out_le64(vaddr, val); } +static inline u64 eeh_raw_readq(void *addr) { + volatile u64 *vaddr = (volatile u64 *)IO_TOKEN_TO_ADDR(addr); + u64 val = in_be64(vaddr); + if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u64)) + return eeh_check_failure(addr, val); + return val; +} +static inline void eeh_raw_writeq(u64 val, void *addr) { + volatile u64 *vaddr = (volatile u64 *)IO_TOKEN_TO_ADDR(addr); + out_be64(vaddr, val); +} static inline void eeh_memset_io(void *addr, int c, unsigned long n) { void *vaddr = (void *)IO_TOKEN_TO_ADDR(addr); @@ -150,8 +185,15 @@ static inline void eeh_memcpy_fromio(void *dest, void *src, unsigned long n) { void *vsrc = (void *)IO_TOKEN_TO_ADDR(src); memcpy(dest, vsrc, n); - /* look for ffff's here at dest[n] */ + /* Look for ffff's here at dest[n]. Assume that at least 4 bytes + * were copied. Check all four bytes. + */ + if ((n >= 4) && + (EEH_POSSIBLE_ERROR(src, vsrc, (*((u32 *) dest+n-4)), u32))) { + eeh_check_failure(src, (*((u32 *) dest+n-4))); + } } + static inline void eeh_memcpy_toio(void *dest, void *src, unsigned long n) { void *vdest = (void *)IO_TOKEN_TO_ADDR(dest); memcpy(vdest, src, n); @@ -169,8 +211,8 @@ if (_IO_IS_ISA(port) && !_IO_HAS_ISA_BUS) return ~0; val = in_8((u8 *)(port+pci_io_base)); - if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR(val)) - return eeh_check_failure((void*)(port+pci_io_base), val); + if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR(val, u8)) + return eeh_check_failure((void*)(port), val); return val; } @@ -184,8 +226,8 @@ if (_IO_IS_ISA(port) && !_IO_HAS_ISA_BUS) return ~0; val = in_le16((u16 *)(port+pci_io_base)); - if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR(val)) - return eeh_check_failure((void*)(port+pci_io_base), val); + if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR(val, u16)) + return eeh_check_failure((void*)(port), val); return val; } @@ -199,8 +241,8 @@ if (_IO_IS_ISA(port) && !_IO_HAS_ISA_BUS) return ~0; val = in_le32((u32 *)(port+pci_io_base)); - if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR(val)) - return eeh_check_failure((void*)(port+pci_io_base), val); + if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR(val, u32)) + return eeh_check_failure((void*)(port), val); return val; } @@ -209,4 +251,23 @@ return out_le32((u32 *)(port+pci_io_base), val); } -#endif /* _EEH_H */ +/* in-string eeh macros */ +static inline void eeh_insb(unsigned long port, void * buf, int ns) { + _insb((u8 *)(port+pci_io_base), buf, ns); + if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR((*(((u8*)buf)+ns-1)), u8)) + eeh_check_failure((void*)(port), *(u8*)buf); +} + +static inline void eeh_insw_ns(unsigned long port, void * buf, int ns) { + _insw_ns((u16 *)(port+pci_io_base), buf, ns); + if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR((*(((u16*)buf)+ns-1)), u16)) + eeh_check_failure((void*)(port), *(u16*)buf); +} + +static inline void eeh_insl_ns(unsigned long port, void * buf, int nl) { + _insl_ns((u32 *)(port+pci_io_base), buf, nl); + if (!_IO_IS_ISA(port) && EEH_POSSIBLE_IO_ERROR((*(((u32*)buf)+nl-1)), u32)) + eeh_check_failure((void*)(port), *(u32*)buf); +} + +#endif /* _PPC64_EEH_H */ diff -Nru a/include/asm-ppc64/hvcall.h b/include/asm-ppc64/hvcall.h --- a/include/asm-ppc64/hvcall.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ppc64/hvcall.h Wed Mar 17 19:29:09 2004 @@ -4,6 +4,14 @@ #define H_Success 0 #define H_Busy 1 /* Hardware busy -- retry later */ #define H_Constrained 4 /* Resource request constrained to max allowed */ +#define H_LongBusyStartRange 9900 /* Start of long busy range */ +#define H_LongBusyOrder1msec 9900 /* Long busy, hint that 1msec is a good time to retry */ +#define H_LongBusyOrder10msec 9901 /* Long busy, hint that 10msec is a good time to retry */ +#define H_LongBusyOrder100msec 9902 /* Long busy, hint that 100msec is a good time to retry */ +#define H_LongBusyOrder1sec 9903 /* Long busy, hint that 1sec is a good time to retry */ +#define H_LongBusyOrder10sec 9904 /* Long busy, hint that 10sec is a good time to retry */ +#define H_LongBusyOrder100sec 9905 /* Long busy, hint that 100sec is a good time to retry */ +#define H_LongBusyEndRange 9905 /* End of long busy range */ #define H_Hardware -1 /* Hardware error */ #define H_Function -2 /* Function not supported */ #define H_Privilege -3 /* Caller not privileged */ @@ -21,6 +29,16 @@ #define H_RemoteParm -15 #define H_Resource -16 +/* Long Busy is a condition that can be returned by the firmware + * when a call cannot be completed now, but the identical call + * should be retried later. This prevents calls blocking in the + * firmware for long periods of time. Annoyingly the firmware can return + * a range of return codes, hinting at how long we should wait before + * retrying. If you don't care for the hint, the macro below is a good + * way to check for the long_busy return codes + */ +#define H_isLongBusy(x) ((x >= H_LongBusyStartRange) && (x <= H_LongBusyEndRange)) + /* Flags */ #define H_LARGE_PAGE (1UL<<(63-16)) #define H_EXACT (1UL<<(63-24)) /* Use exact PTE or return H_PTEG_FULL */ @@ -76,7 +94,7 @@ #define H_PROD 0xE8 #define H_GET_PPP 0xEC #define H_SET_PPP 0xF0 -#define H_SET_PURR 0xF4 +#define H_PURR 0xF4 #define H_PIC 0xF8 #define H_REG_CRQ 0xFC #define H_FREE_CRQ 0x100 @@ -84,6 +102,9 @@ #define H_SEND_CRQ 0x108 #define H_COPY_RDMA 0x110 #define H_POLL_PENDING 0x1D8 +#define H_VTERM_PARTNER_INFO 0x150 +#define H_REGISTER_VTERM 0x154 +#define H_FREE_VTERM 0x158 /* plpar_hcall() -- Generic call interface using above opcodes * diff -Nru a/include/asm-ppc64/iSeries/iSeries_proc.h b/include/asm-ppc64/iSeries/iSeries_proc.h --- a/include/asm-ppc64/iSeries/iSeries_proc.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ppc64/iSeries/iSeries_proc.h Wed Mar 17 19:29:09 2004 @@ -19,12 +19,6 @@ #ifndef _ISERIES_PROC_H #define _ISERIES_PROC_H -#include - extern void iSeries_proc_early_init(void); - -typedef void (*iSeriesProcFunction)(struct proc_dir_entry *iSeries_proc); - -extern void iSeries_proc_callback(iSeriesProcFunction initFunction); #endif /* _iSeries_PROC_H */ diff -Nru a/include/asm-ppc64/iSeries/mf.h b/include/asm-ppc64/iSeries/mf.h --- a/include/asm-ppc64/iSeries/mf.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ppc64/iSeries/mf.h Wed Mar 17 19:29:09 2004 @@ -67,6 +67,4 @@ extern int mf_getRtc( struct rtc_time * tm ); extern int mf_setRtc( struct rtc_time * tm ); -extern void mf_proc_init(struct proc_dir_entry *iSeries_proc); - #endif /* MF_H_INCLUDED */ diff -Nru a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h --- a/include/asm-ppc64/io.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-ppc64/io.h Wed Mar 17 19:29:10 2004 @@ -58,6 +58,13 @@ #define outb(data,addr) writeb(data,((unsigned long)(addr))) #define outw(data,addr) writew(data,((unsigned long)(addr))) #define outl(data,addr) writel(data,((unsigned long)(addr))) +/* + * The *_ns versions below don't do byte-swapping. + * Neither do the standard versions now, these are just here + * for older code. + */ +#define insw_ns(port, buf, ns) _insw_ns((u16 *)((port)+pci_io_base), (buf), (ns)) +#define insl_ns(port, buf, nl) _insl_ns((u32 *)((port)+pci_io_base), (buf), (nl)) #else #define __raw_readb(addr) (*(volatile unsigned char *)(addr)) #define __raw_readw(addr) (*(volatile unsigned short *)(addr)) @@ -90,12 +97,16 @@ * They are only used in practice for transferring buffers which * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insb(port, buf, ns) _insb((u8 *)((port)+pci_io_base), (buf), (ns)) -#define outsb(port, buf, ns) _outsb((u8 *)((port)+pci_io_base), (buf), (ns)) -#define insw(port, buf, ns) _insw_ns((u16 *)((port)+pci_io_base), (buf), (ns)) -#define outsw(port, buf, ns) _outsw_ns((u16 *)((port)+pci_io_base), (buf), (ns)) -#define insl(port, buf, nl) _insl_ns((u32 *)((port)+pci_io_base), (buf), (nl)) -#define outsl(port, buf, nl) _outsl_ns((u32 *)((port)+pci_io_base), (buf), (nl)) +#define insb(port, buf, ns) eeh_insb((port), (buf), (ns)) +#define insw(port, buf, ns) eeh_insw_ns((port), (buf), (ns)) +#define insl(port, buf, nl) eeh_insl_ns((port), (buf), (nl)) +#define insw_ns(port, buf, ns) eeh_insw_ns((port), (buf), (ns)) +#define insl_ns(port, buf, nl) eeh_insl_ns((port), (buf), (nl)) + +#define outsb(port, buf, ns) _outsb((u8 *)((port)+pci_io_base), (buf), (ns)) +#define outsw(port, buf, ns) _outsw_ns((u16 *)((port)+pci_io_base), (buf), (ns)) +#define outsl(port, buf, nl) _outsl_ns((u32 *)((port)+pci_io_base), (buf), (nl)) + #endif #define readb_relaxed(addr) readb(addr) @@ -130,9 +141,7 @@ * Neither do the standard versions now, these are just here * for older code. */ -#define insw_ns(port, buf, ns) _insw_ns((u16 *)((port)+pci_io_base), (buf), (ns)) #define outsw_ns(port, buf, ns) _outsw_ns((u16 *)((port)+pci_io_base), (buf), (ns)) -#define insl_ns(port, buf, nl) _insl_ns((u32 *)((port)+pci_io_base), (buf), (nl)) #define outsl_ns(port, buf, nl) _outsl_ns((u32 *)((port)+pci_io_base), (buf), (nl)) @@ -204,6 +213,9 @@ /* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. + * These routines do not perform EEH-related I/O address translation, + * and should not be used directly by device drivers. Use inb/readb + * instead. */ static inline int in_8(volatile unsigned char *addr) { diff -Nru a/include/asm-ppc64/pmc.h b/include/asm-ppc64/pmc.h --- a/include/asm-ppc64/pmc.h Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,113 +0,0 @@ -/* - * pmc.h - * Copyright (C) 2001 Dave Engebretsen & Mike Corrigan IBM Corporation. - * - * The PPC64 PMC subsystem encompases both the hardware PMC registers and - * a set of software event counters. An interface is provided via the - * proc filesystem which can be used to access this subsystem. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* Start Change Log - * 2001/06/05 : engebret : Created. - * End Change Log - */ - -#ifndef _PPC64_TYPES_H -#include -#endif - -#ifndef _PMC_H -#define _PMC_H - -#define STAB_ENTRY_MAX 64 - -struct _pmc_hw -{ - u64 mmcr0; - u64 mmcr1; - u64 mmcra; - - u64 pmc1; - u64 pmc2; - u64 pmc3; - u64 pmc4; - u64 pmc5; - u64 pmc6; - u64 pmc7; - u64 pmc8; -}; - -struct _pmc_sw -{ - u64 stab_faults; /* Count of faults on the stab */ - u64 stab_capacity_castouts;/* Count of castouts from the stab */ - u64 stab_invalidations; /* Count of invalidations from the */ - /* stab, not including castouts */ - u64 stab_entry_use[STAB_ENTRY_MAX]; - - u64 htab_primary_overflows; - u64 htab_capacity_castouts; - u64 htab_read_to_write_fault; -}; - -#define PMC_HW_TEXT_ENTRY_COUNT (sizeof(struct _pmc_hw) / sizeof(u64)) -#define PMC_SW_TEXT_ENTRY_COUNT (sizeof(struct _pmc_sw) / sizeof(u64)) -#define PMC_TEXT_ENTRY_SIZE 64 - -struct _pmc_sw_text { - char buffer[PMC_SW_TEXT_ENTRY_COUNT * PMC_TEXT_ENTRY_SIZE]; -}; - -struct _pmc_hw_text { - char buffer[PMC_HW_TEXT_ENTRY_COUNT * PMC_TEXT_ENTRY_SIZE]; -}; - -extern struct _pmc_sw pmc_sw_system; -extern struct _pmc_sw pmc_sw_cpu[]; - -extern struct _pmc_sw_text pmc_sw_text; -extern struct _pmc_hw_text pmc_hw_text; -extern char *ppc64_pmc_stab(int file); -extern char *ppc64_pmc_htab(int file); -extern char *ppc64_pmc_hw(int file); - -#if 1 -#define PMC_SW_PROCESSOR(F) pmc_sw_cpu[smp_processor_id()].F++ -#define PMC_SW_PROCESSOR_A(F, E) (pmc_sw_cpu[smp_processor_id()].F[(E)])++ -#define PMC_SW_SYSTEM(F) pmc_sw_system.F++ -#else -#define PMC_SW_PROCESSOR(F) do {;} while (0) -#define PMC_SW_PROCESSOR_A(F) do {;} while (0) -#define PMC_SW_SYSTEM(F) do {;} while (0) -#endif - -#define MMCR0 795 -#define MMCR1 798 -#define MMCRA 786 -#define PMC1 787 -#define PMC2 788 -#define PMC3 789 -#define PMC4 790 -#define PMC5 791 -#define PMC6 792 -#define PMC7 793 -#define PMC8 794 - -#define PMC_CONTROL_CPI 1 -#define PMC_CONTROL_TLB 2 - -#endif /* _PMC_H */ diff -Nru a/include/asm-ppc64/proc_fs.h b/include/asm-ppc64/proc_fs.h --- a/include/asm-ppc64/proc_fs.h Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,39 +0,0 @@ -#ifndef _PPC64_PROC_FS_H -#define _PPC64_PROC_FS_H -/* - * proc_fs.h - * Copyright (C) 2001 Mike Corrigan IBM Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* Change Activity: */ -/* tgall -- merge of iSeries/iSeries_proc.h and proc_pmc.h */ -/* End Change Activity */ - -#include - -struct proc_ppc64_t { - struct proc_dir_entry *root; - struct proc_dir_entry *naca; - struct proc_dir_entry *paca; - struct proc_dir_entry *systemcfg; - struct proc_dir_entry *rtas; -}; - -extern struct proc_ppc64_t proc_ppc64; -extern int proc_ppc64_init(void); - -#endif /* _PPC64_PROC_FS_H */ diff -Nru a/include/asm-ppc64/proc_pmc.h b/include/asm-ppc64/proc_pmc.h --- a/include/asm-ppc64/proc_pmc.h Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,33 +0,0 @@ -/* - * pmc_proc.h - * Copyright (C) 2001 Mike Corrigan IBM Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -/* Change Activity: */ -/* End Change Activity */ - -#ifndef _PMC_PROC_H -#define _PMC_PROC_H - -#include - -void pmc_proc_init(struct proc_dir_entry *iSeries_proc); -void proc_ppc64_init(void); - -#endif /* _PMC_PROC_H */ - diff -Nru a/include/asm-ppc64/rtas.h b/include/asm-ppc64/rtas.h --- a/include/asm-ppc64/rtas.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-ppc64/rtas.h Wed Mar 17 19:29:10 2004 @@ -177,6 +177,7 @@ extern void rtas_halt(void); extern int rtas_get_sensor(int sensor, int index, int *state); extern int rtas_get_power_level(int powerdomain, int *level); +extern int rtas_set_power_level(int powerdomain, int level, int *setlevel); extern int rtas_set_indicator(int indicator, int index, int new_value); /* Given an RTAS status code of 9900..9905 compute the hinted delay */ diff -Nru a/include/asm-ppc64/unistd.h b/include/asm-ppc64/unistd.h --- a/include/asm-ppc64/unistd.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ppc64/unistd.h Wed Mar 17 19:29:09 2004 @@ -274,10 +274,6 @@ #ifndef __ASSEMBLY__ -#include -#include -#include - /* On powerpc a system call basically clobbers the same registers like a * function call, with the exception of LR (which is needed for the * "sc; bnslr" sequence) and CR (where only CR0.SO is clobbered to signal @@ -401,22 +397,17 @@ */ static inline _syscall3(int, execve, __const__ char *, file, char **, argv, char **,envp) -static inline _syscall3(int, open, __const__ char *, file, int, flag, int, mode) -static inline _syscall1(int, close, int, fd) -static inline _syscall1(int, dup, int, fd) -static inline _syscall3(int, read, int, fd, char *, buf , off_t, count) -static inline _syscall3(int, write, int, fd, __const__ char *, buf, off_t, - count) -static inline _syscall0(pid_t, setsid) -static inline _syscall3(off_t, lseek, int, fd, off_t, offset, int, count) -static inline _syscall3(pid_t, waitpid, pid_t, pid, int *, wait_stat, int, - options) #endif /* __KERNEL_SYSCALLS__ */ -asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len, - unsigned long prot, unsigned long flags, - unsigned long fd, off_t offset); +#ifdef __KERNEL__ + +#include +#include +#include + +unsigned long sys_mmap(unsigned long addr, size_t len, unsigned long prot, + unsigned long flags, unsigned long fd, off_t offset); struct pt_regs; int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3, unsigned long a4, unsigned long a5, @@ -430,13 +421,11 @@ int sys_vfork(unsigned long p1, unsigned long p2, unsigned long p3, unsigned long p4, unsigned long p5, unsigned long p6, struct pt_regs *regs); -asmlinkage int sys_pipe(int *fildes); +int sys_pipe(int *fildes); int sys_ptrace(long request, long pid, long addr, long data); struct sigaction; -asmlinkage long sys_rt_sigaction(int sig, - const struct sigaction __user *act, - struct sigaction __user *oact, - size_t sigsetsize); +long sys_rt_sigaction(int sig, const struct sigaction __user *act, + struct sigaction __user *oact, size_t sigsetsize); /* * "Conditional" syscalls @@ -445,6 +434,8 @@ * but it doesn't work on all toolchains, so we just do it by hand */ #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall"); + +#endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ diff -Nru a/include/asm-ppc64/vio.h b/include/asm-ppc64/vio.h --- a/include/asm-ppc64/vio.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-ppc64/vio.h Wed Mar 17 19:29:09 2004 @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -44,8 +45,11 @@ void vio_unregister_driver(struct vio_driver *drv); const struct vio_device_id * vio_match_device(const struct vio_device_id *ids, const struct vio_dev *dev); + struct vio_dev * __devinit vio_register_device(struct device_node *node_vdev); void __devinit vio_unregister_device(struct vio_dev *dev); +struct vio_dev *vio_find_node(struct device_node *vnode); + const void * vio_get_attribute(struct vio_dev *vdev, void* which, int* length); int vio_get_irq(struct vio_dev *dev); struct iommu_table * vio_build_iommu_table(struct vio_dev *dev); @@ -64,6 +68,33 @@ dma_addr_t *dma_handle); void vio_free_consistent(struct vio_dev *dev, size_t size, void *vaddr, dma_addr_t dma_handle); + +static inline int vio_dma_supported(struct vio_dev *hwdev, u64 mask) +{ + return 1; +} + +#define vio_map_page(dev, page, off, size, dir) \ + vio_map_single(dev, (page_address(page) + (off)), size, dir) +#define vio_unmap_page(dev,addr,sz,dir) vio_unmap_single(dev,addr,sz,dir) + + +static inline void vio_dma_sync_single(struct vio_dev *hwdev, + dma_addr_t dma_handle, + size_t size, int direction) +{ + BUG_ON(direction == PCI_DMA_NONE); + /* nothing to do */ +} + +static inline void vio_dma_sync_sg(struct vio_dev *hwdev, + struct scatterlist *sg, + int nelems, int direction) +{ + BUG_ON(direction == PCI_DMA_NONE); + /* nothing to do */ +} +static inline int vio_set_dma_mask(struct vio_dev *dev, u64 mask) { return -EIO; } extern struct bus_type vio_bus_type; diff -Nru a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h --- a/include/asm-s390/bitops.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-s390/bitops.h Wed Mar 17 19:29:09 2004 @@ -532,7 +532,7 @@ * Find-bit routines.. */ static inline int -find_first_zero_bit(unsigned long * addr, unsigned int size) +find_first_zero_bit(const unsigned long * addr, unsigned int size) { unsigned long cmp, count; unsigned int res; @@ -571,7 +571,7 @@ } static inline int -find_first_bit(unsigned long * addr, unsigned int size) +find_first_bit(const unsigned long * addr, unsigned int size) { unsigned long cmp, count; unsigned int res; @@ -610,7 +610,7 @@ } static inline int -find_next_zero_bit (unsigned long * addr, int size, int offset) +find_next_zero_bit (const unsigned long * addr, int size, int offset) { unsigned long * p = ((unsigned long *) addr) + (offset >> 5); unsigned long bitvec, reg; @@ -649,7 +649,7 @@ } static inline int -find_next_bit (unsigned long * addr, int size, int offset) +find_next_bit (const unsigned long * addr, int size, int offset) { unsigned long * p = ((unsigned long *) addr) + (offset >> 5); unsigned long bitvec, reg; @@ -693,7 +693,7 @@ * Find-bit routines.. */ static inline unsigned long -find_first_zero_bit(unsigned long * addr, unsigned long size) +find_first_zero_bit(const unsigned long * addr, unsigned long size) { unsigned long res, cmp, count; @@ -735,7 +735,7 @@ } static inline unsigned long -find_first_bit(unsigned long * addr, unsigned long size) +find_first_bit(const unsigned long * addr, unsigned long size) { unsigned long res, cmp, count; @@ -777,7 +777,7 @@ } static inline unsigned long -find_next_zero_bit (unsigned long * addr, unsigned long size, unsigned long offset) +find_next_zero_bit (const unsigned long * addr, unsigned long size, unsigned long offset) { unsigned long * p = ((unsigned long *) addr) + (offset >> 6); unsigned long bitvec, reg; @@ -821,7 +821,7 @@ } static inline unsigned long -find_next_bit (unsigned long * addr, unsigned long size, unsigned long offset) +find_next_bit (const unsigned long * addr, unsigned long size, unsigned long offset) { unsigned long * p = ((unsigned long *) addr) + (offset >> 6); unsigned long bitvec, reg; diff -Nru a/include/asm-s390/cio.h b/include/asm-s390/cio.h --- a/include/asm-s390/cio.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-s390/cio.h Wed Mar 17 19:29:10 2004 @@ -132,6 +132,7 @@ #define CCW_CMD_SENSE_PGID 0x34 #define CCW_CMD_SUSPEND_RECONN 0x5B #define CCW_CMD_RDC 0x64 +#define CCW_CMD_RELEASE 0x94 #define CCW_CMD_SET_PGID 0xAF #define CCW_CMD_SENSE_ID 0xE4 #define CCW_CMD_DCTL 0xF3 diff -Nru a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h --- a/include/asm-s390/lowcore.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-s390/lowcore.h Wed Mar 17 19:29:09 2004 @@ -44,6 +44,10 @@ #define __LC_PGM_ILC 0x08C #define __LC_PGM_INT_CODE 0x08E +#define __LC_PER_ATMID 0x096 +#define __LC_PER_ADDRESS 0x098 +#define __LC_PER_ACCESS_ID 0x0A1 + #define __LC_SUBCHANNEL_ID 0x0B8 #define __LC_SUBCHANNEL_NR 0x0BA #define __LC_IO_INT_PARM 0x0BC diff -Nru a/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h --- a/include/asm-s390/ptrace.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-s390/ptrace.h Wed Mar 17 19:29:09 2004 @@ -277,6 +277,14 @@ PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK | \ PSW_MASK_PSTATE) +/* This macro merges a NEW PSW mask specified by the user into + the currently active PSW mask CURRENT, modifying only those + bits in CURRENT that the user may be allowed to change: this + is the condition code and the program mask bits. */ +#define PSW_MASK_MERGE(CURRENT,NEW) \ + (((CURRENT) & ~(PSW_MASK_CC|PSW_MASK_PM)) | \ + ((NEW) & (PSW_MASK_CC|PSW_MASK_PM))) + /* * The first entries in pt_regs and user_regs_struct * are common for the two structures. The s390_regs structure diff -Nru a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h --- a/include/asm-s390/unistd.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-s390/unistd.h Wed Mar 17 19:29:10 2004 @@ -256,12 +256,15 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) #define __NR_clock_nanosleep (__NR_timer_create+8) + /* * Number 263 is reserved for vserver */ #define __NR_fadvise64_64 264 +#define __NR_statfs64 265 +#define __NR_fstatfs64 266 -#define NR_syscalls 265 +#define NR_syscalls 267 /* * There are some system calls that are not present on 64 bit, some diff -Nru a/include/asm-sparc/shmparam.h b/include/asm-sparc/shmparam.h --- a/include/asm-sparc/shmparam.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-sparc/shmparam.h Wed Mar 17 19:29:10 2004 @@ -2,6 +2,8 @@ #ifndef _ASMSPARC_SHMPARAM_H #define _ASMSPARC_SHMPARAM_H +#define __ARCH_FORCE_SHMLBA 1 + extern int vac_cache_size; #define SHMLBA (vac_cache_size ? vac_cache_size : \ (sparc_cpu_model == sun4c ? (64 * 1024) : \ diff -Nru a/include/asm-sparc/thread_info.h b/include/asm-sparc/thread_info.h --- a/include/asm-sparc/thread_info.h Wed Mar 17 19:29:10 2004 +++ b/include/asm-sparc/thread_info.h Wed Mar 17 19:29:10 2004 @@ -100,9 +100,6 @@ * Size of kernel stack for each process. * Observe the order of get_free_pages() in alloc_thread_info(). * The sun4 has 8K stack too, because it's short on memory, and 16K is a waste. - * - * XXX Watch how INIT_THREAD_SIZE evolves in linux/sched.h and elsewhere. - * On 2.5.24 it happens to match 8192 magically. */ #define THREAD_SIZE 8192 diff -Nru a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h --- a/include/asm-sparc64/shmparam.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-sparc64/shmparam.h Wed Mar 17 19:29:09 2004 @@ -4,6 +4,7 @@ #include +#define __ARCH_FORCE_SHMLBA 1 /* attach addr a multiple of this */ #define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE) diff -Nru a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h --- a/include/asm-um/processor-generic.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-um/processor-generic.h Wed Mar 17 19:29:09 2004 @@ -94,8 +94,6 @@ .request = { 0 } \ } -#define INIT_THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE) - typedef struct { unsigned long seg; } mm_segment_t; diff -Nru a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h --- a/include/asm-x86_64/bitops.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-x86_64/bitops.h Wed Mar 17 19:29:09 2004 @@ -503,6 +503,8 @@ /* find last set bit */ #define fls(x) generic_fls(x) +#define ARCH_HAS_ATOMIC_UNSIGNED 1 + #endif /* __KERNEL__ */ #endif /* _X86_64_BITOPS_H */ diff -Nru a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h --- a/include/asm-x86_64/smp.h Wed Mar 17 19:29:09 2004 +++ b/include/asm-x86_64/smp.h Wed Mar 17 19:29:09 2004 @@ -48,6 +48,7 @@ extern void zap_low_mappings(void); void smp_stop_cpu(void); extern char cpu_sibling_map[]; +extern char phys_proc_id[NR_CPUS]; #define SMP_TRAMPOLINE_BASE 0x6000 diff -Nru a/include/linux/brlvger.h b/include/linux/brlvger.h --- a/include/linux/brlvger.h Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,54 +0,0 @@ -/* - * Tieman Voyager braille display USB driver. - * - * Copyright 2001-2002 Stephane Dalton - * and Stéphane Doyon - * Maintained by Stéphane Doyon . - */ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _LINUX_BRLVGER_H -#define _LINUX_BRLVGER_H - -/* Ioctl request codes */ -#define BRLVGER_GET_INFO 0 -#define BRLVGER_DISPLAY_ON 2 -#define BRLVGER_DISPLAY_OFF 3 -#define BRLVGER_BUZZ 4 - -/* Base minor for the char devices */ -#define BRLVGER_MINOR 128 - -/* Size of some fields */ -#define BRLVGER_HWVER_SIZE 2 -#define BRLVGER_FWVER_SIZE 200 /* arbitrary, a long string */ -#define BRLVGER_SERIAL_BIN_SIZE 8 -#define BRLVGER_SERIAL_SIZE ((2*BRLVGER_SERIAL_BIN_SIZE)+1) - -struct brlvger_info { - __u8 driver_version[12]; - __u8 driver_banner[200]; - - __u32 display_length; - /* All other char[] fields are strings except this one. - Hardware version: first byte is major, second byte is minor. */ - __u8 hwver[BRLVGER_HWVER_SIZE]; - __u8 fwver[BRLVGER_FWVER_SIZE]; - __u8 serialnum[BRLVGER_SERIAL_SIZE]; -}; - -#endif diff -Nru a/include/linux/cdrom.h b/include/linux/cdrom.h --- a/include/linux/cdrom.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/cdrom.h Wed Mar 17 19:29:09 2004 @@ -722,7 +722,9 @@ /* * feature profile */ -#define CDF_MRW 0x28 +#define CDF_RWRT 0x0020 /* "Random Writable" */ +#define CDF_HWDM 0x0024 /* "Hardware Defect Management" */ +#define CDF_MRW 0x0028 /* * media status bits @@ -771,6 +773,34 @@ __u8 reserved5; }; +/* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */ +struct rwrt_feature_desc { + __u16 feature_code; +#if defined(__BIG_ENDIAN_BITFIELD) + __u8 reserved1 : 2; + __u8 feature_version : 4; + __u8 persistent : 1; + __u8 curr : 1; +#elif defined(__LITTLE_ENDIAN_BITFIELD) + __u8 curr : 1; + __u8 persistent : 1; + __u8 feature_version : 4; + __u8 reserved1 : 2; +#endif + __u8 add_len; + __u32 last_lba; + __u32 block_size; + __u16 blocking; +#if defined(__BIG_ENDIAN_BITFIELD) + __u8 reserved2 : 7; + __u8 page_present : 1; +#elif defined(__LITTLE_ENDIAN_BITFIELD) + __u8 page_present : 1; + __u8 reserved2 : 7; +#endif + __u8 reserved3; +}; + typedef struct { __u16 disc_information_length; #if defined(__BIG_ENDIAN_BITFIELD) @@ -1140,6 +1170,7 @@ extern int cdrom_get_media_event(struct cdrom_device_info *cdi, struct media_event_desc *med); extern int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write); +extern int cdrom_is_random_writable(struct cdrom_device_info *cdi, int *write); #endif /* End of kernel only stuff */ diff -Nru a/include/linux/hiddev.h b/include/linux/hiddev.h --- a/include/linux/hiddev.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/hiddev.h Wed Mar 17 19:29:09 2004 @@ -39,33 +39,33 @@ }; struct hiddev_devinfo { - unsigned int bustype; - unsigned int busnum; - unsigned int devnum; - unsigned int ifnum; - short vendor; - short product; - short version; - unsigned num_applications; + __u32 bustype; + __u32 busnum; + __u32 devnum; + __u32 ifnum; + __s16 vendor; + __s16 product; + __s16 version; + __u32 num_applications; }; struct hiddev_collection_info { - unsigned index; - unsigned type; - unsigned usage; - unsigned level; + __u32 index; + __u32 type; + __u32 usage; + __u32 level; }; #define HID_STRING_SIZE 256 struct hiddev_string_descriptor { - int index; + __s32 index; char value[HID_STRING_SIZE]; }; struct hiddev_report_info { - unsigned report_type; - unsigned report_id; - unsigned num_fields; + __u32 report_type; + __u32 report_id; + __u32 num_fields; }; /* To do a GUSAGE/SUSAGE, fill in at least usage_code, report_type and @@ -88,20 +88,20 @@ #define HID_REPORT_TYPE_MAX 3 struct hiddev_field_info { - unsigned report_type; - unsigned report_id; - unsigned field_index; - unsigned maxusage; - unsigned flags; - unsigned physical; /* physical usage for this field */ - unsigned logical; /* logical usage for this field */ - unsigned application; /* application usage for this field */ + __u32 report_type; + __u32 report_id; + __u32 field_index; + __u32 maxusage; + __u32 flags; + __u32 physical; /* physical usage for this field */ + __u32 logical; /* logical usage for this field */ + __u32 application; /* application usage for this field */ __s32 logical_minimum; __s32 logical_maximum; __s32 physical_minimum; __s32 physical_maximum; - unsigned unit_exponent; - unsigned unit; + __u32 unit_exponent; + __u32 unit; }; /* Fill in report_type, report_id and field_index to get the information on a @@ -118,14 +118,22 @@ #define HID_FIELD_BUFFERED_BYTE 0x100 struct hiddev_usage_ref { - unsigned report_type; - unsigned report_id; - unsigned field_index; - unsigned usage_index; - unsigned usage_code; + __u32 report_type; + __u32 report_id; + __u32 field_index; + __u32 usage_index; + __u32 usage_code; __s32 value; }; +/* hiddev_usage_ref_multi is used for sending multiple bytes to a control. + * It really manifests itself as setting the value of consecutive usages */ +struct hiddev_usage_ref_multi { + struct hiddev_usage_ref uref; + __u32 num_values; + __s32 values[HID_MAX_USAGES]; +}; + /* FIELD_INDEX_NONE is returned in read() data from the kernel when flags * is set to (HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT) and a new report has * been sent by the device @@ -160,6 +168,10 @@ #define HIDIOCGCOLLECTIONINDEX _IOW('H', 0x10, struct hiddev_usage_ref) #define HIDIOCGCOLLECTIONINFO _IOWR('H', 0x11, struct hiddev_collection_info) #define HIDIOCGPHYS(len) _IOC(_IOC_READ, 'H', 0x12, len) + +/* For writing/reading to multiple/consecutive usages */ +#define HIDIOCGUSAGES _IOWR('H', 0x13, struct hiddev_usage_ref_multi) +#define HIDIOCSUSAGES _IOW('H', 0x14, struct hiddev_usage_ref_multi) /* * Flags to be used in HIDIOCSFLAG diff -Nru a/include/linux/ide.h b/include/linux/ide.h --- a/include/linux/ide.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/ide.h Wed Mar 17 19:29:09 2004 @@ -742,8 +742,6 @@ u64 capacity64; /* total number of sectors */ - int last_lun; /* last logical unit */ - int forced_lun; /* if hdxlun was given at boot */ int lun; /* logical unit */ int crc_count; /* crc counter to reduce drive speed */ struct list_head list; @@ -937,7 +935,6 @@ int mmio; /* hosts iomio (0), mmio (1) or custom (2) select */ int rqsize; /* max sectors per request */ int irq; /* our irq number */ - int initializing; /* set while initializing self */ unsigned long dma_master; /* reference base addr dmabase */ unsigned long dma_base; /* base addr for dma ports */ @@ -1612,6 +1609,7 @@ extern char *ide_xfer_verbose(u8 xfer_rate); extern void ide_toggle_bounce(ide_drive_t *drive, int on); extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate); +extern byte ide_dump_atapi_status(ide_drive_t *drive, const char *msg, byte stat); typedef struct ide_pio_timings_s { int setup_time; /* Address setup (ns) minimum */ diff -Nru a/include/linux/init.h b/include/linux/init.h --- a/include/linux/init.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/init.h Wed Mar 17 19:29:09 2004 @@ -110,12 +110,21 @@ }; /* OBSOLETE: see moduleparam.h for the right way. */ -#define __setup(str, fn) \ - static char __setup_str_##fn[] __initdata = str; \ - static struct obs_kernel_param __setup_##fn \ +#define __setup_param(str, unique_id, fn) \ + static char __setup_str_##unique_id[] __initdata = str; \ + static struct obs_kernel_param __setup_##unique_id \ __attribute_used__ \ __attribute__((__section__(".init.setup"))) \ - = { __setup_str_##fn, fn } + = { __setup_str_##unique_id, fn } + +#define __setup_null_param(str, unique_id) \ + __setup_param(str, unique_id, NULL) + +#define __setup(str, fn) \ + __setup_param(str, fn, fn) + +#define __obsolete_setup(str) \ + __setup_null_param(str, __LINE__) #endif /* __ASSEMBLY__ */ @@ -172,7 +181,10 @@ { return exitfn; } \ void cleanup_module(void) __attribute__((alias(#exitfn))); -#define __setup(str,func) /* nothing */ +#define __setup_param(str, unique_id, fn) /* nothing */ +#define __setup_null_param(str, unique_id) /* nothing */ +#define __setup(str, func) /* nothing */ +#define __obsolete_setup(str) /* nothing */ #endif /* Data marked not to be saved by software_suspend() */ diff -Nru a/include/linux/miscdevice.h b/include/linux/miscdevice.h --- a/include/linux/miscdevice.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/miscdevice.h Wed Mar 17 19:29:09 2004 @@ -3,7 +3,6 @@ #include #include -#define BUSMOUSE_MINOR 0 #define PSMOUSE_MINOR 1 #define MS_BUSMOUSE_MINOR 2 #define ATIXL_BUSMOUSE_MINOR 3 diff -Nru a/include/linux/mm.h b/include/linux/mm.h --- a/include/linux/mm.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/mm.h Wed Mar 17 19:29:09 2004 @@ -152,6 +152,12 @@ struct mmu_gather; struct inode; +#ifdef ARCH_HAS_ATOMIC_UNSIGNED +typedef unsigned page_flags_t; +#else +typedef unsigned long page_flags_t; +#endif + /* * Each physical page in the system has a struct page associated with * it to keep track of whatever it is we are using the page for at the @@ -168,7 +174,7 @@ * TODO: make this structure smaller, it could be as small as 32 bytes. */ struct page { - unsigned long flags; /* atomic flags, some possibly + page_flags_t flags; /* atomic flags, some possibly updated asynchronously */ atomic_t count; /* Usage count, see below. */ struct list_head list; /* ->mapping has some page lists. */ @@ -333,7 +339,7 @@ * We'll have up to (MAX_NUMNODES * MAX_NR_ZONES) zones total, * so we use (MAX_NODES_SHIFT + MAX_ZONES_SHIFT) here to get enough bits. */ -#define NODEZONE_SHIFT (BITS_PER_LONG - MAX_NODES_SHIFT - MAX_ZONES_SHIFT) +#define NODEZONE_SHIFT (sizeof(page_flags_t)*8 - MAX_NODES_SHIFT - MAX_ZONES_SHIFT) #define NODEZONE(node, zone) ((node << ZONES_SHIFT) | zone) static inline unsigned long page_zonenum(struct page *page) diff -Nru a/include/linux/mmzone.h b/include/linux/mmzone.h --- a/include/linux/mmzone.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/mmzone.h Wed Mar 17 19:29:09 2004 @@ -316,7 +316,7 @@ #include -#if BITS_PER_LONG == 32 +#if BITS_PER_LONG == 32 || defined(ARCH_HAS_ATOMIC_UNSIGNED) /* * with 32 bit page->flags field, we reserve 8 bits for node/zone info. * there are 3 zones (2 bits) and this leaves 8-2=6 bits for nodes. diff -Nru a/include/linux/moduleparam.h b/include/linux/moduleparam.h --- a/include/linux/moduleparam.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/moduleparam.h Wed Mar 17 19:29:09 2004 @@ -126,12 +126,15 @@ #define param_check_invbool(name, p) __param_check(name, p, int) /* Comma-separated array: num is set to number they actually specified. */ -#define module_param_array(name, type, num, perm) \ +#define module_param_array_named(name, array, type, num, perm) \ static struct kparam_array __param_arr_##name \ - = { ARRAY_SIZE(name), &num, param_set_##type, param_get_##type, \ - sizeof(name[0]), name }; \ + = { ARRAY_SIZE(array), &num, param_set_##type, param_get_##type,\ + sizeof(array[0]), array }; \ module_param_call(name, param_array_set, param_array_get, \ &__param_arr_##name, perm) + +#define module_param_array(name, type, num, perm) \ + module_param_array_named(name, name, type, num, perm) extern int param_array_set(const char *val, struct kernel_param *kp); extern int param_array_get(char *buffer, struct kernel_param *kp); diff -Nru a/include/linux/netpoll.h b/include/linux/netpoll.h --- a/include/linux/netpoll.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/netpoll.h Wed Mar 17 19:29:09 2004 @@ -9,7 +9,6 @@ #include #include -#include #include struct netpoll; diff -Nru a/include/linux/page-flags.h b/include/linux/page-flags.h --- a/include/linux/page-flags.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/page-flags.h Wed Mar 17 19:29:09 2004 @@ -80,9 +80,6 @@ /* * Global page accounting. One instance per CPU. Only unsigned longs are * allowed. - * - * NOTE: if this structure is changed then mm/page_alloc.c and - * arch/s390/appldata/appldata_mem.c must be updated accordingly */ struct page_state { unsigned long nr_dirty; /* Dirty writeable pages */ diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/pci_ids.h Wed Mar 17 19:29:09 2004 @@ -342,6 +342,8 @@ #define PCI_DEVICE_ID_ATI_RS300_133 0x5831 #define PCI_DEVICE_ID_ATI_RS300_166 0x5832 #define PCI_DEVICE_ID_ATI_RS300_200 0x5833 +/* ATI IXP Chipset */ +#define PCI_DEVICE_ID_ATI_IXP_IDE 0x4349 #define PCI_VENDOR_ID_VLSI 0x1004 #define PCI_DEVICE_ID_VLSI_82C592 0x0005 diff -Nru a/include/linux/proc_fs.h b/include/linux/proc_fs.h --- a/include/linux/proc_fs.h Wed Mar 17 19:29:10 2004 +++ b/include/linux/proc_fs.h Wed Mar 17 19:29:10 2004 @@ -141,10 +141,6 @@ return; } #endif /* CONFIG_PROC_DEVICETREE */ -/* - * proc_rtas.c - */ -extern void proc_rtas_init(void); extern struct proc_dir_entry *proc_symlink(const char *, struct proc_dir_entry *, const char *); diff -Nru a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h --- a/include/linux/reiserfs_fs.h Wed Mar 17 19:29:10 2004 +++ b/include/linux/reiserfs_fs.h Wed Mar 17 19:29:10 2004 @@ -1335,7 +1335,8 @@ #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter) #define get_generation(s) atomic_read (&fs_generation(s)) #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen) -#define fs_changed(gen,s) (gen != get_generation (s)) +#define __fs_changed(gen,s) (gen != get_generation (s)) +#define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);}) /***************************************************************************/ diff -Nru a/include/linux/rmap-locking.h b/include/linux/rmap-locking.h --- a/include/linux/rmap-locking.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/rmap-locking.h Wed Mar 17 19:29:09 2004 @@ -10,8 +10,8 @@ struct pte_chain; extern kmem_cache_t *pte_chain_cache; -#define pte_chain_lock(page) bit_spin_lock(PG_chainlock, &page->flags) -#define pte_chain_unlock(page) bit_spin_unlock(PG_chainlock, &page->flags) +#define pte_chain_lock(page) bit_spin_lock(PG_chainlock, (unsigned long *)&page->flags) +#define pte_chain_unlock(page) bit_spin_unlock(PG_chainlock, (unsigned long *)&page->flags) struct pte_chain *pte_chain_alloc(int gfp_flags); void __pte_chain_free(struct pte_chain *pte_chain); diff -Nru a/include/linux/sched.h b/include/linux/sched.h --- a/include/linux/sched.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/sched.h Wed Mar 17 19:29:09 2004 @@ -560,13 +560,9 @@ */ extern struct exec_domain default_exec_domain; -#ifndef INIT_THREAD_SIZE -# define INIT_THREAD_SIZE 2048*sizeof(long) -#endif - union thread_union { struct thread_info thread_info; - unsigned long stack[INIT_THREAD_SIZE/sizeof(long)]; + unsigned long stack[THREAD_SIZE/sizeof(long)]; }; #ifndef __HAVE_ARCH_KSTACK_END diff -Nru a/include/linux/serio.h b/include/linux/serio.h --- a/include/linux/serio.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/serio.h Wed Mar 17 19:29:09 2004 @@ -117,6 +117,7 @@ #define SERIO_MZ 0x05 #define SERIO_MZP 0x06 #define SERIO_MZPP 0x07 +#define SERIO_VSXXXAA 0x08 #define SERIO_SUNKBD 0x10 #define SERIO_WARRIOR 0x18 #define SERIO_SPACEORB 0x19 @@ -134,6 +135,7 @@ #define SERIO_HIL 0x25 #define SERIO_SNES232 0x26 #define SERIO_SEMTECH 0x27 +#define SERIO_LKKBD 0x28 #define SERIO_ID 0xff00UL #define SERIO_EXTRA 0xff0000UL diff -Nru a/include/linux/usb.h b/include/linux/usb.h --- a/include/linux/usb.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/usb.h Wed Mar 17 19:29:09 2004 @@ -72,14 +72,11 @@ /** * struct usb_interface - what usb device drivers talk to - * @altsetting: array of interface descriptors, one for each alternate + * @altsetting: array of interface structures, one for each alternate * setting that may be selected. Each one includes a set of - * endpoint configurations and will be in numberic order, - * 0..num_altsetting. + * endpoint configurations. They will be in no particular order. * @num_altsetting: number of altsettings defined. - * @act_altsetting: index of current altsetting. this number is always - * less than num_altsetting. after the device is configured, each - * interface uses its default setting of zero. + * @cur_altsetting: the current altsetting. * @driver: the USB driver that is bound to this interface. * @minor: the minor number assigned to this interface, if this * interface is bound to a driver that uses the USB major number. @@ -89,6 +86,8 @@ * number from the USB core by calling usb_register_dev(). * @dev: driver model's view of this device * @class_dev: driver model's class view of this device. + * @released: wait for the interface to be released when changing + * configurations. * * USB device drivers attach to interfaces on a physical device. Each * interface encapsulates a single high level function, such as feeding @@ -102,26 +101,33 @@ * calls such as dev_get_drvdata() on the dev member of this structure. * * Each interface may have alternate settings. The initial configuration - * of a device sets the first of these, but the device driver can change + * of a device sets altsetting 0, but the device driver can change * that setting using usb_set_interface(). Alternate settings are often * used to control the the use of periodic endpoints, such as by having * different endpoints use different amounts of reserved USB bandwidth. * All standards-conformant USB devices that use isochronous endpoints * will use them in non-default settings. + * + * The USB specification says that alternate setting numbers must run from + * 0 to one less than the total number of alternate settings. But some + * devices manage to mess this up, and the structures aren't necessarily + * stored in numerical order anyhow. Use usb_altnum_to_altsetting() to + * look up an alternate setting in the altsetting array based on its number. */ struct usb_interface { - /* array of alternate settings for this interface. - * these will be in numeric order, 0..num_altsettting - */ + /* array of alternate settings for this interface, + * stored in no particular order */ struct usb_host_interface *altsetting; - unsigned act_altsetting; /* active alternate setting */ + struct usb_host_interface *cur_altsetting; /* the currently + * active alternate setting */ unsigned num_altsetting; /* number of alternate settings */ struct usb_driver *driver; /* driver */ int minor; /* minor number this interface is bound to */ struct device dev; /* interface specific device info */ struct class_device *class_dev; + struct completion *released; /* wait for release */ }; #define to_usb_interface(d) container_of(d, struct usb_interface, dev) #define interface_to_usbdev(intf) \ @@ -140,19 +146,43 @@ /* this maximum is arbitrary */ #define USB_MAXINTERFACES 32 -/* USB_DT_CONFIG: Configuration descriptor information. - * - * USB_DT_OTHER_SPEED_CONFIG is the same descriptor, except that the - * descriptor type is different. Highspeed-capable devices can look - * different depending on what speed they're currently running. Only - * devices with a USB_DT_DEVICE_QUALIFIER have an OTHER_SPEED_CONFIG. +/** + * struct usb_host_config - representation of a device's configuration + * @desc: the device's configuration descriptor. + * @interface: array of usb_interface structures, one for each interface + * in the configuration. The number of interfaces is stored in + * desc.bNumInterfaces. + * @extra: pointer to buffer containing all extra descriptors associated + * with this configuration (those preceding the first interface + * descriptor). + * @extralen: length of the extra descriptors buffer. + * + * USB devices may have multiple configurations, but only one can be active + * at any time. Each encapsulates a different operational environment; + * for example, a dual-speed device would have separate configurations for + * full-speed and high-speed operation. The number of configurations + * available is stored in the device descriptor as bNumConfigurations. + * + * A configuration can contain multiple interfaces. Each corresponds to + * a different function of the USB device, and all are available whenever + * the configuration is active. The USB standard says that interfaces + * are supposed to be numbered from 0 to desc.bNumInterfaces-1, but a lot + * of devices get this wrong. In addition, the interface array is not + * guaranteed to be sorted in numerical order. Use usb_ifnum_to_if() to + * look up an interface entry based on its number. + * + * Device drivers should not attempt to activate configurations. The choice + * of which configuration to install is a policy decision based on such + * considerations as available power, functionality provided, and the user's + * desires (expressed through hotplug scripts). However, drivers can call + * usb_reset_configuration() to reinitialize the current configuration and + * all its interfaces. */ struct usb_host_config { struct usb_config_descriptor desc; - /* the interfaces associated with this configuration - * these will be in numeric order, 0..desc.bNumInterfaces - */ + /* the interfaces associated with this configuration, + * stored in no particular order */ struct usb_interface *interface[USB_MAXINTERFACES]; unsigned char *extra; /* Extra descriptors */ @@ -294,8 +324,12 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface, const struct usb_device_id *id); -extern struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor); -extern struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, unsigned ifnum); +extern struct usb_interface *usb_find_interface(struct usb_driver *drv, + int minor); +extern struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, + unsigned ifnum); +extern struct usb_host_interface *usb_altnum_to_altsetting( + struct usb_interface *intf, unsigned int altnum); /** @@ -461,8 +495,8 @@ * @minor_base: the start of the minor range for this driver. * * This structure is used for the usb_register_dev() and - * usb_unregister_dev() functions, to consolodate a number of the - * paramaters used for them. + * usb_unregister_dev() functions, to consolidate a number of the + * parameters used for them. */ struct usb_class_driver { char *name; @@ -520,7 +554,7 @@ * @urb_list: For use by current owner of the URB. * @pipe: Holds endpoint number, direction, type, and more. * Create these values with the eight macros available; - * usb_{snd,rcv}TYPEpipe(dev,endpoint), where the type is "ctrl" + * usb_{snd,rcv}TYPEpipe(dev,endpoint), where the TYPE is "ctrl" * (control), "bulk", "int" (interrupt), or "iso" (isochronous). * For example usb_sndbulkpipe() or usb_rcvintpipe(). Endpoint * numbers range from zero to fifteen. Note that "in" endpoint two @@ -539,8 +573,8 @@ * the I/O request will be performed (unless URB_NO_TRANSFER_DMA_MAP * is set). This buffer must be suitable for DMA; allocate it with * kmalloc() or equivalent. For transfers to "in" endpoints, contents - * of this buffer will be modified. This buffer is used for data - * phases of control transfers. + * of this buffer will be modified. This buffer is used for the data + * stage of control transfers. * @transfer_dma: When transfer_flags includes URB_NO_TRANSFER_DMA_MAP, * the device driver is saying that it provided this DMA address, * which the host controller driver should use in preference to the @@ -563,8 +597,7 @@ * device driver has provided this DMA address for the setup packet. * The host controller driver should use this in preference to * setup_packet. - * @start_frame: Returns the initial frame for interrupt or isochronous - * transfers. + * @start_frame: Returns the initial frame for isochronous transfers. * @number_of_packets: Lists the number of ISO transfer buffers. * @interval: Specifies the polling interval for interrupt or isochronous * transfers. The units are frames (milliseconds) for for full and low @@ -632,13 +665,14 @@ * Interrupt UBS must provide an interval, saying how often (in milliseconds * or, for highspeed devices, 125 microsecond units) * to poll for transfers. After the URB has been submitted, the interval - * and start_frame fields reflect how the transfer was actually scheduled. + * field reflects how the transfer was actually scheduled. * The polling interval may be more frequent than requested. * For example, some controllers have a maximum interval of 32 microseconds, * while others support intervals of up to 1024 microseconds. * Isochronous URBs also have transfer intervals. (Note that for isochronous * endpoints, as well as high speed interrupt endpoints, the encoding of - * the transfer interval in the endpoint descriptor is logarithmic.) + * the transfer interval in the endpoint descriptor is logarithmic. + * Device drivers must convert that value to linear units themselves.) * * Isochronous URBs normally use the URB_ISO_ASAP transfer flag, telling * the host controller to schedule the transfer as soon as bandwidth @@ -671,8 +705,9 @@ * The context field is normally used to link URBs back to the relevant * driver or request state. * - * When completion callback is invoked for non-isochronous URBs, the - * actual_length field tells how many bytes were transferred. + * When the completion callback is invoked for non-isochronous URBs, the + * actual_length field tells how many bytes were transferred. This field + * is updated even when the URB terminated with an error or was unlinked. * * ISO transfer status is reported in the status and actual_length fields * of the iso_frame_desc array, and the number of errors is reported in @@ -699,9 +734,9 @@ int actual_length; /* (return) actual transfer length */ unsigned char *setup_packet; /* (in) setup packet (control only) */ dma_addr_t setup_dma; /* (in) dma addr for setup_packet */ - int start_frame; /* (modify) start frame (INT/ISO) */ + int start_frame; /* (modify) start frame (ISO) */ int number_of_packets; /* (in) number of ISO packets */ - int interval; /* (in) transfer interval (INT/ISO) */ + int interval; /* (modify) transfer interval (INT/ISO) */ int error_count; /* (return) number of ISO errors */ int timeout; /* (in) timeout, in jiffies */ void *context; /* (in) context for completion */ diff -Nru a/include/linux/usb_gadget.h b/include/linux/usb_gadget.h --- a/include/linux/usb_gadget.h Wed Mar 17 19:29:09 2004 +++ b/include/linux/usb_gadget.h Wed Mar 17 19:29:09 2004 @@ -465,6 +465,8 @@ * driver setup() requests * @ep_list: List of other endpoints supported by the device. * @speed: Speed of current connection to USB host. + * @is_dualspeed: True if the controller supports both high and full speed + * operation. If it does, the gadget driver must also support both. * @name: Identifies the controller hardware type. Used in diagnostics * and sometimes configuration. * @dev: Driver model state for this abstract device. @@ -488,6 +490,7 @@ struct usb_ep *ep0; struct list_head ep_list; /* of usb_ep */ enum usb_device_speed speed; + unsigned is_dualspeed:1; const char *name; struct device dev; }; @@ -690,7 +693,7 @@ /** * struct usb_string - wraps a C string and its USB id * @id:the (nonzero) ID for this string - * @s:the string, in ISO-8859/1 characters + * @s:the string, in UTF-8 encoding * * If you're using usb_gadget_get_string(), use this to wrap a string * together with its ID. @@ -716,6 +719,17 @@ /* put descriptor for string with that id into buf (buflen >= 256) */ int usb_gadget_get_string (struct usb_gadget_strings *table, int id, u8 *buf); +/*-------------------------------------------------------------------------*/ + +/* utility to simplify managing config descriptors */ + +/* write vector of descriptors into buffer */ +int usb_descriptor_fillbuf(void *, unsigned, + const struct usb_descriptor_header **); + +/* build config descriptor from single descriptor vector */ +int usb_gadget_config_buf(const struct usb_config_descriptor *config, + void *buf, unsigned buflen, const struct usb_descriptor_header **desc); #endif /* __KERNEL__ */ diff -Nru a/init/main.c b/init/main.c --- a/init/main.c Wed Mar 17 19:29:09 2004 +++ b/init/main.c Wed Mar 17 19:29:09 2004 @@ -156,8 +156,11 @@ p = &__setup_start; do { int n = strlen(p->str); - if (!strncmp(line,p->str,n)) { - if (p->setup_func(line+n)) + if (!strncmp(line, p->str, n)) { + if (!p->setup_func) { + printk(KERN_WARNING "Parameter %s is obsolete, ignored\n", p->str); + return 1; + } else if (p->setup_func(line + n)) return 1; } p++; diff -Nru a/ipc/shm.c b/ipc/shm.c --- a/ipc/shm.c Wed Mar 17 19:29:09 2004 +++ b/ipc/shm.c Wed Mar 17 19:29:09 2004 @@ -656,7 +656,10 @@ if (shmflg & SHM_RND) addr &= ~(SHMLBA-1); /* round down */ else - return -EINVAL; +#ifndef __ARCH_FORCE_SHMLBA + if (addr & ~PAGE_MASK) +#endif + return -EINVAL; } flags = MAP_SHARED | MAP_FIXED; } else { @@ -759,6 +762,21 @@ down_write(&mm->mmap_sem); + /* + * This function tries to be smart and unmap shm segments that + * were modified by partial mlock or munmap calls: + * - It first determines the size of the shm segment that should be + * unmapped: It searches for a vma that is backed by shm and that + * started at address shmaddr. It records it's size and then unmaps + * it. + * - Then it unmaps all shm vmas that started at shmaddr and that + * are within the initially determined size. + * Errors from do_munmap are ignored: the function only fails if + * it's called with invalid parameters or if it's called to unmap + * a part of a vma. Both calls in this function are for full vmas, + * the parameters are directly copied from the vma itself and always + * valid - therefore do_munmap cannot fail. (famous last words?) + */ /* * If it had been mremap()'d, the starting address would not * match the usual checks anyway. So assume all vma's are diff -Nru a/kernel/exit.c b/kernel/exit.c --- a/kernel/exit.c Wed Mar 17 19:29:10 2004 +++ b/kernel/exit.c Wed Mar 17 19:29:10 2004 @@ -1146,7 +1146,8 @@ return retval; } -#if !defined(__alpha__) && !defined(__ia64__) && !defined(__arm__) +#if !defined(__alpha__) && !defined(__ia64__) && \ + !defined(__arm__) && !defined(__s390__) /* * sys_waitpid() remains for compatibility. waitpid() should be diff -Nru a/kernel/kthread.c b/kernel/kthread.c --- a/kernel/kthread.c Wed Mar 17 19:29:10 2004 +++ b/kernel/kthread.c Wed Mar 17 19:29:10 2004 @@ -10,6 +10,7 @@ #include #include #include +#include #include struct kthread_create_info @@ -41,6 +42,21 @@ return (kthread_stop_info.k == current); } + +static void kthread_exit_files(void) +{ + struct fs_struct *fs; + struct task_struct *tsk = current; + + exit_fs(tsk); /* current->fs->count--; */ + fs = init_task.fs; + tsk->fs = fs; + atomic_inc(&fs->count); + exit_files(tsk); + current->files = init_task.files; + atomic_inc(&tsk->files->count); +} + static int kthread(void *_create) { struct kthread_create_info *create = _create; @@ -49,6 +65,8 @@ sigset_t blocked; int ret = -EINTR; cpumask_t mask = CPU_MASK_ALL; + + kthread_exit_files(); /* Copy data: it's on keventd's stack */ threadfn = create->threadfn; diff -Nru a/kernel/module.c b/kernel/module.c --- a/kernel/module.c Wed Mar 17 19:29:10 2004 +++ b/kernel/module.c Wed Mar 17 19:29:10 2004 @@ -1243,7 +1243,15 @@ mod->symtab[i].st_info = elf_type(&mod->symtab[i], sechdrs, secstrings, mod); } -#endif +#else +static inline void add_kallsyms(struct module *mod, + Elf_Shdr *sechdrs, + unsigned int symindex, + unsigned int strindex, + const char *secstrings) +{ +} +#endif /* CONFIG_KALLSYMS */ /* Allocate and load the module: note that size of section 0 is always zero, and we rely on this for optional sections. */ @@ -1516,13 +1524,11 @@ percpu_modcopy(mod->percpu, (void *)sechdrs[pcpuindex].sh_addr, sechdrs[pcpuindex].sh_size); + add_kallsyms(mod, sechdrs, symindex, strindex, secstrings); + err = module_finalize(hdr, sechdrs, mod); if (err < 0) goto cleanup; - -#ifdef CONFIG_KALLSYMS - add_kallsyms(mod, sechdrs, symindex, strindex, secstrings); -#endif mod->args = args; if (obsparmindex) { diff -Nru a/kernel/sched.c b/kernel/sched.c --- a/kernel/sched.c Wed Mar 17 19:29:10 2004 +++ b/kernel/sched.c Wed Mar 17 19:29:10 2004 @@ -594,28 +594,21 @@ { unsigned long flags; runqueue_t *rq; + int preempted; repeat: - preempt_disable(); - rq = task_rq(p); - if (unlikely(task_running(rq, p))) { - cpu_relax(); - /* - * enable/disable preemption just to make this - * a preemption point - we are busy-waiting - * anyway. - */ - preempt_enable(); - goto repeat; - } rq = task_rq_lock(p, &flags); - if (unlikely(task_running(rq, p))) { + /* Must be off runqueue entirely, not preempted. */ + if (unlikely(p->array)) { + /* If it's preempted, we yield. It could be a while. */ + preempted = !task_running(rq, p); task_rq_unlock(rq, &flags); - preempt_enable(); + cpu_relax(); + if (preempted) + yield(); goto repeat; } task_rq_unlock(rq, &flags); - preempt_enable(); } /*** diff -Nru a/kernel/signal.c b/kernel/signal.c --- a/kernel/signal.c Wed Mar 17 19:29:09 2004 +++ b/kernel/signal.c Wed Mar 17 19:29:09 2004 @@ -2482,7 +2482,8 @@ #endif /* __sparc__ */ #endif -#if !defined(__alpha__) && !defined(__ia64__) && !defined(__arm__) +#if !defined(__alpha__) && !defined(__ia64__) && \ + !defined(__arm__) && !defined(__s390__) /* * For backwards compatibility. Functionality superseded by sigprocmask. */ diff -Nru a/kernel/workqueue.c b/kernel/workqueue.c --- a/kernel/workqueue.c Wed Mar 17 19:29:10 2004 +++ b/kernel/workqueue.c Wed Mar 17 19:29:10 2004 @@ -47,6 +47,7 @@ struct workqueue_struct *wq; task_t *thread; + int run_depth; /* Detect run_workqueue() recursion depth */ } ____cacheline_aligned; /* @@ -129,6 +130,13 @@ * done. */ spin_lock_irqsave(&cwq->lock, flags); + cwq->run_depth++; + if (cwq->run_depth > 3) { + /* morton gets to eat his hat */ + printk("%s: recursion depth exceeded: %d\n", + __FUNCTION__, cwq->run_depth); + dump_stack(); + } while (!list_empty(&cwq->worklist)) { struct work_struct *work = list_entry(cwq->worklist.next, struct work_struct, entry); @@ -146,6 +154,7 @@ cwq->remove_sequence++; wake_up(&cwq->work_done); } + cwq->run_depth--; spin_unlock_irqrestore(&cwq->lock, flags); } @@ -218,6 +227,14 @@ continue; cwq = wq->cpu_wq + cpu; + if (cwq->thread == current) { + /* + * Probably keventd trying to flush its own queue. + * So simply run it by hand rather than deadlocking. + */ + run_workqueue(cwq); + continue; + } spin_lock_irq(&cwq->lock); sequence_needed = cwq->insert_sequence; @@ -267,6 +284,7 @@ wq = kmalloc(sizeof(*wq), GFP_KERNEL); if (!wq) return NULL; + memset(wq, 0, sizeof(*wq)); for (cpu = 0; cpu < NR_CPUS; cpu++) { if (!cpu_online(cpu)) diff -Nru a/mm/filemap.c b/mm/filemap.c --- a/mm/filemap.c Wed Mar 17 19:29:09 2004 +++ b/mm/filemap.c Wed Mar 17 19:29:09 2004 @@ -574,7 +574,7 @@ /* * This is a generic file read routine, and uses the - * inode->i_op->readpage() function for the actual low-level + * mapping->a_ops->readpage() function for the actual low-level * stuff. * * This is really ugly. But the goto's actually try to clarify some diff -Nru a/mm/page_alloc.c b/mm/page_alloc.c --- a/mm/page_alloc.c Wed Mar 17 19:29:09 2004 +++ b/mm/page_alloc.c Wed Mar 17 19:29:09 2004 @@ -73,7 +73,7 @@ { printk("Bad page state at %s (in process '%s', page %p)\n", function, current->comm, page); printk("flags:0x%08lx mapping:%p mapped:%d count:%d\n", - page->flags, page->mapping, + (unsigned long)page->flags, page->mapping, page_mapped(page), page_count(page)); printk("Backtrace:\n"); dump_stack(); diff -Nru a/mm/rmap.c b/mm/rmap.c --- a/mm/rmap.c Wed Mar 17 19:29:10 2004 +++ b/mm/rmap.c Wed Mar 17 19:29:10 2004 @@ -118,7 +118,7 @@ int referenced = 0; if (page_test_and_clear_young(page)) - mark_page_accessed(page); + referenced++; if (TestClearPageReferenced(page)) referenced++; diff -Nru a/mm/slab.c b/mm/slab.c --- a/mm/slab.c Wed Mar 17 19:29:10 2004 +++ b/mm/slab.c Wed Mar 17 19:29:10 2004 @@ -914,7 +914,7 @@ printk("\n"); } realobj = (char*)objp+obj_dbghead(cachep); - size = cachep->objsize; + size = obj_reallen(cachep); for (i=0; iflags); + printk("struct page at %p, flags %08lx\n", + page, (unsigned long)page->flags); if (PageSlab(page)) { kmem_cache_t *c; struct slab *s; diff -Nru a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c --- a/net/ipv4/ipvs/ip_vs_ctl.c Wed Mar 17 19:29:10 2004 +++ b/net/ipv4/ipvs/ip_vs_ctl.c Wed Mar 17 19:29:10 2004 @@ -1384,95 +1384,223 @@ /* * IPVS sysctl table (under the /proc/sys/net/ipv4/vs/) */ -struct ip_vs_sysctl_table { - struct ctl_table_header *sysctl_header; - ctl_table vs_vars[NET_IPV4_VS_LAST]; - ctl_table vs_dir[2]; - ctl_table ipv4_dir[2]; - ctl_table root_dir[2]; -}; -static struct ip_vs_sysctl_table ipv4_vs_table = { - NULL, - {{NET_IPV4_VS_AMEMTHRESH, "amemthresh", - &sysctl_ip_vs_amemthresh, sizeof(int), 0644, NULL, - &proc_dointvec}, +static struct ctl_table vs_vars[] = { + { + .ctl_name = NET_IPV4_VS_AMEMTHRESH, + .procname = "amemthresh", + .data = &sysctl_ip_vs_amemthresh, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, #ifdef CONFIG_IP_VS_DEBUG - {NET_IPV4_VS_DEBUG_LEVEL, "debug_level", - &sysctl_ip_vs_debug_level, sizeof(int), 0644, NULL, - &proc_dointvec}, + { + .ctl_name = NET_IPV4_VS_DEBUG_LEVEL, + .procname = "debug_level", + .data = &sysctl_ip_vs_debug_level, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, #endif - {NET_IPV4_VS_AMDROPRATE, "am_droprate", - &sysctl_ip_vs_am_droprate, sizeof(int), 0644, NULL, - &proc_dointvec}, - {NET_IPV4_VS_DROP_ENTRY, "drop_entry", - &sysctl_ip_vs_drop_entry, sizeof(int), 0644, NULL, - &proc_do_defense_mode}, - {NET_IPV4_VS_DROP_PACKET, "drop_packet", - &sysctl_ip_vs_drop_packet, sizeof(int), 0644, NULL, - &proc_do_defense_mode}, - {NET_IPV4_VS_SECURE_TCP, "secure_tcp", - &sysctl_ip_vs_secure_tcp, sizeof(int), 0644, NULL, - &proc_do_defense_mode}, + { + .ctl_name = NET_IPV4_VS_AMDROPRATE, + .procname = "am_droprate", + .data = &sysctl_ip_vs_am_droprate, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV4_VS_DROP_ENTRY, + .procname = "drop_entry", + .data = &sysctl_ip_vs_drop_entry, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_do_defense_mode, + }, + { + .ctl_name = NET_IPV4_VS_DROP_PACKET, + .procname = "drop_packet", + .data = &sysctl_ip_vs_drop_packet, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_do_defense_mode, + }, + { + .ctl_name = NET_IPV4_VS_SECURE_TCP, + .procname = "secure_tcp", + .data = &sysctl_ip_vs_secure_tcp, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_do_defense_mode, + }, #if 0 - {NET_IPV4_VS_TO_ES, "timeout_established", - &vs_timeout_table_dos.timeout[IP_VS_S_ESTABLISHED], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_SS, "timeout_synsent", - &vs_timeout_table_dos.timeout[IP_VS_S_SYN_SENT], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_SR, "timeout_synrecv", - &vs_timeout_table_dos.timeout[IP_VS_S_SYN_RECV], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_FW, "timeout_finwait", - &vs_timeout_table_dos.timeout[IP_VS_S_FIN_WAIT], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_TW, "timeout_timewait", - &vs_timeout_table_dos.timeout[IP_VS_S_TIME_WAIT], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_CL, "timeout_close", - &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_CW, "timeout_closewait", - &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE_WAIT], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_LA, "timeout_lastack", - &vs_timeout_table_dos.timeout[IP_VS_S_LAST_ACK], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_LI, "timeout_listen", - &vs_timeout_table_dos.timeout[IP_VS_S_LISTEN], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_SA, "timeout_synack", - &vs_timeout_table_dos.timeout[IP_VS_S_SYNACK], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_UDP, "timeout_udp", - &vs_timeout_table_dos.timeout[IP_VS_S_UDP], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {NET_IPV4_VS_TO_ICMP, "timeout_icmp", - &vs_timeout_table_dos.timeout[IP_VS_S_ICMP], - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, + { + .ctl_name = NET_IPV4_VS_TO_ES, + .procname = "timeout_established", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_ESTABLISHED], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_SS, + .procname = "timeout_synsent", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_SENT], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_SR, + .procname = "timeout_synrecv", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_RECV], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_FW, + .procname = "timeout_finwait", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_FIN_WAIT], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_TW, + .procname = "timeout_timewait", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_TIME_WAIT], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_CL, + .procname = "timeout_close", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_CW, + .procname = "timeout_closewait", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE_WAIT], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_LA, + .procname = "timeout_lastack", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_LAST_ACK], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_LI, + .procname = "timeout_listen", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_LISTEN], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_SA, + .procname = "timeout_synack", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYNACK], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_UDP, + .procname = "timeout_udp", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_UDP], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV4_VS_TO_ICMP, + .procname = "timeout_icmp", + .data = &vs_timeout_table_dos.timeout[IP_VS_S_ICMP], + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, #endif - {NET_IPV4_VS_CACHE_BYPASS, "cache_bypass", - &sysctl_ip_vs_cache_bypass, sizeof(int), 0644, NULL, - &proc_dointvec}, - {NET_IPV4_VS_EXPIRE_NODEST_CONN, "expire_nodest_conn", - &sysctl_ip_vs_expire_nodest_conn, sizeof(int), 0644, NULL, - &proc_dointvec}, - {NET_IPV4_VS_SYNC_THRESHOLD, "sync_threshold", - &sysctl_ip_vs_sync_threshold, sizeof(sysctl_ip_vs_sync_threshold), - 0644, NULL, &proc_do_sync_threshold}, - {NET_IPV4_VS_NAT_ICMP_SEND, "nat_icmp_send", - &sysctl_ip_vs_nat_icmp_send, sizeof(int), 0644, NULL, - &proc_dointvec}, - {0}}, - {{NET_IPV4_VS, "vs", NULL, 0, 0555, ipv4_vs_table.vs_vars}, - {0}}, - {{NET_IPV4, "ipv4", NULL, 0, 0555, ipv4_vs_table.vs_dir}, - {0}}, - {{CTL_NET, "net", NULL, 0, 0555, ipv4_vs_table.ipv4_dir}, - {0}} + { + .ctl_name = NET_IPV4_VS_CACHE_BYPASS, + .procname = "cache_bypass", + .data = &sysctl_ip_vs_cache_bypass, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV4_VS_EXPIRE_NODEST_CONN, + .procname = "expire_nodest_conn", + .data = &sysctl_ip_vs_expire_nodest_conn, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV4_VS_SYNC_THRESHOLD, + .procname = "sync_threshold", + .data = &sysctl_ip_vs_sync_threshold, + .maxlen = sizeof(sysctl_ip_vs_sync_threshold), + .mode = 0644, + .proc_handler = &proc_do_sync_threshold, + }, + { + .ctl_name = NET_IPV4_VS_NAT_ICMP_SEND, + .procname = "nat_icmp_send", + .data = &sysctl_ip_vs_nat_icmp_send, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { .ctl_name = 0 } +}; + +static ctl_table vs_table[] = { + { + .ctl_name = NET_IPV4_VS, + .procname = "vs", + .mode = 0555, + .child = vs_vars + }, + { .ctl_name = 0 } +}; + +static ctl_table ipv4_table[] = { + { + .ctl_name = NET_IPV4, + .procname = "ipv4", + .mode = 0555, + .child = vs_table, + }, + { .ctl_name = 0 } }; +static ctl_table vs_root_table[] = { + { + .ctl_name = CTL_NET, + .procname = "net", + .mode = 0555, + .child = ipv4_table, + }, + { .ctl_name = 0 } +}; + +static struct ctl_table_header * sysctl_header; + #ifdef CONFIG_PROC_FS struct ip_vs_iter { @@ -2184,9 +2312,13 @@ static struct nf_sockopt_ops ip_vs_sockopts = { - { NULL, NULL }, PF_INET, - IP_VS_BASE_CTL, IP_VS_SO_SET_MAX+1, do_ip_vs_set_ctl, - IP_VS_BASE_CTL, IP_VS_SO_GET_MAX+1, do_ip_vs_get_ctl + .pf = PF_INET, + .set_optmin = IP_VS_BASE_CTL, + .set_optmax = IP_VS_SO_SET_MAX+1, + .set = do_ip_vs_set_ctl, + .get_optmin = IP_VS_BASE_CTL, + .get_optmax = IP_VS_SO_GET_MAX+1, + .get = do_ip_vs_get_ctl, }; @@ -2206,8 +2338,7 @@ proc_net_fops_create("ip_vs", 0, &ip_vs_info_fops); proc_net_fops_create("ip_vs_stats",0, &ip_vs_stats_fops); - ipv4_vs_table.sysctl_header = - register_sysctl_table(ipv4_vs_table.root_dir, 0); + sysctl_header = register_sysctl_table(vs_root_table, 0); /* Initialize ip_vs_svc_table, ip_vs_svc_fwm_table, ip_vs_rtable */ for(idx = 0; idx < IP_VS_SVC_TAB_SIZE; idx++) { @@ -2239,7 +2370,7 @@ ip_vs_trash_cleanup(); del_timer_sync(&defense_timer); ip_vs_kill_estimator(&ip_vs_stats); - unregister_sysctl_table(ipv4_vs_table.sysctl_header); + unregister_sysctl_table(sysctl_header); proc_net_remove("ip_vs_stats"); proc_net_remove("ip_vs"); nf_unregister_sockopt(&ip_vs_sockopts); diff -Nru a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c --- a/net/ipv4/ipvs/ip_vs_lblc.c Wed Mar 17 19:29:10 2004 +++ b/net/ipv4/ipvs/ip_vs_lblc.c Wed Mar 17 19:29:10 2004 @@ -108,29 +108,50 @@ /* * IPVS LBLC sysctl table */ -struct ip_vs_lblc_sysctl_table { - struct ctl_table_header *sysctl_header; - ctl_table vs_vars[2]; - ctl_table vs_dir[2]; - ctl_table ipv4_dir[2]; - ctl_table root_dir[2]; + +static ctl_table vs_vars_table[] = { + { + .ctl_name = NET_IPV4_VS_LBLC_EXPIRE, + .procname = "lblc_expiration", + .data = &sysctl_ip_vs_lblc_expiration, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { .ctl_name = 0 } +}; + +static ctl_table vs_table[] = { + { + .ctl_name = NET_IPV4_VS, + .procname = "vs", + .mode = 0555, + .child = vs_vars_table + }, + { .ctl_name = 0 } }; +static ctl_table ipv4_table[] = { + { + .ctl_name = NET_IPV4, + .procname = "ipv4", + .mode = 0555, + .child = vs_table + }, + { .ctl_name = 0 } +}; -static struct ip_vs_lblc_sysctl_table lblc_sysctl_table = { - NULL, - {{NET_IPV4_VS_LBLC_EXPIRE, "lblc_expiration", - &sysctl_ip_vs_lblc_expiration, - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {0}}, - {{NET_IPV4_VS, "vs", NULL, 0, 0555, lblc_sysctl_table.vs_vars}, - {0}}, - {{NET_IPV4, "ipv4", NULL, 0, 0555, lblc_sysctl_table.vs_dir}, - {0}}, - {{CTL_NET, "net", NULL, 0, 0555, lblc_sysctl_table.ipv4_dir}, - {0}} +static ctl_table lblc_root_table[] = { + { + .ctl_name = CTL_NET, + .procname = "net", + .mode = 0555, + .child = ipv4_table + }, + { .ctl_name = 0 } }; +static struct ctl_table_header * sysctl_header; /* * new/free a ip_vs_lblc_entry, which is a mapping of a destionation @@ -586,15 +607,14 @@ static int __init ip_vs_lblc_init(void) { INIT_LIST_HEAD(&ip_vs_lblc_scheduler.n_list); - lblc_sysctl_table.sysctl_header = - register_sysctl_table(lblc_sysctl_table.root_dir, 0); + sysctl_header = register_sysctl_table(lblc_root_table, 0); return register_ip_vs_scheduler(&ip_vs_lblc_scheduler); } static void __exit ip_vs_lblc_cleanup(void) { - unregister_sysctl_table(lblc_sysctl_table.sysctl_header); + unregister_sysctl_table(sysctl_header); unregister_ip_vs_scheduler(&ip_vs_lblc_scheduler); } diff -Nru a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c --- a/net/ipv4/ipvs/ip_vs_lblcr.c Wed Mar 17 19:29:10 2004 +++ b/net/ipv4/ipvs/ip_vs_lblcr.c Wed Mar 17 19:29:10 2004 @@ -297,29 +297,50 @@ /* * IPVS LBLCR sysctl table */ -struct ip_vs_lblcr_sysctl_table { - struct ctl_table_header *sysctl_header; - ctl_table vs_vars[2]; - ctl_table vs_dir[2]; - ctl_table ipv4_dir[2]; - ctl_table root_dir[2]; + +static ctl_table vs_vars_table[] = { + { + .ctl_name = NET_IPV4_VS_LBLCR_EXPIRE, + .procname = "lblcr_expiration", + .data = &sysctl_ip_vs_lblcr_expiration, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { .ctl_name = 0 } +}; + +static ctl_table vs_table[] = { + { + .ctl_name = NET_IPV4_VS, + .procname = "vs", + .mode = 0555, + .child = vs_vars_table + }, + { .ctl_name = 0 } }; +static ctl_table ipv4_table[] = { + { + .ctl_name = NET_IPV4, + .procname = "ipv4", + .mode = 0555, + .child = vs_table + }, + { .ctl_name = 0 } +}; -static struct ip_vs_lblcr_sysctl_table lblcr_sysctl_table = { - NULL, - {{NET_IPV4_VS_LBLCR_EXPIRE, "lblcr_expiration", - &sysctl_ip_vs_lblcr_expiration, - sizeof(int), 0644, NULL, &proc_dointvec_jiffies}, - {0}}, - {{NET_IPV4_VS, "vs", NULL, 0, 0555, lblcr_sysctl_table.vs_vars}, - {0}}, - {{NET_IPV4, "ipv4", NULL, 0, 0555, lblcr_sysctl_table.vs_dir}, - {0}}, - {{CTL_NET, "net", NULL, 0, 0555, lblcr_sysctl_table.ipv4_dir}, - {0}} +static ctl_table lblcr_root_table[] = { + { + .ctl_name = CTL_NET, + .procname = "net", + .mode = 0555, + .child = ipv4_table + }, + { .ctl_name = 0 } }; +static struct ctl_table_header * sysctl_header; /* * new/free a ip_vs_lblcr_entry, which is a mapping of a destination @@ -844,8 +865,7 @@ static int __init ip_vs_lblcr_init(void) { INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list); - lblcr_sysctl_table.sysctl_header = - register_sysctl_table(lblcr_sysctl_table.root_dir, 0); + sysctl_header = register_sysctl_table(lblcr_root_table, 0); #ifdef CONFIG_IP_VS_LBLCR_DEBUG proc_net_create("ip_vs_lblcr", 0, ip_vs_lblcr_getinfo); #endif @@ -858,7 +878,7 @@ #ifdef CONFIG_IP_VS_LBLCR_DEBUG proc_net_remove("ip_vs_lblcr"); #endif - unregister_sysctl_table(lblcr_sysctl_table.sysctl_header); + unregister_sysctl_table(sysctl_header); unregister_ip_vs_scheduler(&ip_vs_lblcr_scheduler); } diff -Nru a/scripts/Makefile b/scripts/Makefile --- a/scripts/Makefile Wed Mar 17 19:29:09 2004 +++ b/scripts/Makefile Wed Mar 17 19:29:09 2004 @@ -2,14 +2,10 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. # --------------------------------------------------------------------------- -# fix-dep: Used to generate dependency information during build process -# split-include: Divide all config symbols up in a number of files in -# include/config/... # docproc: Preprocess .tmpl file in order to generate .sgml docs # conmakehash: Create arrays for initializing the kernel console tables -host-progs := fixdep split-include conmakehash docproc kallsyms modpost \ - mk_elfconfig pnmtologo bin2c +host-progs := conmakehash kallsyms modpost mk_elfconfig pnmtologo bin2c always := $(host-progs) empty.o modpost-objs := modpost.o file2alias.o sumversion.o @@ -17,10 +13,7 @@ subdir-$(CONFIG_MODVERSIONS) += genksyms # Let clean descend into subdirs -subdir- += lxdialog kconfig - -# fixdep is needed to compile other host programs -$(addprefix $(obj)/,$(filter-out fixdep,$(always)) $(subdir-y)): $(obj)/fixdep +subdir- += basic lxdialog kconfig # dependencies on generated files need to be listed explicitly diff -Nru a/scripts/Makefile.build b/scripts/Makefile.build --- a/scripts/Makefile.build Wed Mar 17 19:29:10 2004 +++ b/scripts/Makefile.build Wed Mar 17 19:29:10 2004 @@ -162,7 +162,7 @@ $(if $($(quiet)cmd_cc_o_c),echo ' $($(quiet)cmd_cc_o_c)';) \ $(cmd_cc_o_c); \ $(cmd_modversions) \ - scripts/fixdep $(depfile) $@ '$(cmd_cc_o_c)' > $(@D)/.$(@F).tmp; \ + scripts/basic/fixdep $(depfile) $@ '$(cmd_cc_o_c)' > $(@D)/.$(@F).tmp; \ rm -f $(depfile); \ mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd endef diff -Nru a/scripts/Makefile.lib b/scripts/Makefile.lib --- a/scripts/Makefile.lib Wed Mar 17 19:29:09 2004 +++ b/scripts/Makefile.lib Wed Mar 17 19:29:09 2004 @@ -249,7 +249,7 @@ @set -e; \ $(if $($(quiet)cmd_$(1)),echo ' $(subst ','\'',$($(quiet)cmd_$(1)))';) \ $(cmd_$(1)); \ - scripts/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \ + scripts/basic/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \ rm -f $(depfile); \ mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd) diff -Nru a/scripts/basic/Makefile b/scripts/basic/Makefile --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/scripts/basic/Makefile Wed Mar 17 19:29:10 2004 @@ -0,0 +1,18 @@ +### +# Makefile.basic list the most basic programs used during the build process. +# The programs listed herein is what is needed to do the basic stuff, +# such as splitting .config and fix dependency file. +# This initial step is needed to avoid files to be recompiled +# when kernel configuration changes (which is what happens when +# .config is included by main Makefile. +# --------------------------------------------------------------------------- +# fixdep: Used to generate dependency information during build process +# split-include: Divide all config symbols up in a number of files in +# include/config/... +# docproc: Used in Documentation/docbook + +host-progs := fixdep split-include docproc +always := $(host-progs) + +# fixdep is needed to compile other host programs +$(addprefix $(obj)/,$(filter-out fixdep,$(always))): $(obj)/fixdep diff -Nru a/scripts/basic/docproc.c b/scripts/basic/docproc.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/scripts/basic/docproc.c Wed Mar 17 19:29:09 2004 @@ -0,0 +1,387 @@ +/* + * docproc is a simple preprocessor for the template files + * used as placeholders for the kernel internal documentation. + * docproc is used for documentation-frontend and + * dependency-generator. + * The two usages have in common that they require + * some knowledge of the .tmpl syntax, therefore they + * are kept together. + * + * documentation-frontend + * Scans the template file and call kernel-doc for + * all occurrences of ![EIF]file + * Beforehand each referenced file are scanned for + * any exported sympols "EXPORT_SYMBOL()" statements. + * This is used to create proper -function and + * -nofunction arguments in calls to kernel-doc. + * Usage: docproc doc file.tmpl + * + * dependency-generator: + * Scans the template file and list all files + * referenced in a format recognized by make. + * Usage: docproc depend file.tmpl + * Writes dependency information to stdout + * in the following format: + * file.tmpl src.c src2.c + * The filenames are obtained from the following constructs: + * !Efilename + * !Ifilename + * !Dfilename + * !Ffilename + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* exitstatus is used to keep track of any failing calls to kernel-doc, + * but execution continues. */ +int exitstatus = 0; + +typedef void DFL(char *); +DFL *defaultline; + +typedef void FILEONLY(char * file); +FILEONLY *internalfunctions; +FILEONLY *externalfunctions; +FILEONLY *symbolsonly; + +typedef void FILELINE(char * file, char * line); +FILELINE * singlefunctions; +FILELINE * entity_system; + +#define MAXLINESZ 2048 +#define MAXFILES 250 +#define KERNELDOCPATH "scripts/" +#define KERNELDOC "kernel-doc" +#define DOCBOOK "-docbook" +#define FUNCTION "-function" +#define NOFUNCTION "-nofunction" + +void usage (void) +{ + fprintf(stderr, "Usage: docproc {doc|depend} file\n"); + fprintf(stderr, "Input is read from file.tmpl. Output is sent to stdout\n"); + fprintf(stderr, "doc: frontend when generating kernel documentation\n"); + fprintf(stderr, "depend: generate list of files referenced within file\n"); +} + +/* + * Execute kernel-doc with parameters givin in svec + */ +void exec_kernel_doc(char **svec) +{ + pid_t pid; + int ret; + /* Make sure output generated so far are flushed */ + fflush(stdout); + switch(pid=fork()) { + case -1: + perror("fork"); + exit(1); + case 0: + execvp(KERNELDOCPATH KERNELDOC, svec); + perror("exec " KERNELDOCPATH KERNELDOC); + exit(1); + default: + waitpid(pid, &ret ,0); + } + if (WIFEXITED(ret)) + exitstatus |= WEXITSTATUS(ret); + else + exitstatus = 0xff; +} + +/* Types used to create list of all exported symbols in a number of files */ +struct symbols +{ + char *name; +}; + +struct symfile +{ + char *filename; + struct symbols *symbollist; + int symbolcnt; +}; + +struct symfile symfilelist[MAXFILES]; +int symfilecnt = 0; + +void add_new_symbol(struct symfile *sym, char * symname) +{ + sym->symbollist = + realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); + sym->symbollist[sym->symbolcnt++].name = strdup(symname); +} + +/* Add a filename to the list */ +struct symfile * add_new_file(char * filename) +{ + symfilelist[symfilecnt++].filename = strdup(filename); + return &symfilelist[symfilecnt - 1]; +} +/* Check if file already are present in the list */ +struct symfile * filename_exist(char * filename) +{ + int i; + for (i=0; i < symfilecnt; i++) + if (strcmp(symfilelist[i].filename, filename) == 0) + return &symfilelist[i]; + return NULL; +} + +/* + * List all files referenced within the template file. + * Files are separated by tabs. + */ +void adddep(char * file) { printf("\t%s", file); } +void adddep2(char * file, char * line) { line = line; adddep(file); } +void noaction(char * line) { line = line; } +void noaction2(char * file, char * line) { file = file; line = line; } + +/* Echo the line without further action */ +void printline(char * line) { printf("%s", line); } + +/* + * Find all symbols exported with EXPORT_SYMBOL and EXPORT_SYMBOL_GPL + * in filename. + * All symbols located are stored in symfilelist. + */ +void find_export_symbols(char * filename) +{ + FILE * fp; + struct symfile *sym; + char line[MAXLINESZ]; + if (filename_exist(filename) == NULL) { + sym = add_new_file(filename); + fp = fopen(filename, "r"); + if (fp == NULL) + { + fprintf(stderr, "docproc: "); + perror(filename); + } + while(fgets(line, MAXLINESZ, fp)) { + char *p; + char *e; + if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) || + ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) { + /* Skip EXPORT_SYMBOL{_GPL} */ + while (isalnum(*p) || *p == '_') + p++; + /* Remove paranteses and additional ws */ + while (isspace(*p)) + p++; + if (*p != '(') + continue; /* Syntax error? */ + else + p++; + while (isspace(*p)) + p++; + e = p; + while (isalnum(*e) || *e == '_') + e++; + *e = '\0'; + add_new_symbol(sym, p); + } + } + fclose(fp); + } +} + +/* + * Document all external or internal functions in a file. + * Call kernel-doc with following parameters: + * kernel-doc -docbook -nofunction function_name1 filename + * function names are obtained from all the the src files + * by find_export_symbols. + * intfunc uses -nofunction + * extfunc uses -function + */ +void docfunctions(char * filename, char * type) +{ + int i,j; + int symcnt = 0; + int idx = 0; + char **vec; + + for (i=0; i <= symfilecnt; i++) + symcnt += symfilelist[i].symbolcnt; + vec = malloc((2 + 2 * symcnt + 2) * sizeof(char*)); + if (vec == NULL) { + perror("docproc: "); + exit(1); + } + vec[idx++] = KERNELDOC; + vec[idx++] = DOCBOOK; + for (i=0; i < symfilecnt; i++) { + struct symfile * sym = &symfilelist[i]; + for (j=0; j < sym->symbolcnt; j++) { + vec[idx++] = type; + vec[idx++] = sym->symbollist[j].name; + } + } + vec[idx++] = filename; + vec[idx] = NULL; + printf("\n", filename); + exec_kernel_doc(vec); + fflush(stdout); + free(vec); +} +void intfunc(char * filename) { docfunctions(filename, NOFUNCTION); } +void extfunc(char * filename) { docfunctions(filename, FUNCTION); } + +/* + * Document spåecific function(s) in a file. + * Call kernel-doc with the following parameters: + * kernel-doc -docbook -function function1 [-function function2] + */ +void singfunc(char * filename, char * line) +{ + char *vec[200]; /* Enough for specific functions */ + int i, idx = 0; + int startofsym = 1; + vec[idx++] = KERNELDOC; + vec[idx++] = DOCBOOK; + + /* Split line up in individual parameters preceeded by FUNCTION */ + for (i=0; line[i]; i++) { + if (isspace(line[i])) { + line[i] = '\0'; + startofsym = 1; + continue; + } + if (startofsym) { + startofsym = 0; + vec[idx++] = FUNCTION; + vec[idx++] = &line[i]; + } + } + vec[idx++] = filename; + vec[idx] = NULL; + exec_kernel_doc(vec); +} + +/* + * Parse file, calling action specific functions for: + * 1) Lines containing !E + * 2) Lines containing !I + * 3) Lines containing !D + * 4) Lines containing !F + * 5) Default lines - lines not matching the above + */ +void parse_file(FILE *infile) +{ + char line[MAXLINESZ]; + char * s; + while(fgets(line, MAXLINESZ, infile)) { + if (line[0] == '!') { + s = line + 2; + switch (line[1]) { + case 'E': + while (*s && !isspace(*s)) s++; + *s = '\0'; + externalfunctions(line+2); + break; + case 'I': + while (*s && !isspace(*s)) s++; + *s = '\0'; + internalfunctions(line+2); + break; + case 'D': + while (*s && !isspace(*s)) s++; + *s = '\0'; + symbolsonly(line+2); + break; + case 'F': + /* filename */ + while (*s && !isspace(*s)) s++; + *s++ = '\0'; + /* function names */ + while (isspace(*s)) + s++; + singlefunctions(line +2, s); + break; + default: + defaultline(line); + } + } + else { + defaultline(line); + } + } + fflush(stdout); +} + + +int main(int argc, char *argv[]) +{ + FILE * infile; + if (argc != 3) { + usage(); + exit(1); + } + /* Open file, exit on error */ + infile = fopen(argv[2], "r"); + if (infile == NULL) { + fprintf(stderr, "docproc: "); + perror(argv[2]); + exit(2); + } + + if (strcmp("doc", argv[1]) == 0) + { + /* Need to do this in two passes. + * First pass is used to collect all symbols exported + * in the various files. + * Second pass generate the documentation. + * This is required because function are declared + * and exported in different files :-(( + */ + /* Collect symbols */ + defaultline = noaction; + internalfunctions = find_export_symbols; + externalfunctions = find_export_symbols; + symbolsonly = find_export_symbols; + singlefunctions = noaction2; + parse_file(infile); + + /* Rewind to start from beginning of file again */ + fseek(infile, 0, SEEK_SET); + defaultline = printline; + internalfunctions = intfunc; + externalfunctions = extfunc; + symbolsonly = printline; + singlefunctions = singfunc; + + parse_file(infile); + } + else if (strcmp("depend", argv[1]) == 0) + { + /* Create first part of dependency chain + * file.tmpl */ + printf("%s\t", argv[2]); + defaultline = noaction; + internalfunctions = adddep; + externalfunctions = adddep; + symbolsonly = adddep; + singlefunctions = adddep2; + parse_file(infile); + printf("\n"); + } + else + { + fprintf(stderr, "Unknown option: %s\n", argv[1]); + exit(1); + } + fclose(infile); + fflush(stdout); + return exitstatus; +} + diff -Nru a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/scripts/basic/fixdep.c Wed Mar 17 19:29:09 2004 @@ -0,0 +1,381 @@ +/* + * "Optimize" a list of dependencies as spit out by gcc -MD + * for the kernel build + * =========================================================================== + * + * Author Kai Germaschewski + * Copyright 2002 by Kai Germaschewski + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * + * + * Introduction: + * + * gcc produces a very nice and correct list of dependencies which + * tells make when to remake a file. + * + * To use this list as-is however has the drawback that virtually + * every file in the kernel includes which then again + * includes + * + * If the user re-runs make *config, linux/autoconf.h will be + * regenerated. make notices that and will rebuild every file which + * includes autoconf.h, i.e. basically all files. This is extremely + * annoying if the user just changed CONFIG_HIS_DRIVER from n to m. + * + * So we play the same trick that "mkdep" played before. We replace + * the dependency on linux/autoconf.h by a dependency on every config + * option which is mentioned in any of the listed prequisites. + * + * To be exact, split-include populates a tree in include/config/, + * e.g. include/config/his/driver.h, which contains the #define/#undef + * for the CONFIG_HIS_DRIVER option. + * + * So if the user changes his CONFIG_HIS_DRIVER option, only the objects + * which depend on "include/linux/config/his/driver.h" will be rebuilt, + * so most likely only his driver ;-) + * + * The idea above dates, by the way, back to Michael E Chastain, AFAIK. + * + * So to get dependencies right, there two issues: + * o if any of the files the compiler read changed, we need to rebuild + * o if the command line given to the compile the file changed, we + * better rebuild as well. + * + * The former is handled by using the -MD output, the later by saving + * the command line used to compile the old object and comparing it + * to the one we would now use. + * + * Again, also this idea is pretty old and has been discussed on + * kbuild-devel a long time ago. I don't have a sensibly working + * internet connection right now, so I rather don't mention names + * without double checking. + * + * This code here has been based partially based on mkdep.c, which + * says the following about its history: + * + * Copyright abandoned, Michael Chastain, . + * This is a C version of syncdep.pl by Werner Almesberger. + * + * + * It is invoked as + * + * fixdep + * + * and will read the dependency file + * + * The transformed dependency snipped is written to stdout. + * + * It first generates a line + * + * cmd_ = + * + * and then basically copies the ..d file to stdout, in the + * process filtering out the dependency on linux/autoconf.h and adding + * dependencies on include/config/my/option.h for every + * CONFIG_MY_OPTION encountered in any of the prequisites. + * + * It will also filter out all the dependencies on *.ver. We need + * to make sure that the generated version checksum are globally up + * to date before even starting the recursive build, so it's too late + * at this point anyway. + * + * The algorithm to grep for "CONFIG_..." is bit unusual, but should + * be fast ;-) We don't even try to really parse the header files, but + * merely grep, i.e. if CONFIG_FOO is mentioned in a comment, it will + * be picked up as well. It's not a problem with respect to + * correctness, since that can only give too many dependencies, thus + * we cannot miss a rebuild. Since people tend to not mention totally + * unrelated CONFIG_ options all over the place, it's not an + * efficiency problem either. + * + * (Note: it'd be easy to port over the complete mkdep state machine, + * but I don't think the added complexity is worth it) + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define INT_CONF ntohl(0x434f4e46) +#define INT_ONFI ntohl(0x4f4e4649) +#define INT_NFIG ntohl(0x4e464947) +#define INT_FIG_ ntohl(0x4649475f) + +char *target; +char *depfile; +char *cmdline; + +void usage(void) + +{ + fprintf(stderr, "Usage: fixdep \n"); + exit(1); +} + +void print_cmdline(void) +{ + printf("cmd_%s := %s\n\n", target, cmdline); +} + +char * str_config = NULL; +int size_config = 0; +int len_config = 0; + +/* + * Grow the configuration string to a desired length. + * Usually the first growth is plenty. + */ +void grow_config(int len) +{ + while (len_config + len > size_config) { + if (size_config == 0) + size_config = 2048; + str_config = realloc(str_config, size_config *= 2); + if (str_config == NULL) + { perror("fixdep:malloc"); exit(1); } + } +} + + + +/* + * Lookup a value in the configuration string. + */ +int is_defined_config(const char * name, int len) +{ + const char * pconfig; + const char * plast = str_config + len_config - len; + for ( pconfig = str_config + 1; pconfig < plast; pconfig++ ) { + if (pconfig[ -1] == '\n' + && pconfig[len] == '\n' + && !memcmp(pconfig, name, len)) + return 1; + } + return 0; +} + +/* + * Add a new value to the configuration string. + */ +void define_config(const char * name, int len) +{ + grow_config(len + 1); + + memcpy(str_config+len_config, name, len); + len_config += len; + str_config[len_config++] = '\n'; +} + +/* + * Clear the set of configuration strings. + */ +void clear_config(void) +{ + len_config = 0; + define_config("", 0); +} + +/* + * Record the use of a CONFIG_* word. + */ +void use_config(char *m, int slen) +{ + char s[PATH_MAX]; + char *p; + + if (is_defined_config(m, slen)) + return; + + define_config(m, slen); + + memcpy(s, m, slen); s[slen] = 0; + + for (p = s; p < s + slen; p++) { + if (*p == '_') + *p = '/'; + else + *p = tolower((unsigned char)*p); + } + printf(" $(wildcard include/config/%s.h) \\\n", s); +} + +void parse_config_file(char *map, size_t len) +{ + int *end = (int *) (map + len); + /* start at +1, so that p can never be < map */ + int *m = (int *) map + 1; + char *p, *q; + + for (; m < end; m++) { + if (*m == INT_CONF) { p = (char *) m ; goto conf; } + if (*m == INT_ONFI) { p = (char *) m-1; goto conf; } + if (*m == INT_NFIG) { p = (char *) m-2; goto conf; } + if (*m == INT_FIG_) { p = (char *) m-3; goto conf; } + continue; + conf: + if (p > map + len - 7) + continue; + if (memcmp(p, "CONFIG_", 7)) + continue; + for (q = p + 7; q < map + len; q++) { + if (!(isalnum(*q) || *q == '_')) + goto found; + } + continue; + + found: + use_config(p+7, q-p-7); + } +} + +/* test is s ends in sub */ +int strrcmp(char *s, char *sub) +{ + int slen = strlen(s); + int sublen = strlen(sub); + + if (sublen > slen) + return 1; + + return memcmp(s + slen - sublen, sub, sublen); +} + +void do_config_file(char *filename) +{ + struct stat st; + int fd; + void *map; + + fd = open(filename, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "fixdep: "); + perror(filename); + exit(2); + } + fstat(fd, &st); + if (st.st_size == 0) { + close(fd); + return; + } + map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); + if ((long) map == -1) { + perror("fixdep: mmap"); + close(fd); + return; + } + + parse_config_file(map, st.st_size); + + munmap(map, st.st_size); + + close(fd); +} + +void parse_dep_file(void *map, size_t len) +{ + char *m = map; + char *end = m + len; + char *p; + char s[PATH_MAX]; + + p = strchr(m, ':'); + if (!p) { + fprintf(stderr, "fixdep: parse error\n"); + exit(1); + } + memcpy(s, m, p-m); s[p-m] = 0; + printf("deps_%s := \\\n", target); + m = p+1; + + clear_config(); + + while (m < end) { + while (m < end && (*m == ' ' || *m == '\\' || *m == '\n')) + m++; + p = m; + while (p < end && *p != ' ') p++; + if (p == end) { + do p--; while (!isalnum(*p)); + p++; + } + memcpy(s, m, p-m); s[p-m] = 0; + if (strrcmp(s, "include/linux/autoconf.h") && + strrcmp(s, ".ver")) { + printf(" %s \\\n", s); + do_config_file(s); + } + m = p + 1; + } + printf("\n%s: $(deps_%s)\n\n", target, target); + printf("$(deps_%s):\n", target); +} + +void print_deps(void) +{ + struct stat st; + int fd; + void *map; + + fd = open(depfile, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "fixdep: "); + perror(depfile); + exit(2); + } + fstat(fd, &st); + if (st.st_size == 0) { + fprintf(stderr,"fixdep: %s is empty\n",depfile); + close(fd); + return; + } + map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); + if ((long) map == -1) { + perror("fixdep: mmap"); + close(fd); + return; + } + + parse_dep_file(map, st.st_size); + + munmap(map, st.st_size); + + close(fd); +} + +void traps(void) +{ + static char test[] __attribute__((aligned(sizeof(int)))) = "CONF"; + + if (*(int *)test != INT_CONF) { + fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", + *(int *)test); + exit(2); + } +} + +int main(int argc, char *argv[]) +{ + traps(); + + if (argc != 4) + usage(); + + depfile = argv[1]; + target = argv[2]; + cmdline = argv[3]; + + print_cmdline(); + print_deps(); + + return 0; +} diff -Nru a/scripts/basic/split-include.c b/scripts/basic/split-include.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/scripts/basic/split-include.c Wed Mar 17 19:29:09 2004 @@ -0,0 +1,226 @@ +/* + * split-include.c + * + * Copyright abandoned, Michael Chastain, . + * This is a C version of syncdep.pl by Werner Almesberger. + * + * This program takes autoconf.h as input and outputs a directory full + * of one-line include files, merging onto the old values. + * + * Think of the configuration options as key-value pairs. Then there + * are five cases: + * + * key old value new value action + * + * KEY-1 VALUE-1 VALUE-1 leave file alone + * KEY-2 VALUE-2A VALUE-2B write VALUE-2B into file + * KEY-3 - VALUE-3 write VALUE-3 into file + * KEY-4 VALUE-4 - write an empty file + * KEY-5 (empty) - leave old empty file alone + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#define ERROR_EXIT(strExit) \ + { \ + const int errnoSave = errno; \ + fprintf(stderr, "%s: ", str_my_name); \ + errno = errnoSave; \ + perror((strExit)); \ + exit(1); \ + } + + + +int main(int argc, const char * argv []) +{ + const char * str_my_name; + const char * str_file_autoconf; + const char * str_dir_config; + + FILE * fp_config; + FILE * fp_target; + FILE * fp_find; + + int buffer_size; + + char * line; + char * old_line; + char * list_target; + char * ptarget; + + struct stat stat_buf; + + /* Check arg count. */ + if (argc != 3) + { + fprintf(stderr, "%s: wrong number of arguments.\n", argv[0]); + exit(1); + } + + str_my_name = argv[0]; + str_file_autoconf = argv[1]; + str_dir_config = argv[2]; + + /* Find a buffer size. */ + if (stat(str_file_autoconf, &stat_buf) != 0) + ERROR_EXIT(str_file_autoconf); + buffer_size = 2 * stat_buf.st_size + 4096; + + /* Allocate buffers. */ + if ( (line = malloc(buffer_size)) == NULL + || (old_line = malloc(buffer_size)) == NULL + || (list_target = malloc(buffer_size)) == NULL ) + ERROR_EXIT(str_file_autoconf); + + /* Open autoconfig file. */ + if ((fp_config = fopen(str_file_autoconf, "r")) == NULL) + ERROR_EXIT(str_file_autoconf); + + /* Make output directory if needed. */ + if (stat(str_dir_config, &stat_buf) != 0) + { + if (mkdir(str_dir_config, 0755) != 0) + ERROR_EXIT(str_dir_config); + } + + /* Change to output directory. */ + if (chdir(str_dir_config) != 0) + ERROR_EXIT(str_dir_config); + + /* Put initial separator into target list. */ + ptarget = list_target; + *ptarget++ = '\n'; + + /* Read config lines. */ + while (fgets(line, buffer_size, fp_config)) + { + const char * str_config; + int is_same; + int itarget; + + if (line[0] != '#') + continue; + if ((str_config = strstr(line, "CONFIG_")) == NULL) + continue; + + /* Make the output file name. */ + str_config += sizeof("CONFIG_") - 1; + for (itarget = 0; !isspace(str_config[itarget]); itarget++) + { + int c = (unsigned char) str_config[itarget]; + if (isupper(c)) c = tolower(c); + if (c == '_') c = '/'; + ptarget[itarget] = c; + } + ptarget[itarget++] = '.'; + ptarget[itarget++] = 'h'; + ptarget[itarget++] = '\0'; + + /* Check for existing file. */ + is_same = 0; + if ((fp_target = fopen(ptarget, "r")) != NULL) + { + fgets(old_line, buffer_size, fp_target); + if (fclose(fp_target) != 0) + ERROR_EXIT(ptarget); + if (!strcmp(line, old_line)) + is_same = 1; + } + + if (!is_same) + { + /* Auto-create directories. */ + int islash; + for (islash = 0; islash < itarget; islash++) + { + if (ptarget[islash] == '/') + { + ptarget[islash] = '\0'; + if (stat(ptarget, &stat_buf) != 0 + && mkdir(ptarget, 0755) != 0) + ERROR_EXIT( ptarget ); + ptarget[islash] = '/'; + } + } + + /* Write the file. */ + if ((fp_target = fopen(ptarget, "w" )) == NULL) + ERROR_EXIT(ptarget); + fputs(line, fp_target); + if (ferror(fp_target) || fclose(fp_target) != 0) + ERROR_EXIT(ptarget); + } + + /* Update target list */ + ptarget += itarget; + *(ptarget-1) = '\n'; + } + + /* + * Close autoconfig file. + * Terminate the target list. + */ + if (fclose(fp_config) != 0) + ERROR_EXIT(str_file_autoconf); + *ptarget = '\0'; + + /* + * Fix up existing files which have no new value. + * This is Case 4 and Case 5. + * + * I re-read the tree and filter it against list_target. + * This is crude. But it avoids data copies. Also, list_target + * is compact and contiguous, so it easily fits into cache. + * + * Notice that list_target contains strings separated by \n, + * with a \n before the first string and after the last. + * fgets gives the incoming names a terminating \n. + * So by having an initial \n, strstr will find exact matches. + */ + + fp_find = popen("find * -type f -name \"*.h\" -print", "r"); + if (fp_find == 0) + ERROR_EXIT( "find" ); + + line[0] = '\n'; + while (fgets(line+1, buffer_size, fp_find)) + { + if (strstr(list_target, line) == NULL) + { + /* + * This is an old file with no CONFIG_* flag in autoconf.h. + */ + + /* First strip the \n. */ + line[strlen(line)-1] = '\0'; + + /* Grab size. */ + if (stat(line+1, &stat_buf) != 0) + ERROR_EXIT(line); + + /* If file is not empty, make it empty and give it a fresh date. */ + if (stat_buf.st_size != 0) + { + if ((fp_target = fopen(line+1, "w")) == NULL) + ERROR_EXIT(line); + if (fclose(fp_target) != 0) + ERROR_EXIT(line); + } + } + } + + if (pclose(fp_find) != 0) + ERROR_EXIT("find"); + + return 0; +} diff -Nru a/scripts/docproc.c b/scripts/docproc.c --- a/scripts/docproc.c Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,387 +0,0 @@ -/* - * docproc is a simple preprocessor for the template files - * used as placeholders for the kernel internal documentation. - * docproc is used for documentation-frontend and - * dependency-generator. - * The two usages have in common that they require - * some knowledge of the .tmpl syntax, therefore they - * are kept together. - * - * documentation-frontend - * Scans the template file and call kernel-doc for - * all occurrences of ![EIF]file - * Beforehand each referenced file are scanned for - * any exported sympols "EXPORT_SYMBOL()" statements. - * This is used to create proper -function and - * -nofunction arguments in calls to kernel-doc. - * Usage: docproc doc file.tmpl - * - * dependency-generator: - * Scans the template file and list all files - * referenced in a format recognized by make. - * Usage: docproc depend file.tmpl - * Writes dependency information to stdout - * in the following format: - * file.tmpl src.c src2.c - * The filenames are obtained from the following constructs: - * !Efilename - * !Ifilename - * !Dfilename - * !Ffilename - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* exitstatus is used to keep track of any failing calls to kernel-doc, - * but execution continues. */ -int exitstatus = 0; - -typedef void DFL(char *); -DFL *defaultline; - -typedef void FILEONLY(char * file); -FILEONLY *internalfunctions; -FILEONLY *externalfunctions; -FILEONLY *symbolsonly; - -typedef void FILELINE(char * file, char * line); -FILELINE * singlefunctions; -FILELINE * entity_system; - -#define MAXLINESZ 2048 -#define MAXFILES 250 -#define KERNELDOCPATH "scripts/" -#define KERNELDOC "kernel-doc" -#define DOCBOOK "-docbook" -#define FUNCTION "-function" -#define NOFUNCTION "-nofunction" - -void usage (void) -{ - fprintf(stderr, "Usage: docproc {doc|depend} file\n"); - fprintf(stderr, "Input is read from file.tmpl. Output is sent to stdout\n"); - fprintf(stderr, "doc: frontend when generating kernel documentation\n"); - fprintf(stderr, "depend: generate list of files referenced within file\n"); -} - -/* - * Execute kernel-doc with parameters givin in svec - */ -void exec_kernel_doc(char **svec) -{ - pid_t pid; - int ret; - /* Make sure output generated so far are flushed */ - fflush(stdout); - switch(pid=fork()) { - case -1: - perror("fork"); - exit(1); - case 0: - execvp(KERNELDOCPATH KERNELDOC, svec); - perror("exec " KERNELDOCPATH KERNELDOC); - exit(1); - default: - waitpid(pid, &ret ,0); - } - if (WIFEXITED(ret)) - exitstatus |= WEXITSTATUS(ret); - else - exitstatus = 0xff; -} - -/* Types used to create list of all exported symbols in a number of files */ -struct symbols -{ - char *name; -}; - -struct symfile -{ - char *filename; - struct symbols *symbollist; - int symbolcnt; -}; - -struct symfile symfilelist[MAXFILES]; -int symfilecnt = 0; - -void add_new_symbol(struct symfile *sym, char * symname) -{ - sym->symbollist = - realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); - sym->symbollist[sym->symbolcnt++].name = strdup(symname); -} - -/* Add a filename to the list */ -struct symfile * add_new_file(char * filename) -{ - symfilelist[symfilecnt++].filename = strdup(filename); - return &symfilelist[symfilecnt - 1]; -} -/* Check if file already are present in the list */ -struct symfile * filename_exist(char * filename) -{ - int i; - for (i=0; i < symfilecnt; i++) - if (strcmp(symfilelist[i].filename, filename) == 0) - return &symfilelist[i]; - return NULL; -} - -/* - * List all files referenced within the template file. - * Files are separated by tabs. - */ -void adddep(char * file) { printf("\t%s", file); } -void adddep2(char * file, char * line) { line = line; adddep(file); } -void noaction(char * line) { line = line; } -void noaction2(char * file, char * line) { file = file; line = line; } - -/* Echo the line without further action */ -void printline(char * line) { printf("%s", line); } - -/* - * Find all symbols exported with EXPORT_SYMBOL and EXPORT_SYMBOL_GPL - * in filename. - * All symbols located are stored in symfilelist. - */ -void find_export_symbols(char * filename) -{ - FILE * fp; - struct symfile *sym; - char line[MAXLINESZ]; - if (filename_exist(filename) == NULL) { - sym = add_new_file(filename); - fp = fopen(filename, "r"); - if (fp == NULL) - { - fprintf(stderr, "docproc: "); - perror(filename); - } - while(fgets(line, MAXLINESZ, fp)) { - char *p; - char *e; - if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) || - ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) { - /* Skip EXPORT_SYMBOL{_GPL} */ - while (isalnum(*p) || *p == '_') - p++; - /* Remove paranteses and additional ws */ - while (isspace(*p)) - p++; - if (*p != '(') - continue; /* Syntax error? */ - else - p++; - while (isspace(*p)) - p++; - e = p; - while (isalnum(*e) || *e == '_') - e++; - *e = '\0'; - add_new_symbol(sym, p); - } - } - fclose(fp); - } -} - -/* - * Document all external or internal functions in a file. - * Call kernel-doc with following parameters: - * kernel-doc -docbook -nofunction function_name1 filename - * function names are obtained from all the the src files - * by find_export_symbols. - * intfunc uses -nofunction - * extfunc uses -function - */ -void docfunctions(char * filename, char * type) -{ - int i,j; - int symcnt = 0; - int idx = 0; - char **vec; - - for (i=0; i <= symfilecnt; i++) - symcnt += symfilelist[i].symbolcnt; - vec = malloc((2 + 2 * symcnt + 2) * sizeof(char*)); - if (vec == NULL) { - perror("docproc: "); - exit(1); - } - vec[idx++] = KERNELDOC; - vec[idx++] = DOCBOOK; - for (i=0; i < symfilecnt; i++) { - struct symfile * sym = &symfilelist[i]; - for (j=0; j < sym->symbolcnt; j++) { - vec[idx++] = type; - vec[idx++] = sym->symbollist[j].name; - } - } - vec[idx++] = filename; - vec[idx] = NULL; - printf("\n", filename); - exec_kernel_doc(vec); - fflush(stdout); - free(vec); -} -void intfunc(char * filename) { docfunctions(filename, NOFUNCTION); } -void extfunc(char * filename) { docfunctions(filename, FUNCTION); } - -/* - * Document spåecific function(s) in a file. - * Call kernel-doc with the following parameters: - * kernel-doc -docbook -function function1 [-function function2] - */ -void singfunc(char * filename, char * line) -{ - char *vec[200]; /* Enough for specific functions */ - int i, idx = 0; - int startofsym = 1; - vec[idx++] = KERNELDOC; - vec[idx++] = DOCBOOK; - - /* Split line up in individual parameters preceeded by FUNCTION */ - for (i=0; line[i]; i++) { - if (isspace(line[i])) { - line[i] = '\0'; - startofsym = 1; - continue; - } - if (startofsym) { - startofsym = 0; - vec[idx++] = FUNCTION; - vec[idx++] = &line[i]; - } - } - vec[idx++] = filename; - vec[idx] = NULL; - exec_kernel_doc(vec); -} - -/* - * Parse file, calling action specific functions for: - * 1) Lines containing !E - * 2) Lines containing !I - * 3) Lines containing !D - * 4) Lines containing !F - * 5) Default lines - lines not matching the above - */ -void parse_file(FILE *infile) -{ - char line[MAXLINESZ]; - char * s; - while(fgets(line, MAXLINESZ, infile)) { - if (line[0] == '!') { - s = line + 2; - switch (line[1]) { - case 'E': - while (*s && !isspace(*s)) s++; - *s = '\0'; - externalfunctions(line+2); - break; - case 'I': - while (*s && !isspace(*s)) s++; - *s = '\0'; - internalfunctions(line+2); - break; - case 'D': - while (*s && !isspace(*s)) s++; - *s = '\0'; - symbolsonly(line+2); - break; - case 'F': - /* filename */ - while (*s && !isspace(*s)) s++; - *s++ = '\0'; - /* function names */ - while (isspace(*s)) - s++; - singlefunctions(line +2, s); - break; - default: - defaultline(line); - } - } - else { - defaultline(line); - } - } - fflush(stdout); -} - - -int main(int argc, char *argv[]) -{ - FILE * infile; - if (argc != 3) { - usage(); - exit(1); - } - /* Open file, exit on error */ - infile = fopen(argv[2], "r"); - if (infile == NULL) { - fprintf(stderr, "docproc: "); - perror(argv[2]); - exit(2); - } - - if (strcmp("doc", argv[1]) == 0) - { - /* Need to do this in two passes. - * First pass is used to collect all symbols exported - * in the various files. - * Second pass generate the documentation. - * This is required because function are declared - * and exported in different files :-(( - */ - /* Collect symbols */ - defaultline = noaction; - internalfunctions = find_export_symbols; - externalfunctions = find_export_symbols; - symbolsonly = find_export_symbols; - singlefunctions = noaction2; - parse_file(infile); - - /* Rewind to start from beginning of file again */ - fseek(infile, 0, SEEK_SET); - defaultline = printline; - internalfunctions = intfunc; - externalfunctions = extfunc; - symbolsonly = printline; - singlefunctions = singfunc; - - parse_file(infile); - } - else if (strcmp("depend", argv[1]) == 0) - { - /* Create first part of dependency chain - * file.tmpl */ - printf("%s\t", argv[2]); - defaultline = noaction; - internalfunctions = adddep; - externalfunctions = adddep; - symbolsonly = adddep; - singlefunctions = adddep2; - parse_file(infile); - printf("\n"); - } - else - { - fprintf(stderr, "Unknown option: %s\n", argv[1]); - exit(1); - } - fclose(infile); - fflush(stdout); - return exitstatus; -} - diff -Nru a/scripts/fixdep.c b/scripts/fixdep.c --- a/scripts/fixdep.c Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,381 +0,0 @@ -/* - * "Optimize" a list of dependencies as spit out by gcc -MD - * for the kernel build - * =========================================================================== - * - * Author Kai Germaschewski - * Copyright 2002 by Kai Germaschewski - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - * - * - * Introduction: - * - * gcc produces a very nice and correct list of dependencies which - * tells make when to remake a file. - * - * To use this list as-is however has the drawback that virtually - * every file in the kernel includes which then again - * includes - * - * If the user re-runs make *config, linux/autoconf.h will be - * regenerated. make notices that and will rebuild every file which - * includes autoconf.h, i.e. basically all files. This is extremely - * annoying if the user just changed CONFIG_HIS_DRIVER from n to m. - * - * So we play the same trick that "mkdep" played before. We replace - * the dependency on linux/autoconf.h by a dependency on every config - * option which is mentioned in any of the listed prequisites. - * - * To be exact, split-include populates a tree in include/config/, - * e.g. include/config/his/driver.h, which contains the #define/#undef - * for the CONFIG_HIS_DRIVER option. - * - * So if the user changes his CONFIG_HIS_DRIVER option, only the objects - * which depend on "include/linux/config/his/driver.h" will be rebuilt, - * so most likely only his driver ;-) - * - * The idea above dates, by the way, back to Michael E Chastain, AFAIK. - * - * So to get dependencies right, there two issues: - * o if any of the files the compiler read changed, we need to rebuild - * o if the command line given to the compile the file changed, we - * better rebuild as well. - * - * The former is handled by using the -MD output, the later by saving - * the command line used to compile the old object and comparing it - * to the one we would now use. - * - * Again, also this idea is pretty old and has been discussed on - * kbuild-devel a long time ago. I don't have a sensibly working - * internet connection right now, so I rather don't mention names - * without double checking. - * - * This code here has been based partially based on mkdep.c, which - * says the following about its history: - * - * Copyright abandoned, Michael Chastain, . - * This is a C version of syncdep.pl by Werner Almesberger. - * - * - * It is invoked as - * - * fixdep - * - * and will read the dependency file - * - * The transformed dependency snipped is written to stdout. - * - * It first generates a line - * - * cmd_ = - * - * and then basically copies the ..d file to stdout, in the - * process filtering out the dependency on linux/autoconf.h and adding - * dependencies on include/config/my/option.h for every - * CONFIG_MY_OPTION encountered in any of the prequisites. - * - * It will also filter out all the dependencies on *.ver. We need - * to make sure that the generated version checksum are globally up - * to date before even starting the recursive build, so it's too late - * at this point anyway. - * - * The algorithm to grep for "CONFIG_..." is bit unusual, but should - * be fast ;-) We don't even try to really parse the header files, but - * merely grep, i.e. if CONFIG_FOO is mentioned in a comment, it will - * be picked up as well. It's not a problem with respect to - * correctness, since that can only give too many dependencies, thus - * we cannot miss a rebuild. Since people tend to not mention totally - * unrelated CONFIG_ options all over the place, it's not an - * efficiency problem either. - * - * (Note: it'd be easy to port over the complete mkdep state machine, - * but I don't think the added complexity is worth it) - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define INT_CONF ntohl(0x434f4e46) -#define INT_ONFI ntohl(0x4f4e4649) -#define INT_NFIG ntohl(0x4e464947) -#define INT_FIG_ ntohl(0x4649475f) - -char *target; -char *depfile; -char *cmdline; - -void usage(void) - -{ - fprintf(stderr, "Usage: fixdep \n"); - exit(1); -} - -void print_cmdline(void) -{ - printf("cmd_%s := %s\n\n", target, cmdline); -} - -char * str_config = NULL; -int size_config = 0; -int len_config = 0; - -/* - * Grow the configuration string to a desired length. - * Usually the first growth is plenty. - */ -void grow_config(int len) -{ - while (len_config + len > size_config) { - if (size_config == 0) - size_config = 2048; - str_config = realloc(str_config, size_config *= 2); - if (str_config == NULL) - { perror("fixdep:malloc"); exit(1); } - } -} - - - -/* - * Lookup a value in the configuration string. - */ -int is_defined_config(const char * name, int len) -{ - const char * pconfig; - const char * plast = str_config + len_config - len; - for ( pconfig = str_config + 1; pconfig < plast; pconfig++ ) { - if (pconfig[ -1] == '\n' - && pconfig[len] == '\n' - && !memcmp(pconfig, name, len)) - return 1; - } - return 0; -} - -/* - * Add a new value to the configuration string. - */ -void define_config(const char * name, int len) -{ - grow_config(len + 1); - - memcpy(str_config+len_config, name, len); - len_config += len; - str_config[len_config++] = '\n'; -} - -/* - * Clear the set of configuration strings. - */ -void clear_config(void) -{ - len_config = 0; - define_config("", 0); -} - -/* - * Record the use of a CONFIG_* word. - */ -void use_config(char *m, int slen) -{ - char s[PATH_MAX]; - char *p; - - if (is_defined_config(m, slen)) - return; - - define_config(m, slen); - - memcpy(s, m, slen); s[slen] = 0; - - for (p = s; p < s + slen; p++) { - if (*p == '_') - *p = '/'; - else - *p = tolower((unsigned char)*p); - } - printf(" $(wildcard include/config/%s.h) \\\n", s); -} - -void parse_config_file(char *map, size_t len) -{ - int *end = (int *) (map + len); - /* start at +1, so that p can never be < map */ - int *m = (int *) map + 1; - char *p, *q; - - for (; m < end; m++) { - if (*m == INT_CONF) { p = (char *) m ; goto conf; } - if (*m == INT_ONFI) { p = (char *) m-1; goto conf; } - if (*m == INT_NFIG) { p = (char *) m-2; goto conf; } - if (*m == INT_FIG_) { p = (char *) m-3; goto conf; } - continue; - conf: - if (p > map + len - 7) - continue; - if (memcmp(p, "CONFIG_", 7)) - continue; - for (q = p + 7; q < map + len; q++) { - if (!(isalnum(*q) || *q == '_')) - goto found; - } - continue; - - found: - use_config(p+7, q-p-7); - } -} - -/* test is s ends in sub */ -int strrcmp(char *s, char *sub) -{ - int slen = strlen(s); - int sublen = strlen(sub); - - if (sublen > slen) - return 1; - - return memcmp(s + slen - sublen, sub, sublen); -} - -void do_config_file(char *filename) -{ - struct stat st; - int fd; - void *map; - - fd = open(filename, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "fixdep: "); - perror(filename); - exit(2); - } - fstat(fd, &st); - if (st.st_size == 0) { - close(fd); - return; - } - map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if ((long) map == -1) { - perror("fixdep: mmap"); - close(fd); - return; - } - - parse_config_file(map, st.st_size); - - munmap(map, st.st_size); - - close(fd); -} - -void parse_dep_file(void *map, size_t len) -{ - char *m = map; - char *end = m + len; - char *p; - char s[PATH_MAX]; - - p = strchr(m, ':'); - if (!p) { - fprintf(stderr, "fixdep: parse error\n"); - exit(1); - } - memcpy(s, m, p-m); s[p-m] = 0; - printf("deps_%s := \\\n", target); - m = p+1; - - clear_config(); - - while (m < end) { - while (m < end && (*m == ' ' || *m == '\\' || *m == '\n')) - m++; - p = m; - while (p < end && *p != ' ') p++; - if (p == end) { - do p--; while (!isalnum(*p)); - p++; - } - memcpy(s, m, p-m); s[p-m] = 0; - if (strrcmp(s, "include/linux/autoconf.h") && - strrcmp(s, ".ver")) { - printf(" %s \\\n", s); - do_config_file(s); - } - m = p + 1; - } - printf("\n%s: $(deps_%s)\n\n", target, target); - printf("$(deps_%s):\n", target); -} - -void print_deps(void) -{ - struct stat st; - int fd; - void *map; - - fd = open(depfile, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "fixdep: "); - perror(depfile); - exit(2); - } - fstat(fd, &st); - if (st.st_size == 0) { - fprintf(stderr,"fixdep: %s is empty\n",depfile); - close(fd); - return; - } - map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if ((long) map == -1) { - perror("fixdep: mmap"); - close(fd); - return; - } - - parse_dep_file(map, st.st_size); - - munmap(map, st.st_size); - - close(fd); -} - -void traps(void) -{ - static char test[] __attribute__((aligned(sizeof(int)))) = "CONF"; - - if (*(int *)test != INT_CONF) { - fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", - *(int *)test); - exit(2); - } -} - -int main(int argc, char *argv[]) -{ - traps(); - - if (argc != 4) - usage(); - - depfile = argv[1]; - target = argv[2]; - cmdline = argv[3]; - - print_cmdline(); - print_deps(); - - return 0; -} diff -Nru a/scripts/modpost.c b/scripts/modpost.c --- a/scripts/modpost.c Wed Mar 17 19:29:09 2004 +++ b/scripts/modpost.c Wed Mar 17 19:29:09 2004 @@ -11,6 +11,7 @@ * Usage: modpost vmlinux module1.o module2.o ... */ +#include #include "modpost.h" /* Are we using CONFIG_MODVERSIONS? */ @@ -44,8 +45,6 @@ va_end(arglist); } -#define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__, #ptr) - void *do_nofail(void *ptr, const char *file, int line, const char *expr) { if (!ptr) { @@ -63,21 +62,19 @@ new_module(char *modname) { struct module *mod; - char *p; - size_t len; + char *p, *s; mod = NOFAIL(malloc(sizeof(*mod))); memset(mod, 0, sizeof(*mod)); p = NOFAIL(strdup(modname)); - len = strlen(p); - /* strip trailing .o */ - if (len > 2 && p[len-2] == '.' && p[len-1] == 'o') - p[len -2] = '\0'; + if ((s = strrchr(p, '.')) != NULL) + if (strcmp(s, ".o") == 0) + *s = '\0'; /* add to list */ - mod->name = NOFAIL(strdup(p)); + mod->name = p; mod->next = modules; modules = mod; @@ -207,6 +204,42 @@ if (map == MAP_FAILED) return NULL; return map; +} + +/* + Return a copy of the next line in a mmap'ed file. + spaces in the beginning of the line is trimmed away. + Return a pointer to a static buffer. +*/ +char* +get_next_line(unsigned long *pos, void *file, unsigned long size) +{ + static char line[4096]; + int skip = 1; + size_t len = 0; + char *p = (char *)file + *pos; + char *s = line; + + for (; *pos < size ; (*pos)++) + { + if (skip && isspace(*p)) { + p++; + continue; + } + skip = 0; + if (*p != '\n' && (*pos < size)) { + len++; + *s++ = *p++; + if (len > 4095) + break; /* Too long, stop */ + } else { + /* End of string */ + *s = '\0'; + return line; + } + } + /* End of buffer */ + return NULL; } void diff -Nru a/scripts/modpost.h b/scripts/modpost.h --- a/scripts/modpost.h Wed Mar 17 19:29:09 2004 +++ b/scripts/modpost.h Wed Mar 17 19:29:09 2004 @@ -53,6 +53,9 @@ #endif +#define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__, #ptr) +void *do_nofail(void *ptr, const char *file, int line, const char *expr); + struct buffer { char *p; int pos; @@ -95,4 +98,5 @@ unsigned long modinfo_offset); void *grab_file(const char *filename, unsigned long *size); +char* get_next_line(unsigned long *pos, void *file, unsigned long size); void release_file(void *file, unsigned long size); diff -Nru a/scripts/split-include.c b/scripts/split-include.c --- a/scripts/split-include.c Wed Mar 17 19:29:09 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,226 +0,0 @@ -/* - * split-include.c - * - * Copyright abandoned, Michael Chastain, . - * This is a C version of syncdep.pl by Werner Almesberger. - * - * This program takes autoconf.h as input and outputs a directory full - * of one-line include files, merging onto the old values. - * - * Think of the configuration options as key-value pairs. Then there - * are five cases: - * - * key old value new value action - * - * KEY-1 VALUE-1 VALUE-1 leave file alone - * KEY-2 VALUE-2A VALUE-2B write VALUE-2B into file - * KEY-3 - VALUE-3 write VALUE-3 into file - * KEY-4 VALUE-4 - write an empty file - * KEY-5 (empty) - leave old empty file alone - */ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#define ERROR_EXIT(strExit) \ - { \ - const int errnoSave = errno; \ - fprintf(stderr, "%s: ", str_my_name); \ - errno = errnoSave; \ - perror((strExit)); \ - exit(1); \ - } - - - -int main(int argc, const char * argv []) -{ - const char * str_my_name; - const char * str_file_autoconf; - const char * str_dir_config; - - FILE * fp_config; - FILE * fp_target; - FILE * fp_find; - - int buffer_size; - - char * line; - char * old_line; - char * list_target; - char * ptarget; - - struct stat stat_buf; - - /* Check arg count. */ - if (argc != 3) - { - fprintf(stderr, "%s: wrong number of arguments.\n", argv[0]); - exit(1); - } - - str_my_name = argv[0]; - str_file_autoconf = argv[1]; - str_dir_config = argv[2]; - - /* Find a buffer size. */ - if (stat(str_file_autoconf, &stat_buf) != 0) - ERROR_EXIT(str_file_autoconf); - buffer_size = 2 * stat_buf.st_size + 4096; - - /* Allocate buffers. */ - if ( (line = malloc(buffer_size)) == NULL - || (old_line = malloc(buffer_size)) == NULL - || (list_target = malloc(buffer_size)) == NULL ) - ERROR_EXIT(str_file_autoconf); - - /* Open autoconfig file. */ - if ((fp_config = fopen(str_file_autoconf, "r")) == NULL) - ERROR_EXIT(str_file_autoconf); - - /* Make output directory if needed. */ - if (stat(str_dir_config, &stat_buf) != 0) - { - if (mkdir(str_dir_config, 0755) != 0) - ERROR_EXIT(str_dir_config); - } - - /* Change to output directory. */ - if (chdir(str_dir_config) != 0) - ERROR_EXIT(str_dir_config); - - /* Put initial separator into target list. */ - ptarget = list_target; - *ptarget++ = '\n'; - - /* Read config lines. */ - while (fgets(line, buffer_size, fp_config)) - { - const char * str_config; - int is_same; - int itarget; - - if (line[0] != '#') - continue; - if ((str_config = strstr(line, "CONFIG_")) == NULL) - continue; - - /* Make the output file name. */ - str_config += sizeof("CONFIG_") - 1; - for (itarget = 0; !isspace(str_config[itarget]); itarget++) - { - int c = (unsigned char) str_config[itarget]; - if (isupper(c)) c = tolower(c); - if (c == '_') c = '/'; - ptarget[itarget] = c; - } - ptarget[itarget++] = '.'; - ptarget[itarget++] = 'h'; - ptarget[itarget++] = '\0'; - - /* Check for existing file. */ - is_same = 0; - if ((fp_target = fopen(ptarget, "r")) != NULL) - { - fgets(old_line, buffer_size, fp_target); - if (fclose(fp_target) != 0) - ERROR_EXIT(ptarget); - if (!strcmp(line, old_line)) - is_same = 1; - } - - if (!is_same) - { - /* Auto-create directories. */ - int islash; - for (islash = 0; islash < itarget; islash++) - { - if (ptarget[islash] == '/') - { - ptarget[islash] = '\0'; - if (stat(ptarget, &stat_buf) != 0 - && mkdir(ptarget, 0755) != 0) - ERROR_EXIT( ptarget ); - ptarget[islash] = '/'; - } - } - - /* Write the file. */ - if ((fp_target = fopen(ptarget, "w" )) == NULL) - ERROR_EXIT(ptarget); - fputs(line, fp_target); - if (ferror(fp_target) || fclose(fp_target) != 0) - ERROR_EXIT(ptarget); - } - - /* Update target list */ - ptarget += itarget; - *(ptarget-1) = '\n'; - } - - /* - * Close autoconfig file. - * Terminate the target list. - */ - if (fclose(fp_config) != 0) - ERROR_EXIT(str_file_autoconf); - *ptarget = '\0'; - - /* - * Fix up existing files which have no new value. - * This is Case 4 and Case 5. - * - * I re-read the tree and filter it against list_target. - * This is crude. But it avoids data copies. Also, list_target - * is compact and contiguous, so it easily fits into cache. - * - * Notice that list_target contains strings separated by \n, - * with a \n before the first string and after the last. - * fgets gives the incoming names a terminating \n. - * So by having an initial \n, strstr will find exact matches. - */ - - fp_find = popen("find * -type f -name \"*.h\" -print", "r"); - if (fp_find == 0) - ERROR_EXIT( "find" ); - - line[0] = '\n'; - while (fgets(line+1, buffer_size, fp_find)) - { - if (strstr(list_target, line) == NULL) - { - /* - * This is an old file with no CONFIG_* flag in autoconf.h. - */ - - /* First strip the \n. */ - line[strlen(line)-1] = '\0'; - - /* Grab size. */ - if (stat(line+1, &stat_buf) != 0) - ERROR_EXIT(line); - - /* If file is not empty, make it empty and give it a fresh date. */ - if (stat_buf.st_size != 0) - { - if ((fp_target = fopen(line+1, "w")) == NULL) - ERROR_EXIT(line); - if (fclose(fp_target) != 0) - ERROR_EXIT(line); - } - } - } - - if (pclose(fp_find) != 0) - ERROR_EXIT("find"); - - return 0; -} diff -Nru a/scripts/sumversion.c b/scripts/sumversion.c --- a/scripts/sumversion.c Wed Mar 17 19:29:09 2004 +++ b/scripts/sumversion.c Wed Mar 17 19:29:09 2004 @@ -323,12 +323,12 @@ * figure out source file. */ static int parse_source_files(const char *objfile, struct md4_ctx *md) { - char *cmd, *file, *p, *end; + char *cmd, *file, *line, *dir; const char *base; - unsigned long flen; - int dirlen, ret = 0; + unsigned long flen, pos = 0; + int dirlen, ret = 0, check_files = 0; - cmd = malloc(strlen(objfile) + sizeof("..cmd")); + cmd = NOFAIL(malloc(strlen(objfile) + sizeof("..cmd"))); base = strrchr(objfile, '/'); if (base) { @@ -339,6 +339,9 @@ dirlen = 0; sprintf(cmd, ".%s.cmd", objfile); } + dir = NOFAIL(malloc(dirlen + 1)); + strncpy(dir, objfile, dirlen); + dir[dirlen] = '\0'; file = grab_file(cmd, &flen); if (!file) { @@ -357,48 +360,38 @@ Sum all files in the same dir or subdirs. */ - /* Strictly illegal: file is not nul terminated. */ - p = strstr(file, "\ndeps_"); - if (!p) { - fprintf(stderr, "Warning: could not find deps_ line in %s\n", - cmd); - goto out_file; - } - p = strstr(p, ":="); - if (!p) { - fprintf(stderr, "Warning: could not find := line in %s\n", - cmd); - goto out_file; - } - p += strlen(":="); - p += strspn(p, " \\\n"); - - end = strstr(p, "\n\n"); - if (!end) { - fprintf(stderr, "Warning: could not find end line in %s\n", - cmd); - goto out_file; - } + while ((line = get_next_line(&pos, file, flen)) != NULL) { + char* p = line; + if (strncmp(line, "deps_", sizeof("deps_")-1) == 0) { + check_files = 1; + continue; + } + if (!check_files) + continue; - while (p < end) { - unsigned int len; + /* Continue until line does not end with '\' */ + if ( *(p + strlen(p)-1) != '\\') + break; + /* Terminate line at first space, to get rid of final ' \' */ + while (*p) { + if isspace(*p) { + *p = '\0'; + break; + } + p++; + } - len = strcspn(p, " \\\n"); - if (memcmp(objfile, p, dirlen) == 0) { - char source[len + 1]; - - memcpy(source, p, len); - source[len] = '\0'; - printf("parsing %s\n", source); - if (!parse_file(source, md)) { + /* Check if this file is in same dir as objfile */ + if ((strstr(line, dir)+strlen(dir)-1) == strrchr(line, '/')) { + if (!parse_file(line, md)) { fprintf(stderr, "Warning: could not open %s: %s\n", - source, strerror(errno)); + line, strerror(errno)); goto out_file; } + } - p += len; - p += strspn(p, " \\\n"); + } /* Everyone parsed OK */ @@ -406,6 +399,7 @@ out_file: release_file(file, flen); out: + free(dir); free(cmd); return ret; } diff -Nru a/scripts/ver_linux b/scripts/ver_linux --- a/scripts/ver_linux Wed Mar 17 19:29:09 2004 +++ b/scripts/ver_linux Wed Mar 17 19:29:09 2004 @@ -21,8 +21,9 @@ make --version 2>&1 | awk -F, '{print $1}' | awk \ '/GNU Make/{print "Gnu make ",$NF}' -ld -v 2>&1 | awk -F\) '{print $1}' | awk \ - '/BFD/{print "binutils ",$NF}' +ld -v | awk -F\) '{print $1}' | awk \ +'/BFD/{print "binutils ",$NF} \ +/^GNU/{print "binutils ",$4}' fdformat --version | awk -F\- '{print "util-linux ", $NF}' diff -Nru a/security/selinux/include/av_perm_to_string.h b/security/selinux/include/av_perm_to_string.h --- a/security/selinux/include/av_perm_to_string.h Wed Mar 17 19:29:10 2004 +++ b/security/selinux/include/av_perm_to_string.h Wed Mar 17 19:29:10 2004 @@ -84,6 +84,7 @@ { SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel" }, { SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user" }, { SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce" }, + { SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool" }, { SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info" }, { SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read" }, { SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod" }, diff -Nru a/security/selinux/include/av_permissions.h b/security/selinux/include/av_permissions.h --- a/security/selinux/include/av_permissions.h Wed Mar 17 19:29:09 2004 +++ b/security/selinux/include/av_permissions.h Wed Mar 17 19:29:09 2004 @@ -512,6 +512,7 @@ #define SECURITY__COMPUTE_RELABEL 0x00000020UL #define SECURITY__COMPUTE_USER 0x00000040UL #define SECURITY__SETENFORCE 0x00000080UL +#define SECURITY__SETBOOL 0x00000100UL #define SYSTEM__IPC_INFO 0x00000001UL #define SYSTEM__SYSLOG_READ 0x00000002UL diff -Nru a/security/selinux/include/conditional.h b/security/selinux/include/conditional.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/security/selinux/include/conditional.h Wed Mar 17 19:29:10 2004 @@ -0,0 +1,22 @@ +/* + * Interface to booleans in the security server. This is exported + * for the selinuxfs. + * + * Author: Karl MacMillan + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + +#ifndef _SELINUX_CONDITIONAL_H_ +#define _SELINUX_CONDITIONAL_H_ + +int security_get_bools(int *len, char ***names, int **values); + +int security_set_bools(int len, int *values); + +int security_get_bool_value(int bool); + +#endif diff -Nru a/security/selinux/include/security.h b/security/selinux/include/security.h --- a/security/selinux/include/security.h Wed Mar 17 19:29:09 2004 +++ b/security/selinux/include/security.h Wed Mar 17 19:29:09 2004 @@ -2,7 +2,9 @@ * Security server interface. * * Author : Stephen Smalley, + * */ + #ifndef _SELINUX_SECURITY_H_ #define _SELINUX_SECURITY_H_ @@ -13,12 +15,19 @@ #define SECCLASS_NULL 0x0000 /* no class */ #define SELINUX_MAGIC 0xf97cff8c -#define POLICYDB_VERSION 15 +#define POLICYDB_VERSION 16 +#define POLICYDB_VERSION_COMPAT 15 #ifdef CONFIG_SECURITY_SELINUX_BOOTPARAM extern int selinux_enabled; #else #define selinux_enabled 1 +#endif + +#ifdef CONFIG_SECURITY_SELINUX_MLS +#define selinux_mls_enabled 1 +#else +#define selinux_mls_enabled 0 #endif int security_load_policy(void * data, size_t len); diff -Nru a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c --- a/security/selinux/selinuxfs.c Wed Mar 17 19:29:10 2004 +++ b/security/selinux/selinuxfs.c Wed Mar 17 19:29:10 2004 @@ -1,5 +1,16 @@ +/* Updated: Karl MacMillan + * + * Added conditional policy language extensions + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + #include #include +#include #include #include #include @@ -7,6 +18,7 @@ #include #include #include +#include /* selinuxfs pseudo filesystem for exporting the security policy API. Based on the proc code and the fs/nfsd/nfsctl.c code. */ @@ -16,6 +28,14 @@ #include "avc_ss.h" #include "security.h" #include "objsec.h" +#include "conditional.h" + +static DECLARE_MUTEX(sel_sem); + +/* global data for booleans */ +static struct dentry *bool_dir = NULL; +static int bool_num = 0; +static int *bool_pending_values = NULL; extern void selnl_notify_setenforce(int val); @@ -40,7 +60,9 @@ SEL_CREATE, /* compute create labeling decision */ SEL_RELABEL, /* compute relabeling decision */ SEL_USER, /* compute reachable user contexts */ - SEL_POLICYVERS /* return policy version for this kernel */ + SEL_POLICYVERS, /* return policy version for this kernel */ + SEL_COMMIT_BOOLS, + SEL_MLS /* return if MLS policy is enabled */ }; static ssize_t sel_read_enforce(struct file *filp, char *buf, @@ -169,24 +191,74 @@ .read = sel_read_policyvers, }; +/* declaration for sel_write_load */ +static int sel_make_bools(void); + +static ssize_t sel_read_mls(struct file *filp, char *buf, + size_t count, loff_t *ppos) +{ + char *page; + ssize_t length; + ssize_t end; + + if (count < 0 || count > PAGE_SIZE) + return -EINVAL; + if (!(page = (char*)__get_free_page(GFP_KERNEL))) + return -ENOMEM; + memset(page, 0, PAGE_SIZE); + + length = scnprintf(page, PAGE_SIZE, "%d", selinux_mls_enabled); + if (length < 0) { + free_page((unsigned long)page); + return length; + } + + if (*ppos >= length) { + free_page((unsigned long)page); + return 0; + } + if (count + *ppos > length) + count = length - *ppos; + end = count + *ppos; + if (copy_to_user(buf, (char *) page + *ppos, count)) { + count = -EFAULT; + goto out; + } + *ppos = end; +out: + free_page((unsigned long)page); + return count; +} + +static struct file_operations sel_mls_ops = { + .read = sel_read_mls, +}; + static ssize_t sel_write_load(struct file * file, const char * buf, size_t count, loff_t *ppos) { + int ret; ssize_t length; - void *data; + void *data = NULL; + + down(&sel_sem); length = task_has_security(current, SECURITY__LOAD_POLICY); if (length) - return length; + goto out; if (*ppos != 0) { /* No partial writes. */ - return -EINVAL; + length = -EINVAL; + goto out; } - if ((count < 0) || (count > 64 * 1024 * 1024) || (data = vmalloc(count)) == NULL) - return -ENOMEM; + if ((count < 0) || (count > 64 * 1024 * 1024) + || (data = vmalloc(count)) == NULL) { + length = -ENOMEM; + goto out; + } length = -EFAULT; if (copy_from_user(data, buf, count) != 0) @@ -196,8 +268,13 @@ if (length) goto out; - length = count; + ret = sel_make_bools(); + if (ret) + length = ret; + else + length = count; out: + up(&sel_sem); vfree(data); return length; } @@ -601,9 +678,322 @@ return length; } +static struct inode *sel_make_inode(struct super_block *sb, int mode) +{ + struct inode *ret = new_inode(sb); + + if (ret) { + ret->i_mode = mode; + ret->i_uid = ret->i_gid = 0; + ret->i_blksize = PAGE_CACHE_SIZE; + ret->i_blocks = 0; + ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; + } + return ret; +} + +#define BOOL_INO_OFFSET 30 + +static ssize_t sel_read_bool(struct file *filep, char *buf, + size_t count, loff_t *ppos) +{ + char *page = NULL; + ssize_t length; + ssize_t end; + ssize_t ret; + int cur_enforcing; + struct inode *inode; + + down(&sel_sem); + + ret = -EFAULT; + + /* check to see if this file has been deleted */ + if (!filep->f_op) + goto out; + + if (count < 0 || count > PAGE_SIZE) { + ret = -EINVAL; + goto out; + } + if (!(page = (char*)__get_free_page(GFP_KERNEL))) { + ret = -ENOMEM; + goto out; + } + memset(page, 0, PAGE_SIZE); + + inode = filep->f_dentry->d_inode; + cur_enforcing = security_get_bool_value(inode->i_ino - BOOL_INO_OFFSET); + if (cur_enforcing < 0) { + ret = cur_enforcing; + goto out; + } + + length = scnprintf(page, PAGE_SIZE, "%d %d", cur_enforcing, + bool_pending_values[inode->i_ino - BOOL_INO_OFFSET]); + if (length < 0) { + ret = length; + goto out; + } + + if (*ppos >= length) { + ret = 0; + goto out; + } + if (count + *ppos > length) + count = length - *ppos; + end = count + *ppos; + if (copy_to_user(buf, (char *) page + *ppos, count)) { + ret = -EFAULT; + goto out; + } + *ppos = end; + ret = count; +out: + up(&sel_sem); + if (page) + free_page((unsigned long)page); + return ret; +} + +static ssize_t sel_write_bool(struct file *filep, const char *buf, + size_t count, loff_t *ppos) +{ + char *page = NULL; + ssize_t length = -EFAULT; + int new_value; + struct inode *inode; + + down(&sel_sem); + + length = task_has_security(current, SECURITY__SETBOOL); + if (length) + goto out; + + /* check to see if this file has been deleted */ + if (!filep->f_op) + goto out; + + if (count < 0 || count >= PAGE_SIZE) { + length = -ENOMEM; + goto out; + } + if (*ppos != 0) { + /* No partial writes. */ + goto out; + } + page = (char*)__get_free_page(GFP_KERNEL); + if (!page) + return -ENOMEM; + memset(page, 0, PAGE_SIZE); + + if (copy_from_user(page, buf, count)) + goto out; + + length = -EINVAL; + if (sscanf(page, "%d", &new_value) != 1) + goto out; + + if (new_value) + new_value = 1; + + inode = filep->f_dentry->d_inode; + bool_pending_values[inode->i_ino - BOOL_INO_OFFSET] = new_value; + length = count; + +out: + up(&sel_sem); + if (page) + free_page((unsigned long) page); + return length; +} + +static struct file_operations sel_bool_ops = { + .read = sel_read_bool, + .write = sel_write_bool, +}; + +static ssize_t sel_commit_bools_write(struct file *filep, const char *buf, + size_t count, loff_t *ppos) +{ + char *page = NULL; + ssize_t length = -EFAULT; + int new_value; + + down(&sel_sem); + + length = task_has_security(current, SECURITY__SETBOOL); + if (length) + goto out; + + /* check to see if this file has been deleted */ + if (!filep->f_op) + goto out; + + if (count < 0 || count >= PAGE_SIZE) { + length = -ENOMEM; + goto out; + } + if (*ppos != 0) { + /* No partial writes. */ + goto out; + } + page = (char*)__get_free_page(GFP_KERNEL); + if (!page) + return -ENOMEM; + + memset(page, 0, PAGE_SIZE); + + if (copy_from_user(page, buf, count)) + goto out; + + length = -EINVAL; + if (sscanf(page, "%d", &new_value) != 1) + goto out; + + if (new_value) { + security_set_bools(bool_num, bool_pending_values); + } + + length = count; + +out: + up(&sel_sem); + if (page) + free_page((unsigned long) page); + return length; +} + +static struct file_operations sel_commit_bools_ops = { + .write = sel_commit_bools_write, +}; + +/* delete booleans - partial revoke() from + * fs/proc/generic.c proc_kill_inodes */ +static void sel_remove_bools(struct dentry *de) +{ + struct list_head *p, *node; + struct super_block *sb = de->d_sb; + + spin_lock(&dcache_lock); + node = de->d_subdirs.next; + while (node != &de->d_subdirs) { + struct dentry *d = list_entry(node, struct dentry, d_child); + list_del_init(node); + + if (d->d_inode) { + d = dget_locked(d); + spin_unlock(&dcache_lock); + d_delete(d); + simple_unlink(de->d_inode, d); + dput(d); + spin_lock(&dcache_lock); + } + node = de->d_subdirs.next; + } + + spin_unlock(&dcache_lock); + + file_list_lock(); + list_for_each(p, &sb->s_files) { + struct file * filp = list_entry(p, struct file, f_list); + struct dentry * dentry = filp->f_dentry; + + if (dentry->d_parent != de) { + continue; + } + filp->f_op = NULL; + } + file_list_unlock(); +} + +#define BOOL_DIR_NAME "booleans" + +static int sel_make_bools(void) +{ + int i, ret = 0; + ssize_t len; + struct dentry *dentry = NULL; + struct dentry *dir = bool_dir; + struct inode *inode = NULL; + struct inode_security_struct *isec; + struct qstr qname; + char **names = NULL, *page; + int num; + int *values = NULL; + u32 sid; + + /* remove any existing files */ + if (bool_pending_values) + kfree(bool_pending_values); + + sel_remove_bools(dir); + + if (!(page = (char*)__get_free_page(GFP_KERNEL))) + return -ENOMEM; + memset(page, 0, PAGE_SIZE); + + ret = security_get_bools(&num, &names, &values); + if (ret != 0) + goto out; + + for (i = 0; i < num; i++) { + qname.name = names[i]; + qname.len = strlen(qname.name); + qname.hash = full_name_hash(qname.name, qname.len); + dentry = d_alloc(dir, &qname); + if (!dentry) { + ret = -ENOMEM; + goto err; + } + inode = sel_make_inode(dir->d_sb, S_IFREG | S_IRUGO | S_IWUSR); + if (!inode) { + ret = -ENOMEM; + goto err; + } + + len = snprintf(page, PAGE_SIZE, "/%s/%s", BOOL_DIR_NAME, names[i]); + if (len < 0) { + ret = -EINVAL; + goto err; + } else if (len >= PAGE_SIZE) { + ret = -ENAMETOOLONG; + goto err; + } + isec = (struct inode_security_struct*)inode->i_security; + if ((ret = security_genfs_sid("selinuxfs", page, SECCLASS_FILE, &sid))) + goto err; + isec->sid = sid; + isec->initialized = 1; + inode->i_fop = &sel_bool_ops; + inode->i_ino = i + BOOL_INO_OFFSET; + d_add(dentry, inode); + } + bool_num = num; + bool_pending_values = values; +out: + free_page((unsigned long)page); + if (names) { + for (i = 0; i < num; i++) { + if (names[i]) + kfree(names[i]); + } + kfree(names); + } + return ret; +err: + d_genocide(dir); + ret = -ENOMEM; + goto out; +} static int sel_fill_super(struct super_block * sb, void * data, int silent) { + int ret; + struct dentry *dentry; + struct inode *inode; + struct qstr qname; + static struct tree_descr selinux_files[] = { [SEL_LOAD] = {"load", &sel_load_ops, S_IRUSR|S_IWUSR}, [SEL_ENFORCE] = {"enforce", &sel_enforce_ops, S_IRUGO|S_IWUSR}, @@ -613,9 +1003,37 @@ [SEL_RELABEL] = {"relabel", &transaction_ops, S_IRUGO|S_IWUGO}, [SEL_USER] = {"user", &transaction_ops, S_IRUGO|S_IWUGO}, [SEL_POLICYVERS] = {"policyvers", &sel_policyvers_ops, S_IRUGO}, + [SEL_COMMIT_BOOLS] = {"commit_pending_bools", &sel_commit_bools_ops, S_IWUSR}, + [SEL_MLS] = {"mls", &sel_mls_ops, S_IRUGO}, /* last one */ {""} }; - return simple_fill_super(sb, SELINUX_MAGIC, selinux_files); + ret = simple_fill_super(sb, SELINUX_MAGIC, selinux_files); + if (ret) + return ret; + + qname.name = BOOL_DIR_NAME; + qname.len = strlen(qname.name); + qname.hash = full_name_hash(qname.name, qname.len); + dentry = d_alloc(sb->s_root, &qname); + if (!dentry) + return -ENOMEM; + + inode = sel_make_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); + if (!inode) + goto out; + inode->i_op = &simple_dir_inode_operations; + inode->i_fop = &simple_dir_operations; + d_add(dentry, inode); + bool_dir = dentry; + ret = sel_make_bools(); + if (ret) + goto out; + + return 0; +out: + dput(dentry); + printk(KERN_ERR "security: error creating conditional out_dput\n"); + return -ENOMEM; } static struct super_block *sel_get_sb(struct file_system_type *fs_type, diff -Nru a/security/selinux/ss/Makefile b/security/selinux/ss/Makefile --- a/security/selinux/ss/Makefile Wed Mar 17 19:29:09 2004 +++ b/security/selinux/ss/Makefile Wed Mar 17 19:29:09 2004 @@ -5,7 +5,7 @@ EXTRA_CFLAGS += -Isecurity/selinux/include obj-y := ss.o -ss-y := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o +ss-y := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o conditional.o ss-$(CONFIG_SECURITY_SELINUX_MLS) += mls.o diff -Nru a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c --- a/security/selinux/ss/avtab.c Wed Mar 17 19:29:10 2004 +++ b/security/selinux/ss/avtab.c Wed Mar 17 19:29:10 2004 @@ -3,10 +3,22 @@ * * Author : Stephen Smalley, */ + +/* Updated: Frank Mayer and Karl MacMillan + * + * Added conditional policy language extensions + * + * Copyright (C) 2003 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + #include #include #include #include + #include "avtab.h" #include "policydb.h" @@ -16,6 +28,29 @@ (keyp->source_type << 9)) & \ AVTAB_HASH_MASK) +static struct avtab_node* +avtab_insert_node(struct avtab *h, int hvalue, struct avtab_node * prev, struct avtab_node * cur, + struct avtab_key *key, struct avtab_datum *datum) +{ + struct avtab_node * newnode; + newnode = (struct avtab_node *) kmalloc(sizeof(struct avtab_node),GFP_KERNEL); + if (newnode == NULL) + return NULL; + memset(newnode, 0, sizeof(struct avtab_node)); + newnode->key = *key; + newnode->datum = *datum; + if (prev) { + newnode->next = prev->next; + prev->next = newnode; + } else { + newnode->next = h->htable[hvalue]; + h->htable[hvalue] = newnode; + } + + h->nel++; + return newnode; +} + int avtab_insert(struct avtab *h, struct avtab_key *key, struct avtab_datum *datum) { int hvalue; @@ -44,24 +79,48 @@ break; } - newnode = kmalloc(sizeof(*newnode), GFP_KERNEL); - if (newnode == NULL) + newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); + if(!newnode) return -ENOMEM; - memset(newnode, 0, sizeof(*newnode)); - newnode->key = *key; - newnode->datum = *datum; - if (prev) { - newnode->next = prev->next; - prev->next = newnode; - } else { - newnode->next = h->htable[hvalue]; - h->htable[hvalue] = newnode; - } - h->nel++; return 0; } +/* Unlike avtab_insert(), this function allow multiple insertions of the same + * key/specified mask into the table, as needed by the conditional avtab. + * It also returns a pointer to the node inserted. + */ +struct avtab_node * +avtab_insert_nonunique(struct avtab * h, struct avtab_key * key, struct avtab_datum * datum) +{ + int hvalue; + struct avtab_node *prev, *cur, *newnode; + + if (!h) + return NULL; + hvalue = AVTAB_HASH(key); + for (prev = NULL, cur = h->htable[hvalue]; + cur; + prev = cur, cur = cur->next) { + if (key->source_type == cur->key.source_type && + key->target_type == cur->key.target_type && + key->target_class == cur->key.target_class && + (datum->specified & cur->datum.specified)) + break; + if (key->source_type < cur->key.source_type) + break; + if (key->source_type == cur->key.source_type && + key->target_type < cur->key.target_type) + break; + if (key->source_type == cur->key.source_type && + key->target_type == cur->key.target_type && + key->target_class < cur->key.target_class) + break; + } + newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); + + return newnode; +} struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *key, int specified) { @@ -93,6 +152,67 @@ return NULL; } +/* This search function returns a node pointer, and can be used in + * conjunction with avtab_search_next_node() + */ +struct avtab_node* +avtab_search_node(struct avtab *h, struct avtab_key *key, int specified) +{ + int hvalue; + struct avtab_node *cur; + + if (!h) + return NULL; + + hvalue = AVTAB_HASH(key); + for (cur = h->htable[hvalue]; cur; cur = cur->next) { + if (key->source_type == cur->key.source_type && + key->target_type == cur->key.target_type && + key->target_class == cur->key.target_class && + (specified & cur->datum.specified)) + return cur; + + if (key->source_type < cur->key.source_type) + break; + if (key->source_type == cur->key.source_type && + key->target_type < cur->key.target_type) + break; + if (key->source_type == cur->key.source_type && + key->target_type == cur->key.target_type && + key->target_class < cur->key.target_class) + break; + } + return NULL; +} + +struct avtab_node* +avtab_search_node_next(struct avtab_node *node, int specified) +{ + struct avtab_node *cur; + + if (!node) + return NULL; + + for (cur = node->next; cur; cur = cur->next) { + if (node->key.source_type == cur->key.source_type && + node->key.target_type == cur->key.target_type && + node->key.target_class == cur->key.target_class && + (specified & cur->datum.specified)) + return cur; + + if (node->key.source_type < cur->key.source_type) + break; + if (node->key.source_type == cur->key.source_type && + node->key.target_type < cur->key.target_type) + break; + if (node->key.source_type == cur->key.source_type && + node->key.target_type == cur->key.target_type && + node->key.target_class < cur->key.target_class) + break; + } + return NULL; +} + void avtab_destroy(struct avtab *h) { int i; @@ -179,13 +299,72 @@ max_chain_len); } +int avtab_read_item(void *fp, struct avtab_datum *avdatum, struct avtab_key *avkey) +{ + __u32 *buf; + __u32 items, items2; + + memset(avkey, 0, sizeof(struct avtab_key)); + memset(avdatum, 0, sizeof(struct avtab_datum)); + + buf = next_entry(fp, sizeof(__u32)); + if (!buf) { + printk(KERN_ERR "security: avtab: truncated entry\n"); + goto bad; + } + items2 = le32_to_cpu(buf[0]); + buf = next_entry(fp, sizeof(__u32)*items2); + if (!buf) { + printk(KERN_ERR "security: avtab: truncated entry\n"); + goto bad; + } + items = 0; + avkey->source_type = le32_to_cpu(buf[items++]); + avkey->target_type = le32_to_cpu(buf[items++]); + avkey->target_class = le32_to_cpu(buf[items++]); + avdatum->specified = le32_to_cpu(buf[items++]); + if (!(avdatum->specified & (AVTAB_AV | AVTAB_TYPE))) { + printk(KERN_ERR "security: avtab: null entry\n"); + goto bad; + } + if ((avdatum->specified & AVTAB_AV) && + (avdatum->specified & AVTAB_TYPE)) { + printk(KERN_ERR "security: avtab: entry has both access vectors and types\n"); + goto bad; + } + if (avdatum->specified & AVTAB_AV) { + if (avdatum->specified & AVTAB_ALLOWED) + avtab_allowed(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_AUDITDENY) + avtab_auditdeny(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_AUDITALLOW) + avtab_auditallow(avdatum) = le32_to_cpu(buf[items++]); + } else { + if (avdatum->specified & AVTAB_TRANSITION) + avtab_transition(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_CHANGE) + avtab_change(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_MEMBER) + avtab_member(avdatum) = le32_to_cpu(buf[items++]); + } + if (items != items2) { + printk(KERN_ERR "security: avtab: entry only had %d items, expected %d\n", + items2, items); + goto bad; + } + + return 0; +bad: + return -1; +} + int avtab_read(struct avtab *a, void *fp, u32 config) { int i, rc = -EINVAL; struct avtab_key avkey; struct avtab_datum avdatum; u32 *buf; - u32 nel, items, items2; + u32 nel; buf = next_entry(fp, sizeof(u32)); @@ -199,55 +378,8 @@ goto bad; } for (i = 0; i < nel; i++) { - memset(&avkey, 0, sizeof(avkey)); - memset(&avdatum, 0, sizeof(avdatum)); - - buf = next_entry(fp, sizeof(u32)); - if (!buf) { - printk(KERN_ERR "security: avtab: truncated entry\n"); - goto bad; - } - items2 = le32_to_cpu(buf[0]); - buf = next_entry(fp, sizeof(u32)*items2); - if (!buf) { - printk(KERN_ERR "security: avtab: truncated entry\n"); + if (avtab_read_item(fp, &avdatum, &avkey)) goto bad; - } - items = 0; - avkey.source_type = le32_to_cpu(buf[items++]); - avkey.target_type = le32_to_cpu(buf[items++]); - avkey.target_class = le32_to_cpu(buf[items++]); - avdatum.specified = le32_to_cpu(buf[items++]); - if (!(avdatum.specified & (AVTAB_AV | AVTAB_TYPE))) { - printk(KERN_ERR "security: avtab: null entry\n"); - goto bad; - } - if ((avdatum.specified & AVTAB_AV) && - (avdatum.specified & AVTAB_TYPE)) { - printk(KERN_ERR "security: avtab: entry has both " - "access vectors and types\n"); - goto bad; - } - if (avdatum.specified & AVTAB_AV) { - if (avdatum.specified & AVTAB_ALLOWED) - avtab_allowed(&avdatum) = le32_to_cpu(buf[items++]); - if (avdatum.specified & AVTAB_AUDITDENY) - avtab_auditdeny(&avdatum) = le32_to_cpu(buf[items++]); - if (avdatum.specified & AVTAB_AUDITALLOW) - avtab_auditallow(&avdatum) = le32_to_cpu(buf[items++]); - } else { - if (avdatum.specified & AVTAB_TRANSITION) - avtab_transition(&avdatum) = le32_to_cpu(buf[items++]); - if (avdatum.specified & AVTAB_CHANGE) - avtab_change(&avdatum) = le32_to_cpu(buf[items++]); - if (avdatum.specified & AVTAB_MEMBER) - avtab_member(&avdatum) = le32_to_cpu(buf[items++]); - } - if (items != items2) { - printk(KERN_ERR "security: avtab: entry only had %d " - "items, expected %d\n", items2, items); - goto bad; - } rc = avtab_insert(a, &avkey, &avdatum); if (rc) { if (rc == -ENOMEM) diff -Nru a/security/selinux/ss/avtab.h b/security/selinux/ss/avtab.h --- a/security/selinux/ss/avtab.h Wed Mar 17 19:29:09 2004 +++ b/security/selinux/ss/avtab.h Wed Mar 17 19:29:09 2004 @@ -7,6 +7,16 @@ * * Author : Stephen Smalley, */ + +/* Updated: Frank Mayer and Karl MacMillan + * + * Added conditional policy language extensions + * + * Copyright (C) 2003 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ #ifndef _SS_AVTAB_H_ #define _SS_AVTAB_H_ @@ -25,6 +35,7 @@ #define AVTAB_MEMBER 32 #define AVTAB_CHANGE 64 #define AVTAB_TYPE (AVTAB_TRANSITION | AVTAB_MEMBER | AVTAB_CHANGE) +#define AVTAB_ENABLED 0x80000000 /* reserved for used in cond_avtab */ u32 specified; /* what fields are specified */ u32 data[3]; /* access vectors or types */ #define avtab_allowed(x) (x)->data[0] @@ -56,7 +67,16 @@ void *args), void *args); void avtab_hash_eval(struct avtab *h, char *tag); + +int avtab_read_item(void *fp, struct avtab_datum *avdatum, struct avtab_key *avkey); int avtab_read(struct avtab *a, void *fp, u32 config); + +struct avtab_node *avtab_insert_nonunique(struct avtab *h, struct avtab_key *key, + struct avtab_datum *datum); + +struct avtab_node *avtab_search_node(struct avtab *h, struct avtab_key *key, int specified); + +struct avtab_node *avtab_search_node_next(struct avtab_node *node, int specified); #define AVTAB_HASH_BITS 15 #define AVTAB_HASH_BUCKETS (1 << AVTAB_HASH_BITS) diff -Nru a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/security/selinux/ss/conditional.c Wed Mar 17 19:29:10 2004 @@ -0,0 +1,487 @@ +/* Authors: Karl MacMillan + * Frank Mayer + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + +#include +#include +#include +#include +#include +#include + +#include "security.h" +#include "conditional.h" + +/* + * cond_evaluate_expr evaluates a conditional expr + * in reverse polish notation. It returns true (1), false (0), + * or undefined (-1). Undefined occurs when the expression + * exceeds the stack depth of COND_EXPR_MAXDEPTH. + */ +static int cond_evaluate_expr(struct policydb *p, struct cond_expr *expr) +{ + + struct cond_expr *cur; + int s[COND_EXPR_MAXDEPTH]; + int sp = -1; + + for (cur = expr; cur != NULL; cur = cur->next) { + switch (cur->expr_type) { + case COND_BOOL: + if (sp == (COND_EXPR_MAXDEPTH - 1)) + return -1; + sp++; + s[sp] = p->bool_val_to_struct[cur->bool - 1]->state; + break; + case COND_NOT: + if (sp < 0) + return -1; + s[sp] = !s[sp]; + break; + case COND_OR: + if (sp < 1) + return -1; + sp--; + s[sp] |= s[sp + 1]; + break; + case COND_AND: + if (sp < 1) + return -1; + sp--; + s[sp] &= s[sp + 1]; + break; + case COND_XOR: + if (sp < 1) + return -1; + sp--; + s[sp] ^= s[sp + 1]; + break; + case COND_EQ: + if (sp < 1) + return -1; + sp--; + s[sp] = (s[sp] == s[sp + 1]); + break; + case COND_NEQ: + if (sp < 1) + return -1; + sp--; + s[sp] = (s[sp] != s[sp + 1]); + break; + default: + return -1; + } + } + return s[0]; +} + +/* + * evaluate_cond_node evaluates the conditional stored in + * a struct cond_node and if the result is different than the + * current state of the node it sets the rules in the true/false + * list appropriately. If the result of the expression is undefined + * all of the rules are disabled for safety. + */ +int evaluate_cond_node(struct policydb *p, struct cond_node *node) +{ + int new_state; + struct cond_av_list* cur; + + new_state = cond_evaluate_expr(p, node->expr); + if (new_state != node->cur_state) { + node->cur_state = new_state; + if (new_state == -1) + printk(KERN_ERR "security: expression result was undefined - disabling all rules.\n"); + /* turn the rules on or off */ + for (cur = node->true_list; cur != NULL; cur = cur->next) { + if (new_state <= 0) { + cur->node->datum.specified &= ~AVTAB_ENABLED; + } else { + cur->node->datum.specified |= AVTAB_ENABLED; + } + } + + for (cur = node->false_list; cur != NULL; cur = cur->next) { + /* -1 or 1 */ + if (new_state) { + cur->node->datum.specified &= ~AVTAB_ENABLED; + } else { + cur->node->datum.specified |= AVTAB_ENABLED; + } + } + } + return 0; +} + +int cond_policydb_init(struct policydb *p) +{ + p->bool_val_to_struct = NULL; + p->cond_list = NULL; + if (avtab_init(&p->te_cond_avtab)) + return -1; + + return 0; +} + +static void cond_av_list_destroy(struct cond_av_list *list) +{ + struct cond_av_list *cur, *next; + for (cur = list; cur != NULL; cur = next) { + next = cur->next; + /* the avtab_ptr_t node is destroy by the avtab */ + kfree(cur); + } +} + +static void cond_node_destroy(struct cond_node *node) +{ + struct cond_expr *cur_expr, *next_expr; + + for (cur_expr = node->expr; cur_expr != NULL; cur_expr = next_expr) { + next_expr = cur_expr->next; + kfree(cur_expr); + } + cond_av_list_destroy(node->true_list); + cond_av_list_destroy(node->false_list); + kfree(node); +} + +static void cond_list_destroy(struct cond_node *list) +{ + struct cond_node *next, *cur; + + if (list == NULL) + return; + + for (cur = list; cur != NULL; cur = next) { + next = cur->next; + cond_node_destroy(cur); + } +} + +void cond_policydb_destroy(struct policydb *p) +{ + if (p->bool_val_to_struct != NULL) + kfree(p->bool_val_to_struct); + avtab_destroy(&p->te_cond_avtab); + cond_list_destroy(p->cond_list); +} + +int cond_init_bool_indexes(struct policydb *p) +{ + if (p->bool_val_to_struct) + kfree(p->bool_val_to_struct); + p->bool_val_to_struct = (struct cond_bool_datum**) + kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum*), GFP_KERNEL); + if (!p->bool_val_to_struct) + return -1; + return 0; +} + +int cond_destroy_bool(void *key, void *datum, void *p) +{ + if (key) + kfree(key); + kfree(datum); + return 0; +} + +int cond_index_bool(void *key, void *datum, void *datap) +{ + struct policydb *p; + struct cond_bool_datum *booldatum; + + booldatum = datum; + p = datap; + + if (!booldatum->value || booldatum->value > p->p_bools.nprim) + return -EINVAL; + + p->p_bool_val_to_name[booldatum->value - 1] = key; + p->bool_val_to_struct[booldatum->value -1] = booldatum; + + return 0; +} + +int bool_isvalid(struct cond_bool_datum *b) +{ + if (!(b->state == 0 || b->state == 1)) + return 0; + return 1; +} + +int cond_read_bool(struct policydb *p, struct hashtab *h, void *fp) +{ + char *key = 0; + struct cond_bool_datum *booldatum; + __u32 *buf, len; + + booldatum = kmalloc(sizeof(struct cond_bool_datum), GFP_KERNEL); + if (!booldatum) + return -1; + memset(booldatum, 0, sizeof(struct cond_bool_datum)); + + buf = next_entry(fp, sizeof(__u32) * 3); + if (!buf) + goto err; + + booldatum->value = le32_to_cpu(buf[0]); + booldatum->state = le32_to_cpu(buf[1]); + + if (!bool_isvalid(booldatum)) + goto err; + + len = le32_to_cpu(buf[2]); + + buf = next_entry(fp, len); + if (!buf) + goto err; + key = kmalloc(len + 1, GFP_KERNEL); + if (!key) + goto err; + memcpy(key, buf, len); + key[len] = 0; + if (hashtab_insert(h, key, booldatum)) + goto err; + + return 0; +err: + cond_destroy_bool(key, booldatum, 0); + return -1; +} + +static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list **ret_list, + struct cond_av_list *other) +{ + struct cond_av_list *list, *last = NULL, *cur; + struct avtab_key key; + struct avtab_datum datum; + struct avtab_node *node_ptr; + int len, i; + __u32 *buf; + __u8 found; + + *ret_list = NULL; + + len = 0; + buf = next_entry(fp, sizeof(__u32)); + if (!buf) + return -1; + + len = le32_to_cpu(buf[0]); + if (len == 0) { + return 0; + } + + for (i = 0; i < len; i++) { + if (avtab_read_item(fp, &datum, &key)) + goto err; + + /* + * For type rules we have to make certain there aren't any + * conflicting rules by searching the te_avtab and the + * cond_te_avtab. + */ + if (datum.specified & AVTAB_TYPE) { + if (avtab_search(&p->te_avtab, &key, AVTAB_TYPE)) { + printk("security: type rule already exists outside of a conditional."); + goto err; + } + /* + * If we are reading the false list other will be a pointer to + * the true list. We can have duplicate entries if there is only + * 1 other entry and it is in our true list. + * + * If we are reading the true list (other == NULL) there shouldn't + * be any other entries. + */ + if (other) { + node_ptr = avtab_search_node(&p->te_cond_avtab, &key, AVTAB_TYPE); + if (node_ptr) { + if (avtab_search_node_next(node_ptr, AVTAB_TYPE)) { + printk("security: too many conflicting type rules."); + goto err; + } + found = 0; + for (cur = other; cur != NULL; cur = cur->next) { + if (cur->node == node_ptr) { + found = 1; + break; + } + } + if (!found) { + printk("security: conflicting type rules."); + goto err; + } + } + } else { + if (avtab_search(&p->te_cond_avtab, &key, AVTAB_TYPE)) { + printk("security: conflicting type rules when adding type rule for true."); + goto err; + } + } + } + node_ptr = avtab_insert_nonunique(&p->te_cond_avtab, &key, &datum); + if (!node_ptr) { + printk("security: could not insert rule."); + goto err; + } + + list = kmalloc(sizeof(struct cond_av_list), GFP_KERNEL); + if (!list) + goto err; + memset(list, 0, sizeof(struct cond_av_list)); + + list->node = node_ptr; + if (i == 0) + *ret_list = list; + else + last->next = list; + last = list; + + } + + return 0; +err: + cond_av_list_destroy(*ret_list); + *ret_list = NULL; + return -1; +} + +static int expr_isvalid(struct policydb *p, struct cond_expr *expr) +{ + if (expr->expr_type <= 0 || expr->expr_type > COND_LAST) { + printk("security: conditional expressions uses unknown operator.\n"); + return 0; + } + + if (expr->bool > p->p_bools.nprim) { + printk("security: conditional expressions uses unknown bool.\n"); + return 0; + } + return 1; +} + +static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp) +{ + __u32 *buf; + int len, i; + struct cond_expr *expr = NULL, *last = NULL; + + buf = next_entry(fp, sizeof(__u32)); + if (!buf) + return -1; + + node->cur_state = le32_to_cpu(buf[0]); + + len = 0; + buf = next_entry(fp, sizeof(__u32)); + if (!buf) + return -1; + + /* expr */ + len = le32_to_cpu(buf[0]); + + for (i = 0; i < len; i++ ) { + buf = next_entry(fp, sizeof(__u32) * 2); + if (!buf) + goto err; + + expr = kmalloc(sizeof(struct cond_expr), GFP_KERNEL); + if (!expr) { + goto err; + } + memset(expr, 0, sizeof(struct cond_expr)); + + expr->expr_type = le32_to_cpu(buf[0]); + expr->bool = le32_to_cpu(buf[1]); + + if (!expr_isvalid(p, expr)) + goto err; + + if (i == 0) { + node->expr = expr; + } else { + last->next = expr; + } + last = expr; + } + + if (cond_read_av_list(p, fp, &node->true_list, NULL) != 0) + goto err; + if (cond_read_av_list(p, fp, &node->false_list, node->true_list) != 0) + goto err; + return 0; +err: + cond_node_destroy(node); + return -1; +} + +int cond_read_list(struct policydb *p, void *fp) +{ + struct cond_node *node, *last = NULL; + __u32 *buf; + int i, len; + + buf = next_entry(fp, sizeof(__u32)); + if (!buf) + return -1; + + len = le32_to_cpu(buf[0]); + + for (i = 0; i < len; i++) { + node = kmalloc(sizeof(struct cond_node), GFP_KERNEL); + if (!node) + goto err; + memset(node, 0, sizeof(struct cond_node)); + + if (cond_read_node(p, node, fp) != 0) + goto err; + + if (i == 0) { + p->cond_list = node; + } else { + last->next = node; + } + last = node; + } + return 0; +err: + cond_list_destroy(p->cond_list); + return -1; +} + +/* Determine whether additional permissions are granted by the conditional + * av table, and if so, add them to the result + */ +void cond_compute_av(struct avtab *ctab, struct avtab_key *key, struct av_decision *avd) +{ + struct avtab_node *node; + + if(!ctab || !key || !avd) + return; + + for(node = avtab_search_node(ctab, key, AVTAB_AV); node != NULL; + node = avtab_search_node_next(node, AVTAB_AV)) { + if ( (__u32) (AVTAB_ALLOWED|AVTAB_ENABLED) == + (node->datum.specified & (AVTAB_ALLOWED|AVTAB_ENABLED))) + avd->allowed |= avtab_allowed(&node->datum); + if ( (__u32) (AVTAB_AUDITDENY|AVTAB_ENABLED) == + (node->datum.specified & (AVTAB_AUDITDENY|AVTAB_ENABLED))) + /* Since a '0' in an auditdeny mask represents a + * permission we do NOT want to audit (dontaudit), we use + * the '&' operand to ensure that all '0's in the mask + * are retained (much unlike the allow and auditallow cases). + */ + avd->auditdeny &= avtab_auditdeny(&node->datum); + if ( (__u32) (AVTAB_AUDITALLOW|AVTAB_ENABLED) == + (node->datum.specified & (AVTAB_AUDITALLOW|AVTAB_ENABLED))) + avd->auditallow |= avtab_auditallow(&node->datum); + } + return; +} diff -Nru a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/security/selinux/ss/conditional.h Wed Mar 17 19:29:10 2004 @@ -0,0 +1,77 @@ +/* Authors: Karl MacMillan + * Frank Mayer + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + +#ifndef _CONDITIONAL_H_ +#define _CONDITIONAL_H_ + +#include "avtab.h" +#include "symtab.h" +#include "policydb.h" + +#define COND_EXPR_MAXDEPTH 10 + +/* + * A conditional expression is a list of operators and operands + * in reverse polish notation. + */ +struct cond_expr { +#define COND_BOOL 1 /* plain bool */ +#define COND_NOT 2 /* !bool */ +#define COND_OR 3 /* bool || bool */ +#define COND_AND 4 /* bool && bool */ +#define COND_XOR 5 /* bool ^ bool */ +#define COND_EQ 6 /* bool == bool */ +#define COND_NEQ 7 /* bool != bool */ +#define COND_LAST 8 + __u32 expr_type; + __u32 bool; + struct cond_expr *next; +}; + +/* + * Each cond_node contains a list of rules to be enabled/disabled + * depending on the current value of the conditional expression. This + * struct is for that list. + */ +struct cond_av_list { + struct avtab_node *node; + struct cond_av_list *next; +}; + +/* + * A cond node represents a conditional block in a policy. It + * contains a conditional expression, the current state of the expression, + * two lists of rules to enable/disable depending on the value of the + * expression (the true list corresponds to if and the false list corresponds + * to else).. + */ +struct cond_node { + int cur_state; + struct cond_expr *expr; + struct cond_av_list *true_list; + struct cond_av_list *false_list; + struct cond_node *next; +}; + +int cond_policydb_init(struct policydb* p); +void cond_policydb_destroy(struct policydb* p); + +int cond_init_bool_indexes(struct policydb* p); +int cond_destroy_bool(void *key, void *datum, void *p); + +int cond_index_bool(void *key, void *datum, void *datap); + +int cond_read_bool(struct policydb *p, struct hashtab *h, void *fp); +int cond_read_list(struct policydb *p, void *fp); + +void cond_compute_av(struct avtab *ctab, struct avtab_key *key, struct av_decision *avd); + +int evaluate_cond_node(struct policydb *p, struct cond_node *node); + +#endif /* _CONDITIONAL_H_ */ diff -Nru a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h --- a/security/selinux/ss/mls.h Wed Mar 17 19:29:09 2004 +++ b/security/selinux/ss/mls.h Wed Mar 17 19:29:09 2004 @@ -48,12 +48,12 @@ #define mls_end_user_ranges } } -#define mls_symtab_names , "levels", "categories" -#define mls_symtab_sizes , 16, 16 -#define mls_index_f ,sens_index, cat_index -#define mls_destroy_f ,sens_destroy, cat_destroy -#define mls_read_f ,sens_read, cat_read -#define mls_write_f ,sens_write, cat_write +#define mls_symtab_names "levels", "categories", +#define mls_symtab_sizes 16, 16, +#define mls_index_f sens_index, cat_index, +#define mls_destroy_f sens_destroy, cat_destroy, +#define mls_read_f sens_read, cat_read, +#define mls_write_f sens_write, cat_write, #define mls_policydb_index_others(p) printk(", %d levels", p->nlevels); #define mls_set_config(config) config |= POLICYDB_CONFIG_MLS diff -Nru a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c --- a/security/selinux/ss/policydb.c Wed Mar 17 19:29:09 2004 +++ b/security/selinux/ss/policydb.c Wed Mar 17 19:29:09 2004 @@ -3,12 +3,25 @@ * * Author : Stephen Smalley, */ + +/* Updated: Frank Mayer and Karl MacMillan + * + * Added conditional policy language extensions + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + #include #include #include #include #include "security.h" + #include "policydb.h" +#include "conditional.h" #include "mls.h" #define _DEBUG_HASHES @@ -19,8 +32,9 @@ "classes", "roles", "types", - "users" + "users", mls_symtab_names + "bools" }; #endif @@ -29,8 +43,9 @@ 32, 16, 512, - 128 + 128, mls_symtab_sizes + 16 }; /* @@ -95,6 +110,10 @@ if (rc) goto out_free_avtab; + rc = cond_policydb_init(p); + if (rc) + goto out_free_avtab; + out: return rc; @@ -195,8 +214,9 @@ class_index, role_index, type_index, - user_index + user_index, mls_index_f + cond_index_bool }; /* @@ -267,8 +287,8 @@ { int i, rc = 0; - printk(KERN_INFO "security: %d users, %d roles, %d types", - p->p_users.nprim, p->p_roles.nprim, p->p_types.nprim); + printk(KERN_INFO "security: %d users, %d roles, %d types, %d bools", + p->p_users.nprim, p->p_roles.nprim, p->p_types.nprim, p->p_bools.nprim); mls_policydb_index_others(p); printk("\n"); @@ -296,6 +316,11 @@ goto out; } + if (cond_init_bool_indexes(p)) { + rc = -ENOMEM; + goto out; + } + for (i = SYM_ROLES; i < SYM_NUM; i++) { p->sym_val_to_name[i] = kmalloc(p->symtab[i].nprim * sizeof(char *), GFP_KERNEL); @@ -402,8 +427,9 @@ class_destroy, role_destroy, type_destroy, - user_destroy + user_destroy, mls_destroy_f + cond_destroy_bool }; void ocontext_destroy(struct ocontext *c, int i) @@ -467,6 +493,8 @@ kfree(gtmp); } + cond_policydb_destroy(p); + return; } @@ -1040,8 +1068,9 @@ class_read, role_read, type_read, - user_read + user_read, mls_read_f + cond_read_bool }; #define mls_config(x) \ @@ -1057,7 +1086,7 @@ struct role_trans *tr, *ltr; struct ocontext *l, *c, *newc; struct genfs *genfs_p, *genfs, *newgenfs; - int i, j, rc; + int i, j, rc, policy_ver, num_syms; u32 *buf, len, len2, config, nprim, nel, nel2; char *policydb_str; @@ -1122,7 +1151,8 @@ for (i = 0; i < 4; i++) buf[i] = le32_to_cpu(buf[i]); - if (buf[0] != POLICYDB_VERSION) { + policy_ver = buf[0]; + if (policy_ver != POLICYDB_VERSION && policy_ver != POLICYDB_VERSION_COMPAT) { printk(KERN_ERR "security: policydb version %d does not match " "my version %d\n", buf[0], POLICYDB_VERSION); goto bad; @@ -1134,18 +1164,30 @@ mls_config(config)); goto bad; } - if (buf[2] != SYM_NUM || buf[3] != OCON_NUM) { - printk(KERN_ERR "security: policydb table sizes (%d,%d) do " - "not match mine (%d,%d)\n", - buf[2], buf[3], SYM_NUM, OCON_NUM); - goto bad; + + if (policy_ver == POLICYDB_VERSION_COMPAT) { + if (buf[2] != (SYM_NUM - 1) || buf[3] != OCON_NUM) { + printk(KERN_ERR "security: policydb table sizes (%d,%d) do " + "not match mine (%d,%d)\n", + buf[2], buf[3], SYM_NUM, OCON_NUM); + goto bad; + } + num_syms = SYM_NUM - 1; + } else { + if (buf[2] != SYM_NUM || buf[3] != OCON_NUM) { + printk(KERN_ERR "security: policydb table sizes (%d,%d) do " + "not match mine (%d,%d)\n", + buf[2], buf[3], SYM_NUM, OCON_NUM); + goto bad; + } + num_syms = SYM_NUM; } rc = mls_read_nlevels(p, fp); if (rc) goto bad; - for (i = 0; i < SYM_NUM; i++) { + for (i = 0; i < num_syms; i++) { buf = next_entry(fp, sizeof(u32)*2); if (!buf) { rc = -EINVAL; @@ -1165,6 +1207,12 @@ rc = avtab_read(&p->te_avtab, fp, config); if (rc) goto bad; + + if (policy_ver == POLICYDB_VERSION) { + rc = cond_read_list(p, fp); + if (rc) + goto bad; + } buf = next_entry(fp, sizeof(u32)); if (!buf) { diff -Nru a/security/selinux/ss/policydb.h b/security/selinux/ss/policydb.h --- a/security/selinux/ss/policydb.h Wed Mar 17 19:29:10 2004 +++ b/security/selinux/ss/policydb.h Wed Mar 17 19:29:10 2004 @@ -4,6 +4,17 @@ * * Author : Stephen Smalley, */ + +/* Updated: Frank Mayer and Karl MacMillan + * + * Added conditional policy language extensions + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + #ifndef _SS_POLICYDB_H_ #define _SS_POLICYDB_H_ @@ -100,6 +111,13 @@ }; #endif +/* Boolean data type */ +struct cond_bool_datum { + __u32 value; /* internal type value */ + int state; +}; + +struct cond_node; /* * The configuration data includes security contexts for @@ -145,9 +163,11 @@ #ifdef CONFIG_SECURITY_SELINUX_MLS #define SYM_LEVELS 5 #define SYM_CATS 6 -#define SYM_NUM 7 +#define SYM_BOOLS 7 +#define SYM_NUM 8 #else -#define SYM_NUM 5 +#define SYM_BOOLS 5 +#define SYM_NUM 6 #endif /* object context array indices */ @@ -170,6 +190,7 @@ #define p_users symtab[SYM_USERS] #define p_levels symtab[SYM_LEVELS] #define p_cats symtab[SYM_CATS] +#define p_bools symtab[SYM_BOOLS] /* symbol names indexed by (value - 1) */ char **sym_val_to_name[SYM_NUM]; @@ -180,6 +201,7 @@ #define p_user_val_to_name sym_val_to_name[SYM_USERS] #define p_sens_val_to_name sym_val_to_name[SYM_LEVELS] #define p_cat_val_to_name sym_val_to_name[SYM_CATS] +#define p_bool_val_to_name sym_val_to_name[SYM_BOOLS] /* class, role, and user attributes indexed by (value - 1) */ struct class_datum **class_val_to_struct; @@ -191,6 +213,13 @@ /* role transitions */ struct role_trans *role_tr; + + /* bools indexed by (value - 1) */ + struct cond_bool_datum **bool_val_to_struct; + /* type enforcement conditional access vectors and transitions */ + struct avtab te_cond_avtab; + /* linked list indexing te_cond_avtab by conditional */ + struct cond_node* cond_list; /* role allows */ struct role_allow *role_allow; diff -Nru a/security/selinux/ss/services.c b/security/selinux/ss/services.c --- a/security/selinux/ss/services.c Wed Mar 17 19:29:10 2004 +++ b/security/selinux/ss/services.c Wed Mar 17 19:29:10 2004 @@ -9,6 +9,15 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, * as published by the Free Software Foundation. + * + * Updated: Frank Mayer and Karl MacMillan + * + * Added conditional policy language extensions + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. */ #include #include @@ -26,6 +35,7 @@ #include "policydb.h" #include "sidtab.h" #include "services.h" +#include "conditional.h" #include "mls.h" extern void selnl_notify_policyload(u32 seqno); @@ -225,6 +235,9 @@ avd->auditallow = avtab_auditallow(avdatum); } + /* Check conditional av table for additional permissions */ + cond_compute_av(&policydb.te_cond_avtab, &avkey, avd); + /* * Remove any permissions prohibited by the MLS policy. */ @@ -249,7 +262,7 @@ * pair. */ if (tclass == SECCLASS_PROCESS && - avd->allowed && PROCESS__TRANSITION && + (avd->allowed & PROCESS__TRANSITION) && scontext->role != tcontext->role) { for (ra = policydb.role_allow; ra; ra = ra->next) { if (scontext->role == ra->role && @@ -573,6 +586,7 @@ struct role_trans *roletr = 0; struct avtab_key avkey; struct avtab_datum *avdatum; + struct avtab_node *node; unsigned int type_change = 0; int rc = 0; @@ -639,6 +653,18 @@ avkey.target_type = tcontext->type; avkey.target_class = tclass; avdatum = avtab_search(&policydb.te_avtab, &avkey, AVTAB_TYPE); + + /* If no permanent rule, also check for enabled conditional rules */ + if(!avdatum) { + node = avtab_search_node(&policydb.te_cond_avtab, &avkey, specified); + for (; node != NULL; node = avtab_search_node_next(node, specified)) { + if (node->datum.specified & AVTAB_ENABLED) { + avdatum = &node->datum; + break; + } + } + } + type_change = (avdatum && (avdatum->specified & specified)); if (type_change) { /* Use the type from the type transition/member/change rule. */ @@ -1000,6 +1026,7 @@ return -EINVAL; } ss_initialized = 1; + LOAD_UNLOCK; selinux_complete_init(); return 0; @@ -1046,6 +1073,7 @@ memcpy(&policydb, &newpolicydb, sizeof policydb); sidtab_set(&sidtab, &newsidtab); seqno = ++latest_granting; + POLICY_WRUNLOCK; LOAD_UNLOCK; @@ -1424,6 +1452,119 @@ } } +out: + POLICY_RDUNLOCK; + return rc; +} + +int security_get_bools(int *len, char ***names, int **values) +{ + int i, rc = -ENOMEM; + + POLICY_RDLOCK; + *names = NULL; + *values = NULL; + + *len = policydb.p_bools.nprim; + if (!*len) { + rc = 0; + goto out; + } + + *names = (char**)kmalloc(sizeof(char*) * *len, GFP_ATOMIC); + if (!*names) + goto err; + memset(*names, 0, sizeof(char*) * *len); + + *values = (int*)kmalloc(sizeof(int) * *len, GFP_ATOMIC); + if (!*values) + goto err; + + for (i = 0; i < *len; i++) { + size_t name_len; + (*values)[i] = policydb.bool_val_to_struct[i]->state; + name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; + (*names)[i] = (char*)kmalloc(sizeof(char) * name_len, GFP_ATOMIC); + if (!(*names)[i]) + goto err; + strncpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); + (*names)[i][name_len - 1] = 0; + } + rc = 0; +out: + POLICY_RDUNLOCK; + return rc; +err: + if (*names) { + for (i = 0; i < *len; i++) + if ((*names)[i]) + kfree((*names)[i]); + } + if (*values) + kfree(*values); + goto out; +} + + +int security_set_bools(int len, int *values) +{ + int i, rc = 0; + int lenp, seqno = 0; + struct cond_node *cur; + + POLICY_WRLOCK; + + lenp = policydb.p_bools.nprim; + if (len != lenp) { + rc = -EFAULT; + goto out; + } + + printk(KERN_INFO "security: committed booleans { "); + for (i = 0; i < len; i++) { + if (values[i]) { + policydb.bool_val_to_struct[i]->state = 1; + } else { + policydb.bool_val_to_struct[i]->state = 0; + } + if (i != 0) + printk(", "); + printk("%s:%d", policydb.p_bool_val_to_name[i], + policydb.bool_val_to_struct[i]->state); + } + printk(" }\n"); + + for (cur = policydb.cond_list; cur != NULL; cur = cur->next) { + rc = evaluate_cond_node(&policydb, cur); + if (rc) + goto out; + } + + seqno = ++latest_granting; + +out: + POLICY_WRUNLOCK; + if (!rc) { + avc_ss_reset(seqno); + selnl_notify_policyload(seqno); + } + return rc; +} + +int security_get_bool_value(int bool) +{ + int rc = 0; + int len; + + POLICY_RDLOCK; + + len = policydb.p_bools.nprim; + if (bool >= len) { + rc = -EFAULT; + goto out; + } + + rc = policydb.bool_val_to_struct[bool]->state; out: POLICY_RDUNLOCK; return rc;